${ subject }
@@ -146,7 +137,18 @@ export class EmailService { ${ this.config.host } -`, +`; + + const inlinedHtml = juice(htmlContent); + + try { + // TODO: htmlサニタイズ + const info = await transporter.sendMail({ + from: this.meta.email!, + to: to, + subject: subject, + text: text, + html: inlinedHtml, }); this.logger.info(`Message sent: ${info.messageId}`); @@ -161,8 +163,6 @@ export class EmailService { available: boolean; reason: null | 'used' | 'format' | 'disposable' | 'mx' | 'smtp' | 'banned' | 'network' | 'blacklist'; }> { - const meta = await this.metaService.fetch(); - const exist = await this.userProfilesRepository.countBy({ emailVerified: true, email: emailAddress, @@ -180,11 +180,11 @@ export class EmailService { reason?: string | null, } = { valid: true, reason: null }; - if (meta.enableActiveEmailValidation) { - if (meta.enableVerifymailApi && meta.verifymailAuthKey != null) { - validated = await this.verifyMail(emailAddress, meta.verifymailAuthKey); - } else if (meta.enableTruemailApi && meta.truemailInstance && meta.truemailAuthKey != null) { - validated = await this.trueMail(meta.truemailInstance, emailAddress, meta.truemailAuthKey); + if (this.meta.enableActiveEmailValidation) { + if (this.meta.enableVerifymailApi && this.meta.verifymailAuthKey != null) { + validated = await this.verifyMail(emailAddress, this.meta.verifymailAuthKey); + } else if (this.meta.enableTruemailApi && this.meta.truemailInstance && this.meta.truemailAuthKey != null) { + validated = await this.trueMail(this.meta.truemailInstance, emailAddress, this.meta.truemailAuthKey); } else { validated = await validateEmail({ email: emailAddress, @@ -214,7 +214,7 @@ export class EmailService { } const emailDomain: string = emailAddress.split('@')[1]; - const isBanned = this.utilityService.isBlockedHost(meta.bannedEmailDomains, emailDomain); + const isBanned = this.utilityService.isBlockedHost(this.meta.bannedEmailDomains, emailDomain); if (isBanned) { return { diff --git a/packages/backend/src/core/HashtagService.ts b/packages/backend/src/core/HashtagService.ts index eb192ee6da..793bbeecb1 100644 --- a/packages/backend/src/core/HashtagService.ts +++ b/packages/backend/src/core/HashtagService.ts @@ -10,16 +10,18 @@ import type { MiUser } from '@/models/User.js'; import { normalizeForSearch } from '@/misc/normalize-for-search.js'; import { IdService } from '@/core/IdService.js'; import type { MiHashtag } from '@/models/Hashtag.js'; -import type { HashtagsRepository } from '@/models/_.js'; +import type { HashtagsRepository, MiMeta } from '@/models/_.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { bindThis } from '@/decorators.js'; import { FeaturedService } from '@/core/FeaturedService.js'; -import { MetaService } from '@/core/MetaService.js'; import { UtilityService } from '@/core/UtilityService.js'; @Injectable() export class HashtagService { constructor( + @Inject(DI.meta) + private meta: MiMeta, + @Inject(DI.redis) private redisClient: Redis.Redis, // TODO: 専用のRedisサーバーを設定できるようにする @@ -29,7 +31,6 @@ export class HashtagService { private userEntityService: UserEntityService, private featuredService: FeaturedService, private idService: IdService, - private metaService: MetaService, private utilityService: UtilityService, ) { } @@ -160,10 +161,9 @@ export class HashtagService { @bindThis public async updateHashtagsRanking(hashtag: string, userId: MiUser['id']): Promise
+
+
+
+
+
+
diff --git a/packages/frontend/src/components/MkMediaAudio.vue b/packages/frontend/src/components/MkMediaAudio.vue
index 9ad2d1c8da..1c02d7dce4 100644
--- a/packages/frontend/src/components/MkMediaAudio.vue
+++ b/packages/frontend/src/components/MkMediaAudio.vue
@@ -172,9 +172,7 @@ async function show() {
const menuShowing = ref(false);
function showMenu(ev: MouseEvent) {
- let menu: MenuItem[] = [];
-
- menu = [
+ const menu: MenuItem[] = [
// TODO: 再生キューに追加
{
type: 'switch',
@@ -222,7 +220,7 @@ function showMenu(ev: MouseEvent) {
menu.push({
type: 'divider',
}, {
- type: 'link' as const,
+ type: 'link',
text: i18n.ts._fileViewer.title,
icon: 'ti ti-info-circle',
to: `/my/drive/file/${props.audio.id}`,
diff --git a/packages/frontend/src/components/MkMediaImage.vue b/packages/frontend/src/components/MkMediaImage.vue
index 9ddce88ccd..4ee5fd14fc 100644
--- a/packages/frontend/src/components/MkMediaImage.vue
+++ b/packages/frontend/src/components/MkMediaImage.vue
@@ -64,6 +64,7 @@ import { defaultStore } from '@/store.js';
import { i18n } from '@/i18n.js';
import * as os from '@/os.js';
import { $i, iAmModerator } from '@/account.js';
+import type { MenuItem } from '@/types/menu.js';
import MkRippleEffect from '@/components/MkRippleEffect.vue';
const props = withDefaults(defineProps<{
@@ -141,27 +142,39 @@ watch(() => props.image, () => {
});
function showMenu(ev: MouseEvent) {
- os.popupMenu([{
+ const menuItems: MenuItem[] = [];
+
+ menuItems.push({
text: i18n.ts.hide,
icon: 'ti ti-eye-off',
action: () => {
hide.value = true;
},
- }, ...(iAmModerator ? [{
- text: i18n.ts.markAsSensitive,
- icon: 'ti ti-eye-exclamation',
- danger: true,
- action: () => {
- os.apiWithDialog('drive/files/update', { fileId: props.image.id, isSensitive: true });
- },
- }] : []), ...($i?.id === props.image.userId ? [{
- type: 'divider' as const,
- }, {
- type: 'link' as const,
- text: i18n.ts._fileViewer.title,
- icon: 'ti ti-info-circle',
- to: `/my/drive/file/${props.image.id}`,
- }] : [])], ev.currentTarget ?? ev.target);
+ });
+
+ if (iAmModerator) {
+ menuItems.push({
+ text: i18n.ts.markAsSensitive,
+ icon: 'ti ti-eye-exclamation',
+ danger: true,
+ action: () => {
+ os.apiWithDialog('drive/files/update', { fileId: props.image.id, isSensitive: true });
+ },
+ });
+ }
+
+ if ($i?.id === props.image.userId) {
+ menuItems.push({
+ type: 'divider',
+ }, {
+ type: 'link',
+ text: i18n.ts._fileViewer.title,
+ icon: 'ti ti-info-circle',
+ to: `/my/drive/file/${props.image.id}`,
+ });
+ }
+
+ os.popupMenu(menuItems, ev.currentTarget ?? ev.target);
}
onMounted(() => {
diff --git a/packages/frontend/src/components/MkMediaVideo.vue b/packages/frontend/src/components/MkMediaVideo.vue
index 22fe828f1c..76d02dabac 100644
--- a/packages/frontend/src/components/MkMediaVideo.vue
+++ b/packages/frontend/src/components/MkMediaVideo.vue
@@ -193,9 +193,7 @@ async function show() {
const menuShowing = ref(false);
function showMenu(ev: MouseEvent) {
- let menu: MenuItem[] = [];
-
- menu = [
+ const menu: MenuItem[] = [
// TODO: 再生キューに追加
{
type: 'switch',
@@ -248,7 +246,7 @@ function showMenu(ev: MouseEvent) {
menu.push({
type: 'divider',
}, {
- type: 'link' as const,
+ type: 'link',
text: i18n.ts._fileViewer.title,
icon: 'ti ti-info-circle',
to: `/my/drive/file/${props.video.id}`,
diff --git a/packages/frontend/src/components/MkMenu.child.vue b/packages/frontend/src/components/MkMenu.child.vue
index 235790556c..086573ba6d 100644
--- a/packages/frontend/src/components/MkMenu.child.vue
+++ b/packages/frontend/src/components/MkMenu.child.vue
@@ -12,7 +12,7 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/components/MkRange.vue b/packages/frontend/src/components/MkRange.vue
index 0ee37a8136..5f1fc8d4ea 100644
--- a/packages/frontend/src/components/MkRange.vue
+++ b/packages/frontend/src/components/MkRange.vue
@@ -5,7 +5,9 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.tsx.thereAreNChanges({ n: form.modifiedCount.value }) }}
+
+
-
@@ -99,14 +100,14 @@ onMounted(() => {
if (headerEl.value != null) {
headerEl.value.style.position = 'sticky';
headerEl.value.style.top = 'var(--stickyTop, 0)';
- headerEl.value.style.zIndex = '1000';
+ headerEl.value.style.zIndex = '1';
observer.observe(headerEl.value);
}
if (footerEl.value != null) {
footerEl.value.style.position = 'sticky';
footerEl.value.style.bottom = 'var(--stickyBottom, 0)';
- footerEl.value.style.zIndex = '1000';
+ footerEl.value.style.zIndex = '1';
observer.observe(footerEl.value);
}
diff --git a/packages/frontend/src/instance.ts b/packages/frontend/src/instance.ts
index 48dc48ba9a..ca0ecc0673 100644
--- a/packages/frontend/src/instance.ts
+++ b/packages/frontend/src/instance.ts
@@ -12,7 +12,7 @@ import { miLocalStorage } from '@/local-storage.js';
// TODO: 他のタブと永続化されたstateを同期
//#region loader
-const providedMetaEl = document.getElementById('misskey_meta');
+const providedMetaEl = document.getElementById('cherrypick_meta');
let cachedMeta = miLocalStorage.getItem('instance') ? JSON.parse(miLocalStorage.getItem('instance')!) : null;
let cachedAt = miLocalStorage.getItem('instanceCachedAt') ? parseInt(miLocalStorage.getItem('instanceCachedAt')!) : 0;
diff --git a/packages/frontend/src/navbar.ts b/packages/frontend/src/navbar.ts
index c85de0acf1..30a161255b 100644
--- a/packages/frontend/src/navbar.ts
+++ b/packages/frontend/src/navbar.ts
@@ -139,7 +139,7 @@ export const navbarItemDef = reactive({
ui: {
title: i18n.ts.switchUi,
icon: 'ti ti-devices',
- action: (ev) => {
+ action: (ev: MouseEvent) => {
os.popupMenu([{
text: 'Friendly',
active: ui === 'friendly' || ui === null,
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index c1b30d6733..975de6ade7 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -23,7 +23,7 @@ import MkPasswordDialog from '@/components/MkPasswordDialog.vue';
import MkEmojiPickerDialog from '@/components/MkEmojiPickerDialog.vue';
import MkPopupMenu from '@/components/MkPopupMenu.vue';
import MkContextMenu from '@/components/MkContextMenu.vue';
-import { MenuItem } from '@/types/menu.js';
+import type { MenuItem } from '@/types/menu.js';
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
import { pleaseLogin } from '@/scripts/please-login.js';
import { showMovedDialog } from '@/scripts/show-moved-dialog.js';
diff --git a/packages/frontend/src/pages/admin/bot-protection.vue b/packages/frontend/src/pages/admin/bot-protection.vue
index 73c5e1919f..b34592cd6a 100644
--- a/packages/frontend/src/pages/admin/bot-protection.vue
+++ b/packages/frontend/src/pages/admin/bot-protection.vue
@@ -4,145 +4,143 @@ SPDX-License-Identifier: AGPL-3.0-only
-->
-
+
@@ -14,15 +16,25 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
+
-
-
+
+ {{ i18n.ts.hcaptchaSiteKey }}
+
+
+
+ {{ i18n.ts.hcaptchaSecretKey }}
+
+
+ {{ i18n.ts.preview }}
+
+
+
+
+
+ {{ i18n.ts.mcaptchaSiteKey }}
+
+
+
+ {{ i18n.ts.mcaptchaSecretKey }}
+
+
+
+ {{ i18n.ts.mcaptchaInstanceUrl }}
+
+
+ {{ i18n.ts.preview }}
+
+
+
+
+
+ {{ i18n.ts.recaptchaSiteKey }}
+
+
+
+ {{ i18n.ts.recaptchaSecretKey }}
+
+
+ {{ i18n.ts.preview }}
+
+
+
+
+
+ {{ i18n.ts.turnstileSiteKey }}
+
+
+
+ {{ i18n.ts.turnstileSecretKey }}
+
+
+ {{ i18n.ts.preview }}
+
+
+
+
diff --git a/packages/frontend/src/pages/admin/external-services.vue b/packages/frontend/src/pages/admin/external-services.vue
index 754ff3b698..e841d2f668 100644
--- a/packages/frontend/src/pages/admin/external-services.vue
+++ b/packages/frontend/src/pages/admin/external-services.vue
@@ -8,7 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
-
-
-
-
-
+
+
+ {{ i18n.ts.botProtection }}
+ hCaptcha
+ mCaptcha
+ reCAPTCHA
+ Turnstile
+ {{ i18n.ts.none }} ({{ i18n.ts.notRecommended }})
+
+
-
- {{ i18n.ts.hcaptchaSiteKey }}
-
-
-
- {{ i18n.ts.hcaptchaSecretKey }}
-
-
- {{ i18n.ts.preview }}
-
-
-
-
-
- {{ i18n.ts.mcaptchaSiteKey }}
-
-
-
- {{ i18n.ts.mcaptchaSecretKey }}
-
-
-
- {{ i18n.ts.mcaptchaInstanceUrl }}
-
-
- {{ i18n.ts.preview }}
-
-
-
-
-
- {{ i18n.ts.recaptchaSiteKey }}
-
-
-
- {{ i18n.ts.recaptchaSecretKey }}
-
-
- {{ i18n.ts.preview }}
-
-
-
-
-
- {{ i18n.ts.turnstileSiteKey }}
-
-
-
- {{ i18n.ts.turnstileSecretKey }}
-
-
- {{ i18n.ts.preview }}
-
-
+
+
+
+
+
+
+
+
+
+
- {{ i18n.ts.save }}
-
-
-
@@ -62,17 +63,12 @@ SPDX-License-Identifier: AGPL-3.0-only
Glossary ID
+
+ {{ i18n.ts.save }}
-
-
- {{ i18n.ts.save }}
-
-
-
@@ -84,12 +80,12 @@ import MkButton from '@/components/MkButton.vue';
import MkRadios from '@/components/MkRadios.vue';
import MkSwitch from '@/components/MkSwitch.vue';
import FormSuspense from '@/components/form/suspense.vue';
-import FormSection from '@/components/form/section.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';
+import MkFolder from '@/components/MkFolder.vue';
const provider = ref
-
+
{{ i18n.ts.enableRegistration }}
-
+
{{ i18n.ts.emailRequiredForSignup }}
{{ i18n.ts.serverRules }}
-
-
- {{ i18n.ts.tosUrl }}
-
-
-
-
- {{ i18n.ts.privacyPolicyUrl }}
-
-
-
-
- {{ i18n.ts._serverSettings.inquiryUrl }}
- {{ i18n.ts._serverSettings.inquiryUrlDescription }}
-
-
-
+
+
{{ i18n.ts.preservedUsernames }}
- {{ i18n.ts.preservedUsernamesDescription }}
-
-
+
+
{{ i18n.ts.sensitiveWords }}
- {{ i18n.ts.sensitiveWordsDescription }}
{{ i18n.ts.sensitiveWordsDescription2 }} -
-
+
+
{{ i18n.ts.prohibitedWords }}
- {{ i18n.ts.prohibitedWordsDescription }}
{{ i18n.ts.prohibitedWordsDescription2 }} -
-
+
+
{{ i18n.ts.hiddenTags }}
- {{ i18n.ts.hiddenTagsDescription }}
-
+
+
+
+ {{ i18n.ts.silencedInstances }}
+
+
+
+
+
+ {{ i18n.ts.mediaSilencedInstances }}
+
+
+
+
+
+ {{ i18n.ts.blockedInstances }}
+
+
+
+ {{ i18n.ts.preservedUsernamesDescription }}
+
+ {{ i18n.ts.save }}
+
+
+
+ {{ i18n.ts.sensitiveWordsDescription2 }} -
+
+ {{ i18n.ts.sensitiveWordsDescription }}
{{ i18n.ts.sensitiveWordsDescription2 }} +
+ {{ i18n.ts.save }}
+
+
+
+ {{ i18n.ts.sensitiveWordsDescription2 }} +
{{ i18n.ts.prohibitedWordsDescription2 }} -
+
+ {{ i18n.ts.prohibitedWordsDescription }}
{{ i18n.ts.prohibitedWordsDescription2 }} +
+ {{ i18n.ts.save }}
+
+
+
+ {{ i18n.ts.prohibitedWordsDescription2 }} +
+
+ {{ i18n.ts.hiddenTagsDescription }}
+
+ {{ i18n.ts.save }}
+
+
+
+
+
+ {{ i18n.ts.silencedInstancesDescription }}
+
+ {{ i18n.ts.save }}
+
+
+
+ {{ i18n.ts.mediaSilencedInstancesDescription }}
+
+ {{ i18n.ts.save }}
+
+
+
+ {{ i18n.ts.blockedInstancesDescription }}
+
+ {{ i18n.ts.save }}
+
+
-
- {{ i18n.ts.save }}
-
-
-
@@ -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
- {{ i18n.ts.cherrypickUpdate }}
-
-
-
-
- {{ i18n.ts.enableServerMachineStats }}
- {{ i18n.ts.turnOffToImprovePerformance }}
-
-
-
-
-
- {{ i18n.ts.enableIdenticonGeneration }}
- {{ i18n.ts.turnOffToImprovePerformance }}
-
-
-
-
-
- {{ i18n.ts.enableChartsForRemoteUser }}
- {{ i18n.ts.turnOffToImprovePerformance }}
-
-
-
-
-
- {{ i18n.ts.enableChartsForFederatedInstances }}
- {{ i18n.ts.turnOffToImprovePerformance }}
-
-
-
-
-
- {{ i18n.ts.doNotSendNotificationEmailsForAbuseReport }}
-
-
-
+
+
+ CherryPick® Fan-out Timeline Technology™ (FTT)
+ Enabled
+ Disabled
+
+
+
+
+
+ CherryPick® Reactions Boost Technology™ (RBT){{ i18n.ts.beta }}
+ Enabled
+ Disabled
+
+
+
+
+
+ {{ i18n.ts.enableServerMachineStats }}
+ {{ i18n.ts.turnOffToImprovePerformance }}
+
+
+
+
+
+ {{ i18n.ts.enableIdenticonGeneration }}
+ {{ i18n.ts.turnOffToImprovePerformance }}
+
+
+
+
+
+ {{ i18n.ts.enableChartsForRemoteUser }}
+ {{ i18n.ts.turnOffToImprovePerformance }}
+
+
+
+
+
+ {{ i18n.ts.enableChartsForFederatedInstances }}
+ {{ i18n.ts.turnOffToImprovePerformance }}
+
+
+
+
+
+ {{ i18n.ts.doNotSendNotificationEmailsForAbuseReport }}
+
+
+
+
+
+ {{ i18n.ts.enable }}{{ i18n.ts.modified }}
+
+ {{ i18n.ts.details }}
+
+
+
+
+ {{ i18n.ts._serverSettings.fanoutTimelineDbFallback }}{{ i18n.ts.modified }}
+ {{ i18n.ts._serverSettings.fanoutTimelineDbFallbackDescription }}
+
+
+
+ perLocalUserUserTimelineCacheMax{{ i18n.ts.modified }}
+
+
+
+ perRemoteUserUserTimelineCacheMax{{ i18n.ts.modified }}
+
+
+
+ perUserHomeTimelineCacheMax{{ i18n.ts.modified }}
+
+
+
+ perUserListTimelineCacheMax{{ i18n.ts.modified }}
+
+
+ {{ i18n.ts._serverSettings.fanoutTimelineDescription }}
+
+
+ {{ i18n.ts.enable }}{{ i18n.ts.modified }}
+ {{ i18n.ts._serverSettings.reactionsBufferingDescription }}
+
+
+
+
+ {{ i18n.ts._role.useBaseValue }}
+
+
+ {{ i18n.ts.enable }}
+
+
+ {{ i18n.ts._role.priority }}
+
+
+
+
+ {{ i18n.ts._role.useBaseValue }}
+
+
+ {{ i18n.ts.enable }}
+
+
+ {{ i18n.ts._role.priority }}
+
+
+
+
+ {{ i18n.ts._role.useBaseValue }}
+
+
+ {{ i18n.ts.enable }}
+
+
+ {{ i18n.ts._role.priority }}
+
+
+
+
+ {{ i18n.ts._role.useBaseValue }}
+
+
+ {{ i18n.ts.enable }}
+
+
+ {{ i18n.ts._role.priority }}
+
+
+
+
+ {{ i18n.ts._role.useBaseValue }}
+
+
+ {{ i18n.ts.enable }}
+
+
+ {{ i18n.ts._role.priority }}
+
+
+
diff --git a/packages/frontend/src/pages/admin/security.vue b/packages/frontend/src/pages/admin/security.vue
index 9bccee89a5..975a4a1265 100644
--- a/packages/frontend/src/pages/admin/security.vue
+++ b/packages/frontend/src/pages/admin/security.vue
@@ -7,119 +7,115 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
@@ -131,83 +127,80 @@ import XHeader from './_header_.vue';
import MkFolder from '@/components/MkFolder.vue';
import MkRadios from '@/components/MkRadios.vue';
import MkSwitch from '@/components/MkSwitch.vue';
-import FormSuspense from '@/components/form/suspense.vue';
import MkRange from '@/components/MkRange.vue';
import MkInput from '@/components/MkInput.vue';
-import MkButton from '@/components/MkButton.vue';
import MkTextarea from '@/components/MkTextarea.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';
+import { useForm } from '@/scripts/use-form.js';
+import MkFormFooter from '@/components/MkFormFooter.vue';
-const enableHcaptcha = ref(false);
-const enableMcaptcha = ref(false);
-const enableRecaptcha = ref(false);
-const enableTurnstile = ref(false);
-const sensitiveMediaDetection = ref('none');
-const sensitiveMediaDetectionSensitivity = ref(0);
-const setSensitiveFlagAutomatically = ref(false);
-const enableSensitiveMediaDetectionForVideos = ref(false);
-const enableIpLogging = ref(false);
-const enableActiveEmailValidation = ref(false);
-const enableVerifymailApi = ref(false);
-const verifymailAuthKey = ref(null);
-const enableTruemailApi = ref(false);
-const truemailInstance = ref(null);
-const truemailAuthKey = ref(null);
-const bannedEmailDomains = ref('');
+const meta = await misskeyApi('admin/meta');
-async function init() {
- const meta = await misskeyApi('admin/meta');
- enableHcaptcha.value = meta.enableHcaptcha;
- enableMcaptcha.value = meta.enableMcaptcha;
- enableRecaptcha.value = meta.enableRecaptcha;
- enableTurnstile.value = meta.enableTurnstile;
- sensitiveMediaDetection.value = meta.sensitiveMediaDetection;
- sensitiveMediaDetectionSensitivity.value =
- meta.sensitiveMediaDetectionSensitivity === 'veryLow' ? 0 :
- meta.sensitiveMediaDetectionSensitivity === 'low' ? 1 :
- meta.sensitiveMediaDetectionSensitivity === 'medium' ? 2 :
- meta.sensitiveMediaDetectionSensitivity === 'high' ? 3 :
- meta.sensitiveMediaDetectionSensitivity === 'veryHigh' ? 4 : 0;
- setSensitiveFlagAutomatically.value = meta.setSensitiveFlagAutomatically;
- enableSensitiveMediaDetectionForVideos.value = meta.enableSensitiveMediaDetectionForVideos;
- enableIpLogging.value = meta.enableIpLogging;
- enableActiveEmailValidation.value = meta.enableActiveEmailValidation;
- enableVerifymailApi.value = meta.enableVerifymailApi;
- verifymailAuthKey.value = meta.verifymailAuthKey;
- enableTruemailApi.value = meta.enableTruemailApi;
- truemailInstance.value = meta.truemailInstance;
- truemailAuthKey.value = meta.truemailAuthKey;
- bannedEmailDomains.value = meta.bannedEmailDomains?.join('\n') || '';
-}
-
-function save() {
- os.apiWithDialog('admin/update-meta', {
- sensitiveMediaDetection: sensitiveMediaDetection.value,
+const sensitiveMediaDetectionForm = useForm({
+ sensitiveMediaDetection: meta.sensitiveMediaDetection,
+ sensitiveMediaDetectionSensitivity: meta.sensitiveMediaDetectionSensitivity === 'veryLow' ? 0 :
+ meta.sensitiveMediaDetectionSensitivity === 'low' ? 1 :
+ meta.sensitiveMediaDetectionSensitivity === 'medium' ? 2 :
+ meta.sensitiveMediaDetectionSensitivity === 'high' ? 3 :
+ meta.sensitiveMediaDetectionSensitivity === 'veryHigh' ? 4 : 0,
+ setSensitiveFlagAutomatically: meta.setSensitiveFlagAutomatically,
+ enableSensitiveMediaDetectionForVideos: meta.enableSensitiveMediaDetectionForVideos,
+}, async (state) => {
+ await os.apiWithDialog('admin/update-meta', {
+ sensitiveMediaDetection: state.sensitiveMediaDetection,
sensitiveMediaDetectionSensitivity:
- sensitiveMediaDetectionSensitivity.value === 0 ? 'veryLow' :
- sensitiveMediaDetectionSensitivity.value === 1 ? 'low' :
- sensitiveMediaDetectionSensitivity.value === 2 ? 'medium' :
- sensitiveMediaDetectionSensitivity.value === 3 ? 'high' :
- sensitiveMediaDetectionSensitivity.value === 4 ? 'veryHigh' :
+ state.sensitiveMediaDetectionSensitivity === 0 ? 'veryLow' :
+ state.sensitiveMediaDetectionSensitivity === 1 ? 'low' :
+ state.sensitiveMediaDetectionSensitivity === 2 ? 'medium' :
+ state.sensitiveMediaDetectionSensitivity === 3 ? 'high' :
+ state.sensitiveMediaDetectionSensitivity === 4 ? 'veryHigh' :
0,
- setSensitiveFlagAutomatically: setSensitiveFlagAutomatically.value,
- enableSensitiveMediaDetectionForVideos: enableSensitiveMediaDetectionForVideos.value,
- enableIpLogging: enableIpLogging.value,
- enableActiveEmailValidation: enableActiveEmailValidation.value,
- enableVerifymailApi: enableVerifymailApi.value,
- verifymailAuthKey: verifymailAuthKey.value,
- enableTruemailApi: enableTruemailApi.value,
- truemailInstance: truemailInstance.value,
- truemailAuthKey: truemailAuthKey.value,
- bannedEmailDomains: bannedEmailDomains.value.split('\n'),
- }).then(() => {
- fetchInstance(true);
+ setSensitiveFlagAutomatically: state.setSensitiveFlagAutomatically,
+ enableSensitiveMediaDetectionForVideos: state.enableSensitiveMediaDetectionForVideos,
});
-}
+ fetchInstance(true);
+});
+
+const ipLoggingForm = useForm({
+ enableIpLogging: meta.enableIpLogging,
+}, async (state) => {
+ await os.apiWithDialog('admin/update-meta', {
+ enableIpLogging: state.enableIpLogging,
+ });
+ fetchInstance(true);
+});
+
+const emailValidationForm = useForm({
+ enableActiveEmailValidation: meta.enableActiveEmailValidation,
+ enableVerifymailApi: meta.enableVerifymailApi,
+ verifymailAuthKey: meta.verifymailAuthKey,
+ enableTruemailApi: meta.enableTruemailApi,
+ truemailInstance: meta.truemailInstance,
+ truemailAuthKey: meta.truemailAuthKey,
+}, async (state) => {
+ await os.apiWithDialog('admin/update-meta', {
+ enableActiveEmailValidation: state.enableActiveEmailValidation,
+ enableVerifymailApi: state.enableVerifymailApi,
+ verifymailAuthKey: state.verifymailAuthKey,
+ enableTruemailApi: state.enableTruemailApi,
+ truemailInstance: state.truemailInstance,
+ truemailAuthKey: state.truemailAuthKey,
+ });
+ fetchInstance(true);
+});
+
+const bannedEmailDomainsForm = useForm({
+ bannedEmailDomains: meta.bannedEmailDomains?.join('\n') || '',
+}, async (state) => {
+ await os.apiWithDialog('admin/update-meta', {
+ bannedEmailDomains: state.bannedEmailDomains.split('\n'),
+ });
+ fetchInstance(true);
+});
const headerActions = computed(() => []);
diff --git a/packages/frontend/src/pages/admin/settings.vue b/packages/frontend/src/pages/admin/settings.vue
index 0466cad19e..c8f2e6bd23 100644
--- a/packages/frontend/src/pages/admin/settings.vue
+++ b/packages/frontend/src/pages/admin/settings.vue
@@ -8,224 +8,248 @@ SPDX-License-Identifier: AGPL-3.0-only
-
-
-
-
- {{ i18n.ts.botProtection }}
- hCaptcha
- mCaptcha
- reCAPTCHA
- Turnstile
- {{ i18n.ts.none }} ({{ i18n.ts.notRecommended }})
+
+
+
+
+ {{ i18n.ts.sensitiveMediaDetection }}
+ {{ i18n.ts.all }}
+ {{ i18n.ts.localOnly }}
+ {{ i18n.ts.remoteOnly }}
+ {{ i18n.ts.none }}
+
+
-
- {{ i18n.ts.sensitiveMediaDetection }}
- {{ i18n.ts.all }}
- {{ i18n.ts.localOnly }}
- {{ i18n.ts.remoteOnly }}
- {{ i18n.ts.none }}
+
+
-
- Active Email Validation
- Enabled
- Disabled
+
+ Banned Email Domains
+
+
+
-
- Banned Email Domains
+
+ Log IP address
+ Enabled
+ Disabled
+
+
-
-
- Log IP address
- Enabled
- Disabled
-
-
-
-
+
+ {{ i18n.ts._sensitiveMediaDetection.description }}
-
+ Active Email Validation
+ Enabled
+ Disabled
+
+ {{ i18n.ts.save }}
-
-
- {{ i18n.ts._sensitiveMediaDetection.description }}
+
+
+
+
+
+
-
-
-
-
-
-
+
+ {{ i18n.ts._sensitiveMediaDetection.sensitivity }}
+ {{ i18n.ts._sensitiveMediaDetection.sensitivityDescription }}
+
-
- {{ i18n.ts._sensitiveMediaDetection.sensitivity }}
- {{ i18n.ts._sensitiveMediaDetection.sensitivityDescription }}
-
+
+ {{ i18n.ts._sensitiveMediaDetection.analyzeVideos }}{{ i18n.ts.beta }}
+ {{ i18n.ts._sensitiveMediaDetection.analyzeVideosDescription }}
+
-
- {{ i18n.ts._sensitiveMediaDetection.analyzeVideos }}{{ i18n.ts.beta }}
- {{ i18n.ts._sensitiveMediaDetection.analyzeVideosDescription }}
-
+
+ {{ i18n.ts._sensitiveMediaDetection.setSensitiveFlagAutomatically }} ({{ i18n.ts.notRecommended }})
+ {{ i18n.ts._sensitiveMediaDetection.setSensitiveFlagAutomaticallyDescription }}
+
-
- {{ i18n.ts._sensitiveMediaDetection.setSensitiveFlagAutomatically }} ({{ i18n.ts.notRecommended }})
- {{ i18n.ts._sensitiveMediaDetection.setSensitiveFlagAutomaticallyDescription }}
-
+
+
+
-
+
+ {{ i18n.ts.activeEmailValidationDescription }}
+
+ Enable
+
+
+ Use Verifymail.io API
+
+
+
+ Verifymail.io API Auth Key
+
+
+ Use TrueMail API
+
+
+
+ TrueMail API Instance
+
+
+
+ TrueMail API Auth Key
+
+
+
- {{ i18n.ts.activeEmailValidationDescription }}
-
- Enable
-
-
- Use Verifymail.io API
-
-
-
- Verifymail.io API Auth Key
-
-
- Use TrueMail API
-
-
-
- TrueMail API Instance
-
-
-
- TrueMail API Auth Key
-
- {{ i18n.ts.save }}
-
-
+
+ Banned Email Domains List
+
+
+
-
- Banned Email Domains List
-
- {{ i18n.ts.save }}
-
-
-
- Enable
-
-
-
+
+ Enable
+
+
+
-
- {{ i18n.ts.instanceName }}
-
+
+
+
+ {{ i18n.ts.info }}
+
+
- {{ i18n.ts._serverSettings.shortName }} ({{ i18n.ts.optional }})
- {{ i18n.ts._serverSettings.shortNameDescription }}
-
-
-
- {{ i18n.ts.instanceDescription }}
-
-
-
-
- {{ i18n.ts.maintainerName }}
+
+
+
+
+ {{ i18n.ts.pinnedUsers }}
+
+
+ {{ i18n.ts.pinnedUsers }}{{ i18n.ts.modified }}
{{ i18n.ts.pinnedUsersDescription }}
+
-
- {{ i18n.ts.files }}
+
+
+ {{ i18n.ts.files }}
+
+
-
+
{{ i18n.ts.import }}
@@ -63,7 +63,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.export }}
-
+
{{ i18n.ts.import }}
{{ i18n.ts.import }}
@@ -78,7 +78,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.export }}
-
+
{{ i18n.ts.import }}
{{ i18n.ts.import }}
@@ -93,7 +93,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.export }}
-
+
{{ i18n.ts.import }}
{{ i18n.ts.import }}
@@ -108,7 +108,7 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.export }}
-
+
{{ i18n.ts.import }}
{{ i18n.ts.import }}
diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index c6547f6814..6cbd56e03a 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -75,7 +75,7 @@ import { antennasCache, userListsCache, favoritedChannelsCache } from '@/cache.j
import { globalEvents } from '@/events.js';
import { deviceKind } from '@/scripts/device-kind.js';
import { deepMerge } from '@/scripts/merge.js';
-import { MenuItem } from '@/types/menu.js';
+import type { MenuItem } from '@/types/menu.js';
import { miLocalStorage } from '@/local-storage.js';
import { availableBasicTimelines, hasWithReplies, isAvailableBasicTimeline, isBasicTimeline, basicTimelineIconClass } from '@/timelines.js';
import { reloadAsk } from '@/scripts/reload-ask.js';
@@ -249,7 +249,7 @@ async function chooseChannel(ev: MouseEvent): Promise {
}),
(channels.length === 0 ? undefined : { type: 'divider' }),
{
- type: 'link' as const,
+ type: 'link',
icon: 'ti ti-plus',
text: i18n.ts.createNew,
to: '/channels',
@@ -318,24 +318,36 @@ const headerActions = computed(() => {
icon: 'ti ti-dots',
text: i18n.ts.options,
handler: (ev) => {
- os.popupMenu([{
+ const menuItems: MenuItem[] = [];
+
+ menuItems.push({
type: 'switch',
text: i18n.ts.friendlyEnableNotifications,
ref: friendlyEnableNotifications,
- }, {
+ });
+
+ menuItems.push({
type: 'switch',
text: i18n.ts.friendlyEnableWidgets,
ref: friendlyEnableWidgets,
- }, {
+ });
+
+ menuItems.push({
type: 'switch',
text: i18n.ts.showRenotes,
ref: withRenotes,
- }, isBasicTimeline(src.value) && hasWithReplies(src.value) ? {
- type: 'switch',
- text: i18n.ts.showRepliesToOthersInTimeline,
- ref: withReplies,
- disabled: onlyFiles,
- } : undefined, {
+ });
+
+ if (isBasicTimeline(src.value) && hasWithReplies(src.value)) {
+ menuItems.push({
+ type: 'switch',
+ text: i18n.ts.showRepliesToOthersInTimeline,
+ ref: withReplies,
+ disabled: onlyFiles,
+ });
+ }
+
+ menuItems.push({
type: 'switch',
text: i18n.ts.withSensitive,
ref: withSensitive,
@@ -348,7 +360,9 @@ const headerActions = computed(() => {
type: 'switch',
text: i18n.ts.showCatOnly,
ref: onlyCats,
- }], ev.currentTarget ?? ev.target);
+ });
+
+ os.popupMenu(menuItems, ev.currentTarget ?? ev.target);
},
},
];
diff --git a/packages/frontend/src/router/definition.ts b/packages/frontend/src/router/definition.ts
index adea9d14ce..c4b14d3afb 100644
--- a/packages/frontend/src/router/definition.ts
+++ b/packages/frontend/src/router/definition.ts
@@ -475,22 +475,14 @@ const routes: RouteDef[] = [{
path: '/relays',
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')),
}, {
path: '/external-services',
name: 'external-services',
component: page(() => import('@/pages/admin/external-services.vue')),
}, {
- path: '/other-settings',
- name: 'other-settings',
- component: page(() => import('@/pages/admin/other-settings.vue')),
+ path: '/performance',
+ name: 'performance',
+ component: page(() => import('@/pages/admin/performance.vue')),
}, {
path: '/server-rules',
name: 'server-rules',
diff --git a/packages/frontend/src/scripts/add-dividers-between-menu-sections.ts b/packages/frontend/src/scripts/add-dividers-between-menu-sections.ts
index 050c0f5cc1..6a20d47b67 100644
--- a/packages/frontend/src/scripts/add-dividers-between-menu-sections.ts
+++ b/packages/frontend/src/scripts/add-dividers-between-menu-sections.ts
@@ -3,11 +3,11 @@
* SPDX-License-Identifier: AGPL-3.0-only
*/
-import { MenuItem } from '@/types/menu.js';
+import type { MenuItem } from '@/types/menu.js';
// Add dividers between menu sections. if some menu section has menu item
-export function addDividersBetweenMenuSections(...sections:MenuItem[][]): MenuItem[] {
- const result:MenuItem[] = [];
+export function addDividersBetweenMenuSections(...sections: MenuItem[][]): MenuItem[] {
+ const result: MenuItem[] = [];
let needDivider = false;
for (const section of sections) {
diff --git a/packages/frontend/src/scripts/get-drive-file-menu.ts b/packages/frontend/src/scripts/get-drive-file-menu.ts
index 38f45dc734..35795e4171 100644
--- a/packages/frontend/src/scripts/get-drive-file-menu.ts
+++ b/packages/frontend/src/scripts/get-drive-file-menu.ts
@@ -9,7 +9,7 @@ import { i18n } from '@/i18n.js';
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
import * as os from '@/os.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
-import { MenuItem } from '@/types/menu.js';
+import type { MenuItem } from '@/types/menu.js';
import { defaultStore } from '@/store.js';
function rename(file: Misskey.entities.DriveFile) {
@@ -87,8 +87,10 @@ async function deleteFile(file: Misskey.entities.DriveFile) {
export function getDriveFileMenu(file: Misskey.entities.DriveFile, folder?: Misskey.entities.DriveFolder | null): MenuItem[] {
const isImage = file.type.startsWith('image/');
- let menu;
- menu = [{
+
+ const menuItems: MenuItem[] = [];
+
+ menuItems.push({
type: 'link',
to: `/my/drive/file/${file.id}`,
text: i18n.ts._fileViewer.title,
@@ -109,14 +111,20 @@ export function getDriveFileMenu(file: Misskey.entities.DriveFile, folder?: Miss
text: i18n.ts.describeFile,
icon: 'ti ti-text-caption',
action: () => describe(file),
- }, ...isImage ? [{
- text: i18n.ts.cropImage,
- icon: 'ti ti-crop',
- action: () => os.cropImage(file, {
- aspectRatio: NaN,
- uploadFolder: folder ? folder.id : folder,
- }),
- }] : [], { type: 'divider' }, {
+ });
+
+ if (isImage) {
+ menuItems.push({
+ text: i18n.ts.cropImage,
+ icon: 'ti ti-crop',
+ action: () => os.cropImage(file, {
+ aspectRatio: NaN,
+ uploadFolder: folder ? folder.id : folder,
+ }),
+ });
+ }
+
+ menuItems.push({ type: 'divider' }, {
text: i18n.ts.createNoteFromTheFile,
icon: 'ti ti-pencil',
action: () => os.post({
@@ -138,18 +146,18 @@ export function getDriveFileMenu(file: Misskey.entities.DriveFile, folder?: Miss
icon: 'ti ti-trash',
danger: true,
action: () => deleteFile(file),
- }];
+ });
if (defaultStore.state.devMode) {
- menu = menu.concat([{ type: 'divider' }, {
+ menuItems.push({ type: 'divider' }, {
icon: 'ti ti-id',
text: i18n.ts.copyFileId,
action: () => {
copyToClipboard(file.id);
os.toast(i18n.ts.copied, 'copied');
},
- }]);
+ });
}
- return menu;
+ return menuItems;
}
diff --git a/packages/frontend/src/scripts/get-note-menu.ts b/packages/frontend/src/scripts/get-note-menu.ts
index 73315f563d..075105fbe5 100644
--- a/packages/frontend/src/scripts/get-note-menu.ts
+++ b/packages/frontend/src/scripts/get-note-menu.ts
@@ -17,7 +17,7 @@ import { defaultStore, noteActions } from '@/store.js';
import { miLocalStorage } from '@/local-storage.js';
import { getUserMenu } from '@/scripts/get-user-menu.js';
import { clipsCache, favoritedChannelsCache } from '@/cache.js';
-import { MenuItem } from '@/types/menu.js';
+import type { MenuItem } from '@/types/menu.js';
import MkRippleEffect from '@/components/MkRippleEffect.vue';
import { isSupportShare } from '@/scripts/navigator.js';
import { getAppearNote } from '@/scripts/get-appear-note.js';
@@ -100,11 +100,13 @@ export async function getNoteClipMenu(props: {
const { canceled, result } = await os.form(i18n.ts.createNewClip, {
name: {
type: 'string',
+ default: null,
label: i18n.ts.name,
},
description: {
type: 'string',
required: false,
+ default: null,
multiline: true,
label: i18n.ts.description,
},
@@ -320,7 +322,7 @@ export function getNoteMenu(props: {
title: i18n.ts.numberOfDays,
});
- if (canceled) return;
+ if (canceled || days == null) return;
os.apiWithDialog('admin/promo/create', {
noteId: appearNote.id,
@@ -375,79 +377,103 @@ export function getNoteMenu(props: {
props.noNyaize.value = false;
}
- let menu: MenuItem[];
+ const menuItems: MenuItem[] = [];
+
if ($i) {
const statePromise = misskeyApi('notes/state', {
noteId: appearNote.id,
});
- menu = [
- ...(
- props.currentClip?.userId === $i.id ? [{
- icon: 'ti ti-backspace',
- text: i18n.ts.unclip,
- danger: true,
- action: unclip,
- }, { type: 'divider' }] : []
- ), ...(isSupportShare() ? [{
+ if (props.currentClip?.userId === $i.id) {
+ menuItems.push({
+ icon: 'ti ti-backspace',
+ text: i18n.ts.unclip,
+ danger: true,
+ action: unclip,
+ }, { type: 'divider' });
+ }
+
+ if (isSupportShare()) {
+ menuItems.push({
icon: 'ti ti-share',
text: i18n.ts.share,
action: share,
- }] : []),
- getCopyNoteLinkMenu(appearNote, i18n.ts.copyLink)
- , {
- icon: 'ti ti-copy',
- text: i18n.ts.copyContent,
- action: copyContent,
- }, {
- icon: 'ti ti-external-link',
- text: i18n.ts.openInNewTab,
- action: openInNewTab,
- },
- $i && $i.policies.canUseTranslator && instance.translatorAvailable ? {
+ });
+ }
+
+ getCopyNoteLinkMenu(appearNote, i18n.ts.copyLink)
+
+ menuItems.push({
+ icon: 'ti ti-copy',
+ text: i18n.ts.copyContent,
+ action: copyContent,
+ }, {
+ icon: 'ti ti-external-link',
+ text: i18n.ts.openInNewTab,
+ action: openInNewTab,
+ });
+
+ if ($i.policies.canUseTranslator && instance.translatorAvailable) {
+ menuItems.push({
icon: 'ti ti-language-hiragana',
text: i18n.ts.translate,
action: translate,
- } : undefined,
- { type: 'divider' },
- statePromise.then(state => state.isFavorited ? {
- icon: 'ti ti-star-off',
- text: i18n.ts.unfavorite,
- action: () => toggleFavorite(false),
- } : {
- icon: 'ti ti-star',
- text: i18n.ts.favorite,
- action: () => toggleFavorite(true),
- }),
- {
- type: 'parent' as const,
- icon: 'ti ti-paperclip',
- text: i18n.ts.clip,
- children: () => getNoteClipMenu(props),
- },
- statePromise.then(state => state.isMutedThread ? {
- icon: 'ti ti-message-off',
- text: i18n.ts.unmuteThread,
- action: () => toggleThreadMute(false),
- } : {
- icon: 'ti ti-message-off',
- text: i18n.ts.muteThread,
- action: () => toggleThreadMute(true),
- }),
- appearNote.userId === $i.id ? ($i.pinnedNoteIds ?? []).includes(appearNote.id) ? {
- icon: 'ti ti-pinned-off',
- text: i18n.ts.unpin,
- action: () => togglePin(false),
- } : {
- icon: 'ti ti-pin',
- text: i18n.ts.pin,
- action: () => togglePin(true),
- } : undefined,
- {
- type: 'parent' as const,
- icon: 'ti ti-note',
- text: i18n.ts.note,
- children: [{
+ });
+ }
+
+ menuItems.push({ type: 'divider' });
+
+ menuItems.push(statePromise.then(state => state.isFavorited ? {
+ icon: 'ti ti-star-off',
+ text: i18n.ts.unfavorite,
+ action: () => toggleFavorite(false),
+ } : {
+ icon: 'ti ti-star',
+ text: i18n.ts.favorite,
+ action: () => toggleFavorite(true),
+ }));
+
+ menuItems.push({
+ type: 'parent',
+ icon: 'ti ti-paperclip',
+ text: i18n.ts.clip,
+ children: () => getNoteClipMenu(props),
+ });
+
+ menuItems.push(statePromise.then(state => state.isMutedThread ? {
+ icon: 'ti ti-message-off',
+ text: i18n.ts.unmuteThread,
+ action: () => toggleThreadMute(false),
+ } : {
+ icon: 'ti ti-message-off',
+ text: i18n.ts.muteThread,
+ action: () => toggleThreadMute(true),
+ }));
+
+ if (appearNote.userId === $i.id) {
+ if (($i.pinnedNoteIds ?? []).includes(appearNote.id)) {
+ menuItems.push({
+ icon: 'ti ti-pinned-off',
+ text: i18n.ts.unpin,
+ action: () => togglePin(false),
+ });
+ } else {
+ menuItems.push({
+ icon: 'ti ti-pin',
+ text: i18n.ts.pin,
+ action: () => togglePin(true),
+ });
+ }
+ }
+
+ menuItems.push({
+ type: 'parent',
+ icon: 'ti ti-note',
+ text: i18n.ts.note,
+ children: async () => {
+ const noteChildMenu = [] as MenuItem[];
+
+ noteChildMenu.push({
icon: 'ti ti-info-circle',
text: i18n.ts.details,
action: openDetail,
@@ -459,122 +485,134 @@ export function getNoteMenu(props: {
icon: 'ti ti-icons',
text: i18n.ts.reactionsList,
action: showReactions,
- }, (appearNote.url ?? appearNote.uri) ? {
- icon: 'ti ti-external-link',
- text: i18n.ts.showOnRemote,
- action: () => {
- window.open(appearNote.url ?? appearNote.uri, '_blank', 'noopener');
- },
- } : getNoteEmbedCodeMenu(appearNote, i18n.ts.genEmbedCode)
- , { type: 'divider' }
- , {
+ });
+
+ if (appearNote.url ?? appearNote.uri) {
+ noteChildMenu.push({
+ icon: 'ti ti-external-link',
+ text: i18n.ts.showOnRemote,
+ action: () => {
+ window.open(appearNote.url ?? appearNote.uri, '_blank', 'noopener');
+ },
+ });
+ } else {
+ noteChildMenu.push(getNoteEmbedCodeMenu(appearNote, i18n.ts.genEmbedCode));
+ }
+
+ noteChildMenu.push({ type: 'divider' });
+
+ noteChildMenu.push({
icon: 'ti ti-source-code',
text: i18n.ts.viewTextSource,
action: showViewTextSource,
+ });
+
+ if (props.noNyaize.value) {
+ noteChildMenu.push({
+ icon: 'ti ti-paw-filled',
+ text: i18n.ts.revertNoNyaization,
+ action: revertNoNyaizeText,
+ });
+ } else {
+ noteChildMenu.push({
+ icon: 'ti ti-paw-off',
+ text: i18n.ts.noNyaization,
+ action: noNyaizeText,
+ });
}
- , props.noNyaize.value ? {
- icon: 'ti ti-paw-filled',
- text: i18n.ts.revertNoNyaization,
- action: revertNoNyaizeText,
- } : {
- icon: 'ti ti-paw-off',
- text: i18n.ts.noNyaization,
- action: noNyaizeText,
+
+ if (appearNote.userId === $i.id) {
+ noteChildMenu.push({ type: 'divider' });
+ noteChildMenu.push({
+ icon: 'ti ti-edit-circle',
+ text: i18n.ts.copyAndEdit,
+ action: copyEdit,
+ });
}
- , (appearNote.userId === $i.id) ? { type: 'divider' } : undefined
- , (appearNote.userId === $i.id) ? {
- icon: 'ti ti-edit-circle',
- text: i18n.ts.copyAndEdit,
- action: copyEdit,
- } : undefined],
+
+ return noteChildMenu;
},
- {
- type: 'parent' as const,
- icon: 'ti ti-user',
- text: i18n.ts.user,
+ });
+
+ menuItems.push({
+ type: 'parent',
+ icon: 'ti ti-user',
+ text: i18n.ts.user,
+ children: async () => {
+ const user = appearNote.userId === $i?.id ? $i : await misskeyApi('users/show', { userId: appearNote.userId });
+ const { menu, cleanup } = getUserMenu(user);
+ cleanups.push(cleanup);
+ return menu;
+ },
+ });
+
+ if (appearNote.userId !== $i.id || props.note.userId !== $i.id) {
+ menuItems.push({ type: 'divider' });
+ if (appearNote.userId !== $i.id) menuItems.push(getAbuseNoteMenu(appearNote, i18n.ts.reportAbuse));
+ if (props.note.userId !== $i.id) menuItems.push(getAbuseNoteMenu(props.note, i18n.ts.reportAbuseRenote));
+ }
+
+ if (appearNote.channel && (appearNote.channel.userId === $i.id || $i.isModerator || $i.isAdmin)) {
+ menuItems.push({ type: 'divider' });
+ menuItems.push({
+ type: 'parent',
+ icon: 'ti ti-device-tv',
+ text: i18n.ts.channel,
children: async () => {
- const user = appearNote.userId === $i?.id ? $i : await misskeyApi('users/show', { userId: appearNote.userId });
- const { menu, cleanup } = getUserMenu(user);
- cleanups.push(cleanup);
- return menu;
- },
- },
- /*
- ...($i.isModerator || $i.isAdmin ? [
- { type: 'divider' },
- {
- icon: 'ti ti-speakerphone',
- text: i18n.ts.promote,
- action: promote
- }]
- : []
- ),*/
- ...(appearNote.userId !== $i.id || props.note.userId !== $i.id ? [
- { type: 'divider' },
- appearNote.userId !== $i.id ? getAbuseNoteMenu(appearNote, i18n.ts.reportAbuse) : undefined,
- props.note.userId !== $i.id ? getAbuseNoteMenu(props.note, i18n.ts.reportAbuseRenote) : undefined,
- ]
- : []
- ),
- ...(appearNote.channel && (appearNote.channel.userId === $i.id || $i.isModerator || $i.isAdmin) ? [
- { type: 'divider' },
- {
- type: 'parent' as const,
- icon: 'ti ti-device-tv',
- text: i18n.ts.channel,
- children: async () => {
- const channelChildMenu = [] as MenuItem[];
+ const channelChildMenu = [] as MenuItem[];
- const channel = await misskeyApi('channels/show', { channelId: appearNote.channel!.id });
+ const channel = await misskeyApi('channels/show', { channelId: appearNote.channel!.id });
- if (channel.pinnedNoteIds.includes(appearNote.id)) {
- channelChildMenu.push({
- icon: 'ti ti-pinned-off',
- text: i18n.ts.unpin,
- action: () => os.apiWithDialog('channels/update', {
- channelId: appearNote.channel!.id,
- pinnedNoteIds: channel.pinnedNoteIds.filter(id => id !== appearNote.id),
- }),
- });
- } else {
- channelChildMenu.push({
- icon: 'ti ti-pin',
- text: i18n.ts.pin,
- action: () => os.apiWithDialog('channels/update', {
- channelId: appearNote.channel!.id,
- pinnedNoteIds: [...channel.pinnedNoteIds, appearNote.id],
- }),
- });
- }
- return channelChildMenu;
- },
+ if (channel.pinnedNoteIds.includes(appearNote.id)) {
+ channelChildMenu.push({
+ icon: 'ti ti-pinned-off',
+ text: i18n.ts.unpin,
+ action: () => os.apiWithDialog('channels/update', {
+ channelId: appearNote.channel!.id,
+ pinnedNoteIds: channel.pinnedNoteIds.filter(id => id !== appearNote.id),
+ }),
+ });
+ } else {
+ channelChildMenu.push({
+ icon: 'ti ti-pin',
+ text: i18n.ts.pin,
+ action: () => os.apiWithDialog('channels/update', {
+ channelId: appearNote.channel!.id,
+ pinnedNoteIds: [...channel.pinnedNoteIds, appearNote.id],
+ }),
+ });
+ }
+ return channelChildMenu;
},
- ]
- : []
- ),
- ...(appearNote.userId === $i.id || $i.isModerator || $i.isAdmin ? [
- { type: 'divider' },
- appearNote.userId === $i.id && $i.policies.canEditNote ? {
- icon: 'ti ti-edit',
- text: i18n.ts.edit,
- action: edit,
- } : undefined,
- appearNote.userId === $i.id ? {
+ });
+ }
+
+ if (appearNote.userId === $i.id || $i.isModerator || $i.isAdmin) {
+ menuItems.push({ type: 'divider' });
+ if (appearNote.userId === $i.id) {
+ if ($i.policies.canEditNote) {
+ menuItems.push({
+ icon: 'ti ti-edit',
+ text: i18n.ts.edit,
+ action: edit,
+ });
+ }
+
+ menuItems.push({
icon: 'ti ti-eraser',
text: i18n.ts.deleteAndEdit,
action: delEdit,
- } : undefined,
- {
- icon: 'ti ti-trash',
- text: i18n.ts.delete,
- danger: true,
- action: del,
- }]
- : []
- )]
- .filter(x => x !== undefined);
+ });
+ }
+ menuItems.push({
+ icon: 'ti ti-trash',
+ text: i18n.ts.delete,
+ danger: true,
+ action: del,
+ });
+ }
} else {
- menu = [{
+ menuItems.push({
icon: 'ti ti-info-circle',
text: i18n.ts.details,
action: openDetail,
@@ -582,36 +620,42 @@ export function getNoteMenu(props: {
icon: 'ti ti-copy',
text: i18n.ts.copyContent,
action: copyContent,
- }, getCopyNoteLinkMenu(appearNote, i18n.ts.copyLink)
- , (appearNote.url ?? appearNote.uri) ? {
- icon: 'ti ti-external-link',
- text: i18n.ts.showOnRemote,
- action: () => {
- window.open(appearNote.url ?? appearNote.uri, '_blank', 'noopener');
- },
- } : getNoteEmbedCodeMenu(appearNote, i18n.ts.genEmbedCode)]
- .filter(x => x !== undefined);
+ }, getCopyNoteLinkMenu(appearNote, i18n.ts.copyLink));
+
+ if (appearNote.url ?? appearNote.uri) {
+ menuItems.push({
+ icon: 'ti ti-external-link',
+ text: i18n.ts.showOnRemote,
+ action: () => {
+ window.open(appearNote.url ?? appearNote.uri, '_blank', 'noopener');
+ },
+ });
+ } else {
+ menuItems.push(getNoteEmbedCodeMenu(appearNote, i18n.ts.genEmbedCode));
+ }
}
if (noteActions.length > 0) {
- menu = menu.concat([{ type: 'divider' }, ...noteActions.map(action => ({
+ menuItems.push({ type: 'divider' });
+
+ menuItems.push(...noteActions.map(action => ({
icon: 'ti ti-plug',
text: action.title,
action: () => {
action.handler(appearNote);
},
- }))]);
+ })));
}
if (defaultStore.state.devMode) {
- menu = menu.concat([{ type: 'divider' }, {
+ menuItems.push({ type: 'divider' }, {
icon: 'ti ti-id',
text: i18n.ts.copyNoteId,
action: () => {
copyToClipboard(appearNote.id);
os.toast(i18n.ts.copied, 'copied');
},
- }]);
+ });
}
const cleanup = () => {
@@ -622,7 +666,7 @@ export function getNoteMenu(props: {
};
return {
- menu,
+ menu: menuItems,
cleanup,
};
}
diff --git a/packages/frontend/src/scripts/get-user-menu.ts b/packages/frontend/src/scripts/get-user-menu.ts
index 86c03e2457..79c0cfca7e 100644
--- a/packages/frontend/src/scripts/get-user-menu.ts
+++ b/packages/frontend/src/scripts/get-user-menu.ts
@@ -18,7 +18,7 @@ import { IRouter } from '@/nirax.js';
import { antennasCache, rolesCache, userListsCache } from '@/cache.js';
import { mainRouter } from '@/router/main.js';
import { genEmbedCode } from '@/scripts/get-embed-code.js';
-import { MenuItem } from '@/types/menu.js';
+import type { MenuItem } from '@/types/menu.js';
import { editNickname } from '@/scripts/edit-nickname.js';
import { globalEvents } from '@/events.js';
@@ -176,51 +176,70 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
});
}
- let menu: MenuItem[] = [{
+ const menuItems: MenuItem[] = [];
+
+ menuItems.push({
icon: 'ti ti-at',
text: i18n.ts.copyUsername,
action: () => {
copyToClipboard(`@${user.username}@${user.host ?? host}`);
os.toast(i18n.ts.copied, 'copied');
},
- }, ...( notesSearchAvailable && (user.host == null || canSearchNonLocalNotes) ? [{
- icon: 'ti ti-search',
- text: i18n.ts.searchThisUsersNotes,
- action: () => {
- router.push(`/search?username=${encodeURIComponent(user.username)}${user.host != null ? '&host=' + encodeURIComponent(user.host) : ''}`);
- },
- }] : [])
- , ...(iAmModerator ? [{
- icon: 'ti ti-user-exclamation',
- text: i18n.ts.moderation,
- action: () => {
- router.push(`/admin/user/${user.id}`);
- },
- }] : []), {
+ });
+
+ if (notesSearchAvailable && (user.host == null || canSearchNonLocalNotes)) {
+ menuItems.push({
+ icon: 'ti ti-search',
+ text: i18n.ts.searchThisUsersNotes,
+ action: () => {
+ router.push(`/search?username=${encodeURIComponent(user.username)}${user.host != null ? '&host=' + encodeURIComponent(user.host) : ''}`);
+ },
+ });
+ }
+
+ if (iAmModerator) {
+ menuItems.push({
+ icon: 'ti ti-user-exclamation',
+ text: i18n.ts.moderation,
+ action: () => {
+ router.push(`/admin/user/${user.id}`);
+ },
+ });
+ }
+
+ menuItems.push({
icon: 'ti ti-rss',
text: i18n.ts.copyRSS,
action: () => {
copyToClipboard(`${user.host ?? host}/@${user.username}.atom`);
os.toast(i18n.ts.copied, 'copied');
},
- }, ...(user.host != null && user.url != null ? [{
- icon: 'ti ti-external-link',
- text: i18n.ts.showOnRemote,
- action: () => {
- if (user.url == null) return;
- window.open(user.url, '_blank', 'noopener');
- },
- }] : [{
- icon: 'ti ti-code',
- text: i18n.ts.genEmbedCode,
- type: 'parent' as const,
- children: [{
- text: i18n.ts.noteOfThisUser,
+ });
+
+ if (user.host != null && user.url != null) {
+ menuItems.push({
+ icon: 'ti ti-external-link',
+ text: i18n.ts.showOnRemote,
action: () => {
- genEmbedCode('user-timeline', user.id);
+ if (user.url == null) return;
+ window.open(user.url, '_blank', 'noopener');
},
- }], // TODO: ユーザーカードの埋め込みなど
- }]), {
+ });
+ } else {
+ menuItems.push({
+ icon: 'ti ti-code',
+ text: i18n.ts.genEmbedCode,
+ type: 'parent',
+ children: [{
+ text: i18n.ts.noteOfThisUser,
+ action: () => {
+ genEmbedCode('user-timeline', user.id);
+ },
+ }], // TODO: ユーザーカードの埋め込みなど
+ });
+ }
+
+ menuItems.push({
icon: 'ti ti-share',
text: i18n.ts.copyProfileUrl,
action: () => {
@@ -228,97 +247,119 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
copyToClipboard(`${url}/${canonical}`);
os.toast(i18n.ts.copiedLink, 'copied');
},
- }, ...($i ? [{
- icon: 'ti ti-mail',
- text: i18n.ts.sendMessage,
- action: () => {
- const canonical = user.host === null ? `@${user.username}` : `@${user.username}@${user.host}`;
- os.post({ specified: user, initialText: `${canonical} ` });
- },
- }, meId !== user.id ? {
- type: 'link',
- icon: 'ti ti-messages',
- text: i18n.ts.startMessaging,
- to: `/my/messaging/@${user.host === null ? user.username : user.username + '@' + user.host}`,
- } : undefined, meId !== user.id && user.host === null ? {
- icon: 'ti ti-users',
- text: i18n.ts.inviteToGroup,
- action: inviteGroup,
- } : undefined, { type: 'divider' }, ...(defaultStore.state.nicknameEnabled ? [{
- icon: 'ti ti-edit',
- text: i18n.ts.editNickName,
- action: () => {
- editNickname(user);
- },
- }] : []), {
- icon: 'ti ti-pencil',
- text: i18n.ts.editMemo,
- action: editMemo,
- }, {
- type: 'parent',
- icon: 'ti ti-list',
- text: i18n.ts.addToList,
- children: async () => {
- const lists = await userListsCache.fetch();
- return lists.map(list => {
- const isListed = ref(list.userIds.includes(user.id));
- cleanups.push(watch(isListed, () => {
- if (isListed.value) {
- os.apiWithDialog('users/lists/push', {
- listId: list.id,
- userId: user.id,
- }).then(() => {
- list.userIds.push(user.id);
- });
- } else {
- os.apiWithDialog('users/lists/pull', {
- listId: list.id,
- userId: user.id,
- }).then(() => {
- list.userIds.splice(list.userIds.indexOf(user.id), 1);
- });
- }
- }));
+ });
- return {
- type: 'switch',
- text: list.name,
- ref: isListed,
- };
+ if ($i) {
+ menuItems.push({
+ icon: 'ti ti-mail',
+ text: i18n.ts.sendMessage,
+ action: () => {
+ const canonical = user.host === null ? `@${user.username}` : `@${user.username}@${user.host}`;
+ os.post({ specified: user, initialText: `${canonical} ` });
+ },
+ });
+
+ if (meId !== user.id) {
+ menuItems.push({
+ type: 'link',
+ icon: 'ti ti-messages',
+ text: i18n.ts.startMessaging,
+ to: `/my/messaging/@${user.host === null ? user.username : user.username + '@' + user.host}`,
});
- },
- }, {
- type: 'parent',
- icon: 'ti ti-antenna',
- text: i18n.ts.addToAntenna,
- children: async () => {
- const antennas = await antennasCache.fetch();
- const canonical = user.host === null ? `@${user.username}` : `@${user.username}@${toUnicode(user.host)}`;
- return antennas.filter((a) => a.src === 'users').map(antenna => ({
- text: antenna.name,
- action: async () => {
- await os.apiWithDialog('antennas/update', {
- antennaId: antenna.id,
- name: antenna.name,
- keywords: antenna.keywords,
- excludeKeywords: antenna.excludeKeywords,
- src: antenna.src,
- userListId: antenna.userListId,
- users: [...antenna.users, canonical],
- caseSensitive: antenna.caseSensitive,
- withReplies: antenna.withReplies,
- withFile: antenna.withFile,
- notify: antenna.notify,
- });
- antennasCache.delete();
+
+ if (user.host === null) {
+ menuItems.push({
+ icon: 'ti ti-users',
+ text: i18n.ts.inviteToGroup,
+ action: inviteGroup,
+ });
+ }
+ }
+
+ if (defaultStore.state.nicknameEnabled) {
+ menuItems.push({ type: 'divider' }, {
+ icon: 'ti ti-edit',
+ text: i18n.ts.editNickName,
+ action: () => {
+ editNickname(user);
},
- }));
- },
- }] : [])] as any;
+ });
+ }
+
+ menuItems.push({
+ icon: 'ti ti-pencil',
+ text: i18n.ts.editMemo,
+ action: editMemo,
+ });
+
+ menuItems.push({
+ type: 'parent',
+ icon: 'ti ti-list',
+ text: i18n.ts.addToList,
+ children: async () => {
+ const lists = await userListsCache.fetch();
+ return lists.map(list => {
+ const isListed = ref(list.userIds?.includes(user.id) ?? false);
+ cleanups.push(watch(isListed, () => {
+ if (isListed.value) {
+ os.apiWithDialog('users/lists/push', {
+ listId: list.id,
+ userId: user.id,
+ }).then(() => {
+ list.userIds?.push(user.id);
+ });
+ } else {
+ os.apiWithDialog('users/lists/pull', {
+ listId: list.id,
+ userId: user.id,
+ }).then(() => {
+ list.userIds?.splice(list.userIds?.indexOf(user.id), 1);
+ });
+ }
+ }));
+
+ return {
+ type: 'switch',
+ text: list.name,
+ ref: isListed,
+ };
+ });
+ },
+ });
+
+ menuItems.push({
+ type: 'parent',
+ icon: 'ti ti-antenna',
+ text: i18n.ts.addToAntenna,
+ children: async () => {
+ const antennas = await antennasCache.fetch();
+ const canonical = user.host === null ? `@${user.username}` : `@${user.username}@${toUnicode(user.host)}`;
+ return antennas.filter((a) => a.src === 'users').map(antenna => ({
+ text: antenna.name,
+ action: async () => {
+ await os.apiWithDialog('antennas/update', {
+ antennaId: antenna.id,
+ name: antenna.name,
+ keywords: antenna.keywords,
+ excludeKeywords: antenna.excludeKeywords,
+ src: antenna.src,
+ userListId: antenna.userListId,
+ users: [...antenna.users, canonical],
+ caseSensitive: antenna.caseSensitive,
+ withReplies: antenna.withReplies,
+ withFile: antenna.withFile,
+ notify: antenna.notify,
+ });
+ antennasCache.delete();
+ },
+ }));
+ },
+ });
+ }
if ($i && meId !== user.id) {
if (iAmModerator) {
- menu = menu.concat([{
+ menuItems.push({
type: 'parent',
icon: 'ti ti-badges',
text: i18n.ts.roles,
@@ -356,13 +397,14 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
},
}));
},
- }]);
+ });
}
// フォローしたとしても user.isFollowing はリアルタイム更新されないので不便なため
//if (user.isFollowing) {
- const withRepliesRef = ref(user.withReplies);
- menu = menu.concat([{
+ const withRepliesRef = ref(user.withReplies ?? false);
+
+ menuItems.push({
type: 'switch',
icon: 'ti ti-messages',
text: i18n.ts.showRepliesToOthersInTimeline,
@@ -371,7 +413,8 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
icon: user.notify === 'none' ? 'ti ti-bell' : 'ti ti-bell-off',
text: user.notify === 'none' ? i18n.ts.notifyNotes : i18n.ts.unnotifyNotes,
action: toggleNotify,
- }]);
+ });
+
watch(withRepliesRef, (withReplies) => {
misskeyApi('following/update', {
userId: user.id,
@@ -382,7 +425,7 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
});
//}
- menu = menu.concat([{ type: 'divider' }, {
+ menuItems.push({ type: 'divider' }, {
icon: user.isMuted ? 'ti ti-eye' : 'ti ti-eye-off',
text: user.isMuted ? i18n.ts.unmute : i18n.ts.mute,
action: toggleMute,
@@ -394,71 +437,69 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: IRouter
icon: 'ti ti-ban',
text: user.isBlocking ? i18n.ts.unblock : i18n.ts.block,
action: toggleBlock,
- }]);
+ });
if (user.isFollowed) {
- menu = menu.concat([{
+ menuItems.push({
icon: 'ti ti-link-off',
text: i18n.ts.breakFollow,
action: invalidateFollow,
- }]);
+ });
}
- menu = menu.concat([{ type: 'divider' }, {
+ menuItems.push({ type: 'divider' }, {
icon: 'ti ti-exclamation-circle',
text: i18n.ts.reportAbuse,
action: reportAbuse,
- }]);
+ });
}
if (user.host !== null) {
- menu = menu.concat([{ type: 'divider' }, {
+ menuItems.push({ type: 'divider' }, {
icon: 'ti ti-refresh',
text: i18n.ts.updateRemoteUser,
action: userInfoUpdate,
- }]);
+ });
}
if (defaultStore.state.devMode) {
- menu = menu.concat([{ type: 'divider' }, {
+ menuItems.push({ type: 'divider' }, {
icon: 'ti ti-id',
text: i18n.ts.copyUserId,
action: () => {
copyToClipboard(user.id);
os.toast(i18n.ts.copied, 'copied');
},
- }]);
+ });
}
if ($i && meId === user.id) {
- menu = menu.concat([{ type: 'divider' }, {
+ menuItems.push({ type: 'divider' }, {
icon: 'ti ti-pencil',
text: i18n.ts.editProfile,
action: () => {
router.push('/settings/profile');
},
- }]);
+ });
}
if (userActions.length > 0) {
- menu = menu.concat([{ type: 'divider' }, ...userActions.map(action => ({
+ menuItems.push({ type: 'divider' }, ...userActions.map(action => ({
icon: 'ti ti-plug',
text: action.title,
action: () => {
action.handler(user);
},
- }))]);
+ })));
}
- const cleanup = () => {
- if (_DEV_) console.log('user menu cleanup', cleanups);
- for (const cl of cleanups) {
- cl();
- }
- };
-
return {
- menu,
- cleanup,
+ menu: menuItems,
+ cleanup: () => {
+ if (_DEV_) console.log('user menu cleanup', cleanups);
+ for (const cl of cleanups) {
+ cl();
+ }
+ },
};
}
diff --git a/packages/frontend/src/scripts/use-form.ts b/packages/frontend/src/scripts/use-form.ts
new file mode 100644
index 0000000000..0d505fe466
--- /dev/null
+++ b/packages/frontend/src/scripts/use-form.ts
@@ -0,0 +1,55 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { computed, Reactive, reactive, watch } from 'vue';
+
+function copy(v: T): T {
+ return JSON.parse(JSON.stringify(v));
+}
+
+function unwrapReactive(v: Reactive): T {
+ return JSON.parse(JSON.stringify(v));
+}
+
+export function useForm>(initialState: T, save: (newState: T) => Promise) {
+ const currentState = reactive(copy(initialState));
+ const previousState = reactive(copy(initialState));
+
+ const modifiedStates = reactive>({} as any);
+ for (const key in currentState) {
+ modifiedStates[key] = false;
+ }
+ const modified = computed(() => Object.values(modifiedStates).some(v => v));
+ const modifiedCount = computed(() => Object.values(modifiedStates).filter(v => v).length);
+
+ watch([currentState, previousState], () => {
+ for (const key in modifiedStates) {
+ modifiedStates[key] = currentState[key] !== previousState[key];
+ }
+ }, { deep: true });
+
+ async function _save() {
+ await save(unwrapReactive(currentState));
+ for (const key in currentState) {
+ previousState[key] = copy(currentState[key]);
+ }
+ }
+
+ function discard() {
+ for (const key in currentState) {
+ currentState[key] = copy(previousState[key]);
+ }
+ }
+
+ return {
+ state: currentState,
+ savedState: previousState,
+ modifiedStates,
+ modified,
+ modifiedCount,
+ save: _save,
+ discard,
+ };
+}
diff --git a/packages/frontend/src/style.scss b/packages/frontend/src/style.scss
index bbb4eb1fe1..6c47578f5c 100644
--- a/packages/frontend/src/style.scss
+++ b/packages/frontend/src/style.scss
@@ -471,6 +471,16 @@ rt {
vertical-align: top;
}
+._modified {
+ margin-left: 0.7em;
+ font-size: 65%;
+ padding: 2px 3px;
+ color: var(--warn);
+ border: solid 1px var(--warn);
+ border-radius: 4px;
+ vertical-align: top;
+}
+
._table {
> ._row {
display: flex;
diff --git a/packages/frontend/src/ui/_common_/common.ts b/packages/frontend/src/ui/_common_/common.ts
index 8edb7a75e4..241e7aa831 100644
--- a/packages/frontend/src/ui/_common_/common.ts
+++ b/packages/frontend/src/ui/_common_/common.ts
@@ -51,7 +51,9 @@ function toolsMenuItems(): MenuItem[] {
}
export function openInstanceMenu(ev: MouseEvent) {
- os.popupMenu([{
+ const menuItems: MenuItem[] = [];
+
+ menuItems.push({
text: instance.name ?? host,
type: 'label',
}, {
@@ -79,12 +81,18 @@ export function openInstanceMenu(ev: MouseEvent) {
text: i18n.ts.ads,
icon: 'ti ti-ad',
to: '/ads',
- }, ($i && ($i.isAdmin || $i.policies.canInvite) && instance.disableRegistration) ? {
- type: 'link',
- to: '/invite',
- text: i18n.ts.invite,
- icon: 'ti ti-user-plus',
- } : undefined, {
+ });
+
+ if ($i && ($i.isAdmin || $i.policies.canInvite) && instance.disableRegistration) {
+ menuItems.push({
+ type: 'link',
+ to: '/invite',
+ text: i18n.ts.invite,
+ icon: 'ti ti-user-plus',
+ });
+ }
+
+ menuItems.push({
type: 'parent',
text: i18n.ts.tools,
icon: 'ti ti-tool',
@@ -94,53 +102,85 @@ export function openInstanceMenu(ev: MouseEvent) {
text: i18n.ts.inquiry,
icon: 'ti ti-help-circle',
to: '/contact',
- }, (instance.impressumUrl) ? {
- type: 'a',
- text: i18n.ts.impressum,
- icon: 'ti ti-file-invoice',
- href: instance.impressumUrl,
- target: '_blank',
- } : undefined, (instance.tosUrl) ? {
- type: 'a',
- text: i18n.ts.termsOfService,
- icon: 'ti ti-notebook',
- href: instance.tosUrl,
- target: '_blank',
- } : undefined, (instance.privacyPolicyUrl) ? {
- type: 'a',
- text: i18n.ts.privacyPolicy,
- icon: 'ti ti-shield-lock',
- href: instance.privacyPolicyUrl,
- target: '_blank',
- } : undefined, (!instance.impressumUrl && !instance.tosUrl && !instance.privacyPolicyUrl) ? undefined : { type: 'divider' }, {
- type: 'parent',
- text: i18n.ts.document,
- icon: 'ti ti-bulb',
- children: [{
+ });
+
+ if (instance.impressumUrl) {
+ menuItems.push({
type: 'a',
- text: i18n.ts.document,
- icon: 'ti ti-bulb',
- href: 'https://misskey-hub.net/docs/for-users/',
+ text: i18n.ts.impressum,
+ icon: 'ti ti-file-invoice',
+ href: instance.impressumUrl,
target: '_blank',
- }, {
- type: 'link',
- text: i18n.ts._mfm.cheatSheet,
- icon: 'ti ti-help-circle',
- to: '/mfm-cheat-sheet',
- }],
- }, ($i) ? {
- text: i18n.ts._initialTutorial.launchTutorial,
- icon: 'ti ti-presentation',
- action: () => {
- const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkTutorialDialog.vue')), {}, {
- closed: () => dispose(),
+ });
+ }
+
+ if (instance.tosUrl) {
+ menuItems.push({
+ type: 'a',
+ text: i18n.ts.termsOfService,
+ icon: 'ti ti-notebook',
+ href: instance.tosUrl,
+ target: '_blank',
+ });
+ }
+
+ if (instance.privacyPolicyUrl) {
+ menuItems.push({
+ type: 'a',
+ text: i18n.ts.privacyPolicy,
+ icon: 'ti ti-shield-lock',
+ href: instance.privacyPolicyUrl,
+ target: '_blank',
+ });
+ }
+
+ if (!instance.impressumUrl && !instance.tosUrl && !instance.privacyPolicyUrl) {
+ menuItems.push({ type: 'divider' });
+ }
+
+ menuItems.push({
+ type: 'parent',
+ icon: 'ti ti-bulb',
+ text: i18n.ts.document,
+ children: async () => {
+ const documentChildMenu = [] as MenuItem[];
+
+ menuItems.push({
+ type: 'a',
+ text: i18n.ts.document,
+ icon: 'ti ti-bulb',
+ href: 'https://misskey-hub.net/docs/for-users/',
+ target: '_blank',
+ }, {
+ type: 'link',
+ text: i18n.ts._mfm.cheatSheet,
+ icon: 'ti ti-help-circle',
+ to: '/mfm-cheat-sheet',
});
+
+ return documentChildMenu;
},
- } : undefined, {
+ });
+
+ if ($i) {
+ menuItems.push({
+ text: i18n.ts._initialTutorial.launchTutorial,
+ icon: 'ti ti-presentation',
+ action: () => {
+ const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkTutorialDialog.vue')), {}, {
+ closed: () => dispose(),
+ });
+ },
+ });
+ }
+
+ menuItems.push({
type: 'link',
text: i18n.ts.aboutMisskey,
to: '/about-misskey',
- }], ev.currentTarget ?? ev.target, {
+ });
+
+ os.popupMenu(menuItems, ev.currentTarget ?? ev.target, {
align: 'left',
});
}
diff --git a/packages/frontend/src/ui/deck.vue b/packages/frontend/src/ui/deck.vue
index 151443f3e8..9dd49d4dbd 100644
--- a/packages/frontend/src/ui/deck.vue
+++ b/packages/frontend/src/ui/deck.vue
@@ -118,7 +118,7 @@ import XMentionsColumn from '@/ui/deck/mentions-column.vue';
import XDirectColumn from '@/ui/deck/direct-column.vue';
import XRoleTimelineColumn from '@/ui/deck/role-timeline-column.vue';
import { mainRouter } from '@/router/main.js';
-import { MenuItem } from '@/types/menu.js';
+import type { MenuItem } from '@/types/menu.js';
const XStatusBars = defineAsyncComponent(() => import('@/ui/_common_/statusbars.vue'));
const XAnnouncements = defineAsyncComponent(() => import('@/ui/_common_/announcements.vue'));
diff --git a/packages/frontend/src/ui/deck/antenna-column.vue b/packages/frontend/src/ui/deck/antenna-column.vue
index be743cc1b2..f487784be7 100644
--- a/packages/frontend/src/ui/deck/antenna-column.vue
+++ b/packages/frontend/src/ui/deck/antenna-column.vue
@@ -22,7 +22,7 @@ import MkTimeline from '@/components/MkTimeline.vue';
import * as os from '@/os.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
import { i18n } from '@/i18n.js';
-import { MenuItem } from '@/types/menu.js';
+import type { MenuItem } from '@/types/menu.js';
import { antennasCache } from '@/cache.js';
import { SoundStore } from '@/store.js';
import { soundSettingsButton } from '@/ui/deck/tl-note-notification.js';
diff --git a/packages/frontend/src/ui/deck/channel-column.vue b/packages/frontend/src/ui/deck/channel-column.vue
index 90d8fd78ed..1faf4f3903 100644
--- a/packages/frontend/src/ui/deck/channel-column.vue
+++ b/packages/frontend/src/ui/deck/channel-column.vue
@@ -29,7 +29,7 @@ import * as os from '@/os.js';
import { favoritedChannelsCache } from '@/cache.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
import { i18n } from '@/i18n.js';
-import { MenuItem } from '@/types/menu.js';
+import type { MenuItem } from '@/types/menu.js';
import { SoundStore } from '@/store.js';
import { soundSettingsButton } from '@/ui/deck/tl-note-notification.js';
import * as sound from '@/scripts/sound.js';
diff --git a/packages/frontend/src/ui/deck/column.vue b/packages/frontend/src/ui/deck/column.vue
index 893301122e..b97d86f4a3 100644
--- a/packages/frontend/src/ui/deck/column.vue
+++ b/packages/frontend/src/ui/deck/column.vue
@@ -46,7 +46,7 @@ import { onBeforeUnmount, onMounted, provide, watch, shallowRef, ref, computed }
import { updateColumn, swapLeftColumn, swapRightColumn, swapUpColumn, swapDownColumn, stackLeftColumn, popRightColumn, removeColumn, swapColumn, Column } from './deck-store.js';
import * as os from '@/os.js';
import { i18n } from '@/i18n.js';
-import { MenuItem } from '@/types/menu.js';
+import type { MenuItem } from '@/types/menu.js';
provide('shouldHeaderThin', true);
provide('shouldOmitHeaderTitle', true);
@@ -104,7 +104,27 @@ function toggleActive() {
}
function getMenu() {
- let items: MenuItem[] = [{
+ const menuItems: MenuItem[] = [];
+
+ if (props.menu) {
+ menuItems.push(...props.menu, {
+ type: 'divider',
+ });
+ }
+
+ if (props.refresher) {
+ menuItems.push({
+ icon: 'ti ti-refresh',
+ text: i18n.ts.reload,
+ action: () => {
+ if (props.refresher) {
+ props.refresher();
+ }
+ },
+ });
+ }
+
+ menuItems.push({
icon: 'ti ti-settings',
text: i18n.ts._deck.configureColumn,
action: async () => {
@@ -129,74 +149,73 @@ function getMenu() {
if (canceled) return;
updateColumn(props.column.id, result);
},
+ });
+
+ const moveToMenuItems: MenuItem[] = [];
+
+ moveToMenuItems.push({
+ icon: 'ti ti-arrow-left',
+ text: i18n.ts._deck.swapLeft,
+ action: () => {
+ swapLeftColumn(props.column.id);
+ },
}, {
- type: 'parent',
- text: i18n.ts.move + '...',
- icon: 'ti ti-arrows-move',
- children: [{
- icon: 'ti ti-arrow-left',
- text: i18n.ts._deck.swapLeft,
- action: () => {
- swapLeftColumn(props.column.id);
- },
- }, {
- icon: 'ti ti-arrow-right',
- text: i18n.ts._deck.swapRight,
- action: () => {
- swapRightColumn(props.column.id);
- },
- }, props.isStacked ? {
+ icon: 'ti ti-arrow-right',
+ text: i18n.ts._deck.swapRight,
+ action: () => {
+ swapRightColumn(props.column.id);
+ },
+ });
+
+ if (props.isStacked) {
+ moveToMenuItems.push({
icon: 'ti ti-arrow-up',
text: i18n.ts._deck.swapUp,
action: () => {
swapUpColumn(props.column.id);
},
- } : undefined, props.isStacked ? {
+ }, {
icon: 'ti ti-arrow-down',
text: i18n.ts._deck.swapDown,
action: () => {
swapDownColumn(props.column.id);
},
- } : undefined],
+ });
+ }
+
+ menuItems.push({
+ type: 'parent',
+ text: i18n.ts.move + '...',
+ icon: 'ti ti-arrows-move',
+ children: moveToMenuItems,
}, {
icon: 'ti ti-stack-2',
text: i18n.ts._deck.stackLeft,
action: () => {
stackLeftColumn(props.column.id);
},
- }, props.isStacked ? {
- icon: 'ti ti-window-maximize',
- text: i18n.ts._deck.popRight,
- action: () => {
- popRightColumn(props.column.id);
- },
- } : undefined, { type: 'divider' }, {
+ });
+
+ if (props.isStacked) {
+ menuItems.push({
+ icon: 'ti ti-window-maximize',
+ text: i18n.ts._deck.popRight,
+ action: () => {
+ popRightColumn(props.column.id);
+ },
+ });
+ }
+
+ menuItems.push({ type: 'divider' }, {
icon: 'ti ti-trash',
text: i18n.ts.remove,
danger: true,
action: () => {
removeColumn(props.column.id);
},
- }];
+ });
- if (props.menu) {
- items.unshift({ type: 'divider' });
- items = props.menu.concat(items);
- }
-
- if (props.refresher) {
- items = [{
- icon: 'ti ti-refresh',
- text: i18n.ts.reload,
- action: () => {
- if (props.refresher) {
- props.refresher();
- }
- },
- }, ...items];
- }
-
- return items;
+ return menuItems;
}
function showSettingsMenu(ev: MouseEvent) {
diff --git a/packages/frontend/src/ui/deck/list-column.vue b/packages/frontend/src/ui/deck/list-column.vue
index 977c06789f..525d1c63e3 100644
--- a/packages/frontend/src/ui/deck/list-column.vue
+++ b/packages/frontend/src/ui/deck/list-column.vue
@@ -22,7 +22,7 @@ import MkTimeline from '@/components/MkTimeline.vue';
import * as os from '@/os.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
import { i18n } from '@/i18n.js';
-import { MenuItem } from '@/types/menu.js';
+import type { MenuItem } from '@/types/menu.js';
import { SoundStore } from '@/store.js';
import { userListsCache } from '@/cache.js';
import { soundSettingsButton } from '@/ui/deck/tl-note-notification.js';
diff --git a/packages/frontend/src/ui/deck/role-timeline-column.vue b/packages/frontend/src/ui/deck/role-timeline-column.vue
index a375e9c574..beb4237978 100644
--- a/packages/frontend/src/ui/deck/role-timeline-column.vue
+++ b/packages/frontend/src/ui/deck/role-timeline-column.vue
@@ -21,7 +21,7 @@ import MkTimeline from '@/components/MkTimeline.vue';
import * as os from '@/os.js';
import { misskeyApi } from '@/scripts/misskey-api.js';
import { i18n } from '@/i18n.js';
-import { MenuItem } from '@/types/menu.js';
+import type { MenuItem } from '@/types/menu.js';
import { SoundStore } from '@/store.js';
import { soundSettingsButton } from '@/ui/deck/tl-note-notification.js';
import * as sound from '@/scripts/sound.js';
diff --git a/packages/frontend/src/ui/deck/tl-column.vue b/packages/frontend/src/ui/deck/tl-column.vue
index d6287b059e..80973284c6 100644
--- a/packages/frontend/src/ui/deck/tl-column.vue
+++ b/packages/frontend/src/ui/deck/tl-column.vue
@@ -121,33 +121,45 @@ function onNote() {
sound.playMisskeySfxFile(soundSetting.value);
}
-const menu = computed(() => [{
- icon: 'ti ti-pencil',
- text: i18n.ts.timeline,
- action: setType,
-}, {
- icon: 'ti ti-bell',
- text: i18n.ts._deck.newNoteNotificationSettings,
- action: () => soundSettingsButton(soundSetting),
-}, {
- type: 'switch',
- text: i18n.ts.showRenotes,
- ref: withRenotes,
-}, hasWithReplies(props.column.tl) ? {
- type: 'switch',
- text: i18n.ts.showRepliesToOthersInTimeline,
- ref: withReplies,
- disabled: onlyFiles,
-} : undefined, {
- type: 'switch',
- text: i18n.ts.fileAttachedOnly,
- ref: onlyFiles,
- disabled: hasWithReplies(props.column.tl) ? withReplies : false,
-}, {
- type: 'switch',
- text: i18n.ts.showCatOnly,
- ref: onlyCats,
-}]);
+const menu = computed(() => {
+ const menuItems: MenuItem[] = [];
+
+ menuItems.push({
+ icon: 'ti ti-pencil',
+ text: i18n.ts.timeline,
+ action: setType,
+ }, {
+ icon: 'ti ti-bell',
+ text: i18n.ts._deck.newNoteNotificationSettings,
+ action: () => soundSettingsButton(soundSetting),
+ }, {
+ type: 'switch',
+ text: i18n.ts.showRenotes,
+ ref: withRenotes,
+ });
+
+ if (hasWithReplies(props.column.tl)) {
+ menuItems.push({
+ type: 'switch',
+ text: i18n.ts.showRepliesToOthersInTimeline,
+ ref: withReplies,
+ disabled: onlyFiles,
+ });
+ }
+
+ menuItems.push({
+ type: 'switch',
+ text: i18n.ts.fileAttachedOnly,
+ ref: onlyFiles,
+ disabled: hasWithReplies(props.column.tl) ? withReplies : false,
+ }, {
+ type: 'switch',
+ text: i18n.ts.showCatOnly,
+ ref: onlyCats,
+ });
+
+ return menuItems;
+});
+
+ {{ i18n.ts.instanceName }}{{ i18n.ts.modified }}
-
-
- {{ i18n.ts.maintainerEmail }}
+
+ {{ i18n.ts._serverSettings.shortName }} ({{ i18n.ts.optional }}){{ i18n.ts.modified }}
+ {{ i18n.ts._serverSettings.shortNameDescription }}
-
-
- {{ i18n.ts.repositoryUrl }}
-
- {{ i18n.ts.repositoryUrlDescription }}
-
+
+ {{ i18n.ts.instanceDescription }}{{ i18n.ts.modified }}
+
-
- {{ i18n.ts.repositoryUrlOrTarballRequired }}
-
+
+
+ {{ i18n.ts.maintainerName }}{{ i18n.ts.modified }}
+
-
- {{ i18n.ts.impressumUrl }}
-
- {{ i18n.ts.impressumDescription }}
-
+
+ {{ i18n.ts.maintainerEmail }}{{ i18n.ts.modified }}
+
+
+
-
- {{ i18n.ts.pinnedUsers }}
+
+ {{ i18n.ts.tosUrl }}{{ i18n.ts.modified }}
+
+
+
+
+ {{ i18n.ts.privacyPolicyUrl }}{{ i18n.ts.modified }}
+
+
+
+
+ {{ i18n.ts._serverSettings.inquiryUrl }}{{ i18n.ts.modified }}
+ {{ i18n.ts._serverSettings.inquiryUrlDescription }}
+
+
+
+
+ {{ i18n.ts.repositoryUrl }}{{ i18n.ts.modified }}
+ {{ i18n.ts.repositoryUrlDescription }}
+
+
+
+
+ {{ i18n.ts.repositoryUrlOrTarballRequired }}
+
+
+
+ {{ i18n.ts.impressumUrl }}{{ i18n.ts.modified }}
+ {{ i18n.ts.impressumDescription }}
+
+
+
+
-
- {{ i18n.ts.cacheRemoteFiles }}
- {{ i18n.ts.cacheRemoteFilesDescription }}{{ i18n.ts.youCanCleanRemoteFilesCache }}
+
- {{ i18n.ts.cacheRemoteSensitiveFiles }}
- {{ i18n.ts.cacheRemoteSensitiveFilesDescription }}
-
-
+
+
+ ServiceWorker
+
+
+
+
+
+ {{ i18n.ts._ad.adsSettings }}
+
+
-
- ServiceWorker
+
+
+ {{ i18n.ts._urlPreviewSetting.title }}
+
+
@@ -29,18 +23,22 @@ SPDX-License-Identifier: AGPL-3.0-only
import { computed, onMounted, ref } from 'vue';
import { entities } from 'cherrypick-js';
import XItem from './system-webhook.item.vue';
-import FormSection from '@/components/form/section.vue';
import { definePageMetadata } from '@/scripts/page-metadata.js';
import { i18n } from '@/i18n.js';
import XHeader from '@/pages/admin/_header_.vue';
-import MkButton from '@/components/MkButton.vue';
import { misskeyApi } from '@/scripts/misskey-api.js';
import { showSystemWebhookEditorDialog } from '@/components/MkSystemWebhookEditor.impl.js';
import * as os from '@/os.js';
const webhooks = ref([]);
-const headerActions = computed(() => []);
+const headerActions = computed(() => [{
+ asFullButton: true,
+ icon: 'ti ti-plus',
+ text: i18n.ts._webhookSettings.createWebhook,
+ handler: onCreateWebhookClicked,
+}]);
+
const headerTabs = computed(() => []);
async function onCreateWebhookClicked() {
@@ -89,8 +87,5 @@ definePageMetadata(() => ({
diff --git a/packages/frontend/src/pages/clip.vue b/packages/frontend/src/pages/clip.vue
index e4241789e6..6badc04cfc 100644
--- a/packages/frontend/src/pages/clip.vue
+++ b/packages/frontend/src/pages/clip.vue
@@ -45,6 +45,7 @@ import { clipsCache } from '@/cache.js';
import { isSupportShare } from '@/scripts/navigator.js';
import { copyToClipboard } from '@/scripts/copy-to-clipboard.js';
import { genEmbedCode } from '@/scripts/get-embed-code.js';
+import type { MenuItem } from '@/types/menu.js';
const props = defineProps<{
clipId: string,
@@ -131,7 +132,9 @@ const headerActions = computed(() => clip.value && isOwned.value ? [{
icon: 'ti ti-share',
text: i18n.ts.share,
handler: (ev: MouseEvent): void => {
- os.popupMenu([{
+ const menuItems: MenuItem[] = [];
+
+ menuItems.push({
icon: 'ti ti-link',
text: i18n.ts.copyUrl,
action: () => {
@@ -144,17 +147,23 @@ const headerActions = computed(() => clip.value && isOwned.value ? [{
action: () => {
genEmbedCode('clips', clip.value!.id);
},
- }, ...(isSupportShare() ? [{
- icon: 'ti ti-share',
- text: i18n.ts.share,
- action: async () => {
- navigator.share({
- title: clip.value!.name,
- text: clip.value!.description ?? '',
- url: `${url}/clips/${clip.value!.id}`,
- });
- },
- }] : [])], ev.currentTarget ?? ev.target);
+ });
+
+ if (isSupportShare()) {
+ menuItems.push({
+ icon: 'ti ti-share',
+ text: i18n.ts.share,
+ action: async () => {
+ navigator.share({
+ title: clip.value!.name,
+ text: clip.value!.description ?? '',
+ url: `${url}/clips/${clip.value!.id}`,
+ });
+ },
+ });
+ }
+
+ os.popupMenu(menuItems, ev.currentTarget ?? ev.target);
},
}] : []), {
icon: 'ti ti-trash',
diff --git a/packages/frontend/src/pages/drive.file.info.vue b/packages/frontend/src/pages/drive.file.info.vue
index e2b3ebfef0..41fb4a63b2 100644
--- a/packages/frontend/src/pages/drive.file.info.vue
+++ b/packages/frontend/src/pages/drive.file.info.vue
@@ -45,7 +45,7 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+ {{ i18n.ts.cacheRemoteFiles }}{{ i18n.ts.modified }}
+ {{ i18n.ts.cacheRemoteFilesDescription }}{{ i18n.ts.youCanCleanRemoteFilesCache }}
+
+
+
+
+ {{ i18n.ts.cacheRemoteSensitiveFiles }}{{ i18n.ts.modified }}
+ {{ i18n.ts.cacheRemoteSensitiveFilesDescription }}
+
+
+
-
-
+
+ {{ i18n.ts.enableServiceworker }}{{ i18n.ts.modified }}
+ {{ i18n.ts.serviceworkerInfo }}
+
+
+
+
+ Public key{{ i18n.ts.modified }}
+
+
+
+
+ Private key{{ i18n.ts.modified }}
+
+
+
+
+
+
+
+
+ {{ i18n.ts._ad.notesPerOneAd }}{{ i18n.ts.modified }}
+ {{ i18n.ts._ad.setZeroToDisable }}
+
+
+ {{ i18n.ts._ad.adsTooClose }}
+
-
+
-
- {{ i18n.ts.enableServiceworker }}
- {{ i18n.ts.serviceworkerInfo }}
-
+
+ {{ i18n.ts._urlPreviewSetting.maximumContentLength }}{{ i18n.ts.modified }}
+ {{ i18n.ts._urlPreviewSetting.maximumContentLengthDescription }}
+
-
- CherryPick® Fan-out Timeline Technology™ (FTT)
+
+ {{ i18n.ts._urlPreviewSetting.timeout }}{{ i18n.ts.modified }}
+ {{ i18n.ts._urlPreviewSetting.timeoutDescription }}
+
-
diff --git a/packages/frontend/src/pages/admin/system-webhook.vue b/packages/frontend/src/pages/admin/system-webhook.vue
index c3af79d6c1..dfeda411d2 100644
--- a/packages/frontend/src/pages/admin/system-webhook.vue
+++ b/packages/frontend/src/pages/admin/system-webhook.vue
@@ -11,15 +11,9 @@ SPDX-License-Identifier: AGPL-3.0-only
+
+ {{ i18n.ts._urlPreviewSetting.enable }}{{ i18n.ts.modified }}
+
-
-
-
- Public key
-
+
+ {{ i18n.ts._urlPreviewSetting.requireContentLength }}{{ i18n.ts.modified }}
+ {{ i18n.ts._urlPreviewSetting.requireContentLengthDescription }}
+
-
-
- Private key
-
-
-
-
+
-
- {{ i18n.ts.enable }}
- {{ i18n.ts._serverSettings.fanoutTimelineDescription }}
-
+
+ {{ i18n.ts._urlPreviewSetting.userAgent }}{{ i18n.ts.modified }}
+ {{ i18n.ts._urlPreviewSetting.userAgentDescription }}
+
-
- {{ i18n.ts._serverSettings.fanoutTimelineDbFallback }}
- {{ i18n.ts._serverSettings.fanoutTimelineDbFallbackDescription }}
-
-
-
- perLocalUserUserTimelineCacheMax
+
- {{ i18n.ts._ad.adsSettings }}
-
-
- {{ i18n.ts._urlPreviewSetting.title }}
+
+
+ {{ i18n.ts.proxyAccount }}
-
-
-
- {{ i18n.ts.abuseReports }}
-
-
-
-
-
-
-
+
+ {{ i18n.ts._urlPreviewSetting.summaryProxy }}{{ i18n.ts.modified }}
+ [{{ i18n.ts.notUsePleaseLeaveBlank }}] {{ i18n.ts._urlPreviewSetting.summaryProxyDescription }}
-
- perRemoteUserUserTimelineCacheMax
-
-
-
- perUserHomeTimelineCacheMax
-
-
-
- perUserListTimelineCacheMax
-
-
-
-
-
-
+
-
-
- {{ i18n.ts._ad.notesPerOneAd }}
- {{ i18n.ts._ad.setZeroToDisable }}
-
-
- {{ i18n.ts._ad.adsTooClose }}
-
+
-
+
+ {{ i18n.ts._urlPreviewSetting.summaryProxyDescription2 }}
+
-
+
- {{ i18n.ts._urlPreviewSetting.timeout }} / key:timeout +
- {{ i18n.ts._urlPreviewSetting.maximumContentLength }} / key:contentLengthLimit +
- {{ i18n.ts._urlPreviewSetting.requireContentLength }} / key:contentLengthRequired +
- {{ i18n.ts._urlPreviewSetting.userAgent }} / key:userAgent +
-
- {{ i18n.ts._urlPreviewSetting.enable }}
-
+
- {{ i18n.ts._urlPreviewSetting.maximumContentLength }}
- {{ i18n.ts._urlPreviewSetting.maximumContentLengthDescription }}
-
+
+
+ {{ i18n.ts.abuseReports }}
-
- {{ i18n.ts._urlPreviewSetting.timeout }}
- {{ i18n.ts._urlPreviewSetting.timeoutDescription }}
-
-
-
- {{ i18n.ts._urlPreviewSetting.userAgent }}
- {{ i18n.ts._urlPreviewSetting.userAgentDescription }}
-
-
-
-
+ {{ i18n.ts.proxyAccountDescription }}
+
+ {{ i18n.ts.proxyAccount }}
+ {{ proxyAccount ? `@${proxyAccount.username}` : i18n.ts.none }}
+
-
- {{ i18n.ts._urlPreviewSetting.requireContentLength }}
- {{ i18n.ts._urlPreviewSetting.requireContentLengthDescription }}
-
+ {{ i18n.ts.selectAccount }}
+
+
-
-
- {{ i18n.ts._urlPreviewSetting.summaryProxy }}
- [{{ i18n.ts.notUsePleaseLeaveBlank }}] {{ i18n.ts._urlPreviewSetting.summaryProxyDescription }}
-
-
-
-
- {{ i18n.ts._urlPreviewSetting.summaryProxyDescription2 }}
-
- -
-
- {{ i18n.ts._urlPreviewSetting.timeout }} / key:timeout -
- {{ i18n.ts._urlPreviewSetting.maximumContentLength }} / key:contentLengthLimit -
- {{ i18n.ts._urlPreviewSetting.requireContentLength }} / key:contentLengthRequired -
- {{ i18n.ts._urlPreviewSetting.userAgent }} / key:userAgent -
-
-
- {{ i18n.ts.emailToReceiveAbuseReport }}
- {{ i18n.ts.emailToReceiveAbuseReportCaption }}
-
-
-
-
- {{ i18n.ts.save }}
-
+
-
+
+
+
+ {{ i18n.ts.emailToReceiveAbuseReport }}
+ {{ i18n.ts.emailToReceiveAbuseReportCaption }}
+
+
+
-
- {{ i18n.ts._webhookSettings.createWebhook }}
-
-
-
-
+
-
-
+