CrescentLeaf/LingChair
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: 添加了新的字段代替 chat id

Browse Source 
* 谁又能想到 chat id 的可变性和依赖性恰恰埋下了祸患呢
This commit is contained in:
CrescentLeaf
2025-10-24 22:21:28 +08:00
parent afd9193dea
commit 2d78e39ca1
9 changed files with 49 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/api/client_data/GroupSettings.ts
View File

@@ -6,7 +6,7 @@ interface GroupSettings {
// 下面两个比较特殊, 由服务端给予
group_title: string
group_id: string
group_name: string
[key: string]: unknown
}

7
client/ui/chat/ChatFragment.tsx
View File

@@ -535,10 +535,11 @@ export default function ChatFragment({ target, showReturnButton, onReturnButtonC
state={groupPreferenceStore.state.group_title || ''}
disabled={!chatInfo.is_admin} />
<TextFieldPreference
title="设置群 ID"
title="设置群别名"
icon="edit"
id="group_id"
state={groupPreferenceStore.state.group_id || ''}
id="group_name"
description="以便于添加, 可留空"
state={groupPreferenceStore.state.group_name || ''}
disabled={!chatInfo.is_admin} />
{/* <PreferenceHeader
title="群组管理" />

14
client/ui/dialog/CreateGroupDialog.tsx
View File

@@ -15,13 +15,13 @@ interface Refs {
export default function CreateGroupDialog({
createGroupDialogRef,
}: Refs) {
const inputGroupTitleRef = React.useRef<TextField>(null)
const inputGroupNameRef = React.useRef<TextField>(null)
const inputGroupIdRef = React.useRef<TextField>(null)
async function createGroup() {
const re = await Client.invoke("Chat.createGroup", {
title: inputGroupNameRef.current!.value,
id: inputGroupIdRef.current!.value,
title: inputGroupTitleRef.current!.value,
name: inputGroupNameRef.current!.value,
token: data.access_token,
})
@@ -32,18 +32,18 @@ export default function CreateGroupDialog({
})
EventBus.emit('ContactsList.updateContacts')
inputGroupTitleRef.current!.value = ''
inputGroupNameRef.current!.value = ''
inputGroupIdRef.current!.value = ''
createGroupDialogRef.current!.open = false
}
return (
<mdui-dialog close-on-overlay-click close-on-esc headline="创建群组" ref={createGroupDialogRef}>
<mdui-text-field clearable label="群组名称" ref={inputGroupNameRef as any} onKeyDown={(event) => {
<mdui-text-field clearable label="群组名称" ref={inputGroupTitleRef as any} onKeyDown={(event) => {
if (event.key == 'Enter')
inputGroupIdRef.current!.click()
inputGroupNameRef.current!.click()
}}></mdui-text-field>
<mdui-text-field style={{ marginTop: "10px", }} clearable label="群组 ID (可选)" ref={inputGroupIdRef as any} onKeyDown={(event) => {
<mdui-text-field style={{ marginTop: "10px", }} clearable label="群组别名 (可选, 供查询)" ref={inputGroupNameRef as any} onKeyDown={(event) => {
if (event.key == 'Enter')
createGroup()
}}></mdui-text-field>

18
server/api/ChatApi.ts
View File

@@ -334,7 +334,7 @@ export default class ChatApi extends BaseApi {
* 创建群组
* @param token 令牌
* @param title 名称
* @param [id] 群组 ID
* @param [name] 群组别名
*/
this.registerEvent("Chat.createGroup", (args, { deviceId }) => {
if (this.checkArgsMissing(args, ['token', 'title'])) return {
@@ -353,13 +353,7 @@ export default class ChatApi extends BaseApi {
}
const user = User.findById(token.author) as User
const haveId = args.id && ((args.id as string) != '')
if (haveId && Chat.findById(args.id as string) != null) return {
msg: "对话 ID 已被占用",
code: 403,
}
const chat = ChatGroup.createGroup(haveId ? args.id as string : undefined)
const chat = ChatGroup.createGroup(args.name as string)
chat.setTitle(args.title as string)
chat.addMembers([
user.bean.id,
@@ -419,6 +413,7 @@ export default class ChatApi extends BaseApi {
msg: "成功",
data: {
id: args.target as string,
name: chat.bean.name,
type: chat.bean.type,
title: chat.getTitle(mine),
avatar_file_hash: chat.getAvatarFileHash(mine) ? chat.getAvatarFileHash(mine) : undefined,
@@ -434,13 +429,14 @@ export default class ChatApi extends BaseApi {
msg: "成功",
data: {
id: args.target as string,
name: chat.bean.name,
type: chat.bean.type,
title: chat.getTitle(),
avatar_file_hash: chat.getAvatarFileHash() ? chat.getAvatarFileHash() : undefined,
settings: {
...JSON.parse(chat.bean.settings),
// 下面两个比较特殊, 用于群设置
group_id: chat.bean.id,
group_name: chat.bean.name,
group_title: chat.getTitle(),
},
is_member: UserChatLinker.checkUserIsLinkedToChat(token.author, chat!.bean.id),
@@ -522,8 +518,8 @@ export default class ChatApi extends BaseApi {
const settings = args.settings as any
if (settings.group_title != null)
chat.setTitle(settings.group_title)
if (settings.group_id != null)
chat.setId(settings.group_id)
if (settings.group_name != null)
chat.setName(settings.group_name == '' ? null : settings.group_name)
} else
return {
code: 403,

2
server/api/UserApi.ts
View File

@@ -317,7 +317,7 @@ export default class UserApi extends BaseApi {
}
const user = User.findById(token.author) as User
const chat = Chat.findById(args.target as string)
const chat = Chat.findById(args.target as string) || Chat.findByName(args.target as string)
const targetUser = User.findByAccount(args.target as string) as User
if (chat)
user!.addContact(chat.bean.id)

34
server/data/Chat.ts
View File

@@ -27,8 +27,9 @@ export default class Chat {
/* 序号 */ count INTEGER PRIMARY KEY AUTOINCREMENT,
/* 类型 */ type TEXT NOT NULL,
/* ID */ id TEXT NOT NULL,
/* 检索 */ name TEXT,
/* 标题 */ title TEXT,
/* 头像 */ avatar_file_hash BLOB,
/* 头像 */ avatar_file_hash TEXT,
/* 设置 */ settings TEXT NOT NULL
);
`)
@@ -48,21 +49,32 @@ export default class Chat {
return new Chat(beans[0])
}
static create(chatId: string, type: ChatType) {
if (this.findAllChatBeansByCondition('id = ?', chatId).length > 0)
throw new DataWrongError(`对话 ID ${chatId} 已被使用`)
static findByName(name: string) {
const beans = this.findAllChatBeansByCondition('name = ?', name)
if (beans.length == 0)
return null
else if (beans.length > 1)
console.error(chalk.red(`警告: 查询 name = ${name} 时, 查询到多个相同 name 的 Chat`))
return new Chat(beans[0])
}
static create(chatName: string | undefined, type: ChatType) {
if (this.findAllChatBeansByCondition('id = ?', chatName || null).length > 0)
throw new DataWrongError(`对话名称 ${chatName} 已被使用`)
const chat = new Chat(
Chat.findAllChatBeansByCondition(
'count = ?',
Chat.database.prepare(`INSERT INTO Chat (
type,
id,
name,
title,
avatar_file_hash,
settings
) VALUES (?, ?, ?, ?, ?);`).run(
) VALUES (?, ?, ?, ?, ?, ?);`).run(
type,
chatId,
crypto.randomUUID(),
chatName || null,
null,
null,
"{}"
@@ -200,11 +212,11 @@ export default class Chat {
return null
}
setId(id: string) {
if (this.bean.id == id) return
if (Chat.findAllChatBeansByCondition('id = ?', id).length > 0)
throw new DataWrongError(`对话ID ${id} 已被使用`)
this.setAttr("id", id)
setName(name: string) {
if (this.bean.name == name) return
if (name != null && Chat.findAllChatBeansByCondition('name = ?', name).length > 0)
throw new DataWrongError(`对话名称 ${name} 已被使用`)
this.setAttr("name", name)
}
setTitle(title: string) {
if (this.bean.type == 'private')

1
server/data/ChatBean.ts
View File

@@ -4,6 +4,7 @@ export default class ChatBean {
declare count: number
declare type: ChatType
declare id: string
declare name?: string
declare title?: string
declare avatar_file_hash?: string
declare members_list: string

4
server/data/ChatGroup.ts
View File

@@ -40,7 +40,7 @@ export default class ChatGroup extends Chat {
return new ChatGroup(chat.bean)
}
static createGroup(chatId?: string) {
return this.create(chatId || crypto.randomUUID(), 'group')
static createGroup(group_name?: string) {
return this.create(group_name, 'group')
}
}

5
server/data/ChatPrivate.ts
View File

@@ -8,11 +8,12 @@ export default class ChatPrivate extends Chat {
}
static getChatIdByUsersId(userIdA: string, userIdB: string) {
return [userIdA, userIdB].sort().join('------')
return 'priv_' + [userIdA, userIdB].sort().join('__').replaceAll('-', '_')
}
static createForPrivate(userA: User, userB: User) {
const chat = this.create(this.getChatIdByUsersId(userA.bean.id, userB.bean.id), 'private')
const chat = this.create(undefined, 'private')
chat.setAttr('id', this.getChatIdByUsersId(userA.bean.id, userB.bean.id))
chat.addMembers([
userA.bean.id,
userB.bean.id