Compare commits

...

3 Commits

Author SHA1 Message Date
Tim
98bbc36453 feat: show channel message indicator 2025-08-23 02:11:25 +08:00
tim
15cba0c96e fix: 支持显示最后一条消息 2025-08-23 01:57:33 +08:00
Tim
98a79acad9 Merge pull request #702 from nagisa77/codex/add-multi-tab-support-to-message-box
feat: add channel support
2025-08-23 01:31:26 +08:00
7 changed files with 105 additions and 14 deletions

View File

@@ -18,14 +18,14 @@ public class ChannelInitializer implements CommandLineRunner {
chat.setChannel(true);
chat.setName("吹水群");
chat.setDescription("吹水聊天");
chat.setAvatar("/default-avatar.svg");
chat.setAvatar("https://openisle-1307107697.cos.accelerate.myqcloud.com/dynamic_assert/32647273e2334d14adfd4a6ce9db0643.jpeg");
conversationRepository.save(chat);
MessageConversation tech = new MessageConversation();
tech.setChannel(true);
tech.setName("技术讨论群");
tech.setDescription("讨论技术相关话题");
tech.setAvatar("/default-avatar.svg");
tech.setAvatar("https://openisle-1307107697.cos.accelerate.myqcloud.com/dynamic_assert/5edde9a5864e471caa32491dbcdaa8b2.png");
conversationRepository.save(tech);
}
}

View File

@@ -121,6 +121,7 @@ public class SecurityConfig {
.requestMatchers(HttpMethod.GET, "/api/reaction-types").permitAll()
.requestMatchers(HttpMethod.GET, "/api/activities/**").permitAll()
.requestMatchers(HttpMethod.GET, "/api/sitemap.xml").permitAll()
.requestMatchers(HttpMethod.GET, "/api/channels").permitAll()
.requestMatchers(HttpMethod.GET, "/api/rss").permitAll()
.requestMatchers(HttpMethod.GET, "/api/point-goods").permitAll()
.requestMatchers(HttpMethod.POST, "/api/point-goods").permitAll()
@@ -156,7 +157,7 @@ public class SecurityConfig {
uri.startsWith("/api/search") || uri.startsWith("/api/users") ||
uri.startsWith("/api/reaction-types") || uri.startsWith("/api/config") ||
uri.startsWith("/api/activities") || uri.startsWith("/api/push/public-key") ||
uri.startsWith("/api/point-goods") ||
uri.startsWith("/api/point-goods") || uri.startsWith("/api/channels") ||
uri.startsWith("/api/sitemap.xml") || uri.startsWith("/api/medals") ||
uri.startsWith("/api/rss"));

View File

@@ -10,6 +10,7 @@ public class ChannelDto {
private String name;
private String description;
private String avatar;
private MessageDto lastMessage;
private long memberCount;
private boolean joined;
private long unreadCount;

View File

@@ -6,7 +6,10 @@
<button class="menu-btn" ref="menuBtn" @click="$emit('toggle-menu')">
<i class="fas fa-bars"></i>
</button>
<span v-if="isMobile && unreadMessageCount > 0" class="menu-unread-dot"></span>
<span
v-if="isMobile && (unreadMessageCount > 0 || hasChannelUnread)"
class="menu-unread-dot"
></span>
</div>
<NuxtLink class="logo-container" :to="`/`" @click="refrechData">
<img
@@ -53,6 +56,7 @@
<span v-if="unreadMessageCount > 0" class="unread-badge">{{
unreadMessageCount
}}</span>
<span v-else-if="hasChannelUnread" class="unread-dot"></span>
</div>
</ToolTip>
@@ -85,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'
@@ -103,6 +108,7 @@ const props = defineProps({
const isLogin = computed(() => authState.loggedIn)
const isMobile = useIsMobile()
const { count: unreadMessageCount, fetchUnreadCount } = useUnreadCount()
const { hasUnread: hasChannelUnread, fetchChannelUnread } = useChannelUnread()
const avatar = ref('')
const showSearch = ref(false)
const searchDropdown = ref(null)
@@ -227,8 +233,10 @@ onMounted(async () => {
}
const updateUnread = async () => {
if (authState.loggedIn) {
// Initialize the unread count composable
fetchUnreadCount()
fetchChannelUnread()
} else {
fetchChannelUnread()
}
}
@@ -413,6 +421,16 @@ onMounted(async () => {
box-sizing: border-box;
}
.unread-dot {
position: absolute;
top: -2px;
right: -4px;
width: 8px;
height: 8px;
border-radius: 50%;
background-color: #ff4d4f;
}
.rss-icon {
animation: rss-glow 2s 3;
}

View File

@@ -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,
}
}

View File

@@ -22,8 +22,13 @@
</div>
<BaseTimeline :items="messages">
<template #item="{ item }">
<div class="message-timestamp">
{{ TimeManager.format(item.createdAt) }}
<div class="message-header">
<div class="user-name">
{{ item.sender.username }}
</div>
<div class="message-timestamp">
{{ TimeManager.format(item.createdAt) }}
</div>
</div>
<div class="message-content">
<div class="info-content-text" v-html="renderMarkdown(item.content)"></div>
@@ -64,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'
@@ -73,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([])
@@ -253,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)
}
@@ -448,10 +456,22 @@ onUnmounted(() => {
.message-timestamp {
font-size: 11px;
color: var(--text-color-secondary);
margin-top: 5px;
opacity: 0.6;
}
.message-header {
display: flex;
flex-direction: row;
align-items: center;
gap: 10px;
}
.user-name {
font-size: 14px;
font-weight: 600;
color: var(--text-color);
}
.message-item.sent {
align-self: flex-end;
flex-direction: row-reverse;

View File

@@ -97,7 +97,11 @@
<div class="message-time">成员 {{ ch.memberCount }}</div>
</div>
<div class="last-message-row">
<div class="last-message">{{ ch.description }}</div>
<div class="last-message">
{{
ch.lastMessage ? stripMarkdownLength(ch.lastMessage.content, 100) : ch.description
}}
</div>
</div>
</div>
</div>
@@ -113,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'
@@ -127,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')
@@ -185,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 {
@@ -224,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)
@@ -262,8 +272,6 @@ function goToConversation(id) {
<style scoped>
.messages-container {
margin: 0 auto;
padding: 20px;
}
.tabs {
@@ -291,6 +299,8 @@ function goToConversation(id) {
.search-container {
margin-bottom: 24px;
margin-left: 20px;
margin-right: 20px;
}
.messages-header {
@@ -330,6 +340,8 @@ function goToConversation(id) {
.conversation-item {
display: flex;
align-items: center;
margin-left: 20px;
margin-right: 20px;
padding: 8px 10px;
cursor: pointer;
transition: background-color 0.2s ease;
@@ -415,8 +427,9 @@ function goToConversation(id) {
/* 响应式设计 */
@media (max-width: 768px) {
.messages-container {
padding: 10px 10px;
.conversation-item {
margin-left: 10px;
margin-right: 10px;
}
.messages-title {