From 05f25c21e047713075ea4de25fbf731ae73c3060 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 11 Jun 2026 10:28:02 +0300 Subject: [PATCH] add withReblogs & fix reporting modal --- src/components/user_profile/user_profile.scss | 2 +- .../user_profile/user_profile_admin_view.js | 3 +- .../user_profile/user_profile_admin_view.vue | 17 ++++++--- .../user_reporting_modal.vue | 35 +++++-------------- src/i18n/en.json | 7 ++-- 5 files changed, 27 insertions(+), 37 deletions(-) diff --git a/src/components/user_profile/user_profile.scss b/src/components/user_profile/user_profile.scss index 35aa49ca9..4b68b46b0 100644 --- a/src/components/user_profile/user_profile.scss +++ b/src/components/user_profile/user_profile.scss @@ -26,7 +26,7 @@ } &.-admin-view { - .godmode { + .filter { padding: 1em; } diff --git a/src/components/user_profile/user_profile_admin_view.js b/src/components/user_profile/user_profile_admin_view.js index 0cb164dd9..5b27ed393 100644 --- a/src/components/user_profile/user_profile_admin_view.js +++ b/src/components/user_profile/user_profile_admin_view.js @@ -19,6 +19,7 @@ const UserProfileAdminView = { return { userId: null, godmode: false, + showReblogs: false, } }, created() { @@ -38,7 +39,7 @@ const UserProfileAdminView = { pageSize: 20, godmode: this.godmode, id: this.userId, - withReblogs: false, + withReblogs: this.showReblogs, } }, user() { diff --git a/src/components/user_profile/user_profile_admin_view.vue b/src/components/user_profile/user_profile_admin_view.vue index 47a23dd35..7e57aae5a 100644 --- a/src/components/user_profile/user_profile_admin_view.vue +++ b/src/components/user_profile/user_profile_admin_view.vue @@ -12,19 +12,28 @@ /> - {{ $t('admin_dash.users.godmode') }} + {{ $t('admin_dash.users.filters.show_direct') }} + + + {{ $t('admin_dash.users.filters.show_reblogs') }} diff --git a/src/components/user_reporting_modal/user_reporting_modal.vue b/src/components/user_reporting_modal/user_reporting_modal.vue index 0e10064b9..e99d4c053 100644 --- a/src/components/user_reporting_modal/user_reporting_modal.vue +++ b/src/components/user_reporting_modal/user_reporting_modal.vue @@ -51,19 +51,16 @@
- +
@@ -136,20 +133,6 @@ overflow-y: auto; } - &-sitem { - display: flex; - justify-content: space-between; - - /* TODO cleanup this */ - > .Status { - flex: 1; - } - - > .checkbox { - margin: 0.75em; - } - } - @media all and (width >= 801px) { .panel-body { flex-direction: row; diff --git a/src/i18n/en.json b/src/i18n/en.json index 3154d0b20..f54d6ace1 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -1295,7 +1295,6 @@ "users": { "title": "Users", "local_id": "Local ID", - "godmode": "Show direct messages", "labels": { "query": "Search", "name": "Name", @@ -1326,10 +1325,8 @@ "only_unconfirmed": "Exclude Confirmed" }, "filters": { - "show_direct": "Show Direct Posts", - "show_reblogs": "Show Reblogs", - "ascending": "Oldest First", - "descending": "Newest First" + "show_direct": "Show Direct Messages", + "show_reblogs": "Show Reblogs" }, "indicator": { "admin": "Admin",