diff --git a/src/App.tsx b/src/App.tsx index 8a4cdac8..86e4a898 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -73,8 +73,8 @@ const hardcodedConfig: AppConfig = { feedIncludeProfileThemes: true, showThemeDefinitions: true, feedIncludeThemeDefinitions: true, - showActiveThemes: true, - feedIncludeActiveThemes: true, + showProfileThemeUpdates: true, + feedIncludeProfileThemeUpdates: true, showCustomProfileThemes: true, }, sidebarOrder: [], diff --git a/src/components/ContentSettings.tsx b/src/components/ContentSettings.tsx index 08233d4d..d16b3d78 100644 --- a/src/components/ContentSettings.tsx +++ b/src/components/ContentSettings.tsx @@ -949,7 +949,7 @@ function ThemePreferencesSection() { const { user } = useCurrentUser(); const showOnProfiles = feedSettings.showCustomProfileThemes !== false; - const showInFeed = feedSettings.feedIncludeThemeDefinitions !== false || feedSettings.feedIncludeActiveThemes !== false; + const showInFeed = feedSettings.feedIncludeThemeDefinitions !== false || feedSettings.feedIncludeProfileThemeUpdates !== false; const handleProfileThemeToggle = async (value: boolean) => { updateFeedSettings({ showCustomProfileThemes: value }); @@ -963,7 +963,7 @@ function ThemePreferencesSection() { const patch = { feedIncludeProfileThemes: value, feedIncludeThemeDefinitions: value, - feedIncludeActiveThemes: value, + feedIncludeProfileThemeUpdates: value, }; updateFeedSettings(patch); if (user) { diff --git a/src/components/InitialSyncGate.tsx b/src/components/InitialSyncGate.tsx index 4a61ffa5..80e2085f 100644 --- a/src/components/InitialSyncGate.tsx +++ b/src/components/InitialSyncGate.tsx @@ -409,8 +409,8 @@ function SetupQuestionnaire({ onComplete, onPreload, isSignup = false }: { feedIncludeProfileThemes: true, showThemeDefinitions: true, feedIncludeThemeDefinitions: true, - showActiveThemes: true, - feedIncludeActiveThemes: true, + showProfileThemeUpdates: true, + feedIncludeProfileThemeUpdates: true, showCustomProfileThemes: true, }; diff --git a/src/components/ThemeContent.tsx b/src/components/ThemeContent.tsx index 0170e2eb..476b7819 100644 --- a/src/components/ThemeContent.tsx +++ b/src/components/ThemeContent.tsx @@ -47,7 +47,7 @@ export function ThemeContent({ event }: ThemeContentProps) { const title = event.tags.find(([n]) => n === 'title')?.[1]; return { colors: active.colors, - title: title ?? 'Active Theme', + title: title ?? 'Profile Theme', description: undefined as string | undefined, identifier: undefined as string | undefined, sourceRef: active.sourceRef, diff --git a/src/contexts/AppContext.ts b/src/contexts/AppContext.ts index 3a217843..c852afa1 100644 --- a/src/contexts/AppContext.ts +++ b/src/contexts/AppContext.ts @@ -76,16 +76,16 @@ export interface FeedSettings { feedIncludeWebxdc: boolean; /** Show Themes link in sidebar */ showProfileThemes: boolean; - /** Include Profile Theme updates in the follows/global feed (legacy key, maps to feedIncludeThemeDefinitions + feedIncludeActiveThemes) */ + /** Include Profile Theme updates in the follows/global feed (legacy key, maps to feedIncludeThemeDefinitions + feedIncludeProfileThemeUpdates) */ feedIncludeProfileThemes: boolean; /** Show theme definitions (kind 36767) on Themes page */ showThemeDefinitions: boolean; /** Include theme definitions in the follows/global feed */ feedIncludeThemeDefinitions: boolean; - /** Show active theme updates (kind 16767) on Themes page */ - showActiveThemes: boolean; - /** Include active theme updates in the follows/global feed */ - feedIncludeActiveThemes: boolean; + /** Show profile theme updates (kind 16767) on Themes page */ + showProfileThemeUpdates: boolean; + /** Include profile theme updates in the follows/global feed */ + feedIncludeProfileThemeUpdates: boolean; /** Show custom profile themes when visiting other users' profiles */ showCustomProfileThemes: boolean; } diff --git a/src/lib/extraKinds.ts b/src/lib/extraKinds.ts index 5d54d878..3c54a11a 100644 --- a/src/lib/extraKinds.ts +++ b/src/lib/extraKinds.ts @@ -174,10 +174,10 @@ export const EXTRA_KINDS: ExtraKindDef[] = [ }, { kind: 16767, - showKey: 'showActiveThemes', - feedKey: 'feedIncludeActiveThemes', - label: 'Theme Updates', - description: 'Active profile theme updates', + showKey: 'showProfileThemeUpdates', + feedKey: 'feedIncludeProfileThemeUpdates', + label: 'Profile Themes', + description: 'Profile theme updates', addressable: false, }, ], diff --git a/src/lib/schemas.ts b/src/lib/schemas.ts index 3350f3d1..b8cef534 100644 --- a/src/lib/schemas.ts +++ b/src/lib/schemas.ts @@ -155,8 +155,8 @@ export const FeedSettingsSchema = z.looseObject({ feedIncludeProfileThemes: z.boolean().optional(), showThemeDefinitions: z.boolean().optional(), feedIncludeThemeDefinitions: z.boolean().optional(), - showActiveThemes: z.boolean().optional(), - feedIncludeActiveThemes: z.boolean().optional(), + showProfileThemeUpdates: z.boolean().optional(), + feedIncludeProfileThemeUpdates: z.boolean().optional(), showCustomProfileThemes: z.boolean().optional(), }); diff --git a/src/test/TestApp.tsx b/src/test/TestApp.tsx index fae71ffc..88b81919 100644 --- a/src/test/TestApp.tsx +++ b/src/test/TestApp.tsx @@ -59,8 +59,8 @@ export function TestApp({ children }: TestAppProps) { feedIncludeProfileThemes: true, showThemeDefinitions: true, feedIncludeThemeDefinitions: true, - showActiveThemes: true, - feedIncludeActiveThemes: true, + showProfileThemeUpdates: true, + feedIncludeProfileThemeUpdates: true, showCustomProfileThemes: true, }, sidebarOrder: [],