diff --git a/client/shared/model/user.ts b/client/shared/model/user.ts index 7b2ef8d9..05eb9243 100644 --- a/client/shared/model/user.ts +++ b/client/shared/model/user.ts @@ -50,6 +50,7 @@ export function pickUserBaseInfo(userInfo: UserLoginInfo): UserBaseInfo { 'discriminator', 'avatar', 'temporary', + 'type', 'emailVerified', 'banned', ]); @@ -64,6 +65,7 @@ const builtinUserInfo: Record UserBaseInfo> = { discriminator: '0000', avatar: null, temporary: false, + type: 'normalUser', emailVerified: false, banned: false, }), diff --git a/client/web/src/routes/Main/Content/Personal/Friends/FriendList.tsx b/client/web/src/routes/Main/Content/Personal/Friends/FriendList.tsx index 23f31028..9ef335ca 100644 --- a/client/web/src/routes/Main/Content/Personal/Friends/FriendList.tsx +++ b/client/web/src/routes/Main/Content/Personal/Friends/FriendList.tsx @@ -117,7 +117,7 @@ export const FriendList: React.FC<{
handleCreateConverse(item.id)} + onClick={() => handleCreateConverse(item._id)} />
, @@ -127,7 +127,7 @@ export const FriendList: React.FC<{ items: [ { key: 'setNickname', - onClick: () => handleSetFriendNickname(item.id), + onClick: () => handleSetFriendNickname(item._id), label: isValidStr(item.nickname) ? t('更改好友昵称') : t('添加好友昵称'), @@ -135,7 +135,7 @@ export const FriendList: React.FC<{ { key: 'delete', danger: true, - onClick: () => handleRemoveFriend(item.id), + onClick: () => handleRemoveFriend(item._id), label: t('删除'), }, ],