@lobehub/chat 1.108.0 → 1.108.2

package/src/database/models/thread.ts

@@ -1,4 +1,4 @@
-import { and, desc, eq } from 'drizzle-orm/expressions';
+import { and, desc, eq } from 'drizzle-orm';
 
 import { LobeChatDatabase } from '@/database/type';
 import { CreateThreadParams, ThreadStatus } from '@/types/topic';

package/src/database/models/topic.ts

@@ -1,5 +1,4 @@
-import { count, sql } from 'drizzle-orm';
-import { and, desc, eq, gt, ilike, inArray, isNull } from 'drizzle-orm/expressions';
+import { and, count, desc, eq, gt, ilike, inArray, isNull, sql } from 'drizzle-orm';
 
 import { LobeChatDatabase } from '@/database/type';
 import {

package/src/database/models/user.ts

@@ -1,6 +1,6 @@
 import { TRPCError } from '@trpc/server';
 import dayjs from 'dayjs';
-import { eq } from 'drizzle-orm/expressions';
+import { eq } from 'drizzle-orm';
 import type { AdapterAccount } from 'next-auth/adapters';
 import type { PartialDeep } from 'type-fest';
 

package/src/database/repositories/dataExporter/index.ts

@@ -1,4 +1,4 @@
-import { and, eq, inArray } from 'drizzle-orm/expressions';
+import { and, eq, inArray } from 'drizzle-orm';
 import pMap from 'p-map';
 
 import * as EXPORT_TABLES from '@/database/schemas';

package/src/database/repositories/dataImporter/__tests__/index.test.ts

@@ -1,4 +1,4 @@
-import { eq, inArray } from 'drizzle-orm/expressions';
+import { eq, inArray } from 'drizzle-orm';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { getTestDB } from '@/database/models/__tests__/_util';

package/src/database/repositories/dataImporter/deprecated/__tests__/index.test.ts

@@ -1,5 +1,5 @@
 // @vitest-environment node
-import { eq, inArray } from 'drizzle-orm/expressions';
+import { eq, inArray } from 'drizzle-orm';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { getTestDBInstance } from '@/database/core/dbForTest';

package/src/database/repositories/dataImporter/deprecated/index.ts

@@ -1,5 +1,4 @@
-import { sql } from 'drizzle-orm';
-import { and, eq, inArray } from 'drizzle-orm/expressions';
+import { and, eq, inArray, sql } from 'drizzle-orm';
 
 import {
   agents,

package/src/database/repositories/dataImporter/index.ts

@@ -1,4 +1,4 @@
-import { and, eq, inArray } from 'drizzle-orm/expressions';
+import { and, eq, inArray } from 'drizzle-orm';
 
 import * as EXPORT_TABLES from '@/database/schemas';
 import { LobeChatDatabase } from '@/database/type';

package/src/database/server/models/__tests__/adapter.test.ts

@@ -1,4 +1,4 @@
-import { eq } from 'drizzle-orm/expressions';
+import { eq } from 'drizzle-orm';
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import { getTestDBInstance } from '@/database/core/dbForTest';

package/src/database/server/models/__tests__/nextauth.test.ts

@@ -5,7 +5,7 @@ import type {
   AdapterUser,
   VerificationToken,
 } from '@auth/core/adapters';
-import { eq } from 'drizzle-orm/expressions';
+import { eq } from 'drizzle-orm';
 import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { getTestDBInstance } from '@/database/core/dbForTest';

package/src/database/server/models/__tests__/user.test.ts

@@ -1,6 +1,6 @@
 import { TRPCError } from '@trpc/server';
 import dayjs from 'dayjs';
-import { eq } from 'drizzle-orm/expressions';
+import { eq } from 'drizzle-orm';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { INBOX_SESSION_ID } from '@/const/session';

package/src/database/server/models/ragEval/dataset.ts

@@ -1,4 +1,4 @@
-import { and, desc, eq } from 'drizzle-orm/expressions';
+import { and, desc, eq } from 'drizzle-orm';
 
 import { NewEvalDatasetsItem, evalDatasets } from '@/database/schemas';
 import { serverDB } from '@/database/server';

package/src/database/server/models/ragEval/datasetRecord.ts

@@ -1,4 +1,4 @@
-import { and, eq, inArray } from 'drizzle-orm/expressions';
+import { and, eq, inArray } from 'drizzle-orm';
 
 import { NewEvalDatasetRecordsItem, evalDatasetRecords, files } from '@/database/schemas';
 import { serverDB } from '@/database/server';

package/src/database/server/models/ragEval/evaluation.ts

@@ -1,5 +1,4 @@
-import { SQL, count } from 'drizzle-orm';
-import { and, desc, eq, inArray } from 'drizzle-orm/expressions';
+import { SQL, and, count, desc, eq, inArray } from 'drizzle-orm';
 
 import {
   NewEvalEvaluationItem,

package/src/database/server/models/ragEval/evaluationRecord.ts

@@ -1,4 +1,4 @@
-import { and, eq } from 'drizzle-orm/expressions';
+import { and, eq } from 'drizzle-orm';
 
 import { NewEvaluationRecordsItem, evaluationRecords } from '@/database/schemas';
 import { serverDB } from '@/database/server';

package/src/database/utils/genWhere.ts

@@ -1,6 +1,5 @@
 import dayjs, { Dayjs } from 'dayjs';
-import { SQL } from 'drizzle-orm';
-import { and, gte, lte } from 'drizzle-orm/expressions';
+import { SQL, and, gte, lte } from 'drizzle-orm';
 
 export const genWhere = (sqls: (SQL<any> | undefined)[]): SQL<any> | undefined => {
   const where = sqls.filter(Boolean);

package/src/features/User/UserAvatar.tsx

@@ -2,10 +2,13 @@
 
 import { Avatar, type AvatarProps } from '@lobehub/ui';
 import { createStyles } from 'antd-style';
-import { forwardRef } from 'react';
+import { forwardRef, useMemo } from 'react';
 
 import { BRANDING_NAME } from '@/const/branding';
 import { DEFAULT_USER_AVATAR_URL } from '@/const/meta';
+import { isDesktop } from '@/const/version';
+import { useElectronStore } from '@/store/electron';
+import { electronSyncSelectors } from '@/store/electron/selectors';
 import { useUserStore } from '@/store/user';
 import { authSelectors, userProfileSelectors } from '@/store/user/selectors';
 
@@ -54,11 +57,24 @@ const UserAvatar = forwardRef<HTMLDivElement, UserAvatarProps>(
     ]);
 
     const isSignedIn = useUserStore(authSelectors.isLogin);
+    const remoteServerUrl = useElectronStore(electronSyncSelectors.remoteServerUrl);
+
+    // Process avatar URL for desktop environment
+    const avatarUrl = useMemo(() => {
+      if (!isSignedIn || !avatar) return DEFAULT_USER_AVATAR_URL;
+
+      // If in desktop environment and avatar starts with /, prepend the remote server URL
+      if (isDesktop && avatar.startsWith('/') && remoteServerUrl) {
+        return remoteServerUrl + avatar;
+      }
+
+      return avatar;
+    }, [isSignedIn, avatar, remoteServerUrl]);
 
     return (
       <Avatar
         alt={isSignedIn && !!username ? username : BRANDING_NAME}
-        avatar={isSignedIn && !!avatar ? avatar : DEFAULT_USER_AVATAR_URL}
+        avatar={avatarUrl}
         background={isSignedIn && avatar ? background : 'transparent'}
         className={cx(clickable && styles.clickable, className)}
         ref={ref}