summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/frontend/src/pages/admin/index.vue5
-rw-r--r--packages/frontend/src/pages/admin/instance-block.vue84
-rw-r--r--packages/frontend/src/pages/admin/moderation.vue198
-rw-r--r--packages/frontend/src/pages/admin/settings.vue25
-rw-r--r--packages/frontend/src/router/definition.ts4
5 files changed, 173 insertions, 143 deletions
diff --git a/packages/frontend/src/pages/admin/index.vue b/packages/frontend/src/pages/admin/index.vue
index 40dec55deb..cd1dd2ca9d 100644
--- a/packages/frontend/src/pages/admin/index.vue
+++ b/packages/frontend/src/pages/admin/index.vue
@@ -200,11 +200,6 @@ const menuDef = computed(() => [{
to: '/admin/relays',
active: currentPage.value?.route.name === 'relays',
}, {
- icon: 'ti ti-ban',
- text: i18n.ts.instanceBlocking,
- to: '/admin/instance-block',
- active: currentPage.value?.route.name === 'instance-block',
- }, {
icon: 'ti ti-ghost',
text: i18n.ts.proxyAccount,
to: '/admin/proxy-account',
diff --git a/packages/frontend/src/pages/admin/instance-block.vue b/packages/frontend/src/pages/admin/instance-block.vue
deleted file mode 100644
index e090616b26..0000000000
--- a/packages/frontend/src/pages/admin/instance-block.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<!--
-SPDX-FileCopyrightText: syuilo and misskey-project
-SPDX-License-Identifier: AGPL-3.0-only
--->
-
-<template>
-<MkStickyContainer>
- <template #header><XHeader v-model:tab="tab" :actions="headerActions" :tabs="headerTabs"/></template>
- <MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
- <FormSuspense :p="init">
- <template v-if="tab === 'block'">
- <MkTextarea v-model="blockedHosts">
- <span>{{ i18n.ts.blockedInstances }}</span>
- <template #caption>{{ i18n.ts.blockedInstancesDescription }}</template>
- </MkTextarea>
- </template>
- <template v-else-if="tab === 'silence'">
- <MkTextarea v-model="silencedHosts" class="_formBlock">
- <span>{{ i18n.ts.silencedInstances }}</span>
- <template #caption>{{ i18n.ts.silencedInstancesDescription }}</template>
- </MkTextarea>
- <MkTextarea v-model="mediaSilencedHosts" class="_formBlock">
- <span>{{ i18n.ts.mediaSilencedInstances }}</span>
- <template #caption>{{ i18n.ts.mediaSilencedInstancesDescription }}</template>
- </MkTextarea>
- </template>
- <MkButton primary @click="save"><i class="ti ti-device-floppy"></i> {{ i18n.ts.save }}</MkButton>
- </FormSuspense>
- </MkSpacer>
-</MkStickyContainer>
-</template>
-
-<script lang="ts" setup>
-import { ref, computed } from 'vue';
-import XHeader from './_header_.vue';
-import MkButton from '@/components/MkButton.vue';
-import MkTextarea from '@/components/MkTextarea.vue';
-import FormSuspense from '@/components/form/suspense.vue';
-import * as os from '@/os.js';
-import { misskeyApi } from '@/scripts/misskey-api.js';
-import { fetchInstance } from '@/instance.js';
-import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/scripts/page-metadata.js';
-
-const blockedHosts = ref<string>('');
-const silencedHosts = ref<string>('');
-const mediaSilencedHosts = ref<string>('');
-const tab = ref('block');
-
-async function init() {
- const meta = await misskeyApi('admin/meta');
- blockedHosts.value = meta.blockedHosts.join('\n');
- silencedHosts.value = meta.silencedHosts.join('\n');
- mediaSilencedHosts.value = meta.mediaSilencedHosts.join('\n');
-}
-
-function save() {
- os.apiWithDialog('admin/update-meta', {
- blockedHosts: blockedHosts.value.split('\n') || [],
- silencedHosts: silencedHosts.value.split('\n') || [],
- mediaSilencedHosts: mediaSilencedHosts.value.split('\n') || [],
-
- }).then(() => {
- fetchInstance(true);
- });
-}
-
-const headerActions = 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,
- icon: 'ti ti-ban',
-}));
-</script>
diff --git a/packages/frontend/src/pages/admin/moderation.vue b/packages/frontend/src/pages/admin/moderation.vue
index a75799696d..82e053c2da 100644
--- a/packages/frontend/src/pages/admin/moderation.vue
+++ b/packages/frontend/src/pages/admin/moderation.vue
@@ -10,61 +10,102 @@ SPDX-License-Identifier: AGPL-3.0-only
<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
<FormSuspense :p="init">
<div class="_gaps_m">
- <MkSwitch v-model="enableRegistration">
+ <MkSwitch v-model="enableRegistration" @change="onChange_enableRegistration">
<template #label>{{ i18n.ts.enableRegistration }}</template>
</MkSwitch>
- <MkSwitch v-model="emailRequiredForSignup">
+ <MkSwitch v-model="emailRequiredForSignup" @change="onChange_emailRequiredForSignup">
<template #label>{{ i18n.ts.emailRequiredForSignup }}</template>
</MkSwitch>
<FormLink to="/admin/server-rules">{{ i18n.ts.serverRules }}</FormLink>
- <MkInput v-model="tosUrl" type="url">
- <template #prefix><i class="ti ti-link"></i></template>
- <template #label>{{ i18n.ts.tosUrl }}</template>
- </MkInput>
-
- <MkInput v-model="privacyPolicyUrl" type="url">
- <template #prefix><i class="ti ti-link"></i></template>
- <template #label>{{ i18n.ts.privacyPolicyUrl }}</template>
- </MkInput>
-
- <MkInput v-model="inquiryUrl" type="url">
- <template #prefix><i class="ti ti-link"></i></template>
- <template #label>{{ i18n.ts._serverSettings.inquiryUrl }}</template>
- <template #caption>{{ i18n.ts._serverSettings.inquiryUrlDescription }}</template>
- </MkInput>
-
- <MkTextarea v-model="preservedUsernames">
+ <MkFolder>
+ <template #icon><i class="ti ti-lock-star"></i></template>
<template #label>{{ i18n.ts.preservedUsernames }}</template>
- <template #caption>{{ i18n.ts.preservedUsernamesDescription }}</template>
- </MkTextarea>
- <MkTextarea v-model="sensitiveWords">
+ <div class="_gaps">
+ <MkTextarea v-model="preservedUsernames">
+ <template #caption>{{ i18n.ts.preservedUsernamesDescription }}</template>
+ </MkTextarea>
+ <MkButton primary @click="save_preservedUsernames">{{ i18n.ts.save }}</MkButton>
+ </div>
+ </MkFolder>
+
+ <MkFolder>
+ <template #icon><i class="ti ti-message-exclamation"></i></template>
<template #label>{{ i18n.ts.sensitiveWords }}</template>
- <template #caption>{{ i18n.ts.sensitiveWordsDescription }}<br>{{ i18n.ts.sensitiveWordsDescription2 }}</template>
- </MkTextarea>
- <MkTextarea v-model="prohibitedWords">
+ <div class="_gaps">
+ <MkTextarea v-model="sensitiveWords">
+ <template #caption>{{ i18n.ts.sensitiveWordsDescription }}<br>{{ i18n.ts.sensitiveWordsDescription2 }}</template>
+ </MkTextarea>
+ <MkButton primary @click="save_sensitiveWords">{{ i18n.ts.save }}</MkButton>
+ </div>
+ </MkFolder>
+
+ <MkFolder>
+ <template #icon><i class="ti ti-message-x"></i></template>
<template #label>{{ i18n.ts.prohibitedWords }}</template>
- <template #caption>{{ i18n.ts.prohibitedWordsDescription }}<br>{{ i18n.ts.prohibitedWordsDescription2 }}</template>
- </MkTextarea>
- <MkTextarea v-model="hiddenTags">
+ <div class="_gaps">
+ <MkTextarea v-model="prohibitedWords">
+ <template #caption>{{ i18n.ts.prohibitedWordsDescription }}<br>{{ i18n.ts.prohibitedWordsDescription2 }}</template>
+ </MkTextarea>
+ <MkButton primary @click="save_prohibitedWords">{{ i18n.ts.save }}</MkButton>
+ </div>
+ </MkFolder>
+
+ <MkFolder>
+ <template #icon><i class="ti ti-eye-off"></i></template>
<template #label>{{ i18n.ts.hiddenTags }}</template>
- <template #caption>{{ i18n.ts.hiddenTagsDescription }}</template>
- </MkTextarea>
+
+ <div class="_gaps">
+ <MkTextarea v-model="hiddenTags">
+ <template #caption>{{ i18n.ts.hiddenTagsDescription }}</template>
+ </MkTextarea>
+ <MkButton primary @click="save_hiddenTags">{{ i18n.ts.save }}</MkButton>
+ </div>
+ </MkFolder>
+
+ <MkFolder>
+ <template #icon><i class="ti ti-eye-off"></i></template>
+ <template #label>{{ i18n.ts.silencedInstances }}</template>
+
+ <div class="_gaps">
+ <MkTextarea v-model="silencedHosts">
+ <template #caption>{{ i18n.ts.silencedInstancesDescription }}</template>
+ </MkTextarea>
+ <MkButton primary @click="save_silencedHosts">{{ i18n.ts.save }}</MkButton>
+ </div>
+ </MkFolder>
+
+ <MkFolder>
+ <template #icon><i class="ti ti-eye-off"></i></template>
+ <template #label>{{ i18n.ts.mediaSilencedInstances }}</template>
+
+ <div class="_gaps">
+ <MkTextarea v-model="mediaSilencedHosts">
+ <template #caption>{{ i18n.ts.mediaSilencedInstancesDescription }}</template>
+ </MkTextarea>
+ <MkButton primary @click="save_mediaSilencedHosts">{{ i18n.ts.save }}</MkButton>
+ </div>
+ </MkFolder>
+
+ <MkFolder>
+ <template #icon><i class="ti ti-ban"></i></template>
+ <template #label>{{ i18n.ts.blockedInstances }}</template>
+
+ <div class="_gaps">
+ <MkTextarea v-model="blockedHosts">
+ <template #caption>{{ i18n.ts.blockedInstancesDescription }}</template>
+ </MkTextarea>
+ <MkButton primary @click="save_blockedHosts">{{ i18n.ts.save }}</MkButton>
+ </div>
+ </MkFolder>
</div>
</FormSuspense>
</MkSpacer>
- <template #footer>
- <div :class="$style.footer">
- <MkSpacer :contentMax="700" :marginMin="16" :marginMax="16">
- <MkButton primary rounded @click="save"><i class="ti ti-check"></i> {{ i18n.ts.save }}</MkButton>
- </MkSpacer>
- </div>
- </template>
</MkStickyContainer>
</div>
</template>
@@ -83,6 +124,7 @@ import { i18n } from '@/i18n.js';
import { definePageMetadata } from '@/scripts/page-metadata.js';
import MkButton from '@/components/MkButton.vue';
import FormLink from '@/components/form/link.vue';
+import MkFolder from '@/components/MkFolder.vue';
const enableRegistration = ref<boolean>(false);
const emailRequiredForSignup = ref<boolean>(false);
@@ -90,9 +132,9 @@ const sensitiveWords = ref<string>('');
const prohibitedWords = ref<string>('');
const hiddenTags = ref<string>('');
const preservedUsernames = ref<string>('');
-const tosUrl = ref<string | null>(null);
-const privacyPolicyUrl = ref<string | null>(null);
-const inquiryUrl = ref<string | null>(null);
+const blockedHosts = ref<string>('');
+const silencedHosts = ref<string>('');
+const mediaSilencedHosts = ref<string>('');
async function init() {
const meta = await misskeyApi('admin/meta');
@@ -102,22 +144,78 @@ async function init() {
prohibitedWords.value = meta.prohibitedWords.join('\n');
hiddenTags.value = meta.hiddenTags.join('\n');
preservedUsernames.value = meta.preservedUsernames.join('\n');
- tosUrl.value = meta.tosUrl;
- privacyPolicyUrl.value = meta.privacyPolicyUrl;
- inquiryUrl.value = meta.inquiryUrl;
+ blockedHosts.value = meta.blockedHosts.join('\n');
+ silencedHosts.value = meta.silencedHosts.join('\n');
+ mediaSilencedHosts.value = meta.mediaSilencedHosts.join('\n');
+}
+
+function onChange_enableRegistration(value: boolean) {
+ os.apiWithDialog('admin/update-meta', {
+ disableRegistration: !value,
+ }).then(() => {
+ fetchInstance(true);
+ });
+}
+
+function onChange_emailRequiredForSignup(value: boolean) {
+ os.apiWithDialog('admin/update-meta', {
+ emailRequiredForSignup: value,
+ }).then(() => {
+ fetchInstance(true);
+ });
+}
+
+function save_preservedUsernames() {
+ os.apiWithDialog('admin/update-meta', {
+ preservedUsernames: preservedUsernames.value.split('\n'),
+ }).then(() => {
+ fetchInstance(true);
+ });
}
-function save() {
+function save_sensitiveWords() {
os.apiWithDialog('admin/update-meta', {
- disableRegistration: !enableRegistration.value,
- emailRequiredForSignup: emailRequiredForSignup.value,
- tosUrl: tosUrl.value,
- privacyPolicyUrl: privacyPolicyUrl.value,
- inquiryUrl: inquiryUrl.value,
sensitiveWords: sensitiveWords.value.split('\n'),
+ }).then(() => {
+ fetchInstance(true);
+ });
+}
+
+function save_prohibitedWords() {
+ os.apiWithDialog('admin/update-meta', {
prohibitedWords: prohibitedWords.value.split('\n'),
+ }).then(() => {
+ fetchInstance(true);
+ });
+}
+
+function save_hiddenTags() {
+ os.apiWithDialog('admin/update-meta', {
hiddenTags: hiddenTags.value.split('\n'),
- preservedUsernames: preservedUsernames.value.split('\n'),
+ }).then(() => {
+ fetchInstance(true);
+ });
+}
+
+function save_blockedHosts() {
+ os.apiWithDialog('admin/update-meta', {
+ blockedHosts: blockedHosts.value.split('\n') || [],
+ }).then(() => {
+ fetchInstance(true);
+ });
+}
+
+function save_silencedHosts() {
+ os.apiWithDialog('admin/update-meta', {
+ silencedHosts: silencedHosts.value.split('\n') || [],
+ }).then(() => {
+ fetchInstance(true);
+ });
+}
+
+function save_mediaSilencedHosts() {
+ os.apiWithDialog('admin/update-meta', {
+ mediaSilencedHosts: mediaSilencedHosts.value.split('\n') || [],
}).then(() => {
fetchInstance(true);
});
diff --git a/packages/frontend/src/pages/admin/settings.vue b/packages/frontend/src/pages/admin/settings.vue
index ffff57b454..6eaafed6df 100644
--- a/packages/frontend/src/pages/admin/settings.vue
+++ b/packages/frontend/src/pages/admin/settings.vue
@@ -34,6 +34,22 @@ SPDX-License-Identifier: AGPL-3.0-only
</MkInput>
</FormSplit>
+ <MkInput v-model="tosUrl" type="url">
+ <template #prefix><i class="ti ti-link"></i></template>
+ <template #label>{{ i18n.ts.tosUrl }}</template>
+ </MkInput>
+
+ <MkInput v-model="privacyPolicyUrl" type="url">
+ <template #prefix><i class="ti ti-link"></i></template>
+ <template #label>{{ i18n.ts.privacyPolicyUrl }}</template>
+ </MkInput>
+
+ <MkInput v-model="inquiryUrl" type="url">
+ <template #prefix><i class="ti ti-link"></i></template>
+ <template #label>{{ i18n.ts._serverSettings.inquiryUrl }}</template>
+ <template #caption>{{ i18n.ts._serverSettings.inquiryUrlDescription }}</template>
+ </MkInput>
+
<MkInput v-model="repositoryUrl" type="url">
<template #label>{{ i18n.ts.repositoryUrl }}</template>
<template #prefix><i class="ti ti-link"></i></template>
@@ -196,6 +212,9 @@ const shortName = ref<string | null>(null);
const description = ref<string | null>(null);
const maintainerName = ref<string | null>(null);
const maintainerEmail = ref<string | null>(null);
+const tosUrl = ref<string | null>(null);
+const privacyPolicyUrl = ref<string | null>(null);
+const inquiryUrl = ref<string | null>(null);
const repositoryUrl = ref<string | null>(null);
const impressumUrl = ref<string | null>(null);
const pinnedUsers = ref<string>('');
@@ -219,6 +238,9 @@ async function init(): Promise<void> {
description.value = meta.description;
maintainerName.value = meta.maintainerName;
maintainerEmail.value = meta.maintainerEmail;
+ tosUrl.value = meta.tosUrl;
+ privacyPolicyUrl.value = meta.privacyPolicyUrl;
+ inquiryUrl.value = meta.inquiryUrl;
repositoryUrl.value = meta.repositoryUrl;
impressumUrl.value = meta.impressumUrl;
pinnedUsers.value = meta.pinnedUsers.join('\n');
@@ -243,6 +265,9 @@ async function save() {
description: description.value,
maintainerName: maintainerName.value,
maintainerEmail: maintainerEmail.value,
+ tosUrl: tosUrl.value,
+ privacyPolicyUrl: privacyPolicyUrl.value,
+ inquiryUrl: inquiryUrl.value,
repositoryUrl: repositoryUrl.value,
impressumUrl: impressumUrl.value,
pinnedUsers: pinnedUsers.value.split('\n'),
diff --git a/packages/frontend/src/router/definition.ts b/packages/frontend/src/router/definition.ts
index 8a29fd677e..bcd1d9a159 100644
--- a/packages/frontend/src/router/definition.ts
+++ b/packages/frontend/src/router/definition.ts
@@ -463,10 +463,6 @@ const routes: RouteDef[] = [{
name: 'relays',
component: page(() => import('@/pages/admin/relays.vue')),
}, {
- path: '/instance-block',
- name: 'instance-block',
- component: page(() => import('@/pages/admin/instance-block.vue')),
- }, {
path: '/proxy-account',
name: 'proxy-account',
component: page(() => import('@/pages/admin/proxy-account.vue')),
generated by cgit v1.2.3-freya (git 2.53.0.84.g453e7b744a) at 2026-03-03 14:56:10 +0000