Skip to content

T
tg
Commit 8eaa6119 authored by vvaltman's avatar vvaltman
Browse files
Options

added register function from lua

parent 4734c8ba
Hide whitespace changes
Inline Side-by-side
Showing with 408 additions and 184 deletions
interface.c
View file @ 8eaa6119
...@@ -575,8 +575,9 @@ struct arg { ...@@ -575,8 +575,9 @@ struct arg {
struct command { struct command {
char *name; char *name;
enum command_argument args[10]; enum command_argument args[10];
void (*fun)(int arg_num, struct arg args[], struct in_ev *ev); void (*fun)(struct command *command, int arg_num, struct arg args[], struct in_ev *ev);
char *desc; char *desc;
void *arg;
}; };
...@@ -599,7 +600,7 @@ void print_encr_chat_success_gw (struct tgl_state *TLS, void *extra, int success ...@@ -599,7 +600,7 @@ void print_encr_chat_success_gw (struct tgl_state *TLS, void *extra, int success
void print_success_gw (struct tgl_state *TLS, void *extra, int success); void print_success_gw (struct tgl_state *TLS, void *extra, int success);
struct command commands[]; struct command commands[];
void do_help (int arg_num, struct arg args[], struct in_ev *ev) { void do_help (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (!arg_num); assert (!arg_num);
if (ev) { mprint_start (ev); } if (ev) { mprint_start (ev); }
mpush_color (ev, COLOR_YELLOW); mpush_color (ev, COLOR_YELLOW);
...@@ -615,13 +616,13 @@ void do_help (int arg_num, struct arg args[], struct in_ev *ev) { ...@@ -615,13 +616,13 @@ void do_help (int arg_num, struct arg args[], struct in_ev *ev) {
} }
} }
void do_contact_list (int arg_num, struct arg args[], struct in_ev *ev) { void do_contact_list (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (!arg_num); assert (!arg_num);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_update_contact_list (TLS, print_user_list_gw, ev); tgl_do_update_contact_list (TLS, print_user_list_gw, ev);
} }
void do_stats (int arg_num, struct arg args[], struct in_ev *ev) { void do_stats (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (!arg_num); assert (!arg_num);
static char stat_buf[1 << 15]; static char stat_buf[1 << 15];
tgl_print_stat (TLS, stat_buf, (1 << 15) - 1); tgl_print_stat (TLS, stat_buf, (1 << 15) - 1);
...@@ -633,97 +634,97 @@ void do_stats (int arg_num, struct arg args[], struct in_ev *ev) { ...@@ -633,97 +634,97 @@ void do_stats (int arg_num, struct arg args[], struct in_ev *ev) {
} }
} }
void do_history (int arg_num, struct arg args[], struct in_ev *ev) { void do_history (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 3); assert (arg_num == 3);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_get_history_ext (TLS, args[0].P->id, args[2].num != NOT_FOUND ? args[2].num : 0, args[1].num != NOT_FOUND ? args[1].num : 40, offline_mode, print_msg_list_gw, ev); tgl_do_get_history_ext (TLS, args[0].P->id, args[2].num != NOT_FOUND ? args[2].num : 0, args[1].num != NOT_FOUND ? args[1].num : 40, offline_mode, print_msg_list_gw, ev);
} }
void do_dialog_list (int arg_num, struct arg args[], struct in_ev *ev) { void do_dialog_list (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num <= 2); assert (arg_num <= 2);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_get_dialog_list (TLS, args[0].num != NOT_FOUND ? args[0].num : 100, args[1].num != NOT_FOUND ? args[1].num : 0, print_dialog_list_gw, ev); tgl_do_get_dialog_list (TLS, args[0].num != NOT_FOUND ? args[0].num : 100, args[1].num != NOT_FOUND ? args[1].num : 0, print_dialog_list_gw, ev);
} }
void do_send_photo (int arg_num, struct arg args[], struct in_ev *ev) { void do_send_photo (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num >= 2); assert (arg_num >= 2);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_send_document (TLS, -1, args[0].P->id, args[1].str, 0, arg_num == 2 ? NULL : args[2].str, print_msg_success_gw, ev); tgl_do_send_document (TLS, -1, args[0].P->id, args[1].str, 0, arg_num == 2 ? NULL : args[2].str, print_msg_success_gw, ev);
} }
void do_send_file (int arg_num, struct arg args[], struct in_ev *ev) { void do_send_file (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num >= 2); assert (arg_num >= 2);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_send_document (TLS, -2, args[0].P->id, args[1].str, 0, arg_num == 2 ? NULL : args[2].str, print_msg_success_gw, ev); tgl_do_send_document (TLS, -2, args[0].P->id, args[1].str, 0, arg_num == 2 ? NULL : args[2].str, print_msg_success_gw, ev);
} }
void do_send_audio (int arg_num, struct arg args[], struct in_ev *ev) { void do_send_audio (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num >= 2); assert (arg_num >= 2);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_send_document (TLS, FLAG_DOCUMENT_AUDIO, args[0].P->id, args[1].str, 0, arg_num == 2 ? NULL : args[2].str, print_msg_success_gw, ev); tgl_do_send_document (TLS, FLAG_DOCUMENT_AUDIO, args[0].P->id, args[1].str, 0, arg_num == 2 ? NULL : args[2].str, print_msg_success_gw, ev);
} }
void do_send_video (int arg_num, struct arg args[], struct in_ev *ev) { void do_send_video (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num >= 2); assert (arg_num >= 2);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_send_document (TLS, FLAG_DOCUMENT_VIDEO, args[0].P->id, args[1].str, 0, arg_num == 2 ? NULL : args[2].str, print_msg_success_gw, ev); tgl_do_send_document (TLS, FLAG_DOCUMENT_VIDEO, args[0].P->id, args[1].str, 0, arg_num == 2 ? NULL : args[2].str, print_msg_success_gw, ev);
} }
void do_send_document (int arg_num, struct arg args[], struct in_ev *ev) { void do_send_document (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num >= 2); assert (arg_num >= 2);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_send_document (TLS, 0, args[0].P->id, args[1].str, 0, arg_num == 2 ? NULL : args[2].str, print_msg_success_gw, ev); tgl_do_send_document (TLS, 0, args[0].P->id, args[1].str, 0, arg_num == 2 ? NULL : args[2].str, print_msg_success_gw, ev);
} }
void do_reply_photo (int arg_num, struct arg args[], struct in_ev *ev) { void do_reply_photo (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num >= 2); assert (arg_num >= 2);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_reply_document (TLS, -1, args[0].num, args[1].str, arg_num == 2 ? NULL : args[2].str, print_msg_success_gw, ev); tgl_do_reply_document (TLS, -1, args[0].num, args[1].str, arg_num == 2 ? NULL : args[2].str, print_msg_success_gw, ev);
} }
void do_reply_file (int arg_num, struct arg args[], struct in_ev *ev) { void do_reply_file (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num >= 2); assert (arg_num >= 2);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_reply_document (TLS, -2, args[0].num, args[1].str, arg_num == 2 ? NULL : args[2].str, print_msg_success_gw, ev); tgl_do_reply_document (TLS, -2, args[0].num, args[1].str, arg_num == 2 ? NULL : args[2].str, print_msg_success_gw, ev);
} }
void do_reply_audio (int arg_num, struct arg args[], struct in_ev *ev) { void do_reply_audio (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num >= 2); assert (arg_num >= 2);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_reply_document (TLS, FLAG_DOCUMENT_AUDIO, args[0].num, args[1].str, arg_num == 2 ? NULL : args[2].str, print_msg_success_gw, ev); tgl_do_reply_document (TLS, FLAG_DOCUMENT_AUDIO, args[0].num, args[1].str, arg_num == 2 ? NULL : args[2].str, print_msg_success_gw, ev);
} }
void do_reply_video (int arg_num, struct arg args[], struct in_ev *ev) { void do_reply_video (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num >= 2); assert (arg_num >= 2);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_reply_document (TLS, FLAG_DOCUMENT_VIDEO, args[0].num, args[1].str, arg_num == 2 ? NULL : args[2].str, print_msg_success_gw, ev); tgl_do_reply_document (TLS, FLAG_DOCUMENT_VIDEO, args[0].num, args[1].str, arg_num == 2 ? NULL : args[2].str, print_msg_success_gw, ev);
} }
void do_reply_document (int arg_num, struct arg args[], struct in_ev *ev) { void do_reply_document (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num >= 2); assert (arg_num >= 2);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_reply_document (TLS, 0, args[0].num, args[1].str, arg_num == 2 ? NULL : args[2].str, print_msg_success_gw, ev); tgl_do_reply_document (TLS, 0, args[0].num, args[1].str, arg_num == 2 ? NULL : args[2].str, print_msg_success_gw, ev);
} }
void do_send_text (int arg_num, struct arg args[], struct in_ev *ev) { void do_send_text (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 2); assert (arg_num == 2);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_send_text (TLS, args[0].P->id, args[1].str, print_msg_success_gw, ev); tgl_do_send_text (TLS, args[0].P->id, args[1].str, print_msg_success_gw, ev);
} }
void do_chat_info (int arg_num, struct arg args[], struct in_ev *ev) { void do_chat_info (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 1); assert (arg_num == 1);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_get_chat_info (TLS, args[0].P->id, offline_mode, print_chat_info_gw, ev); tgl_do_get_chat_info (TLS, args[0].P->id, offline_mode, print_chat_info_gw, ev);
} }
void do_user_info (int arg_num, struct arg args[], struct in_ev *ev) { void do_user_info (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 1); assert (arg_num == 1);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_get_user_info (TLS, args[0].P->id, offline_mode, print_user_info_gw, ev); tgl_do_get_user_info (TLS, args[0].P->id, offline_mode, print_user_info_gw, ev);
} }
void do_fwd (int arg_num, struct arg args[], struct in_ev *ev) { void do_fwd (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num >= 2); assert (arg_num >= 2);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
assert (arg_num <= 1000); assert (arg_num <= 1000);
...@@ -740,56 +741,56 @@ void do_fwd (int arg_num, struct arg args[], struct in_ev *ev) { ...@@ -740,56 +741,56 @@ void do_fwd (int arg_num, struct arg args[], struct in_ev *ev) {
} }
void do_fwd_media (int arg_num, struct arg args[], struct in_ev *ev) { void do_fwd_media (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 2); assert (arg_num == 2);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_forward_message (TLS, args[0].P->id, args[1].num, print_msg_success_gw, ev); tgl_do_forward_message (TLS, args[0].P->id, args[1].num, print_msg_success_gw, ev);
} }
void do_get_message (int arg_num, struct arg args[], struct in_ev *ev) { void do_get_message (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 1); assert (arg_num == 1);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_get_message (TLS, args[0].num, print_msg_gw, ev); tgl_do_get_message (TLS, args[0].num, print_msg_gw, ev);
} }
void do_msg (int arg_num, struct arg args[], struct in_ev *ev) { void do_msg (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 2); assert (arg_num == 2);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_send_message (TLS, args[0].P->id, args[1].str, strlen (args[1].str), print_msg_success_gw, ev); tgl_do_send_message (TLS, args[0].P->id, args[1].str, strlen (args[1].str), print_msg_success_gw, ev);
} }
void do_reply (int arg_num, struct arg args[], struct in_ev *ev) { void do_reply (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 2); assert (arg_num == 2);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_send_message_reply (TLS, args[0].num, args[1].str, strlen (args[1].str), print_msg_success_gw, ev); tgl_do_send_message_reply (TLS, args[0].num, args[1].str, strlen (args[1].str), print_msg_success_gw, ev);
} }
void do_send_typing (int arg_num, struct arg args[], struct in_ev *ev) { void do_send_typing (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 1); assert (arg_num == 1);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_send_typing (TLS, args[0].P->id, tgl_typing_typing, print_success_gw, ev); tgl_do_send_typing (TLS, args[0].P->id, tgl_typing_typing, print_success_gw, ev);
} }
void do_send_typing_abort (int arg_num, struct arg args[], struct in_ev *ev) { void do_send_typing_abort (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 1); assert (arg_num == 1);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_send_typing (TLS, args[0].P->id, tgl_typing_cancel, print_success_gw, ev); tgl_do_send_typing (TLS, args[0].P->id, tgl_typing_cancel, print_success_gw, ev);
} }
void do_rename_chat (int arg_num, struct arg args[], struct in_ev *ev) { void do_rename_chat (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 2); assert (arg_num == 2);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_rename_chat (TLS, args[0].P->id, args[1].str, print_success_gw, ev); tgl_do_rename_chat (TLS, args[0].P->id, args[1].str, print_success_gw, ev);
} }
void do_import_chat_link (int arg_num, struct arg args[], struct in_ev *ev) { void do_import_chat_link (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 1); assert (arg_num == 1);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_import_chat_link (TLS, args[0].str, strlen (args[0].str), print_success_gw, ev); tgl_do_import_chat_link (TLS, args[0].str, strlen (args[0].str), print_success_gw, ev);
} }
#define DO_LOAD_PHOTO(tp,act,actf) \ #define DO_LOAD_PHOTO(tp,act,actf) \
void do_ ## act ## _ ## tp (int arg_num, struct arg args[], struct in_ev *ev) { \ void do_ ## act ## _ ## tp (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) { \
assert (arg_num == 1);\ assert (arg_num == 1);\
struct tgl_message *M = tgl_message_get (TLS, args[0].num);\ struct tgl_message *M = tgl_message_get (TLS, args[0].num);\
if (M && !(M->flags & TGLMF_SERVICE)) {\ if (M && !(M->flags & TGLMF_SERVICE)) {\
...@@ -810,7 +811,7 @@ void do_ ## act ## _ ## tp (int arg_num, struct arg args[], struct in_ev *ev) { ...@@ -810,7 +811,7 @@ void do_ ## act ## _ ## tp (int arg_num, struct arg args[], struct in_ev *ev) {
} }
#define DO_LOAD_PHOTO_THUMB(tp,act,actf) \ #define DO_LOAD_PHOTO_THUMB(tp,act,actf) \
void do_ ## act ## _ ## tp ## _thumb (int arg_num, struct arg args[], struct in_ev *ev) { \ void do_ ## act ## _ ## tp ## _thumb (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) { \
assert (arg_num == 1);\ assert (arg_num == 1);\
struct tgl_message *M = tgl_message_get (TLS, args[0].num);\ struct tgl_message *M = tgl_message_get (TLS, args[0].num);\
if (M && !(M->flags & TGLMF_SERVICE)) {\ if (M && !(M->flags & TGLMF_SERVICE)) {\
...@@ -838,19 +839,19 @@ DO_LOAD_PHOTO_THUMB(document, open, open_filename_gw) ...@@ -838,19 +839,19 @@ DO_LOAD_PHOTO_THUMB(document, open, open_filename_gw)
DO_LOAD_PHOTO_THUMB(file, open, open_filename_gw) DO_LOAD_PHOTO_THUMB(file, open, open_filename_gw)
DO_LOAD_PHOTO(any, open, open_filename_gw) DO_LOAD_PHOTO(any, open, open_filename_gw)
void do_add_contact (int arg_num, struct arg args[], struct in_ev *ev) { void do_add_contact (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 3); assert (arg_num == 3);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_add_contact (TLS, args[0].str, strlen (args[0].str), args[1].str, strlen (args[1].str), args[2].str, strlen (args[2].str), 0, print_user_list_gw, ev); tgl_do_add_contact (TLS, args[0].str, strlen (args[0].str), args[1].str, strlen (args[1].str), args[2].str, strlen (args[2].str), 0, print_user_list_gw, ev);
} }
void do_del_contact (int arg_num, struct arg args[], struct in_ev *ev) { void do_del_contact (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 1); assert (arg_num == 1);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_del_contact (TLS, args[0].P->id, print_success_gw, ev); tgl_do_del_contact (TLS, args[0].P->id, print_success_gw, ev);
} }
void do_rename_contact (int arg_num, struct arg args[], struct in_ev *ev) { void do_rename_contact (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 3); assert (arg_num == 3);
if (args[0].P->user.phone) { if (args[0].P->user.phone) {
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
...@@ -861,7 +862,7 @@ void do_rename_contact (int arg_num, struct arg args[], struct in_ev *ev) { ...@@ -861,7 +862,7 @@ void do_rename_contact (int arg_num, struct arg args[], struct in_ev *ev) {
} }
} }
void do_show_license (int arg_num, struct arg args[], struct in_ev *ev) { void do_show_license (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (!arg_num); assert (!arg_num);
static char *b = static char *b =
#include "LICENSE.h" #include "LICENSE.h"
...@@ -871,7 +872,7 @@ void do_show_license (int arg_num, struct arg args[], struct in_ev *ev) { ...@@ -871,7 +872,7 @@ void do_show_license (int arg_num, struct arg args[], struct in_ev *ev) {
if (ev) { mprint_end (ev); } if (ev) { mprint_end (ev); }
} }
void do_search (int arg_num, struct arg args[], struct in_ev *ev) { void do_search (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 6); assert (arg_num == 6);
tgl_peer_id_t id; tgl_peer_id_t id;
if (args[0].P) { if (args[0].P) {
...@@ -907,13 +908,13 @@ void do_search (int arg_num, struct arg args[], struct in_ev *ev) { ...@@ -907,13 +908,13 @@ void do_search (int arg_num, struct arg args[], struct in_ev *ev) {
tgl_do_msg_search (TLS, id, from, to, limit, offset, args[5].str, print_msg_list_gw, ev); tgl_do_msg_search (TLS, id, from, to, limit, offset, args[5].str, print_msg_list_gw, ev);
} }
void do_mark_read (int arg_num, struct arg args[], struct in_ev *ev) { void do_mark_read (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 1); assert (arg_num == 1);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_mark_read (TLS, args[0].P->id, print_success_gw, ev); tgl_do_mark_read (TLS, args[0].P->id, print_success_gw, ev);
} }
void do_visualize_key (int arg_num, struct arg args[], struct in_ev *ev) { void do_visualize_key (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 1); assert (arg_num == 1);
static char *colors[4] = {COLOR_GREY, COLOR_CYAN, COLOR_BLUE, COLOR_GREEN}; static char *colors[4] = {COLOR_GREY, COLOR_CYAN, COLOR_BLUE, COLOR_GREEN};
static unsigned char buf[16]; static unsigned char buf[16];
...@@ -961,13 +962,13 @@ void do_visualize_key (int arg_num, struct arg args[], struct in_ev *ev) { ...@@ -961,13 +962,13 @@ void do_visualize_key (int arg_num, struct arg args[], struct in_ev *ev) {
mprint_end (ev); mprint_end (ev);
} }
void do_create_secret_chat (int arg_num, struct arg args[], struct in_ev *ev) { void do_create_secret_chat (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 1); assert (arg_num == 1);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_create_secret_chat (TLS, args[0].P->id, print_secret_chat_gw, ev); tgl_do_create_secret_chat (TLS, args[0].P->id, print_secret_chat_gw, ev);
} }
void do_secret_chat_rekey (int arg_num, struct arg args[], struct in_ev *ev) { void do_secret_chat_rekey (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 1); assert (arg_num == 1);
tgl_peer_t *P = args[0].P; tgl_peer_t *P = args[0].P;
if (P->encr_chat.state == sc_ok) { if (P->encr_chat.state == sc_ok) {
...@@ -976,45 +977,45 @@ void do_secret_chat_rekey (int arg_num, struct arg args[], struct in_ev *ev) { ...@@ -976,45 +977,45 @@ void do_secret_chat_rekey (int arg_num, struct arg args[], struct in_ev *ev) {
} }
} }
void do_chat_add_user (int arg_num, struct arg args[], struct in_ev *ev) { void do_chat_add_user (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 3); assert (arg_num == 3);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_add_user_to_chat (TLS, args[0].P->id, args[1].P->id, args[2].num != NOT_FOUND ? args[2].num : 100, print_success_gw, ev); tgl_do_add_user_to_chat (TLS, args[0].P->id, args[1].P->id, args[2].num != NOT_FOUND ? args[2].num : 100, print_success_gw, ev);
} }
void do_chat_del_user (int arg_num, struct arg args[], struct in_ev *ev) { void do_chat_del_user (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 2); assert (arg_num == 2);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_del_user_from_chat (TLS, args[0].P->id, args[1].P->id, print_success_gw, ev); tgl_do_del_user_from_chat (TLS, args[0].P->id, args[1].P->id, print_success_gw, ev);
} }
void do_status_online (int arg_num, struct arg args[], struct in_ev *ev) { void do_status_online (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (!arg_num); assert (!arg_num);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_update_status (TLS, 1, print_success_gw, ev); tgl_do_update_status (TLS, 1, print_success_gw, ev);
} }
void do_status_offline (int arg_num, struct arg args[], struct in_ev *ev) { void do_status_offline (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (!arg_num); assert (!arg_num);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_update_status (TLS, 0, print_success_gw, ev); tgl_do_update_status (TLS, 0, print_success_gw, ev);
} }
void do_quit (int arg_num, struct arg args[], struct in_ev *ev) { void do_quit (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
if (daemonize) { if (daemonize) {
event_incoming (ev->bev, BEV_EVENT_EOF, ev); event_incoming (ev->bev, BEV_EVENT_EOF, ev);
} }
do_halt (0); do_halt (0);
} }
void do_safe_quit (int arg_num, struct arg args[], struct in_ev *ev) { void do_safe_quit (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
if (daemonize) { if (daemonize) {
event_incoming (ev->bev, BEV_EVENT_EOF, ev); event_incoming (ev->bev, BEV_EVENT_EOF, ev);
} }
safe_quit = 1; safe_quit = 1;
} }
void do_set (int arg_num, struct arg args[], struct in_ev *ev) { void do_set (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
int num = args[1].num; int num = args[1].num;
if (!strcmp (args[0].str, "debug_verbosity")) { if (!strcmp (args[0].str, "debug_verbosity")) {
tgl_set_verbosity (TLS, num); tgl_set_verbosity (TLS, num);
...@@ -1027,24 +1028,24 @@ void do_set (int arg_num, struct arg args[], struct in_ev *ev) { ...@@ -1027,24 +1028,24 @@ void do_set (int arg_num, struct arg args[], struct in_ev *ev) {
} }
} }
void do_chat_with_peer (int arg_num, struct arg args[], struct in_ev *ev) { void do_chat_with_peer (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
if (!ev) { if (!ev) {
in_chat_mode = 1; in_chat_mode = 1;
chat_mode_id = args[0].P->id; chat_mode_id = args[0].P->id;
} }
} }
void do_delete_msg (int arg_num, struct arg args[], struct in_ev *ev) { void do_delete_msg (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_delete_msg (TLS, args[0].num, print_success_gw, ev); tgl_do_delete_msg (TLS, args[0].num, print_success_gw, ev);
} }
//void do_restore_msg (int arg_num, struct arg args[], struct in_ev *ev) { //void do_restore_msg (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
// if (ev) { ev->refcnt ++; } // if (ev) { ev->refcnt ++; }
// tgl_do_restore_msg (TLS, args[0].num, print_success_gw, ev); // tgl_do_restore_msg (TLS, args[0].num, print_success_gw, ev);
//} //}
void do_create_group_chat (int arg_num, struct arg args[], struct in_ev *ev) { void do_create_group_chat (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num >= 1 && arg_num <= 1000); assert (arg_num >= 1 && arg_num <= 1000);
static tgl_peer_id_t ids[1000]; static tgl_peer_id_t ids[1000];
int i; int i;
...@@ -1056,55 +1057,55 @@ void do_create_group_chat (int arg_num, struct arg args[], struct in_ev *ev) { ...@@ -1056,55 +1057,55 @@ void do_create_group_chat (int arg_num, struct arg args[], struct in_ev *ev) {
tgl_do_create_group_chat_ex (TLS, arg_num - 1, ids, args[0].str, print_success_gw, ev); tgl_do_create_group_chat_ex (TLS, arg_num - 1, ids, args[0].str, print_success_gw, ev);
} }
void do_chat_set_photo (int arg_num, struct arg args[], struct in_ev *ev) { void do_chat_set_photo (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 2); assert (arg_num == 2);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_set_chat_photo (TLS, args[0].P->id, args[1].str, print_success_gw, ev); tgl_do_set_chat_photo (TLS, args[0].P->id, args[1].str, print_success_gw, ev);
} }
void do_set_profile_photo (int arg_num, struct arg args[], struct in_ev *ev) { void do_set_profile_photo (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 1); assert (arg_num == 1);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_set_profile_photo (TLS, args[0].str, print_success_gw, ev); tgl_do_set_profile_photo (TLS, args[0].str, print_success_gw, ev);
} }
void do_set_profile_name (int arg_num, struct arg args[], struct in_ev *ev) { void do_set_profile_name (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 2); assert (arg_num == 2);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_set_profile_name (TLS, args[0].str, args[1].str, print_user_gw, ev); tgl_do_set_profile_name (TLS, args[0].str, args[1].str, print_user_gw, ev);
} }
void do_set_username (int arg_num, struct arg args[], struct in_ev *ev) { void do_set_username (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 1); assert (arg_num == 1);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_set_username (TLS, args[0].str, print_user_gw, ev); tgl_do_set_username (TLS, args[0].str, print_user_gw, ev);
} }
void do_load_user_photo (int arg_num, struct arg args[], struct in_ev *ev) { void do_load_user_photo (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 1); assert (arg_num == 1);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_load_file_location (TLS, &args[0].P->user.photo_big, print_filename_gw, ev); tgl_do_load_file_location (TLS, &args[0].P->user.photo_big, print_filename_gw, ev);
} }
void do_view_user_photo (int arg_num, struct arg args[], struct in_ev *ev) { void do_view_user_photo (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 1); assert (arg_num == 1);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_load_file_location (TLS, &args[0].P->user.photo_big, open_filename_gw, ev); tgl_do_load_file_location (TLS, &args[0].P->user.photo_big, open_filename_gw, ev);
} }
void do_contact_search (int arg_num, struct arg args[], struct in_ev *ev) { void do_contact_search (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 2); assert (arg_num == 2);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_contact_search (TLS, args[0].str, args[1].num == NOT_FOUND ? args[1].num : 10, print_user_list_gw, ev); tgl_do_contact_search (TLS, args[0].str, args[1].num == NOT_FOUND ? args[1].num : 10, print_user_list_gw, ev);
} }
void do_accept_secret_chat (int arg_num, struct arg args[], struct in_ev *ev) { void do_accept_secret_chat (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 1); assert (arg_num == 1);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_accept_encr_chat_request (TLS, &args[0].P->encr_chat, print_encr_chat_success_gw, ev); tgl_do_accept_encr_chat_request (TLS, &args[0].P->encr_chat, print_encr_chat_success_gw, ev);
} }
void do_set_ttl (int arg_num, struct arg args[], struct in_ev *ev) { void do_set_ttl (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 2); assert (arg_num == 2);
if (args[0].P->encr_chat.state == sc_ok) { if (args[0].P->encr_chat.state == sc_ok) {
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
...@@ -1115,19 +1116,19 @@ void do_set_ttl (int arg_num, struct arg args[], struct in_ev *ev) { ...@@ -1115,19 +1116,19 @@ void do_set_ttl (int arg_num, struct arg args[], struct in_ev *ev) {
} }
} }
void do_export_card (int arg_num, struct arg args[], struct in_ev *ev) { void do_export_card (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (!arg_num); assert (!arg_num);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_export_card (TLS, print_card_gw, ev); tgl_do_export_card (TLS, print_card_gw, ev);
} }
void do_export_chat_link (int arg_num, struct arg args[], struct in_ev *ev) { void do_export_chat_link (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 1); assert (arg_num == 1);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_export_chat_link (TLS, args[0].P->id, print_string_gw, ev); tgl_do_export_chat_link (TLS, args[0].P->id, print_string_gw, ev);
} }
void do_import_card (int arg_num, struct arg args[], struct in_ev *ev) { void do_import_card (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 1); assert (arg_num == 1);
char *s = args[0].str; char *s = args[0].str;
int l = strlen (s); int l = strlen (s);
...@@ -1159,19 +1160,19 @@ void do_import_card (int arg_num, struct arg args[], struct in_ev *ev) { ...@@ -1159,19 +1160,19 @@ void do_import_card (int arg_num, struct arg args[], struct in_ev *ev) {
} }
} }
void do_send_contact (int arg_num, struct arg args[], struct in_ev *ev) { void do_send_contact (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 4); assert (arg_num == 4);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_send_contact (TLS, args[0].P->id, args[1].str, strlen (args[1].str), args[2].str, strlen (args[2].str), args[3].str, strlen (args[3].str), print_msg_success_gw, ev); tgl_do_send_contact (TLS, args[0].P->id, args[1].str, strlen (args[1].str), args[2].str, strlen (args[2].str), args[3].str, strlen (args[3].str), print_msg_success_gw, ev);
} }
void do_reply_contact (int arg_num, struct arg args[], struct in_ev *ev) { void do_reply_contact (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 4); assert (arg_num == 4);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_reply_contact (TLS, args[0].num, args[1].str, strlen (args[1].str), args[2].str, strlen (args[2].str), args[3].str, strlen (args[3].str), print_msg_success_gw, ev); tgl_do_reply_contact (TLS, args[0].num, args[1].str, strlen (args[1].str), args[2].str, strlen (args[2].str), args[3].str, strlen (args[3].str), print_msg_success_gw, ev);
} }
void do_main_session (int arg_num, struct arg args[], struct in_ev *ev) { void do_main_session (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
if (notify_ev && !--notify_ev->refcnt) { if (notify_ev && !--notify_ev->refcnt) {
free (notify_ev); free (notify_ev);
} }
...@@ -1179,7 +1180,7 @@ void do_main_session (int arg_num, struct arg args[], struct in_ev *ev) { ...@@ -1179,7 +1180,7 @@ void do_main_session (int arg_num, struct arg args[], struct in_ev *ev) {
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
} }
void do_broadcast (int arg_num, struct arg args[], struct in_ev *ev) { void do_broadcast (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
vlogprintf (E_ERROR, "arg_num = %d\n", arg_num); vlogprintf (E_ERROR, "arg_num = %d\n", arg_num);
assert (arg_num >= 1 && arg_num <= 1000); assert (arg_num >= 1 && arg_num <= 1000);
static tgl_peer_id_t ids[1000]; static tgl_peer_id_t ids[1000];
...@@ -1191,7 +1192,7 @@ void do_broadcast (int arg_num, struct arg args[], struct in_ev *ev) { ...@@ -1191,7 +1192,7 @@ void do_broadcast (int arg_num, struct arg args[], struct in_ev *ev) {
tgl_do_send_broadcast (TLS, arg_num - 1, ids, args[arg_num - 1].str, strlen (args[arg_num - 1].str), print_msg_list_success_gw, ev); tgl_do_send_broadcast (TLS, arg_num - 1, ids, args[arg_num - 1].str, strlen (args[arg_num - 1].str), print_msg_list_success_gw, ev);
} }
void do_set_password (int arg_num, struct arg args[], struct in_ev *ev) { void do_set_password (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 1); assert (arg_num == 1);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_set_password (TLS, args[0].str ? args[0].str : "empty", print_success_gw, ev); tgl_do_set_password (TLS, args[0].str ? args[0].str : "empty", print_success_gw, ev);
...@@ -1209,7 +1210,7 @@ extern char *binlog_file_name; ...@@ -1209,7 +1210,7 @@ extern char *binlog_file_name;
extern char *lua_file; extern char *lua_file;
extern struct event *term_ev; extern struct event *term_ev;
void do_clear (int arg_num, struct arg args[], struct in_ev *ev) { void do_clear (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
logprintf ("Do_clear\n"); logprintf ("Do_clear\n");
free (default_username); free (default_username);
free (config_filename); free (config_filename);
...@@ -1229,110 +1230,118 @@ void do_clear (int arg_num, struct arg args[], struct in_ev *ev) { ...@@ -1229,110 +1230,118 @@ void do_clear (int arg_num, struct arg args[], struct in_ev *ev) {
do_halt (0); do_halt (0);
} }
void do_send_location (int arg_num, struct arg args[], struct in_ev *ev) { void do_send_location (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 3); assert (arg_num == 3);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_send_location (TLS, args[0].P->id, args[1].dval, args[2].dval, print_msg_success_gw, ev); tgl_do_send_location (TLS, args[0].P->id, args[1].dval, args[2].dval, print_msg_success_gw, ev);
} }
void do_reply_location (int arg_num, struct arg args[], struct in_ev *ev) { void do_reply_location (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
assert (arg_num == 3); assert (arg_num == 3);
if (ev) { ev->refcnt ++; } if (ev) { ev->refcnt ++; }
tgl_do_reply_location (TLS, args[0].num, args[1].dval, args[2].dval, print_msg_success_gw, ev); tgl_do_reply_location (TLS, args[0].num, args[1].dval, args[2].dval, print_msg_success_gw, ev);
} }
struct command commands[] = { #define MAX_COMMANDS_SIZE 1000
{"accept_secret_chat", {ca_secret_chat, ca_none}, do_accept_secret_chat, "accept_secret_chat <secret chat>\tAccepts secret chat. Only useful with -E option"}, struct command commands[MAX_COMMANDS_SIZE] = {
{"add_contact", {ca_string, ca_string, ca_string, ca_none}, do_add_contact, "add_contact <phone> <first name> <last name>\tTries to add user to contact list"}, {"accept_secret_chat", {ca_secret_chat, ca_none}, do_accept_secret_chat, "accept_secret_chat <secret chat>\tAccepts secret chat. Only useful with -E option", NULL},
{"broadcast", {ca_user, ca_period, ca_string_end, ca_none}, do_broadcast, "broadcast <user>+ <text>\tSends text to several users at once"}, {"add_contact", {ca_string, ca_string, ca_string, ca_none}, do_add_contact, "add_contact <phone> <first name> <last name>\tTries to add user to contact list", NULL},
{"chat_add_user", {ca_chat, ca_user, ca_number | ca_optional, ca_none}, do_chat_add_user, "chat_add_user <chat> <user> [msgs-to-forward]\tAdds user to chat. Sends him last msgs-to-forward message from this chat. Default 100"}, {"broadcast", {ca_user, ca_period, ca_string_end, ca_none}, do_broadcast, "broadcast <user>+ <text>\tSends text to several users at once", NULL},
{"chat_del_user", {ca_chat, ca_user, ca_none}, do_chat_del_user, "chat_del_user <chat> <user>\tDeletes user from chat"}, {"chat_add_user", {ca_chat, ca_user, ca_number | ca_optional, ca_none}, do_chat_add_user, "chat_add_user <chat> <user> [msgs-to-forward]\tAdds user to chat. Sends him last msgs-to-forward message from this chat. Default 100", NULL},
{"chat_info", {ca_chat, ca_none}, do_chat_info, "chat_info <chat>\tPrints info about chat (id, members, admin, etc.)"}, {"chat_del_user", {ca_chat, ca_user, ca_none}, do_chat_del_user, "chat_del_user <chat> <user>\tDeletes user from chat", NULL},
{"chat_set_photo", {ca_chat, ca_file_name_end, ca_none}, do_chat_set_photo, "chat_set_photo <chat> <filename>\tSets chat photo. Photo will be cropped to square"}, {"chat_info", {ca_chat, ca_none}, do_chat_info, "chat_info <chat>\tPrints info about chat (id, members, admin, etc.)", NULL},
{"chat_with_peer", {ca_peer, ca_none}, do_chat_with_peer, "chat_with_peer <peer>\tInterface option. All input will be treated as messages to this peer. Type /quit to end this mode"}, {"chat_set_photo", {ca_chat, ca_file_name_end, ca_none}, do_chat_set_photo, "chat_set_photo <chat> <filename>\tSets chat photo. Photo will be cropped to square", NULL},
{"clear", {ca_none}, do_clear, "clear\tClears all data and exits. For debug."}, {"chat_with_peer", {ca_peer, ca_none}, do_chat_with_peer, "chat_with_peer <peer>\tInterface option. All input will be treated as messages to this peer. Type /quit to end this mode", NULL},
{"contact_list", {ca_none}, do_contact_list, "contact_list\tPrints contact list"}, {"clear", {ca_none}, do_clear, "clear\tClears all data and exits. For debug.", NULL},
{"contact_search", {ca_string, ca_number | ca_optional, ca_none}, do_contact_search, "contact_search username [limit]\tSearches contacts by username"}, {"contact_list", {ca_none}, do_contact_list, "contact_list\tPrints contact list", NULL},
{"create_group_chat", {ca_string, ca_user, ca_period, ca_none}, do_create_group_chat, "create_group_chat <name> <user>+\tCreates group chat with users"}, {"contact_search", {ca_string, ca_number | ca_optional, ca_none}, do_contact_search, "contact_search username [limit]\tSearches contacts by username", NULL},
{"create_secret_chat", {ca_user, ca_none}, do_create_secret_chat, "create_secret_chat <user>\tStarts creation of secret chat"}, {"create_group_chat", {ca_string, ca_user, ca_period, ca_none}, do_create_group_chat, "create_group_chat <name> <user>+\tCreates group chat with users", NULL},
{"del_contact", {ca_user, ca_none}, do_del_contact, "del_contact <user>\tDeletes contact from contact list"}, {"create_secret_chat", {ca_user, ca_none}, do_create_secret_chat, "create_secret_chat <user>\tStarts creation of secret chat", NULL},
{"delete_msg", {ca_number, ca_none}, do_delete_msg, "delete_msg <msg-id>\tDeletes message"}, {"del_contact", {ca_user, ca_none}, do_del_contact, "del_contact <user>\tDeletes contact from contact list", NULL},
{"dialog_list", {ca_number | ca_optional, ca_number | ca_optional, ca_none}, do_dialog_list, "dialog_list [limit=100] [offset=0]\tList of last conversations"}, {"delete_msg", {ca_number, ca_none}, do_delete_msg, "delete_msg <msg-id>\tDeletes message", NULL},
{"export_card", {ca_none}, do_export_card, "export_card\tPrints card that can be imported by another user with import_card method"}, {"dialog_list", {ca_number | ca_optional, ca_number | ca_optional, ca_none}, do_dialog_list, "dialog_list [limit=100] [offset=0]\tList of last conversations", NULL},
{"export_chat_link", {ca_chat, ca_none}, do_export_chat_link, "export_chat_link\tPrints chat link that can be used to join to chat"}, {"export_card", {ca_none}, do_export_card, "export_card\tPrints card that can be imported by another user with import_card method", NULL},
{"fwd", {ca_peer, ca_number, ca_period, ca_none}, do_fwd, "fwd <peer> <msg-id>+\tForwards message to peer. Forward to secret chats is forbidden"}, {"export_chat_link", {ca_chat, ca_none}, do_export_chat_link, "export_chat_link\tPrints chat link that can be used to join to chat", NULL},
{"fwd_media", {ca_peer, ca_number, ca_none}, do_fwd_media, "fwd <peer> <msg-id>\tForwards message media to peer. Forward to secret chats is forbidden. Result slightly differs from fwd"}, {"fwd", {ca_peer, ca_number, ca_period, ca_none}, do_fwd, "fwd <peer> <msg-id>+\tForwards message to peer. Forward to secret chats is forbidden", NULL},
{"get_message", {ca_number, ca_none}, do_get_message, "get_message <msg-id>\tGet message by id"}, {"fwd_media", {ca_peer, ca_number, ca_none}, do_fwd_media, "fwd <peer> <msg-id>\tForwards message media to peer. Forward to secret chats is forbidden. Result slightly differs from fwd", NULL},
{"help", {ca_none}, do_help, "help\tPrints this help"}, {"get_message", {ca_number, ca_none}, do_get_message, "get_message <msg-id>\tGet message by id", NULL},
{"history", {ca_peer, ca_number | ca_optional, ca_number | ca_optional, ca_none}, do_history, "history <peer> [limit] [offset]\tPrints messages with this peer (most recent message lower). Also marks messages as read"}, {"help", {ca_none}, do_help, "help\tPrints this help", NULL},
{"import_card", {ca_string, ca_none}, do_import_card, "import_card <card>\tGets user by card and prints it name. You can then send messages to him as usual"}, {"history", {ca_peer, ca_number | ca_optional, ca_number | ca_optional, ca_none}, do_history, "history <peer> [limit] [offset]\tPrints messages with this peer (most recent message lower). Also marks messages as read", NULL},
{"import_chat_link", {ca_string, ca_none}, do_import_chat_link, "impoty_chat_link <hash>\tJoins to chat by link"}, {"import_card", {ca_string, ca_none}, do_import_card, "import_card <card>\tGets user by card and prints it name. You can then send messages to him as usual", NULL},
{"load_audio", {ca_number, ca_none}, do_load_audio, "load_audio <msg-id>\tDownloads file to downloads dirs. Prints file name after download end"}, {"import_chat_link", {ca_string, ca_none}, do_import_chat_link, "impoty_chat_link <hash>\tJoins to chat by link", NULL},
{"load_chat_photo", {ca_chat, ca_none}, do_load_user_photo, "load_chat_photo <chat>\tDownloads file to downloads dirs. Prints file name after download end"}, {"load_audio", {ca_number, ca_none}, do_load_audio, "load_audio <msg-id>\tDownloads file to downloads dirs. Prints file name after download end", NULL},
{"load_document", {ca_number, ca_none}, do_load_document, "load_document <msg-id>\tDownloads file to downloads dirs. Prints file name after download end"}, {"load_chat_photo", {ca_chat, ca_none}, do_load_user_photo, "load_chat_photo <chat>\tDownloads file to downloads dirs. Prints file name after download end", NULL},
{"load_document_thumb", {ca_number, ca_none}, do_load_document_thumb, "load_document_thumb <msg-id>\tDownloads file to downloads dirs. Prints file name after download end"}, {"load_document", {ca_number, ca_none}, do_load_document, "load_document <msg-id>\tDownloads file to downloads dirs. Prints file name after download end", NULL},
{"load_file", {ca_number, ca_none}, do_load_file, "load_file <msg-id>\tDownloads file to downloads dirs. Prints file name after download end"}, {"load_document_thumb", {ca_number, ca_none}, do_load_document_thumb, "load_document_thumb <msg-id>\tDownloads file to downloads dirs. Prints file name after download end", NULL},
{"load_file_thumb", {ca_number, ca_none}, do_load_file_thumb, "load_file_thumb <msg-id>\tDownloads file to downloads dirs. Prints file name after download end"}, {"load_file", {ca_number, ca_none}, do_load_file, "load_file <msg-id>\tDownloads file to downloads dirs. Prints file name after download end", NULL},
{"load_photo", {ca_number, ca_none}, do_load_photo, "load_photo <msg-id>\tDownloads file to downloads dirs. Prints file name after download end"}, {"load_file_thumb", {ca_number, ca_none}, do_load_file_thumb, "load_file_thumb <msg-id>\tDownloads file to downloads dirs. Prints file name after download end", NULL},
{"load_user_photo", {ca_user, ca_none}, do_load_user_photo, "load_user_photo <user>\tDownloads file to downloads dirs. Prints file name after download end"}, {"load_photo", {ca_number, ca_none}, do_load_photo, "load_photo <msg-id>\tDownloads file to downloads dirs. Prints file name after download end", NULL},
{"load_video", {ca_number, ca_none}, do_load_video, "load_video <msg-id>\tDownloads file to downloads dirs. Prints file name after download end"}, {"load_user_photo", {ca_user, ca_none}, do_load_user_photo, "load_user_photo <user>\tDownloads file to downloads dirs. Prints file name after download end", NULL},
{"load_video_thumb", {ca_number, ca_none}, do_load_video_thumb, "load_video_thumb <msg-id>\tDownloads file to downloads dirs. Prints file name after download end"}, {"load_video", {ca_number, ca_none}, do_load_video, "load_video <msg-id>\tDownloads file to downloads dirs. Prints file name after download end", NULL},
{"main_session", {ca_none}, do_main_session, "main_session\tSends updates to this connection (or terminal). Useful only with listening socket"}, {"load_video_thumb", {ca_number, ca_none}, do_load_video_thumb, "load_video_thumb <msg-id>\tDownloads file to downloads dirs. Prints file name after download end", NULL},
{"mark_read", {ca_peer, ca_none}, do_mark_read, "mark_read <peer>\tMarks messages with peer as read"}, {"main_session", {ca_none}, do_main_session, "main_session\tSends updates to this connection (or terminal). Useful only with listening socket", NULL},
{"msg", {ca_peer, ca_string_end, ca_none}, do_msg, "msg <peer> <text>\tSends text message to peer"}, {"mark_read", {ca_peer, ca_none}, do_mark_read, "mark_read <peer>\tMarks messages with peer as read", NULL},
{"quit", {ca_none}, do_quit, "quit\tQuits immediately"}, {"msg", {ca_peer, ca_string_end, ca_none}, do_msg, "msg <peer> <text>\tSends text message to peer", NULL},
{"rename_chat", {ca_chat, ca_string_end, ca_none}, do_rename_chat, "rename_chat <chat> <new name>\tRenames chat"}, {"quit", {ca_none}, do_quit, "quit\tQuits immediately", NULL},
{"rename_contact", {ca_user, ca_string, ca_string, ca_none}, do_rename_contact, "rename_contact <user> <first name> <last name>\tRenames contact"}, {"rename_chat", {ca_chat, ca_string_end, ca_none}, do_rename_chat, "rename_chat <chat> <new name>\tRenames chat", NULL},
{"reply", {ca_number, ca_string_end, ca_none}, do_reply, "msg <msg-id> <text>\tSends text reply to message"}, {"rename_contact", {ca_user, ca_string, ca_string, ca_none}, do_rename_contact, "rename_contact <user> <first name> <last name>\tRenames contact", NULL},
{"reply_audio", {ca_number, ca_file_name, ca_none}, do_send_audio, "reply_audio <msg-id> <file>\tSends audio to peer"}, {"reply", {ca_number, ca_string_end, ca_none}, do_reply, "msg <msg-id> <text>\tSends text reply to message", NULL},
{"reply_contact", {ca_number, ca_string, ca_string, ca_string, ca_none}, do_reply_contact, "reply_contact <msg-id> <phone> <first-name> <last-name>\tSends contact (not necessary telegram user)"}, {"reply_audio", {ca_number, ca_file_name, ca_none}, do_send_audio, "reply_audio <msg-id> <file>\tSends audio to peer", NULL},
{"reply_document", {ca_number, ca_file_name, ca_none}, do_reply_document, "reply_document <msg-id> <file>\tSends document to peer"}, {"reply_contact", {ca_number, ca_string, ca_string, ca_string, ca_none}, do_reply_contact, "reply_contact <msg-id> <phone> <first-name> <last-name>\tSends contact (not necessary telegram user)", NULL},
{"reply_file", {ca_number, ca_file_name, ca_none}, do_reply_file, "reply_file <msg-id> <file>\tSends document to peer"}, {"reply_document", {ca_number, ca_file_name, ca_none}, do_reply_document, "reply_document <msg-id> <file>\tSends document to peer", NULL},
{"reply_location", {ca_number, ca_double, ca_double, ca_none}, do_reply_location, "reply_location <msg-id> <latitude> <longitude>\tSends geo location"}, {"reply_file", {ca_number, ca_file_name, ca_none}, do_reply_file, "reply_file <msg-id> <file>\tSends document to peer", NULL},
{"reply_photo", {ca_number, ca_file_name, ca_string_end | ca_optional, ca_none}, do_reply_photo, "reply_photo <msg-id> <file> [caption]\tSends photo to peer"}, {"reply_location", {ca_number, ca_double, ca_double, ca_none}, do_reply_location, "reply_location <msg-id> <latitude> <longitude>\tSends geo location", NULL},
//{"reply_text", {ca_number, ca_file_name_end, ca_none}, do_reply_text, "reply_text <msg-id> <file>\tSends contents of text file as plain text message"}, {"reply_photo", {ca_number, ca_file_name, ca_string_end | ca_optional, ca_none}, do_reply_photo, "reply_photo <msg-id> <file> [caption]\tSends photo to peer", NULL},
{"reply_video", {ca_number, ca_file_name, ca_none}, do_reply_video, "reply_video <msg-id> <file>\tSends video to peer"}, //{"reply_text", {ca_number, ca_file_name_end, ca_none}, do_reply_text, "reply_text <msg-id> <file>\tSends contents of text file as plain text message", NULL},
// {"restore_msg", {ca_number, ca_none}, do_restore_msg, "restore_msg <msg-id>\tRestores message. Only available shortly (one hour?) after deletion"}, {"reply_video", {ca_number, ca_file_name, ca_none}, do_reply_video, "reply_video <msg-id> <file>\tSends video to peer", NULL},
{"safe_quit", {ca_none}, do_safe_quit, "safe_quit\tWaits for all queries to end, then quits"}, // {"restore_msg", {ca_number, ca_none}, do_restore_msg, "restore_msg <msg-id>\tRestores message. Only available shortly (one hour?) after deletion", NULL},
{"search", {ca_peer | ca_optional, ca_number | ca_optional, ca_number | ca_optional, ca_number | ca_optional, ca_number | ca_optional, ca_string_end}, do_search, "search [peer] [limit] [from] [to] [offset] pattern\tSearch for pattern in messages from date from to date to (unixtime) in messages with peer (if peer not present, in all messages)"}, {"safe_quit", {ca_none}, do_safe_quit, "safe_quit\tWaits for all queries to end, then quits", NULL},
{"secret_chat_rekey", { ca_secret_chat, ca_none}, do_secret_chat_rekey, "generate new key for active secret chat"}, {"search", {ca_peer | ca_optional, ca_number | ca_optional, ca_number | ca_optional, ca_number | ca_optional, ca_number | ca_optional, ca_string_end}, do_search, "search [peer] [limit] [from] [to] [offset] pattern\tSearch for pattern in messages from date from to date to (unixtime) in messages with peer (if peer not present, in all messages)", NULL},
{"send_audio", {ca_peer, ca_file_name, ca_none}, do_send_audio, "send_audio <peer> <file>\tSends audio to peer"}, {"secret_chat_rekey", { ca_secret_chat, ca_none}, do_secret_chat_rekey, "generate new key for active secret chat", NULL},
{"send_contact", {ca_peer, ca_string, ca_string, ca_string, ca_none}, do_send_contact, "send_contact <peer> <phone> <first-name> <last-name>\tSends contact (not necessary telegram user)"}, {"send_audio", {ca_peer, ca_file_name, ca_none}, do_send_audio, "send_audio <peer> <file>\tSends audio to peer", NULL},
{"send_document", {ca_peer, ca_file_name, ca_none}, do_send_document, "send_document <peer> <file>\tSends document to peer"}, {"send_contact", {ca_peer, ca_string, ca_string, ca_string, ca_none}, do_send_contact, "send_contact <peer> <phone> <first-name> <last-name>\tSends contact (not necessary telegram user)", NULL},
{"send_file", {ca_peer, ca_file_name, ca_none}, do_send_file, "send_file <peer> <file>\tSends document to peer"}, {"send_document", {ca_peer, ca_file_name, ca_none}, do_send_document, "send_document <peer> <file>\tSends document to peer", NULL},
{"send_location", {ca_peer, ca_double, ca_double, ca_none}, do_send_location, "send_location <peer> <latitude> <longitude>\tSends geo location"}, {"send_file", {ca_peer, ca_file_name, ca_none}, do_send_file, "send_file <peer> <file>\tSends document to peer", NULL},
{"send_photo", {ca_peer, ca_file_name, ca_string_end | ca_optional, ca_none}, do_send_photo, "send_photo <peer> <file> [caption]\tSends photo to peer"}, {"send_location", {ca_peer, ca_double, ca_double, ca_none}, do_send_location, "send_location <peer> <latitude> <longitude>\tSends geo location", NULL},
{"send_text", {ca_peer, ca_file_name_end, ca_none}, do_send_text, "send_text <peer> <file>\tSends contents of text file as plain text message"}, {"send_photo", {ca_peer, ca_file_name, ca_string_end | ca_optional, ca_none}, do_send_photo, "send_photo <peer> <file> [caption]\tSends photo to peer", NULL},
{"send_typing", {ca_peer, ca_none}, do_send_typing, "send_typing <peer>\tSends typing notification"}, {"send_text", {ca_peer, ca_file_name_end, ca_none}, do_send_text, "send_text <peer> <file>\tSends contents of text file as plain text message", NULL},
{"send_typing_abort", {ca_peer, ca_none}, do_send_typing_abort, "send_typing <peer>\tSends typing notification abort"}, {"send_typing", {ca_peer, ca_none}, do_send_typing, "send_typing <peer>\tSends typing notification", NULL},
{"send_video", {ca_peer, ca_file_name, ca_string | ca_optional, ca_none}, do_send_video, "send_video <peer> <file> [caption]\tSends video to peer"}, {"send_typing_abort", {ca_peer, ca_none}, do_send_typing_abort, "send_typing <peer>\tSends typing notification abort", NULL},
{"set", {ca_string, ca_number, ca_none}, do_set, "set <param> <value>\tSets value of param. Currently available: log_level, debug_verbosity, alarm, msg_num"}, {"send_video", {ca_peer, ca_file_name, ca_string | ca_optional, ca_none}, do_send_video, "send_video <peer> <file> [caption]\tSends video to peer", NULL},
{"set_password", {ca_string | ca_optional, ca_none}, do_set_password, "set_password <hint>\tSets password"}, {"set", {ca_string, ca_number, ca_none}, do_set, "set <param> <value>\tSets value of param. Currently available: log_level, debug_verbosity, alarm, msg_num", NULL},
{"set_profile_name", {ca_string, ca_string, ca_none}, do_set_profile_name, "set_profile_name <first-name> <last-name>\tSets profile name."}, {"set_password", {ca_string | ca_optional, ca_none}, do_set_password, "set_password <hint>\tSets password", NULL},
{"set_profile_photo", {ca_file_name_end, ca_none}, do_set_profile_photo, "set_profile_photo <filename>\tSets profile photo. Photo will be cropped to square"}, {"set_profile_name", {ca_string, ca_string, ca_none}, do_set_profile_name, "set_profile_name <first-name> <last-name>\tSets profile name.", NULL},
{"set_ttl", {ca_secret_chat, ca_number, ca_none}, do_set_ttl, "set_ttl <secret chat>\tSets secret chat ttl. Client itself ignores ttl"}, {"set_profile_photo", {ca_file_name_end, ca_none}, do_set_profile_photo, "set_profile_photo <filename>\tSets profile photo. Photo will be cropped to square", NULL},
{"set_username", {ca_string, ca_none}, do_set_username, "set_username <name>\tSets username."}, {"set_ttl", {ca_secret_chat, ca_number, ca_none}, do_set_ttl, "set_ttl <secret chat>\tSets secret chat ttl. Client itself ignores ttl", NULL},
{"show_license", {ca_none}, do_show_license, "show_license\tPrints contents of GPL license"}, {"set_username", {ca_string, ca_none}, do_set_username, "set_username <name>\tSets username.", NULL},
{"stats", {ca_none}, do_stats, "stats\tFor debug purpose"}, {"show_license", {ca_none}, do_show_license, "show_license\tPrints contents of GPL license", NULL},
{"status_online", {ca_none}, do_status_online, "status_online\tSets status as online"}, {"stats", {ca_none}, do_stats, "stats\tFor debug purpose", NULL},
{"status_offline", {ca_none}, do_status_offline, "status_offline\tSets status as offline"}, {"status_online", {ca_none}, do_status_online, "status_online\tSets status as online", NULL},
{"user_info", {ca_user, ca_none}, do_user_info, "user_info <user>\tPrints info about user (id, last online, phone)"}, {"status_offline", {ca_none}, do_status_offline, "status_offline\tSets status as offline", NULL},
{"view_audio", {ca_number, ca_none}, do_open_audio, "view_audio <msg-id>\tDownloads file to downloads dirs. Then tries to open it with system default action"}, {"user_info", {ca_user, ca_none}, do_user_info, "user_info <user>\tPrints info about user (id, last online, phone)", NULL},
{"view_chat_photo", {ca_chat, ca_none}, do_view_user_photo, "view_chat_photo <chat>\tDownloads file to downloads dirs. Then tries to open it with system default action"}, {"view_audio", {ca_number, ca_none}, do_open_audio, "view_audio <msg-id>\tDownloads file to downloads dirs. Then tries to open it with system default action", NULL},
{"view_document", {ca_number, ca_none}, do_open_document, "view_document <msg-id>\tDownloads file to downloads dirs. Then tries to open it with system default action"}, {"view_chat_photo", {ca_chat, ca_none}, do_view_user_photo, "view_chat_photo <chat>\tDownloads file to downloads dirs. Then tries to open it with system default action", NULL},
{"view_document_thumb", {ca_number, ca_none}, do_open_document_thumb, "view_document_thumb <msg-id>\tDownloads file to downloads dirs. Then tries to open it with system default action"}, {"view_document", {ca_number, ca_none}, do_open_document, "view_document <msg-id>\tDownloads file to downloads dirs. Then tries to open it with system default action", NULL},
{"view_file", {ca_number, ca_none}, do_open_file, "view_file <msg-id>\tDownloads file to downloads dirs. Then tries to open it with system default action"}, {"view_document_thumb", {ca_number, ca_none}, do_open_document_thumb, "view_document_thumb <msg-id>\tDownloads file to downloads dirs. Then tries to open it with system default action", NULL},
{"view_file_thumb", {ca_number, ca_none}, do_open_file_thumb, "view_file_thumb <msg-id>\tDownloads file to downloads dirs. Then tries to open it with system default action"}, {"view_file", {ca_number, ca_none}, do_open_file, "view_file <msg-id>\tDownloads file to downloads dirs. Then tries to open it with system default action", NULL},
{"view_photo", {ca_number, ca_none}, do_open_photo, "view_photo <msg-id>\tDownloads file to downloads dirs. Then tries to open it with system default action"}, {"view_file_thumb", {ca_number, ca_none}, do_open_file_thumb, "view_file_thumb <msg-id>\tDownloads file to downloads dirs. Then tries to open it with system default action", NULL},
{"view_user_photo", {ca_user, ca_none}, do_view_user_photo, "view_user_photo <user>\tDownloads file to downloads dirs. Then tries to open it with system default action"}, {"view_photo", {ca_number, ca_none}, do_open_photo, "view_photo <msg-id>\tDownloads file to downloads dirs. Then tries to open it with system default action", NULL},
{"view_video", {ca_number, ca_none}, do_open_video, "view_video <msg-id>\tDownloads file to downloads dirs. Then tries to open it with system default action"}, {"view_user_photo", {ca_user, ca_none}, do_view_user_photo, "view_user_photo <user>\tDownloads file to downloads dirs. Then tries to open it with system default action", NULL},
{"view_video_thumb", {ca_number, ca_none}, do_open_video_thumb, "view_video_thumb <msg-id>\tDownloads file to downloads dirs. Then tries to open it with system default action"}, {"view_video", {ca_number, ca_none}, do_open_video, "view_video <msg-id>\tDownloads file to downloads dirs. Then tries to open it with system default action", NULL},
{"view", {ca_number, ca_none}, do_open_any, "view <msg-id>\tTries to view message contents"}, {"view_video_thumb", {ca_number, ca_none}, do_open_video_thumb, "view_video_thumb <msg-id>\tDownloads file to downloads dirs. Then tries to open it with system default action", NULL},
{"visualize_key", {ca_secret_chat, ca_none}, do_visualize_key, "visualize_key <secret chat>\tPrints visualization of encryption key (first 16 bytes sha1 of it in fact}"}, {"view", {ca_number, ca_none}, do_open_any, "view <msg-id>\tTries to view message contents", NULL},
{0, {ca_none}, 0, ""} {"visualize_key", {ca_secret_chat, ca_none}, do_visualize_key, "visualize_key <secret chat>\tPrints visualization of encryption key (first 16 bytes sha1 of it in fact}", NULL}
}; };
void register_new_command (struct command *cmd) {
int i = 0;
while (commands[i].name) {
i ++;
}
assert (i < MAX_COMMANDS_SIZE - 1);
commands[i] = *cmd;
}
enum command_argument get_complete_mode (void) { enum command_argument get_complete_mode (void) {
force_end_mode = 0; force_end_mode = 0;
...@@ -2299,7 +2308,7 @@ void interpreter_ex (char *line, void *ex) { ...@@ -2299,7 +2308,7 @@ void interpreter_ex (char *line, void *ex) {
offline_mode = 0; offline_mode = 0;
count = 1; count = 1;
if (!line) { if (!line) {
do_safe_quit (0, NULL, NULL); do_safe_quit (NULL, 0, NULL, NULL);
in_readline = 0; in_readline = 0;
return; return;
} }
...@@ -2365,7 +2374,7 @@ void interpreter_ex (char *line, void *ex) { ...@@ -2365,7 +2374,7 @@ void interpreter_ex (char *line, void *ex) {
} }
enum command_argument *flags = command->args; enum command_argument *flags = command->args;
void (*fun)(int, struct arg[], struct in_ev *) = command->fun; void (*fun)(struct command *, int, struct arg[], struct in_ev *) = command->fun;
int args_num = 0; int args_num = 0;
static struct arg args[1000]; static struct arg args[1000];
while (1) { while (1) {
...@@ -2384,7 +2393,7 @@ void interpreter_ex (char *line, void *ex) { ...@@ -2384,7 +2393,7 @@ void interpreter_ex (char *line, void *ex) {
if (cur_token_end_str) { if (cur_token_end_str) {
int z; int z;
for (z = 0; z < count; z ++) { for (z = 0; z < count; z ++) {
fun (args_num, args, ex); fun (command, args_num, args, ex);
} }
} }
break; break;
...@@ -2399,7 +2408,7 @@ void interpreter_ex (char *line, void *ex) { ...@@ -2399,7 +2408,7 @@ void interpreter_ex (char *line, void *ex) {
args[args_num ++].str = strndup (cur_token, cur_token_len); args[args_num ++].str = strndup (cur_token, cur_token_len);
int z; int z;
for (z = 0; z < count; z ++) { for (z = 0; z < count; z ++) {
fun (args_num, args, ex); fun (command, args_num, args, ex);
} }
break; break;
} }
...@@ -2411,7 +2420,7 @@ void interpreter_ex (char *line, void *ex) { ...@@ -2411,7 +2420,7 @@ void interpreter_ex (char *line, void *ex) {
if (period && cur_token_end_str) { if (period && cur_token_end_str) {
int z; int z;
for (z = 0; z < count; z ++) { for (z = 0; z < count; z ++) {
fun (args_num, args, ex); fun (command, args_num, args, ex);
} }
break; break;
} }
......
lua-tg.c
View file @ 8eaa6119
...@@ -50,6 +50,16 @@ extern struct tgl_state *TLS; ...@@ -50,6 +50,16 @@ extern struct tgl_state *TLS;
static int have_file; static int have_file;
void print_start (void);
void print_end (void);
int ps_lua_pcall (lua_State *l, int a, int b, int c) {
print_start ();
int r = lua_pcall (l, a, b, c);
print_end ();
return r;
}
#define my_lua_checkstack(L,x) assert (lua_checkstack (L, x)) #define my_lua_checkstack(L,x) assert (lua_checkstack (L, x))
void push_user (tgl_peer_t *P); void push_user (tgl_peer_t *P);
void push_peer (tgl_peer_id_t id, tgl_peer_t *P); void push_peer (tgl_peer_id_t id, tgl_peer_t *P);
...@@ -488,7 +498,7 @@ void lua_binlog_end (void) { ...@@ -488,7 +498,7 @@ void lua_binlog_end (void) {
lua_getglobal (luaState, "on_binlog_replay_end"); lua_getglobal (luaState, "on_binlog_replay_end");
assert (lua_gettop (luaState) == 1); assert (lua_gettop (luaState) == 1);
int r = lua_pcall (luaState, 0, 0, 0); int r = ps_lua_pcall (luaState, 0, 0, 0);
if (r) { if (r) {
logprintf ("lua: %s\n", lua_tostring (luaState, -1)); logprintf ("lua: %s\n", lua_tostring (luaState, -1));
} }
...@@ -502,7 +512,7 @@ void lua_diff_end (void) { ...@@ -502,7 +512,7 @@ void lua_diff_end (void) {
lua_getglobal (luaState, "on_get_difference_end"); lua_getglobal (luaState, "on_get_difference_end");
assert (lua_gettop (luaState) == 1); assert (lua_gettop (luaState) == 1);
int r = lua_pcall (luaState, 0, 0, 0); int r = ps_lua_pcall (luaState, 0, 0, 0);
if (r) { if (r) {
logprintf ("lua: %s\n", lua_tostring (luaState, -1)); logprintf ("lua: %s\n", lua_tostring (luaState, -1));
} }
...@@ -517,7 +527,7 @@ void lua_our_id (int id) { ...@@ -517,7 +527,7 @@ void lua_our_id (int id) {
lua_pushnumber (luaState, id); lua_pushnumber (luaState, id);
assert (lua_gettop (luaState) == 2); assert (lua_gettop (luaState) == 2);
int r = lua_pcall (luaState, 1, 0, 0); int r = ps_lua_pcall (luaState, 1, 0, 0);
if (r) { if (r) {
logprintf ("lua: %s\n", lua_tostring (luaState, -1)); logprintf ("lua: %s\n", lua_tostring (luaState, -1));
} }
...@@ -532,7 +542,7 @@ void lua_new_msg (struct tgl_message *M) { ...@@ -532,7 +542,7 @@ void lua_new_msg (struct tgl_message *M) {
push_message (M); push_message (M);
assert (lua_gettop (luaState) == 2); assert (lua_gettop (luaState) == 2);
int r = lua_pcall (luaState, 1, 0, 0); int r = ps_lua_pcall (luaState, 1, 0, 0);
if (r) { if (r) {
logprintf ("lua: %s\n", lua_tostring (luaState, -1)); logprintf ("lua: %s\n", lua_tostring (luaState, -1));
} }
...@@ -548,7 +558,7 @@ void lua_secret_chat_update (struct tgl_secret_chat *C, unsigned flags) { ...@@ -548,7 +558,7 @@ void lua_secret_chat_update (struct tgl_secret_chat *C, unsigned flags) {
push_update_types (flags); push_update_types (flags);
assert (lua_gettop (luaState) == 3); assert (lua_gettop (luaState) == 3);
int r = lua_pcall (luaState, 2, 0, 0); int r = ps_lua_pcall (luaState, 2, 0, 0);
if (r) { if (r) {
logprintf ("lua: %s\n", lua_tostring (luaState, -1)); logprintf ("lua: %s\n", lua_tostring (luaState, -1));
} }
...@@ -564,7 +574,7 @@ void lua_user_update (struct tgl_user *U, unsigned flags) { ...@@ -564,7 +574,7 @@ void lua_user_update (struct tgl_user *U, unsigned flags) {
push_update_types (flags); push_update_types (flags);
assert (lua_gettop (luaState) == 3); assert (lua_gettop (luaState) == 3);
int r = lua_pcall (luaState, 2, 0, 0); int r = ps_lua_pcall (luaState, 2, 0, 0);
if (r) { if (r) {
logprintf ("lua: %s\n", lua_tostring (luaState, -1)); logprintf ("lua: %s\n", lua_tostring (luaState, -1));
} }
...@@ -580,7 +590,7 @@ void lua_chat_update (struct tgl_chat *C, unsigned flags) { ...@@ -580,7 +590,7 @@ void lua_chat_update (struct tgl_chat *C, unsigned flags) {
push_update_types (flags); push_update_types (flags);
assert (lua_gettop (luaState) == 3); assert (lua_gettop (luaState) == 3);
int r = lua_pcall (luaState, 2, 0, 0); int r = ps_lua_pcall (luaState, 2, 0, 0);
if (r) { if (r) {
logprintf ("lua: %s\n", lua_tostring (luaState, -1)); logprintf ("lua: %s\n", lua_tostring (luaState, -1));
} }
...@@ -663,7 +673,7 @@ void lua_empty_cb (struct tgl_state *TLSR, void *cb_extra, int success) { ...@@ -663,7 +673,7 @@ void lua_empty_cb (struct tgl_state *TLSR, void *cb_extra, int success) {
assert (lua_gettop (luaState) == 3); assert (lua_gettop (luaState) == 3);
int r = lua_pcall (luaState, 2, 0, 0); int r = ps_lua_pcall (luaState, 2, 0, 0);
luaL_unref (luaState, LUA_REGISTRYINDEX, cb->func); luaL_unref (luaState, LUA_REGISTRYINDEX, cb->func);
luaL_unref (luaState, LUA_REGISTRYINDEX, cb->param); luaL_unref (luaState, LUA_REGISTRYINDEX, cb->param);
...@@ -701,7 +711,7 @@ void lua_contact_list_cb (struct tgl_state *TLSR, void *cb_extra, int success, i ...@@ -701,7 +711,7 @@ void lua_contact_list_cb (struct tgl_state *TLSR, void *cb_extra, int success, i
assert (lua_gettop (luaState) == 4); assert (lua_gettop (luaState) == 4);
int r = lua_pcall (luaState, 3, 0, 0); int r = ps_lua_pcall (luaState, 3, 0, 0);
luaL_unref (luaState, LUA_REGISTRYINDEX, cb->func); luaL_unref (luaState, LUA_REGISTRYINDEX, cb->func);
luaL_unref (luaState, LUA_REGISTRYINDEX, cb->param); luaL_unref (luaState, LUA_REGISTRYINDEX, cb->param);
...@@ -755,7 +765,7 @@ void lua_dialog_list_cb (struct tgl_state *TLSR, void *cb_extra, int success, in ...@@ -755,7 +765,7 @@ void lua_dialog_list_cb (struct tgl_state *TLSR, void *cb_extra, int success, in
assert (lua_gettop (luaState) == 4); assert (lua_gettop (luaState) == 4);
int r = lua_pcall (luaState, 3, 0, 0); int r = ps_lua_pcall (luaState, 3, 0, 0);
luaL_unref (luaState, LUA_REGISTRYINDEX, cb->func); luaL_unref (luaState, LUA_REGISTRYINDEX, cb->func);
luaL_unref (luaState, LUA_REGISTRYINDEX, cb->param); luaL_unref (luaState, LUA_REGISTRYINDEX, cb->param);
...@@ -787,7 +797,7 @@ void lua_msg_cb (struct tgl_state *TLSR, void *cb_extra, int success, struct tgl ...@@ -787,7 +797,7 @@ void lua_msg_cb (struct tgl_state *TLSR, void *cb_extra, int success, struct tgl
assert (lua_gettop (luaState) == 4); assert (lua_gettop (luaState) == 4);
int r = lua_pcall (luaState, 3, 0, 0); int r = ps_lua_pcall (luaState, 3, 0, 0);
luaL_unref (luaState, LUA_REGISTRYINDEX, cb->func); luaL_unref (luaState, LUA_REGISTRYINDEX, cb->func);
luaL_unref (luaState, LUA_REGISTRYINDEX, cb->param); luaL_unref (luaState, LUA_REGISTRYINDEX, cb->param);
...@@ -825,7 +835,7 @@ void lua_msg_list_cb (struct tgl_state *TLSR, void *cb_extra, int success, int n ...@@ -825,7 +835,7 @@ void lua_msg_list_cb (struct tgl_state *TLSR, void *cb_extra, int success, int n
assert (lua_gettop (luaState) == 4); assert (lua_gettop (luaState) == 4);
int r = lua_pcall (luaState, 3, 0, 0); int r = ps_lua_pcall (luaState, 3, 0, 0);
luaL_unref (luaState, LUA_REGISTRYINDEX, cb->func); luaL_unref (luaState, LUA_REGISTRYINDEX, cb->func);
luaL_unref (luaState, LUA_REGISTRYINDEX, cb->param); luaL_unref (luaState, LUA_REGISTRYINDEX, cb->param);
...@@ -857,7 +867,7 @@ void lua_file_cb (struct tgl_state *TLSR, void *cb_extra, int success, char *fil ...@@ -857,7 +867,7 @@ void lua_file_cb (struct tgl_state *TLSR, void *cb_extra, int success, char *fil
assert (lua_gettop (luaState) == 4); assert (lua_gettop (luaState) == 4);
int r = lua_pcall (luaState, 3, 0, 0); int r = ps_lua_pcall (luaState, 3, 0, 0);
luaL_unref (luaState, LUA_REGISTRYINDEX, cb->func); luaL_unref (luaState, LUA_REGISTRYINDEX, cb->func);
luaL_unref (luaState, LUA_REGISTRYINDEX, cb->param); luaL_unref (luaState, LUA_REGISTRYINDEX, cb->param);
...@@ -889,7 +899,7 @@ void lua_chat_cb (struct tgl_state *TLSR, void *cb_extra, int success, struct tg ...@@ -889,7 +899,7 @@ void lua_chat_cb (struct tgl_state *TLSR, void *cb_extra, int success, struct tg
assert (lua_gettop (luaState) == 4); assert (lua_gettop (luaState) == 4);
int r = lua_pcall (luaState, 3, 0, 0); int r = ps_lua_pcall (luaState, 3, 0, 0);
luaL_unref (luaState, LUA_REGISTRYINDEX, cb->func); luaL_unref (luaState, LUA_REGISTRYINDEX, cb->func);
luaL_unref (luaState, LUA_REGISTRYINDEX, cb->param); luaL_unref (luaState, LUA_REGISTRYINDEX, cb->param);
...@@ -921,7 +931,7 @@ void lua_secret_chat_cb (struct tgl_state *TLSR, void *cb_extra, int success, st ...@@ -921,7 +931,7 @@ void lua_secret_chat_cb (struct tgl_state *TLSR, void *cb_extra, int success, st
assert (lua_gettop (luaState) == 4); assert (lua_gettop (luaState) == 4);
int r = lua_pcall (luaState, 3, 0, 0); int r = ps_lua_pcall (luaState, 3, 0, 0);
luaL_unref (luaState, LUA_REGISTRYINDEX, cb->func); luaL_unref (luaState, LUA_REGISTRYINDEX, cb->func);
luaL_unref (luaState, LUA_REGISTRYINDEX, cb->param); luaL_unref (luaState, LUA_REGISTRYINDEX, cb->param);
...@@ -953,7 +963,7 @@ void lua_user_cb (struct tgl_state *TLSR, void *cb_extra, int success, struct tg ...@@ -953,7 +963,7 @@ void lua_user_cb (struct tgl_state *TLSR, void *cb_extra, int success, struct tg
assert (lua_gettop (luaState) == 4); assert (lua_gettop (luaState) == 4);
int r = lua_pcall (luaState, 3, 0, 0); int r = ps_lua_pcall (luaState, 3, 0, 0);
luaL_unref (luaState, LUA_REGISTRYINDEX, cb->func); luaL_unref (luaState, LUA_REGISTRYINDEX, cb->func);
luaL_unref (luaState, LUA_REGISTRYINDEX, cb->param); luaL_unref (luaState, LUA_REGISTRYINDEX, cb->param);
...@@ -985,7 +995,7 @@ void lua_str_cb (struct tgl_state *TLSR, void *cb_extra, int success, char *data ...@@ -985,7 +995,7 @@ void lua_str_cb (struct tgl_state *TLSR, void *cb_extra, int success, char *data
assert (lua_gettop (luaState) == 4); assert (lua_gettop (luaState) == 4);
int r = lua_pcall (luaState, 3, 0, 0); int r = ps_lua_pcall (luaState, 3, 0, 0);
luaL_unref (luaState, LUA_REGISTRYINDEX, cb->func); luaL_unref (luaState, LUA_REGISTRYINDEX, cb->func);
luaL_unref (luaState, LUA_REGISTRYINDEX, cb->param); luaL_unref (luaState, LUA_REGISTRYINDEX, cb->param);
...@@ -1500,7 +1510,7 @@ static void lua_postpone_alarm (evutil_socket_t fd, short what, void *arg) { ...@@ -1500,7 +1510,7 @@ static void lua_postpone_alarm (evutil_socket_t fd, short what, void *arg) {
lua_rawgeti (luaState, LUA_REGISTRYINDEX, t[0]); lua_rawgeti (luaState, LUA_REGISTRYINDEX, t[0]);
assert (lua_gettop (luaState) == 2); assert (lua_gettop (luaState) == 2);
int r = lua_pcall (luaState, 1, 0, 0); int r = ps_lua_pcall (luaState, 1, 0, 0);
luaL_unref (luaState, LUA_REGISTRYINDEX, t[0]); luaL_unref (luaState, LUA_REGISTRYINDEX, t[0]);
luaL_unref (luaState, LUA_REGISTRYINDEX, t[1]); luaL_unref (luaState, LUA_REGISTRYINDEX, t[1]);
...@@ -1583,6 +1593,207 @@ static void my_lua_register (lua_State *L, const char *name, lua_CFunction f) { ...@@ -1583,6 +1593,207 @@ static void my_lua_register (lua_State *L, const char *name, lua_CFunction f) {
lua_setglobal(L, name); lua_setglobal(L, name);
} }
enum command_argument {
ca_none,
ca_user,
ca_chat,
ca_secret_chat,
ca_peer,
ca_file_name,
ca_file_name_end,
ca_period,
ca_number,
ca_double,
ca_string_end,
ca_string,
ca_modifier,
ca_command,
ca_extf,
ca_optional = 256
};
struct arg {
int flags;
struct {
tgl_peer_t *P;
struct tgl_message *M;
char *str;
long long num;
double dval;
};
};
struct in_ev;
struct command {
char *name;
enum command_argument args[10];
void (*fun)(struct command *command, int arg_num, struct arg args[], struct in_ev *ev);
char *desc;
void *arg;
};
#define NOT_FOUND (int)0x80000000
static void do_interface_from_lua (struct command *command, int arg_num, struct arg args[], struct in_ev *ev) {
lua_settop (luaState, 0);
my_lua_checkstack (luaState, 20);
struct lua_query_extra *e = command->arg;
lua_rawgeti (luaState, LUA_REGISTRYINDEX, e->func);
lua_rawgeti (luaState, LUA_REGISTRYINDEX, e->param);
int i;
for (i = 0; i < arg_num; i ++) {
int j = i;
if (j > 9) { j = 9; }
while (j >= 0) {
if (command->args[j] == ca_period) { j --; continue; }
if (command->args[j] == ca_none) { j --; continue; }
break;
}
assert (j >= 0);
switch (command->args[j] & 0xff) {
case ca_none:
case ca_period:
assert (0);
break;
case ca_user:
case ca_chat:
case ca_secret_chat:
case ca_peer:
if (args[i].P) {
push_peer (args[i].P->id, args[i].P);
} else {
lua_pushnil (luaState);
}
break;
case ca_file_name:
case ca_file_name_end:
case ca_string_end:
case ca_string:
if (args[i].str) {
lua_pushstring (luaState, args[i].str);
} else {
lua_pushnil (luaState);
}
break;
case ca_number:
if (args[i].num != NOT_FOUND) {
lua_pushnumber (luaState, args[i].num);
} else {
lua_pushnil (luaState);
}
break;
case ca_double:
if (args[i].dval != NOT_FOUND) {
lua_pushnumber (luaState, args[i].dval);
} else {
lua_pushnil (luaState);
}
break;
}
if (args[i].flags & 1) {
free (args[i].str);
}
}
int r = ps_lua_pcall (luaState, 1 + arg_num, 0, 0);
if (r) {
logprintf ("lua: %s\n", lua_tostring (luaState, -1));
}
}
void register_new_command (struct command *cmd);
static int register_interface_from_lua (lua_State *L) {
int n = lua_gettop (L);
if (n <= 4 || n >= 13) {
lua_pushboolean (L, 0);
return 1;
}
static struct command cmd;
memset (&cmd, 0, sizeof (struct command));
int i;
for (i = 0; i < n - 4; i++) {
char *s = lua_tostring (L, -1);
lua_pop (L, 1);
if (!s || !strlen (s)) {
lua_pushboolean (L, 0);
return 1;
}
int len = strlen (s);
int optional = 0;
if (len > 9 && !strcmp (s + len - 9, " optional")) {
optional = ca_optional;
len -= 9;
}
int ok = 0;
#define VARIANT(name) \
if (len == strlen (#name) && !strncmp (s, #name, len)) {\
cmd.args[n - 5 - i] = ca_ ## name | optional; \
ok = 1; \
}
VARIANT (user)
VARIANT (chat)
VARIANT (secret_chat)
VARIANT (peer)
VARIANT (file_name)
VARIANT (file_name_end)
VARIANT (period)
VARIANT (number)
VARIANT (double)
VARIANT (string_end)
VARIANT (string)
#undef VARTIANT
if (!ok) {
lua_pushboolean (L, 0);
return 1;
}
}
const char *s = lua_tostring (L, -1);
lua_pop (L, 1);
cmd.desc = s ? tstrdup (s) : tstrdup ("no help provided");
int a1 = luaL_ref (L, LUA_REGISTRYINDEX);
int a2 = luaL_ref (L, LUA_REGISTRYINDEX);
struct lua_query_extra *e = malloc (sizeof (*e));
assert (e);
e->func = a2;
e->param = a1;
cmd.arg = e;
cmd.fun = do_interface_from_lua;
s = lua_tostring (L, -1);
lua_pop (L, 1);
cmd.name = tstrdup (s ? s : "none");
register_new_command (&cmd);
lua_pushboolean (L, 1);
return 1;
}
void lua_init (const char *file) { void lua_init (const char *file) {
if (!file) { return; } if (!file) { return; }
...@@ -1598,9 +1809,13 @@ void lua_init (const char *file) { ...@@ -1598,9 +1809,13 @@ void lua_init (const char *file) {
lua_register (luaState, "postpone", postpone_from_lua); lua_register (luaState, "postpone", postpone_from_lua);
lua_register (luaState, "safe_quit", safe_quit_from_lua); lua_register (luaState, "safe_quit", safe_quit_from_lua);
lua_register (luaState, "register_interface_function", register_interface_from_lua);
int ret = luaL_dofile (luaState, file); print_start ();
if (ret) { int r = luaL_dofile (luaState, file);
print_end ();
if (r) {
logprintf ("lua: %s\n", lua_tostring (luaState, -1)); logprintf ("lua: %s\n", lua_tostring (luaState, -1));
exit (1); exit (1);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023