git » sdk » commit cc8cd26

diff --git a/snikket/Chat.hx b/snikket/Chat.hx
index fb58b58..1c2db8d 100644
--- a/snikket/Chat.hx
+++ b/snikket/Chat.hx
@@ -960,21 +960,8 @@ class Channel extends Chat {
 						if (err.name == "service-unavailable" || err.name == "feature-not-implemented") return selfPingSuccess(); // Error, success!
 						if (err.name == "remote-server-not-found" || err.name == "remote-server-timeout") return selfPingSuccess(); // Timeout, retry later
 						if (err.name == "item-not-found") return selfPingSuccess(); // Nick was changed?
-						presence = []; // About to ask for a fresh set
-						_nickInUse = null;
-						inSync = false;
-						client.trigger("chats/update", [this]);
-						final desiredFullJid = JID.parse(chatId).withResource(client.displayName());
-						client.sendPresence(
-							desiredFullJid.asString(),
-							(stanza) -> {
-								stanza.tag("x", { xmlns: "http://jabber.org/protocol/muc" });
-								if (disco.features.contains("urn:xmpp:mam:2")) stanza.tag("history", { maxchars: "0" }).up();
-								// TODO: else since (last message we know about)
-								stanza.up();
-								return stanza;
-							}
-						);
+						trace("SYNC: self-ping fail, join", chatId);
+						join();
 					} else {
 						selfPingSuccess();
 					}
@@ -983,6 +970,26 @@ class Channel extends Chat {
 		});
 	}
 
+	@:allow(snikket)
+	private function join() {
+		presence = []; // About to ask for a fresh set
+		_nickInUse = null;
+		inSync = false;
+		client.trigger("chats/update", [this]);
+		final desiredFullJid = JID.parse(chatId).withResource(client.displayName());
+		client.sendPresence(
+			desiredFullJid.asString(),
+			(stanza) -> {
+				stanza.tag("x", { xmlns: "http://jabber.org/protocol/muc" });
+				if (disco.features.contains("urn:xmpp:mam:2")) stanza.tag("history", { maxchars: "0" }).up();
+				// TODO: else since (last message we know about)
+				stanza.up();
+				return stanza;
+			}
+		);
+		persistence.lastId(client.accountId(), chatId, doSync);
+	}
+
 	private function selfPingSuccess() {
 		if (nickInUse() != client.displayName()) {
 			final desiredFullJid = JID.parse(chatId).withResource(client.displayName());
@@ -1011,9 +1018,6 @@ class Channel extends Chat {
 		}
 		super.setPresence(resource, presence);
 		final tripleThree = presence?.mucUser?.allTags("status").find((status) -> status.attr.get("code") == "333");
-		if (!inSync && sync == null && oneTen != null) {
-			persistence.lastId(client.accountId(), chatId, doSync);
-		}
 		if (oneTen != null && tripleThree != null) {
 			selfPing(true);
 		}
diff --git a/snikket/Client.hx b/snikket/Client.hx
index f204c03..8152c2e 100644
--- a/snikket/Client.hx
+++ b/snikket/Client.hx
@@ -719,7 +719,7 @@ class Client extends EventEmitter {
 								.up()
 						);
 						sendPresence();
-						pingAllChannels(true);
+						joinAllChannels();
 					}
 					this.trigger("status/online", {});
 					trace("SYNC: done");
@@ -1508,4 +1508,20 @@ class Client extends EventEmitter {
 			channel?.selfPing(refresh || channel?.disco == null);
 		}
 	}
+
+	private function joinAllChannels() {
+		for (chat in getChats()) {
+			final channel = Std.downcast(chat, Channel);
+			if (channel != null) {
+				if (channel.disco.identities.length < 1) {
+					channel.refreshDisco(() -> {
+						channel.join();
+					});
+				} else {
+					channel.join();
+					haxe.Timer.delay(() -> channel.refreshDisco(), 30000);
+				}
+			}
+		}
+	}
 }