From 187923ca3cda4ce9fdc9c2e3841ac1567e58f2a5 Mon Sep 17 00:00:00 2001 From: xhgit Date: Sat, 14 Nov 2026 20:11:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=89=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=9A=84=E7=BE=A4=E6=B6=88=E6=81=AF=E6=9C=AA?= =?UTF-8?q?=E8=AF=BB=E8=A7=92=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- docs/api.md | 3 ++ docs/progress.md | 6 ++++ server/internal/database/011_group_seen.sql | 9 +++++ server/internal/database/database.go | 4 +++ server/internal/groups/seen.go | 38 +++++++++++++++++++++ server/internal/groups/store.go | 29 ++++++++++++---- server/internal/httpapi/api.go | 1 + server/internal/httpapi/group_transport.go | 27 +++++++++++++++ server/internal/httpapi/groups.go | 2 +- tests/delivery.test.mjs | 15 ++++++++ tests/group-chat.test.mjs | 6 +++- web/src/chat/GroupChat.vue | 26 ++++++++++++-- web/src/chat/group-chat.ts | 4 ++- web/src/views/ChatView.vue | 12 +++---- web/src/views/GroupView.vue | 28 ++++++++++++--- 16 files changed, 189 insertions(+), 23 deletions(-) create mode 100644 server/internal/database/011_group_seen.sql create mode 100644 server/internal/groups/seen.go diff --git a/README.md b/README.md index 11c79f5..13f6ca3 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ | 账号与设备 | Windows 和 Web 共用账号,支持用户名注册、登录、查看设备和远程撤销。 | | 联系人 | 按用户名查找、处理好友申请、管理备注与分组,以及拉黑。变更可在双端实时同步。 | | 加密文字聊天 | 在两个已核验设备之间发送 MLS 加密消息,支持离线接收。 | -| 加密群聊 | 创建群组、邀请联系人、管理成员,并按账号同步置顶和免打扰。每个账号选一台已核验设备参与 MLS 加密文字聊天。 | +| 加密群聊 | 创建群组、邀请联系人和管理成员。群列表显示本机未读,并按账号同步置顶和免打扰。每个账号选一台已核验设备参与 MLS 加密文字聊天。 | | 加密附件 | 两端可在私聊和群聊发送、下载最多 8 MiB 的文件,并在本机预览图片和视频。 | | 加密语音 | 两端可在私聊和群聊录制、取消或发送最长 60 秒的语音消息,接收方在本机解密播放。 | | 消息管理 | 私聊和群聊支持引用回复、编辑文字、撤回、本机搜索和收藏。消息可转发到已建立加密会话的群或已核验的联系人设备。私聊支持可选加密已读回执。 | diff --git a/docs/api.md b/docs/api.md index 2d598c5..5243d4e 100644 --- a/docs/api.md +++ b/docs/api.md @@ -29,6 +29,7 @@ | GET / POST | /api/v1/groups | 列出当前账号所属群组与邀请,或创建群组 | | GET / POST | /api/v1/groups/{id} | 查看群组详情或执行邀请、接受、拒绝、改名、升降管理员、移除、退出或解散 | | POST | /api/v1/groups/{id}/preferences | 更新当前账号的 `pinned` 和 `muted`,可只传其中一项 | +| POST | /api/v1/groups/{id}/seen | 提交当前设备已同步的消息游标 `sequence`,成功返回 204 | | GET | /api/v1/groups/{id}/devices | 获取群成员的有效设备与 MLS 公钥 | | POST | /api/v1/groups/{id}/devices/{device}/claim | 群主一次性领取群成员设备的 KeyPackage | | GET / POST | /api/v1/groups/{id}/epochs | 读取当前设备可访问的会话信息或由群主发布新世代 | @@ -59,6 +60,8 @@ MLS 凭据由标准 Base64 的 publicKey 和 signature 组成,使用 UTF-8 前 群列表和详情返回当前账号的 `pinned` 和 `muted`。群列表先排序置顶群,随后按创建时间排序。设置修改后,同一账号的在线设备收到刷新提示。离开群组或被移除后,当前成员资格的设置随之清除。 +群列表同时返回当前设备的 `unread`,上限为 100,用于客户端显示 `99+`。统计当前成员资格内、设备获准接收且由其他设备发送的密文投递。`sequence` 是正整数字符串,须指向当前设备在该群有权读取的消息,更新不会回退游标。成员列表和其他账号的 API 响应不包含该设备的查看状态。 + 有效成员可通过 `GET /groups/{id}/devices` 获取群内有效设备凭据。群主通过 `POST /groups/{id}/devices/{device}/claim` 一次性领取其他有效成员的设备密钥包。邀请待接受的账号、已离群的账号和撤销设备无法访问群设备目录。 成员变更后旧世代不能发消息。绑定设备被撤销后需以替代设备发布新世代。重新加入的成员只能补拉本次加入以来的世代。服务端校验外层格式和投递授权,MLS 内容验证由客户端执行。 diff --git a/docs/progress.md b/docs/progress.md index 0d488f8..a246150 100644 --- a/docs/progress.md +++ b/docs/progress.md @@ -162,3 +162,9 @@ Windows Electron 和 Edge 验证了群组页在兜底轮询前显示邀请、成 两端可按账号设置群置顶和免打扰,置顶群排在群列表前面。离开群页面时,未静音的新群投递可显示通用的应用内提醒,点击返回群组。免打扰保留 WebSocket 补拉提示,省略应用内提醒标记。原生系统通知和 Web Push 仍待实现。 测试覆盖迁移 010、邀请者和外部账号不可修改群设置、不同账号的设置隔离、双端静音收取和提醒入口,以及同一账号的两台设备实时同步偏好。 + +## 群聊未读角标 + +Windows 和 Web 的群列表按当前设备显示未读投递数量,免打扰群使用低强调角标。打开可见的群聊并同步后,客户端提交本机游标。统计排除本机发送的消息,页面后台时保留角标。游标由服务端按设备保存,其他成员看不到逐条已读状态。编辑和撤回也是群密文投递,会计入尚未同步的数量。 + +接口测试覆盖发送设备排除、游标单调递增、越权及重新入群隔离。Windows Electron 与 Edge 验证免打扰时显示未读、启用群安全会话后同步并清除角标,以及群消息和私聊附件回归。私聊文件选择在同步繁忙时也会排队提交。 diff --git a/server/internal/database/011_group_seen.sql b/server/internal/database/011_group_seen.sql new file mode 100644 index 0000000..76391b4 --- /dev/null +++ b/server/internal/database/011_group_seen.sql @@ -0,0 +1,9 @@ +CREATE TABLE group_seen ( + group_id uuid NOT NULL, + user_id uuid NOT NULL, + device_id uuid NOT NULL REFERENCES devices(id) ON DELETE CASCADE, + sequence bigint NOT NULL CHECK (sequence > 0), + PRIMARY KEY (group_id,device_id), + FOREIGN KEY (group_id,user_id) REFERENCES group_members(group_id,user_id) ON DELETE CASCADE +); +CREATE INDEX group_seen_membership ON group_seen(group_id,user_id); diff --git a/server/internal/database/database.go b/server/internal/database/database.go index 05ac3eb..fb72603 100644 --- a/server/internal/database/database.go +++ b/server/internal/database/database.go @@ -37,6 +37,9 @@ var groupAttachmentsMigration string //go:embed 010_group_preferences.sql var groupPreferencesMigration string +//go:embed 011_group_seen.sql +var groupSeenMigration string + func Migrate(ctx context.Context, pool *pgxpool.Pool) error { tx, err := pool.Begin(ctx) if err != nil { @@ -52,6 +55,7 @@ func Migrate(ctx context.Context, pool *pgxpool.Pool) error { for index, migration := range []string{ identityMigration, contactsMigration, deliveryMigration, keyPackagesMigration, mlsCredentialsMigration, attachmentsMigration, groupsMigration, groupTransportMigration, groupAttachmentsMigration, groupPreferencesMigration, + groupSeenMigration, } { version := index + 1 var applied bool diff --git a/server/internal/groups/seen.go b/server/internal/groups/seen.go new file mode 100644 index 0000000..939961b --- /dev/null +++ b/server/internal/groups/seen.go @@ -0,0 +1,38 @@ +package groups + +import ( + "context" + "errors" + + "github.com/jackc/pgx/v5" +) + +func (s *Store) MarkSeen(ctx context.Context, group, user, device string, sequence int64) error { + tx, err := s.db.Begin(ctx) + if err != nil { + return err + } + defer tx.Rollback(ctx) + if _, _, err := lockTransport(ctx, tx, group, user, device); err != nil { + return err + } + var seen int64 + err = tx.QueryRow(ctx, ` + INSERT INTO group_seen(group_id,user_id,device_id,sequence) + SELECT m.group_id,m.user_id,d.id,x.sequence FROM group_messages x + JOIN group_epoch_devices e ON (e.group_id,e.epoch_id)=(x.group_id,x.epoch_id) AND e.device_id=$3 + JOIN group_epochs epoch ON (epoch.group_id,epoch.id)=(x.group_id,x.epoch_id) + JOIN group_members m ON m.group_id=x.group_id AND m.user_id=$2 AND m.state='active' + JOIN devices d ON d.id=e.device_id AND d.user_id=m.user_id AND d.revoked_at IS NULL + WHERE x.group_id=$1 AND x.sequence=$4 AND epoch.membership_version>=m.joined_version + ON CONFLICT (group_id,device_id) DO UPDATE SET sequence=GREATEST(group_seen.sequence,EXCLUDED.sequence) + RETURNING sequence + `, group, user, device, sequence).Scan(&seen) + if errors.Is(err, pgx.ErrNoRows) { + return ErrUnavailable + } + if err != nil { + return err + } + return tx.Commit(ctx) +} diff --git a/server/internal/groups/store.go b/server/internal/groups/store.go index 7075f69..bdd38b0 100644 --- a/server/internal/groups/store.go +++ b/server/internal/groups/store.go @@ -21,6 +21,11 @@ type Group struct { Preferences } +type ListedGroup struct { + Group + Unread int `json:"unread"` +} + type Preferences struct { Pinned bool `json:"pinned"` Muted bool `json:"muted"` @@ -58,21 +63,31 @@ func (s *Store) Create(ctx context.Context, owner, name string) (Group, error) { return result, err } +const groupColumns = `g.id,g.name,m.state,CASE WHEN g.owner_id=m.user_id THEN 'owner' ELSE m.role END,g.membership_version::text,m.pinned,m.muted` const groupRows = ` - SELECT g.id,g.name,m.state,CASE WHEN g.owner_id=m.user_id THEN 'owner' ELSE m.role END,g.membership_version::text,m.pinned,m.muted FROM chat_groups g JOIN group_members m ON m.group_id=g.id WHERE m.user_id=$1 ` -func (s *Store) List(ctx context.Context, user string) ([]Group, error) { - rows, err := s.db.Query(ctx, groupRows+" ORDER BY m.pinned DESC, g.created_at DESC, g.id LIMIT 200", user) +func (s *Store) List(ctx context.Context, user, device string) ([]ListedGroup, error) { + rows, err := s.db.Query(ctx, "SELECT "+groupColumns+`, ( + SELECT count(*) FROM ( + SELECT 1 FROM group_messages x + JOIN group_epoch_devices enrolled ON (enrolled.group_id,enrolled.epoch_id)=(x.group_id,x.epoch_id) AND enrolled.device_id=$2 + JOIN group_epochs epoch ON (epoch.group_id,epoch.id)=(x.group_id,x.epoch_id) + JOIN devices d ON d.id=enrolled.device_id AND d.revoked_at IS NULL + WHERE x.group_id=g.id AND epoch.membership_version>=m.joined_version AND x.sender_device<>$2 + AND x.sequence>COALESCE((SELECT seen.sequence FROM group_seen seen WHERE seen.group_id=g.id AND seen.device_id=$2),0) + ORDER BY x.sequence LIMIT 100 + ) AS unread + )`+groupRows+" ORDER BY m.pinned DESC, g.created_at DESC, g.id LIMIT 200", user, device) if err != nil { return nil, err } defer rows.Close() - result := make([]Group, 0) + result := make([]ListedGroup, 0) for rows.Next() { - var g Group - if err := rows.Scan(&g.ID, &g.Name, &g.State, &g.Role, &g.Version, &g.Pinned, &g.Muted); err != nil { + var g ListedGroup + if err := rows.Scan(&g.ID, &g.Name, &g.State, &g.Role, &g.Version, &g.Pinned, &g.Muted, &g.Unread); err != nil { return nil, err } result = append(result, g) @@ -87,7 +102,7 @@ func (s *Store) Detail(ctx context.Context, user, id string) (Detail, error) { return result, err } defer tx.Rollback(ctx) - err = tx.QueryRow(ctx, groupRows+" AND g.id=$2", user, id). + err = tx.QueryRow(ctx, "SELECT "+groupColumns+" "+groupRows+" AND g.id=$2", user, id). Scan(&result.ID, &result.Name, &result.State, &result.Role, &result.Version, &result.Pinned, &result.Muted) if errors.Is(err, pgx.ErrNoRows) { return result, ErrUnavailable diff --git a/server/internal/httpapi/api.go b/server/internal/httpapi/api.go index 9549c8e..9aa2063 100644 --- a/server/internal/httpapi/api.go +++ b/server/internal/httpapi/api.go @@ -65,6 +65,7 @@ func New(accounts *account.Store, contactStore *contacts.Store, envelopeStore *d mux.HandleFunc("GET /api/v1/groups/{id}", a.authorized(a.groupDetail)) mux.HandleFunc("POST /api/v1/groups/{id}", a.authorized(a.changeGroup)) mux.HandleFunc("POST /api/v1/groups/{id}/preferences", a.authorized(a.setGroupPreferences)) + mux.HandleFunc("POST /api/v1/groups/{id}/seen", a.authorized(a.markGroupSeen)) mux.HandleFunc("GET /api/v1/groups/{id}/epochs", a.authorized(a.groupEpochs)) mux.HandleFunc("POST /api/v1/groups/{id}/epochs", a.authorized(a.publishGroupEpoch)) mux.HandleFunc("GET /api/v1/groups/{id}/messages", a.authorized(a.groupInbox)) diff --git a/server/internal/httpapi/group_transport.go b/server/internal/httpapi/group_transport.go index 9f7c6e3..f42eb8e 100644 --- a/server/internal/httpapi/group_transport.go +++ b/server/internal/httpapi/group_transport.go @@ -183,3 +183,30 @@ func (a *API) groupInbox(w http.ResponseWriter, r *http.Request, _ string, actor } respond(w, 200, items) } + +func (a *API) markGroupSeen(w http.ResponseWriter, r *http.Request, _ string, actor account.Identity) { + group := r.PathValue("id") + if !uuidPattern.MatchString(group) { + groupError(w, groups.ErrUnavailable) + return + } + var input struct { + Sequence string `json:"sequence"` + } + if !parse(w, r, &input) { + return + } + sequence, err := strconv.ParseInt(input.Sequence, 10, 64) + if err != nil || sequence <= 0 || strconv.FormatInt(sequence, 10) != input.Sequence { + problem(w, 400, "invalid_cursor", "无效的已查看游标") + return + } + if !a.limit(w, r, "group-seen:"+actor.Device.ID, 240) { + return + } + if err = a.groups.MarkSeen(r.Context(), group, actor.User.ID, actor.Device.ID, sequence); err != nil { + groupError(w, err) + return + } + w.WriteHeader(204) +} diff --git a/server/internal/httpapi/groups.go b/server/internal/httpapi/groups.go index 681f90e..9ea1b3e 100644 --- a/server/internal/httpapi/groups.go +++ b/server/internal/httpapi/groups.go @@ -59,7 +59,7 @@ func (a *API) createGroup(w http.ResponseWriter, r *http.Request, _ string, id a } func (a *API) listGroups(w http.ResponseWriter, r *http.Request, _ string, id account.Identity) { - result, err := a.groups.List(r.Context(), id.User.ID) + result, err := a.groups.List(r.Context(), id.User.ID, id.Device.ID) if err != nil { groupError(w, err) return diff --git a/tests/delivery.test.mjs b/tests/delivery.test.mjs index 65afd68..b8d81ab 100644 --- a/tests/delivery.test.mjs +++ b/tests/delivery.test.mjs @@ -220,6 +220,13 @@ test('群密文和实时提示只投递到名单设备,移除或撤销阻断 assert.deepEqual(await json(path + '/messages', 'POST', member.token, message), sequence) const received = await json(path + '/messages', 'GET', member.token) assert.deepEqual(received.map((item) => item.wire), [message.wire]) + const unread = async (actor) => (await json('/groups', 'GET', actor.token)).find((entry) => entry.id === group.id)?.unread + const seen = (actor, cursor) => call(path + '/seen', 'POST', actor.token, { sequence: cursor }) + assert.equal(await unread(owner), 1) + assert.equal(await unread(member), 0) + assert.equal(await unread(outsider), undefined) + assert.equal((await seen(outsider, sequence.sequence)).status, 404) + assert.equal((await seen(member, '0')).status, 400) await json(path + '/preferences', 'POST', member.token, { muted: true }) @@ -242,6 +249,11 @@ test('群密文和实时提示只投递到名单设备,移除或撤销阻断 await json(attachment, 'GET', member.token, undefined, 404) await json(path + '/messages', 'POST', member.token, linked, 409) const posted = await json(path + '/messages', 'POST', owner.token, linked) + assert.equal(await unread(member), 1) + assert.equal((await seen(member, posted.sequence)).status, 204) + assert.equal((await seen(member, sequence.sequence)).status, 204) + assert.equal(await unread(member), 0) + assert.equal(await unread(owner), 1) assert.deepEqual(await json(path + '/messages', 'POST', owner.token, linked), posted) await json(path + '/messages', 'POST', owner.token, { ...linked, id: randomUUID() }, 409) await json(path + '/messages', 'POST', owner.token, { ...linked, attachmentId: undefined }, 409) @@ -252,11 +264,14 @@ test('群密文和实时提示只投递到名单设备,移除或撤销阻断 assert.deepEqual(Buffer.from(await download.arrayBuffer()), bytes) await json(attachment, 'GET', outsider.token, undefined, 404) await change(owner, 'remove', member.user.id) + assert.equal((await seen(member, posted.sequence)).status, 404) await json(path + '/messages', 'GET', member.token, undefined, 404) await json(attachment, 'GET', member.token, undefined, 404) await json(path + '/messages', 'POST', owner.token, { ...message, id: randomUUID() }, 409) await change(owner, 'invite', member.user.id) await change(member, 'accept') + assert.equal(await unread(member), 0) + assert.equal((await seen(member, posted.sequence)).status, 404) await json(attachment, 'GET', member.token, undefined, 404) assert.equal((await call(attachment, 'GET', owner.token)).status, 200) assert.deepEqual(await json(path + '/messages', 'GET', member.token), []) diff --git a/tests/group-chat.test.mjs b/tests/group-chat.test.mjs index 8f02674..c11c420 100644 --- a/tests/group-chat.test.mjs +++ b/tests/group-chat.test.mjs @@ -201,9 +201,13 @@ test('Windows 与 Web 加密群聊支持消息操作、附件、语音和成员 await Promise.all([owner, windows].map((page) => chat(page).getByText(first, { exact: true }).waitFor({ timeout: 3500 }))) assert.equal(await removed.getByRole('link', { name: '有新的群消息' }).count(), 0) await work(removed).getByRole('link', { name: '群组' }).click() - await removed.getByRole('link', { name: new RegExp(group) }).click() + const unreadGroup = removed.getByRole('link', { name: new RegExp(group + '.*1 条未读') }) + await unreadGroup.click() + await unreadGroup.waitFor() await chat(removed).getByRole('button', { name: '启用本机群聊' }).click() await chat(removed).getByText(first, { exact: true }).waitFor() + await unreadGroup.waitFor({ state: 'detached', timeout: 4500 }) + assert.equal(await windows.getByRole('link', { name: new RegExp(group + '.*未读') }).count(), 0) const original = chat(owner).getByRole('listitem').filter({ hasText: first }) assert.equal(await original.getByRole('button', { name: '编辑', exact: true }).count(), 0) diff --git a/web/src/chat/GroupChat.vue b/web/src/chat/GroupChat.vue index c10f712..2210708 100644 --- a/web/src/chat/GroupChat.vue +++ b/web/src/chat/GroupChat.vue @@ -1,6 +1,7 @@ diff --git a/web/src/chat/group-chat.ts b/web/src/chat/group-chat.ts index 5e69275..caf4f25 100644 --- a/web/src/chat/group-chat.ts +++ b/web/src/chat/group-chat.ts @@ -9,6 +9,7 @@ export type GroupMember = { id: string; username: string; state: 'active' | 'inv export type GroupDetail = { id: string; membershipVersion: string; members: GroupMember[]; role: GroupMember['role'] } export type GroupPreferences = { pinned: boolean; muted: boolean } export type GroupSummary = Omit & GroupPreferences & { name: string; state: GroupMember['state'] } +export type ListedGroup = GroupSummary & { unread: number } export type GroupDevice = Peer & { user: string } type Epoch = { id: string; creatorDevice: string; membershipVersion: string; welcome?: string; current: boolean; roster: string[] } type Publishing = { id: string; membershipVersion: string; devices: { device: string; wire?: string }[] } @@ -271,7 +272,8 @@ export function synchronizeGroup(identity: ChatIdentity, group: GroupDetail, cal const engine = factory.DeviceMls.restore(decode(state.engine)) try { await replenishPackages(identity, call, state, save, engine) } catch { warning ||= '密钥包补充失败' } finally { engine.free() } } - return { devices, lines: chat.lines, pinned: state.pinned, ready, current, warning, + const hasMore = packets.length === 64 && packets.at(-1)?.sequence === chat.cursor + return { devices, lines: chat.lines, pinned: state.pinned, ready, current, warning, cursor: chat.cursor, hasMore, hasPending: Boolean(chat.pendingMessage), stalePending: Boolean(chat.pendingMessage && chat.pendingMessage.epoch !== current?.id) } }) } diff --git a/web/src/views/ChatView.vue b/web/src/views/ChatView.vue index 64bf458..9f6f3a8 100644 --- a/web/src/views/ChatView.vue +++ b/web/src/views/ChatView.vue @@ -35,7 +35,7 @@ const recent = ref>({}) const conversationQuery = ref('') const history = ref() const shareRead = ref(false) -const pendingVoice = ref() +const pendingFile = ref() const view = ref>>() const target = computed(() => typeof route.params.user === 'string' ? route.params.user : '') const peer = computed(() => view.value?.peers.find((item) => item.id === selected.value)) @@ -213,7 +213,7 @@ function attach(event: Event) { const input = event.target as HTMLInputElement const file = input.files?.[0] input.value = '' - if (file) sendFile(file) + if (file) pendingFile.value = file } function sendFile(file: File) { @@ -225,12 +225,12 @@ function sendFile(file: File) { } function sendVoice(file: File) { - pendingVoice.value = file + pendingFile.value = file } -watch([pendingVoice, busy], ([file, inProgress]) => { +watch([pendingFile, busy], ([file, inProgress]) => { if (!file || inProgress) return - pendingVoice.value = undefined + pendingFile.value = undefined sendFile(file) }) @@ -286,7 +286,7 @@ watch(selected, () => { recalling.value = undefined forwarding.value = undefined forwardStatus.value = '' - pendingVoice.value = undefined + pendingFile.value = undefined draft.value = '' scheduleReceipt() }) diff --git a/web/src/views/GroupView.vue b/web/src/views/GroupView.vue index 0f5fe16..72277d2 100644 --- a/web/src/views/GroupView.vue +++ b/web/src/views/GroupView.vue @@ -5,7 +5,7 @@ import { useSession } from '../session' import { APIError } from '../api' import type { Contact } from '../contacts' import GroupChat from '../chat/GroupChat.vue' -import type { GroupPreferences, GroupSummary } from '../chat/group-chat' +import type { GroupPreferences, GroupSummary, ListedGroup } from '../chat/group-chat' type Group = GroupSummary type Detail = Group & { members: { id: string; username: string; state: Group['state']; role: Group['role'] }[] } @@ -13,7 +13,7 @@ type Detail = Group & { members: { id: string; username: string; state: Group['s const session = useSession() const route = useRoute() const router = useRouter() -const groups = ref([]) +const groups = ref([]) const contacts = ref([]) const detail = ref() const term = ref('') @@ -37,7 +37,7 @@ let revision = 0 async function refresh() { const version = ++revision const selected = id.value - let list = await session.authorized('/groups') + let list = await session.authorized('/groups') let next: Detail | undefined if (list.some((group) => group.id === selected)) { try { @@ -129,6 +129,7 @@ watch(id, () => { else reload() }) watch(() => session.groupListChanges, queueRefresh) +watch(() => session.groupChange, queueRefresh) watch(() => session.connection, (connection) => { if (connection === '实时连接已建立') queueRefresh() }) onMounted(() => { reload() @@ -157,6 +158,10 @@ onBeforeUnmount(() => { {{ group.name }} {{ group.state === 'invited' ? '待接受邀请' : roles[group.role] }} + + + {{ group.unread >= 100 ? '99 条以上未读' : group.unread + ' 条未读' }} +
@@ -175,7 +180,7 @@ onBeforeUnmount(() => {
- +
@@ -219,3 +224,18 @@ onBeforeUnmount(() => { + +