aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfiaxh <git@lightrise.org>2020-10-27 11:56:45 +0100
committerfiaxh <git@lightrise.org>2020-10-27 12:02:52 +0100
commitedbc8f794d42cc30bfbe6602becb43c3500e02a2 (patch)
tree2175d9c6f276bdb3151098e95f54a8f3d2be1813
parent5954f7764f239d213ae5b30887994f4af535b81f (diff)
downloaddino-edbc8f794d42cc30bfbe6602becb43c3500e02a2.tar.gz
dino-edbc8f794d42cc30bfbe6602becb43c3500e02a2.zip
Don't crash on MAM id-time hickup
fixes #886
-rw-r--r--libdino/src/service/message_processor.vala80
1 files changed, 47 insertions, 33 deletions
diff --git a/libdino/src/service/message_processor.vala b/libdino/src/service/message_processor.vala
index 80c6b2d8..98f14945 100644
--- a/libdino/src/service/message_processor.vala
+++ b/libdino/src/service/message_processor.vala
@@ -130,7 +130,10 @@ public class MessageProcessor : StreamInteractionModule, Object {
string? id = message.stanza.get_deep_attribute(mam_flag.ns_ver + ":result", "id");
if (id == null) return;
StanzaNode? delay_node = message.stanza.get_deep_subnode(mam_flag.ns_ver + ":result", "urn:xmpp:forward:0:forwarded", "urn:xmpp:delay:delay");
- if (delay_node == null) return;
+ if (delay_node == null) {
+ warning("MAM result did not contain delayed time %s", message.stanza.to_string());
+ return;
+ }
DateTime? time = DelayedDelivery.get_time_for_node(delay_node);
if (time == null) return;
mam_times[account][id] = time;
@@ -253,40 +256,51 @@ public class MessageProcessor : StreamInteractionModule, Object {
while (iq != null) {
string? earliest_id = iq.stanza.get_deep_string_content("urn:xmpp:mam:2:fin", "http://jabber.org/protocol/rsm" + ":set", "first");
if (earliest_id == null) return true;
+ string? latest_id = iq.stanza.get_deep_string_content("urn:xmpp:mam:2:fin", "http://jabber.org/protocol/rsm" + ":set", "last");
- if (!mam_times[account].has_key(earliest_id)) error("wtf");
-
- debug("MAM: [%s] Update from_id %s", account.bare_jid.to_string(), earliest_id);
- if (!current_catchup_id.has_key(account)) {
- debug("MAM: [%s] We get our first MAM page", account.bare_jid.to_string());
- string? latest_id = iq.stanza.get_deep_string_content("urn:xmpp:mam:2:fin", "http://jabber.org/protocol/rsm" + ":set", "last");
- if (!mam_times[account].has_key(latest_id)) error("wtf2");
- current_catchup_id[account] = (int) db.mam_catchup.insert()
- .value(db.mam_catchup.account_id, account.id)
- .value(db.mam_catchup.from_id, earliest_id)
- .value(db.mam_catchup.from_time, (long)mam_times[account][earliest_id].to_unix())
- .value(db.mam_catchup.to_id, latest_id)
- .value(db.mam_catchup.to_time, (long)mam_times[account][latest_id].to_unix())
- .perform();
- } else {
- // Update existing id
- db.mam_catchup.update()
- .set(db.mam_catchup.from_id, earliest_id)
- .set(db.mam_catchup.from_time, (long)mam_times[account][earliest_id].to_unix()) // need to make sure we have this
- .with(db.mam_catchup.id, "=", current_catchup_id[account])
- .perform();
- }
+ // We wait until all the messages from the page are processed (and we got the `mam_times` from them)
+ Idle.add(get_mam_range.callback, Priority.LOW);
+ yield;
- TimeSpan catchup_time_ago = (new DateTime.now_utc()).difference(mam_times[account][earliest_id]);
- int wait_ms = 10;
- if (catchup_time_ago > 14 * TimeSpan.DAY) {
- wait_ms = 2000;
- } else if (catchup_time_ago > 5 * TimeSpan.DAY) {
- wait_ms = 1000;
- } else if (catchup_time_ago > 2 * TimeSpan.DAY) {
- wait_ms = 200;
- } else if (catchup_time_ago > TimeSpan.DAY) {
- wait_ms = 50;
+ int wait_ms = 1000;
+
+
+ if (mam_times[account].has_key(earliest_id) && (current_catchup_id.has_key(account) || mam_times[account].has_key(latest_id))) {
+
+ debug("MAM: [%s] Update from_id %s", account.bare_jid.to_string(), earliest_id);
+ if (!current_catchup_id.has_key(account)) {
+ debug("MAM: [%s] We get our first MAM page", account.bare_jid.to_string());
+ current_catchup_id[account] = (int) db.mam_catchup.insert()
+ .value(db.mam_catchup.account_id, account.id)
+ .value(db.mam_catchup.from_id, earliest_id)
+ .value(db.mam_catchup.from_time, (long)mam_times[account][earliest_id].to_unix())
+ .value(db.mam_catchup.to_id, latest_id)
+ .value(db.mam_catchup.to_time, (long)mam_times[account][latest_id].to_unix())
+ .perform();
+ } else {
+ // Update existing id
+ db.mam_catchup.update()
+ .set(db.mam_catchup.from_id, earliest_id)
+ .set(db.mam_catchup.from_time, (long)mam_times[account][earliest_id].to_unix())
+ .with(db.mam_catchup.id, "=", current_catchup_id[account])
+ .perform();
+ }
+
+ TimeSpan catchup_time_ago = (new DateTime.now_utc()).difference(mam_times[account][earliest_id]);
+
+ if (catchup_time_ago > 14 * TimeSpan.DAY) {
+ wait_ms = 2000;
+ } else if (catchup_time_ago > 5 * TimeSpan.DAY) {
+ wait_ms = 1000;
+ } else if (catchup_time_ago > 2 * TimeSpan.DAY) {
+ wait_ms = 200;
+ } else if (catchup_time_ago > TimeSpan.DAY) {
+ wait_ms = 50;
+ } else {
+ wait_ms = 10;
+ }
+ } else {
+ warning("Didn't have time for MAM id; earliest_id:%s latest_id:%s", mam_times[account].has_key(earliest_id).to_string(), mam_times[account].has_key(latest_id).to_string());
}
mam_times[account] = new HashMap<string, DateTime>();