@ethora/chat-component 25.6.10 → 25.6.11

package/dist/main.js

@@ -4969,7 +4969,9 @@ const so = (n) => ({
   setLangSource: W1
 } = j1.actions, Hv = j1.reducer, yc = (n, e) => new Date(n) < new Date(e), ao = (n, e) => new Date(n) > new Date(e);
 function Uv(n, e, i) {
-  if (n.find((A) => A.id === e.id)) return;
+  if (n.find(
+    (A) => A.id === e.id || e.xmppId && A.id === e.xmppId || A.xmppId && A.xmppId === e.id
+  )) return;
   const r = e.date, s = n[n.length - 1], a = n[0];
   if (ao(r.toString(), s.date.toString())) {
     const A = n.findIndex(
@@ -5109,9 +5111,21 @@ const Jv = {
       const { roomJID: i, message: t, start: r } = e.payload;
       if (!t?.body) return;
       const s = n.rooms[i]?.messages, a = Object.keys(JSON.parse(JSON.stringify(n.rooms))).length > 0, A = !!n?.rooms[i];
-      if (!a || !A || (s || (n.rooms[i].messages = []), s.some((f) => f.id === t.id)))
+      if (!a || !A)
         return;
-      const o = {
+      s || (n.rooms[i].messages = []);
+      const o = s.findIndex(
+        (d) => d.id === t.id || t.xmppId && d.id === t.xmppId || d.xmppId && d.xmppId === t.id
+      );
+      if (o !== -1) {
+        s[o] = {
+          ...s[o],
+          ...t,
+          pending: !1
+        };
+        return;
+      }
+      const f = {
         ...t,
         user: {
           name: zv(n.usersSet, t.user.id),
@@ -5119,20 +5133,20 @@ const Jv = {
         }
       };
       if (s.length === 0 || r) {
-        const f = s.findIndex(
-          (d) => d.id === t.xmppId || d.id === t.id
+        const d = s.findIndex(
+          (l) => l.id === t.xmppId || l.id === t.id
         );
-        f !== -1 ? s[f] = {
-          ...o,
-          id: o.id,
+        d !== -1 ? s[d] = {
+          ...f,
+          id: f.id,
           pending: !1
-        } : s.unshift(o);
+        } : s.unshift(f);
       } else {
-        const f = n.rooms[i].lastViewedTimestamp ? new Date(n.rooms[i].lastViewedTimestamp) : null;
+        const d = n.rooms[i].lastViewedTimestamp ? new Date(n.rooms[i].lastViewedTimestamp) : null;
         Uv(
           s,
-          o,
-          f
+          f,
+          d
         );
       }
     },