feat: show channel message indicator

frontend_nuxt/components/HeaderComponent.vue

@@ -7,7 +7,7 @@
             <i class="fas fa-bars"></i>
           </button>
           <span
-            v-if="isMobile && (messageUnreadCount > 0 || channelUnreadCount > 0)"
+            v-if="isMobile && (unreadMessageCount > 0 || hasChannelUnread)"
             class="menu-unread-dot"
           ></span>
         </div>
@@ -53,10 +53,10 @@
           <ToolTip v-if="isLogin" content="站内信和频道" placement="bottom">
             <div class="messages-icon" @click="goToMessages">
               <i class="fas fa-comments"></i>
-              <span v-if="messageUnreadCount > 0" class="unread-badge">
-                {{ messageUnreadCount }}
-              </span>
-              <span v-else-if="channelUnreadCount > 0" class="messages-unread-dot"></span>
+              <span v-if="unreadMessageCount > 0" class="unread-badge">{{
+                unreadMessageCount
+              }}</span>
+              <span v-else-if="hasChannelUnread" class="unread-dot"></span>
             </div>
           </ToolTip>
 
@@ -89,6 +89,7 @@ import ToolTip from '~/components/ToolTip.vue'
 import SearchDropdown from '~/components/SearchDropdown.vue'
 import { authState, clearToken, loadCurrentUser } from '~/utils/auth'
 import { useUnreadCount } from '~/composables/useUnreadCount'
+import { useChannelUnread } from '~/composables/useChannelUnread'
 import { useIsMobile } from '~/utils/screen'
 import { themeState, cycleTheme, ThemeMode } from '~/utils/theme'
 import { toast } from '~/main'
