收藏定位私聊和群聊原消息 #46
No files matched your search
@@ -25,7 +25,7 @@
|
|||||||
| 加密附件 | 两端可在私聊和群聊多选或拖入文件,每批最多 8 个,每个最大 8 MiB。图片、视频在本机预览,群聊支持按附件类型查看。 |
|
| 加密附件 | 两端可在私聊和群聊多选或拖入文件,每批最多 8 个,每个最大 8 MiB。图片、视频在本机预览,群聊支持按附件类型查看。 |
|
||||||
| 加密语音 | 两端可在私聊和群聊录制、取消或发送最长 60 秒的语音消息,接收方在本机解密播放。 |
|
| 加密语音 | 两端可在私聊和群聊录制、取消或发送最长 60 秒的语音消息,接收方在本机解密播放。 |
|
||||||
| 消息管理 | 私聊和群聊支持引用回复、编辑文字、撤回、本机搜索、收藏和本机删除。可打开消息里的网页链接,并将消息转发到加密群或已核验的联系人设备。私聊支持可选加密已读回执。 |
|
| 消息管理 | 私聊和群聊支持引用回复、编辑文字、撤回、本机搜索、收藏和本机删除。可打开消息里的网页链接,并将消息转发到加密群或已核验的联系人设备。私聊支持可选加密已读回执。 |
|
||||||
| 本机收藏 | 汇总私聊与群聊收藏,支持本机搜索、按来源、内容类型和标签筛选。可预览媒体、播放语音、下载加密附件或批量取消收藏。 |
|
| 本机收藏 | 汇总私聊与群聊收藏,支持本机搜索、按来源、内容类型和标签筛选。可预览媒体、播放语音、下载加密附件、查看原消息或批量取消收藏。 |
|
||||||
| Chromium 浏览器 | Windows 端支持独立窗口、多标签、导航、搜索、书签、历史、下载和隐私窗口,网页运行在独立会话中。 |
|
| Chromium 浏览器 | Windows 端支持独立窗口、多标签、导航、搜索、书签、历史、下载和隐私窗口,网页运行在独立会话中。 |
|
||||||
|
|
||||||
当前为开发预览。大文件分片、音视频和多设备历史同步仍在开发,Windows 安装包尚未发布。 [开发进度与验收记录](docs/progress.md)
|
当前为开发预览。大文件分片、音视频和多设备历史同步仍在开发,Windows 安装包尚未发布。 [开发进度与验收记录](docs/progress.md)
|
||||||
|
|||||||
@@ -228,3 +228,7 @@ Windows 与 Edge 验证多选、拖拽、移除、清空和数量上限。第二
|
|||||||
Windows 和 Web 可从工作区进入收藏,查看当前设备本机密文库中的私聊和群聊收藏,按消息时间倒序分页。可按来源和文字、网页、图片、视频、语音、文件筛选。本机搜索匹配消息文字、引用、文件名及会话名称。复用聊天内的安全链接处理、媒体解密预览、语音播放和附件下载,附件仍受服务端访问权限和保留期限约束。取消收藏保留原消息,收藏状态按本机设备隔离。
|
Windows 和 Web 可从工作区进入收藏,查看当前设备本机密文库中的私聊和群聊收藏,按消息时间倒序分页。可按来源和文字、网页、图片、视频、语音、文件筛选。本机搜索匹配消息文字、引用、文件名及会话名称。复用聊天内的安全链接处理、媒体解密预览、语音播放和附件下载,附件仍受服务端访问权限和保留期限约束。取消收藏保留原消息,收藏状态按本机设备隔离。
|
||||||
|
|
||||||
收藏标签与消息一起保存在本机加密库,可筛选和搜索。批量管理支持选择当前列表和逐条选择,确认后在一次本机写入中清除收藏与关联标签。已撤回消息也会移出收藏。
|
收藏标签与消息一起保存在本机加密库,可筛选和搜索。批量管理支持选择当前列表和逐条选择,确认后在一次本机写入中清除收藏与关联标签。已撤回消息也会移出收藏。
|
||||||
|
|
||||||
|
收藏可跳回当前账号仍可查看的私聊与群聊。客户端按设备和消息标识匹配本机历史,滚动并聚焦到原消息。跳转参数只有标识,恢复会话仍沿用设备核验和群成员权限。找不到已缓存原消息时显示明确提示。
|
||||||
|
|
||||||
|
Windows Electron 与 Edge 验证同一设备上的私聊与群聊收藏汇总、来源和类型筛选、解密下载及播放、标签持久化、批量取消后原消息仍在、双端原消息定位和焦点。客户端搜索和收藏操作未向服务端发送搜索词或标签。
|
||||||
@@ -435,6 +435,14 @@ test('Web 与 Windows 安全码校验、加密互发、离线接收和状态恢
|
|||||||
web.off('request', trackFavorites)
|
web.off('request', trackFavorites)
|
||||||
assert.ok(tracked.every(([url, method, body]) => method === 'GET' && !body &&
|
assert.ok(tracked.every(([url, method, body]) => method === 'GET' && !body &&
|
||||||
!url.includes(encodeURIComponent(marker)) && !url.includes(encodeURIComponent('验收资料'))))
|
!url.includes(encodeURIComponent(marker)) && !url.includes(encodeURIComponent('验收资料'))))
|
||||||
|
const originalLink = webFavorites.getByRole('link', { name: '查看原消息', exact: true })
|
||||||
|
assert.ok(!(await originalLink.getAttribute('href')).includes('healthz'))
|
||||||
|
await originalLink.click()
|
||||||
|
const locatedPrivate = web.getByRole('list', { name: '消息记录' }).locator('li[aria-current="true"]')
|
||||||
|
await locatedPrivate.getByRole('link', { name: link, exact: true }).waitFor()
|
||||||
|
await locatedPrivate.evaluate((row) => {
|
||||||
|
if (document.activeElement !== row) throw new Error('私聊原消息未获得焦点')
|
||||||
|
})
|
||||||
|
|
||||||
await windows.getByLabel('内容类型').selectOption('image')
|
await windows.getByLabel('内容类型').selectOption('image')
|
||||||
await windowsFavorites.getByRole('button', { name: '预览 加密预览.png', exact: true }).click()
|
await windowsFavorites.getByRole('button', { name: '预览 加密预览.png', exact: true }).click()
|
||||||
|
|||||||
@@ -626,7 +626,9 @@ test('Windows 与 Web 加密群聊支持消息操作、附件、语音和成员
|
|||||||
await windows.getByRole('heading', { name: pendingGroup }).waitFor()
|
await windows.getByRole('heading', { name: pendingGroup }).waitFor()
|
||||||
await work(windows).getByRole('link', { name: '消息', exact: true }).click()
|
await work(windows).getByRole('link', { name: '消息', exact: true }).click()
|
||||||
await windows.getByRole('link', { name: names[0] }).click()
|
await windows.getByRole('link', { name: names[0] }).click()
|
||||||
|
await windows.waitForURL(/#\/chat\/[0-9a-f-]+$/)
|
||||||
await windows.getByRole('button', { name: '启用本机加密聊天' }).click()
|
await windows.getByRole('button', { name: '启用本机加密聊天' }).click()
|
||||||
|
await windows.getByText('设备已验证', { exact: true }).waitFor()
|
||||||
const privateFile = '私聊文件-' + id() + '.txt'
|
const privateFile = '私聊文件-' + id() + '.txt'
|
||||||
const privateAttachments = windows.getByRole('region', { name: '私聊附件发送区' })
|
const privateAttachments = windows.getByRole('region', { name: '私聊附件发送区' })
|
||||||
await privateAttachments.locator('input:enabled').setInputFiles({ name: privateFile, mimeType: 'text/plain', buffer: contents })
|
await privateAttachments.locator('input:enabled').setInputFiles({ name: privateFile, mimeType: 'text/plain', buffer: contents })
|
||||||
@@ -728,7 +730,16 @@ test('Windows 与 Web 加密群聊支持消息操作、附件、语音和成员
|
|||||||
await windows.getByLabel('来源', { exact: true }).selectOption('group')
|
await windows.getByLabel('来源', { exact: true }).selectOption('group')
|
||||||
assert.equal(await downloads.count(), 1)
|
assert.equal(await downloads.count(), 1)
|
||||||
await collection.getByText(new RegExp(targetGroup)).waitFor()
|
await collection.getByText(new RegExp(targetGroup)).waitFor()
|
||||||
|
await collection.getByRole('link', { name: '查看原消息', exact: true }).click()
|
||||||
|
const locatedGroup = chat(windows).getByRole('list', { name: '群消息记录' }).locator('li[aria-current="true"]')
|
||||||
|
await locatedGroup.getByRole('button', { name: '下载 ' + privateFile, exact: true }).waitFor()
|
||||||
|
await locatedGroup.evaluate((row) => {
|
||||||
|
if (document.activeElement !== row) throw new Error('群聊原消息未获得焦点')
|
||||||
|
})
|
||||||
|
await work(windows).getByRole('link', { name: '收藏', exact: true }).click()
|
||||||
|
await windows.getByRole('searchbox', { name: '搜索本机收藏' }).fill(privateFile)
|
||||||
await windows.getByLabel('来源', { exact: true }).selectOption('private')
|
await windows.getByLabel('来源', { exact: true }).selectOption('private')
|
||||||
|
await downloads.waitFor()
|
||||||
assert.equal(await downloads.count(), 1)
|
assert.equal(await downloads.count(), 1)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
const status = await Promise.all(pages.map((page) => page.locator('[role=alert], .group-chat [role=status]').allTextContents()))
|
const status = await Promise.all(pages.map((page) => page.locator('[role=alert], .group-chat [role=status]').allTextContents()))
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
|
import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
|
||||||
|
import { useRoute } from 'vue-router'
|
||||||
import { useSession } from '../session'
|
import { useSession } from '../session'
|
||||||
import { APIError } from '../api'
|
import { APIError } from '../api'
|
||||||
import { downloadAttachment, maxAttachmentSize } from './attachments'
|
import { downloadAttachment, maxAttachmentSize } from './attachments'
|
||||||
@@ -12,10 +13,15 @@ import VoiceRecorder from './VoiceRecorder.vue'
|
|||||||
import { enableChat, trust } from './chat'
|
import { enableChat, trust } from './chat'
|
||||||
import { discardPendingGroupMessage, forwardGroupMessage, groupAttachmentPath, groupQuote, publishGroup, removeLocalGroupMessage, sendGroupMessage, setGroupFavorite, synchronizeGroup } from './group-chat'
|
import { discardPendingGroupMessage, forwardGroupMessage, groupAttachmentPath, groupQuote, publishGroup, removeLocalGroupMessage, sendGroupMessage, setGroupFavorite, synchronizeGroup } from './group-chat'
|
||||||
import type { ForwardDestination, GroupDetail, GroupDevice, GroupLine } from './group-chat'
|
import type { ForwardDestination, GroupDetail, GroupDevice, GroupLine } from './group-chat'
|
||||||
|
import { focusMessage, groupMessageFocus, groupMessageKey } from './message-key'
|
||||||
|
|
||||||
const props = defineProps<{ group: GroupDetail }>()
|
const props = defineProps<{ group: GroupDetail }>()
|
||||||
const emit = defineEmits<{ seen: [] }>()
|
const emit = defineEmits<{ seen: [] }>()
|
||||||
const session = useSession()
|
const session = useSession()
|
||||||
|
const route = useRoute()
|
||||||
|
const history = ref<HTMLUListElement>()
|
||||||
|
const openedMessage = ref('')
|
||||||
|
const requestedMessage = computed(() => groupMessageFocus(route.query.message, props.group.id))
|
||||||
const view = ref<Awaited<ReturnType<typeof synchronizeGroup>>>()
|
const view = ref<Awaited<ReturnType<typeof synchronizeGroup>>>()
|
||||||
const code = ref('')
|
const code = ref('')
|
||||||
const codes = ref<Record<string, string>>({})
|
const codes = ref<Record<string, string>>({})
|
||||||
@@ -63,6 +69,8 @@ const lines = computed(() => {
|
|||||||
return mode === 'messages' ? matches : matches.reverse()
|
return mode === 'messages' ? matches : matches.reverse()
|
||||||
})
|
})
|
||||||
const visibleLines = computed(() => historyView.value.id === 'messages' ? lines.value : lines.value.slice(0, mediaLimit.value))
|
const visibleLines = computed(() => historyView.value.id === 'messages' ? lines.value : lines.value.slice(0, mediaLimit.value))
|
||||||
|
const highlighted = computed(() => requestedMessage.value && visibleLines.value.find((line) =>
|
||||||
|
!line.recalled && groupMessageKey(props.group.id, line) === requestedMessage.value))
|
||||||
const members = computed(() => props.group.members.filter((member) => member.state === 'active' && member.id !== session.identity?.user.id))
|
const members = computed(() => props.group.members.filter((member) => member.state === 'active' && member.id !== session.identity?.user.id))
|
||||||
const canPublish = computed(() => Boolean(view.value && !view.value.current && members.value.every((member) =>
|
const canPublish = computed(() => Boolean(view.value && !view.value.current && members.value.every((member) =>
|
||||||
view.value?.devices.some((device) => device.user === member.id && device.id === selected.value[member.id] && pinned(device)))))
|
view.value?.devices.some((device) => device.user === member.id && device.id === selected.value[member.id] && pinned(device)))))
|
||||||
@@ -317,6 +325,19 @@ function discard() {
|
|||||||
|
|
||||||
watch(() => props.group.membershipVersion, queueRefresh)
|
watch(() => props.group.membershipVersion, queueRefresh)
|
||||||
watch([historyView, search, favoritesOnly], () => { mediaLimit.value = mediaPageSize })
|
watch([historyView, search, favoritesOnly], () => { mediaLimit.value = mediaPageSize })
|
||||||
|
watch(requestedMessage, (key) => {
|
||||||
|
openedMessage.value = ''
|
||||||
|
if (!key) return
|
||||||
|
historyView.value = historyViews[0]
|
||||||
|
search.value = ''
|
||||||
|
favoritesOnly.value = false
|
||||||
|
if (code.value) queueRefresh()
|
||||||
|
else enable()
|
||||||
|
}, { immediate: true })
|
||||||
|
watch([highlighted, history], () => {
|
||||||
|
const key = requestedMessage.value
|
||||||
|
if (key && key !== openedMessage.value && highlighted.value && focusMessage(history.value)) openedMessage.value = key
|
||||||
|
}, { flush: 'post' })
|
||||||
watch(() => session.groupChange, (event) => { if (event?.groupId === props.group.id) queueRefresh() })
|
watch(() => session.groupChange, (event) => { if (event?.groupId === props.group.id) queueRefresh() })
|
||||||
watch(() => session.connection, (connection) => { if (connection === '实时连接已建立') queueRefresh() })
|
watch(() => session.connection, (connection) => { if (connection === '实时连接已建立') queueRefresh() })
|
||||||
watch(currentEpoch, (epoch, previous) => {
|
watch(currentEpoch, (epoch, previous) => {
|
||||||
@@ -364,6 +385,7 @@ onBeforeUnmount(() => {
|
|||||||
<button v-if="!code" class="primary" :disabled="busy" @click="enable">启用本机群聊</button>
|
<button v-if="!code" class="primary" :disabled="busy" @click="enable">启用本机群聊</button>
|
||||||
<template v-else>
|
<template v-else>
|
||||||
<p v-if="view?.warning" class="muted" role="status">{{ view.warning }}</p>
|
<p v-if="view?.warning" class="muted" role="status">{{ view.warning }}</p>
|
||||||
|
<p v-if="requestedMessage && view && !highlighted && !openedMessage && !busy" class="muted" role="status">原消息当前无法定位。</p>
|
||||||
<p v-if="ready" role="status">群加密已建立</p>
|
<p v-if="ready" role="status">群加密已建立</p>
|
||||||
<p v-else-if="view?.current && !view.current.welcome">当前设备未获分配群密钥。</p>
|
<p v-else-if="view?.current && !view.current.welcome">当前设备未获分配群密钥。</p>
|
||||||
<p v-else-if="!view?.current && group.role !== 'owner'">等待群主建立群加密会话。</p>
|
<p v-else-if="!view?.current && group.role !== 'owner'">等待群主建立群加密会话。</p>
|
||||||
@@ -419,9 +441,10 @@ onBeforeUnmount(() => {
|
|||||||
<label class="chat-checkbox"><input v-model="favoritesOnly" type="checkbox">只看收藏</label>
|
<label class="chat-checkbox"><input v-model="favoritesOnly" type="checkbox">只看收藏</label>
|
||||||
</div>
|
</div>
|
||||||
<p v-if="!lines.length && (historyView.id !== 'messages' || search.trim() || favoritesOnly)" class="muted" role="status">{{ historyView.empty }}</p>
|
<p v-if="!lines.length && (historyView.id !== 'messages' || search.trim() || favoritesOnly)" class="muted" role="status">{{ historyView.empty }}</p>
|
||||||
<ul v-if="visibleLines.length" class="group-chat-lines" :class="{ 'group-media': historyView.id !== 'messages' }"
|
<ul v-if="visibleLines.length" ref="history" class="group-chat-lines" :class="{ 'group-media': historyView.id !== 'messages' }"
|
||||||
:aria-label="historyView.id === 'messages' ? '群消息记录' : historyView.label">
|
:aria-label="historyView.id === 'messages' ? '群消息记录' : historyView.label">
|
||||||
<li v-for="line in visibleLines" :key="[historyView.id, line.epoch, line.sender, line.id].join('/')">
|
<li v-for="line in visibleLines" :key="[historyView.id, line.epoch, line.sender, line.id].join('/')"
|
||||||
|
:aria-current="highlighted === line ? 'true' : undefined" :tabindex="highlighted === line ? -1 : undefined">
|
||||||
<small>{{ line.name }} · {{ new Date(line.time).toLocaleString() }}</small>
|
<small>{{ line.name }} · {{ new Date(line.time).toLocaleString() }}</small>
|
||||||
<blockquote v-if="line.quote">{{ line.quote }}</blockquote>
|
<blockquote v-if="line.quote">{{ line.quote }}</blockquote>
|
||||||
<p v-if="line.recalled" class="muted">消息已撤回</p>
|
<p v-if="line.recalled" class="muted">消息已撤回</p>
|
||||||
|
|||||||
@@ -271,7 +271,7 @@ export function send(identity: ChatIdentity, user: string, peer: Peer, content:
|
|||||||
export function localMessageAction(identity: ChatIdentity, line: ChatLine, action: 'favorite' | 'remove') {
|
export function localMessageAction(identity: ChatIdentity, line: ChatLine, action: 'favorite' | 'remove') {
|
||||||
return update(identity, async (state, save) => {
|
return update(identity, async (state, save) => {
|
||||||
const index = state.lines.findIndex((item) => item.id === line.id && item.peer === line.peer && item.own === line.own)
|
const index = state.lines.findIndex((item) => item.id === line.id && item.peer === line.peer && item.own === line.own)
|
||||||
if (index < 0) return
|
if (index < 0) return state.lines
|
||||||
if (action === 'remove') {
|
if (action === 'remove') {
|
||||||
if (state.outbox.some((item) => (item.mutationTarget ?? item.messageId) === line.id && item.recipientDevice === line.peer)) {
|
if (state.outbox.some((item) => (item.mutationTarget ?? item.messageId) === line.id && item.recipientDevice === line.peer)) {
|
||||||
throw new Error('待发送消息暂不能删除')
|
throw new Error('待发送消息暂不能删除')
|
||||||
@@ -283,6 +283,7 @@ export function localMessageAction(identity: ChatIdentity, line: ChatLine, actio
|
|||||||
else if (!target.recalled) target.favorite = true
|
else if (!target.recalled) target.favorite = true
|
||||||
}
|
}
|
||||||
await save(state)
|
await save(state)
|
||||||
|
return state.lines
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import type { Attachment } from './attachments'
|
import type { Attachment } from './attachments'
|
||||||
import type { ChatLine, ChatState } from './chat'
|
import type { ChatLine, ChatState } from './chat'
|
||||||
import type { GroupLine } from './group-chat'
|
|
||||||
import { splitChatText } from './links'
|
import { splitChatText } from './links'
|
||||||
|
import { groupMessageKey, privateMessageKey } from './message-key'
|
||||||
import { withVault } from './vault'
|
import { withVault } from './vault'
|
||||||
|
|
||||||
type FavoriteType = 'text' | 'link' | 'image' | 'video' | 'voice' | 'file'
|
type FavoriteType = 'text' | 'link' | 'image' | 'video' | 'voice' | 'file'
|
||||||
@@ -20,9 +20,6 @@ export type Favorite = CommonFavorite & (
|
|||||||
{ kind: 'group'; group: string; sender: string; epoch?: string; id: string }
|
{ kind: 'group'; group: string; sender: string; epoch?: string; id: string }
|
||||||
)
|
)
|
||||||
|
|
||||||
const privateKey = (line: ChatLine) => ['private', line.peer, line.own ? 'own' : 'remote', line.id].join('/')
|
|
||||||
const groupKey = (group: string, line: GroupLine) => ['group', group, line.epoch, line.sender, line.id].join('/')
|
|
||||||
|
|
||||||
export function clearFavorite(line: FavoriteFields) {
|
export function clearFavorite(line: FavoriteFields) {
|
||||||
delete line.favorite
|
delete line.favorite
|
||||||
delete line.favoriteTags
|
delete line.favoriteTags
|
||||||
@@ -58,14 +55,14 @@ function entries(state?: ChatState): Favorite[] {
|
|||||||
for (const line of state?.lines ?? []) {
|
for (const line of state?.lines ?? []) {
|
||||||
if (!line.favorite || line.recalled) continue
|
if (!line.favorite || line.recalled) continue
|
||||||
const { id, peer, own, contact, text, quote, time, attachment } = line
|
const { id, peer, own, contact, text, quote, time, attachment } = line
|
||||||
favorites.push({ kind: 'private', key: privateKey(line), type: favoriteType(line), id, peer, own, contact, text, quote, time,
|
favorites.push({ kind: 'private', key: privateMessageKey(line), type: favoriteType(line), id, peer, own, contact, text, quote, time,
|
||||||
attachment, tags: line.favoriteTags ?? [] })
|
attachment, tags: line.favoriteTags ?? [] })
|
||||||
}
|
}
|
||||||
for (const [group, chat] of Object.entries(state?.groupChats ?? {})) {
|
for (const [group, chat] of Object.entries(state?.groupChats ?? {})) {
|
||||||
for (const line of chat.lines) {
|
for (const line of chat.lines) {
|
||||||
if (!line.favorite || line.recalled) continue
|
if (!line.favorite || line.recalled) continue
|
||||||
const { id, epoch, sender, text, quote, time, attachment } = line
|
const { id, epoch, sender, text, quote, time, attachment } = line
|
||||||
favorites.push({ kind: 'group', key: groupKey(group, line), type: favoriteType(line), id, group, epoch, sender, text, quote,
|
favorites.push({ kind: 'group', key: groupMessageKey(group, line), type: favoriteType(line), id, group, epoch, sender, text, quote,
|
||||||
time, attachment, tags: line.favoriteTags ?? [] })
|
time, attachment, tags: line.favoriteTags ?? [] })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -88,14 +85,14 @@ export function removeFavorites(device: string, keys: ReadonlySet<string>) {
|
|||||||
return changeFavorites(device, (state) => {
|
return changeFavorites(device, (state) => {
|
||||||
let changed = false
|
let changed = false
|
||||||
for (const line of state.lines) {
|
for (const line of state.lines) {
|
||||||
if (line.favorite && keys.has(privateKey(line))) {
|
if (line.favorite && keys.has(privateMessageKey(line))) {
|
||||||
clearFavorite(line)
|
clearFavorite(line)
|
||||||
changed = true
|
changed = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (const [group, chat] of Object.entries(state.groupChats ?? {})) {
|
for (const [group, chat] of Object.entries(state.groupChats ?? {})) {
|
||||||
for (const line of chat.lines) {
|
for (const line of chat.lines) {
|
||||||
if (line.favorite && keys.has(groupKey(group, line))) {
|
if (line.favorite && keys.has(groupMessageKey(group, line))) {
|
||||||
clearFavorite(line)
|
clearFavorite(line)
|
||||||
changed = true
|
changed = true
|
||||||
}
|
}
|
||||||
@@ -108,8 +105,8 @@ export function removeFavorites(device: string, keys: ReadonlySet<string>) {
|
|||||||
export function setFavoriteTags(device: string, key: string, tags: string[]) {
|
export function setFavoriteTags(device: string, key: string, tags: string[]) {
|
||||||
return changeFavorites(device, (state) => {
|
return changeFavorites(device, (state) => {
|
||||||
const group = key.split('/')[1] ?? ''
|
const group = key.split('/')[1] ?? ''
|
||||||
const line = key.startsWith('private/') ? state.lines.find((item) => privateKey(item) === key) :
|
const line = key.startsWith('private/') ? state.lines.find((item) => privateMessageKey(item) === key) :
|
||||||
state.groupChats?.[group]?.lines.find((item) => groupKey(group, item) === key)
|
state.groupChats?.[group]?.lines.find((item) => groupMessageKey(group, item) === key)
|
||||||
if (!line?.favorite || line.recalled) throw new Error('此消息已不在本机收藏')
|
if (!line?.favorite || line.recalled) throw new Error('此消息已不在本机收藏')
|
||||||
const labels = normalizedTags(tags)
|
const labels = normalizedTags(tags)
|
||||||
if (labels.length) line.favoriteTags = labels
|
if (labels.length) line.favoriteTags = labels
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
import type { ChatLine } from './chat'
|
||||||
|
import type { GroupLine } from './group-chat'
|
||||||
|
|
||||||
|
const uuid = /^[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}$/
|
||||||
|
|
||||||
|
export function privateMessageKey(line: Pick<ChatLine, 'id' | 'peer' | 'own'>) {
|
||||||
|
return ['private', line.peer, line.own ? 'own' : 'remote', line.id].join('/')
|
||||||
|
}
|
||||||
|
|
||||||
|
export function groupMessageKey(group: string, line: Pick<GroupLine, 'id' | 'sender' | 'epoch'>) {
|
||||||
|
return ['group', group, line.epoch, line.sender, line.id].join('/')
|
||||||
|
}
|
||||||
|
|
||||||
|
export function privateMessageFocus(value: unknown) {
|
||||||
|
if (typeof value !== 'string' || value.length > 100) return
|
||||||
|
const [kind, device, side, id, extra] = value.split('/')
|
||||||
|
if (kind !== 'private' || !device || !uuid.test(device) || (side !== 'own' && side !== 'remote') ||
|
||||||
|
!id || !uuid.test(id) || extra !== undefined) return
|
||||||
|
return { key: value, device }
|
||||||
|
}
|
||||||
|
|
||||||
|
export function groupMessageFocus(value: unknown, group: string) {
|
||||||
|
if (typeof value !== 'string' || value.length > 160) return
|
||||||
|
const [kind, scope, epoch, sender, id, extra] = value.split('/')
|
||||||
|
if (kind !== 'group' || scope !== group || !uuid.test(group) || (epoch !== '' && (!epoch || !uuid.test(epoch))) ||
|
||||||
|
!sender || !uuid.test(sender) || !id || !uuid.test(id) || extra !== undefined) return
|
||||||
|
return value
|
||||||
|
}
|
||||||
|
|
||||||
|
export function focusMessage(history?: HTMLElement) {
|
||||||
|
const row = history?.querySelector<HTMLElement>('li[aria-current="true"]')
|
||||||
|
if (!row) return false
|
||||||
|
row.scrollIntoView({ block: 'center', inline: 'nearest' })
|
||||||
|
row.focus({ preventScroll: true })
|
||||||
|
return true
|
||||||
|
}
|
||||||
@@ -91,6 +91,7 @@ input { width: 100%; color: var(--text); background: var(--base); border: 1px so
|
|||||||
.chat-lines { list-style: none; padding: 0; margin: 0; min-height: 90px; max-height: 45vh; overflow: auto; display: flex; flex-direction: column; gap: 8px; }
|
.chat-lines { list-style: none; padding: 0; margin: 0; min-height: 90px; max-height: 45vh; overflow: auto; display: flex; flex-direction: column; gap: 8px; }
|
||||||
.chat-lines li { align-self: start; border-radius: 9px; background: var(--base); padding: 8px 11px; max-width: 85%; white-space: pre-wrap; overflow-wrap: anywhere; }
|
.chat-lines li { align-self: start; border-radius: 9px; background: var(--base); padding: 8px 11px; max-width: 85%; white-space: pre-wrap; overflow-wrap: anywhere; }
|
||||||
.chat-lines li.own { align-self: end; background: var(--green-soft); }
|
.chat-lines li.own { align-self: end; background: var(--green-soft); }
|
||||||
|
.chat-lines li[aria-current='true'], .group-chat-lines li[aria-current='true'] { outline: 2px solid var(--green); outline-offset: -2px; }
|
||||||
.chat-lines small { display: block; text-align: end; }
|
.chat-lines small { display: block; text-align: end; }
|
||||||
.chat-lines audio { display: block; width: min(260px, 100%); }
|
.chat-lines audio { display: block; width: min(260px, 100%); }
|
||||||
.media-preview { display: grid; gap: 5px; justify-items: start; margin-bottom: 5px; }
|
.media-preview { display: grid; gap: 5px; justify-items: start; margin-bottom: 5px; }
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import VoiceRecorder from '../chat/VoiceRecorder.vue'
|
|||||||
import VoiceMessage from '../chat/VoiceMessage.vue'
|
import VoiceMessage from '../chat/VoiceMessage.vue'
|
||||||
import MediaPreview from '../chat/MediaPreview.vue'
|
import MediaPreview from '../chat/MediaPreview.vue'
|
||||||
import MessageText from '../chat/MessageText.vue'
|
import MessageText from '../chat/MessageText.vue'
|
||||||
|
import { focusMessage, privateMessageFocus, privateMessageKey } from '../chat/message-key'
|
||||||
|
|
||||||
const session = useSession()
|
const session = useSession()
|
||||||
const route = useRoute()
|
const route = useRoute()
|
||||||
@@ -37,6 +38,7 @@ const recent = ref<Record<string, string>>({})
|
|||||||
const unread = ref<Record<string, number>>({})
|
const unread = ref<Record<string, number>>({})
|
||||||
const conversationQuery = ref('')
|
const conversationQuery = ref('')
|
||||||
const history = ref<HTMLOListElement>()
|
const history = ref<HTMLOListElement>()
|
||||||
|
const openedMessage = ref('')
|
||||||
const shareRead = ref(false)
|
const shareRead = ref(false)
|
||||||
const pendingVoice = ref<File>()
|
const pendingVoice = ref<File>()
|
||||||
const files = ref<File[]>([])
|
const files = ref<File[]>([])
|
||||||
@@ -45,6 +47,7 @@ const batchProgress = ref('')
|
|||||||
const maxBatchFiles = 8
|
const maxBatchFiles = 8
|
||||||
const view = ref<Awaited<ReturnType<typeof synchronize>>>()
|
const view = ref<Awaited<ReturnType<typeof synchronize>>>()
|
||||||
const target = computed(() => typeof route.params.user === 'string' ? route.params.user : '')
|
const target = computed(() => typeof route.params.user === 'string' ? route.params.user : '')
|
||||||
|
const requestedMessage = computed(() => target.value ? privateMessageFocus(route.query.message) : undefined)
|
||||||
const activeContact = computed(() => contacts.value.find((item) => item.id === target.value && item.state === 'friend'))
|
const activeContact = computed(() => contacts.value.find((item) => item.id === target.value && item.state === 'friend'))
|
||||||
const peer = computed(() => view.value?.peers.find((item) => item.id === selected.value))
|
const peer = computed(() => view.value?.peers.find((item) => item.id === selected.value))
|
||||||
const trusted = computed(() => peer.value && view.value?.pinned[peer.value.id] === peer.value.publicKey)
|
const trusted = computed(() => peer.value && view.value?.pinned[peer.value.id] === peer.value.publicKey)
|
||||||
@@ -62,6 +65,8 @@ const lines = computed(() => {
|
|||||||
(!favoritesOnly.value || line.favorite) &&
|
(!favoritesOnly.value || line.favorite) &&
|
||||||
(!query || [line.text, line.attachment?.name, line.quote].some((part) => part?.toLowerCase().includes(query))))
|
(!query || [line.text, line.attachment?.name, line.quote].some((part) => part?.toLowerCase().includes(query))))
|
||||||
})
|
})
|
||||||
|
const highlighted = computed(() => trusted.value && requestedMessage.value ? lines.value.find((line) =>
|
||||||
|
!line.recalled && privateMessageKey(line) === requestedMessage.value?.key) : undefined)
|
||||||
let timer: ReturnType<typeof setInterval>
|
let timer: ReturnType<typeof setInterval>
|
||||||
let receiptTimer: ReturnType<typeof setTimeout> | undefined
|
let receiptTimer: ReturnType<typeof setTimeout> | undefined
|
||||||
let seenTimer: ReturnType<typeof setTimeout> | undefined
|
let seenTimer: ReturnType<typeof setTimeout> | undefined
|
||||||
@@ -70,6 +75,8 @@ let unreadVersion = 0
|
|||||||
let conversationVersion = 0
|
let conversationVersion = 0
|
||||||
let markingSeen = false
|
let markingSeen = false
|
||||||
let active = true
|
let active = true
|
||||||
|
let refreshRequested = false
|
||||||
|
let refreshTimer: ReturnType<typeof setTimeout> | undefined
|
||||||
const seen = new Map<string, string>()
|
const seen = new Map<string, string>()
|
||||||
|
|
||||||
async function loadConversations() {
|
async function loadConversations() {
|
||||||
@@ -134,6 +141,7 @@ async function execute(action: () => Promise<void>) {
|
|||||||
} finally {
|
} finally {
|
||||||
busy.value = false
|
busy.value = false
|
||||||
scheduleReceipt()
|
scheduleReceipt()
|
||||||
|
if (refreshRequested && active) sync()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -142,7 +150,7 @@ async function refresh() {
|
|||||||
if (!identity || !target.value || !ownCode.value) return
|
if (!identity || !target.value || !ownCode.value) return
|
||||||
const contact = target.value
|
const contact = target.value
|
||||||
const current = await synchronize(identity, contact, session.authorized)
|
const current = await synchronize(identity, contact, session.authorized)
|
||||||
if (target.value !== contact) return
|
if (!active || target.value !== contact) return
|
||||||
view.value = current
|
view.value = current
|
||||||
shareRead.value = current.shareRead
|
shareRead.value = current.shareRead
|
||||||
for (const line of current.lines) {
|
for (const line of current.lines) {
|
||||||
@@ -150,7 +158,12 @@ async function refresh() {
|
|||||||
recent.value[line.contact] = line.time
|
recent.value[line.contact] = line.time
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!current.peers.some((device) => device.id === selected.value)) selected.value = current.peers[0]?.id ?? ''
|
const requested = requestedMessage.value
|
||||||
|
if (requested && openedMessage.value !== requested.key && current.peers.some((device) => device.id === requested.device)) {
|
||||||
|
selected.value = requested.device
|
||||||
|
} else if (!current.peers.some((device) => device.id === selected.value)) {
|
||||||
|
selected.value = current.peers[0]?.id ?? ''
|
||||||
|
}
|
||||||
queueSeen()
|
queueSeen()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -335,10 +348,11 @@ function saveAttachment(attachment: Attachment) {
|
|||||||
function localAction(line: ChatLine, action: 'favorite' | 'remove') {
|
function localAction(line: ChatLine, action: 'favorite' | 'remove') {
|
||||||
void execute(async () => {
|
void execute(async () => {
|
||||||
if (!session.identity) return
|
if (!session.identity) return
|
||||||
await localMessageAction(session.identity, line, action)
|
const current = view.value
|
||||||
|
const updated = await localMessageAction(session.identity, line, action)
|
||||||
|
if (current && view.value === current) current.lines = updated
|
||||||
deleting.value = undefined
|
deleting.value = undefined
|
||||||
if (action === 'remove' && reply.value?.id === line.id) reply.value = undefined
|
if (action === 'remove' && reply.value?.id === line.id) reply.value = undefined
|
||||||
await refresh()
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -361,7 +375,15 @@ function submitForward(destination: ForwardDestination) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function sync() {
|
function sync() {
|
||||||
if (ownCode.value) void execute(refresh)
|
if (!active || !ownCode.value || !target.value) return
|
||||||
|
refreshRequested = true
|
||||||
|
if (busy.value || refreshTimer) return
|
||||||
|
refreshTimer = setTimeout(() => {
|
||||||
|
refreshTimer = undefined
|
||||||
|
if (busy.value) return
|
||||||
|
refreshRequested = false
|
||||||
|
void execute(refresh)
|
||||||
|
}, 180)
|
||||||
}
|
}
|
||||||
|
|
||||||
watch(target, () => {
|
watch(target, () => {
|
||||||
@@ -391,6 +413,18 @@ watch(() => [session.inboxChanges, session.contactChanges, session.connection],
|
|||||||
watch(() => [session.inboxChanges, session.contactChanges, session.connection], queueUnread)
|
watch(() => [session.inboxChanges, session.contactChanges, session.connection], queueUnread)
|
||||||
watch(() => [session.contactChanges, session.connection], () => void loadConversations())
|
watch(() => [session.contactChanges, session.connection], () => void loadConversations())
|
||||||
watch([search, favoritesOnly], scheduleReceipt)
|
watch([search, favoritesOnly], scheduleReceipt)
|
||||||
|
watch(requestedMessage, (message) => {
|
||||||
|
openedMessage.value = ''
|
||||||
|
if (!message) return
|
||||||
|
search.value = ''
|
||||||
|
favoritesOnly.value = false
|
||||||
|
if (ownCode.value) sync()
|
||||||
|
else enable()
|
||||||
|
}, { immediate: true })
|
||||||
|
watch([highlighted, history], () => {
|
||||||
|
const key = requestedMessage.value?.key
|
||||||
|
if (key && key !== openedMessage.value && highlighted.value && focusMessage(history.value)) openedMessage.value = key
|
||||||
|
}, { flush: 'post' })
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
void loadConversations()
|
void loadConversations()
|
||||||
queueUnread()
|
queueUnread()
|
||||||
@@ -406,6 +440,7 @@ onBeforeUnmount(() => {
|
|||||||
clearTimeout(receiptTimer)
|
clearTimeout(receiptTimer)
|
||||||
clearTimeout(seenTimer)
|
clearTimeout(seenTimer)
|
||||||
clearTimeout(unreadTimer)
|
clearTimeout(unreadTimer)
|
||||||
|
clearTimeout(refreshTimer)
|
||||||
unreadVersion++
|
unreadVersion++
|
||||||
window.removeEventListener('focus', scheduleReceipt)
|
window.removeEventListener('focus', scheduleReceipt)
|
||||||
window.removeEventListener('focus', queueSeen)
|
window.removeEventListener('focus', queueSeen)
|
||||||
@@ -422,7 +457,7 @@ onBeforeUnmount(() => {
|
|||||||
@click="togglePreference('mute')">消息免打扰</button>
|
@click="togglePreference('mute')">消息免打扰</button>
|
||||||
<button v-if="activeContact" type="button" class="plain" :aria-pressed="activeContact.pinned" :disabled="busy"
|
<button v-if="activeContact" type="button" class="plain" :aria-pressed="activeContact.pinned" :disabled="busy"
|
||||||
@click="togglePreference('pin')">会话置顶</button>
|
@click="togglePreference('pin')">会话置顶</button>
|
||||||
<button v-if="ownCode" class="plain" :disabled="busy" @click="sync">刷新</button>
|
<button v-if="ownCode" class="plain" :disabled="busy" @click="execute(refresh)">刷新</button>
|
||||||
</header>
|
</header>
|
||||||
<div class="conversation-layout">
|
<div class="conversation-layout">
|
||||||
<aside class="conversation-list" aria-label="会话列表">
|
<aside class="conversation-list" aria-label="会话列表">
|
||||||
@@ -458,6 +493,7 @@ onBeforeUnmount(() => {
|
|||||||
</label>
|
</label>
|
||||||
<p v-else>对方设备出现后可开始验证。</p>
|
<p v-else>对方设备出现后可开始验证。</p>
|
||||||
<p v-if="changed" class="error" role="alert">设备身份已变更,请重新核验。</p>
|
<p v-if="changed" class="error" role="alert">设备身份已变更,请重新核验。</p>
|
||||||
|
<p v-if="requestedMessage && view && !highlighted && !openedMessage && !busy" class="muted" role="status">原消息当前无法定位。</p>
|
||||||
<p v-if="peer && !peer.mls">等待对方启用本机加密聊天。</p>
|
<p v-if="peer && !peer.mls">等待对方启用本机加密聊天。</p>
|
||||||
<form v-if="peer?.mls && !trusted" class="contact-preferences" @submit.prevent="confirm">
|
<form v-if="peer?.mls && !trusted" class="contact-preferences" @submit.prevent="confirm">
|
||||||
<label>对方安全码<input v-model="code" required maxlength="100" autocomplete="off"></label>
|
<label>对方安全码<input v-model="code" required maxlength="100" autocomplete="off"></label>
|
||||||
@@ -474,6 +510,7 @@ onBeforeUnmount(() => {
|
|||||||
</div>
|
</div>
|
||||||
<ol ref="history" class="chat-lines" aria-label="消息记录" aria-live="polite" @scroll.passive="scheduleReceipt">
|
<ol ref="history" class="chat-lines" aria-label="消息记录" aria-live="polite" @scroll.passive="scheduleReceipt">
|
||||||
<li v-for="line in lines" :key="line.peer + ':' + line.own + ':' + line.id" :class="{ own: line.own }"
|
<li v-for="line in lines" :key="line.peer + ':' + line.own + ':' + line.id" :class="{ own: line.own }"
|
||||||
|
:aria-current="highlighted === line ? 'true' : undefined" :tabindex="highlighted === line ? -1 : undefined"
|
||||||
:data-unread="!line.own && !line.read && !line.recalled ? line.id : undefined">
|
:data-unread="!line.own && !line.read && !line.recalled ? line.id : undefined">
|
||||||
<blockquote v-if="line.quote">{{ line.quote }}</blockquote>
|
<blockquote v-if="line.quote">{{ line.quote }}</blockquote>
|
||||||
<span v-if="line.recalled" class="muted">消息已撤回</span>
|
<span v-if="line.recalled" class="muted">消息已撤回</span>
|
||||||
|
|||||||
@@ -35,6 +35,12 @@ function title(item: Favorite) {
|
|||||||
return item.kind === 'group' ? groups.value[item.group] ?? '群聊' : contacts.value[item.contact ?? ''] ?? '私聊'
|
return item.kind === 'group' ? groups.value[item.group] ?? '群聊' : contacts.value[item.contact ?? ''] ?? '私聊'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function originalPath(item: Favorite) {
|
||||||
|
if (item.kind === 'group' && groups.value[item.group]) return '/groups/' + item.group
|
||||||
|
if (item.kind === 'private' && item.contact && contacts.value[item.contact]) return '/chat/' + item.contact
|
||||||
|
return ''
|
||||||
|
}
|
||||||
|
|
||||||
const tags = computed(() => {
|
const tags = computed(() => {
|
||||||
const options = new Map<string, string>()
|
const options = new Map<string, string>()
|
||||||
for (const item of favorites.value) {
|
for (const item of favorites.value) {
|
||||||
@@ -77,8 +83,10 @@ async function refresh() {
|
|||||||
async function loadNames() {
|
async function loadNames() {
|
||||||
const [people, conversations] = await Promise.allSettled([session.contacts(), session.authorized<ListedGroup[]>('/groups')])
|
const [people, conversations] = await Promise.allSettled([session.contacts(), session.authorized<ListedGroup[]>('/groups')])
|
||||||
if (!active) return
|
if (!active) return
|
||||||
if (people.status === 'fulfilled') contacts.value = Object.fromEntries(people.value.map((item) => [item.id, item.alias || item.username]))
|
if (people.status === 'fulfilled') contacts.value = Object.fromEntries(people.value.filter((item) => item.state === 'friend')
|
||||||
if (conversations.status === 'fulfilled') groups.value = Object.fromEntries(conversations.value.map((item) => [item.id, item.name]))
|
.map((item) => [item.id, item.alias || item.username]))
|
||||||
|
if (conversations.status === 'fulfilled') groups.value = Object.fromEntries(conversations.value.filter((item) => item.state === 'active')
|
||||||
|
.map((item) => [item.id, item.name]))
|
||||||
}
|
}
|
||||||
|
|
||||||
async function change(action: (device: string) => Promise<Favorite[]>) {
|
async function change(action: (device: string) => Promise<Favorite[]>) {
|
||||||
@@ -218,6 +226,7 @@ onBeforeUnmount(() => {
|
|||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
<div v-if="!selecting && editor !== item.key" class="message-actions">
|
<div v-if="!selecting && editor !== item.key" class="message-actions">
|
||||||
|
<RouterLink v-if="originalPath(item)" class="plain favorite-original" :to="{ path: originalPath(item), query: { message: item.key } }">查看原消息</RouterLink>
|
||||||
<button type="button" class="plain" :disabled="busy" @click="editTags(item)">编辑标签</button>
|
<button type="button" class="plain" :disabled="busy" @click="editTags(item)">编辑标签</button>
|
||||||
<button type="button" class="plain" :disabled="busy" @click="change((device) => removeFavorites(device, new Set([item.key])))">取消收藏</button>
|
<button type="button" class="plain" :disabled="busy" @click="change((device) => removeFavorites(device, new Set([item.key])))">取消收藏</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -240,4 +249,5 @@ onBeforeUnmount(() => {
|
|||||||
.favorite-tags { display: flex; flex-wrap: wrap; gap: .3rem; }
|
.favorite-tags { display: flex; flex-wrap: wrap; gap: .3rem; }
|
||||||
.favorite-tags button { padding: .15rem .45rem; background: var(--green-soft); color: var(--green); white-space: normal; }
|
.favorite-tags button { padding: .15rem .45rem; background: var(--green-soft); color: var(--green); white-space: normal; }
|
||||||
.favorite-tag-editor { width: min(100%, 25rem); }
|
.favorite-tag-editor { width: min(100%, 25rem); }
|
||||||
|
.favorite-original { text-decoration: none; }
|
||||||
</style>
|
</style>
|
||||||
Reference in new issue
Block a user