♻️ refactor: rebase

src/app/(main)/profile/(home)/[[...slugs]]/page.tsx

@@ -1,6 +1,6 @@
+import { Skeleton } from 'antd';
 import dynamic from 'next/dynamic';
 
-import SkeletonLoading from '@/components/SkeletonLoading';
 import { enableClerk } from '@/const/auth';
 import { metadataModule } from '@/server/metadata';
 import { translation } from '@/server/translation';
@@ -13,7 +13,7 @@ import Client from '../Client';
 const ClerkProfile = dynamic(() => import('../../features/ClerkProfile'), {
   loading: () => (
     <div style={{ flex: 1 }}>
-      <SkeletonLoading paragraph={{ rows: 8 }} title={false} />
+      <Skeleton paragraph={{ rows: 8 }} title={false} />
     </div>
   ),
 });

src/app/(main)/profile/loading.tsx

@@ -1,9 +1,3 @@
-import SkeletonLoading from '@/components/SkeletonLoading';
+import FullLoading from '@/components/Loading/BrandTextLoading';
 
-export default () => {
-  return (
-    <div style={{ flex: 1 }}>
-      <SkeletonLoading paragraph={{ rows: 8 }} title={false} />
-    </div>
-  );
-};
+export default () => <FullLoading />;

src/app/(main)/profile/security/page.tsx

@@ -1,7 +1,7 @@
+import { Skeleton } from 'antd';
 import dynamic from 'next/dynamic';
 import { notFound } from 'next/navigation';
 
-import SkeletonLoading from '@/components/SkeletonLoading';
 import { enableClerk } from '@/const/auth';
 import { metadataModule } from '@/server/metadata';
 import { translation } from '@/server/translation';
@@ -10,7 +10,7 @@ import { isMobileDevice } from '@/utils/server/responsive';
 const ClerkProfile = dynamic(() => import('../features/ClerkProfile'), {
   loading: () => (
     <div style={{ flex: 1 }}>
-      <SkeletonLoading paragraph={{ rows: 8 }} title={false} />
+      <Skeleton paragraph={{ rows: 8 }} title={false} />
     </div>
   ),
 });

src/database/server/models/session.ts

@@ -13,7 +13,7 @@ import {
 } from '@/database/utils/genWhere';
 import { idGenerator } from '@/database/utils/idGenerator';
 import { parseAgentConfig } from '@/server/globalConfig/parseDefaultAgent';