@@ -106,10 +107,8 @@ const props = defineProps({
 
 const isLogin = computed(() => authState.loggedIn)
 const isMobile = useIsMobile()
-const { count: totalUnreadCount, channelUnreadCount, fetchUnreadCount } = useUnreadCount()
-const messageUnreadCount = computed(() =>
-  Math.max(totalUnreadCount.value - channelUnreadCount.value, 0),
-)
+const { count: unreadMessageCount, fetchUnreadCount } = useUnreadCount()
+const { hasUnread: hasChannelUnread, fetchChannelUnread } = useChannelUnread()
 const avatar = ref('')
 const showSearch = ref(false)
 const searchDropdown = ref(null)
@@ -234,8 +233,10 @@ onMounted(async () => {
   }
   const updateUnread = async () => {
     if (authState.loggedIn) {
-      // Initialize the unread count composable
       fetchUnreadCount()
+      fetchChannelUnread()
+    } else {
+      fetchChannelUnread()
     }
   }
 
@@ -420,7 +421,7 @@ onMounted(async () => {
   box-sizing: border-box;
 }
 
-.messages-unread-dot {
+.unread-dot {
   position: absolute;
   top: -2px;
   right: -4px;

frontend_nuxt/composables/useChannelUnread.js

@@ -0,0 +1,38 @@
+import { ref } from 'vue'
+import { getToken } from '~/utils/auth'
+
+const hasUnread = ref(false)
+
+export function useChannelUnread() {
+  const config = useRuntimeConfig()
+  const API_BASE_URL = config.public.apiBaseUrl
+
+  const setFromList = (channels) => {
+    hasUnread.value = Array.isArray(channels) && channels.some((c) => c.unreadCount > 0)
+  }
+
+  const fetchChannelUnread = async () => {
+    const token = getToken()
+    if (!token) {
+      hasUnread.value = false
+      return
+    }
+    try {
+      const response = await fetch(`${API_BASE_URL}/api/channels`, {
+        headers: { Authorization: `Bearer ${token}` },
+      })
+      if (response.ok) {
+        const data = await response.json()
+        setFromList(data)
+      }
+    } catch (e) {
+      console.error('Failed to fetch channel unread status:', e)
+    }
+  }
+
+  return {
+    hasUnread,
+    fetchChannelUnread,
+    setFromList,
+  }
+}

frontend_nuxt/composables/useUnreadCount.js

@@ -1,123 +1,93 @@
-import { ref, watch } from 'vue'
-import { useWebSocket } from './useWebSocket'
-import { getToken } from '~/utils/auth'
+import { ref, watch, onMounted } from 'vue';
+import { useWebSocket } from './useWebSocket';
+import { getToken } from '~/utils/auth';
 
-const count = ref(0)
-const channelUnreadCount = ref(0)
-let isInitialized = false
-let wsSubscription = null
+const count = ref(0);
+let isInitialized = false;
+let wsSubscription = null;
 
 export function useUnreadCount() {
-  const config = useRuntimeConfig()
-  const API_BASE_URL = config.public.apiBaseUrl
-  const { subscribe, isConnected, connect } = useWebSocket()
+  const config = useRuntimeConfig();
+  const API_BASE_URL = config.public.apiBaseUrl;
+  const { subscribe, isConnected, connect } = useWebSocket();
 
-  const fetchTotalUnreadCount = async () => {
-    const token = getToken()
+  const fetchUnreadCount = async () => {
+    const token = getToken();
     if (!token) {
-      count.value = 0
-      return
+      count.value = 0;
+      return;
     }
     try {
       const response = await fetch(`${API_BASE_URL}/api/messages/unread-count`, {
         headers: { Authorization: `Bearer ${token}` },
-      })
+      });
       if (response.ok) {
-        const data = await response.json()
-        count.value = data
+        const data = await response.json();
+        count.value = data;
       }
     } catch (error) {
-      console.error('Failed to fetch unread count:', error)
+      console.error('Failed to fetch unread count:', error);
     }
-  }
-
-  const fetchChannelUnreadCount = async () => {
-    const token = getToken()
-    if (!token) {
-      channelUnreadCount.value = 0
-      return
-    }
-    try {
-      const response = await fetch(`${API_BASE_URL}/api/channels`, {
-        headers: { Authorization: `Bearer ${token}` },
-      })
-      if (response.ok) {
-        const channels = await response.json()
-        channelUnreadCount.value = channels.reduce((sum, ch) => sum + (ch.unreadCount || 0), 0)
-      }
-    } catch (error) {
-      console.error('Failed to fetch channel unread count:', error)
-    }
-  }
-
-  const fetchUnreadCount = async () => {
-    await Promise.all([fetchTotalUnreadCount(), fetchChannelUnreadCount()])
-  }
+  };
 
   const initialize = async () => {
-    const token = getToken()
+    const token = getToken();
     if (!token) {
-      count.value = 0
-      channelUnreadCount.value = 0
-      return
+      count.value = 0;
+      return;
     }
 
     // 总是获取最新的未读数量
-    fetchUnreadCount()
-
+    fetchUnreadCount();
+    
     // 确保WebSocket连接
     if (!isConnected.value) {
-      connect(token)
+      connect(token);
     }
-
+    
     // 设置WebSocket监听
-    await setupWebSocketListener()
-  }
+    await setupWebSocketListener();
+  };
 
   const setupWebSocketListener = async () => {
     // 只有在还没有订阅的情况下才设置监听
     if (!wsSubscription) {
-      watch(
-        isConnected,
-        (newValue) => {
-          if (newValue && !wsSubscription) {
-            const destination = `/user/queue/unread-count`
-            wsSubscription = subscribe(destination, (message) => {
-              const unreadCount = parseInt(message.body, 10)
-              if (!isNaN(unreadCount)) {
-                count.value = unreadCount
-                fetchChannelUnreadCount()
-              }
-            })
-          }
-        },
-        { immediate: true },
-      )
+      
+      watch(isConnected, (newValue) => {
+        if (newValue && !wsSubscription) {
+          const destination = `/user/queue/unread-count`;
+          wsSubscription = subscribe(destination, (message) => {
+            const unreadCount = parseInt(message.body, 10);
+            if (!isNaN(unreadCount)) {
+              count.value = unreadCount;
+            }
+          });
+        }
+      }, { immediate: true });
     }
-  }
+  };
 
   // 自动初始化逻辑 - 确保每次调用都能获取到未读数量并设置监听
-  const token = getToken()
+  const token = getToken();
   if (token) {
     if (!isInitialized) {
-      isInitialized = true
-      initialize() // 完整初始化，包括WebSocket监听
+      isInitialized = true;
+      initialize(); // 完整初始化，包括WebSocket监听
     } else {
       // 即使已经初始化，也要确保获取最新的未读数量并确保WebSocket监听存在
-      fetchUnreadCount()
-
+      fetchUnreadCount();
+      
       // 确保WebSocket连接和监听都存在
       if (!isConnected.value) {
-        connect(token)
+        connect(token);
       }
-      setupWebSocketListener()
+      setupWebSocketListener();
     }
   }
 
   return {
     count,
-    channelUnreadCount,
     fetchUnreadCount,
     initialize,
-  }
-}
+  };
+}

