From 2c2dff72e45c64dbbb81bb28e30dc795f6958565 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 29 May 2025 17:33:46 -0400
Subject: [PATCH 01/25] remove duplicate horizontal swipe

---
 packages/frontend/src/pages/instance-info.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index 479774faef..9b63752957 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -6,7 +6,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <PageWithHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs" :swipable="true">
 	<div v-if="instance" class="_spacer" style="--MI_SPACER-w: 600px; --MI_SPACER-min: 16px; --MI_SPACER-max: 32px;">
-		<MkSwiper v-model:tab="tab" :tabs="headerTabs">
+		<!-- This empty div is preserved to avoid merge conflicts -->
+		<div>
 			<div v-if="tab === 'overview'" class="_gaps_m">
 				<div class="fnfelxur">
 					<img :src="faviconUrl" alt="" class="icon"/>
@@ -165,7 +166,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkObjectView tall :value="instance">
 				</MkObjectView>
 			</div>
-		</MkSwiper>
+		</div>
 	</div>
 </PageWithHeader>
 </template>

From 5575c797a4132adc7adc5ab38e3c6051093d78ac Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 29 May 2025 17:36:09 -0400
Subject: [PATCH 02/25] don't render instance icon if it doesn't have one

---
 packages/frontend/src/pages/instance-info.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index 9b63752957..9caa3679ef 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -10,7 +10,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<div>
 			<div v-if="tab === 'overview'" class="_gaps_m">
 				<div class="fnfelxur">
-					<img :src="faviconUrl" alt="" class="icon"/>
+					<!-- TODO copy the alt text stuff from reports UI PR -->
+					<img v-if="faviconUrl" :src="faviconUrl" alt="" class="icon"/>
 					<span class="name">{{ instance.name || `(${i18n.ts.unknown})` }}</span>
 				</div>
 				<div style="display: flex; flex-direction: column; gap: 1em;">

From 83a2f90842821a2c4b4aae650e17d444280d6700 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 29 May 2025 17:45:11 -0400
Subject: [PATCH 03/25] use instance host as placeholder for name

---
 packages/frontend/src/pages/instance-info.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index 9caa3679ef..20dad6ffb5 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<div class="fnfelxur">
 					<!-- TODO copy the alt text stuff from reports UI PR -->
 					<img v-if="faviconUrl" :src="faviconUrl" alt="" class="icon"/>
-					<span class="name">{{ instance.name || `(${i18n.ts.unknown})` }}</span>
+					<span class="name">{{ instance.name || instance.host }}</span>
 				</div>
 				<div style="display: flex; flex-direction: column; gap: 1em;">
 					<MkKeyValue :copy="host" oneline>

From 6e58a320caf3b21419683bcc404b1f74a185ba84 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 29 May 2025 17:45:18 -0400
Subject: [PATCH 04/25] add missing translations

