applications/tg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Vysheng 2014-08-19 16:57:55 +04:00
parent 2b2cc686fc
commit d1096cba33
5 changed files with 94 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
binlog.c
View File

@ -84,7 +84,6 @@ static int fetch_comb_binlog_dc_option (void *extra) {
vlogprintf (E_NOTICE, "DC%d '%.*s' update: %.*s:%d\n", id, l1, name, l2, ip, port); vlogprintf (E_NOTICE, "DC%d '%.*s' update: %.*s:%d\n", id, l1, name, l2, ip, port);
tglmp_alloc_dc (id, tstrndup (ip, l2), port); tglmp_alloc_dc (id, tstrndup (ip, l2), port);
return 0; return 0;
} }
@ -196,10 +195,10 @@ static int fetch_comb_binlog_user_add (void *extra) {
} }
#ifdef USE_LUA #ifdef USE_LUA
lua_user_update (U); lua_user_update (U, TGL_UPDATE_CREATED);
#endif #endif
if (tgl_state.callback.new_user) { if (tgl_state.callback.user_update) {
tgl_state.callback.new_user (U); tgl_state.callback.user_update (U, TGL_UPDATE_CREATED);
} }
return 0; return 0;
} }
@ -211,10 +210,10 @@ static int fetch_comb_binlog_user_delete (void *extra) {
U->flags |= FLAG_DELETED; U->flags |= FLAG_DELETED;
#ifdef USE_LUA #ifdef USE_LUA
lua_user_update (&U->user); lua_user_update (&U->user, TGL_UPDATE_DELETED);
#endif #endif
if (tgl_state.callback.delete_user) { if (tgl_state.callback.user_update) {
tgl_state.callback.delete_user ((void *)U); tgl_state.callback.user_update ((void *)U, TGL_UPDATE_DELETED);
} }
return 0; return 0;
} }
@ -224,10 +223,6 @@ static int fetch_comb_binlog_user_set_access_hash (void *extra) {
tgl_peer_t *U = tgl_peer_get (id); tgl_peer_t *U = tgl_peer_get (id);
assert (U); assert (U);
U->user.access_hash = fetch_long (); U->user.access_hash = fetch_long ();
#ifdef USE_LUA
lua_user_update (&U->user);
#endif
return 0; return 0;
} }
@ -241,11 +236,11 @@ static int fetch_comb_binlog_user_set_phone (void *extra) {
U->user.phone = fetch_str_dup (); U->user.phone = fetch_str_dup ();
#ifdef USE_LUA #ifdef USE_LUA
lua_user_update (&U->user); lua_user_update (&U->user, TGL_UPDATE_PHONE);
#endif #endif
if (tgl_state.callback.update_user_info) { if (tgl_state.callback.user_update) {
tgl_state.callback.update_user_info ((void *)U); tgl_state.callback.user_update ((void *)U, TGL_UPDATE_PHONE);
} }
return 0; return 0;
} }
@ -262,10 +257,10 @@ static int fetch_comb_binlog_user_set_friend (void *extra) {
else { U->flags &= ~FLAG_USER_CONTACT; } else { U->flags &= ~FLAG_USER_CONTACT; }
#ifdef USE_LUA #ifdef USE_LUA
lua_user_update (&U->user); lua_user_update (&U->user, TGL_UPDATE_CONTACT);
#endif #endif
if (tgl_state.callback.update_user_info) { if (tgl_state.callback.user_update) {
tgl_state.callback.update_user_info ((void *)U); tgl_state.callback.user_update ((void *)U, TGL_UPDATE_CONTACT);
} }
return 0; return 0;
} }
@ -280,10 +275,10 @@ static int fetch_comb_binlog_user_set_full_photo (void *extra) {
tglf_fetch_photo (&U->user.photo); tglf_fetch_photo (&U->user.photo);
#ifdef USE_LUA #ifdef USE_LUA
lua_user_update (&U->user); lua_user_update (&U->user, TGL_UPDATE_PHOTO);
#endif #endif
if (tgl_state.callback.update_user_info) { if (tgl_state.callback.user_update) {
tgl_state.callback.update_user_info ((void *)U); tgl_state.callback.user_update ((void *)U, TGL_UPDATE_PHOTO);
} }
return 0; return 0;
} }
@ -296,10 +291,10 @@ static int fetch_comb_binlog_user_set_blocked (void *extra) {
U->user.blocked = fetch_int (); U->user.blocked = fetch_int ();
#ifdef USE_LUA #ifdef USE_LUA
lua_user_update (&U->user); lua_user_update (&U->user, TGL_UPDATE_BLOCKED);
#endif #endif
if (tgl_state.callback.update_user_info) { if (tgl_state.callback.user_update) {
tgl_state.callback.update_user_info ((void *)U); tgl_state.callback.user_update ((void *)U, TGL_UPDATE_BLOCKED);
} }
return 0; return 0;
} }
@ -315,10 +310,10 @@ static int fetch_comb_binlog_user_set_real_name (void *extra) {
U->user.real_last_name = fetch_str_dup (); U->user.real_last_name = fetch_str_dup ();
#ifdef USE_LUA #ifdef USE_LUA
lua_user_update (&U->user); lua_user_update (&U->user, TGL_UPDATE_REAL_NAME);
#endif #endif
if (tgl_state.callback.update_user_info) { if (tgl_state.callback.user_update) {
tgl_state.callback.update_user_info ((void *)U); tgl_state.callback.user_update ((void *)U, TGL_UPDATE_REAL_NAME);
} }
return 0; return 0;
} }
@ -340,10 +335,10 @@ static int fetch_comb_binlog_user_set_name (void *extra) {
tglp_peer_insert_name ((void *)U); tglp_peer_insert_name ((void *)U);
#ifdef USE_LUA #ifdef USE_LUA
lua_user_update (&U->user); lua_user_update (&U->user, TGL_UPDATE_NAME);
#endif #endif
if (tgl_state.callback.update_user_info) { if (tgl_state.callback.user_update) {
tgl_state.callback.update_user_info ((void *)U); tgl_state.callback.user_update ((void *)U, TGL_UPDATE_NAME);
} }
return 0; return 0;
} }
@ -369,8 +364,8 @@ static int fetch_comb_binlog_user_set_photo (void *extra) {
#ifdef USE_LUA #ifdef USE_LUA
lua_user_update (&U->user); lua_user_update (&U->user);
#endif #endif
if (tgl_state.callback.update_user_info) { if (tgl_state.callback.user_update) {
tgl_state.callback.update_user_info ((void *)U); tgl_state.callback.user_update ((void *)U, TGL_UPDATE_PHOTO);
} }
return 0; return 0;
} }
@ -393,10 +388,10 @@ static int fetch_comb_binlog_encr_chat_delete (void *extra) {
} }
#ifdef USE_LUA #ifdef USE_LUA
lua_secret_chat_update (U); lua_secret_chat_update (U, TGL_UPDATE_DELETED);
#endif #endif
if (tgl_state.callback.secret_chat_deleted) { if (tgl_state.callback.secret_chat_update) {
tgl_state.callback.secret_chat_deleted (U); tgl_state.callback.secret_chat_update (U, TGL_UPDATE_DELETED);
} }
return 0; return 0;
} }
@ -436,10 +431,10 @@ static int fetch_comb_binlog_encr_chat_requested (void *extra) {
U->state = sc_request; U->state = sc_request;
#ifdef USE_LUA #ifdef USE_LUA
lua_secret_chat_update (U); lua_secret_chat_update (U, TGL_UPDATE_REQUESTED);
#endif #endif
if (tgl_state.callback.secret_chat_request) { if (tgl_state.callback.secret_chat_update) {
tgl_state.callback.secret_chat_request (U); tgl_state.callback.secret_chat_update (U, TGL_UPDATE_REQUESTED);
} }
return 0; return 0;
} }
@ -449,10 +444,6 @@ static int fetch_comb_binlog_encr_chat_set_access_hash (void *extra) {
tgl_peer_t *U = tgl_peer_get (id); tgl_peer_t *U = tgl_peer_get (id);
assert (U); assert (U);
U->encr_chat.access_hash = fetch_long (); U->encr_chat.access_hash = fetch_long ();
#ifdef USE_LUA
lua_secret_chat_update (&U->encr_chat);
#endif
return 0; return 0;
} }
@ -461,10 +452,6 @@ static int fetch_comb_binlog_encr_chat_set_date (void *extra) {
tgl_peer_t *U = tgl_peer_get (id); tgl_peer_t *U = tgl_peer_get (id);
assert (U); assert (U);
U->encr_chat.date = fetch_int (); U->encr_chat.date = fetch_int ();
#ifdef USE_LUA
lua_secret_chat_update (&U->encr_chat);
#endif
return 0; return 0;
} }
@ -473,10 +460,6 @@ static int fetch_comb_binlog_encr_chat_set_state (void *extra) {
tgl_peer_t *U = tgl_peer_get (id); tgl_peer_t *U = tgl_peer_get (id);
assert (U); assert (U);
U->encr_chat.state = fetch_int (); U->encr_chat.state = fetch_int ();
#ifdef USE_LUA
lua_secret_chat_update (&U->encr_chat);
#endif
return 0; return 0;
} }
@ -502,10 +485,10 @@ static int fetch_comb_binlog_encr_chat_accepted (void *extra) {
U->state = sc_ok; U->state = sc_ok;
#ifdef USE_LUA #ifdef USE_LUA
lua_secret_chat_update (U); lua_secret_chat_update (U, TGL_UPDATE_WORKING);
#endif #endif
if (tgl_state.callback.secret_chat_accepted) { if (tgl_state.callback.secret_chat_update) {
tgl_state.callback.secret_chat_accepted (U); tgl_state.callback.secret_chat_update (U, TGL_UPDATE_WORKING);
} }
return 0; return 0;
} }
@ -517,10 +500,6 @@ static int fetch_comb_binlog_encr_chat_set_key (void *extra) {
struct tgl_secret_chat *U = &_U->encr_chat; struct tgl_secret_chat *U = &_U->encr_chat;
fetch_ints (U->key, 64); fetch_ints (U->key, 64);
U->key_fingerprint = fetch_long (); U->key_fingerprint = fetch_long ();
#ifdef USE_LUA
lua_secret_chat_update (U);
#endif
return 0; return 0;
} }
@ -542,10 +521,10 @@ static int fetch_comb_binlog_encr_chat_init (void *extra) {
P->flags |= FLAG_CREATED; P->flags |= FLAG_CREATED;
#ifdef USE_LUA #ifdef USE_LUA
lua_secret_chat_update (U); lua_secret_chat_update (U, TGL_UPDATE_CREATED);
#endif #endif
if (tgl_state.callback.secret_chat_created) { if (tgl_state.callback.secret_chat_update) {
tgl_state.callback.secret_chat_created ((void *)P); tgl_state.callback.secret_chat_update ((void *)P, TGL_UPDATE_CREATED);
} }
return 0; return 0;
} }
@ -574,10 +553,10 @@ static int fetch_comb_binlog_chat_create (void *extra) {
fetch_data (&C->photo_small, sizeof (struct tgl_file_location)); fetch_data (&C->photo_small, sizeof (struct tgl_file_location));
#ifdef USE_LUA #ifdef USE_LUA
lua_chat_update (C); lua_chat_update (C, TGL_UPDATE_CREATED);
#endif #endif
if (tgl_state.callback.chat_created) { if (tgl_state.callback.chat_update) {
tgl_state.callback.chat_created (C); tgl_state.callback.chat_update (C, TGL_UPDATE_CREATED);
} }
return 0; return 0;
} }
@ -589,10 +568,10 @@ static int fetch_comb_binlog_chat_change_flags (void *extra) {
C->chat.flags &= ~fetch_int (); C->chat.flags &= ~fetch_int ();
#ifdef USE_LUA #ifdef USE_LUA
lua_chat_update (&C->chat); lua_chat_update (&C->chat, TGL_UPDATE_FLAGS);
#endif #endif
if (tgl_state.callback.chat_update) { if (tgl_state.callback.chat_update) {
tgl_state.callback.chat_update ((void *)C); tgl_state.callback.chat_update ((void *)C, TGL_UPDATE_FLAGS);
} }
return 0; return 0;
} }
@ -611,10 +590,10 @@ static int fetch_comb_binlog_chat_set_title (void *extra) {
tglp_peer_insert_name ((void *)C); tglp_peer_insert_name ((void *)C);
#ifdef USE_LUA #ifdef USE_LUA
lua_chat_update (&C->chat); lua_chat_update (&C->chat, TGL_UPDATE_TITLE);
#endif #endif
if (tgl_state.callback.chat_update) { if (tgl_state.callback.chat_update) {
tgl_state.callback.chat_update ((void *)C); tgl_state.callback.chat_update ((void *)C, TGL_UPDATE_TITLE);
} }
return 0; return 0;
} }
@ -626,10 +605,10 @@ static int fetch_comb_binlog_chat_set_photo (void *extra) {
fetch_data (&C->photo_small, sizeof (struct tgl_file_location)); fetch_data (&C->photo_small, sizeof (struct tgl_file_location));
#ifdef USE_LUA #ifdef USE_LUA
lua_chat_update (&C->chat); lua_chat_update (&C->chat, TGL_UPDATE_PHOTO);
#endif #endif
if (tgl_state.callback.chat_update) { if (tgl_state.callback.chat_update) {
tgl_state.callback.chat_update ((void *)C); tgl_state.callback.chat_update ((void *)C, TGL_UPDATE_PHOTO);
} }
return 0; return 0;
} }
@ -638,13 +617,6 @@ static int fetch_comb_binlog_chat_set_date (void *extra) {
tgl_peer_t *C = tgl_peer_get (TGL_MK_CHAT (fetch_int ())); tgl_peer_t *C = tgl_peer_get (TGL_MK_CHAT (fetch_int ()));
assert (C && (C->flags & FLAG_CREATED)); assert (C && (C->flags & FLAG_CREATED));
C->chat.date = fetch_int (); C->chat.date = fetch_int ();
#ifdef USE_LUA
lua_chat_update (&C->chat);
#endif
if (tgl_state.callback.chat_update) {
tgl_state.callback.chat_update ((void *)C);
}
return 0; return 0;
} }
@ -653,13 +625,6 @@ static int fetch_comb_binlog_chat_set_version (void *extra) {
assert (C && (C->flags & FLAG_CREATED)); assert (C && (C->flags & FLAG_CREATED));
C->chat.version = fetch_int (); C->chat.version = fetch_int ();
C->chat.users_num = fetch_int (); C->chat.users_num = fetch_int ();
#ifdef USE_LUA
lua_chat_update (&C->chat);
#endif
if (tgl_state.callback.chat_update) {
tgl_state.callback.chat_update ((void *)C);
}
return 0; return 0;
} }
@ -669,10 +634,10 @@ static int fetch_comb_binlog_chat_set_admin (void *extra) {
C->chat.admin_id = fetch_int (); C->chat.admin_id = fetch_int ();
#ifdef USE_LUA #ifdef USE_LUA
lua_chat_update (&C->chat); lua_chat_update (&C->chat, TGL_UPDATE_ADMIN);
#endif #endif
if (tgl_state.callback.chat_update) { if (tgl_state.callback.chat_update) {
tgl_state.callback.chat_update ((void *)C); tgl_state.callback.chat_update ((void *)C, TGL_UPDATE_ADMIN);
} }
return 0; return 0;
} }
@ -687,10 +652,10 @@ static int fetch_comb_binlog_chat_set_participants (void *extra) {
fetch_ints (C->chat.user_list, 3 * C->chat.user_list_size); fetch_ints (C->chat.user_list, 3 * C->chat.user_list_size);
#ifdef USE_LUA #ifdef USE_LUA
lua_chat_update (&C->chat); lua_chat_update (&C->chat, TGL_UPDATE_MEMBERS);
#endif #endif
if (tgl_state.callback.chat_update) { if (tgl_state.callback.chat_update) {
tgl_state.callback.chat_update ((void *)C); tgl_state.callback.chat_update ((void *)C, TGL_UPDATE_MEMBERS);
} }
return 0; return 0;
} }
@ -706,10 +671,10 @@ static int fetch_comb_binlog_chat_set_full_photo (void *extra) {
tglf_fetch_photo (&C->chat.photo); tglf_fetch_photo (&C->chat.photo);
#ifdef USE_LUA #ifdef USE_LUA
lua_chat_update (&C->chat); lua_chat_update (&C->chat, TGL_UPDATE_PHOTO);
#endif #endif
if (tgl_state.callback.chat_update) { if (tgl_state.callback.chat_update) {
tgl_state.callback.chat_update ((void *)C); tgl_state.callback.chat_update ((void *)C, TGL_UPDATE_PHOTO);
} }
return 0; return 0;
} }
@ -739,10 +704,10 @@ static int fetch_comb_binlog_chat_add_participant (void *extra) {
C->user_list_version = version; C->user_list_version = version;
#ifdef USE_LUA #ifdef USE_LUA
lua_chat_update (C); lua_chat_update (C, TGL_UPDATE_MEMBERS);
#endif #endif
if (tgl_state.callback.chat_update) { if (tgl_state.callback.chat_update) {
tgl_state.callback.chat_update (C); tgl_state.callback.chat_update (C, TGL_UPDATE_MEMBERS);
} }
return 0; return 0;
} }
@ -772,10 +737,10 @@ static int fetch_comb_binlog_chat_del_participant (void *extra) {
C->user_list_version = version; C->user_list_version = version;
#ifdef USE_LUA #ifdef USE_LUA
lua_chat_update (C); lua_chat_update (C, TGL_UPDATE_MEMBERS);
#endif #endif
if (tgl_state.callback.chat_update) { if (tgl_state.callback.chat_update) {
tgl_state.callback.chat_update (C); tgl_state.callback.chat_update (C, TGL_UPDATE_MEMBERS);
} }
return 0; return 0;
} }

