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

Merge pull request #618 from Floens/user_status_pack_peer

Browse Source 
Add more info to the JSON user status event
This commit is contained in:
vysheng 2015-06-12 11:54:06 +03:00
commit 105ccd2821
3 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
interface.c
View File

@ -1853,7 +1853,7 @@ void print_user_list_gw (struct tgl_state *TLSR, void *extra, int success, int n
json_t *res = json_array (); json_t *res = json_array ();
int i; int i;
for (i = num - 1; i >= 0; i--) { for (i = num - 1; i >= 0; i--) {
json_t *a = json_pack_peer (UL[i]->id, (void *)UL[i]); json_t *a = json_pack_peer (UL[i]->id);
assert (json_array_append (res, a) >= 0); assert (json_array_append (res, a) >= 0);
} }
char *s = json_dumps (res, 0); char *s = json_dumps (res, 0);
@ -1879,7 +1879,7 @@ void print_user_gw (struct tgl_state *TLSR, void *extra, int success, struct tgl
mprintf (ev, "\n"); mprintf (ev, "\n");
} else { } else {
#ifdef USE_JSON #ifdef USE_JSON
json_t *res = json_pack_peer (U->id, (void *)U); json_t *res = json_pack_peer (U->id);
char *s = json_dumps (res, 0); char *s = json_dumps (res, 0);
mprintf (ev, "%s\n", s); mprintf (ev, "%s\n", s);
json_decref (res); json_decref (res);
@ -1992,7 +1992,7 @@ void print_chat_info_gw (struct tgl_state *TLSR, void *extra, int success, struc
mpop_color (ev); mpop_color (ev);
} else { } else {
#ifdef USE_JSON #ifdef USE_JSON
json_t *res = json_pack_peer (C->id, (void *)C); json_t *res = json_pack_peer (C->id);
char *s = json_dumps (res, 0); char *s = json_dumps (res, 0);
mprintf (ev, "%s\n", s); mprintf (ev, "%s\n", s);
json_decref (res); json_decref (res);
@ -2052,7 +2052,7 @@ void print_user_info_gw (struct tgl_state *TLSR, void *extra, int success, struc
mpop_color (ev); mpop_color (ev);
} else { } else {
#ifdef USE_JSON #ifdef USE_JSON
json_t *res = json_pack_peer (U->id, (void *)U); json_t *res = json_pack_peer (U->id);
char *s = json_dumps (res, 0); char *s = json_dumps (res, 0);
mprintf (ev, "%s\n", s); mprintf (ev, "%s\n", s);
json_decref (res); json_decref (res);
@ -2079,7 +2079,7 @@ void print_secret_chat_gw (struct tgl_state *TLSR, void *extra, int success, str
mpop_color (ev); mpop_color (ev);
} else { } else {
#ifdef USE_JSON #ifdef USE_JSON
json_t *res = json_pack_peer (E->id, (void *)E); json_t *res = json_pack_peer (E->id);
char *s = json_dumps (res, 0); char *s = json_dumps (res, 0);
mprintf (ev, "%s\n", s); mprintf (ev, "%s\n", s);
json_decref (res); json_decref (res);
@ -2124,7 +2124,7 @@ void print_dialog_list_gw (struct tgl_state *TLSR, void *extra, int success, int
json_t *res = json_array (); json_t *res = json_array ();
int i; int i;
for (i = size - 1; i >= 0; i--) { for (i = size - 1; i >= 0; i--) {
json_t *a = json_pack_peer (peers[i], tgl_peer_get (TLS, peers[i])); json_t *a = json_pack_peer (peers[i]);
assert (json_array_append (res, a) >= 0); assert (json_array_append (res, a) >= 0);
} }
char *s = json_dumps (res, 0); char *s = json_dumps (res, 0);
@ -2427,7 +2427,7 @@ void json_peer_update (struct in_ev *ev, tgl_peer_t *P, unsigned flags) {
#ifdef USE_JSON #ifdef USE_JSON
json_t *res = json_object (); json_t *res = json_object ();
assert (json_object_set (res, "event", json_string ("updates")) >= 0); assert (json_object_set (res, "event", json_string ("updates")) >= 0);
assert (json_object_set (res, "peer", json_pack_peer (P->id, P)) >= 0); assert (json_object_set (res, "peer", json_pack_peer (P->id)) >= 0);
assert (json_object_set (res, "updates", json_pack_updates (flags)) >= 0); assert (json_object_set (res, "updates", json_pack_updates (flags)) >= 0);
char *s = json_dumps (res, 0); char *s = json_dumps (res, 0);
mprintf (ev, "%s\n", s); mprintf (ev, "%s\n", s);

25
json-tg.c
View File

@ -66,7 +66,7 @@ void json_pack_chat (json_t *res, tgl_peer_t *P) {
int i; int i;
for (i = 0; i < P->chat.users_num; i++) { for (i = 0; i < P->chat.users_num; i++) {
tgl_peer_id_t id = TGL_MK_USER (P->chat.user_list[i].user_id); tgl_peer_id_t id = TGL_MK_USER (P->chat.user_list[i].user_id);
assert (json_array_append (m, json_pack_peer (id, tgl_peer_get (TLS, id))) >= 0); assert (json_array_append (m, json_pack_peer (id)) >= 0);
} }
assert (json_object_set (res, "members", m) >= 0); assert (json_object_set (res, "members", m) >= 0);
@ -75,10 +75,12 @@ void json_pack_chat (json_t *res, tgl_peer_t *P) {
void json_pack_encr_chat (json_t *res, tgl_peer_t *P) { void json_pack_encr_chat (json_t *res, tgl_peer_t *P) {
assert (json_object_set (res, "user", json_pack_peer (TGL_MK_USER (P->encr_chat.user_id), tgl_peer_get (TLS, TGL_MK_USER (P->encr_chat.user_id)))) >= 0); assert (json_object_set (res, "user", json_pack_peer (TGL_MK_USER (P->encr_chat.user_id))) >= 0);
} }
json_t *json_pack_peer (tgl_peer_id_t id, tgl_peer_t *P) { json_t *json_pack_peer (tgl_peer_id_t id) {
tgl_peer_t *P = tgl_peer_get (TLS, id);
assert (P);
json_t *res = json_object (); json_t *res = json_object ();
assert (json_object_set (res, "id", json_integer (tgl_get_peer_id (id))) >= 0); assert (json_object_set (res, "id", json_integer (tgl_get_peer_id (id))) >= 0);
@ -313,15 +315,15 @@ json_t *json_pack_service (struct tgl_message *M) {
break; break;
case tgl_message_action_chat_add_user: case tgl_message_action_chat_add_user:
assert (json_object_set (res, "type", json_string ("chat_add_user")) >= 0); assert (json_object_set (res, "type", json_string ("chat_add_user")) >= 0);
assert (json_object_set (res, "user", json_pack_peer (tgl_set_peer_id (TGL_PEER_USER, M->action.user), tgl_peer_get (TLS, tgl_set_peer_id (TGL_PEER_USER, M->action.user)))) >= 0); assert (json_object_set (res, "user", json_pack_peer (tgl_set_peer_id (TGL_PEER_USER, M->action.user))) >= 0);
break; break;
case tgl_message_action_chat_add_user_by_link: case tgl_message_action_chat_add_user_by_link:
assert (json_object_set (res, "type", json_string ("chat_add_user_link")) >= 0); assert (json_object_set (res, "type", json_string ("chat_add_user_link")) >= 0);
assert (json_object_set (res, "user", json_pack_peer (tgl_set_peer_id (TGL_PEER_USER, M->action.user), tgl_peer_get (TLS, tgl_set_peer_id (TGL_PEER_USER, M->action.user)))) >= 0); assert (json_object_set (res, "user", json_pack_peer (tgl_set_peer_id (TGL_PEER_USER, M->action.user))) >= 0);
break; break;
case tgl_message_action_chat_delete_user: case tgl_message_action_chat_delete_user:
assert (json_object_set (res, "type", json_string ("chat_del_user")) >= 0); assert (json_object_set (res, "type", json_string ("chat_del_user")) >= 0);
assert (json_object_set (res, "user", json_pack_peer (tgl_set_peer_id (TGL_PEER_USER, M->action.user), tgl_peer_get (TLS, tgl_set_peer_id (TGL_PEER_USER, M->action.user)))) >= 0); assert (json_object_set (res, "user", json_pack_peer (tgl_set_peer_id (TGL_PEER_USER, M->action.user))) >= 0);
break; break;
case tgl_message_action_set_message_ttl: case tgl_message_action_set_message_ttl:
assert (json_object_set (res, "type", json_string ("set_ttl")) >= 0); assert (json_object_set (res, "type", json_string ("set_ttl")) >= 0);
@ -386,7 +388,7 @@ json_t *json_pack_message (struct tgl_message *M) {
assert (json_object_set (res, "flags", json_integer (M->flags)) >= 0); assert (json_object_set (res, "flags", json_integer (M->flags)) >= 0);
if (tgl_get_peer_type (M->fwd_from_id)) { if (tgl_get_peer_type (M->fwd_from_id)) {
assert (json_object_set (res, "fwd_from", json_pack_peer (M->fwd_from_id, tgl_peer_get (TLS, M->fwd_from_id))) >= 0); assert (json_object_set (res, "fwd_from", json_pack_peer (M->fwd_from_id)) >= 0);
assert (json_object_set (res, "fwd_date", json_integer (M->fwd_date)) >= 0); assert (json_object_set (res, "fwd_date", json_integer (M->fwd_date)) >= 0);
} }
@ -398,8 +400,8 @@ json_t *json_pack_message (struct tgl_message *M) {
assert (json_object_set (res, "mention", json_true ()) >= 0); assert (json_object_set (res, "mention", json_true ()) >= 0);
} }
assert (json_object_set (res, "from", json_pack_peer (M->from_id, tgl_peer_get (TLS, M->from_id))) >= 0); assert (json_object_set (res, "from", json_pack_peer (M->from_id)) >= 0);
assert (json_object_set (res, "to", json_pack_peer (M->to_id, tgl_peer_get (TLS, M->to_id))) >= 0); assert (json_object_set (res, "to", json_pack_peer (M->to_id)) >= 0);
assert (json_object_set (res, "out", json_boolean (M->flags & TGLMF_OUT)) >= 0); assert (json_object_set (res, "out", json_boolean (M->flags & TGLMF_OUT)) >= 0);
assert (json_object_set (res, "unread", json_boolean (M->flags & TGLMF_UNREAD)) >= 0); assert (json_object_set (res, "unread", json_boolean (M->flags & TGLMF_UNREAD)) >= 0);
@ -435,11 +437,8 @@ int str_format_time(long when, char* string)
json_t *json_pack_user_status (struct tgl_user *U) { json_t *json_pack_user_status (struct tgl_user *U) {
json_t *res = json_object (); json_t *res = json_object ();
assert (json_object_set (res, "user", json_pack_peer (U->id)) >= 0);
struct tgl_user_status *S = &U->status; struct tgl_user_status *S = &U->status;
json_object ();
json_t *user_res = json_object ();
json_pack_user(user_res, (void *) U);
assert (json_object_set (res, "user", user_res) >= 0);
assert (json_object_set (res, "online", json_boolean (S->online == 1)) >= 0); assert (json_object_set (res, "online", json_boolean (S->online == 1)) >= 0);
assert (json_object_set (res, "state", json_integer (S->online)) >= 0); assert (json_object_set (res, "state", json_integer (S->online)) >= 0);
if (S->online > 0 || S->online == -1) { if (S->online > 0 || S->online == -1) {

2
json-tg.h
View File

@ -7,7 +7,7 @@
#include <tgl/tgl-layout.h> #include <tgl/tgl-layout.h>
json_t *json_pack_message (struct tgl_message *M); json_t *json_pack_message (struct tgl_message *M);
json_t *json_pack_updates (unsigned flags); json_t *json_pack_updates (unsigned flags);
json_t *json_pack_peer (tgl_peer_id_t id, tgl_peer_t *P); json_t *json_pack_peer (tgl_peer_id_t id);
json_t *json_pack_read (struct tgl_message *M); json_t *json_pack_read (struct tgl_message *M);
json_t *json_pack_user_status (struct tgl_user *U); json_t *json_pack_user_status (struct tgl_user *U);
#endif #endif