From 82b9b005c7a2204bff0596ae0f166f44a6da629d Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 10 Jun 2026 17:57:25 +0300 Subject: [PATCH 1/4] update changelog --- changelog.d/user-management.add | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.d/user-management.add b/changelog.d/user-management.add index 28dfc2220..ccd217f19 100644 --- a/changelog.d/user-management.add +++ b/changelog.d/user-management.add @@ -1 +1 @@ -user management (view and modify user info, view and modify user statuses) +User administration + post scope/sensitivity admin change support From 03c0c1664af4212d6cf78f120936e3506f89d088 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 10 Jun 2026 18:09:20 +0300 Subject: [PATCH 2/4] list styles --- src/App.scss | 43 ++---------------------------------- src/components/list/list.css | 16 ++++++++++++++ 2 files changed, 18 insertions(+), 41 deletions(-) diff --git a/src/App.scss b/src/App.scss index 952af5b47..3e1e7e2f2 100644 --- a/src/App.scss +++ b/src/App.scss @@ -418,45 +418,6 @@ nav { } } -.list-item { - border-color: var(--border); - border-style: solid; - border-width: 0; - border-top-width: 1px; - - &.-active, - &:hover { - border-top-width: 1px; - border-bottom-width: 1px; - } - - &.-active + &, - &:hover + & { - border-top-width: 0; - } - - &:hover + .menu-item-collapsible:not(.-expanded) + &, - &.-active + .menu-item-collapsible:not(.-expanded) + & { - border-top-width: 0; - } - - &[aria-expanded="true"] { - border-bottom-width: 1px; - } - - &:first-child { - border-top-right-radius: var(--roundness); - border-top-left-radius: var(--roundness); - border-top-width: 0; - } - - &:last-child { - border-bottom-right-radius: var(--roundness); - border-bottom-left-radius: var(--roundness); - border-bottom-width: 0; - } -} - .menu-item, .list-item { display: block; @@ -480,8 +441,8 @@ nav { cursor: auto; } - a, - button:not(.button-default) { + > a, + > button:not(.button-default) { text-align: initial; padding: 0; background: none; diff --git a/src/components/list/list.css b/src/components/list/list.css index 84b737ed2..c478e9bc4 100644 --- a/src/components/list/list.css +++ b/src/components/list/list.css @@ -14,6 +14,22 @@ display: flex; align-items: center; + &[aria-expanded="true"] { + border-bottom-width: 1px; + } + + &:first-child { + border-top-right-radius: var(--roundness); + border-top-left-radius: var(--roundness); + border-top-width: 0; + } + + &:last-child { + border-bottom-right-radius: var(--roundness); + border-bottom-left-radius: var(--roundness); + border-bottom-width: 0; + } + &:not(:last-child) { border-bottom: 1px dotted var(--border); } From f932006c0e68dfd195023c62af1437ddebce68b8 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 10 Jun 2026 18:09:49 +0300 Subject: [PATCH 3/4] fix user settings --- src/components/settings_modal/tabs/notifications_tab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/settings_modal/tabs/notifications_tab.js b/src/components/settings_modal/tabs/notifications_tab.js index c863a7b9f..5114012a8 100644 --- a/src/components/settings_modal/tabs/notifications_tab.js +++ b/src/components/settings_modal/tabs/notifications_tab.js @@ -21,7 +21,7 @@ const NotificationsTab = { if (!this.user) { return false } - return this.user.privileges.includes('reports_manage_reports') + return this.user.privileges.has('reports_manage_reports') }, ...SharedComputedObject(), }, From 5a7e6b8f6e9b648d4b9a4d09f1e2a87d598ce6c3 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 10 Jun 2026 18:18:53 +0300 Subject: [PATCH 4/4] fix pagination for user admin view --- src/services/api/api.service.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index 85fc84ff9..5ab1fa18e 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -188,11 +188,12 @@ const PLEROMA_ADMIN_RESEND_CONFIRMATION_EMAIL_URL = '/api/v1/pleroma/admin/users/resend_confirmation_email' const PLEROMA_ADMIN_LIST_STATUSES_URL = ({ id, + page, pageSize, godmode, withReblogs, }) => - `/api/v1/pleroma/admin/users/${id}/statuses?page_size=${pageSize}&godmode=${godmode}&with_reblogs=${withReblogs}` + `/api/v1/pleroma/admin/users/${id}/statuses?page_size=${pageSize}&page=${page}&godmode=${godmode}&with_reblogs=${withReblogs}` const PLEROMA_ADMIN_CHANGE_STATUS_SCOPE_URL = (id) => `/api/v1/pleroma/admin/statuses/${id}` const PLEROMA_ADMIN_REQUIRE_PASSWORD_CHANGE_URL =