Fixed a cause for duplicate MUC messages #46

When messages do not have an id attribute, but instead only an MAM archive node with an id attribute UWPX would handle them as new unique messages.
UWPX · Mar 1, 2020 · 47d6162 · 47d6162
1 parent c5d669e
commit 47d6162
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/XMPP_API/Classes/Consts.cs b/XMPP_API/Classes/Consts.cs
@@ -85,5 +85,7 @@ public static class Consts
         public const string XML_XEP_0336_NAMESPACE = "urn:xmpp:xdata:dynamic";
         // XEP-IoT:
         public const string XML_XEP_IOT_NAMESPACE = "urn:xmpp:uwpx:iot";
+        // XEP-0313 (Message Archive Management)
+        public const string XML_XEP_0313_NAMESPACE = "urn:xmpp:mam:tmp";
     }
 }
diff --git a/XMPP_API/Classes/Network/XML/Messages/MessageMessage.cs b/XMPP_API/Classes/Network/XML/Messages/MessageMessage.cs
@@ -53,7 +53,7 @@ public MessageMessage(XmlNode node, string type) : this(node, CarbonCopyType.NON
             chatMessageId = null;
         }
 
-        public MessageMessage(XmlNode node, CarbonCopyType ccType) : base(node.Attributes["from"]?.Value, node.Attributes["to"]?.Value, (node.Attributes["id"]?.Value) ?? getRandomId())
+        public MessageMessage(XmlNode node, CarbonCopyType ccType) : base(node.Attributes["from"]?.Value, node.Attributes["to"]?.Value, loadMessageId(node))
         {
             CC_TYPE = ccType;
             if (!node.HasChildNodes)
@@ -130,6 +130,30 @@ public DateTime getDelay()
             return delay;
         }
 
+        protected static string loadMessageId(XmlNode node)
+        {
+            // Check for the default message ID attribute:
+            string id = node.Attributes["id"]?.Value;
+            if (!(id is null))
+            {
+                return id;
+            }
+
+            // Check for a MAM-ID in the archived node:
+            XmlNode archivedNode = XMLUtils.getChildNode(node, "archived", Consts.XML_XMLNS, Consts.XML_XEP_0313_NAMESPACE);
+            if (!(archivedNode is null))
+            {
+                id = archivedNode.Attributes["id"]?.Value;
+                if (!(id is null))
+                {
+                    return id;
+                }
+            }
+
+            // Fall back to a new message ID:
+            return getRandomId();
+        }
+
         #endregion
         //--------------------------------------------------------Misc Methods:---------------------------------------------------------------\\
         #region --Misc Methods (Public)--