${ subject }
@@ -148,7 +145,7 @@ export class EmailService { try { // TODO: htmlサニタイズ const info = await transporter.sendMail({ - from: meta.email!, + from: this.meta.email!, to: to, subject: subject, text: text, @@ -167,8 +164,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, @@ -186,11 +181,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, @@ -220,7 +215,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/GlobalEventService.ts b/packages/backend/src/core/GlobalEventService.ts index 312bcfb3b5..8e4181c840 100644 --- a/packages/backend/src/core/GlobalEventService.ts +++ b/packages/backend/src/core/GlobalEventService.ts @@ -241,7 +241,7 @@ export interface InternalEventTypes { avatarDecorationCreated: MiAvatarDecoration; avatarDecorationDeleted: MiAvatarDecoration; avatarDecorationUpdated: MiAvatarDecoration; - metaUpdated: MiMeta; + metaUpdated: { before?: MiMeta; after: MiMeta; }; followChannel: { userId: MiUser['id']; channelId: MiChannel['id']; }; unfollowChannel: { userId: MiUser['id']; channelId: MiChannel['id']; }; updateUserProfile: MiUserProfile; 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/MkInviteCode.vue b/packages/frontend/src/components/MkInviteCode.vue
index de51a98789..4aee64f78e 100644
--- a/packages/frontend/src/components/MkInviteCode.vue
+++ b/packages/frontend/src/components/MkInviteCode.vue
@@ -11,8 +11,14 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts.expired }}
{{ i18n.ts.unused }}
+
+
+
- {{ i18n.tsx.thereAreNChanges({ n: form.modifiedCount.value }) }}
+
+
+
{{ i18n.ts.delete }}
+ {{ i18n.ts.invitationCode }}
@@ -49,10 +55,6 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ i18n.ts.copy }}
- {{ i18n.ts.delete }}
-
-
@@ -83,14 +84,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/navbar.ts b/packages/frontend/src/navbar.ts
index a96a4f0539..ac730f8021 100644
--- a/packages/frontend/src/navbar.ts
+++ b/packages/frontend/src/navbar.ts
@@ -125,7 +125,7 @@ export const navbarItemDef = reactive({
ui: {
title: i18n.ts.switchUi,
icon: 'ti ti-devices',
- action: (ev) => {
+ action: (ev: MouseEvent) => {
os.popupMenu([{
text: i18n.ts.default,
active: ui === 'default' || ui === null,
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index f42e2ed3c5..60e4218a48 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -22,7 +22,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-file.vue b/packages/frontend/src/pages/admin-file.vue
index d8311186ab..60f6be51d4 100644
--- a/packages/frontend/src/pages/admin-file.vue
+++ b/packages/frontend/src/pages/admin-file.vue
@@ -44,6 +44,9 @@ SPDX-License-Identifier: AGPL-3.0-only
+
@@ -14,15 +16,25 @@ SPDX-License-Identifier: AGPL-3.0-only
-
+
+
+
@@ -19,17 +19,11 @@ SPDX-License-Identifier: AGPL-3.0-only
Pro account
+ Save
-
-
- {{ i18n.ts.save }}
-
-
-
@@ -40,12 +34,12 @@ import MkInput from '@/components/MkInput.vue';
import MkButton from '@/components/MkButton.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 deeplAuthKey = 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 }}
-
-
-
-
-
- Misskey® Fan-out Timeline Technology™ (FTT)
- Enabled
- Disabled
-
-
-
-
-
- Misskey® Reactions Buffering 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.enable }}
-
- {{ i18n.ts.details }}
-
-
-
-
- {{ i18n.ts._serverSettings.fanoutTimelineDbFallback }}
- {{ i18n.ts._serverSettings.fanoutTimelineDbFallbackDescription }}
-
-
-
- perLocalUserUserTimelineCacheMax
-
-
-
- perRemoteUserUserTimelineCacheMax
-
-
-
- perUserHomeTimelineCacheMax
-
-
-
- perUserListTimelineCacheMax
-
-
- {{ i18n.ts._serverSettings.fanoutTimelineDescription }}
-
-
- {{ i18n.ts.enable }}
- {{ i18n.ts._serverSettings.reactionsBufferingDescription }}
-
-
-
+
+
+ Misskey® Fan-out Timeline Technology™ (FTT)
+ Enabled
+ Disabled
+
+
+
+
+
+ Misskey® 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.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 }}
+
+
+