frontend_nuxt/pages/message-box/[id].vue

@@ -69,6 +69,7 @@ import { renderMarkdown } from '~/utils/markdown'
 import MessageEditor from '~/components/MessageEditor.vue'
 import { useWebSocket } from '~/composables/useWebSocket'
 import { useUnreadCount } from '~/composables/useUnreadCount'
+import { useChannelUnread } from '~/composables/useChannelUnread'
 import TimeManager from '~/utils/time'
 import BaseTimeline from '~/components/BaseTimeline.vue'
 import BasePlaceholder from '~/components/BasePlaceholder.vue'
@@ -78,6 +79,7 @@ const route = useRoute()
 const API_BASE_URL = config.public.apiBaseUrl
 const { connect, disconnect, subscribe, isConnected } = useWebSocket()
 const { fetchUnreadCount: refreshGlobalUnreadCount } = useUnreadCount()
+const { fetchChannelUnread: refreshChannelUnread } = useChannelUnread()
 let subscription = null
 
 const messages = ref([])
@@ -258,6 +260,7 @@ async function markConversationAsRead() {
     })
     // After marking as read, refresh the global unread count
     refreshGlobalUnreadCount()
+    refreshChannelUnread()
   } catch (e) {
     console.error('Failed to mark conversation as read', e)
   }

frontend_nuxt/pages/message-box/index.vue

@@ -117,6 +117,7 @@ import { getToken, fetchCurrentUser } from '~/utils/auth'
 import { toast } from '~/main'
 import { useWebSocket } from '~/composables/useWebSocket'
 import { useUnreadCount } from '~/composables/useUnreadCount'
+import { useChannelUnread } from '~/composables/useChannelUnread'
 import TimeManager from '~/utils/time'
 import { stripMarkdownLength } from '~/utils/markdown'
 import SearchPersonDropdown from '~/components/SearchPersonDropdown.vue'
@@ -131,6 +132,8 @@ const currentUser = ref(null)
 const API_BASE_URL = config.public.apiBaseUrl
 const { connect, disconnect, subscribe, isConnected } = useWebSocket()
 const { fetchUnreadCount: refreshGlobalUnreadCount } = useUnreadCount()
+const { fetchChannelUnread: refreshChannelUnread, setFromList: setChannelUnreadFromList } =
+  useChannelUnread()
 let subscription = null
 
 const activeTab = ref('messages')
@@ -189,7 +192,9 @@ async function fetchChannels() {
       headers: { Authorization: `Bearer ${token}` },
     })
     if (!response.ok) throw new Error('无法加载频道')
-    channels.value = await response.json()
+    const data = await response.json()
+    channels.value = data
+    setChannelUnreadFromList(data)
   } catch (e) {
     toast.error(e.message)
   } finally {
@@ -228,6 +233,7 @@ onActivated(async () => {
   if (currentUser.value) {
     await fetchConversations()
     refreshGlobalUnreadCount() // Refresh global count when entering the list
+    refreshChannelUnread()
     const token = getToken()
     if (token && !isConnected.value) {
       connect(token)