diff --git a/src/onebot/actions/friend/friend.ts b/src/onebot/actions/friend/friend.ts index c2400ad..a19f2a4 100644 --- a/src/onebot/actions/friend/friend.ts +++ b/src/onebot/actions/friend/friend.ts @@ -22,7 +22,7 @@ const getFriendList = async (p: {}): Promise => { name: e.categroyName, count: e.categroyMbCount, friend_list: e.buddyList.map(f => ({ - uin: f.uin, + uin: parseInt(f.uin), nick: f.nick, avatar_url: f.avatarUrl, remark: f.remark, @@ -69,6 +69,7 @@ const getUserInfo = async (p: UserInfoReq): Promise => { export const initFriend = () => { // 注册获取好友列表 registerActionHandle('get_friend_list', getFriendList) + registerActionHandle('get_friend_list_with_group', getFriendList) registerActionHandle('send_like_friend', sendLikeFriend) registerActionHandle('get_user_info', getUserInfo) } \ No newline at end of file diff --git a/src/onebot/actions/interfaces.ts b/src/onebot/actions/interfaces.ts index 658a949..d161740 100644 --- a/src/onebot/actions/interfaces.ts +++ b/src/onebot/actions/interfaces.ts @@ -8,7 +8,7 @@ export interface BotActionRequest { */ id: string user: { - qid: `${number}` + uin: `${number}` } /** * 动作名称 diff --git a/src/onebot/common/user.ts b/src/onebot/common/user.ts index 778f6dd..ae6111f 100644 --- a/src/onebot/common/user.ts +++ b/src/onebot/common/user.ts @@ -5,7 +5,7 @@ import { useNTCore } from "../../ntqq/core/core" import { useNTUserStore } from "../../ntqq/store/user" import { useLogger } from "../../common/log" -const { registerEventListener, removeEventListener } = useStore() +const { registerEventListener } = useStore() const log = useLogger('Common/User') export const getUserInfoByUid = (uid: `u_${string}`): Promise => { diff --git a/src/server/websocket.ts b/src/server/websocket.ts index 1821cfd..bc8d333 100644 --- a/src/server/websocket.ts +++ b/src/server/websocket.ts @@ -63,8 +63,8 @@ export const startWebsocketServer = () => { ws.send(JSON.stringify(ret)); return } - log.info('id:', msg.user.qid) - asyncStore.getStore()?.set('id', msg.user.qid) + log.info('uin:', msg.user.uin) + asyncStore.getStore()?.set('id', msg.user.uin) const { getUserInfo } = useNTUserStore() let u = getUserInfo() if (!u) {