From 3c09ebecfdba3496e994b599e43a23d16c018285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= Date: Mon, 6 Apr 2026 09:41:05 +0000 Subject: [PATCH 1/4] nicolium: WIP pleroma admin config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nicole mikołajczyk --- .../nicolium/src/queries/admin/use-config.ts | 21 +++++++++++++++++-- packages/nicolium/src/queries/keys.ts | 5 +++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/packages/nicolium/src/queries/admin/use-config.ts b/packages/nicolium/src/queries/admin/use-config.ts index 6a8476e4c..64e67a02e 100644 --- a/packages/nicolium/src/queries/admin/use-config.ts +++ b/packages/nicolium/src/queries/admin/use-config.ts @@ -16,7 +16,19 @@ const useAdminConfig = () => { return useQuery({ queryKey: queryKeys.admin.config, queryFn: () => client.admin.config.getPleromaConfig(), - enabled: ownAccount?.is_admin && features.pleromaAdminAccounts, + enabled: ownAccount?.is_admin && features.pleromaAdminConfig, + }); +}; + +const useAdminConfigDescriptions = () => { + const client = useClient(); + const features = useFeatures(); + const { data: ownAccount } = useOwnAccount(); + + return useQuery({ + queryKey: queryKeys.admin.configDescriptions, + queryFn: () => client.admin.config.getPleromaConfigDescriptions(), + enabled: ownAccount?.is_admin && features.pleromaAdminConfig, }); }; @@ -52,4 +64,9 @@ const getUpdateFrontendConfigParams = (data: any) => { ]; }; -export { useAdminConfig, useUpdateAdminConfig, getUpdateFrontendConfigParams }; +export { + useAdminConfig, + useAdminConfigDescriptions, + useUpdateAdminConfig, + getUpdateFrontendConfigParams, +}; diff --git a/packages/nicolium/src/queries/keys.ts b/packages/nicolium/src/queries/keys.ts index 061804c4d..15b2a8c26 100644 --- a/packages/nicolium/src/queries/keys.ts +++ b/packages/nicolium/src/queries/keys.ts @@ -54,6 +54,7 @@ import type { PaginatedResponse, PlApiClient, PleromaConfig, + PleromaConfigDescription, Poll, Relationship, RssFeed, @@ -306,6 +307,10 @@ const groupRelationships = { const admin = { root: ['admin'] as const, config: ['admin', 'config'] as TaggedKey<['admin', 'config'], PleromaConfig>, + configDescriptions: ['admin', 'configDescriptions'] as TaggedKey< + ['admin', 'configDescriptions'], + Array + >, accounts: { root: ['admin', 'accounts'] as const, show: (accountId: string) => { From 83a016de04cb4fd4ef6bd4f929f1d5425b4098d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= Date: Mon, 6 Apr 2026 09:55:52 +0000 Subject: [PATCH 2/4] pl-api: fix pleroma config description schema MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nicole mikołajczyk --- .../lib/entities/admin/pleroma-config-description.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/pl-api/lib/entities/admin/pleroma-config-description.ts b/packages/pl-api/lib/entities/admin/pleroma-config-description.ts index b94ac863c..3d106dc00 100644 --- a/packages/pl-api/lib/entities/admin/pleroma-config-description.ts +++ b/packages/pl-api/lib/entities/admin/pleroma-config-description.ts @@ -6,7 +6,7 @@ import * as v from 'valibot'; const pleromaConfigDescriptionChildSchema: v.GenericSchema = v.looseObject({ key: v.optional(v.string()), - type: v.union([v.string(), v.array(v.string())]), + type: v.union([v.string(), v.array(v.union([v.string(), v.array(v.string())]))]), description: v.optional(v.string()), label: v.optional(v.string()), suggestions: v.optional(v.array(v.any())), @@ -38,12 +38,12 @@ type PleromaConfigDescription = v.InferOutput>; description?: string; label?: string; - suggestions?: unknown[]; - children?: PleromaConfigDescriptionChild[]; - group?: string | string[]; + suggestions?: Array; + children?: Array; + group?: string | Array; }; export { From 59b2301b006f0ac96d02fd7caf16574c30767350 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= Date: Mon, 6 Apr 2026 12:53:43 +0200 Subject: [PATCH 3/4] nicolium: style fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nicole mikołajczyk --- packages/nicolium/src/styles/new/layout.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/nicolium/src/styles/new/layout.scss b/packages/nicolium/src/styles/new/layout.scss index 4ebf8f2a4..63e222ee4 100644 --- a/packages/nicolium/src/styles/new/layout.scss +++ b/packages/nicolium/src/styles/new/layout.scss @@ -639,7 +639,8 @@ body { color: rgb(var(--color-gray-500)); } - .dark &:hover { + .dark &:hover, + .dark &:focus { background-color: rgb(var(--color-gray-800)); } From 57d77c609cfc324906f5a3b76c4ba638e708cd4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= Date: Mon, 6 Apr 2026 15:33:59 +0000 Subject: [PATCH 4/4] nicolium: more style fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nicole mikołajczyk --- packages/nicolium/src/components/accounts/account-header.tsx | 2 +- packages/nicolium/src/components/accounts/account.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/nicolium/src/components/accounts/account-header.tsx b/packages/nicolium/src/components/accounts/account-header.tsx index a844bd7b7..d9a3355b8 100644 --- a/packages/nicolium/src/components/accounts/account-header.tsx +++ b/packages/nicolium/src/components/accounts/account-header.tsx @@ -352,7 +352,7 @@ const AccountHeader: React.FC = ({ account }) => { /> {account.verified && ( -
+
)} diff --git a/packages/nicolium/src/components/accounts/account.tsx b/packages/nicolium/src/components/accounts/account.tsx index fb8442bf5..7b06512c5 100644 --- a/packages/nicolium/src/components/accounts/account.tsx +++ b/packages/nicolium/src/components/accounts/account.tsx @@ -345,7 +345,7 @@ const Account = ({ username={account.username} /> ) : ( - +