feat: 修復並正式支持聯絡人

* wip(ui): 增刪
This commit is contained in:
CrescentLeaf
2025-09-21 02:13:16 +08:00
parent 468de4f439
commit 791baf474c
4 changed files with 47 additions and 45 deletions

View File

@@ -1,44 +1,42 @@
import React from "react"
import User from "../../api/client_data/User.ts"
import ContactsListItem from "./ContactsListItem.tsx"
import useEventListener from "../useEventListener.ts"
import { ListItem, TextField } from "mdui"
import { Dialog, ListItem, TextField } from "mdui"
import useAsyncEffect from "../useAsyncEffect.ts"
import Client from "../../api/Client.ts"
import data from "../../Data.ts"
import { checkApiSuccessOrSncakbar } from "../snackbar.ts"
import Chat from "../../api/client_data/Chat.ts"
interface Args extends React.HTMLAttributes<HTMLElement> {
display: boolean
openChatFragment: (id: string) => void
chatInfoDialogRef: React.MutableRefObject<Dialog>
setChatInfo: React.Dispatch<React.SetStateAction<Chat>>
}
export default function ContactsList({
display,
openChatFragment,
setChatInfo,
chatInfoDialogRef,
...props
}: Args) {
const searchRef = React.useRef<HTMLElement>(null)
const [isMultiSelecting, setIsMultiSelecting] = React.useState(false)
const [searchText, setSearchText] = React.useState('')
const [contactsList, setContactsList] = React.useState([
{
id: '1',
avatar: "https://www.court-records.net/mugshot/aa6-004-maya.png",
nickname: "麻油衣酱",
},
{
id: '0',
avatar: "https://www.court-records.net/mugshot/aa6-004-maya.png",
nickname: "Maya Fey",
},
] as User[])
const [contactsList, setContactsList] = React.useState<Chat[]>([])
useEventListener(searchRef, 'input', (e) => {
setSearchText((e.target as unknown as TextField).value)
})
useAsyncEffect(async () => {
const re = await Client.invoke("User.getMyContacts", {
token: data.access_token,
})
if (re.code != 200)
return checkApiSuccessOrSncakbar(re, "获取联络人列表失败")
setContactsList(re.data!.contacts_list as Chat[])
})
return <mdui-list style={{
@@ -63,21 +61,21 @@ export default function ContactsList({
}} icon={ isMultiSelecting ? "done" : "edit"} onClick={() => setIsMultiSelecting(!isMultiSelecting)}>{ isMultiSelecting ? "關閉多選" : "多選模式" }</mdui-list-item> */}
{
contactsList.filter((user) =>
contactsList.filter((chat) =>
searchText == '' ||
user.nickname.includes(searchText) ||
user.id.includes(searchText) ||
user.username?.includes(searchText)
chat.title.includes(searchText) ||
chat.id.includes(searchText)
).map((v) =>
<ContactsListItem
/* active={!isMultiSelecting && false}
// active={!isMultiSelecting && false}
onClick={(e) => {
const self = (e.target as ListItem)
if (isMultiSelecting)
/*if (isMultiSelecting)
self.active = !self.active
else
void(0)
}} */
else*/
setChatInfo(v)
chatInfoDialogRef.current!.open = true
}}
key={v.id}
contact={v} />
)

View File

@@ -1,15 +1,14 @@
import { ListItem } from "mdui";
import User from "../../api/client_data/User.ts"
import Chat from "../../api/client_data/Chat.ts"
import Avatar from "../Avatar.tsx"
import React from 'react'
interface Args extends React.HTMLAttributes<HTMLElement> {
contact: User
contact: Chat
active?: boolean
}
export default function ContactsListItem({ contact, ...prop }: Args) {
const { id, nickname, avatar } = contact
const { id, title, avatar } = contact
const ref = React.useRef<HTMLElement>(null)
return (
@@ -20,8 +19,8 @@ export default function ContactsListItem({ contact, ...prop }: Args) {
}} {...prop as any}>
<span style={{
width: "100%",
}}>{nickname}</span>
<Avatar src={avatar} text="title" slot="icon" />
}}>{title}</span>
<Avatar src={avatar as string} text={title} slot="icon" />
</mdui-list-item>
)
}

View File

@@ -18,7 +18,7 @@ export default class UserApi extends BaseApi {
}
try {
const access_token = TokenManager.decode(args.access_token as string)
if (access_token.expired_time < Date.now()) return {
msg: "登錄令牌失效",
code: 401,
@@ -135,7 +135,7 @@ export default class UserApi extends BaseApi {
msg: "參數缺失",
code: 400,
}
const token = TokenManager.decode(args.token as string)
if (!this.checkToken(token)) return {
code: 401,
@@ -144,9 +144,9 @@ export default class UserApi extends BaseApi {
const user = User.findById(token.author)
if (args.nickname != null)
user!.setNickName(args.nickname as string)
user!.setNickName(args.nickname as string)
if (args.username != null)
user!.setUserName(args.username as string)
user!.setUserName(args.username as string)
return {
msg: "成功",
@@ -192,14 +192,21 @@ export default class UserApi extends BaseApi {
msg: "令牌無效",
}
const user = User.findById(token.author)
const user = User.findById(token.author) as User
const contacts = user.getContactsList()
contacts.push(ChatPrivate.getChatIdByUsersId(token.author, token.author))
return {
msg: "成功",
code: 200,
data: {
contacts: user!.getContactsList().map((id) => {
title: Chat.findById(id)?.bean.title
contacts_list: contacts.map((id) => {
const chat = Chat.findById(id)
return {
id,
title: chat?.getTitle(user) || "未知",
avatar: chat?.getAvatarFileHash(user) ? "uploaded_files/" + chat?.getAvatarFileHash(user) : undefined
}
})
}
}
@@ -230,6 +237,6 @@ export default class UserApi extends BaseApi {
* 公開資料
* ================================================
*/
}
}

View File

@@ -36,7 +36,7 @@ export default class User {
/* 用戶名, 可選 */ username TEXT,
/* 昵称 */ nickname TEXT NOT NULL,
/* 头像, 可选 */ avatar_file_hash TEXT,
/* 聯絡人組 */ contact_groups TEXT NOT NULL,
/* 聯絡人組 */ contacts_list TEXT NOT NULL,
/* 设置 */ settings TEXT NOT NULL
);
`)
@@ -80,7 +80,7 @@ export default class User {
)[0]
)
avatar && user.setAvatar(avatar)
user.addContact(ChatPrivate.getChatIdByUsersId(user.bean.id, user.bean.id))
ChatPrivate.findOrCreateForPrivate(user, user)
return user
}
@@ -133,9 +133,7 @@ export default class User {
return JSON.parse(this.bean.contacts_list) as string[]
} catch (e) {
console.log(chalk.yellow(`警告: 聯絡人組解析失敗: ${(e as Error).message}`))
return [
this.bean.id
]
return []
}
}
getNickName(): string {