feat: 查看自己所有的对话
This commit is contained in:
@@ -22,6 +22,9 @@ export type CallMethod =
|
|||||||
// 最近对话列表
|
// 最近对话列表
|
||||||
"User.getMyRecentChats" |
|
"User.getMyRecentChats" |
|
||||||
|
|
||||||
|
// 所有对话列表
|
||||||
|
"User.getMyAllChats" |
|
||||||
|
|
||||||
// 对话信息
|
// 对话信息
|
||||||
"Chat.getInfo" |
|
"Chat.getInfo" |
|
||||||
"Chat.getAnotherUserIdFromPrivate" |
|
"Chat.getAnotherUserIdFromPrivate" |
|
||||||
|
|||||||
@@ -177,4 +177,24 @@ export default class UserMySelf extends User {
|
|||||||
return re.data!.recent_chats as RecentChatBean[]
|
return re.data!.recent_chats as RecentChatBean[]
|
||||||
throw new CallbackError(re)
|
throw new CallbackError(re)
|
||||||
}
|
}
|
||||||
|
/*
|
||||||
|
* ================================================
|
||||||
|
* 所有对话
|
||||||
|
* ================================================
|
||||||
|
*/
|
||||||
|
async getMyAllChatBeans() {
|
||||||
|
try {
|
||||||
|
return await this.getMyAllChatBeansOrThrow()
|
||||||
|
} catch (_) {
|
||||||
|
return []
|
||||||
|
}
|
||||||
|
}
|
||||||
|
async getMyAllChatBeansOrThrow() {
|
||||||
|
const re = await this.client.invoke("User.getMyAllChats", {
|
||||||
|
token: this.client.access_token
|
||||||
|
})
|
||||||
|
if (re.code == 200)
|
||||||
|
return re.data!.all_chats as ChatBean[]
|
||||||
|
throw new CallbackError(re)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,6 +22,9 @@ export type CallMethod =
|
|||||||
// 最近对话列表
|
// 最近对话列表
|
||||||
"User.getMyRecentChats" |
|
"User.getMyRecentChats" |
|
||||||
|
|
||||||
|
// 所有对话列表
|
||||||
|
"User.getMyAllChats" |
|
||||||
|
|
||||||
// 对话信息
|
// 对话信息
|
||||||
"Chat.getInfo" |
|
"Chat.getInfo" |
|
||||||
"Chat.getAnotherUserIdFromPrivate" |
|
"Chat.getAnotherUserIdFromPrivate" |
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ import DataCaches from "../api/DataCaches.ts"
|
|||||||
import getUrlForFileByHash from "../getUrlForFileByHash.ts"
|
import getUrlForFileByHash from "../getUrlForFileByHash.ts"
|
||||||
import Message from "../api/client_data/Message.ts"
|
import Message from "../api/client_data/Message.ts"
|
||||||
import EventBus from "../EventBus.ts"
|
import EventBus from "../EventBus.ts"
|
||||||
|
import AllChatsList from "./main/AllChatsList.tsx";
|
||||||
|
|
||||||
declare global {
|
declare global {
|
||||||
namespace React {
|
namespace React {
|
||||||
@@ -205,8 +206,21 @@ export default function App() {
|
|||||||
</mdui-button-icon>
|
</mdui-button-icon>
|
||||||
|
|
||||||
<mdui-navigation-rail-item icon="watch_later--outlined" active-icon="watch_later--filled" value="Recents"></mdui-navigation-rail-item>
|
<mdui-navigation-rail-item icon="watch_later--outlined" active-icon="watch_later--filled" value="Recents"></mdui-navigation-rail-item>
|
||||||
<mdui-navigation-rail-item icon="chat--outlined" active-icon="chat--filled" value="Contacts"></mdui-navigation-rail-item>
|
<mdui-navigation-rail-item icon="favorite_border" active-icon="favorite" value="Contacts"></mdui-navigation-rail-item>
|
||||||
|
<mdui-navigation-rail-item icon="chat--outlined" active-icon="chat--filled" value="AllChats"></mdui-navigation-rail-item>
|
||||||
|
|
||||||
|
<mdui-button-icon icon="refresh" slot="bottom" onClick={() => {
|
||||||
|
EventBus.emit('RecentsList.updateRecents')
|
||||||
|
EventBus.emit('ContactsList.updateContacts')
|
||||||
|
EventBus.emit('AllChatsList.updateAllChats')
|
||||||
|
}}></mdui-button-icon>
|
||||||
|
<mdui-dropdown trigger="hover" slot="bottom">
|
||||||
|
<mdui-button-icon icon="add" slot="trigger"></mdui-button-icon>
|
||||||
|
<mdui-menu>
|
||||||
|
<mdui-menu-item icon="person_add" onClick={() => addContactDialogRef.current!.open = true}>添加收藏对话</mdui-menu-item>
|
||||||
|
<mdui-menu-item icon="group_add" onClick={() => createGroupDialogRef.current!.open = true}>创建群组</mdui-menu-item>
|
||||||
|
</mdui-menu>
|
||||||
|
</mdui-dropdown>
|
||||||
<mdui-button-icon icon="settings" slot="bottom"></mdui-button-icon>
|
<mdui-button-icon icon="settings" slot="bottom"></mdui-button-icon>
|
||||||
</mdui-navigation-rail>
|
</mdui-navigation-rail>
|
||||||
{
|
{
|
||||||
@@ -220,9 +234,17 @@ export default function App() {
|
|||||||
display={navigationItemSelected == "Recents"}
|
display={navigationItemSelected == "Recents"}
|
||||||
currentChatId={currentChatId} />
|
currentChatId={currentChatId} />
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
// 最近聊天
|
||||||
|
<AllChatsList
|
||||||
|
openChatInfoDialog={openChatInfoDialog}
|
||||||
|
display={navigationItemSelected == "AllChats"}
|
||||||
|
currentChatId={currentChatId} />
|
||||||
|
}
|
||||||
{
|
{
|
||||||
// 對話列表
|
// 對話列表
|
||||||
<ContactsList
|
<ContactsList
|
||||||
|
currentChatId={currentChatId}
|
||||||
openChatInfoDialog={openChatInfoDialog}
|
openChatInfoDialog={openChatInfoDialog}
|
||||||
setSharedFavouriteChats={setSharedFavouriteChats}
|
setSharedFavouriteChats={setSharedFavouriteChats}
|
||||||
addContactDialogRef={addContactDialogRef as any}
|
addContactDialogRef={addContactDialogRef as any}
|
||||||
|
|||||||
@@ -21,6 +21,8 @@ import Chat from "../api/client_data/Chat.ts"
|
|||||||
import AddContactDialog from './dialog/AddContactDialog.tsx'
|
import AddContactDialog from './dialog/AddContactDialog.tsx'
|
||||||
import CreateGroupDialog from './dialog/CreateGroupDialog.tsx'
|
import CreateGroupDialog from './dialog/CreateGroupDialog.tsx'
|
||||||
import getUrlForFileByHash from "../getUrlForFileByHash.ts"
|
import getUrlForFileByHash from "../getUrlForFileByHash.ts"
|
||||||
|
import AllChatsList from "./main/AllChatsList.tsx";
|
||||||
|
import EventBus from "../EventBus.ts";
|
||||||
|
|
||||||
declare global {
|
declare global {
|
||||||
namespace React {
|
namespace React {
|
||||||
@@ -198,12 +200,24 @@ export default function AppMobile() {
|
|||||||
<mdui-top-app-bar-title>{
|
<mdui-top-app-bar-title>{
|
||||||
({
|
({
|
||||||
Recents: "最近对话",
|
Recents: "最近对话",
|
||||||
Contacts: "所有对话"
|
Contacts: "收藏对话"
|
||||||
})[navigationItemSelected]
|
})[navigationItemSelected]
|
||||||
}</mdui-top-app-bar-title>
|
}</mdui-top-app-bar-title>
|
||||||
<div style={{
|
<div style={{
|
||||||
flexGrow: 1,
|
flexGrow: 1,
|
||||||
}}></div>
|
}}></div>
|
||||||
|
<mdui-button-icon icon="refresh" onClick={() => {
|
||||||
|
EventBus.emit('RecentsList.updateRecents')
|
||||||
|
EventBus.emit('ContactsList.updateContacts')
|
||||||
|
EventBus.emit('AllChatsList.updateAllChats')
|
||||||
|
}}></mdui-button-icon>
|
||||||
|
<mdui-dropdown trigger="hover">
|
||||||
|
<mdui-button-icon icon="add" slot="trigger"></mdui-button-icon>
|
||||||
|
<mdui-menu>
|
||||||
|
<mdui-menu-item icon="person_add" onClick={() => addContactDialogRef.current!.open = true}>添加收藏对话</mdui-menu-item>
|
||||||
|
<mdui-menu-item icon="group_add" onClick={() => createGroupDialogRef.current!.open = true}>创建群组</mdui-menu-item>
|
||||||
|
</mdui-menu>
|
||||||
|
</mdui-dropdown>
|
||||||
<mdui-button-icon icon="settings"></mdui-button-icon>
|
<mdui-button-icon icon="settings"></mdui-button-icon>
|
||||||
<mdui-button-icon>
|
<mdui-button-icon>
|
||||||
<Avatar src={getUrlForFileByHash(myUserProfileCache?.avatar_file_hash)} text={myUserProfileCache?.nickname} avatarRef={openMyProfileDialogButtonRef} />
|
<Avatar src={getUrlForFileByHash(myUserProfileCache?.avatar_file_hash)} text={myUserProfileCache?.nickname} avatarRef={openMyProfileDialogButtonRef} />
|
||||||
@@ -227,9 +241,17 @@ export default function AppMobile() {
|
|||||||
display={navigationItemSelected == "Recents"}
|
display={navigationItemSelected == "Recents"}
|
||||||
currentChatId={currentChatId} />
|
currentChatId={currentChatId} />
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
// 最近聊天
|
||||||
|
<AllChatsList
|
||||||
|
openChatInfoDialog={openChatInfoDialog}
|
||||||
|
display={navigationItemSelected == "AllChats"}
|
||||||
|
currentChatId={currentChatId} />
|
||||||
|
}
|
||||||
{
|
{
|
||||||
// 對話列表
|
// 對話列表
|
||||||
<ContactsList
|
<ContactsList
|
||||||
|
currentChatId={currentChatId}
|
||||||
openChatInfoDialog={openChatInfoDialog}
|
openChatInfoDialog={openChatInfoDialog}
|
||||||
setSharedFavouriteChats={setSharedFavouriteChats}
|
setSharedFavouriteChats={setSharedFavouriteChats}
|
||||||
addContactDialogRef={addContactDialogRef as any}
|
addContactDialogRef={addContactDialogRef as any}
|
||||||
@@ -242,7 +264,8 @@ export default function AppMobile() {
|
|||||||
bottom: '0',
|
bottom: '0',
|
||||||
}}>
|
}}>
|
||||||
<mdui-navigation-bar-item icon="watch_later--outlined" active-icon="watch_later--filled" value="Recents">最近对话</mdui-navigation-bar-item>
|
<mdui-navigation-bar-item icon="watch_later--outlined" active-icon="watch_later--filled" value="Recents">最近对话</mdui-navigation-bar-item>
|
||||||
<mdui-navigation-bar-item icon="chat--outlined" active-icon="chat--filled" value="Contacts">所有对话</mdui-navigation-bar-item>
|
<mdui-navigation-bar-item icon="favorite_border" active-icon="favorite" value="Contacts">收藏对话</mdui-navigation-bar-item>
|
||||||
|
<mdui-navigation-bar-item icon="chat--outlined" active-icon="chat--filled" value="AllChats">全部对话</mdui-navigation-bar-item>
|
||||||
</mdui-navigation-bar>
|
</mdui-navigation-bar>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
|
|||||||
85
client/ui/main/AllChatsList.tsx
Normal file
85
client/ui/main/AllChatsList.tsx
Normal file
@@ -0,0 +1,85 @@
|
|||||||
|
import { TextField } from "mdui"
|
||||||
|
import useEventListener from "../useEventListener.ts"
|
||||||
|
import RecentsListItem from "./RecentsListItem.tsx"
|
||||||
|
import React from "react"
|
||||||
|
import useAsyncEffect from "../useAsyncEffect.ts"
|
||||||
|
import Client from "../../api/Client.ts"
|
||||||
|
import { checkApiSuccessOrSncakbar } from "../snackbar.ts"
|
||||||
|
import data from "../../Data.ts"
|
||||||
|
import EventBus from "../../EventBus.ts"
|
||||||
|
import isMobileUI from "../isMobileUI.ts"
|
||||||
|
import Chat from "../../api/client_data/Chat.ts"
|
||||||
|
import AllChatsListItem from "./AllChatsListItem.tsx"
|
||||||
|
|
||||||
|
interface Args extends React.HTMLAttributes<HTMLElement> {
|
||||||
|
display: boolean
|
||||||
|
currentChatId: string
|
||||||
|
openChatInfoDialog: (chat: Chat) => void
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function AllChatsList({
|
||||||
|
currentChatId,
|
||||||
|
display,
|
||||||
|
openChatInfoDialog,
|
||||||
|
...props
|
||||||
|
}: Args) {
|
||||||
|
const searchRef = React.useRef<HTMLElement>(null)
|
||||||
|
const [searchText, setSearchText] = React.useState('')
|
||||||
|
const [allChatsList, setAllChatsList] = React.useState<Chat[]>([])
|
||||||
|
|
||||||
|
useEventListener(searchRef, 'input', (e) => {
|
||||||
|
setSearchText((e.target as unknown as TextField).value)
|
||||||
|
})
|
||||||
|
|
||||||
|
useAsyncEffect(async () => {
|
||||||
|
async function updateAllChats() {
|
||||||
|
const re = await Client.invoke("User.getMyAllChats", {
|
||||||
|
token: data.access_token,
|
||||||
|
})
|
||||||
|
if (re.code != 200) {
|
||||||
|
if (re.code != 401 && re.code != 400) checkApiSuccessOrSncakbar(re, "获取所有对话列表失败")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
setAllChatsList(re.data!.all_chats as Chat[])
|
||||||
|
}
|
||||||
|
updateAllChats()
|
||||||
|
EventBus.on('AllChatsList.updateAllChats', () => updateAllChats())
|
||||||
|
return () => {
|
||||||
|
EventBus.off('AllChatsList.updateAllChats')
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
return <mdui-list style={{
|
||||||
|
overflowY: 'auto',
|
||||||
|
paddingRight: '10px',
|
||||||
|
paddingLeft: '10px',
|
||||||
|
display: display ? undefined : 'none',
|
||||||
|
height: '100%',
|
||||||
|
width: '100%',
|
||||||
|
}} {...props}>
|
||||||
|
<mdui-text-field icon="search" type="search" clearable ref={searchRef} variant="outlined" placeholder="搜索..." style={{
|
||||||
|
marginTop: '5px',
|
||||||
|
marginBottom: '13px',
|
||||||
|
position: 'sticky',
|
||||||
|
top: '0',
|
||||||
|
backgroundColor: 'rgb(var(--mdui-color-background))',
|
||||||
|
zIndex: '10',
|
||||||
|
}}></mdui-text-field>
|
||||||
|
{
|
||||||
|
allChatsList.filter((chat) =>
|
||||||
|
searchText == '' ||
|
||||||
|
chat.title.includes(searchText) ||
|
||||||
|
chat.id.includes(searchText)
|
||||||
|
).map((v) =>
|
||||||
|
<AllChatsListItem
|
||||||
|
active={isMobileUI() ? false : currentChatId == v.id}
|
||||||
|
key={v.id}
|
||||||
|
onClick={() => {
|
||||||
|
openChatInfoDialog(v)
|
||||||
|
}}
|
||||||
|
chat={v} />
|
||||||
|
)
|
||||||
|
}
|
||||||
|
</mdui-list>
|
||||||
|
}
|
||||||
29
client/ui/main/AllChatsListItem.tsx
Normal file
29
client/ui/main/AllChatsListItem.tsx
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
import { $ } from "mdui/jq"
|
||||||
|
import Avatar from "../Avatar.tsx"
|
||||||
|
import React from 'react'
|
||||||
|
import getUrlForFileByHash from "../../getUrlForFileByHash.ts"
|
||||||
|
import Chat from "../../api/client_data/Chat.ts"
|
||||||
|
|
||||||
|
interface Args extends React.HTMLAttributes<HTMLElement> {
|
||||||
|
chat: Chat
|
||||||
|
active?: boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function AllChatsListItem({ chat, active, ...prop }: Args) {
|
||||||
|
const { title, avatar_file_hash } = chat
|
||||||
|
|
||||||
|
const ref = React.useRef<HTMLElement>(null)
|
||||||
|
|
||||||
|
return (
|
||||||
|
<mdui-list-item active={active} ref={ref} rounded style={{
|
||||||
|
marginTop: '3px',
|
||||||
|
marginBottom: '3px',
|
||||||
|
width: '100%',
|
||||||
|
}} {...prop as any}>
|
||||||
|
<span style={{
|
||||||
|
width: "100%",
|
||||||
|
}}>{title}</span>
|
||||||
|
<Avatar src={getUrlForFileByHash(avatar_file_hash as string)} text={title} slot="icon" />
|
||||||
|
</mdui-list-item>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -267,6 +267,38 @@ export default class UserApi extends BaseApi {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
// 獲取聯絡人列表
|
||||||
|
this.registerEvent("User.getMyAllChats", (args, { deviceId }) => {
|
||||||
|
if (this.checkArgsMissing(args, ['token'])) return {
|
||||||
|
msg: "参数缺失",
|
||||||
|
code: 400,
|
||||||
|
}
|
||||||
|
|
||||||
|
const token = TokenManager.decode(args.token as string)
|
||||||
|
if (!this.checkToken(token, deviceId)) return {
|
||||||
|
code: 401,
|
||||||
|
msg: "令牌无效",
|
||||||
|
}
|
||||||
|
|
||||||
|
const user = User.findById(token.author) as User
|
||||||
|
const list = user.getAllChatsList()
|
||||||
|
|
||||||
|
return {
|
||||||
|
msg: "成功",
|
||||||
|
code: 200,
|
||||||
|
data: {
|
||||||
|
all_chats: list.map((id) => {
|
||||||
|
const chat = Chat.findById(id)
|
||||||
|
return {
|
||||||
|
id,
|
||||||
|
type: chat?.bean.type,
|
||||||
|
title: chat?.getTitle(user) || "未知",
|
||||||
|
avatar_file_hash: chat?.getAvatarFileHash(user) ? chat?.getAvatarFileHash(user) : undefined
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
// 獲取最近对话列表
|
// 獲取最近对话列表
|
||||||
this.registerEvent("User.getMyRecentChats", (args, { deviceId }) => {
|
this.registerEvent("User.getMyRecentChats", (args, { deviceId }) => {
|
||||||
if (this.checkArgsMissing(args, ['token'])) return {
|
if (this.checkArgsMissing(args, ['token'])) return {
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import Chat from "./Chat.ts"
|
|||||||
import ChatBean from "./ChatBean.ts"
|
import ChatBean from "./ChatBean.ts"
|
||||||
import MapJson from "../MapJson.ts"
|
import MapJson from "../MapJson.ts"
|
||||||
import DataWrongError from '../api/DataWrongError.ts'
|
import DataWrongError from '../api/DataWrongError.ts'
|
||||||
|
import UserChatLinker from "./UserChatLinker.ts";
|
||||||
|
|
||||||
type UserBeanKey = keyof UserBean
|
type UserBeanKey = keyof UserBean
|
||||||
|
|
||||||
@@ -155,6 +156,9 @@ export default class User {
|
|||||||
return []
|
return []
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
getAllChatsList() {
|
||||||
|
return UserChatLinker.getUserChats(this.bean.id)
|
||||||
|
}
|
||||||
getNickName(): string {
|
getNickName(): string {
|
||||||
return this.bean.nickname
|
return this.bean.nickname
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user