release: v2025.5.0-kakurega.1.42.0 (#179)

hideki0403 · web-flow · commit 76054ab46ed3 · 2025-05-22T14:58:26.000+09:00
diff --git a/locales/index.d.ts b/locales/index.d.ts
@@ -5849,6 +5849,14 @@ export interface Locale extends ILocale {
      * 「ファイル付きのみ」が有効になっています
      */
     "onlyFilesIsEnabled": string;
+    /**
+     * 招待コードをコピー
+     */
+    "copyInviteCode": string;
+    /**
+     * 招待URLをコピー
+     */
+    "copyInviteUrl": string;
     "_chat": {
         /**
          * まだメッセージはありません
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
@@ -1457,6 +1457,8 @@ federationJobs: "連合ジョブ"
 driveAboutTip: "ドライブでは、過去にアップロードしたファイルの一覧が表示されます。<br>\nノートに添付する際に再利用したり、あとで投稿するファイルを予めアップロードしておくこともできます。<br>\n<b>ファイルを削除すると、今までそのファイルを使用した全ての場所(ノート、ページ、アバター、バナー等)からも見えなくなるので注意してください。</b><br>\nフォルダを作って整理することもできます。"
 scrollToClose: "スクロールして閉じる"
 onlyFilesIsEnabled: "「ファイル付きのみ」が有効になっています"
+copyInviteCode: "招待コードをコピー"
+copyInviteUrl: "招待URLをコピー"
 
 _chat:
   noMessagesYet: "まだメッセージはありません"
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2025.5.0-kakurega.1.41.0",
+	"version": "2025.5.0-kakurega.1.42.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts
@@ -413,5 +413,16 @@ export async function mainBoot() {
 	} as const satisfies Keymap;
 	window.document.addEventListener('keydown', makeHotkey(keymap), { passive: false });
 
+	// もしURLのクエリにinvite-codeを持っていたらsignupダイアログを開く
+	const params = new URLSearchParams(window.location.search);
+	if (params.has('invite-code') && (instance.disableRegistration || instance.enableRegistrationLimit)) {
+		const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkSignupDialog.vue')), {
+			autoSet: true,
+			skipChoose: true,
+		}, {
+			closed: () => dispose(),
+		});
+	}
+
 	initializeSw();
 }
diff --git a/packages/frontend/src/components/MkInviteCode.vue b/packages/frontend/src/components/MkInviteCode.vue
@@ -11,10 +11,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<span v-else-if="isExpired" style="color: var(--MI_THEME-error)">{{ i18n.ts.expired }}</span>
 		<span v-else style="color: var(--MI_THEME-success)">{{ i18n.ts.unused }}</span>
 	</template>
-	<template #footer>
+	<template v-if="!invite.used || moderator" #footer>
 		<div class="_buttons">
-			<MkButton v-if="!invite.used && !isExpired" primary rounded @click="copyInviteCode()"><i class="ti ti-copy"></i> {{ i18n.ts.copy }}</MkButton>
-			<MkButton v-if="!invite.used || moderator" danger rounded @click="deleteCode()"><i class="ti ti-trash"></i> {{ i18n.ts.delete }}</MkButton>
+			<template v-if="!isExpired && !invite.used">
+				<MkButton primary rounded @click="copyInviteUrl(invite.code)"><i class="ti ti-link"></i> {{ i18n.ts.copyInviteUrl }}</MkButton>
+				<MkButton primary rounded @click="copyInviteCode(invite.code)"><i class="ti ti-copy"></i> {{ i18n.ts.copyInviteCode }}</MkButton>
+			</template>
+			<MkButton danger rounded @click="deleteCode()"><i class="ti ti-trash"></i> {{ i18n.ts.delete }}</MkButton>
 		</div>
 	</template>
 
@@ -64,7 +67,7 @@ import { computed } from 'vue';
 import * as Misskey from 'misskey-js';
 import MkFolder from '@/components/MkFolder.vue';
 import MkButton from '@/components/MkButton.vue';
-import { copyToClipboard } from '@/utility/copy-to-clipboard.js';
+import { copyInviteCode, copyInviteUrl } from '@/utility/invite.js';
 import { i18n } from '@/i18n.js';
 import * as os from '@/os.js';
 
@@ -87,10 +90,6 @@ function deleteCode() {
 	});
 	emits('deleted', props.invite.id);
 }
-
-function copyInviteCode() {
-	copyToClipboard(props.invite.code);
-}
 </script>
 
 <style lang="scss" module>
diff --git a/packages/frontend/src/components/MkSignupDialog.choice.vue b/packages/frontend/src/components/MkSignupDialog.choice.vue
@@ -73,6 +73,7 @@ async function doneWithoutCode() {
 .choiceButton {
 	height: 60px;
 	width: 100% !important;
+	border-radius: 16px;
 }
 
 .banner {
diff --git a/packages/frontend/src/components/MkSignupDialog.form.vue b/packages/frontend/src/components/MkSignupDialog.form.vue
@@ -171,7 +171,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { toUnicode } from 'punycode.js';
 import * as Misskey from 'misskey-js';
 import * as config from '@@/js/config.js';
@@ -374,21 +374,29 @@ async function onSubmit(): Promise<void> {
 	});
 
 	if (res && res.ok) {
+		const redirect = new URL(window.location.href);
+		const hasInviteCode = redirect.searchParams.has('invite-code');
+		redirect.searchParams.delete('invite-code');
+
 		if (res.status === 204 || instance.emailRequiredForSignup) {
-			os.alert({
+			await os.alert({
 				type: 'success',
 				title: i18n.ts._signup.almostThere,
 				text: i18n.tsx._signup.emailSent({ email: email.value }),
 			});
 			emit('signupEmailPending');
+
+			if (hasInviteCode) {
+				window.location.href = redirect.toString();
+			}
 		} else {
 			const resJson = (await res.json()) as Misskey.entities.SignupResponse;
 			if (_DEV_) console.log(resJson);
 
 			emit('signup', resJson);
 
 			if (props.autoSet) {
-				await login(resJson.token);
+				await login(resJson.token, redirect.toString());
 			}
 		}
 	} else {
@@ -411,6 +419,13 @@ function onSignupApiError() {
 		text: i18n.ts.somethingHappened,
 	});
 }
+
+onMounted(() => {
+	const params = new URLSearchParams(window.location.search);
+	if (params.has('invite-code') && useInviteCode) {
+		invitationCode.value = params.get('invite-code') ?? '';
+	}
+});
 </script>
 
 <style lang="scss" module>
diff --git a/packages/frontend/src/components/MkSignupDialog.rules.vue b/packages/frontend/src/components/MkSignupDialog.rules.vue
@@ -10,14 +10,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 	</div>
 	<div class="_spacer" style="--MI_SPACER-min: 20px; --MI_SPACER-max: 28px;">
 		<div class="_gaps_m">
-			<div v-if="instance.disableRegistration || instance.federation !== 'all'" class="_gaps_s">
+			<div v-if="instance.disableRegistration || instance.enableRegistrationLimit || instance.federation !== 'all'" class="_gaps_s">
+				<MkInfo v-if="!instance.disableRegistration && instance.enableRegistrationLimit" warn>{{ i18n.ts.registrationLimitEnabled }}</MkInfo>
 				<MkInfo v-if="instance.disableRegistration" warn>{{ i18n.ts.invitationRequiredToRegister }}</MkInfo>
 				<MkInfo v-if="instance.federation === 'specified'" warn>{{ i18n.ts.federationSpecified }}</MkInfo>
 				<MkInfo v-else-if="instance.federation === 'none'" warn>{{ i18n.ts.federationDisabled }}</MkInfo>
 			</div>
-			<div v-if="instance.enableRegistrationLimit" :class="$style.mainWarn">
-				<MkInfo warn>{{ i18n.ts.registrationLimitEnabled }}</MkInfo>
-			</div>
 
 			<div style="text-align: center;">
 				<div>{{ i18n.ts.pleaseConfirmBelowBeforeSignup }}</div>
diff --git a/packages/frontend/src/components/MkSignupDialog.vue b/packages/frontend/src/components/MkSignupDialog.vue
@@ -24,7 +24,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<template v-if="!isAcceptedServerRule">
 				<XServerRules @done="isAcceptedServerRule = true" @cancel="onClose"/>
 			</template>
-			<template v-else-if="!isChoosed && instance.enableRegistrationLimit">
+			<template v-else-if="!skipChoose && !isChoosed && !instance.disableRegistration && instance.enableRegistrationLimit">
 				<XChoice @done="doneChoice" @cancel="dialog?.close()"/>
 			</template>
 			<template v-else>
@@ -47,8 +47,10 @@ import { i18n } from '@/i18n.js';
 
 const props = withDefaults(defineProps<{
 	autoSet?: boolean;
+	skipChoose?: boolean;
 }>(), {
 	autoSet: false,
+	skipChoose: false,
 });
 
 const emit = defineEmits<{
@@ -61,7 +63,7 @@ const dialog = useTemplateRef('dialog');
 
 const isAcceptedServerRule = ref(false);
 const isChoosed = ref(false);
-const withoutInviteCode = ref(true);
+const withoutInviteCode = ref(false);
 
 function doneChoice(hasInviteCode: boolean) {
 	isChoosed.value = true;
diff --git a/packages/frontend/src/components/MkUpdated.vue b/packages/frontend/src/components/MkUpdated.vue
@@ -42,7 +42,7 @@ function closePanel() {
 }
 
 function whatIsNew() {
-	window.open(`https://misskey-hub.net/ja/docs/releases/#_${misskeyVersion.replaceAll('.', '-')}`, '_blank');
+	window.open(`https://misskey-hub.net/docs/releases/#_${misskeyVersion.replaceAll('.', '')}`, '_blank');
 }
 
 function whatIsNewKakurega() {
diff --git a/packages/frontend/src/components/MkVisitorDashboard.vue b/packages/frontend/src/components/MkVisitorDashboard.vue
@@ -18,14 +18,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<!-- eslint-disable-next-line vue/no-v-html -->
 				<div v-html="instance.description || i18n.ts.headlineMisskey"></div>
 			</div>
-			<div v-if="instance.disableRegistration || instance.federation !== 'all'" :class="$style.mainWarn" class="_gaps_s">
+			<div v-if="instance.disableRegistration || instance.enableRegistrationLimit || instance.federation !== 'all'" :class="$style.mainWarn" class="_gaps_s">
+				<MkInfo v-if="!instance.disableRegistration && instance.enableRegistrationLimit" info>{{ i18n.tsx.registrationLimitDetails({ limit: instance.registrationLimitCooldown, count: instance.registrationLimit }) }}</MkInfo>
 				<MkInfo v-if="instance.disableRegistration" warn>{{ i18n.ts.invitationRequiredToRegister }}</MkInfo>
 				<MkInfo v-if="instance.federation === 'specified'" warn>{{ i18n.ts.federationSpecified }}</MkInfo>
 				<MkInfo v-else-if="instance.federation === 'none'" warn>{{ i18n.ts.federationDisabled }}</MkInfo>
 			</div>
-			<div v-if="instance.enableRegistrationLimit" :class="$style.mainWarn">
-				<MkInfo info>{{ i18n.tsx.registrationLimitDetails({ limit: instance.registrationLimitCooldown, count: instance.registrationLimit }) }}</MkInfo>
-			</div>
 			<div class="_gaps_s" :class="$style.mainActions">
 				<MkButton :class="$style.mainAction" full rounded gradate data-cy-signup style="margin-right: 12px;" @click="signup()">{{ i18n.ts.joinThisServer }}</MkButton>
 				<MkButton :class="$style.mainAction" full rounded link to="https://misskey-hub.net/servers/">{{ i18n.ts.exploreOtherServers }}</MkButton>
@@ -58,20 +56,20 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script lang="ts" setup>
 import { ref } from 'vue';
 import * as Misskey from 'misskey-js';
+import { instanceName } from '@@/js/config.js';
+import type { MenuItem } from '@/types/menu.js';
 import XSigninDialog from '@/components/MkSigninDialog.vue';
 import XSignupDialog from '@/components/MkSignupDialog.vue';
 import MkButton from '@/components/MkButton.vue';
 import MkTimeline from '@/components/MkTimeline.vue';
 import MkInfo from '@/components/MkInfo.vue';
-import { instanceName } from '@@/js/config.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/utility/misskey-api.js';
 import { i18n } from '@/i18n.js';
 import { instance } from '@/instance.js';
 import MkNumber from '@/components/MkNumber.vue';
 import XActiveUsersChart from '@/components/MkVisitorDashboard.ActiveUsersChart.vue';
 import { openInstanceMenu } from '@/ui/_common_/common.js';
-import type { MenuItem } from '@/types/menu.js';
 
 const stats = ref<Misskey.entities.StatsResponse | null>(null);
 
diff --git a/packages/frontend/src/pages/admin/moderation.vue b/packages/frontend/src/pages/admin/moderation.vue
@@ -32,22 +32,26 @@ SPDX-License-Identifier: AGPL-3.0-only
 							<template #caption>{{ i18n.ts.blockMentionsFromUnfamiliarRemoteUsersDescription }} Cherry-picked from Misskey.io (https://github.com/MisskeyIO/misskey/commit/82cc3987c13db4ad0da1589386027c222ce85ff8)</template>
 						</MkSwitch>
 
-						<MkSwitch v-model="enableRegistrationLimit" :disabled="!enableRegistration" @change="onChange_enableRegistrationLimit">
-							<template #label>{{ i18n.ts.enableRegistrationLimit }}<span class="_beta">{{ i18n.ts.originalFeature }}</span></template>
-							<template #caption>{{ i18n.ts.enableRegistrationLimitDescription }}</template>
-						</MkSwitch>
-
-						<MkInput v-model="registrationLimitCooldown" type="number" :min="1" :disabled="!enableRegistration || !enableRegistrationLimit">
-							<template #label>{{ i18n.ts.registrationLimitCooldown }}</template>
-							<template #suffix>{{ i18n.ts._time.hour }}</template>
-							<template #caption>{{ i18n.ts.registrationLimitCooldownDescription }}</template>
-						</MkInput>
-
-						<MkInput v-model="registrationLimit" type="number" :min="0" :disabled="!enableRegistration || !enableRegistrationLimit">
-							<template #label>{{ i18n.ts.registrationLimit }}</template>
-							<template #caption>{{ i18n.ts.registrationLimitDescription }}</template>
-						</MkInput>
-						<MkButton primary :disabled="!enableRegistration || !enableRegistrationLimit" @click="save_registrationLimitSettings">{{ i18n.ts.save }}</MkButton>
+						<MkDisableSection :disabled="!enableRegistration">
+							<div class="_gaps_m">
+								<MkSwitch v-model="enableRegistrationLimit" @change="onChange_enableRegistrationLimit">
+									<template #label>{{ i18n.ts.enableRegistrationLimit }}<span class="_beta">{{ i18n.ts.originalFeature }}</span></template>
+									<template #caption>{{ i18n.ts.enableRegistrationLimitDescription }}</template>
+								</MkSwitch>
+
+								<MkInput v-model="registrationLimitCooldown" type="number" :min="1" :disabled="!enableRegistrationLimit">
+									<template #label>{{ i18n.ts.registrationLimitCooldown }}</template>
+									<template #suffix>{{ i18n.ts._time.hour }}</template>
+									<template #caption>{{ i18n.ts.registrationLimitCooldownDescription }}</template>
+								</MkInput>
+
+								<MkInput v-model="registrationLimit" type="number" :min="0" :disabled="!enableRegistrationLimit">
+									<template #label>{{ i18n.ts.registrationLimit }}</template>
+									<template #caption>{{ i18n.ts.registrationLimitDescription }}</template>
+								</MkInput>
+								<MkButton primary :disabled="!enableRegistrationLimit" @click="save_registrationLimitSettings">{{ i18n.ts.save }}</MkButton>
+							</div>
+						</MkDisableSection>
 
 						<MkSwitch v-model="disableExploreLocalUsers" @change="onChange_disableExploreLocalUsers">
 							<template #label>{{ i18n.ts.disableExploreLocalUsers }}<span class="_beta">{{ i18n.ts.originalFeature }}</span></template>
@@ -179,6 +183,7 @@ import MkSwitch from '@/components/MkSwitch.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkTextarea from '@/components/MkTextarea.vue';
 import FormSuspense from '@/components/form/suspense.vue';
+import MkDisableSection from '@/components/MkDisableSection.vue';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/utility/misskey-api.js';
 import { fetchInstance } from '@/instance.js';
diff --git a/packages/frontend/src/pages/invite.vue b/packages/frontend/src/pages/invite.vue
@@ -33,6 +33,7 @@ import type { Paging } from '@/components/MkPagination.vue';
 import { i18n } from '@/i18n.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/utility/misskey-api.js';
+import { copyInviteCode, copyInviteUrl } from '@/utility/invite.js';
 import MkButton from '@/components/MkButton.vue';
 import MkPagination from '@/components/MkPagination.vue';
 import MkInviteCode from '@/components/MkInviteCode.vue';
@@ -62,12 +63,33 @@ const resetCycle = computed<null | string>(() => {
 
 async function create() {
 	const ticket = await misskeyApi('invite/create');
-	os.alert({
+	const { result } = await os.actions({
 		type: 'success',
 		title: i18n.ts.inviteCodeCreated,
 		text: ticket.code,
+		actions: [{
+			value: 'copyUrl',
+			text: i18n.ts.copyInviteUrl,
+			primary: true,
+		}, {
+			value: 'copyCode',
+			text: i18n.ts.copyInviteCode,
+			primary: true,
+		}, {
+			value: 'close',
+			text: i18n.ts.close,
+		}],
 	});
 
+	switch (result) {
+		case 'copyUrl':
+			copyInviteUrl(ticket.code);
+			break;
+		case 'copyCode':
+			copyInviteCode(ticket.code);
+			break;
+	}
+
 	pagingComponent.value?.prepend(ticket);
 	update();
 }
diff --git a/packages/frontend/src/utility/invite.ts b/packages/frontend/src/utility/invite.ts
@@ -0,0 +1,12 @@
+import { copyToClipboard } from '@/utility/copy-to-clipboard.js';
+import { instance } from '@/instance.js';
+
+export function copyInviteCode(code: string) {
+	copyToClipboard(code);
+}
+
+export function copyInviteUrl(code: string) {
+	const url = new URL(instance.uri);
+	url.searchParams.set('invite-code', code);
+	copyToClipboard(url.toString());
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "misskey",`
`3`		`- "version": "2025.5.0-kakurega.1.41.0",`
	`3`	`+ "version": "2025.5.0-kakurega.1.42.0",`
`4`	`4`	`"codename": "nasubi",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ async function doneWithoutCode() {`
`73`	`73`	`.choiceButton {`
`74`	`74`	`height: 60px;`
`75`	`75`	`width: 100% !important;`
	`76`	`+ border-radius: 16px;`
`76`	`77`	`}`
`77`	`78`
`78`	`79`	`.banner {`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ function closePanel() {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`function whatIsNew() {`
`45`		- window.open(`https://misskey-hub.net/ja/docs/releases/#_${misskeyVersion.replaceAll('.', '-')}`, '_blank');
	`45`	+ window.open(`https://misskey-hub.net/docs/releases/#_${misskeyVersion.replaceAll('.', '')}`, '_blank');
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`function whatIsNewKakurega() {`