Move /t_ms delta admin text type parsing to separate file

gave92 · Feb 8, 2020 · 561d0e0 · 561d0e0
1 parent 8862d4f
commit 561d0e0
Show file tree

Hide file tree

Showing 21 changed files with 497 additions and 726 deletions.
diff --git a/fbchat-sharp/API/Client.cs b/fbchat-sharp/API/Client.cs
diff --git a/fbchat-sharp/API/ClientPayload.cs → fbchat-sharp/API/Events/ClientPayload.cs b/fbchat-sharp/API/ClientPayload.cs → fbchat-sharp/API/Events/ClientPayload.cs
@@ -1,5 +1,6 @@
 using Newtonsoft.Json.Linq;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace fbchat_sharp.API
 {
@@ -58,7 +59,7 @@ public class FB_LiveLocationEvent : FB_ThreadEvent
         {
             var thread = FB_LiveLocationEvent._get_thread(session, data);
 
-            foreach (var location_data in data?.get("messageLiveLocations").OrEmptyIfNull())
+            foreach (var location_data in data?.get("messageLiveLocations") ?? Enumerable.Empty<JToken>())
             {
                 var message = new FB_Message(session: session, thread_id: thread.uid, uid: data?.get("messageId")?.Value<string>());
                 var author = new FB_User(session: session, uid: location_data?.get("senderId")?.Value<string>());
@@ -123,9 +124,9 @@ internal class ClientPayload
     {
         public static IEnumerable<FB_Event> parse_client_payloads(Session session, JToken data)
         {
-            var payload = JToken.Parse(string.Join("", data.get("payload")?.Value<string>()));
+            var payload = JToken.Parse(string.Join("", data.get("payload")?.Select(x => x?.Value<int?>()?.ToString())));
 
-            foreach (var d in payload.get("deltas").OrEmptyIfNull())
+            foreach (var d in payload?.get("deltas") ?? Enumerable.Empty<JToken>())
             {
                 yield return parse_client_delta(session, d);
             }

diff --git a/fbchat-sharp/API/DeltaClass.cs → fbchat-sharp/API/Events/DeltaClass.cs b/fbchat-sharp/API/DeltaClass.cs → fbchat-sharp/API/Events/DeltaClass.cs