Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'misskey-mattyatea/report' into develop

Browse source 
# Conflicts:
#	locales/index.d.ts
#	locales/ja-JP.yml
#	packages/backend/src/models/Meta.ts
#	packages/backend/src/server/api/endpoints/admin/meta.ts
#	packages/backend/src/server/api/endpoints/admin/update-meta.ts
This commit is contained in:
mattyatea 2024-01-28 08:01:21 +09:00
commit 7a3eb26c4d
16 changed files with 276 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

7
packages/frontend/src/pages/admin/moderation.vue
View file

@ -18,6 +18,10 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #label>{{ i18n.ts.emailRequiredForSignup }}</template>
</MkSwitch>
<MkSwitch v-model="enableGDPRMode">
<template #label>{{ i18n.ts.enableGDPRMode }}</template>
</MkSwitch>
<FormLink to="/admin/server-rules">{{ i18n.ts.serverRules }}</FormLink>
<MkInput v-model="tosUrl" type="url">
@ -80,6 +84,7 @@ const hiddenTags = ref<string>('');
const preservedUsernames = ref<string>('');
const tosUrl = ref<string | null>(null);
const privacyPolicyUrl = ref<string | null>(null);
const enableGDPRMode = ref<boolean>(false);
async function init() {
const meta = await misskeyApi('admin/meta');
@ -90,6 +95,7 @@ async function init() {
preservedUsernames.value = meta.preservedUsernames.join('\n');
tosUrl.value = meta.tosUrl;
privacyPolicyUrl.value = meta.privacyPolicyUrl;
enableGDPRMode.value = meta.enableGDPRMode;
}
function save() {
@ -101,6 +107,7 @@ function save() {
sensitiveWords: sensitiveWords.value.split('\n'),
hiddenTags: hiddenTags.value.split('\n'),
preservedUsernames: preservedUsernames.value.split('\n'),
enableGDPRMode: enableGDPRMode.value,
}).then(() => {
fetchInstance();
});