2 files changed, 31 insertions, 23 deletions
diff --git a/src/state/models/ui/preferences.ts b/src/state/models/ui/preferences.ts
index a892d8d34..23668a3dc 100644
--- a/src/state/models/ui/preferences.ts
+++ b/src/state/models/ui/preferences.ts
@@ -418,34 +418,35 @@ export class PreferencesModel {
     return {
       userDid: this.rootStore.session.currentSession?.did || '',
       adultContentEnabled: this.adultContentEnabled,
-      labelerSettings: [
+      labels: {
+        // TEMP translate old settings until this UI can be migrated -prf
+        porn: tempfixLabelPref(this.contentLabels.nsfw),
+        sexual: tempfixLabelPref(this.contentLabels.suggestive),
+        nudity: tempfixLabelPref(this.contentLabels.nudity),
+        nsfl: tempfixLabelPref(this.contentLabels.gore),
+        corpse: tempfixLabelPref(this.contentLabels.gore),
+        gore: tempfixLabelPref(this.contentLabels.gore),
+        torture: tempfixLabelPref(this.contentLabels.gore),
+        'self-harm': tempfixLabelPref(this.contentLabels.gore),
+        'intolerant-race': tempfixLabelPref(this.contentLabels.hate),
+        'intolerant-gender': tempfixLabelPref(this.contentLabels.hate),
+        'intolerant-sexual-orientation': tempfixLabelPref(
+          this.contentLabels.hate,
+        ),
+        'intolerant-religion': tempfixLabelPref(this.contentLabels.hate),
+        intolerant: tempfixLabelPref(this.contentLabels.hate),
+        'icon-intolerant': tempfixLabelPref(this.contentLabels.hate),
+        spam: tempfixLabelPref(this.contentLabels.spam),
+        impersonation: tempfixLabelPref(this.contentLabels.impersonation),
+        scam: 'warn',
+      },
+      labelers: [
         {
           labeler: {
             did: '',
             displayName: 'Bluesky Social',
           },
-          settings: {
-            // TEMP translate old settings until this UI can be migrated -prf
-            porn: tempfixLabelPref(this.contentLabels.nsfw),
-            sexual: tempfixLabelPref(this.contentLabels.suggestive),
-            nudity: tempfixLabelPref(this.contentLabels.nudity),
-            nsfl: tempfixLabelPref(this.contentLabels.gore),
-            corpse: tempfixLabelPref(this.contentLabels.gore),
-            gore: tempfixLabelPref(this.contentLabels.gore),
-            torture: tempfixLabelPref(this.contentLabels.gore),
-            'self-harm': tempfixLabelPref(this.contentLabels.gore),
-            'intolerant-race': tempfixLabelPref(this.contentLabels.hate),
-            'intolerant-gender': tempfixLabelPref(this.contentLabels.hate),
-            'intolerant-sexual-orientation': tempfixLabelPref(
-              this.contentLabels.hate,
-            ),
-            'intolerant-religion': tempfixLabelPref(this.contentLabels.hate),
-            intolerant: tempfixLabelPref(this.contentLabels.hate),
-            'icon-intolerant': tempfixLabelPref(this.contentLabels.hate),
-            spam: tempfixLabelPref(this.contentLabels.spam),
-            impersonation: tempfixLabelPref(this.contentLabels.impersonation),
-            scam: 'warn',
-          },
+          labels: {},
         },
       ],
     }
diff --git a/src/state/models/ui/shell.ts b/src/state/models/ui/shell.ts
index 476277592..348fa4899 100644
--- a/src/state/models/ui/shell.ts
+++ b/src/state/models/ui/shell.ts
@@ -100,6 +100,12 @@ export interface RepostModal {
   isReposted: boolean
 }
 
+export interface SelfLabelModal {
+  name: 'self-label'
+  labels: string[]
+  onChange: (labels: string[]) => void
+}
+
 export interface ChangeHandleModal {
   name: 'change-handle'
   onChanged: () => void
@@ -164,6 +170,7 @@ export type Modal =
   | EditImageModal
   | ServerInputModal
   | RepostModal
+  | SelfLabelModal
 
   // Bluesky access
   | WaitlistModal