From a3dc2e85620e6b8e4ae71f5ac6f3cc5ed1ede7e6 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Fri, 9 May 2025 11:53:29 -0400 Subject: add new role conditions for local/remote followers/followees --- locales/index.d.ts | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'locales') diff --git a/locales/index.d.ts b/locales/index.d.ts index 3316a679e0..a83f5f317a 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -7729,6 +7729,38 @@ export interface Locale extends ILocale { * Follows X or more remote accounts */ "remoteFollowingMoreThanOrEq": string; + /** + * Has X or fewer local followers + */ + "localFollowersLessThanOrEq": string; + /** + * Has X or more local followers + */ + "localFollowersMoreThanOrEq": string; + /** + * Follows X or fewer local accounts + */ + "localFollowingLessThanOrEq": string; + /** + * Follows X or more local accounts + */ + "localFollowingMoreThanOrEq": string; + /** + * Has X or fewer remote followers + */ + "remoteFollowersLessThanOrEq": string; + /** + * Has X or more remote followers + */ + "remoteFollowersMoreThanOrEq": string; + /** + * Follows X or fewer remote accounts + */ + "remoteFollowingLessThanOrEq": string; + /** + * Follows X or more remote accounts + */ + "remoteFollowingMoreThanOrEq": string; }; /** * This condition may be incorrect for remote users. -- cgit v1.2.3-freya From d717df938b916ddfa0312164f243fd30672bceea Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Sat, 10 May 2025 12:15:01 -0400 Subject: cleanup admin user UI * hide inaccessible controls * hide irrelevant controls * remove duplicate components * collapse details behind sections * group all buttons * apply semantic "warning" styles to buttons * add follow stats * translate untranslated strings * group related controls * resolve some lint errors --- locales/index.d.ts | 42 +++++++- packages/frontend/src/pages/admin-user.vue | 157 ++++++++++++++++++----------- sharkey-locales/en-US.yml | 12 +++ 3 files changed, 151 insertions(+), 60 deletions(-) (limited to 'locales') diff --git a/locales/index.d.ts b/locales/index.d.ts index a83f5f317a..fd5c5fd845 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -2447,7 +2447,7 @@ export interface Locale extends ILocale { */ "disablePagesScript": string; /** - * リモートユーザー情報の更新 + * Refresh remote data */ "updateRemoteUser": string; /** @@ -13089,6 +13089,46 @@ export interface Locale extends ILocale { * Users popular on {name} */ "popularUsersLocal": ParameterizedString<"name">; + /** + * Silenced + */ + "silenced": string; + /** + * Total followers + */ + "totalFollowers": string; + /** + * Total following + */ + "totalFollowing": string; + /** + * Local followers + */ + "localFollowers": string; + /** + * Local following + */ + "localFollowing": string; + /** + * Remote followers + */ + "remoteFollowers": string; + /** + * Remote following + */ + "remoteFollowing": string; + /** + * Activity Pub + */ + "activityPub": string; + /** + * IP + */ + "ip": string; + /** + * The date is the IP address was first acknowledged. + */ + "ipTip": string; /** * Translation timeout */ diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue index efe547ff21..100fb34655 100644 --- a/packages/frontend/src/pages/admin-user.vue +++ b/packages/frontend/src/pages/admin-user.vue @@ -7,38 +7,49 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
+
+
- @{{ acct(user) }} + + @{{ acct(user) }} + + + + {{ user.id }} + + {{ i18n.ts.notApproved }} {{ i18n.ts.approved }} - Suspended - Silenced - Moderator + {{ i18n.ts.suspended }} + {{ i18n.ts.silenced }} + {{ i18n.ts.moderator }}
{{ i18n.ts.isSystemAccount }} - {{ i18n.ts.instanceInfo }} - -
- - - - - -