Skip to content

Commit d074133

Browse files
committed
Fix _parseDelta() exception, fix login for new accounts
1 parent 7b375c7 commit d074133

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

fbchat-sharp/API/Client.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2776,7 +2776,7 @@ private async Task _parseDelta(JToken m)
27762776

27772777
var mid = metadata?.get("messageId")?.Value<string>();
27782778
var author_id = metadata?.get("actorFbId")?.Value<string>();
2779-
var ts = long.Parse(metadata?.get("timestamp")?.Value<string>());
2779+
long.TryParse(metadata?.get("timestamp")?.Value<string>(), out long ts);
27802780

27812781
// Added participants
27822782
if (delta.get("addedParticipants") != null)
@@ -3209,9 +3209,10 @@ await this.onPlanParticipation(
32093209
// Client payload (that weird numbers)
32103210
else if (delta_class == "ClientPayload")
32113211
{
3212-
var payload = JToken.Parse(string.Join("", delta.get("payload")?.Value<string>()));
3212+
var json = string.Join("", delta.get("payload")?.Value<string>());
3213+
var payload = JToken.Parse(json);
32133214
ts = m.get("ofd_ts")?.Value<long>() ?? 0;
3214-
foreach (var d in payload.get("deltas") ?? new JObject())
3215+
foreach (var d in payload.get("deltas") ?? new JArray())
32153216
{
32163217
// Message reaction
32173218
if (d.get("deltaMessageReaction") != null)
@@ -3720,7 +3721,7 @@ private async Task _parse_mqtt(string event_type, JToken event_data)
37203721
// event_data.get("lastIssuedSeqId")?.Value<int>() ?? event_data.get("deltas")?.LastOrDefault()?.get("irisSeqId")?.Value<int>() ?? _mqtt_sequence_id);
37213722
}
37223723

3723-
foreach (var delta in event_data.get("deltas") ?? new JObject())
3724+
foreach (var delta in event_data.get("deltas") ?? new JArray())
37243725
await this._parseDelta(new JObject() { { "delta", delta } });
37253726
}
37263727
}

fbchat-sharp/API/State.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ private bool is_home(string url)
6767
{
6868
var uri = new Uri(url);
6969
// Check the urls `/home.php` and `/`
70-
return (uri.AbsolutePath.Contains("home") || uri.AbsolutePath == "/");
70+
return (uri.AbsolutePath.Contains("home")
71+
|| uri.AbsolutePath.Contains("gettingstarted")
72+
|| uri.AbsolutePath == "/");
7173
}
7274

7375
private static string get_decoded(byte[] content)

0 commit comments

Comments
 (0)