groupchat 0.0.14 → 0.0.15

package/dist/index.js

@@ -4373,7 +4373,7 @@ var require_react_development = __commonJS({
           var dispatcher = resolveDispatcher();
           return dispatcher.useReducer(reducer, initialArg, init);
         }
-        function useRef6(initialValue) {
+        function useRef7(initialValue) {
           var dispatcher = resolveDispatcher();
           return dispatcher.useRef(initialValue);
         }
@@ -5167,7 +5167,7 @@ var require_react_development = __commonJS({
         exports.useLayoutEffect = useLayoutEffect3;
         exports.useMemo = useMemo10;
         exports.useReducer = useReducer;
-        exports.useRef = useRef6;
+        exports.useRef = useRef7;
         exports.useState = useState17;
         exports.useSyncExternalStore = useSyncExternalStore;
         exports.useTransition = useTransition;
@@ -35294,7 +35294,7 @@ function Menu({
                 isSelected: selectedIndex === newDmIndex
               }
             ),
-            isLoadingDms ? /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(Text, { color: "cyan", children: "Loading conversations..." }) }) : dmConversations.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(Text, { color: "gray", children: "No Direct Messages Yet.." }) }) : /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(import_jsx_runtime7.Fragment, { children: [
+            isLoadingDms && dmConversations.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(Text, { color: "cyan", children: "Loading conversations..." }) }) : dmConversations.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(Text, { color: "gray", children: "No Direct Messages Yet.." }) }) : /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(import_jsx_runtime7.Fragment, { children: [
               dmConversations.slice(0, 5).map((conversation, idx) => {
                 const absoluteIndex = dmStartIndex + idx;
                 const isSelected = selectedIndex === absoluteIndex;
@@ -38668,7 +38668,10 @@ function DmConversation({
     const originalOnDmMessage = channelManager["callbacks"].onDmMessage;
     const originalOnDmTypingStart = channelManager["callbacks"].onDmTypingStart;
     const originalOnDmTypingStop = channelManager["callbacks"].onDmTypingStop;
-    channelManager["callbacks"].onDmMessage = handleDmMessage;
+    channelManager["callbacks"].onDmMessage = (msg) => {
+      handleDmMessage(msg);
+      originalOnDmMessage?.(msg);
+    };
     channelManager["callbacks"].onDmTypingStart = handleTypingStart2;
     channelManager["callbacks"].onDmTypingStop = handleTypingStop2;
     return () => {
@@ -38679,11 +38682,9 @@ function DmConversation({
   }, [channelManager, dm?.slug, username, isScrollDetached]);
   const handleSendMessage = (0, import_react38.useCallback)(async (content) => {
     if (!channelManager || !dm) return;
-    try {
-      await channelManager.sendDmMessage(dm.slug, content);
-    } catch (err) {
+    channelManager.sendDmMessage(dm.slug, content).catch(() => {
       setError("Failed to send message");
-    }
+    });
   }, [channelManager, dm]);
   const handleTypingStart = (0, import_react38.useCallback)(() => {
     if (!channelManager || !dm) return;
@@ -38801,6 +38802,57 @@ var init_DmConversation = __esm({
   }
 });
 
+// src/lib/presence-utils.ts
+function upsertMetas(existing, incoming) {
+  if (incoming.length === 0) return existing;
+  const merged = existing.slice();
+  const indexByRef = /* @__PURE__ */ new Map();
+  existing.forEach((meta, index) => {
+    indexByRef.set(meta.phx_ref, index);
+  });
+  incoming.forEach((meta) => {
+    const index = indexByRef.get(meta.phx_ref);
+    if (index === void 0) {
+      indexByRef.set(meta.phx_ref, merged.length);
+      merged.push(meta);
+    } else {
+      merged[index] = meta;
+    }
+  });
+  return merged;
+}
+function removeMetas(existing, leaving) {
+  if (leaving.length === 0) return existing;
+  const refsToRemove = new Set(leaving.map((meta) => meta.phx_ref));
+  return existing.filter((meta) => !refsToRemove.has(meta.phx_ref));
+}
+function applyPresenceDiff(prev, diff2) {
+  const next = { ...prev };
+  Object.entries(diff2.leaves).forEach(([username, data]) => {
+    const existing = next[username]?.metas;
+    if (!existing || existing.length === 0) return;
+    const remaining = removeMetas(existing, data.metas);
+    if (remaining.length === 0) {
+      delete next[username];
+    } else {
+      next[username] = { metas: remaining };
+    }
+  });
+  Object.entries(diff2.joins).forEach(([username, data]) => {
+    const existing = next[username]?.metas ?? [];
+    const merged = upsertMetas(existing, data.metas);
+    if (merged.length > 0) {
+      next[username] = { metas: merged };
+    }
+  });
+  return next;
+}
+var init_presence_utils = __esm({
+  "src/lib/presence-utils.ts"() {
+    "use strict";
+  }
+});
+
 // src/lib/channel-manager.ts
 function extractTimestampFromUUIDv7(uuid) {
   const hex = uuid.replace(/-/g, "").slice(0, 12);
@@ -38812,6 +38864,7 @@ var init_channel_manager = __esm({
   "src/lib/channel-manager.ts"() {
     "use strict";
     init_phoenix();
+    init_presence_utils();
     if (typeof globalThis.WebSocket === "undefined") {
       throw new Error(
         "WebSocket is not available. Load the ws polyfill before ChannelManager."
@@ -38925,10 +38978,7 @@ var init_channel_manager = __esm({
           });
           this.statusChannel.on("presence_diff", (payload) => {
             const diff2 = payload;
-            const next = { ...this.globalPresence };
-            Object.keys(diff2.leaves).forEach((u) => delete next[u]);
-            Object.entries(diff2.joins).forEach(([u, d]) => next[u] = d);
-            this.globalPresence = next;
+            this.globalPresence = applyPresenceDiff(this.globalPresence, diff2);
             this.callbacks.onGlobalPresenceDiff?.(diff2);
           });
           this.statusChannel.join().receive("ok", () => resolve()).receive("error", (e) => reject(e)).receive("timeout", () => reject(new Error("timeout")));
@@ -39036,14 +39086,7 @@ var init_channel_manager = __esm({
           const diff2 = payload;
           const channelState = this.channelStates.get(channelSlug);
           if (channelState) {
-            const next = { ...channelState.presence };
-            Object.keys(diff2.leaves).forEach((username) => {
-              delete next[username];
-            });
-            Object.entries(diff2.joins).forEach(([username, data]) => {
-              next[username] = data;
-            });
-            channelState.presence = next;
+            channelState.presence = applyPresenceDiff(channelState.presence, diff2);
           }
           if (channelSlug === this.currentActiveChannel) {
             this.callbacks.onPresenceDiff?.(channelSlug, diff2);
@@ -39607,16 +39650,7 @@ function useMultiChannelChat(token, currentChannel, onChannelListChanged, increm
           });
         },
         onPresenceDiff: (channelSlug, diff2) => {
-          setPresenceState((prev) => {
-            const next = { ...prev };
-            Object.keys(diff2.leaves).forEach((username2) => {
-              delete next[username2];
-            });
-            Object.entries(diff2.joins).forEach(([username2, data]) => {
-              next[username2] = data;
-            });
-            return next;
-          });
+          setPresenceState((prev) => applyPresenceDiff(prev, diff2));
         },
         onUserTyping: (channelSlug, username2, typing) => {
           setTypingUsers((prev) => {
@@ -39694,12 +39728,7 @@ function useMultiChannelChat(token, currentChannel, onChannelListChanged, increm
           setGlobalPresence(state);
         },
         onGlobalPresenceDiff: (diff2) => {
-          setGlobalPresence((prev) => {
-            const next = { ...prev };
-            Object.keys(diff2.leaves).forEach((u) => delete next[u]);
-            Object.entries(diff2.joins).forEach(([u, d]) => next[u] = d);
-            return next;
-          });
+          setGlobalPresence((prev) => applyPresenceDiff(prev, diff2));
         }
       }
     );
@@ -39836,6 +39865,7 @@ var init_use_multi_channel_chat = __esm({
     init_chat_client();
     init_config();
     init_notification_manager();
+    init_presence_utils();
   }
 });
 
@@ -40025,11 +40055,37 @@ var init_use_channels = __esm({
   }
 });
 
+// src/lib/dm-utils.ts
+function truncatePreview(content) {
+  if (content.length > 100) {
+    return content.slice(0, 97) + "...";
+  }
+  return content;
+}
+function sortConversationsByActivity(conversations) {
+  return [...conversations].sort((a, b) => {
+    return new Date(b.last_activity_at).getTime() - new Date(a.last_activity_at).getTime();
+  });
+}
+var init_dm_utils = __esm({
+  "src/lib/dm-utils.ts"() {
+    "use strict";
+  }
+});
+
 // src/hooks/use-dms.ts
-function useDms(token) {
+function useDms(token, channelManager, currentUsername, activeDmSlug) {
   const [conversations, setConversations] = (0, import_react43.useState)([]);
   const [loading, setLoading] = (0, import_react43.useState)(false);
   const [error, setError] = (0, import_react43.useState)(null);
+  const activeDmSlugRef = (0, import_react43.useRef)(activeDmSlug);
+  const currentUsernameRef = (0, import_react43.useRef)(currentUsername);
+  (0, import_react43.useEffect)(() => {
+    activeDmSlugRef.current = activeDmSlug;
+  }, [activeDmSlug]);
+  (0, import_react43.useEffect)(() => {
+    currentUsernameRef.current = currentUsername;
+  }, [currentUsername]);
   const fetchData = (0, import_react43.useCallback)(async () => {
     if (!token) return;
     setLoading(true);
@@ -40037,10 +40093,7 @@ function useDms(token) {
     try {
       const config = getConfig();
       const data = await fetchDmConversations(config.wsUrl, token);
-      const sortedConversations = [...data.conversations].sort((a, b) => {
-        return new Date(b.last_activity_at).getTime() - new Date(a.last_activity_at).getTime();
-      });
-      setConversations(sortedConversations);
+      setConversations(sortConversationsByActivity(data.conversations));
     } catch (err) {
       setError(err instanceof Error ? err.message : "Failed to fetch DM conversations");
     } finally {
@@ -40050,6 +40103,56 @@ function useDms(token) {
   const totalDmUnreadCount = (0, import_react43.useMemo)(() => {
     return conversations.reduce((sum, conv) => sum + conv.unread_count, 0);
   }, [conversations]);
+  const clearUnreadCount = (0, import_react43.useCallback)((dmSlug) => {
+    setConversations(
+      (prev) => prev.map(
+        (conv) => conv.slug === dmSlug ? { ...conv, unread_count: 0 } : conv
+      )
+    );
+  }, []);
+  const handleDmMessage = (0, import_react43.useCallback)((msg) => {
+    const now = (/* @__PURE__ */ new Date()).toISOString();
+    const preview = truncatePreview(msg.content);
+    const isActiveConversation = activeDmSlugRef.current === msg.dm_slug;
+    const isOwnMessage = msg.username === currentUsernameRef.current;
+    setConversations((prev) => {
+      const existingIndex = prev.findIndex((conv) => conv.slug === msg.dm_slug);
+      if (existingIndex >= 0) {
+        const updated = prev.filter((_, idx) => idx !== existingIndex);
+        const conversation = {
+          ...prev[existingIndex],
+          last_activity_at: now,
+          last_message_preview: preview,
+          unread_count: isActiveConversation || isOwnMessage ? prev[existingIndex].unread_count : prev[existingIndex].unread_count + 1
+        };
+        return [conversation, ...updated];
+      } else {
+        const newConversation = {
+          channel_id: msg.dm_slug,
+          slug: msg.dm_slug,
+          other_user_id: msg.sender_id,
+          other_username: msg.username,
+          last_activity_at: now,
+          last_message_preview: preview,
+          unread_count: isOwnMessage ? 0 : 1
+        };
+        return [newConversation, ...prev];
+      }
+    });
+    if (!isOwnMessage && !isActiveConversation) {
+      getNotificationManager().notify("bell");
+    }
+  }, []);
+  (0, import_react43.useEffect)(() => {
+    if (!channelManager) {
+      return;
+    }
+    const originalCallback = channelManager["callbacks"].onDmMessage;
+    channelManager["callbacks"].onDmMessage = handleDmMessage;
+    return () => {
+      channelManager["callbacks"].onDmMessage = originalCallback;
+    };
+  }, [channelManager, handleDmMessage]);
   (0, import_react43.useEffect)(() => {
     if (token) {
       fetchData();
@@ -40060,7 +40163,8 @@ function useDms(token) {
     loading,
     error,
     refetch: fetchData,
-    totalDmUnreadCount
+    totalDmUnreadCount,
+    clearUnreadCount
   };
 }
 var import_react43;
@@ -40070,6 +40174,8 @@ var init_use_dms = __esm({
     import_react43 = __toESM(require_react(), 1);
     init_chat_client();
     init_config();
+    init_notification_manager();
+    init_dm_utils();
   }
 });
 
@@ -40101,6 +40207,7 @@ function AppContent() {
   const prevAuthStateRef = (0, import_react44.useRef)(null);
   const [currentDm, setCurrentDm] = (0, import_react44.useState)(null);
   const [shouldStartDmSearch, setShouldStartDmSearch] = (0, import_react44.useState)(false);
+  const activeDmSlug = route === "dm-chat" && currentDm ? currentDm.slug : null;
   (0, import_react44.useEffect)(() => {
     if (stdout) {
       getNotificationManager().setStdout(stdout);
@@ -40140,13 +40247,6 @@ function AppContent() {
     checkAuth();
   }, []);
   const { publicChannels, privateChannels, unreadCounts, loading: isLoadingChannels, refetchUnreadCounts, refetch: refetchChannels, incrementUnreadCount, clearUnreadCount, totalUnreadCount } = useChannels(token);
-  const {
-    conversations: dmConversations,
-    loading: isLoadingDms,
-    totalDmUnreadCount,
-    refetch: refetchDms
-  } = useDms(token);
-  const combinedTotalUnreadCount = totalUnreadCount + totalDmUnreadCount;
   const {
     messages,
     connectionStatus,
@@ -40163,6 +40263,14 @@ function AppContent() {
     disconnect,
     channelManager
   } = useMultiChannelChat(token, currentChannel, refetchChannels, incrementUnreadCount);
+  const {
+    conversations: dmConversations,
+    loading: isLoadingDms,
+    totalDmUnreadCount,
+    refetch: refetchDms,
+    clearUnreadCount: clearDmUnreadCount
+  } = useDms(token, channelManager, username, activeDmSlug);
+  const combinedTotalUnreadCount = totalUnreadCount + totalDmUnreadCount;
   const { users } = usePresence(presenceState, subscribers, currentChannel, globalPresence);
   useAgentDetection(channelManager, connectionStatus === "connected");
   const sendCommand = (0, import_react44.useCallback)(
@@ -40273,8 +40381,9 @@ function AppContent() {
   }, [token, refetchChannels]);
   const handleDmSelect = (0, import_react44.useCallback)((dm) => {
     setCurrentDm(dm);
+    clearDmUnreadCount(dm.slug);
     navigate("dm-chat");
-  }, [navigate]);
+  }, [navigate, clearDmUnreadCount]);
   const handleNewDm = (0, import_react44.useCallback)(() => {
     setShouldStartDmSearch(true);
     navigate("dm-inbox");
@@ -40407,6 +40516,7 @@ function AppContent() {
   if (route === "dm-inbox") {
     const handleSelectDm = (dm) => {
       setCurrentDm(dm);
+      clearDmUnreadCount(dm.slug);
       navigate("dm-chat");
     };
     return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
@@ -40705,7 +40815,7 @@ function UpdatePrompt({ updateInfo, onComplete }) {
 // package.json
 var package_default = {
   name: "groupchat",
-  version: "0.0.14",
+  version: "0.0.15",
   description: "CLI chat client for Groupchat",
   type: "module",
   main: "./dist/index.js",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "groupchat",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "description": "CLI chat client for Groupchat",
   "type": "module",
   "main": "./dist/index.js",