---
 locales/index.d.ts                            | 20 +++++++++++++++++
 packages/frontend/src/pages/instance-info.vue | 22 +++++++++----------
 sharkey-locales/en-US.yml                     |  6 +++++
 3 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 69c63cc714..2392d51c45 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -13129,6 +13129,26 @@ export interface Locale extends ILocale {
      * Timeout in milliseconds for translation API requests.
      */
     "translationTimeoutCaption": string;
+    /**
+     * Following (Pub)
+     */
+    "followingPub": string;
+    /**
+     * Followers (Sub)
+     */
+    "followersSub": string;
+    /**
+     * Well-known resources
+     */
+    "wellKnownResources": string;
+    /**
+     * Last posted: {at}
+     */
+    "lastPosted": ParameterizedString<"at">;
+    /**
+     * Raw
+     */
+    "raw": string;
 }
 declare const locales: {
     [lang: string]: Locale;
diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index 20dad6ffb5..c5e7802a0b 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -16,7 +16,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</div>
 				<div style="display: flex; flex-direction: column; gap: 1em;">
 					<MkKeyValue :copy="host" oneline>
-						<template #key>Host</template>
+						<template #key>{{ i18n.ts.name }}</template>
 						<template #value><span class="_monospace"><MkLink :url="`https://${host}`">{{ host }}</MkLink></span></template>
 					</MkKeyValue>
 					<MkKeyValue oneline>
@@ -34,7 +34,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</MkKeyValue>
 
 				<FormSection v-if="iAmModerator">
-					<template #label>Moderation</template>
+					<template #label>{{ i18n.ts.moderation }}</template>
 					<div class="_gaps_s">
 						<MkKeyValue>
 							<template #key>
@@ -83,17 +83,17 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 				<FormSection>
 					<MkKeyValue oneline style="margin: 1em 0;">
-						<template #key>Following (Pub)</template>
+						<template #key>{{ i18n.ts.followingPub }}</template>
 						<template #value>{{ number(instance.followingCount) }}</template>
 					</MkKeyValue>
 					<MkKeyValue oneline style="margin: 1em 0;">
-						<template #key>Followers (Sub)</template>
+						<template #key>{{ i18n.ts.followersSub }}</template>
 						<template #value>{{ number(instance.followersCount) }}</template>
 					</MkKeyValue>
 				</FormSection>
 
 				<FormSection>
-					<template #label>Well-known resources</template>
+					<template #label>{{ i18n.ts.wellKnownResources }}</template>
 					<FormLink :to="`https://${host}/.well-known/host-meta`" external style="margin-bottom: 8px;">host-meta</FormLink>
 					<FormLink :to="`https://${host}/.well-known/host-meta.json`" external style="margin-bottom: 8px;">host-meta.json</FormLink>
 					<FormLink :to="`https://${host}/.well-known/nodeinfo`" external style="margin-bottom: 8px;">nodeinfo</FormLink>
@@ -128,7 +128,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 			<div v-else-if="tab === 'users'" class="_gaps_m">
 				<MkPagination v-slot="{items}" :pagination="usersPagination" style="display: grid; grid-template-columns: repeat(auto-fill,minmax(270px,1fr)); grid-gap: 12px;">
-					<MkA v-for="user in items" :key="user.id" v-tooltip.mfm="`Last posted: ${dateString(user.updatedAt)}`" class="user" :to="`/admin/user/${user.id}`">
+					<MkA v-for="user in items" :key="user.id" v-tooltip.mfm="i18n.tsx.lastPosted({ at: dateString(user.updatedAt) })" class="user" :to="`/admin/user/${user.id}`">
 						<MkUserCardMini :user="user"/>
 					</MkA>
 				</MkPagination>
@@ -137,11 +137,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkPagination v-slot="{items}" :pagination="followingPagination">
 					<div class="follow-relations-list">
 						<div v-for="followRelationship in items" :key="followRelationship.id" class="follow-relation">
-							<MkA v-tooltip.mfm="`Last posted: ${dateString(followRelationship.followee.updatedAt)}`" :to="`/admin/user/${followRelationship.followee.id}`" class="user">
+							<MkA v-tooltip.mfm="i18n.tsx.lastPosted({ at: dateString(followRelationship.followee.updatedAt) })" :to="`/admin/user/${followRelationship.followee.id}`" class="user">
 								<MkUserCardMini :user="followRelationship.followee" :withChart="false"/>
 							</MkA>
 							<span class="arrow">→</span>
-							<MkA v-tooltip.mfm="`Last posted: ${dateString(followRelationship.follower.updatedAt)}`" :to="`/admin/user/${followRelationship.follower.id}`" class="user">
+							<MkA v-tooltip.mfm="i18n.tsx.lastPosted({ at: dateString(followRelationship.follower.updatedAt) })" :to="`/admin/user/${followRelationship.follower.id}`" class="user">
 								<MkUserCardMini :user="followRelationship.follower" :withChart="false"/>
 							</MkA>
 						</div>
@@ -152,11 +152,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkPagination v-slot="{items}" :pagination="followersPagination">
 					<div class="follow-relations-list">
 						<div v-for="followRelationship in items" :key="followRelationship.id" class="follow-relation">
-							<MkA v-tooltip.mfm="`Last posted: ${dateString(followRelationship.followee.updatedAt)}`" :to="`/admin/user/${followRelationship.followee.id}`" class="user">
+							<MkA v-tooltip.mfm="i18n.tsx.lastPosted({ at: dateString(followRelationship.followee.updatedAt) })" :to="`/admin/user/${followRelationship.followee.id}`" class="user">
 								<MkUserCardMini :user="followRelationship.followee" :withChart="false"/>
 							</MkA>
 							<span class="arrow">←</span>
-							<MkA v-tooltip.mfm="`Last posted: ${dateString(followRelationship.follower.updatedAt)}`" :to="`/admin/user/${followRelationship.follower.id}`" class="user">
+							<MkA v-tooltip.mfm="i18n.tsx.lastPosted({ at: dateString(followRelationship.follower.updatedAt) })" :to="`/admin/user/${followRelationship.follower.id}`" class="user">
 								<MkUserCardMini :user="followRelationship.follower" :withChart="false"/>
 							</MkA>
 						</div>
@@ -440,7 +440,7 @@ const headerTabs = computed(() => [{
 	icon: 'ti ti-users',
 }, ...getFollowingTabs(), {
 	key: 'raw',
-	title: 'Raw',
+	title: i18n.ts.raw,
 	icon: 'ti ti-code',
 }]);
 
diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml
index f1ad66fc8c..586203099f 100644
--- a/sharkey-locales/en-US.yml
+++ b/sharkey-locales/en-US.yml
@@ -589,3 +589,9 @@ roleAutomatic: "automatic"
 
 translationTimeoutLabel: "Translation timeout"
 translationTimeoutCaption: "Timeout in milliseconds for translation API requests."
+
+followingPub: "Following (Pub)"
+followersSub: "Followers (Sub)"
+wellKnownResources: "Well-known resources"
+lastPosted: "Last posted: {at}"
+raw: 'Raw'

From f2c346d085fab86f9263a0bb1c32786ce58da94a Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 29 May 2025 18:10:11 -0400
Subject: [PATCH 05/25] consolidate details into collapsible "details" section

---
 packages/frontend/src/pages/instance-info.vue | 139 ++++++++++++------
 1 file changed, 90 insertions(+), 49 deletions(-)

diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index c5e7802a0b..d76b6e355a 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -12,22 +12,72 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<div class="fnfelxur">
 					<!-- TODO copy the alt text stuff from reports UI PR -->
 					<img v-if="faviconUrl" :src="faviconUrl" alt="" class="icon"/>
-					<span class="name">{{ instance.name || instance.host }}</span>
-				</div>
-				<div style="display: flex; flex-direction: column; gap: 1em;">
-					<MkKeyValue :copy="host" oneline>
-						<template #key>{{ i18n.ts.name }}</template>
-						<template #value><span class="_monospace"><MkLink :url="`https://${host}`">{{ host }}</MkLink></span></template>
-					</MkKeyValue>
-					<MkKeyValue oneline>
-						<template #key>{{ i18n.ts.software }}</template>
-						<template #value><span class="_monospace">{{ instance.softwareName || `(${i18n.ts.unknown})` }} / {{ instance.softwareVersion || `(${i18n.ts.unknown})` }}</span></template>
-					</MkKeyValue>
-					<MkKeyValue oneline>
-						<template #key>{{ i18n.ts.administrator }}</template>
-						<template #value>{{ instance.maintainerName || `(${i18n.ts.unknown})` }} ({{ instance.maintainerEmail || `(${i18n.ts.unknown})` }})</template>
-					</MkKeyValue>
+					<div :class="$style.headerData">
+						<span class="name">{{ instance.name || instance.host }}</span>
+						<span>
+							<span class="_monospace">{{ instance.host }}</span>
+							<button v-tooltip="i18n.ts.copy" class="_textButton" style="margin-left: 0.5em;" @click="copyToClipboard(instance.host)"><i class="ti ti-copy"></i></button>
+						</span>
+						<span>
+							<span class="_monospace">{{ instance.id }}</span>
+							<button v-tooltip="i18n.ts.copy" class="_textButton" style="margin-left: 0.5em;" @click="copyToClipboard(instance.id)"><i class="ti ti-copy"></i></button>
+						</span>
+					</div>
 				</div>
+				<MkFolder>
+					<template #icon><i class="ph-list-bullets ph-bold ph-lg"></i></template>
+					<template #label>{{ i18n.ts.details }}</template>
+					<div style="display: flex; flex-direction: column; gap: 1em;">
+						<MkKeyValue :copy="instance.id" oneline>
+							<template #key>{{ i18n.ts.id }}</template>
+							<template #value><span class="_monospace">{{ instance.id }}</span></template>
+						</MkKeyValue>
+						<MkKeyValue :copy="instance.name" oneline>
+							<template #key>{{ i18n.ts.name }}</template>
+							<template #value><span class="_monospace">{{ instance.name || `(${i18n.ts.unknown})` }}</span></template>
+						</MkKeyValue>
+						<MkKeyValue :copy="host" oneline>
+							<template #key>{{ i18n.ts.host }}</template>
+							<template #value><span class="_monospace"><MkLink :url="`https://${host}`">{{ host }}</MkLink></span></template>
+						</MkKeyValue>
+						<MkKeyValue :copy="instance.firstRetrievedAt" oneline>
+							<template #key>{{ i18n.ts.createdAt }}</template>
+							<template #value><span class="_monospace"><MkTime :time="instance.firstRetrievedAt" :mode="'detail'"/></span></template>
+						</MkKeyValue>
+						<MkKeyValue :copy="instance.infoUpdatedAt" oneline>
+							<template #key>{{ i18n.ts.updatedAt }}</template>
+							<template #value><span class="_monospace"><MkTime :time="instance.infoUpdatedAt" :mode="'detail'"/></span></template>
+						</MkKeyValue>
+						<MkKeyValue :copy="instance.latestRequestReceivedAt" oneline>
+							<template #key>{{ i18n.ts.lastActiveDate }}</template>
+							<template #value><span class="_monospace"><MkTime :time="instance.latestRequestReceivedAt" :mode="'detail'"/></span></template>
+						</MkKeyValue>
+						<MkKeyValue :copy="instance.softwareName" oneline>
+							<template #key>{{ i18n.ts.software }}</template>
+							<template #value><span class="_monospace">{{ instance.softwareName || `(${i18n.ts.unknown})` }} / {{ instance.softwareVersion || `(${i18n.ts.unknown})` }}</span></template>
+						</MkKeyValue>
+						<MkKeyValue :copy="instance.maintainerName" oneline>
+							<template #key>{{ i18n.ts.administrator }}</template>
+							<template #value><span class="_monospace">{{ instance.maintainerName || `(${i18n.ts.unknown})` }}</span></template>
+						</MkKeyValue>
+						<MkKeyValue :copy="instance.maintainerEmail" oneline>
+							<template #key>{{ i18n.ts.email }}</template>
+							<template #value><span class="_monospace">{{ instance.maintainerEmail || `(${i18n.ts.unknown})` }}</span></template>
+						</MkKeyValue>
+						<MkKeyValue oneline>
+							<template #key>{{ i18n.ts.followingPub }}</template>
+							<template #value><span class="_monospace"><MkNumber :value="instance.followingCount"/></span></template>
+						</MkKeyValue>
+						<MkKeyValue oneline>
+							<template #key>{{ i18n.ts.followersSub }}</template>
+							<template #value><span class="_monospace"><MkNumber :value="instance.followersCount"/></span></template>
+						</MkKeyValue>
+						<MkKeyValue>
+							<template #key>{{ i18n.ts._delivery.status }}</template>
+							<template #value><span class="_monospace">{{ i18n.ts._delivery._type[suspensionState] }}</span></template>
+						</MkKeyValue>
+					</div>
+				</MkFolder>
 				<MkKeyValue>
 					<template #key>{{ i18n.ts.description }}</template>
 					<template #value>{{ instance.description }}</template>
@@ -36,14 +86,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<FormSection v-if="iAmModerator">
 					<template #label>{{ i18n.ts.moderation }}</template>
 					<div class="_gaps_s">
-						<MkKeyValue>
-							<template #key>
-								{{ i18n.ts._delivery.status }}
-							</template>
-							<template #value>
-								{{ i18n.ts._delivery._type[suspensionState] }}
-							</template>
-						</MkKeyValue>
 						<div class="_buttons">
 							<MkButton inline :disabled="!instance" danger @click="deleteAllFiles">{{ i18n.ts.deleteAllFiles }}</MkButton>
 							<MkButton inline :disabled="!instance" danger @click="severAllFollowRelations">{{ i18n.ts.severAllFollowRelations }}</MkButton>
@@ -66,32 +108,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</div>
 				</FormSection>
 
-				<FormSection>
-					<MkKeyValue oneline style="margin: 1em 0;">
-						<template #key>{{ i18n.ts.registeredAt }}</template>
-						<template #value><MkTime mode="detail" :time="instance.firstRetrievedAt"/></template>
-					</MkKeyValue>
-					<MkKeyValue oneline style="margin: 1em 0;">
-						<template #key>{{ i18n.ts.updatedAt }}</template>
-						<template #value><MkTime mode="detail" :time="instance.infoUpdatedAt"/></template>
-					</MkKeyValue>
-					<MkKeyValue oneline style="margin: 1em 0;">
-						<template #key>{{ i18n.ts.latestRequestReceivedAt }}</template>
-						<template #value><MkTime v-if="instance.latestRequestReceivedAt" :time="instance.latestRequestReceivedAt"/><span v-else>N/A</span></template>
-					</MkKeyValue>
-				</FormSection>
-
-				<FormSection>
-					<MkKeyValue oneline style="margin: 1em 0;">
-						<template #key>{{ i18n.ts.followingPub }}</template>
-						<template #value>{{ number(instance.followingCount) }}</template>
-					</MkKeyValue>
-					<MkKeyValue oneline style="margin: 1em 0;">
-						<template #key>{{ i18n.ts.followersSub }}</template>
-						<template #value>{{ number(instance.followersCount) }}</template>
-					</MkKeyValue>
-				</FormSection>
-
 				<FormSection>
 					<template #label>{{ i18n.ts.wellKnownResources }}</template>
 					<FormLink :to="`https://${host}/.well-known/host-meta`" external style="margin-bottom: 8px;">host-meta</FormLink>
@@ -199,6 +215,10 @@ import { dateString } from '@/filters/date.js';
 import MkTextarea from '@/components/MkTextarea.vue';
 import MkInfo from '@/components/MkInfo.vue';
 import { $i } from '@/i.js';
+import { copyToClipboard } from '@/utility/copy-to-clipboard';
+import { acct } from '@/filters/user';
+import MkFolder from '@/components/MkFolder.vue';
+import MkNumber from '@/components/MkNumber.vue';
 
 const props = defineProps<{
 	host: string;
@@ -524,3 +544,24 @@ definePage(() => ({
   }
 }
 </style>
+
+<style lang="scss" module>
+.headerData {
+	display: flex;
+	flex-direction: column;
+
+	> * {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		font-size: 85%;
+		opacity: 0.7;
+	}
+
+	> :first-child {
+		text-overflow: initial;
+		word-break: break-all;
+		font-size: 100%;
+		opacity: 1.0;
+	}
+}
+</style>

From 529014e7f248bb42b30f52037f1f3f7f4e8e4aa7 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 29 May 2025 18:12:38 -0400
Subject: [PATCH 06/25] move moderation note into collapsible section

---
 packages/frontend/src/pages/instance-info.vue | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index d76b6e355a..caccc0a080 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -78,6 +78,16 @@ SPDX-License-Identifier: AGPL-3.0-only
 						</MkKeyValue>
 					</div>
 				</MkFolder>
+
+				<MkFolder v-if="iAmModerator" :defaultOpen="moderationNote.length > 0">
+					<template #icon><i class="ph-stamp ph-bold ph-lg"></i></template>
+					<template #label>{{ i18n.ts.moderationNote }}</template>
+					<MkTextarea v-model="moderationNote" manualSave>
+						<template #label>{{ i18n.ts.moderationNote }}</template>
+						<template #caption>{{ i18n.ts.moderationNoteDescription }}</template>
+					</MkTextarea>
+				</MkFolder>
+
 				<MkKeyValue>
 					<template #key>{{ i18n.ts.description }}</template>
 					<template #value>{{ instance.description }}</template>
@@ -101,10 +111,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<MkInfo v-if="isBaseMediaSilenced" warn>{{ i18n.ts.mediaSilencedByBase }}</MkInfo>
 						<MkSwitch v-model="isMediaSilenced" :disabled="!meta || !instance || isBaseMediaSilenced" @update:modelValue="toggleMediaSilenced">{{ i18n.ts.mediaSilenceThisInstance }}</MkSwitch>
 						<MkButton @click="refreshMetadata"><i class="ti ti-refresh"></i> Refresh metadata</MkButton>
-						<MkTextarea v-model="moderationNote" manualSave>
-							<template #label>{{ i18n.ts.moderationNote }}</template>
-							<template #caption>{{ i18n.ts.moderationNoteDescription }}</template>
-						</MkTextarea>
 					</div>
 				</FormSection>
 

From afbe3a95c071db4d7aa95be7289b3de47df75ce3 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 29 May 2025 18:13:25 -0400
Subject: [PATCH 07/25] translate "Refresh metadata" and use same icon as user
 controls

---
 packages/frontend/src/pages/instance-info.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index caccc0a080..b2dba6c1f3 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -110,7 +110,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<MkSwitch v-model="rejectReports" :disabled="!instance" @update:modelValue="toggleRejectReports">{{ i18n.ts.rejectReports }}</MkSwitch>
 						<MkInfo v-if="isBaseMediaSilenced" warn>{{ i18n.ts.mediaSilencedByBase }}</MkInfo>
 						<MkSwitch v-model="isMediaSilenced" :disabled="!meta || !instance || isBaseMediaSilenced" @update:modelValue="toggleMediaSilenced">{{ i18n.ts.mediaSilenceThisInstance }}</MkSwitch>
-						<MkButton @click="refreshMetadata"><i class="ti ti-refresh"></i> Refresh metadata</MkButton>
+						<MkButton @click="refreshMetadata"><i class="ph-cloud-arrow-down ph-bold ph-lg"></i> {{ i18n.ts.updateRemoteUser }}</MkButton>
 					</div>
 				</FormSection>
 

From 23f0748e60ff9bad30b87fb07f8b42038e2c0a0b Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 29 May 2025 18:27:23 -0400
Subject: [PATCH 08/25] move instance description into a section with divider

---
 packages/frontend/src/pages/instance-info.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index b2dba6c1f3..cc15149086 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -88,10 +88,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</MkTextarea>
 				</MkFolder>
 
-				<MkKeyValue>
-					<template #key>{{ i18n.ts.description }}</template>
-					<template #value>{{ instance.description }}</template>
-				</MkKeyValue>
+				<FormSection v-if="instance.description">
+					<MkKeyValue>
+						<template #key>{{ i18n.ts.description }}</template>
+						<template #value>{{ instance.description }}</template>
+					</MkKeyValue>
+				</FormSection>
 
 				<FormSection v-if="iAmModerator">
 					<template #label>{{ i18n.ts.moderation }}</template>

From 9595997b933ada9ec2a6d4cd0b2420eb40b20db0 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 29 May 2025 21:05:33 -0400
Subject: [PATCH 09/25] move well-known resources to a collapsible section

---
 packages/frontend/src/pages/instance-info.vue | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index cc15149086..da743d776c 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -79,6 +79,19 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</div>
 				</MkFolder>
 
+				<MkFolder>
+					<template #label>{{ i18n.ts.wellKnownResources }}</template>
+					<template #icon><i class="ph-network ph-bold ph-lg"></i></template>
+					<ul :class="$style.linksList" class="_gaps_s">
+						<!-- TODO more links here -->
+						<li><MkLink :url="`https://${host}/.well-known/host-meta`" class="_monospace">/.well-known/host-meta</MkLink></li>
+						<li><MkLink :url="`https://${host}/.well-known/host-meta.json`" class="_monospace">/.well-known/host-meta.json</MkLink></li>
+						<li><MkLink :url="`https://${host}/.well-known/nodeinfo`" class="_monospace">/.well-known/nodeinfo</MkLink></li>
+						<li><MkLink :url="`https://${host}/robots.txt`" class="_monospace">/robots.txt</MkLink></li>
+						<li><MkLink :url="`https://${host}/manifest.json`" class="_monospace">/manifest.json</MkLink></li>
+					</ul>
+				</MkFolder>
+
 				<MkFolder v-if="iAmModerator" :defaultOpen="moderationNote.length > 0">
 					<template #icon><i class="ph-stamp ph-bold ph-lg"></i></template>
 					<template #label>{{ i18n.ts.moderationNote }}</template>
@@ -115,15 +128,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<MkButton @click="refreshMetadata"><i class="ph-cloud-arrow-down ph-bold ph-lg"></i> {{ i18n.ts.updateRemoteUser }}</MkButton>
 					</div>
 				</FormSection>
-
-				<FormSection>
-					<template #label>{{ i18n.ts.wellKnownResources }}</template>
-					<FormLink :to="`https://${host}/.well-known/host-meta`" external style="margin-bottom: 8px;">host-meta</FormLink>
-					<FormLink :to="`https://${host}/.well-known/host-meta.json`" external style="margin-bottom: 8px;">host-meta.json</FormLink>
-					<FormLink :to="`https://${host}/.well-known/nodeinfo`" external style="margin-bottom: 8px;">nodeinfo</FormLink>
-					<FormLink :to="`https://${host}/robots.txt`" external style="margin-bottom: 8px;">robots.txt</FormLink>
-					<FormLink :to="`https://${host}/manifest.json`" external style="margin-bottom: 8px;">manifest.json</FormLink>
-				</FormSection>
 			</div>
 			<div v-else-if="tab === 'chart'" class="_gaps_m">
 				<div class="cmhjzshl">
@@ -572,4 +576,9 @@ definePage(() => ({
 		opacity: 1.0;
 	}
 }
+
+.linksList {
+	margin: 0;
+	padding-left: 1.5em;
+}
 </style>

From b082797c69224355788fce9dc8f35c21f8f63c55 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 29 May 2025 21:08:19 -0400
Subject: [PATCH 10/25] improve styling of Description section

---
 packages/frontend/src/pages/instance-info.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index da743d776c..5a003176f0 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -102,10 +102,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</MkFolder>
 
 				<FormSection v-if="instance.description">
-					<MkKeyValue>
-						<template #key>{{ i18n.ts.description }}</template>
-						<template #value>{{ instance.description }}</template>
-					</MkKeyValue>
+					<template #label>{{ i18n.ts.description }}</template>
+					{{ instance.description }}
 				</FormSection>
 
 				<FormSection v-if="iAmModerator">

From 43495fbd0d724eb60c5ddf338596b1e634e230d8 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 29 May 2025 21:11:13 -0400
Subject: [PATCH 11/25] move all buttons to a group

---
 packages/frontend/src/pages/admin-user.vue    |  1 +
 packages/frontend/src/pages/instance-info.vue | 22 ++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue
index d3c0de3040..63352f6ca3 100644
--- a/packages/frontend/src/pages/admin-user.vue
+++ b/packages/frontend/src/pages/admin-user.vue
@@ -782,6 +782,7 @@ definePage(() => ({
 	cursor: pointer;
 }
 
+// Sync with instance-info.vue
 .buttonStrip {
 	margin: calc(var(--MI-margin) / 2 * -1);
 
diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index 5a003176f0..ce60f2f9ad 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -108,11 +108,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 				<FormSection v-if="iAmModerator">
 					<template #label>{{ i18n.ts.moderation }}</template>
-					<div class="_gaps_s">
-						<div class="_buttons">
-							<MkButton inline :disabled="!instance" danger @click="deleteAllFiles">{{ i18n.ts.deleteAllFiles }}</MkButton>
-							<MkButton inline :disabled="!instance" danger @click="severAllFollowRelations">{{ i18n.ts.severAllFollowRelations }}</MkButton>
-						</div>
+					<div class="_gaps">
 						<MkSwitch v-model="isSuspended" :disabled="!instance" @update:modelValue="toggleSuspended">{{ i18n.ts._delivery.stop }}</MkSwitch>
 						<MkInfo v-if="isBaseBlocked" warn>{{ i18n.ts.blockedByBase }}</MkInfo>
 						<MkSwitch v-model="isBlocked" :disabled="!meta || !instance || isBaseBlocked" @update:modelValue="toggleBlock">{{ i18n.ts.blockThisInstance }}</MkSwitch>
@@ -123,7 +119,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<MkSwitch v-model="rejectReports" :disabled="!instance" @update:modelValue="toggleRejectReports">{{ i18n.ts.rejectReports }}</MkSwitch>
 						<MkInfo v-if="isBaseMediaSilenced" warn>{{ i18n.ts.mediaSilencedByBase }}</MkInfo>
 						<MkSwitch v-model="isMediaSilenced" :disabled="!meta || !instance || isBaseMediaSilenced" @update:modelValue="toggleMediaSilenced">{{ i18n.ts.mediaSilenceThisInstance }}</MkSwitch>
-						<MkButton @click="refreshMetadata"><i class="ph-cloud-arrow-down ph-bold ph-lg"></i> {{ i18n.ts.updateRemoteUser }}</MkButton>
+
+						<div :class="$style.buttonStrip">
+							<MkButton inline :disabled="!instance" @click="refreshMetadata"><i class="ph-cloud-arrow-down ph-bold ph-lg"></i> {{ i18n.ts.updateRemoteUser }}</MkButton>
+							<MkButton inline :disabled="!instance" danger @click="deleteAllFiles">{{ i18n.ts.deleteAllFiles }}</MkButton>
+							<MkButton inline :disabled="!instance" danger @click="severAllFollowRelations">{{ i18n.ts.severAllFollowRelations }}</MkButton>
+						</div>
 					</div>
 				</FormSection>
 			</div>
@@ -579,4 +580,13 @@ definePage(() => ({
 	margin: 0;
 	padding-left: 1.5em;
 }
+
+// Sync with admin-user.vue
+.buttonStrip {
+	margin: calc(var(--MI-margin) / 2 * -1);
+
+	>* {
+		margin: calc(var(--MI-margin) / 2);
+	}
+}
 </style>

From d86920d2f6bee6613aba13eaa8c01f346643a2b6 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 29 May 2025 21:12:13 -0400
Subject: [PATCH 12/25] match gap size to admin-user

---
 packages/frontend/src/pages/instance-info.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index ce60f2f9ad..33548b50b8 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<div v-if="instance" class="_spacer" style="--MI_SPACER-w: 600px; --MI_SPACER-min: 16px; --MI_SPACER-max: 32px;">
 		<!-- This empty div is preserved to avoid merge conflicts -->
 		<div>
-			<div v-if="tab === 'overview'" class="_gaps_m">
+			<div v-if="tab === 'overview'" class="_gaps">
 				<div class="fnfelxur">
 					<!-- TODO copy the alt text stuff from reports UI PR -->
 					<img v-if="faviconUrl" :src="faviconUrl" alt="" class="icon"/>

From 586c9974a4b0b52068f8fa7a911240ca44de6938 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 29 May 2025 21:13:51 -0400
Subject: [PATCH 13/25] add icons to buttons

---
 packages/frontend/src/pages/instance-info.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index 33548b50b8..78947a771e 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -122,8 +122,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 						<div :class="$style.buttonStrip">
 							<MkButton inline :disabled="!instance" @click="refreshMetadata"><i class="ph-cloud-arrow-down ph-bold ph-lg"></i> {{ i18n.ts.updateRemoteUser }}</MkButton>
-							<MkButton inline :disabled="!instance" danger @click="deleteAllFiles">{{ i18n.ts.deleteAllFiles }}</MkButton>
-							<MkButton inline :disabled="!instance" danger @click="severAllFollowRelations">{{ i18n.ts.severAllFollowRelations }}</MkButton>
+							<MkButton inline :disabled="!instance" danger @click="deleteAllFiles"><i class="ph-trash ph-bold ph-lg"></i> {{ i18n.ts.deleteAllFiles }}</MkButton>
+							<MkButton inline :disabled="!instance" danger @click="severAllFollowRelations"><i class="ph-link-break ph-bold ph-lg"></i> {{ i18n.ts.severAllFollowRelations }}</MkButton>
 						</div>
 					</div>
 				</FormSection>

From db7e0d9353d92e12c56203f9fac60050ab0b6aff Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 29 May 2025 21:14:42 -0400
Subject: [PATCH 14/25] add missing oneline flag to delivery status

---
 packages/frontend/src/pages/instance-info.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index 78947a771e..5d884e4985 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -72,7 +72,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 							<template #key>{{ i18n.ts.followersSub }}</template>
 							<template #value><span class="_monospace"><MkNumber :value="instance.followersCount"/></span></template>
 						</MkKeyValue>
-						<MkKeyValue>
+						<MkKeyValue oneline>
 							<template #key>{{ i18n.ts._delivery.status }}</template>
 							<template #value><span class="_monospace">{{ i18n.ts._delivery._type[suspensionState] }}</span></template>
 						</MkKeyValue>

From 756096e498bc54e42aa8dbeef9d364afb9fd6893 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 29 May 2025 21:16:58 -0400
Subject: [PATCH 15/25] re-order moderation toggles to match admin-user

---
 packages/frontend/src/pages/instance-info.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index 5d884e4985..5d14b6bf2c 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -109,13 +109,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<FormSection v-if="iAmModerator">
 					<template #label>{{ i18n.ts.moderation }}</template>
 					<div class="_gaps">
+						<MkInfo v-if="isBaseSilenced" warn>{{ i18n.ts.silencedByBase }}</MkInfo>
+						<MkSwitch v-model="isSilenced" :disabled="!meta || !instance || isBaseSilenced" @update:modelValue="toggleSilenced">{{ i18n.ts.silenceThisInstance }}</MkSwitch>
 						<MkSwitch v-model="isSuspended" :disabled="!instance" @update:modelValue="toggleSuspended">{{ i18n.ts._delivery.stop }}</MkSwitch>
 						<MkInfo v-if="isBaseBlocked" warn>{{ i18n.ts.blockedByBase }}</MkInfo>
 						<MkSwitch v-model="isBlocked" :disabled="!meta || !instance || isBaseBlocked" @update:modelValue="toggleBlock">{{ i18n.ts.blockThisInstance }}</MkSwitch>
-						<MkInfo v-if="isBaseSilenced" warn>{{ i18n.ts.silencedByBase }}</MkInfo>
-						<MkSwitch v-model="isSilenced" :disabled="!meta || !instance || isBaseSilenced" @update:modelValue="toggleSilenced">{{ i18n.ts.silenceThisInstance }}</MkSwitch>
-						<MkSwitch v-model="isNSFW" :disabled="!instance" @update:modelValue="toggleNSFW">{{ i18n.ts.markInstanceAsNSFW }}</MkSwitch>
 						<MkSwitch v-model="rejectQuotes" :disabled="!instance" @update:modelValue="toggleRejectQuotes">{{ i18n.ts.rejectQuotesInstance }}</MkSwitch>
+						<MkSwitch v-model="isNSFW" :disabled="!instance" @update:modelValue="toggleNSFW">{{ i18n.ts.markInstanceAsNSFW }}</MkSwitch>
 						<MkSwitch v-model="rejectReports" :disabled="!instance" @update:modelValue="toggleRejectReports">{{ i18n.ts.rejectReports }}</MkSwitch>
 						<MkInfo v-if="isBaseMediaSilenced" warn>{{ i18n.ts.mediaSilencedByBase }}</MkInfo>
 						<MkSwitch v-model="isMediaSilenced" :disabled="!meta || !instance || isBaseMediaSilenced" @update:modelValue="toggleMediaSilenced">{{ i18n.ts.mediaSilenceThisInstance }}</MkSwitch>

From f303cb1171ad1914c3ec4d16a648322006da55d2 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 29 May 2025 22:19:51 -0400
Subject: [PATCH 16/25] implement SkBadgeStrip

---
 .../frontend/src/components/SkBadgeStrip.vue  | 84 +++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 packages/frontend/src/components/SkBadgeStrip.vue

diff --git a/packages/frontend/src/components/SkBadgeStrip.vue b/packages/frontend/src/components/SkBadgeStrip.vue
new file mode 100644
index 0000000000..6611d35b07
--- /dev/null
+++ b/packages/frontend/src/components/SkBadgeStrip.vue
@@ -0,0 +1,84 @@
+<!--
+SPDX-FileCopyrightText: hazelnoot and other Sharkey contributors
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<div :class="$style.badges">
+	<div
+		v-for="badge of badges"
+		:key="badge.key"
+		:class="[$style.badge, semanticClass(badge)]"
+	>
+		{{ badge.label }}
+	</div>
+</div>
+</template>
+
+<script lang="ts">
+export interface Badge {
+	/**
+	 * ID/key of this badge, must be unique within the strip.
+	 */
+	key: string;
+
+	/**
+	 * Label text to display.
+	 * Should already be translated.
+	 */
+	label: string;
+
+	/**
+	 * Semantic style of the badge.
+	 * Defaults to "neutral" if unset.
+	 */
+	style?: 'success' | 'neutral' | 'warning' | 'error';
+}
+</script>
+
+<script setup lang="ts">
+import { useCssModule } from 'vue';
+
+const $style = useCssModule();
+
+defineProps<{
+	badges: Badge[],
+}>();
+
+function semanticClass(badge: Badge): string {
+	const style = badge.style ?? 'neutral';
+	return $style[`semantic_${style}`];
+}
+</script>
+
+<style module lang="scss">
+.badges {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	gap: var(--MI-margin);
+}
+
+.badge {
+	display: inline-block;
+	border: solid 1px;
+	border-radius: var(--MI-radius-sm);
+	padding: 2px 6px;
+	font-size: 85%;
+}
+
+.semantic_error {
+	color: var(--MI_THEME-error);
+	border-color: var(--MI_THEME-error);
+}
+
+.semantic_warning {
+	color: var(--MI_THEME-warn);
+	border-color: var(--MI_THEME-warn);
+}
+
+.semantic_success {
+	color: var(--MI_THEME-success);
+	border-color: var(--MI_THEME-success);
+}
+</style>

From 979c7628b1d2b21bd9dd9d13ec0110bde883f074 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 29 May 2025 22:20:21 -0400
Subject: [PATCH 17/25] disable status badge strip in admin-user and
 instance-info

---
 locales/index.d.ts                            |  28 +++++
 packages/backend/src/core/UtilityService.ts   |   9 ++
 .../core/entities/InstanceEntityService.ts    |   1 +
 .../models/json-schema/federation-instance.ts |   4 +
 .../server/api/endpoints/admin/show-user.ts   |   6 +
 packages/frontend/src/pages/admin-user.vue    | 103 ++++++++++++++++--
 packages/frontend/src/pages/instance-info.vue |  58 +++++++++-
 packages/misskey-js/src/autogen/types.ts      |   2 +
 sharkey-locales/en-US.yml                     |   9 +-
 9 files changed, 211 insertions(+), 9 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 2392d51c45..2f3bc664ff 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -13145,10 +13145,38 @@ export interface Locale extends ILocale {
      * Last posted: {at}
      */
     "lastPosted": ParameterizedString<"at">;
+    /**
+     * NSFW
+     */
+    "nsfw": string;
     /**
      * Raw
      */
     "raw": string;
+    /**
+     * CW
+     */
+    "cw": string;
+    /**
+     * Media Silenced
+     */
+    "mediaSilenced": string;
+    /**
+     * Bubble
+     */
+    "bubble": string;
+    /**
+     * Verified
+     */
+    "verified": string;
+    /**
+     * Not Verified
+     */
+    "notVerified": string;
+    /**
+     * Hibernated
+     */
+    "hibernated": string;
 }
 declare const locales: {
     [lang: string]: Locale;
diff --git a/packages/backend/src/core/UtilityService.ts b/packages/backend/src/core/UtilityService.ts
index 170afc72dc..ee17906d55 100644
--- a/packages/backend/src/core/UtilityService.ts
+++ b/packages/backend/src/core/UtilityService.ts
@@ -67,6 +67,15 @@ export class UtilityService {
 		return silencedHosts.some(x => `.${host.toLowerCase()}`.endsWith(`.${x}`));
 	}
 
+	@bindThis
+	public isBubbledHost(host: string | null): boolean {
+		if (host == null) return false;
+
+		// TODO remove null conditional after merging lab/persisted-instance-blocks
+		// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+		return this.meta.bubbleInstances?.includes(host);
+	}
+
 	@bindThis
 	public concatNoteContentsForKeyWordCheck(content: {
 		cw?: string | null;
diff --git a/packages/backend/src/core/entities/InstanceEntityService.ts b/packages/backend/src/core/entities/InstanceEntityService.ts
index fcc9bed3bd..08a7765d40 100644
--- a/packages/backend/src/core/entities/InstanceEntityService.ts
+++ b/packages/backend/src/core/entities/InstanceEntityService.ts
@@ -62,6 +62,7 @@ export class InstanceEntityService {
 			rejectReports: instance.rejectReports,
 			rejectQuotes: instance.rejectQuotes,
 			moderationNote: iAmModerator ? instance.moderationNote : null,
+			isBubbled: this.utilityService.isBubbledHost(instance.host),
 		};
 	}
 
diff --git a/packages/backend/src/models/json-schema/federation-instance.ts b/packages/backend/src/models/json-schema/federation-instance.ts
index 57d4466ffa..fd6eddf594 100644
--- a/packages/backend/src/models/json-schema/federation-instance.ts
+++ b/packages/backend/src/models/json-schema/federation-instance.ts
@@ -135,5 +135,9 @@ export const packedFederationInstanceSchema = {
 			type: 'string',
 			optional: true, nullable: true,
 		},
+		isBubbled: {
+			type: 'boolean',
+			optional: false, nullable: false,
+		},
 	},
 } as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/show-user.ts b/packages/backend/src/server/api/endpoints/admin/show-user.ts
index 1579719246..6a77fc177f 100644
--- a/packages/backend/src/server/api/endpoints/admin/show-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/show-user.ts
@@ -122,6 +122,10 @@ export const meta = {
 				type: 'boolean',
 				optional: false, nullable: false,
 			},
+			isAdministrator: {
+				type: 'boolean',
+				optional: false, nullable: false,
+			},
 			isSystem: {
 				type: 'boolean',
 				optional: false, nullable: false,
@@ -257,6 +261,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 			}
 
 			const isModerator = await this.roleService.isModerator(user);
+			const isAdministrator = await this.roleService.isAdministrator(user);
 			const isSilenced = user.isSilenced || !(await this.roleService.getUserPolicies(user.id)).canPublicNote;
 
 			const _me = await this.usersRepository.findOneByOrFail({ id: me.id });
@@ -289,6 +294,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				mutedInstances: profile.mutedInstances,
 				notificationRecieveConfig: profile.notificationRecieveConfig,
 				isModerator: isModerator,
+				isAdministrator: isAdministrator,
 				isSystem: isSystemAccount(user),
 				isSilenced: isSilenced,
 				isSuspended: user.isSuspended,
diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue
index 63352f6ca3..f7db436bc8 100644
--- a/packages/frontend/src/pages/admin-user.vue
+++ b/packages/frontend/src/pages/admin-user.vue
@@ -20,16 +20,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 							<span class="_monospace">{{ user.id }}</span>
 							<button v-tooltip="i18n.ts.copy" class="_textButton" style="margin-left: 0.5em;" @click="copyToClipboard(user.id)"><i class="ti ti-copy"></i></button>
 						</span>
-						<span class="state">
-							<span v-if="!approved" class="silenced">{{ i18n.ts.notApproved }}</span>
-							<span v-if="approved && !user.host" class="moderator">{{ i18n.ts.approved }}</span>
-							<span v-if="suspended" class="suspended">{{ i18n.ts.suspended }}</span>
-							<span v-if="silenced" class="silenced">{{ i18n.ts.silenced }}</span>
-							<span v-if="moderator" class="moderator">{{ i18n.ts.moderator }}</span>
-						</span>
 					</div>
 				</div>
 
+				<SkBadgeStrip v-if="badges.length > 0" :badges="badges"></SkBadgeStrip>
+
 				<MkInfo v-if="isSystem">{{ i18n.ts.isSystemAccount }}</MkInfo>
 
 				<MkFolder v-if="!isSystem">
@@ -248,6 +243,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 import { computed, defineAsyncComponent, watch, ref } from 'vue';
 import * as Misskey from 'misskey-js';
 import { url } from '@@/js/config.js';
+import type { Badge } from '@/components/SkBadgeStrip.vue';
 import MkChart from '@/components/MkChart.vue';
 import MkObjectView from '@/components/MkObjectView.vue';
 import MkTextarea from '@/components/MkTextarea.vue';
@@ -272,6 +268,7 @@ import MkPagination from '@/components/MkPagination.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkNumber from '@/components/MkNumber.vue';
 import { copyToClipboard } from '@/utility/copy-to-clipboard';
+import SkBadgeStrip from '@/components/SkBadgeStrip.vue';
 
 const props = withDefaults(defineProps<{
 	userId: string;
@@ -304,6 +301,98 @@ const filesPagination = {
 	})),
 };
 
+const badges = computed(() => {
+	const arr: Badge[] = [];
+	if (info.value && user.value) {
+		if (info.value.isSuspended) {
+			arr.push({
+				key: 'suspended',
+				label: i18n.ts.suspended,
+				style: 'error',
+			});
+		}
+
+		if (info.value.isSilenced) {
+			arr.push({
+				key: 'silenced',
+				label: i18n.ts.silenced,
+				style: 'warning',
+			});
+		}
+
+		if (info.value.alwaysMarkNsfw) {
+			arr.push({
+				key: 'nsfw',
+				label: i18n.ts.nsfw,
+				style: 'warning',
+			});
+		}
+
+		if (user.value.mandatoryCW) {
+			arr.push({
+				key: 'cw',
+				label: i18n.ts.cw,
+				style: 'warning',
+			});
+		}
+
+		if (info.value.isHibernated) {
+			arr.push({
+				key: 'hibernated',
+				label: i18n.ts.hibernated,
+				style: 'neutral',
+			});
+		}
+
+		if (info.value.isAdministrator) {
+			arr.push({
+				key: 'admin',
+				label: i18n.ts.administrator,
+				style: 'success',
+			});
+		} else if (info.value.isModerator) {
+			arr.push({
+				key: 'mod',
+				label: i18n.ts.moderator,
+				style: 'success',
+			});
+		}
+
+		if (user.value.host == null) {
+			if (info.value.email) {
+				if (info.value.emailVerified) {
+					arr.push({
+						key: 'verified',
+						label: i18n.ts.verified,
+						style: 'success',
+					});
+				} else {
+					arr.push({
+						key: 'not_verified',
+						label: i18n.ts.notVerified,
+						style: 'success',
+					});
+				}
+			}
+
+			if (info.value.approved) {
+				arr.push({
+					key: 'approved',
+					label: i18n.ts.approved,
+					style: 'success',
+				});
+			} else {
+				arr.push({
+					key: 'not_approved',
+					label: i18n.ts.notApproved,
+					style: 'warning',
+				});
+			}
+		}
+	}
+	return arr;
+});
+
 const announcementsStatus = ref<'active' | 'archived'>('active');
 
 const announcementsPagination = {
diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index 5d14b6bf2c..356bb4273b 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -24,6 +24,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 						</span>
 					</div>
 				</div>
+
+				<SkBadgeStrip v-if="badges.length > 0" :badges="badges"></SkBadgeStrip>
+
 				<MkFolder>
 					<template #icon><i class="ph-list-bullets ph-bold ph-lg"></i></template>
 					<template #label>{{ i18n.ts.details }}</template>
@@ -200,10 +203,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { ref, computed, watch } from 'vue';
+import { ref, computed, watch, useCssModule } from 'vue';
 import * as Misskey from 'misskey-js';
 import type { ChartSrc } from '@/components/MkChart.vue';
 import type { Paging } from '@/components/MkPagination.vue';
+import type { Badge } from '@/components/SkBadgeStrip.vue';
 import MkChart from '@/components/MkChart.vue';
 import MkObjectView from '@/components/MkObjectView.vue';
 import FormLink from '@/components/form/link.vue';
@@ -230,6 +234,9 @@ import { copyToClipboard } from '@/utility/copy-to-clipboard';
 import { acct } from '@/filters/user';
 import MkFolder from '@/components/MkFolder.vue';
 import MkNumber from '@/components/MkNumber.vue';
+import SkBadgeStrip from '@/components/SkBadgeStrip.vue';
+
+const $style = useCssModule();
 
 const props = defineProps<{
 	host: string;
@@ -266,6 +273,55 @@ const isBaseBlocked = computed(() => meta.value && baseDomains.value.some(d => m
 const isBaseSilenced = computed(() => meta.value && baseDomains.value.some(d => meta.value?.silencedHosts.includes(d)));
 const isBaseMediaSilenced = computed(() => meta.value && baseDomains.value.some(d => meta.value?.mediaSilencedHosts.includes(d)));
 
+const badges = computed(() => {
+	const arr: Badge[] = [];
+	if (instance.value) {
+		if (instance.value.isBlocked) {
+			arr.push({
+				key: 'blocked',
+				label: i18n.ts.blocked,
+				style: 'error',
+			});
+		}
+		if (instance.value.isSuspended) {
+			arr.push({
+				key: 'suspended',
+				label: i18n.ts.suspended,
+				style: 'error',
+			});
+		}
+		if (instance.value.isSilenced) {
+			arr.push({
+				key: 'silenced',
+				label: i18n.ts.silenced,
+				style: 'warning',
+			});
+		}
+		if (instance.value.isMediaSilenced) {
+			arr.push({
+				key: 'media_silenced',
+				label: i18n.ts.mediaSilenced,
+				style: 'warning',
+			});
+		}
+		if (instance.value.isNSFW) {
+			arr.push({
+				key: 'nsfw',
+				label: i18n.ts.nsfw,
+				style: 'warning',
+			});
+		}
+		if (instance.value.isBubbled) {
+			arr.push({
+				key: 'bubbled',
+				label: i18n.ts.bubble,
+				style: 'success',
+			});
+		}
+	}
+	return arr;
+});
+
 const usersPagination = {
 	endpoint: iAmModerator ? 'admin/show-users' : 'users',
 	limit: 10,
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 55302960dc..13fc56ca53 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -5294,6 +5294,7 @@ export type components = {
       rejectReports: boolean;
       rejectQuotes: boolean;
       moderationNote?: string | null;
+      isBubbled: boolean;
     };
     GalleryPost: {
       /**
@@ -11209,6 +11210,7 @@ export type operations = {
               }]>;
             };
             isModerator: boolean;
+            isAdministrator: boolean;
             isSystem: boolean;
             isSilenced: boolean;
             isSuspended: boolean;
diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml
index 586203099f..e219872b71 100644
--- a/sharkey-locales/en-US.yml
+++ b/sharkey-locales/en-US.yml
@@ -594,4 +594,11 @@ followingPub: "Following (Pub)"
 followersSub: "Followers (Sub)"
 wellKnownResources: "Well-known resources"
 lastPosted: "Last posted: {at}"
-raw: 'Raw'
+nsfw: "NSFW"
+raw: "Raw"
+cw: "CW"
+mediaSilenced: "Media Silenced"
+bubble: "Bubble"
+verified: "Verified"
+notVerified: "Not Verified"
+hibernated: "Hibernated"

From fadf39d8e77253c0e841b046286315eb95fb10e5 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 29 May 2025 22:21:59 -0400
Subject: [PATCH 18/25] re-order instance-info tabs to match admin-user

---
 packages/frontend/src/pages/instance-info.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index 356bb4273b..563e92bfac 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -517,15 +517,15 @@ const headerTabs = computed(() => [{
 	key: 'overview',
 	title: i18n.ts.overview,
 	icon: 'ti ti-info-circle',
-}, {
-	key: 'chart',
-	title: i18n.ts.charts,
-	icon: 'ti ti-chart-line',
 }, {
 	key: 'users',
 	title: i18n.ts.users,
 	icon: 'ti ti-users',
 }, ...getFollowingTabs(), {
+	key: 'chart',
+	title: i18n.ts.charts,
+	icon: 'ti ti-chart-line',
+}, {
 	key: 'raw',
 	title: i18n.ts.raw,
 	icon: 'ti ti-code',

From 5b8764d6df911e52c9a4c3aafbc99fb389d197b8 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 29 May 2025 22:41:59 -0400
Subject: [PATCH 19/25] allow os.promiseDialog to accept a callback

---
 packages/frontend/src/os.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index 5a12e3ae6d..24eb81beca 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -101,7 +101,7 @@ export const apiWithDialog = (<
 });
 
 export function promiseDialog<T extends Promise<any>>(
-	promise: T,
+	promise: T | (() => T),
 	onSuccess?: ((res: Awaited<T>) => void) | null,
 	onFailure?: ((err: Misskey.api.APIError) => void) | null,
 	text?: string,
@@ -109,6 +109,10 @@ export function promiseDialog<T extends Promise<any>>(
 	const showing = ref(true);
 	const success = ref(false);
 
+	if (typeof(promise) === 'function') {
+		promise = promise();
+	}
+
 	promise.then(res => {
 		if (onSuccess) {
 			showing.value = false;

From 30f0e5002cb711d6497acf66d663fa94c22b2a7d Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 29 May 2025 22:42:40 -0400
Subject: [PATCH 20/25] refresh instance info after applying moderation rules,
 and make sure that API calls show a dialog while running

---
 packages/frontend/src/pages/instance-info.vue | 149 ++++++++++--------
 1 file changed, 87 insertions(+), 62 deletions(-)

diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index 563e92bfac..228ad6da33 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -356,17 +356,20 @@ const followersPagination = {
 if (iAmModerator) {
 	watch(moderationNote, async () => {
 		if (instance.value == null) return;
-		await misskeyApi('admin/federation/update-instance', { host: instance.value.host, moderationNote: moderationNote.value });
+		await os.apiWithDialog('admin/federation/update-instance', { host: instance.value.host, moderationNote: moderationNote.value });
 	});
 }
 
 async function fetch(): Promise<void> {
-	if (iAmAdmin) {
-		meta.value = await misskeyApi('admin/meta');
-	}
-	instance.value = await misskeyApi('federation/show-instance', {
-		host: props.host,
-	});
+	const [m, i] = await Promise.all([
+		iAmAdmin ? misskeyApi('admin/meta') : null,
+		misskeyApi('federation/show-instance', {
+			host: props.host,
+		}),
+	]);
+	meta.value = m;
+	instance.value = i;
+
 	suspensionState.value = instance.value?.suspensionState ?? 'none';
 	isSuspended.value = suspensionState.value !== 'none';
 	isBlocked.value = instance.value?.isBlocked ?? false;
@@ -381,80 +384,106 @@ async function fetch(): Promise<void> {
 
 async function toggleBlock(): Promise<void> {
 	if (!iAmAdmin) return;
-	if (!meta.value) throw new Error('No meta?');
-	if (!instance.value) throw new Error('No instance?');
-	const { host } = instance.value;
-	await misskeyApi('admin/update-meta', {
-		blockedHosts: isBlocked.value ? meta.value.blockedHosts.concat([host]) : meta.value.blockedHosts.filter(x => x !== host),
+	await os.promiseDialog(async () => {
+		if (!meta.value) throw new Error('No meta?');
+		if (!instance.value) throw new Error('No instance?');
+		const { host } = instance.value;
+		await os.apiWithDialog('admin/update-meta', {
+			blockedHosts: isBlocked.value ? meta.value.blockedHosts.concat([host]) : meta.value.blockedHosts.filter(x => x !== host),
+		});
+		await fetch();
 	});
 }
 
 async function toggleSilenced(): Promise<void> {
 	if (!iAmAdmin) return;
-	if (!meta.value) throw new Error('No meta?');
-	if (!instance.value) throw new Error('No instance?');
-	const { host } = instance.value;
-	const silencedHosts = meta.value.silencedHosts ?? [];
-	await misskeyApi('admin/update-meta', {
-		silencedHosts: isSilenced.value ? silencedHosts.concat([host]) : silencedHosts.filter(x => x !== host),
+	await os.promiseDialog(async () => {
+		if (!meta.value) throw new Error('No meta?');
+		if (!instance.value) throw new Error('No instance?');
+		const { host } = instance.value;
+		const silencedHosts = meta.value.silencedHosts ?? [];
+		await os.promiseDialog(async () => {
+			await misskeyApi('admin/update-meta', {
+				silencedHosts: isSilenced.value ? silencedHosts.concat([host]) : silencedHosts.filter(x => x !== host),
+			});
+			await fetch();
+		});
 	});
 }
 
 async function toggleMediaSilenced(): Promise<void> {
 	if (!iAmAdmin) return;
-	if (!meta.value) throw new Error('No meta?');
-	if (!instance.value) throw new Error('No instance?');
-	const { host } = instance.value;
-	const mediaSilencedHosts = meta.value.mediaSilencedHosts ?? [];
-	await misskeyApi('admin/update-meta', {
-		mediaSilencedHosts: isMediaSilenced.value ? mediaSilencedHosts.concat([host]) : mediaSilencedHosts.filter(x => x !== host),
+	await os.promiseDialog(async () => {
+		if (!meta.value) throw new Error('No meta?');
+		if (!instance.value) throw new Error('No instance?');
+		const { host } = instance.value;
+		const mediaSilencedHosts = meta.value.mediaSilencedHosts ?? [];
+		await misskeyApi('admin/update-meta', {
+			mediaSilencedHosts: isMediaSilenced.value ? mediaSilencedHosts.concat([host]) : mediaSilencedHosts.filter(x => x !== host),
+		});
+		await fetch();
 	});
 }
 
 async function toggleSuspended(): Promise<void> {
 	if (!iAmModerator) return;
-	if (!instance.value) throw new Error('No instance?');
-	suspensionState.value = isSuspended.value ? 'manuallySuspended' : 'none';
-	await misskeyApi('admin/federation/update-instance', {
-		host: instance.value.host,
-		isSuspended: isSuspended.value,
+	await os.promiseDialog(async () => {
+		if (!instance.value) throw new Error('No instance?');
+		suspensionState.value = isSuspended.value ? 'manuallySuspended' : 'none';
+		await misskeyApi('admin/federation/update-instance', {
+			host: instance.value.host,
+			isSuspended: isSuspended.value,
+		});
+		await fetch();
 	});
 }
 
 async function toggleNSFW(): Promise<void> {
 	if (!iAmModerator) return;
-	if (!instance.value) throw new Error('No instance?');
-	await misskeyApi('admin/federation/update-instance', {
-		host: instance.value.host,
-		isNSFW: isNSFW.value,
+	await os.promiseDialog(async () => {
+		if (!instance.value) throw new Error('No instance?');
+		await misskeyApi('admin/federation/update-instance', {
+			host: instance.value.host,
+			isNSFW: isNSFW.value,
+		});
+		await fetch();
 	});
 }
 
 async function toggleRejectReports(): Promise<void> {
 	if (!iAmModerator) return;
-	if (!instance.value) throw new Error('No instance?');
-	await misskeyApi('admin/federation/update-instance', {
-		host: instance.value.host,
-		rejectReports: rejectReports.value,
+	await os.promiseDialog(async () => {
+		if (!instance.value) throw new Error('No instance?');
+		await misskeyApi('admin/federation/update-instance', {
+			host: instance.value.host,
+			rejectReports: rejectReports.value,
+		});
+		await fetch();
 	});
 }
 
 async function toggleRejectQuotes(): Promise<void> {
 	if (!iAmModerator) return;
-	if (!instance.value) throw new Error('No instance?');
-	await misskeyApi('admin/federation/update-instance', {
-		host: instance.value.host,
-		rejectQuotes: rejectQuotes.value,
+	await os.promiseDialog(async () => {
+		if (!instance.value) throw new Error('No instance?');
+		await misskeyApi('admin/federation/update-instance', {
+			host: instance.value.host,
+			rejectQuotes: rejectQuotes.value,
+		});
+		await fetch();
 	});
 }
 
-function refreshMetadata(): void {
+async function refreshMetadata(): Promise<void> {
 	if (!iAmModerator) return;
-	if (!instance.value) throw new Error('No instance?');
-	misskeyApi('admin/federation/refresh-remote-instance-metadata', {
-		host: instance.value.host,
+	await os.promiseDialog(async () => {
+		if (!instance.value) throw new Error('No instance?');
+		await misskeyApi('admin/federation/refresh-remote-instance-metadata', {
+			host: instance.value.host,
+		});
+		await fetch();
 	});
-	os.alert({
+	await os.alert({
 		text: 'Refresh requested',
 	});
 }
@@ -469,14 +498,12 @@ async function deleteAllFiles(): Promise<void> {
 	});
 	if (confirm.canceled) return;
 
-	await Promise.all([
-		misskeyApi('admin/federation/delete-all-files', {
-			host: instance.value.host,
-		}),
-		os.alert({
-			text: i18n.ts.deleteAllFilesQueued,
-		}),
-	]);
+	await os.apiWithDialog('admin/federation/delete-all-files', {
+		host: instance.value.host,
+	});
+	await os.alert({
+		text: i18n.ts.deleteAllFilesQueued,
+	});
 }
 
 async function severAllFollowRelations(): Promise<void> {
@@ -493,14 +520,12 @@ async function severAllFollowRelations(): Promise<void> {
 	});
 	if (confirm.canceled) return;
 
-	await Promise.all([
-		misskeyApi('admin/federation/remove-all-following', {
-			host: instance.value.host,
-		}),
-		os.alert({
-			text: i18n.tsx.severAllFollowRelationsQueued({ host: instance.value.host }),
-		}),
-	]);
+	await os.apiWithDialog('admin/federation/remove-all-following', {
+		host: instance.value.host,
+	});
+	await os.alert({
+		text: i18n.tsx.severAllFollowRelationsQueued({ host: instance.value.host }),
+	});
 }
 
 fetch();

From b3022e853e447c9534f1ad316e0df717d548c3c7 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 29 May 2025 23:04:17 -0400
Subject: [PATCH 21/25] fix refresh / dialog promises in admin-user.vue

---
 packages/frontend/src/pages/admin-user.vue | 117 ++++++++++-----------
 1 file changed, 54 insertions(+), 63 deletions(-)

diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue
index f7db436bc8..7f8ff6a2c9 100644
--- a/packages/frontend/src/pages/admin-user.vue
+++ b/packages/frontend/src/pages/admin-user.vue
@@ -412,10 +412,13 @@ function createFetcher() {
 		userId: props.userId,
 	}), iAmAdmin ? misskeyApi('admin/get-user-ips', {
 		userId: props.userId,
-	}) : Promise.resolve(null)]).then(([_user, _info, _ips]) => {
+	}) : Promise.resolve(null), iAmAdmin ? misskeyApi('ap/get', {
+		uri: `${url}/users/${props.userId}`,
+	}).catch(() => null) : null]).then(([_user, _info, _ips, _ap]) => {
 		user.value = _user;
 		info.value = _info;
 		ips.value = _ips;
+		ap.value = _ap;
 		moderator.value = info.value.isModerator;
 		silenced.value = info.value.isSilenced;
 		approved.value = info.value.approved;
@@ -427,23 +430,30 @@ function createFetcher() {
 	});
 }
 
-function refreshUser() {
-	init.value = createFetcher();
+async function refreshUser() {
+	// Not a typo - createFetcher() returns a function()
+	await createFetcher()();
 }
 
 async function onMandatoryCWChanged(value: string) {
-	await os.apiWithDialog('admin/cw-user', { userId: props.userId, cw: value });
-	refreshUser();
+	await os.promiseDialog(async () => {
+		await misskeyApi('admin/cw-user', { userId: props.userId, cw: value });
+		await refreshUser();
+	});
 }
 
 async function onModerationNoteChanged(value: string) {
-	await misskeyApi('admin/update-user-note', { userId: props.userId, text: value });
-	refreshUser();
+	await os.promiseDialog(async () => {
+		await misskeyApi('admin/update-user-note', { userId: props.userId, text: value });
+		refreshUser();
+	});
 }
 
 async function updateRemoteUser() {
-	await os.apiWithDialog('federation/update-remote-user', { userId: user.value.id });
-	refreshUser();
+	await os.promiseDialog(async () => {
+		await misskeyApi('federation/update-remote-user', { userId: props.userId });
+		refreshUser();
+	});
 }
 
 async function resetPassword() {
@@ -457,7 +467,7 @@ async function resetPassword() {
 		const { password } = await misskeyApi('admin/reset-password', {
 			userId: user.value.id,
 		});
-		os.alert({
+		await os.alert({
 			type: 'success',
 			text: i18n.tsx.newPasswordIs({ password }),
 		});
@@ -472,7 +482,7 @@ async function toggleNSFW(v) {
 	if (confirm.canceled) {
 		markedAsNSFW.value = !v;
 	} else {
-		await misskeyApi(v ? 'admin/nsfw-user' : 'admin/unnsfw-user', { userId: user.value.id });
+		await misskeyApi(v ? 'admin/nsfw-user' : 'admin/unnsfw-user', { userId: props.userId });
 		await refreshUser();
 	}
 }
@@ -485,8 +495,10 @@ async function toggleSilence(v) {
 	if (confirm.canceled) {
 		silenced.value = !v;
 	} else {
-		await misskeyApi(v ? 'admin/silence-user' : 'admin/unsilence-user', { userId: user.value.id });
-		await refreshUser();
+		await os.promiseDialog(async () => {
+			await misskeyApi(v ? 'admin/silence-user' : 'admin/unsilence-user', { userId: props.userId });
+			await refreshUser();
+		});
 	}
 }
 
@@ -498,8 +510,10 @@ async function toggleSuspend(v) {
 	if (confirm.canceled) {
 		suspended.value = !v;
 	} else {
-		await misskeyApi(v ? 'admin/suspend-user' : 'admin/unsuspend-user', { userId: user.value.id });
-		await refreshUser();
+		await os.promiseDialog(async () => {
+			await misskeyApi(v ? 'admin/suspend-user' : 'admin/unsuspend-user', { userId: props.userId });
+			await refreshUser();
+		});
 	}
 }
 
@@ -511,11 +525,13 @@ async function toggleRejectQuotes(v: boolean): Promise<void> {
 	if (confirm.canceled) {
 		rejectQuotes.value = !v;
 	} else {
-		await misskeyApi('admin/reject-quotes', {
-			userId: props.userId,
-			rejectQuotes: v,
+		await os.promiseDialog(async () => {
+			await misskeyApi('admin/reject-quotes', {
+				userId: props.userId,
+				rejectQuotes: v,
+			});
+			await refreshUser();
 		});
-		await refreshUser();
 	}
 }
 
@@ -525,17 +541,10 @@ async function unsetUserAvatar() {
 		text: i18n.ts.unsetUserAvatarConfirm,
 	});
 	if (confirm.canceled) return;
-	const process = async () => {
-		await misskeyApi('admin/unset-user-avatar', { userId: user.value.id });
-		os.success();
-	};
-	await process().catch(err => {
-		os.alert({
-			type: 'error',
-			text: err.toString(),
-		});
+	await os.promiseDialog(async () => {
+		await misskeyApi('admin/unset-user-avatar', { userId: props.userId });
+		await refreshUser();
 	});
-	refreshUser();
 }
 
 async function unsetUserBanner() {
@@ -544,17 +553,10 @@ async function unsetUserBanner() {
 		text: i18n.ts.unsetUserBannerConfirm,
 	});
 	if (confirm.canceled) return;
-	const process = async () => {
-		await misskeyApi('admin/unset-user-banner', { userId: user.value.id });
-		os.success();
-	};
-	await process().catch(err => {
-		os.alert({
-			type: 'error',
-			text: err.toString(),
-		});
+	await os.promiseDialog(async () => {
+		await misskeyApi('admin/unset-user-banner', { userId: props.userId });
+		await refreshUser();
 	});
-	refreshUser();
 }
 
 async function deleteAllFiles() {
@@ -563,17 +565,10 @@ async function deleteAllFiles() {
 		text: i18n.ts.deleteAllFilesConfirm,
 	});
 	if (confirm.canceled) return;
-	const process = async () => {
-		await misskeyApi('admin/delete-all-files-of-a-user', { userId: user.value.id });
-		os.success();
-	};
-	await process().catch(err => {
-		os.alert({
-			type: 'error',
-			text: err.toString(),
-		});
+	await os.promiseDialog(async () => {
+		await misskeyApi('admin/delete-all-files-of-a-user', { userId: props.userId });
+		await refreshUser();
 	});
-	await refreshUser();
 }
 
 async function deleteAccount() {
@@ -593,7 +588,7 @@ async function deleteAccount() {
 			userId: user.value.id,
 		});
 	} else {
-		os.alert({
+		await os.alert({
 			type: 'error',
 			text: 'input not match',
 		});
@@ -633,18 +628,22 @@ async function assignRole() {
 		: period === 'oneMonth' ? Date.now() + (1000 * 60 * 60 * 24 * 30)
 		: null;
 
-	await os.apiWithDialog('admin/roles/assign', { roleId, userId: user.value.id, expiresAt });
-	refreshUser();
+	await os.promiseDialog(async () => {
+		await misskeyApi('admin/roles/assign', { roleId, userId: props.userId, expiresAt });
+		await refreshUser();
+	});
 }
 
 async function unassignRole(role, ev) {
-	os.popupMenu([{
+	await os.popupMenu([{
 		text: i18n.ts.unassign,
 		icon: 'ti ti-x',
 		danger: true,
 		action: async () => {
-			await os.apiWithDialog('admin/roles/unassign', { roleId: role.id, userId: user.value.id });
-			refreshUser();
+			await os.promiseDialog(async () => {
+				await misskeyApi('admin/roles/unassign', { roleId: role.id, userId: props.userId});
+				await refreshUser();
+			});
 		},
 	}], ev.currentTarget ?? ev.target);
 }
@@ -680,14 +679,6 @@ watch(() => props.userId, () => {
 	immediate: true,
 });
 
-watch(user, () => {
-	misskeyApi('ap/get', {
-		uri: user.value.uri ?? `${url}/users/${user.value.id}`,
-	}).then(res => {
-		ap.value = res;
-	});
-});
-
 const headerActions = computed(() => []);
 
 const headerTabs = computed(() => isSystem.value ? [{

From 5924e27859c93b0fc6de5258c633cafdf348b740 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 29 May 2025 23:13:15 -0400
Subject: [PATCH 22/25] all MkFolder to not have a sticky header

---
 packages/frontend/src/components/MkFolder.vue        |  6 ++++--
 .../src/components/global/MkStickyContainer.vue      | 12 +++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/frontend/src/components/MkFolder.vue b/packages/frontend/src/components/MkFolder.vue
index 2e5d0a3dea..4537bc9d82 100644
--- a/packages/frontend/src/components/MkFolder.vue
+++ b/packages/frontend/src/components/MkFolder.vue
@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div ref="rootEl" :class="$style.root" role="group" :aria-expanded="opened">
-	<MkStickyContainer>
+	<MkStickyContainer :sticky="sticky">
 		<template #header>
 			<button :class="[$style.header, { [$style.opened]: opened }]" class="_button" role="button" data-cy-folder-header @click="toggle">
 				<div :class="$style.headerIcon"><slot name="icon"></slot></div>
@@ -34,7 +34,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			>
 				<KeepAlive>
 					<div v-show="opened">
-						<MkStickyContainer>
+						<MkStickyContainer :sticky="sticky">
 							<template #header>
 								<div v-if="$slots.header" :class="$style.inBodyHeader">
 									<slot name="header"></slot>
@@ -73,12 +73,14 @@ const props = withDefaults(defineProps<{
 	withSpacer?: boolean;
 	spacerMin?: number;
 	spacerMax?: number;
+	sticky?: boolean;
 }>(), {
 	defaultOpen: false,
 	maxHeight: null,
 	withSpacer: true,
 	spacerMin: 14,
 	spacerMax: 22,
+	sticky: true,
 });
 
 const rootEl = useTemplateRef('rootEl');
diff --git a/packages/frontend/src/components/global/MkStickyContainer.vue b/packages/frontend/src/components/global/MkStickyContainer.vue
index 05245716c2..73ce393113 100644
--- a/packages/frontend/src/components/global/MkStickyContainer.vue
+++ b/packages/frontend/src/components/global/MkStickyContainer.vue
@@ -5,17 +5,17 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div ref="rootEl">
-	<div ref="headerEl" :class="$style.header">
+	<div ref="headerEl" :class="{ [$style.header]: sticky }">
 		<slot name="header"></slot>
 	</div>
 	<div
-		:class="$style.body"
+		:class="{ [$style.body]: sticky }"
 		:data-sticky-container-header-height="headerHeight"
 		:data-sticky-container-footer-height="footerHeight"
 	>
 		<slot></slot>
 	</div>
-	<div ref="footerEl" :class="$style.footer">
+	<div ref="footerEl" :class="{ [$style.footer]: sticky }">
 		<slot name="footer"></slot>
 	</div>
 </div>
@@ -25,6 +25,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 import { onMounted, onUnmounted, provide, inject, ref, watch, useTemplateRef } from 'vue';
 import { DI } from '@/di.js';
 
+withDefaults(defineProps<{
+	sticky?: boolean,
+}>(), {
+	sticky: true,
+});
+
 const rootEl = useTemplateRef('rootEl');
 const headerEl = useTemplateRef('headerEl');
 const footerEl = useTemplateRef('footerEl');

From f799835ec733ba04e93c208d225d5afb3db0c1ea Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 29 May 2025 23:13:33 -0400
Subject: [PATCH 23/25] fix Z-fighting in report UI caused by sticky header

---
 packages/frontend/src/pages/admin-user.vue    | 8 ++++----
 packages/frontend/src/pages/instance-info.vue | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue
index 7f8ff6a2c9..711612004d 100644
--- a/packages/frontend/src/pages/admin-user.vue
+++ b/packages/frontend/src/pages/admin-user.vue
@@ -27,7 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 				<MkInfo v-if="isSystem">{{ i18n.ts.isSystemAccount }}</MkInfo>
 
-				<MkFolder v-if="!isSystem">
+				<MkFolder v-if="!isSystem" :sticky="false">
 					<template #icon><i class="ph-list-bullets ph-bold ph-lg"></i></template>
 					<template #label>{{ i18n.ts.details }}</template>
 					<div style="display: flex; flex-direction: column; gap: 1em;">
@@ -84,7 +84,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</div>
 				</MkFolder>
 
-				<MkFolder v-if="info">
+				<MkFolder v-if="info" :sticky="false">
 					<template #icon><i class="ph-scroll ph-bold ph-lg"></i></template>
 					<template #label>{{ i18n.ts._role.policies }}</template>
 					<div class="_gaps">
@@ -94,7 +94,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</div>
 				</MkFolder>
 
-				<MkFolder v-if="iAmAdmin && ips && ips.length > 0">
+				<MkFolder v-if="iAmAdmin && ips && ips.length > 0" :sticky="false">
 					<template #icon><i class="ph-network ph-bold ph-lg"></i></template>
 					<template #label>{{ i18n.ts.ip }}</template>
 					<MkInfo>{{ i18n.ts.ipTip }}</MkInfo>
@@ -104,7 +104,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</div>
 				</MkFolder>
 
-				<MkFolder v-if="iAmModerator" :defaultOpen="moderationNote.length > 0">
+				<MkFolder v-if="iAmModerator" :defaultOpen="moderationNote.length > 0" :sticky="false">
 					<template #icon><i class="ph-stamp ph-bold ph-lg"></i></template>
 					<template #label>{{ i18n.ts.moderationNote }}</template>
 					<MkTextarea v-model="moderationNote" manualSave @update:modelValue="onModerationNoteChanged">
diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index 228ad6da33..6757683a0f 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -27,7 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 				<SkBadgeStrip v-if="badges.length > 0" :badges="badges"></SkBadgeStrip>
 
-				<MkFolder>
+				<MkFolder :sticky="false">
 					<template #icon><i class="ph-list-bullets ph-bold ph-lg"></i></template>
 					<template #label>{{ i18n.ts.details }}</template>
 					<div style="display: flex; flex-direction: column; gap: 1em;">
@@ -82,7 +82,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</div>
 				</MkFolder>
 
-				<MkFolder>
+				<MkFolder :sticky="false">
 					<template #label>{{ i18n.ts.wellKnownResources }}</template>
 					<template #icon><i class="ph-network ph-bold ph-lg"></i></template>
 					<ul :class="$style.linksList" class="_gaps_s">
@@ -95,7 +95,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					</ul>
 				</MkFolder>
 
-				<MkFolder v-if="iAmModerator" :defaultOpen="moderationNote.length > 0">
+				<MkFolder v-if="iAmModerator" :defaultOpen="moderationNote.length > 0" :sticky="false">
 					<template #icon><i class="ph-stamp ph-bold ph-lg"></i></template>
 					<template #label>{{ i18n.ts.moderationNote }}</template>
 					<MkTextarea v-model="moderationNote" manualSave>

From 92bbcd32551597215b56d9d45cf506e0327037ac Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Thu, 29 May 2025 23:55:40 -0400
Subject: [PATCH 24/25] fix saving moderation note

---
 packages/frontend/src/pages/instance-info.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index 6757683a0f..b60bdf3a72 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -98,7 +98,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<MkFolder v-if="iAmModerator" :defaultOpen="moderationNote.length > 0" :sticky="false">
 					<template #icon><i class="ph-stamp ph-bold ph-lg"></i></template>
 					<template #label>{{ i18n.ts.moderationNote }}</template>
-					<MkTextarea v-model="moderationNote" manualSave>
+					<MkTextarea v-model="moderationNote" manualSave @update:modelValue="saveModerationNote">
 						<template #label>{{ i18n.ts.moderationNote }}</template>
 						<template #caption>{{ i18n.ts.moderationNoteDescription }}</template>
 					</MkTextarea>
@@ -353,11 +353,14 @@ const followersPagination = {
 	offsetMode: false,
 };
 
-if (iAmModerator) {
-	watch(moderationNote, async () => {
-		if (instance.value == null) return;
-		await os.apiWithDialog('admin/federation/update-instance', { host: instance.value.host, moderationNote: moderationNote.value });
-	});
+async function saveModerationNote() {
+	if (iAmModerator) {
+		await os.promiseDialog(async () => {
+			if (instance.value == null) return;
+			await os.apiWithDialog('admin/federation/update-instance', { host: instance.value.host, moderationNote: moderationNote.value });
+			await fetch();
+		});
+	}
 }
 
 async function fetch(): Promise<void> {

From 561d44cd2347417e124bdb6f6221e6326a90935b Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Sun, 1 Jun 2025 13:45:02 -0400
Subject: [PATCH 25/25] fix lint error in admin-user.vue

---
 packages/frontend/src/pages/admin-user.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue
index 711612004d..0596b165fd 100644
--- a/packages/frontend/src/pages/admin-user.vue
+++ b/packages/frontend/src/pages/admin-user.vue
@@ -641,7 +641,7 @@ async function unassignRole(role, ev) {
 		danger: true,
 		action: async () => {
 			await os.promiseDialog(async () => {
-				await misskeyApi('admin/roles/unassign', { roleId: role.id, userId: props.userId});
+				await misskeyApi('admin/roles/unassign', { roleId: role.id, userId: props.userId });
 				await refreshUser();
 			});
 		},