feat: add online status in user popover

msgbyte · Sep 2, 2023 · 1b813f9 · 1b813f9
1 parent 56c042d
commit 1b813f9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/client/web/src/components/UserProfileContainer.tsx b/client/web/src/components/UserProfileContainer.tsx
@@ -1,7 +1,7 @@
 import { fetchImagePrimaryColor } from '@/utils/image-helper';
 import React, { PropsWithChildren } from 'react';
 import { AvatarWithPreview, getTextColorHex } from 'tailchat-design';
-import { useAsync, UserBaseInfo } from 'tailchat-shared';
+import { useAsync, useCachedOnlineStatus, UserBaseInfo } from 'tailchat-shared';
 
 /**
  * 用户信息容器
@@ -10,6 +10,8 @@ export const UserProfileContainer: React.FC<
   PropsWithChildren<{ userInfo: UserBaseInfo }>
 > = React.memo((props) => {
   const { userInfo } = props;
+  const userId = userInfo._id;
+  const [isOnline] = useCachedOnlineStatus([userId]);
 
   const { value: bannerColor } = useAsync(async () => {
     if (!userInfo.avatar) {
@@ -35,6 +37,7 @@ export const UserProfileContainer: React.FC<
           size={80}
           src={userInfo.avatar}
           name={userInfo.nickname}
+          isOnline={isOnline}
         />
       </div>
 

diff --git a/server/models/chat/ack.ts b/server/models/chat/ack.ts
@@ -3,7 +3,6 @@ import {
   prop,
   DocumentType,
   Ref,
-  ReturnModelType,
   index,
 } from '@typegoose/typegoose';
 import type { Base } from '@typegoose/typegoose/lib/defaultClasses';