feat: サーバーサイレンス機能を追加 (#12031)
* feat : サーバーサイレンスを追加 * Update CHANGELOG.md * Update CHANGELOG.md * Update locale * Update instance-info.vue * update misskey-js.api.md * lint fix * migration fix * 既存のものを使うように * fix * 色々直した * Update packages/frontend/src/pages/admin/instance-block.vue * Update packages/frontend/src/pages/admin/instance-block.vue * Update packages/frontend/src/components/MkInstanceCardMini.vue * Update packages/backend/src/core/entities/InstanceEntityService.ts * Update packages/backend/src/core/entities/InstanceEntityService.ts * Update packages/backend/src/core/entities/InstanceEntityService.ts * Update packages/backend/src/core/UserFollowingService.ts * Update packages/backend/src/core/UserFollowingService.ts * fix: サイレンスされてるサーバーからの投稿は全部ホームにする * fix: undefinedでfalseを返すようにした --------- Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
This commit is contained in:
		| @@ -18,6 +18,7 @@ SPDX-License-Identifier: AGPL-3.0-only | ||||
| 				<option value="subscribing">{{ i18n.ts.subscribing }}</option> | ||||
| 				<option value="publishing">{{ i18n.ts.publishing }}</option> | ||||
| 				<option value="suspended">{{ i18n.ts.suspended }}</option> | ||||
| 				<option value="silenced">{{ i18n.ts.silence }}</option> | ||||
| 				<option value="blocked">{{ i18n.ts.blocked }}</option> | ||||
| 				<option value="notResponding">{{ i18n.ts.notResponding }}</option> | ||||
| 			</MkSelect> | ||||
| @@ -75,6 +76,7 @@ const pagination = { | ||||
| 			state === 'publishing' ? { publishing: true } : | ||||
| 			state === 'suspended' ? { suspended: true } : | ||||
| 			state === 'blocked' ? { blocked: true } : | ||||
| 			state === 'silenced' ? { silenced: true } : | ||||
| 			state === 'notResponding' ? { notResponding: true } : | ||||
| 			{}), | ||||
| 	})), | ||||
| @@ -83,6 +85,7 @@ const pagination = { | ||||
| function getStatus(instance) { | ||||
| 	if (instance.isSuspended) return 'Suspended'; | ||||
| 	if (instance.isBlocked) return 'Blocked'; | ||||
| 	if (instance.isSilenced) return 'Silenced'; | ||||
| 	if (instance.isNotResponding) return 'Error'; | ||||
| 	return 'Alive'; | ||||
| } | ||||
|   | ||||
| @@ -5,14 +5,17 @@ SPDX-License-Identifier: AGPL-3.0-only | ||||
|  | ||||
| <template> | ||||
| <MkStickyContainer> | ||||
| 	<template #header><XHeader :actions="headerActions" :tabs="headerTabs"/></template> | ||||
| 	<template #header><XHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template> | ||||
| 	<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32"> | ||||
| 		<FormSuspense :p="init"> | ||||
| 			<MkTextarea v-model="blockedHosts"> | ||||
| 			<MkTextarea v-if="tab === 'block'" v-model="blockedHosts"> | ||||
| 				<span>{{ i18n.ts.blockedInstances }}</span> | ||||
| 				<template #caption>{{ i18n.ts.blockedInstancesDescription }}</template> | ||||
| 			</MkTextarea> | ||||
|  | ||||
| 			<MkTextarea v-else-if="tab === 'silence'" v-model="silencedHosts" class="_formBlock"> | ||||
| 				<span>{{ i18n.ts.silencedInstances }}</span> | ||||
| 				<template #caption>{{ i18n.ts.silencedInstancesDescription }}</template> | ||||
| 			</MkTextarea> | ||||
| 			<MkButton primary @click="save"><i class="ti ti-device-floppy"></i> {{ i18n.ts.save }}</MkButton> | ||||
| 		</FormSuspense> | ||||
| 	</MkSpacer> | ||||
| @@ -20,7 +23,6 @@ SPDX-License-Identifier: AGPL-3.0-only | ||||
| </template> | ||||
|  | ||||
| <script lang="ts" setup> | ||||
| import { } from 'vue'; | ||||
| import XHeader from './_header_.vue'; | ||||
| import MkButton from '@/components/MkButton.vue'; | ||||
| import MkTextarea from '@/components/MkTextarea.vue'; | ||||
| @@ -31,15 +33,20 @@ import { i18n } from '@/i18n.js'; | ||||
| import { definePageMetadata } from '@/scripts/page-metadata.js'; | ||||
|  | ||||
| let blockedHosts: string = $ref(''); | ||||
| let silencedHosts: string = $ref(''); | ||||
| let tab = $ref('block'); | ||||
|  | ||||
| async function init() { | ||||
| 	const meta = await os.api('admin/meta'); | ||||
| 	blockedHosts = meta.blockedHosts.join('\n'); | ||||
| 	silencedHosts = meta.silencedHosts.join('\n'); | ||||
| } | ||||
|  | ||||
| function save() { | ||||
| 	os.apiWithDialog('admin/update-meta', { | ||||
| 		blockedHosts: blockedHosts.split('\n') || [], | ||||
| 		silencedHosts: silencedHosts.split('\n') || [], | ||||
|  | ||||
| 	}).then(() => { | ||||
| 		fetchInstance(); | ||||
| 	}); | ||||
| @@ -47,7 +54,15 @@ function save() { | ||||
|  | ||||
| const headerActions = $computed(() => []); | ||||
|  | ||||
| const headerTabs = $computed(() => []); | ||||
| const headerTabs = $computed(() => [{ | ||||
| 	key: 'block', | ||||
| 	title: i18n.ts.block, | ||||
| 	icon: 'ti ti-ban', | ||||
| }, { | ||||
| 	key: 'silence', | ||||
| 	title: i18n.ts.silence, | ||||
| 	icon: 'ti ti-eye-off', | ||||
| }]); | ||||
|  | ||||
| definePageMetadata({ | ||||
| 	title: i18n.ts.instanceBlocking, | ||||
|   | ||||
| @@ -36,7 +36,8 @@ SPDX-License-Identifier: AGPL-3.0-only | ||||
| 				<div class="_gaps_s"> | ||||
| 					<MkSwitch v-model="suspended" :disabled="!instance" @update:modelValue="toggleSuspend">{{ i18n.ts.stopActivityDelivery }}</MkSwitch> | ||||
| 					<MkSwitch v-model="isBlocked" :disabled="!meta || !instance" @update:modelValue="toggleBlock">{{ i18n.ts.blockThisInstance }}</MkSwitch> | ||||
| 					<MkButton @click="refreshMetadata"><i class="ti ti-refresh"></i> Refresh metadata</MkButton> | ||||
|                     <MkSwitch v-model="isSilenced" :disabled="!meta || !instance" @update:modelValue="toggleSilenced">{{ i18n.ts.silenceThisInstance }}</MkSwitch> | ||||
|                     <MkButton @click="refreshMetadata"><i class="ti ti-refresh"></i> Refresh metadata</MkButton> | ||||
| 				</div> | ||||
| 			</FormSection> | ||||
|  | ||||
| @@ -147,6 +148,7 @@ let meta = $ref<Misskey.entities.AdminInstanceMetadata | null>(null); | ||||
| let instance = $ref<Misskey.entities.Instance | null>(null); | ||||
| let suspended = $ref(false); | ||||
| let isBlocked = $ref(false); | ||||
| let isSilenced = $ref(false); | ||||
| let faviconUrl = $ref<string | null>(null); | ||||
|  | ||||
| const usersPagination = { | ||||
| @@ -169,7 +171,8 @@ async function fetch(): Promise<void> { | ||||
| 	}); | ||||
| 	suspended = instance.isSuspended; | ||||
| 	isBlocked = instance.isBlocked; | ||||
| 	faviconUrl = getProxiedImageUrlNullable(instance.faviconUrl, 'preview') ?? getProxiedImageUrlNullable(instance.iconUrl, 'preview'); | ||||
|     isSilenced = instance.isSilenced; | ||||
|     faviconUrl = getProxiedImageUrlNullable(instance.faviconUrl, 'preview') ?? getProxiedImageUrlNullable(instance.iconUrl, 'preview'); | ||||
| } | ||||
|  | ||||
| async function toggleBlock(): Promise<void> { | ||||
| @@ -180,7 +183,14 @@ async function toggleBlock(): Promise<void> { | ||||
| 		blockedHosts: isBlocked ? meta.blockedHosts.concat([host]) : meta.blockedHosts.filter(x => x !== host), | ||||
| 	}); | ||||
| } | ||||
|  | ||||
| async function toggleSilenced(): Promise<void> { | ||||
|     if (!meta) throw new Error('No meta?'); | ||||
|     if (!instance) throw new Error('No instance?'); | ||||
|     const { host } = instance; | ||||
|     await os.api('admin/update-meta', { | ||||
|         silencedHosts: isSilenced ? meta.silencedHosts.concat([host]) : meta.silencedHosts.filter(x => x !== host), | ||||
|     }); | ||||
| } | ||||
| async function toggleSuspend(): Promise<void> { | ||||
| 	if (!instance) throw new Error('No instance?'); | ||||
| 	await os.api('admin/federation/update-instance', { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 まっちゃてぃー
					まっちゃてぃー