Parse buddylist presence updates, reconnect to MQTT

gave92 · Nov 24, 2019 · fe14554 · fe14554
1 parent f0c4795
commit fe14554
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 4 deletions.
diff --git a/fbchat-sharp/API/Client.cs b/fbchat-sharp/API/Client.cs
@@ -3618,9 +3618,18 @@ public async Task<bool> startListening(CancellationTokenSource _cancellationToke
                 }
             });
 
-            mqttClient.UseDisconnectedHandler(e =>
+            mqttClient.UseDisconnectedHandler(async e =>
             {
                 Debug.WriteLine("### DISCONNECTED FROM SERVER ###");
+                try
+                {
+                    await Task.Delay(TimeSpan.FromSeconds(5), _cancellationTokenSource.Token);
+                    await mqttClient.ConnectAsync(options, _cancellationTokenSource.Token);
+                }
+                catch (Exception ex)
+                {
+                    Debug.WriteLine(ex.ToString());
+                }
             });
 
             await mqttClient.ConnectAsync(options, _cancellationTokenSource.Token);
@@ -3649,7 +3658,37 @@ private async Task _parse_mqtt(string event_type, JToken event_data)
                     event_data.get("lastIssuedSeqId")?.Value<int>() ?? event_data.get("deltas")?.LastOrDefault()?.get("irisSeqId")?.Value<int>() ?? _seq);
                 foreach (var delta in event_data.get("deltas") ?? new JObject())
                     await this._parseDelta(new JObject() { { "delta", delta } });
-            }            
+            }
+            else if (new string[] { "/thread_typing", "/orca_typing_notifications" }.Contains(event_type))
+            {
+                var author_id = event_data.get("sender_fbid")?.Value<string>();
+                var thread_id = event_data.get("thread")?.Value<string>() ?? author_id;
+                var typing_status = (TypingStatus)(event_data.get("state")?.Value<int>());
+                await this.onTyping(
+                    author_id: author_id,
+                    status: typing_status,
+                    thread_id: thread_id,
+                    thread_type: thread_id == author_id ? ThreadType.USER : ThreadType.GROUP,
+                    msg: event_data
+                );
+            }
+            else if (event_type == "/orca_presence")
+            {
+                var statuses = new Dictionary<string, FB_ActiveStatus>();
+                foreach (var data in event_data.get("list"))
+                {
+                    var user_id = data["u"]?.Value<string>();
+
+                    bool old_in_game = false;
+                    if (this._buddylist.ContainsKey(user_id))
+                        old_in_game = this._buddylist[user_id].in_game;
+
+                    statuses[user_id] = FB_ActiveStatus._from_orca_presence(data, old_in_game);
+                    this._buddylist[user_id] = statuses[user_id];
+
+                    await this.onBuddylistOverlay(statuses: statuses, msg: event_data);
+                }
+            }
         }
 
         /// <summary>

diff --git a/fbchat-sharp/API/Thread.cs b/fbchat-sharp/API/Thread.cs
@@ -12,7 +12,8 @@ public enum ThreadType
         GROUP = 2,
         ROOM = 2,
         PAGE = 3,
-        INVALID = 4
+        MARKETPLACE = 4,
+        INVALID = 5
     }
 
     /// <summary>

diff --git a/fbchat-sharp/API/User.cs b/fbchat-sharp/API/User.cs
@@ -301,5 +301,13 @@ public static FB_ActiveStatus _from_buddylist_update(JToken data)
                 last_active: null,
                 in_game: false);
         }
+
+        public static FB_ActiveStatus _from_orca_presence(JToken data, bool in_game = false)
+        {
+            return new FB_ActiveStatus(
+                active: new int[] { 2, 3 }.Contains(data.get("p")?.Value<int>() ?? 0),
+                last_active: data.get("l")?.Value<string>(),
+                in_game: in_game);
+        }
     }
 }
diff --git a/fbchat-sharp/API/Utils.cs b/fbchat-sharp/API/Utils.cs
@@ -234,7 +234,6 @@ public static Type _to_class(this ThreadType threadType)
                 //    return typeof(FB_Room);
                 case ThreadType.PAGE:
                     return typeof(FB_Page);
-                case ThreadType.INVALID:
                 default:
                     throw new FBchatException($"Invalid thread type: {threadType}.");
             }