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

Merge branch 'master' of https://github.com/luckydonald/tg into luckydonald-master

Browse Source
This commit is contained in:
vvaltman 2015-05-27 17:31:51 +03:00
commit 3aae4ed7be
1 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
json-tg.c
View File

@ -243,6 +243,49 @@ json_t *json_pack_media (struct tgl_message_media *M) {
return res;
}
json_t *json_pack_typing (enum tgl_typing_status status) {
json_t *res = json_object ();
switch (status) {
case tgl_typing_none:
assert (json_object_set (res, "status", json_string ("doing nothing")) >= 0);
break;
case tgl_typing_typing:
assert (json_object_set (res, "status", json_string ("typing")) >= 0);
break;
case tgl_typing_cancel:
assert (json_object_set (res, "status", json_string ("deleting typed message")) >= 0);
break;
case tgl_typing_record_video:
assert (json_object_set (res, "status", json_string ("recording video")) >= 0);
break;
case tgl_typing_upload_video:
assert (json_object_set (res, "status", json_string ("uploading video")) >= 0);
break;
case tgl_typing_record_audio:
assert (json_object_set (res, "status", json_string ("recording audio")) >= 0);
break;
case tgl_typing_upload_audio:
assert (json_object_set (res, "status", json_string ("uploading audio")) >= 0);
break;
case tgl_typing_upload_photo:
assert (json_object_set (res, "status", json_string ("uploading photo")) >= 0);
break;
case tgl_typing_upload_document:
assert (json_object_set (res, "status", json_string ("uploading document")) >= 0);
break;
case tgl_typing_geo:
assert (json_object_set (res, "status", json_string ("choosing location")) >= 0);
break;
case tgl_typing_choose_contact:
assert (json_object_set (res, "status", json_string ("choosing contact")) >= 0);
break;
default:
assert (json_object_set (res, "status", json_string ("???")) >= 0);
break;
}
return res;
}
json_t *json_pack_service (struct tgl_message *M) {
json_t *res = json_object ();
switch (M->action.type) {
@ -306,7 +349,7 @@ json_t *json_pack_service (struct tgl_message *M) {
break;
case tgl_message_action_typing:
assert (json_object_set (res, "type", json_string ("typing")) >= 0);
break;
assert (json_array_append (res, json_pack_typing (M->action.typing)) >= 0);
case tgl_message_action_noop:
assert (json_object_set (res, "type", json_string ("noop")) >= 0);
break;