git » sdk » commit ead60ca

diff --git a/snikket/Chat.hx b/snikket/Chat.hx
index e96ddc4..48fda70 100644
--- a/snikket/Chat.hx
+++ b/snikket/Chat.hx
@@ -655,7 +655,7 @@ class Channel extends Chat {
 	}
 
 	private function prepareOutgoingMessage(message:ChatMessage) {
-		message.groupchat = true;
+		message.isGroupchat = true;
 		message.timestamp = message.timestamp ?? Date.format(std.Date.now());
 		message.direction = MessageSent;
 		message.from = client.jid;
diff --git a/snikket/ChatMessage.hx b/snikket/ChatMessage.hx
index 8605b06..a0cc791 100644
--- a/snikket/ChatMessage.hx
+++ b/snikket/ChatMessage.hx
@@ -62,7 +62,7 @@ class ChatMessage {
 	public var text: Null<String> = null;
 	public var lang: Null<String> = null;
 
-	public var groupchat: Bool = false; // Only really useful for distinguishing whispers
+	public var isGroupchat: Bool = false; // Only really useful for distinguishing whispers
 	@HaxeCBridge.noemit
 	public var direction: MessageDirection = MessageReceived;
 	@HaxeCBridge.noemit
@@ -104,7 +104,7 @@ class ChatMessage {
 
 	public function reply() {
 		final m = new ChatMessage();
-		m.groupchat = groupchat;
+		m.isGroupchat = isGroupchat;
 		m.threadId = threadId ?? ID.long();
 		m.replyToMessage = this;
 		return m;
@@ -168,7 +168,7 @@ class ChatMessage {
 
 	public function asStanza():Stanza {
 		var body = text;
-		var attrs: haxe.DynamicAccess<String> = { type: groupchat ? "groupchat" : "chat" };
+		var attrs: haxe.DynamicAccess<String> = { type: isGroupchat ? "groupchat" : "chat" };
 		if (from != null) attrs.set("from", from.asString());
 		if (to != null) attrs.set("to", to.asString());
 		if (localId != null) attrs.set("id", localId);
@@ -201,7 +201,7 @@ class ChatMessage {
 			}
 			final reaction = EmojiUtil.isEmoji(StringTools.trim(body)) ? StringTools.trim(body) : null;
 			body = quoteText + "\n" + body;
-			final replyId = replyToM.groupchat ? replyToM.serverId : replyToM.localId;
+			final replyId = replyToM.isGroupchat ? replyToM.serverId : replyToM.localId;
 			if (replyId != null) {
 				final codepoints = StringUtil.codepointArray(quoteText);
 				if (reaction != null) {
diff --git a/snikket/Message.hx b/snikket/Message.hx
index d943477..863b2d2 100644
--- a/snikket/Message.hx
+++ b/snikket/Message.hx
@@ -37,7 +37,7 @@ class Message {
 		}
 		final from = stanza.attr.get("from");
 		msg.from = from == null ? null : JID.parse(from);
-		msg.groupchat = stanza.attr.get("type") == "groupchat";
+		msg.isGroupchat = stanza.attr.get("type") == "groupchat";
 		msg.sender = stanza.attr.get("type") == "groupchat" ? msg.from : msg.from?.asBare();
 		final localJidBare = localJid.asBare();
 		final domain = localJid.domain;
@@ -174,9 +174,9 @@ class Message {
 			if (replyToID != null) {
 				// Reply stub
 				final replyToMessage = new ChatMessage();
-				replyToMessage.groupchat = msg.groupchat;
+				replyToMessage.isGroupchat = msg.isGroupchat;
 				replyToMessage.from = replyToJid == null ? null : JID.parse(replyToJid);
-				if (msg.groupchat) {
+				if (msg.isGroupchat) {
 					replyToMessage.serverId = replyToID;
 				} else {
 					replyToMessage.localId = replyToID;
diff --git a/snikket/persistence/browser.js b/snikket/persistence/browser.js
index 98019b9..6b8ba16 100644
--- a/snikket/persistence/browser.js
+++ b/snikket/persistence/browser.js
@@ -79,7 +79,7 @@ exports.xmpp.persistence = {
 			message.reactions = value.reactions;
 			message.text = value.text;
 			message.lang = value.lang;
-			message.groupchat = value.groupchat;
+			message.isGroupchat = value.isGroupchat || value.groupchat;
 			message.direction = value.direction == "MessageReceived" ? xmpp.MessageDirection.MessageReceived : xmpp.MessageDirection.MessageSent;
 			switch (value.status) {
 				case "MessagePending":
@@ -335,7 +335,7 @@ exports.xmpp.persistence = {
 					}).then((done) => {
 						if (!done) {
 							// There may be reactions already if we are paging backwards
-							const cursor = tx.objectStore("reactions").index("senders").openCursor(IDBKeyRange.bound([account, message.chatId(), (message.groupchat ? message.serverId : message.localId) || ""], [account, message.chatId(), (message.groupchat ? message.serverId : message.localId) || "", []]), "prev");
+							const cursor = tx.objectStore("reactions").index("senders").openCursor(IDBKeyRange.bound([account, message.chatId(), (message.isGroupchat ? message.serverId : message.localId) || ""], [account, message.chatId(), (message.isGroupchat ? message.serverId : message.localId) || "", []]), "prev");
 							const reactions = new Map();
 							const reactionTimes = new Map();
 							cursor.onsuccess = (event) => {