fix: min faces user preference (#30177)

mobile/ios/WidgetExtension/ImageWidgetView.swift

@@ -17,62 +17,46 @@ struct ImmichWidgetView: View {
   var entry: ImageEntry
 
   var body: some View {
-    if let image = entry.image {
-      ImmichWidgetContentView(image: image, subtitle: entry.metadata.subtitle, deepLink: entry.metadata.deepLink)
-    } else {
-      ImmichWidgetLoadingView(message: entry.metadata.error?.errorDescription)
-    }
-  }
-}
-
-private struct ImmichWidgetLoadingView: View {
-  let message: String?
-
-  var body: some View {
-    Image("LaunchImage")
-      .tintedWidgetImageModifier()
-      .overlay(alignment: .bottom) {
-        if let message {
-          Text(message)
-            .minimumScaleFactor(0.25)
-            .multilineTextAlignment(.center)
-            .foregroundStyle(.secondary)
-            .fixedSize()
-            .alignmentGuide(.bottom) { dimensions in
-              // Place the text below the bottom of the image
-              dimensions[.top] - 8
-            }
+    if entry.image == nil {
+      Image("LaunchImage")
+        .tintedWidgetImageModifier()
+        .overlay(alignment: .bottom) {
+          if let error = entry.metadata.error?.errorDescription {
+            Text(error)
+              .minimumScaleFactor(0.25)
+              .multilineTextAlignment(.center)
+              .foregroundStyle(.secondary)
+              .fixedSize()
+              .alignmentGuide(.bottom) { dimensions in
+                // Place the text below the bottom of the image
+                dimensions[.top] - 8
+              }
+          }
         }
-      }
-  }
-}
+    } else {
+      ZStack(alignment: .leading) {
+        Color.clear.overlay(
+          Image(uiImage: entry.image!)
+            .resizable()
+            .tintedWidgetImageModifier()
+            .scaledToFill()
 
-private struct ImmichWidgetContentView: View {
-  let image: UIImage
-  let subtitle: String?
-  let deepLink: URL?
-
-  var body: some View {
-    ZStack(alignment: .leading) {
-      Color.clear.overlay(
-        Image(uiImage: image)
-          .resizable()
-          .tintedWidgetImageModifier()
-          .scaledToFill()
         )
         VStack {
           Spacer()
-          if let subtitle = subtitle {
+          if let subtitle = entry.metadata.subtitle {
             Text(subtitle)
               .foregroundColor(.white)
-              .padding(6)
-              .background(ContainerRelativeShape().fill(Color.black.opacity(0.6)))
+              .padding(8)
+              .background(Color.black.opacity(0.6))
+              .cornerRadius(8)
               .font(.system(size: 16))
           }
         }
-          .padding(16)
-        }
-    .widgetURL(deepLink)
+        .padding(16)
+      }
+      .widgetURL(entry.metadata.deepLink)
+    }
   }
 }
 
@@ -85,44 +69,10 @@ private struct ImmichWidgetContentView: View {
     let date = Date()
     ImageEntry(
       date: date,
-      image: UIImage(named: "LaunchImage"),
+      image: UIImage(named: "ImmichLogo"),
       metadata: EntryMetadata(
         subtitle: "1 year ago"
       )
     )
   }
 )
-
-#Preview(
-  as: .systemSmall,
-  widget: {
-    ImmichRandomWidget()
-  },
-  timeline: {
-    let date = Date()
-    ImageEntry(
-      date: date,
-      image: UIImage(named: "LaunchImage"),
-      metadata: EntryMetadata(
-        subtitle: "Yesterday"
-      )
-    )
-  }
-)
-
-#Preview(
-  as: .systemLarge,
-  widget: {
-    ImmichRandomWidget()
-  },
-  timeline: {
-    let date = Date()
-    ImageEntry(
-      date: date,
-      image: UIImage(named: "LaunchImage"),
-      metadata: EntryMetadata(
-        subtitle: "2000 seconds ago"
-      )
-    )
-  }
-)

server/src/schema/migrations/1784836013770-MinFacePreferenceMigration.ts

@@ -0,0 +1,25 @@
+import { Kysely, sql } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await sql`
+    INSERT INTO "user_metadata" ("userId", "key", "value")
+    SELECT "user"."id", 'preferences', jsonb_build_object('people', jsonb_build_object('minimumFaces', "config"."minFaces"))
+    FROM "user"
+    CROSS JOIN (
+      SELECT "value"->'machineLearning'->'facialRecognition'->'minFaces' AS "minFaces"
+      FROM "system_metadata"
+      WHERE "key" = 'system-config'
+        AND "value"->'machineLearning'->'facialRecognition'->'minFaces' IS NOT NULL
+    ) AS "config"
+    ON CONFLICT ("userId", "key") DO UPDATE
+    SET "value" = "user_metadata"."value" || jsonb_build_object(
+      'people',
+      COALESCE("user_metadata"."value"->'people', '{}'::jsonb) || (EXCLUDED."value"->'people')
+    )
+    WHERE "user_metadata"."value"->'people'->'minimumFaces' IS NULL
+  `.execute(db);
+}
+
+export async function down(): Promise<void> {
+  // not supported
+}