feat: get user info

Author: luoling8192

packages/core/src/adapter/client/adapter.ts

@@ -143,16 +143,38 @@ export class ClientAdapter implements ITelegramClientAdapter {
     }
   }
 
-  async getUserInfo(userId: string): Promise<Api.users.UserFull> {
-    return await this.connectionManager.getClient().invoke(new Api.users.GetFullUser({
-      id: userId,
+  async getMeInfo(): Promise<Api.User> {
+    return this.connectionManager.getMe()
+  }
+
+  async getUserInfo(userId: string): Promise<Api.User> {
+    const users = await this.connectionManager.getClient().invoke(new Api.users.GetUsers({
+      id: [userId],
     }))
+
+    const user = users[0]
+
+    // Filter out empty user results
+    if (!user || user instanceof Api.UserEmpty) {
+      throw new Error(`User ${userId} not found`)
+    }
+
+    return user
   }
 
-  async getUsersInfo(userIds: string[]): Promise<Api.TypeUser[]> {
-    return await this.connectionManager.getClient().invoke(new Api.users.GetUsers({
+  async getUsersInfo(userIds: string[]): Promise<Api.User[]> {
+    const users = await this.connectionManager.getClient().invoke(new Api.users.GetUsers({
       id: userIds,
     }))
+
+    // Filter out empty or invalid user results
+    const validUsers = users.filter(user => user && !(user instanceof Api.UserEmpty))
+
+    if (validUsers.length === 0) {
+      throw new Error('No valid users found')
+    }
+
+    return validUsers as Api.User[]
   }
 
   async getHistory(chatId: number): Promise<Api.messages.TypeMessages & { count: number }> {

packages/core/src/adapter/client/connection-manager.ts

@@ -41,6 +41,10 @@ export class ConnectionManager {
     return this.client
   }
 
+  public async getMe(): Promise<Api.User> {
+    return this.client.getMe()
+  }
+
   /**
    * Check if the client is connected and authorized
    */

packages/core/src/types/adapter.ts

@@ -69,8 +69,22 @@ export interface ITelegramClientAdapter extends BaseTelegramAdapter {
    * Check if the client is connected
    */
   isConnected: () => Promise<boolean>
-  getUserInfo: (userId: string) => Promise<Api.users.UserFull>
-  getUsersInfo: (userIds: string[]) => Promise<Api.TypeUser[]>
+
+  /**
+   * Get me info
+   */
+  getMeInfo: () => Promise<Api.User>
+
+  /**
+   * Get user info
+   */
+  getUserInfo: (userId: string) => Promise<Api.User>
+
+  /**
+   * Get users info
+   */
+  getUsersInfo: (userIds: string[]) => Promise<Api.User[]>
+
   /**
    * Send verification code
    */

packages/frontend/src/apis/useAuth.ts

@@ -1,4 +1,4 @@
-import type { SuccessResponse } from '@tg-search/server'
+import type { SuccessResponse, UserInfoResponse } from '@tg-search/server'
 
 import { ref } from 'vue'
 
@@ -20,6 +20,14 @@ export function useAuth() {
     return response.data.connected
   }
 
+  async function getMeInfo(): Promise<UserInfoResponse> {
+    const response = await apiFetch<SuccessResponse<UserInfoResponse>>('/auth/me', {
+      method: 'GET',
+    })
+
+    return response.data
+  }
+
   /**
    * Logout from Telegram
    */
@@ -45,5 +53,6 @@ export function useAuth() {
     error,
     logout,
     checkStatus,
+    getMeInfo,
   }
 }

packages/frontend/src/apis/useUserInfo.ts

@@ -0,0 +1,43 @@
+import type { SuccessResponse, UserInfoResponse } from '@tg-search/server'
+
+import { apiFetch, useApi } from '../composables/api'
+
+/**
+ * Vue composable for managing Telegram user info operations
+ */
+export function useUserInfo() {
+  const { loading, error } = useApi()
+
+  /**
+   * Get info for a single user by ID
+   */
+  async function getUserInfo(id: string): Promise<UserInfoResponse> {
+    const response = await apiFetch<SuccessResponse<UserInfoResponse>>(`/users/${id}`, {
+      method: 'GET',
+      query: {
+        id,
+      },
+    })
+
+    return response.data
+  }
+
+  /**
+   * Get info for multiple users by IDs
+   */
+  async function getUsersInfo(ids: string[]): Promise<UserInfoResponse[]> {
+    const response = await apiFetch<SuccessResponse<UserInfoResponse[]>>('/users/batch', {
+      method: 'GET',
+      query: { ids },
+    })
+
+    return response.data
+  }
+
+  return {
+    loading,
+    error,
+    getUserInfo,
+    getUsersInfo,
+  }
+}

packages/frontend/src/layouts/default.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import type { UserInfoResponse } from '@tg-search/server'
 import { onClickOutside } from '@vueuse/core'
 import { onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
@@ -10,7 +11,7 @@ import { useLanguage } from '../composables/useLanguage'
 import { useSession } from '../composables/useSession'
 
 const router = useRouter()
-const { logout } = useAuth()
+const { logout, getMeInfo } = useAuth()
 const { isDark } = useDarkStore()
 const { checkConnection, isConnected } = useSession()
 const { supportedLanguages, setLanguage, locale } = useLanguage()
@@ -19,6 +20,7 @@ const showUserMenu = ref(false)
 const showLanguageMenu = ref(false)
 const userMenuRef = ref<HTMLElement | null>(null)
 const languageMenuRef = ref<HTMLElement | null>(null)
+const userInfo = ref<UserInfoResponse | null>(null)
 
 // Use VueUse's onClickOutside to handle closing the menus
 onClickOutside(userMenuRef, () => {
@@ -29,16 +31,25 @@ onClickOutside(languageMenuRef, () => {
   showLanguageMenu.value = false
 })
 
-// 检查用户是否已登录
+// Check if user is logged in and get user info
 onMounted(async () => {
   await checkConnection(false)
+  if (isConnected.value) {
+    try {
+      userInfo.value = await getMeInfo()
+    }
+    catch (err) {
+      console.error('Failed to get user info:', err)
+    }
+  }
 })
 
-// 处理注销
+// Handle logout
 async function handleLogout() {
   showUserMenu.value = false
   const success = await logout()
   if (success) {
+    userInfo.value = null
     toast.success(t('header.logout_success'))
     router.push('/login')
   }
@@ -47,13 +58,13 @@ async function handleLogout() {
   }
 }
 
-// 处理登录
+// Handle login
 async function handleLogin() {
   showUserMenu.value = false
   router.push('/login')
 }
 
-// 处理语言切换
+// Handle language change
 function handleLanguageChange(langCode: string) {
   setLanguage(langCode)
   showLanguageMenu.value = false
@@ -73,15 +84,15 @@ function handleLanguageChange(langCode: string) {
         <div class="flex items-center gap-4">
           <ThemeToggle />
 
-          <!-- 语言切换 -->
+          <!-- Language switcher -->
           <div ref="languageMenuRef" class="relative">
             <IconButton
               icon="i-carbon-language"
               aria-label="Language"
               @click="showLanguageMenu = !showLanguageMenu"
             />
 
-            <!-- 语言菜单 -->
+            <!-- Language menu -->
             <div
               v-if="showLanguageMenu"
               class="absolute right-0 z-50 mt-2 w-48 border border-gray-200 rounded-md bg-white py-1 shadow-lg dark:border-gray-700 dark:bg-gray-800"
@@ -111,7 +122,7 @@ function handleLanguageChange(langCode: string) {
             @click="router.push('/settings')"
           />
 
-          <!-- 用户头像与下拉菜单 -->
+          <!-- User avatar and dropdown menu -->
           <div ref="userMenuRef" class="relative">
             <IconButton
               icon="i-carbon-user"
@@ -121,11 +132,20 @@ function handleLanguageChange(langCode: string) {
               @click="showUserMenu = !showUserMenu"
             />
 
-            <!-- 用户菜单 -->
+            <!-- User menu -->
             <div
               v-if="showUserMenu"
               class="absolute right-0 z-50 mt-2 w-48 border border-gray-200 rounded-md bg-white py-1 shadow-lg dark:border-gray-700 dark:bg-gray-800"
             >
+              <div v-if="userInfo" class="px-4 py-2 text-sm text-gray-700 dark:text-gray-200">
+                <div>{{ userInfo.firstName }} {{ userInfo.lastName }}</div>
+                <div class="text-xs text-gray-500">
+                  @{{ userInfo.username }}
+                </div>
+              </div>
+
+              <div class="border-b border-gray-200 dark:border-gray-700 my-2" />
+
               <button
                 v-if="!isConnected"
                 class="block w-full px-4 py-2 text-left text-sm text-gray-700 hover:bg-gray-100 dark:text-gray-200 dark:hover:bg-gray-700"

packages/server/src/index.ts

@@ -18,6 +18,7 @@ import { setupCommandRoutes } from './routes/commands'
 import { setupConfigRoutes } from './routes/config'
 import { setupMessageRoutes } from './routes/message'
 import { setupSearchRoutes } from './routes/search'
+import { setupUserInfoRoutes } from './routes/user-info'
 import { setupWsAuthRoutes } from './routes/ws-auth'
 import { createErrorResponse } from './utils/response'
 
@@ -62,6 +63,7 @@ function setupRoutes(app: App) {
   setupMessageRoutes(app)
   setupSearchRoutes(app)
   setupWsAuthRoutes(app)
+  setupUserInfoRoutes(app)
 }
 
 // Server configuration

packages/server/src/routes/user-info.ts

@@ -0,0 +1,76 @@
+import type { App, H3Event } from 'h3'
+import type { UserInfoResponse } from '../types/apis/user-info'
+
+import { createError, createRouter, defineEventHandler, getRouterParams } from 'h3'
+
+import { useTelegramClient } from '../services/telegram'
+import { createResponse } from '../utils/response'
+
+/**
+ * Setup user info routes
+ */
+export function setupUserInfoRoutes(app: App) {
+  const router = createRouter()
+
+  // Get single user info
+  router.get('/:id', defineEventHandler(async (event: H3Event) => {
+    const { id } = getRouterParams(event)
+    const client = await useTelegramClient()
+
+    try {
+      const userInfo = await client.getUserInfo(id)
+
+      const response: UserInfoResponse = {
+        id: userInfo.id.toString(),
+        firstName: userInfo?.firstName ?? '',
+        lastName: userInfo?.lastName ?? '',
+        username: userInfo?.username ?? '',
+        // photoUrl: userInfo.photoUrl ?? '',
+      }
+
+      return createResponse<UserInfoResponse>(response)
+    }
+    catch {
+      return createError({
+        statusCode: 404,
+        message: `User ${id} not found`,
+      })
+    }
+  }))
+
+  // Get multiple users info
+  router.get('/batch', defineEventHandler(async (event: H3Event) => {
+    const { ids } = getRouterParams(event)
+    const client = await useTelegramClient()
+
+    if (!ids || !Array.isArray(ids)) {
+      throw createError({
+        statusCode: 400,
+        message: 'User IDs array is required',
+      })
+    }
+
+    try {
+      const usersInfo = await client.getUsersInfo(ids)
+
+      const response: UserInfoResponse[] = usersInfo.map(user => ({
+        id: user.id.toString(),
+        firstName: user?.firstName ?? '',
+        lastName: user?.lastName ?? '',
+        username: user?.username ?? '',
+        // photoUrl: user.photoUrl ?? '',
+      }))
+
+      return createResponse<UserInfoResponse[]>(response)
+    }
+    catch {
+      return createError({
+        statusCode: 404,
+        message: 'Failed to fetch users info',
+      })
+    }
+  }))
+
+  // Mount routes
+  app.use('/users', router.handler)
+}

packages/server/src/routes/ws-auth.ts

@@ -1,6 +1,7 @@
 import type { ITelegramClientAdapter } from '@tg-search/core'
 import type { Peer } from 'crossws'
 import type { App } from 'h3'
+import type { UserInfoResponse } from '../types/apis/user-info'
 import type { WsMessage } from '../utils/ws'
 
 import { useLogger } from '@tg-search/common'
@@ -101,6 +102,20 @@ export function setupWsAuthRoutes(app: App) {
     }
   }))
 
+  router.get('/me', defineEventHandler(async () => {
+    const client = await useTelegramClient()
+    const userInfo = await client.getMeInfo()
+
+    const response: UserInfoResponse = {
+      id: userInfo.id.toString(),
+      firstName: userInfo.firstName ?? '',
+      lastName: userInfo.lastName ?? '',
+      username: userInfo.username ?? '',
+    }
+
+    return createResponse<UserInfoResponse>(response)
+  }))
+
   // 将旧的auth路由挂载到/auth路径
   app.use('/auth', router.handler)
 

packages/server/src/types/apis/index.ts

@@ -3,3 +3,4 @@ export * from './command'
 export * from './export'
 export * from './search'
 export * from './sync'
+export * from './user-info'