From 8ff3b7857765ac5bceda5d5d1c0b0a596dfea966 Mon Sep 17 00:00:00 2001
From: luckydonald <luckydonald@flutterb.at>
Date: Tue, 19 May 2015 21:25:20 +0200
Subject: [PATCH 1/2] added status string to 'typing' service. E.g. ``` {  ...
 ,   "type":"typing", "status":"recording audio",  ... }```

---
 json-tg.c | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/json-tg.c b/json-tg.c
index 376708c..ae83d16 100644
--- a/json-tg.c
+++ b/json-tg.c
@@ -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;

From 9268a89d4509e2133844c35b415b07520800691c Mon Sep 17 00:00:00 2001
From: vvaltman <vvaltman@neon>
Date: Wed, 27 May 2015 17:32:14 +0300
Subject: [PATCH 2/2] fixed pull request

---
 json-tg.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/json-tg.c b/json-tg.c
index ae83d16..4ab3485 100644
--- a/json-tg.c
+++ b/json-tg.c
@@ -350,6 +350,7 @@ json_t *json_pack_service (struct tgl_message *M) {
   case tgl_message_action_typing:    
     assert (json_object_set (res, "type", json_string ("typing")) >= 0);
     assert (json_array_append (res, json_pack_typing (M->action.typing)) >= 0);
+    break;
   case tgl_message_action_noop:
     assert (json_object_set (res, "type", json_string ("noop")) >= 0);
     break;