Merge branch 'develop' into feature/2024.9.0

# Conflicts:
#	packages/frontend/src/pages/instance-info.vue

locales/en-US.yml

@@ -258,6 +258,7 @@ defaultValueIs: "Default: {value}"
 noCustomEmojis: "There are no emoji"
 noJobs: "There are no jobs"
 federating: "Federating"
+blockingYou: "Blocking you"
 blocked: "Blocked"
 suspended: "Suspended"
 all: "All"
@@ -1294,7 +1295,7 @@ _delivery:
     none: "Publishing"
     manuallySuspended: "Manually suspended"
     goneSuspended: "Server is suspended due to server deletion"
-    autoSuspendedForNotResponding: "Server is suspended due to no responding"
+    autoSuspendedForNotResponding: "Server is suspended due to not responding"
 _bubbleGame:
   howToPlay: "How to play"
   hold: "Hold"

locales/index.d.ts

@@ -1050,6 +1050,10 @@ export interface Locale extends ILocale {
      * 連合中
      */
     "federating": string;
+    /**
+     * Blocking you
+     */
+    "blockingYou": string;
     /**
      * ブロック中
      */

locales/ja-JP.yml

@@ -258,6 +258,7 @@ defaultValueIs: "デフォルト: {value}"
 noCustomEmojis: "絵文字はありません"
 noJobs: "ジョブはありません"
 federating: "連合中"
+blockingYou: "Blocking you"
 blocked: "ブロック中"
 suspended: "配信停止"
 all: "全て"

packages/frontend/src/pages/instance-info.vue

@@ -46,9 +46,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<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>
-							<MkButton v-if="suspensionState === 'none'" inline :disabled="!instance" danger @click="stopDelivery">{{ i18n.ts._delivery.stop }}</MkButton>
-							<MkButton v-if="suspensionState !== 'none'" inline :disabled="!instance" @click="resumeDelivery">{{ i18n.ts._delivery.resume }}</MkButton>
 						</div>
+						<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>
@@ -206,6 +205,7 @@ const chartSrc = ref<ChartSrc>('instance-requests');
 const meta = ref<Misskey.entities.AdminMetaResponse | null>(null);
 const instance = ref<Misskey.entities.FederationInstance | null>(null);
 const suspensionState = ref<'none' | 'manuallySuspended' | 'goneSuspended' | 'autoSuspendedForNotResponding'>('none');
+const isSuspended = ref(false);
 const isBlocked = ref(false);
 const isSilenced = ref(false);
 const isNSFW = ref(false);
@@ -275,6 +275,7 @@ async function fetch(): Promise<void> {
 		host: props.host,
 	});
 	suspensionState.value = instance.value?.suspensionState ?? 'none';
+	isSuspended.value = instance.value?.suspensionState !== 'none';
 	isBlocked.value = instance.value?.isBlocked ?? false;
 	isSilenced.value = instance.value?.isSilenced ?? false;
 	isNSFW.value = instance.value?.isNSFW ?? false;
@@ -316,23 +317,13 @@ async function toggleMediaSilenced(): Promise<void> {
 	});
 }
 
-async function stopDelivery(): Promise<void> {
+async function toggleSuspended(): Promise<void> {
 	if (!iAmModerator) return;
 	if (!instance.value) throw new Error('No instance?');
-	suspensionState.value = 'manuallySuspended';
+	suspensionState.value = isSuspended.value ? 'manuallySuspended' : 'none';
 	await misskeyApi('admin/federation/update-instance', {
 		host: instance.value.host,
-		isSuspended: true,
+		isSuspended: isSuspended.value,
-	});
-}
-
-async function resumeDelivery(): Promise<void> {
-	if (!iAmModerator) return;
-	if (!instance.value) throw new Error('No instance?');
-	suspensionState.value = 'none';
-	await misskeyApi('admin/federation/update-instance', {
-		host: instance.value.host,
-		isSuspended: false,
 	});
 }
 

packages/frontend/src/pages/user/home.vue

@@ -30,12 +30,15 @@ SPDX-License-Identifier: AGPL-3.0-only
 								</button>
 							</div>
 						</div>
-						<div v-if="$i && $i.id != user.id" class="info-badges">
+						<ul v-if="$i && $i.id != user.id" class="info-badges">
-							<span v-if="user.isFollowed">{{ i18n.ts.followsYou }}</span>
+							<li v-if="user.isFollowed && user.isFollowing">{{ i18n.ts.mutuals }}</li>
-							<span v-if="user.isMuted">{{ i18n.ts.muted }}</span>
+							<li v-else-if="user.isFollowing">{{ i18n.ts.following }}</li>
-							<span v-if="user.isRenoteMuted">{{ i18n.ts.renoteMuted }}</span>
+							<li v-else-if="user.isFollowed">{{ i18n.ts.followsYou }}</li>
-							<span v-if="user.isBlocking">{{ i18n.ts.blocked }}</span>
+							<li v-if="user.isMuted">{{ i18n.ts.muted }}</li>
-						</div>
+							<li v-if="user.isRenoteMuted">{{ i18n.ts.renoteMuted }}</li>
+							<li v-if="user.isBlocking">{{ i18n.ts.blocked }}</li>
+							<li v-if="user.isBlocked && $i.isModerator">{{ i18n.ts.blockingYou }}</li>
+						</ul>
 						<div class="actions">
 							<button class="menu _button" @click="menu"><i class="ti ti-dots"></i></button>
 							<MkFollowButton v-if="$i?.id != user.id" v-model:user="user" :inline="true" :transparent="false" :full="true" class="koudoku"/>
@@ -474,12 +477,17 @@ onUnmounted(() => {
 						display: flex;
 						flex-direction: row;
 
+						padding: 0;
+						margin: 0;
+
 						> * {
 							padding: 4px 8px;
 							color: #fff;
 							background: rgba(0, 0, 0, 0.7);
 							font-size: 0.7em;
 							border-radius: var(--radius-sm);
+							list-style-type: none;
+							margin-left: 0;
 						}
 
 						> :not(:first-child) {