From d717df938b916ddfa0312164f243fd30672bceea Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
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
---
 sharkey-locales/en-US.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'sharkey-locales/en-US.yml')

diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml
index bf746533af..165f477f21 100644
--- a/sharkey-locales/en-US.yml
+++ b/sharkey-locales/en-US.yml
@@ -569,5 +569,17 @@ bubbleTimelineMustBeEnabled: "Note: the bubble timeline is hidden by default, an
 popularUsersGlobal: "Users popular on the global network"
 popularUsersLocal: "Users popular on {name}"
 
+silenced: "Silenced"
+totalFollowers: "Total followers"
+totalFollowing: "Total following"
+localFollowers: "Local followers"
+localFollowing: "Local following"
+remoteFollowers: "Remote followers"
+remoteFollowing: "Remote following"
+updateRemoteUser: "Refresh remote data"
+activityPub: "Activity Pub"
+ip: "IP"
+ipTip: "The date is the IP address was first acknowledged."
+
 translationTimeoutLabel: "Translation timeout"
 translationTimeoutCaption: "Timeout in milliseconds for translation API requests."
-- 
cgit v1.2.3-freya


From 1fcca626ca642d0855ea286719a909a6fb48348e Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sat, 10 May 2025 12:30:55 -0400
Subject: fix error when expanding conditional role

---
 locales/index.d.ts                         | 12 ++++++++++++
 packages/frontend/src/pages/admin-user.vue | 11 ++++++++---
 sharkey-locales/en-US.yml                  |  3 +++
 3 files changed, 23 insertions(+), 3 deletions(-)

(limited to 'sharkey-locales/en-US.yml')

diff --git a/locales/index.d.ts b/locales/index.d.ts
index fd5c5fd845..29ed11c3bc 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -13129,6 +13129,18 @@ export interface Locale extends ILocale {
      * The date is the IP address was first acknowledged.
      */
     "ipTip": string;
+    /**
+     * Period
+     */
+    "rolePeriod": string;
+    /**
+     * Assigned
+     */
+    "roleAssigned": string;
+    /**
+     * automatic
+     */
+    "roleAutomatic": string;
     /**
      * Translation timeout
      */
diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue
index bab40a90bd..859e24d9f3 100644
--- a/packages/frontend/src/pages/admin-user.vue
+++ b/packages/frontend/src/pages/admin-user.vue
@@ -170,9 +170,14 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<button v-else class="_button" :class="$style.roleUnassign" disabled><i class="ti ti-ban"></i></button>
 					</div>
 					<div v-if="expandedRoles.includes(role.id)" :class="$style.roleItemSub">
-						<div>Assigned: <MkTime :time="info.roleAssigns.find(a => a.roleId === role.id).createdAt" mode="detail"/></div>
-						<div v-if="info.roleAssigns.find(a => a.roleId === role.id).expiresAt">Period: {{ new Date(info.roleAssigns.find(a => a.roleId === role.id).expiresAt).toLocaleString() }}</div>
-						<div v-else>Period: {{ i18n.ts.indefinitely }}</div>
+						<template v-if="info.roleAssigns.some(a => a.roleId === role.id)">
+							<div>{{ i18n.ts.roleAssigned }}: <MkTime :time="info.roleAssigns.find(a => a.roleId === role.id).createdAt" mode="detail"/></div>
+							<div v-if="info.roleAssigns.find(a => a.roleId === role.id).expiresAt">{{ i18n.ts.rolePeriod }}: {{ new Date(info.roleAssigns.find(a => a.roleId === role.id).expiresAt).toLocaleString() }}</div>
+							<div v-else>{{ i18n.ts.rolePeriod }}: {{ i18n.ts.indefinitely }}</div>
+						</template>
+						<template v-else>
+							<div>{{ i18n.ts.roleAssigned }}: {{ i18n.ts.roleAutomatic }}</div>
+						</template>
 					</div>
 				</div>
 			</div>
diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml
index 165f477f21..41cc7c48e8 100644
--- a/sharkey-locales/en-US.yml
+++ b/sharkey-locales/en-US.yml
@@ -580,6 +580,9 @@ updateRemoteUser: "Refresh remote data"
 activityPub: "Activity Pub"
 ip: "IP"
 ipTip: "The date is the IP address was first acknowledged."
+rolePeriod: "Period"
+roleAssigned: "Assigned"
+roleAutomatic: "automatic"
 
 translationTimeoutLabel: "Translation timeout"
 translationTimeoutCaption: "Timeout in milliseconds for translation API requests."
-- 
cgit v1.2.3-freya


From ce8bcf57077b69752d5cf700985a2c3b73426d88 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Mon, 12 May 2025 14:21:21 -0400
Subject: clarify IP tip message

---
 locales/index.d.ts        | 2 +-
 sharkey-locales/en-US.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'sharkey-locales/en-US.yml')

diff --git a/locales/index.d.ts b/locales/index.d.ts
index f599c0df05..6557208b2f 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -13094,7 +13094,7 @@ export interface Locale extends ILocale {
      */
     "ip": string;
     /**
-     * The date is the IP address was first acknowledged.
+     * The date is when IP address was first used.
      */
     "ipTip": string;
     /**
diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml
index 41cc7c48e8..0fff81f240 100644
--- a/sharkey-locales/en-US.yml
+++ b/sharkey-locales/en-US.yml
@@ -579,7 +579,7 @@ remoteFollowing: "Remote following"
 updateRemoteUser: "Refresh remote data"
 activityPub: "Activity Pub"
 ip: "IP"
-ipTip: "The date is the IP address was first acknowledged."
+ipTip: "The date is when IP address was first used."
 rolePeriod: "Period"
 roleAssigned: "Assigned"
 roleAutomatic: "automatic"
-- 
cgit v1.2.3-freya