8
interface.c
View File

@ -736,11 +736,9 @@ struct tgl_update_callback upd_cb = {
.user_registered = 0, .user_registered = 0,
.user_activated = 0, .user_activated = 0,
.new_authorization = 0, .new_authorization = 0,
.secret_chat_created = 0, .user_update = 0,
.secret_chat_request = 0, .chat_update = 0,
.secret_chat_established = 0, .secret_chat_update = 0
.secret_chat_deleted = 0,
.secret_chat_accepted = 0
}; };

2
structures.c
View File

@ -237,7 +237,7 @@ int tglf_fetch_user (struct tgl_user *U) {
if (x == CODE_user_contact) { if (x == CODE_user_contact) {
bl_do_user_set_friend (U, 1); bl_do_user_set_friend (U, 1);
} else { } else {
bl_do_user_set_friend (U, 0); bl_do_user_set_friend (U, 0);
} }
} }

39
tgl.h
View File

@ -14,6 +14,22 @@ struct connection;
struct mtproto_methods; struct mtproto_methods;
struct session; struct session;
struct dc; struct dc;
#define TGL_UPDATE_CREATED 1
#define TGL_UPDATE_DELETED 2
#define TGL_UPDATE_PHONE 4
#define TGL_UPDATE_CONTACT 8
#define TGL_UPDATE_PHOTO 16
#define TGL_UPDATE_BLOCKED 32
#define TGL_UPDATE_REAL_NAME 64
#define TGL_UPDATE_NAME 128
#define TGL_UPDATE_REQUESTED 256
#define TGL_UPDATE_WORKING 512
#define TGL_UPDATE_FLAGS 1024
#define TGL_UPDATE_TITLE 2048
#define TGL_UPDATE_ADMIN 4096
#define TGL_UPDATE_MEMBERS 8192
struct tgl_update_callback { struct tgl_update_callback {
void (*new_msg)(struct tgl_message *M); void (*new_msg)(struct tgl_message *M);
void (*marked_read)(int num, struct tgl_message *list[]); void (*marked_read)(int num, struct tgl_message *list[]);
@ -25,20 +41,23 @@ struct tgl_update_callback {
void (*user_registered)(struct tgl_user *U); void (*user_registered)(struct tgl_user *U);
void (*user_activated)(struct tgl_user *U); void (*user_activated)(struct tgl_user *U);
void (*new_authorization)(const char *device, const char *location); void (*new_authorization)(const char *device, const char *location);
void (*secret_chat_created)(struct tgl_secret_chat *E); //void (*secret_chat_created)(struct tgl_secret_chat *E);
void (*secret_chat_request)(struct tgl_secret_chat *E); //void (*secret_chat_request)(struct tgl_secret_chat *E);
void (*secret_chat_established)(struct tgl_secret_chat *E); //void (*secret_chat_established)(struct tgl_secret_chat *E);
void (*secret_chat_deleted)(struct tgl_secret_chat *E); //void (*secret_chat_deleted)(struct tgl_secret_chat *E);
void (*secret_chat_accepted)(struct tgl_secret_chat *E); //void (*secret_chat_accepted)(struct tgl_secret_chat *E);
void (*new_user)(struct tgl_user *U); //void (*new_user)(struct tgl_user *U);
void (*delete_user)(struct tgl_user *U); //void (*delete_user)(struct tgl_user *U);
void (*update_user_info)(struct tgl_user *U); //void (*update_user_info)(struct tgl_user *U);
//void (*secret_chat_delete)(struct tgl_secret_chat *U); //void (*secret_chat_delete)(struct tgl_secret_chat *U);
//void (*secret_chat_requested)(struct tgl_secret_chat *U); //void (*secret_chat_requested)(struct tgl_secret_chat *U);
//void (*secret_chat_accepted)(struct tgl_secret_chat *U); //void (*secret_chat_accepted)(struct tgl_secret_chat *U);
//void (*secret_chat_created)(struct tgl_secret_chat *U); //void (*secret_chat_created)(struct tgl_secret_chat *U);
void (*chat_created)(struct tgl_chat *C); //void (*chat_created)(struct tgl_chat *C);
void (*chat_update)(struct tgl_chat *C); //void (*chat_update)(struct tgl_chat *C);
void (*chat_update)(struct tgl_chat *C, unsigned flags);
void (*user_update)(struct tgl_user *C, unsigned flags);
void (*secret_chat_update)(struct tgl_secret_chat *C, unsigned flags);
}; };
struct tgl_net_methods { struct tgl_net_methods {

8
updates.c
View File

@ -488,8 +488,8 @@ void tglu_work_update (struct connection *c, long long msg_id) {
pop_color (); pop_color ();
print_end ();*/ print_end ();*/
if (E->state == sc_request) { /*if (E->state == sc_request) {
if (tgl_state.callback.secret_chat_request) { if (tgl_state.callback.secret_chat_update) {
tgl_state.callback.secret_chat_request (E); tgl_state.callback.secret_chat_request (E);
} }
} else if (E->state == sc_ok) { } else if (E->state == sc_ok) {
@ -500,7 +500,7 @@ void tglu_work_update (struct connection *c, long long msg_id) {
if (tgl_state.callback.secret_chat_deleted) { if (tgl_state.callback.secret_chat_deleted) {
tgl_state.callback.secret_chat_deleted (E); tgl_state.callback.secret_chat_deleted (E);
} }
} }*/
if (E->state == sc_ok) { if (E->state == sc_ok) {
tgl_do_send_encr_chat_layer (E); tgl_do_send_encr_chat_layer (E);
} }
@ -724,6 +724,6 @@ void tglu_work_update_short_chat_message (struct connection *c, long long msg_id
void tglu_work_updates_to_long (struct connection *c, long long msg_id) { void tglu_work_updates_to_long (struct connection *c, long long msg_id) {
assert (fetch_int () == (int)CODE_updates_too_long); assert (fetch_int () == (int)CODE_updates_too_long);
vlogprintf (E_NOTICE, "updates to long... Getting difference\n"); vlogprintf (E_NOTICE, "updates too long... Getting difference\n");
tgl_do_get_difference (0, 0, 0); tgl_do_get_difference (0, 0, 0);
} }