@lobehub/lobehub 2.0.0-next.333 → 2.0.0-next.335

package/packages/database/migrations/meta/_journal.json

@@ -490,7 +490,14 @@
       "when": 1768303764632,
       "tag": "0069_add_topic_shares_table",
       "breakpoints": true
+    },
+    {
+      "idx": 70,
+      "version": "7",
+      "when": 1768999498635,
+      "tag": "0070_add_user_memory_activities",
+      "breakpoints": true
     }
   ],
   "version": "6"
-}
+}

package/packages/database/src/schemas/userMemories/index.ts

@@ -124,6 +124,70 @@ export const userMemoriesPreferences = pgTable(
   ],
 );
 
+export const userMemoriesActivities = pgTable(
+  'user_memories_activities',
+  {
+    id: varchar255('id')
+      .$defaultFn(() => idGenerator('memory'))
+      .primaryKey(),
+
+    userId: text('user_id').references(() => users.id, { onDelete: 'cascade' }),
+    userMemoryId: varchar255('user_memory_id').references(() => userMemories.id, {
+      onDelete: 'cascade',
+    }),
+
+    metadata: jsonb('metadata').$type<Record<string, unknown>>(),
+    tags: text('tags').array(),
+
+    type: varchar255('type').notNull(),
+    status: varchar255('status').notNull().default('pending'),
+    timezone: varchar255('timezone'),
+    startsAt: timestamptz('starts_at'),
+    endsAt: timestamptz('ends_at'),
+
+    associatedObjects: jsonb('associated_objects').$type<{
+      extra?: Record<string, unknown>,
+      name?: string,
+      type?: string
+    }[]>(),
+    associatedSubjects: jsonb('associated_subjects').$type<{
+      extra?: Record<string, unknown>,
+      name?: string,
+      type?: string
+    }[]>(),
+    associatedLocations: jsonb('associated_locations').$type<{
+      address?: string;
+      name?: string;
+      tags?: string[];
+      type?: string;
+    }[]>(),
+
+    notes: text('notes'),
+    narrative: text('narrative'),
+    narrativeVector: vector('narrative_vector', { dimensions: 1024 }),
+    feedback: text('feedback'),
+    feedbackVector: vector('feedback_vector', { dimensions: 1024 }),
+
+    capturedAt: timestamptz('captured_at').notNull().defaultNow(),
+
+    ...timestamps,
+  },
+  (table) => [
+    index('user_memories_activities_narrative_vector_index').using(
+      'hnsw',
+      table.narrativeVector.op('vector_cosine_ops'),
+    ),
+    index('user_memories_activities_feedback_vector_index').using(
+      'hnsw',
+      table.feedbackVector.op('vector_cosine_ops'),
+    ),
+    index('user_memories_activities_type_index').on(table.type),
+    index('user_memories_activities_user_id_index').on(table.userId),
+    index('user_memories_activities_user_memory_id_index').on(table.userMemoryId),
+    index('user_memories_activities_status_index').on(table.status),
+  ],
+);
+
 export const userMemoriesIdentities = pgTable(
   'user_memories_identities',
   {
@@ -242,3 +306,10 @@ export type UserMemoryExperiencesWithoutVectors = Omit<
   'situationVector' | 'actionVector' | 'keyLearningVector'
 >;
 export type NewUserMemoryExperience = typeof userMemoriesExperiences.$inferInsert;
+
+export type UserMemoryActivity = typeof userMemoriesActivities.$inferSelect;
+export type UserMemoryActivitiesWithoutVectors = Omit<
+  UserMemoryActivity,
+  'narrativeVector' | 'feedbackVector'
+>;
+export type NewUserMemoryActivity = typeof userMemoriesActivities.$inferInsert;

package/src/app/[variants]/(mobile)/me/(home)/features/useCategory.tsx

@@ -1,5 +1,5 @@
-import { UTM_SOURCE , LOBE_CHAT_CLOUD } from '@lobechat/business-const';
-import { OFFICIAL_URL } from '@lobechat/const';
+import { LOBE_CHAT_CLOUD, UTM_SOURCE } from '@lobechat/business-const';
+import { DOWNLOAD_URL, OFFICIAL_URL } from '@lobechat/const';
 import {
   Book,
   CircleUserRound,
@@ -9,22 +9,29 @@ import {
   FileClockIcon,
   Settings2,
 } from 'lucide-react';
+import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 
 import { type CellProps } from '@/components/Cell';
 import { DOCUMENTS, FEEDBACK } from '@/const/index';
-import { usePWAInstall } from '@/hooks/usePWAInstall';
+import { usePlatform } from '@/hooks/usePlatform';
 import { featureFlagsSelectors, useServerConfigStore } from '@/store/serverConfig';
 import { useUserStore } from '@/store/user';
 import { authSelectors } from '@/store/user/selectors';
 
 export const useCategory = (onOpenChangelogModal: () => void) => {
   const navigate = useNavigate();
-  const { canInstall, install } = usePWAInstall();
   const { t } = useTranslation(['common', 'setting', 'auth']);
   const { showCloudPromotion, hideDocs } = useServerConfigStore(featureFlagsSelectors);
   const [isLoginWithAuth] = useUserStore((s) => [authSelectors.isLoginWithAuth(s)]);
+  const { isIOS, isAndroid } = usePlatform();
+
+  const downloadUrl = useMemo(() => {
+    if (isIOS) return DOWNLOAD_URL.ios;
+    if (isAndroid) return DOWNLOAD_URL.android;
+    return DOWNLOAD_URL.default;
+  }, [isIOS, isAndroid]);
 
   const profile: CellProps[] = [
     {
@@ -47,12 +54,12 @@ export const useCategory = (onOpenChangelogModal: () => void) => {
     },
   ];
 
-  const pwa: CellProps[] = [
+  const downloadClient: CellProps[] = [
     {
       icon: Download,
-      key: 'pwa',
-      label: t('installPWA'),
-      onClick: () => install(),
+      key: 'download-client',
+      label: t('downloadClient'),
+      onClick: () => window.open(downloadUrl, '__blank'),
     },
     {
       type: 'divider',
@@ -96,7 +103,7 @@ export const useCategory = (onOpenChangelogModal: () => void) => {
     /* ↓ cloud slot ↓ */
 
     /* ↑ cloud slot ↑ */
-    ...(canInstall ? pwa : []),
+    ...downloadClient,
     ...(!hideDocs ? helps : []),
   ].filter(Boolean) as CellProps[];
 

package/src/app/[variants]/layout.tsx

@@ -9,7 +9,6 @@ import BusinessGlobalProvider from '@/business/client/BusinessGlobalProvider';
 import Analytics from '@/components/Analytics';
 import { DEFAULT_LANG } from '@/const/locale';
 import { isDesktop } from '@/const/version';
-import PWAInstall from '@/features/PWAInstall';
 import AuthProvider from '@/layout/AuthProvider';
 import GlobalProvider from '@/layout/GlobalProvider';
 import { type Locales } from '@/locales/resources';
@@ -40,9 +39,6 @@ const RootLayout = async ({ children, params }: RootLayoutProps) => {
         variants={variants}
       >
         <AuthProvider>{children}</AuthProvider>
-        <Suspense fallback={null}>
-          <PWAInstall />
-        </Suspense>
       </GlobalProvider>
     );
   };

package/src/features/User/UserPanel/useMenu.tsx

@@ -1,9 +1,9 @@
 import { LOBE_CHAT_CLOUD, UTM_SOURCE } from '@lobechat/business-const';
-import { isDesktop } from '@lobechat/const';
+import { DOWNLOAD_URL, isDesktop } from '@lobechat/const';
 import { Flexbox, Hotkey, Icon, Tag } from '@lobehub/ui';
 import { type ItemType } from 'antd/es/menu/interface';
 import { Cloudy, Download, HardDriveDownload, LogOut, Settings2 } from 'lucide-react';
-import { type PropsWithChildren, memo } from 'react';
+import { type PropsWithChildren, memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
 
@@ -12,7 +12,7 @@ import type { MenuProps } from '@/components/Menu';
 import { DEFAULT_DESKTOP_HOTKEY_CONFIG } from '@/const/desktop';
 import { OFFICIAL_URL } from '@/const/url';
 import DataImporter from '@/features/DataImporter';
-import { usePWAInstall } from '@/hooks/usePWAInstall';
+import { usePlatform } from '@/hooks/usePlatform';
 import { featureFlagsSelectors, useServerConfigStore } from '@/store/serverConfig';
 import { useUserStore } from '@/store/user';
 import { authSelectors } from '@/store/user/selectors';
@@ -44,7 +44,6 @@ const NewVersionBadge = memo(
 );
 
 export const useMenu = () => {
-  const { canInstall, install } = usePWAInstall();
   const hasNewVersion = useNewVersion();
   const { t } = useTranslation(['common', 'setting', 'auth']);
   const { showCloudPromotion, hideDocs } = useServerConfigStore(featureFlagsSelectors);
@@ -53,6 +52,13 @@ export const useMenu = () => {
     authSelectors.isLoginWithAuth(s),
   ]);
   const businessMenuItems = useBusinessMenuItems(isLogin);
+  const { isIOS, isAndroid } = usePlatform();
+
+  const downloadUrl = useMemo(() => {
+    if (isIOS) return DOWNLOAD_URL.ios;
+    if (isAndroid) return DOWNLOAD_URL.android;
+    return DOWNLOAD_URL.default;
+  }, [isIOS, isAndroid]);
 
   const settings: MenuProps['items'] = [
     {
@@ -71,12 +77,15 @@ export const useMenu = () => {
     },
   ];
 
-  const pwa: MenuProps['items'] = [
+  const downloadClient: MenuProps['items'] = [
     {
       icon: <Icon icon={Download} />,
-      key: 'pwa',
-      label: t('installPWA'),
-      onClick: () => install(),
+      key: 'download-client',
+      label: (
+        <a href={downloadUrl} rel="noopener noreferrer" target="_blank">
+          {t('downloadClient')}
+        </a>
+      ),
     },
     {
       type: 'divider',
@@ -119,7 +128,7 @@ export const useMenu = () => {
 
     ...(isLogin ? settings : []),
     ...businessMenuItems,
-    ...(canInstall ? pwa : []),
+    ...(!isDesktop ? downloadClient : []),
     ...data,
     ...(!hideDocs ? helps : []),
   ].filter(Boolean) as MenuProps['items'];

package/src/hooks/usePlatform.test.ts

@@ -25,6 +25,7 @@ describe('usePlatform', () => {
     const { result } = renderHook(() => usePlatform());
 
     expect(result.current).toEqual({
+      isAndroid: false,
       isApple: true,
       isChrome: true,
       isChromium: true,
@@ -50,6 +51,7 @@ describe('usePlatform', () => {
     const { result } = renderHook(() => usePlatform());
 
     expect(result.current).toEqual({
+      isAndroid: false,
       isApple: true,
       isChrome: false,
       isChromium: false,
@@ -75,6 +77,7 @@ describe('usePlatform', () => {
     const { result } = renderHook(() => usePlatform());
 
     expect(result.current).toEqual({
+      isAndroid: false,
       isApple: false,
       isChrome: false,
       isChromium: true,
@@ -100,6 +103,7 @@ describe('usePlatform', () => {
     const { result } = renderHook(() => usePlatform());
 
     expect(result.current).toEqual({
+      isAndroid: false,
       isApple: false,
       isChrome: false,
       isChromium: false,
@@ -125,6 +129,7 @@ describe('usePlatform', () => {
     const { result } = renderHook(() => usePlatform());
 
     expect(result.current).toEqual({
+      isAndroid: false,
       isApple: true,
       isChrome: true,
       isChromium: true,

package/src/hooks/usePlatform.ts

@@ -13,6 +13,7 @@ export const usePlatform = () => {
   const browser = useRef(getBrowser());
 
   const platformInfo = {
+    isAndroid: platform.current?.toLowerCase() === 'android',
     isApple: platform.current && ['mac os', 'ios'].includes(platform.current?.toLowerCase()),
     isArc: isArc(),
     isChrome: browser.current?.toLowerCase() === 'chrome',

package/src/locales/default/common.ts

@@ -193,6 +193,7 @@ export default {
   'delete': 'Delete',
   'document': 'User Manual',
   'download': 'Download',
+  'downloadClient': 'Download Client',
   'duplicate': 'Duplicate',
   'edit': 'Edit',
   'errors.invalidFileFormat': 'Invalid file format',