-import { ChatSessionList, LobeAgentSession } from '@/types/session';
+import { ChatSessionList, LobeAgentSession, SessionRankItem } from '@/types/session';
 import { merge } from '@/utils/merge';
 
 import {
@@ -119,15 +119,7 @@ export class SessionModel {
     return result[0].count;
   };
 
-  rank = async (): Promise<
-    {
-      avatar: string | null;
-      backgroundColor: string | null;
-      count: number;
-      id: string;
-      title: string | null;
-    }[]
-  > => {
+  rank = async (): Promise<SessionRankItem[]> => {
     return this.db
       .select({
         avatar: agents.avatar,

src/database/server/models/topic.ts

@@ -9,6 +9,7 @@ import {
   genWhere,
 } from '@/database/utils/genWhere';
 import { idGenerator } from '@/database/utils/idGenerator';
+import { TopicRankItem } from '@/types/topic';
 
 import { NewMessage, TopicItem, messages, topics } from '../../schemas';
 
@@ -126,14 +127,7 @@ export class TopicModel {
     return result[0].count;
   };
 
-  rank = async (): Promise<
-    {
-      count: number;
-      id: string;
-      sessionId: string | null;
-      title: string | null;
-    }[]
-  > => {
+  rank = async (): Promise<TopicRankItem[]> => {
     return this.db
       .select({
         count: count(messages.id).as('count'),

src/services/message/client.ts

@@ -1,5 +1,3 @@
-import dayjs from 'dayjs';
-
 import { INBOX_SESSION_ID } from '@/const/session';
 import { clientDB } from '@/database/client/db';
 import { MessageModel } from '@/database/server/models/message';
@@ -52,9 +50,9 @@ export class ClientService extends BaseClientService implements IMessageService
     return data as unknown as ChatMessage[];
   };
 
-  async countMessages(params?: { endDate?: string; range?: [string, string]; startDate?: string }) {
+  countMessages: IMessageService['countMessages'] = async (params) => {
     return this.messageModel.count(params);
-  }
+  };
 
   getAllMessagesInSession: IMessageService['getAllMessagesInSession'] = async (sessionId) => {
     const data = this.messageModel.queryBySessionId(this.toDbSessionId(sessionId));

src/services/message/server.ts

@@ -36,13 +36,9 @@ export class ServerService implements IMessageService {
     });
   };
 
-  countMessages = async (params?: {
-    endDate?: string;
-    range?: [string, string];
-    startDate?: string;
-  }): Promise<number> => {
+  countMessages: IMessageService['countMessages'] = async (params) => {
     return lambdaClient.message.count.query(params);
-  }
+  };
 
   updateMessageError: IMessageService['updateMessageError'] = async (id, error) => {
     return lambdaClient.message.update.mutate({ id, value: { error } });

src/services/message/type.ts

@@ -16,7 +16,11 @@ export interface IMessageService {
   getMessages(sessionId: string, topicId?: string): Promise<ChatMessage[]>;
   getAllMessages(): Promise<ChatMessage[]>;
   getAllMessagesInSession(sessionId: string): Promise<ChatMessage[]>;
-  countMessages(): Promise<number>;
+  countMessages(params?: {
+    endDate?: string;
+    range?: [string, string];
+    startDate?: string;
+  }): Promise<number>;
 
   updateMessageError(id: string, error: ChatMessageError): Promise<any>;
   updateMessage(id: string, message: Partial<MessageItem>): Promise<any>;

src/services/session/client.ts

@@ -74,13 +74,13 @@ export class ClientService extends BaseClientService implements ISessionService
     }
   };
 
-  async countSessions(params?: { endDate?: string; range?: [string, string]; startDate?: string }) {
+  countSessions: ISessionService['countSessions'] = async (params) => {
     return this.sessionModel.count(params);
-  }
+  };
 
-  async rankSessions() {
+  rankSessions: ISessionService['rankSessions'] = async () => {
     return this.sessionModel.rank();
-  }
+  };
 
   searchSessions: ISessionService['searchSessions'] = async (keyword) => {
     return this.sessionModel.queryByKeyword(keyword);

src/services/session/server.ts

@@ -36,14 +36,14 @@ export class ServerService implements ISessionService {
     return lambdaClient.session.getGroupedSessions.query();
   };
 
-  countSessions = async (params?: {
-    endDate?: string;
-    range?: [string, string];
-    startDate?: string;
-  }): Promise<number> => {
+  countSessions: ISessionService['countSessions'] = async (params) => {
     return lambdaClient.session.countSessions.query(params);
   };
 
+  rankSessions: ISessionService['rankSessions'] = async () => {
+    return lambdaClient.session.rankSessions.query();
+  };
+
   updateSession: ISessionService['updateSession'] = (id, data) => {
     const { group, pinned, meta, updatedAt } = data;
     return lambdaClient.session.updateSession.mutate({

src/services/session/type.ts

@@ -11,6 +11,7 @@ import {
   LobeSessions,
   SessionGroupItem,
   SessionGroups,
+  SessionRankItem,
   UpdateSessionParams,
 } from '@/types/session';
 
@@ -36,15 +37,7 @@ export interface ISessionService {
     range?: [string, string];
     startDate?: string;
   }): Promise<number>;
-  rankSessions(): Promise<
-    {
-      avatar: string | null;
-      count: number;
-      id: string;
-      title: string | null;
-      backgroundColor: string | null;
-    }[]
-  >;
+  rankSessions(): Promise<SessionRankItem[]>;
   searchSessions(keyword: string): Promise<LobeSessions>;
 
   updateSession(id: string, data: Partial<UpdateSessionParams>): Promise<any>;

src/services/topic/client.ts

@@ -55,20 +55,13 @@ export class ClientService extends BaseClientService implements ITopicService {
     return data as unknown as Promise<ChatTopic[]>;
   };
 
-  async countTopics(params?: { endDate?: string; range?: [string, string]; startDate?: string }) {
+  countTopics: ITopicService['countTopics'] = async (params) => {
     return this.topicModel.count(params);
-  }
+  };
 
-  async rankTopics(): Promise<
-    {
-      count: number;
-      id: string;
-      sessionId: string | null;
-      title: string | null;
-    }[]
-  > {
+  rankTopics: ITopicService['rankTopics'] = async () => {
     return this.topicModel.rank();
-  }
+  };
 
   updateTopic: ITopicService['updateTopic'] = async (id, data) => {
     return this.topicModel.update(id, data as any);

src/services/topic/server.ts

@@ -24,24 +24,13 @@ export class ServerService implements ITopicService {
   getAllTopics: ITopicService['getAllTopics'] = () =>
     lambdaClient.topic.getAllTopics.query() as any;
 
-  countTopics = async(params?: {
-    endDate?: string;
-    range?: [string, string];
-    startDate?: string;
-  }): Promise<number> => {
+  countTopics: ITopicService['countTopics'] = async (params) => {
     return lambdaClient.topic.countTopics.query(params);
-  }
+  };
 
-  rankTopics = async (): Promise<
-    {
-      count: number;
-      id: string;
-      sessionId: string | null;
-      title: string | null;
-    }[]
-  > => {
+  rankTopics: ITopicService['rankTopics'] = async () => {
     return lambdaClient.topic.rankTopics.query();
-  }
+  };
 
   searchTopics: ITopicService['searchTopics'] = (keywords, sessionId) =>
     lambdaClient.topic.searchTopics.query({

src/services/topic/type.ts

@@ -1,6 +1,6 @@
 /* eslint-disable typescript-sort-keys/interface */
 import { BatchTaskResult } from '@/types/service';
-import { ChatTopic } from '@/types/topic';
+import { ChatTopic, TopicRankItem } from '@/types/topic';
 
 export interface CreateTopicParams {
   favorite?: boolean;
@@ -22,15 +22,12 @@ export interface ITopicService {
 
   getTopics(params: QueryTopicParams): Promise<ChatTopic[]>;
   getAllTopics(): Promise<ChatTopic[]>;
-  countTopics(): Promise<number>;
-  rankTopics(): Promise<
-    {
-      id: string;
-      title: string | null;
-      count: number;
-      sessionId: string | null;
-    }[]
-  >;
+  countTopics(params?: {
+    endDate?: string;
+    range?: [string, string];
+    startDate?: string;
+  }): Promise<number>;
+  rankTopics(): Promise<TopicRankItem[]>;
   searchTopics(keyword: string, sessionId?: string): Promise<ChatTopic[]>;
 
   updateTopic(id: string, data: Partial<ChatTopic>): Promise<any>;

src/types/session/index.ts

@@ -15,3 +15,11 @@ export interface UpdateSessionParams {
   pinned?: boolean;
   updatedAt: Date;
 }
+
+export interface SessionRankItem {
+  avatar: string | null;
+  backgroundColor: string | null;
+  count: number;
+  id: string;
+  title: string | null;
+}

src/types/topic/topic.ts

@@ -44,3 +44,10 @@ export interface ChatTopic extends Omit<BaseDataModel, 'meta'> {
 }
 
 export type ChatTopicMap = Record<string, ChatTopic>;
+
+export interface TopicRankItem {
+  count: number;
+  id: string;
+  sessionId: string | null;
+  title: string | null;
+}