Merge branch 'develop' into multiple-reactions

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Simplified)

CHANGELOG.md

@@ -17,7 +17,7 @@
 - Fix: 特定の条件下でノートの削除ボタンが出ないのを修正
 
 ### Server
-- enhance: 照会時にURLがhtmlかつheadタグ内に`rel="alternate"`, `type="application/activity+json"`の`link`タグがある場合に追ってリンク先を照会できるように
+- Enhance: 照会時にURLがhtmlかつheadタグ内に`rel="alternate"`, `type="application/activity+json"`の`link`タグがある場合に追ってリンク先を照会できるように
 - Enhance: 凍結されたアカウントのフォローリクエストを表示しないように
 - Fix: WSの`readAllNotifications` メッセージが `body` を持たない場合に動作しない問題 #14374
   - 通知ページや通知カラム(デッキ)を開いている状態において、新たに発生した通知が既読されない問題が修正されます。

locales/en-US.yml

@@ -2499,6 +2499,7 @@ _moderationLogTypes:
   createAbuseReportNotificationRecipient: "Create a recipient for abuse reports"
   updateAbuseReportNotificationRecipient: "Update recipients for abuse reports"
   deleteAbuseReportNotificationRecipient: "Delete a recipient for abuse reports"
+  deleteFlash: "Delete Play"
 _fileViewer:
   title: "File details"
   type: "File type"

locales/index.d.ts

@@ -6686,6 +6686,10 @@ export interface Locale extends ILocale {
              * ノートのピン留めの最大数
              */
             "pinMax": string;
+            /**
+             * 一つのノートに対する最大リアクション数
+             */
+            "reactionsPerNoteLimit": string;
             /**
              * アンテナの作成可能数
              */

locales/ja-JP.yml

@@ -1728,6 +1728,7 @@ _role:
     alwaysMarkNsfw: "ファイルにNSFWを常に付与"
     canUpdateBioMedia: "アイコンとバナーの更新を許可"
     pinMax: "ノートのピン留めの最大数"
+    reactionsPerNoteLimit: "一つのノートに対する最大リアクション数"
     antennaMax: "アンテナの作成可能数"
     wordMuteMax: "ワードミュートの最大文字数"
     webhookMax: "Webhookの作成可能数"

locales/zh-CN.yml

@@ -2316,6 +2316,7 @@ _pages:
   eyeCatchingImageSet: "设置封面图片"
   eyeCatchingImageRemove: "删除封面图片"
   chooseBlock: "添加块"
+  enterSectionTitle: "输入会话标题"
   selectType: "选择类型"
   contentBlocks: "内容"
   inputBlocks: "输入"
@@ -2499,6 +2500,10 @@ _moderationLogTypes:
   createAbuseReportNotificationRecipient: "新建了举报通知"
   updateAbuseReportNotificationRecipient: "更新了举报通知"
   deleteAbuseReportNotificationRecipient: "删除了举报通知"
+  deleteAccount: "删除了账户"
+  deletePage: "删除了页面"
+  deleteFlash: "删除了 Play"
+  deleteGalleryPost: "删除了图库稿件"
 _fileViewer:
   title: "文件信息"
   type: "文件类型"

locales/zh-TW.yml

@@ -2316,6 +2316,7 @@ _pages:
   eyeCatchingImageSet: "設定封面影像"
   eyeCatchingImageRemove: "刪除封面影像"
   chooseBlock: "新增方塊"
+  enterSectionTitle: "輸入區段的標題"
   selectType: "選擇類型"
   contentBlocks: "內容"
   inputBlocks: "輸入"
@@ -2499,6 +2500,10 @@ _moderationLogTypes:
   createAbuseReportNotificationRecipient: "建立接收檢舉的通知對象"
   updateAbuseReportNotificationRecipient: "更新接收檢舉的通知對象"
   deleteAbuseReportNotificationRecipient: "刪除接收檢舉的通知對象"
+  deleteAccount: "刪除帳戶"
+  deletePage: "刪除頁面"
+  deleteFlash: "刪除 Play"
+  deleteGalleryPost: "刪除相簿的貼文"
 _fileViewer:
   title: "檔案詳細資訊"
   type: "檔案類型 "

packages/backend/migration/1721117896543-multiple-reactions.js

@@ -0,0 +1,20 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class MultipleReactions1721117896543 {
+	name = 'MultipleReactions1721117896543';
+
+	async up(queryRunner) {
+		await queryRunner.query('DROP INDEX "public"."IDX_ad0c221b25672daf2df320a817"');
+		await queryRunner.query('CREATE UNIQUE INDEX "IDX_a7751b74317122d11575bff31c" ON "note_reaction" ("userId", "noteId", "reaction") ');
+		await queryRunner.query('CREATE INDEX "IDX_ad0c221b25672daf2df320a817" ON "note_reaction" ("userId", "noteId") ');
+	}
+
+	async down(queryRunner) {
+		await queryRunner.query('DROP INDEX "public"."IDX_ad0c221b25672daf2df320a817"');
+		await queryRunner.query('DROP INDEX "public"."IDX_a7751b74317122d11575bff31c"');
+		await queryRunner.query('CREATE UNIQUE INDEX "IDX_ad0c221b25672daf2df320a817" ON "note_reaction" ("userId", "noteId") ');
+	}
+}

packages/backend/src/core/ReactionService.ts

@@ -174,24 +174,12 @@ export class ReactionService {
 			reaction,
 		};
 
-		// Create reaction
 		try {
 			await this.noteReactionsRepository.insert(record);
 		} catch (e) {
 			if (isDuplicateKeyValueError(e)) {
-				const exists = await this.noteReactionsRepository.findOneByOrFail({
-					noteId: note.id,
-					userId: user.id,
-				});
-
-				if (exists.reaction !== reaction) {
-					// 別のリアクションがすでにされていたら置き換える
-					await this.delete(user, note);
-					await this.noteReactionsRepository.insert(record);
-				} else {
 				// 同じリアクションがすでにされていたらエラー
 				throw new IdentifiableError('51c42bb4-931a-456b-bff7-e5a8a70dd298');
-				}
 			} else {
 				throw e;
 			}
@@ -286,11 +274,12 @@ export class ReactionService {
 	}
 
 	@bindThis
-	public async delete(user: { id: MiUser['id']; host: MiUser['host']; isBot: MiUser['isBot']; }, note: MiNote) {
+	public async delete(user: { id: MiUser['id']; host: MiUser['host']; isBot: MiUser['isBot']; }, note: MiNote, _reaction?: string | null) {
 		// if already unreacted
 		const exist = await this.noteReactionsRepository.findOneBy({
 			noteId: note.id,
 			userId: user.id,
+			reaction: _reaction ?? FALLBACK,
 		});
 
 		if (exist == null) {

packages/backend/src/core/RoleService.ts

@@ -49,6 +49,7 @@ export type RolePolicies = {
 	alwaysMarkNsfw: boolean;
 	canUpdateBioMedia: boolean;
 	pinLimit: number;
+	reactionsPerNoteLimit: number;
 	antennaLimit: number;
 	wordMuteLimit: number;
 	webhookLimit: number;
@@ -78,6 +79,7 @@ export const DEFAULT_POLICIES: RolePolicies = {
 	alwaysMarkNsfw: false,
 	canUpdateBioMedia: true,
 	pinLimit: 5,
+	reactionsPerNoteLimit: 1,
 	antennaLimit: 5,
 	wordMuteLimit: 200,
 	webhookLimit: 3,
@@ -380,6 +382,7 @@ export class RoleService implements OnApplicationShutdown, OnModuleInit {
 			alwaysMarkNsfw: calc('alwaysMarkNsfw', vs => vs.some(v => v === true)),
 			canUpdateBioMedia: calc('canUpdateBioMedia', vs => vs.some(v => v === true)),
 			pinLimit: calc('pinLimit', vs => Math.max(...vs)),
+			reactionsPerNoteLimit: calc('reactionsPerNoteLimit', vs => Math.max(...vs)),
 			antennaLimit: calc('antennaLimit', vs => Math.max(...vs)),
 			wordMuteLimit: calc('wordMuteLimit', vs => Math.max(...vs)),
 			webhookLimit: calc('webhookLimit', vs => Math.max(...vs)),

packages/backend/src/core/activitypub/ApRequestService.ts

@@ -203,7 +203,9 @@ export class ApRequestService {
 		});
 
 		//#region リクエスト先がhtmlかつactivity+jsonへのalternate linkタグがあるとき
-		if (res.headers.get('Content-type')?.startsWith('text/html;') && _followAlternate === true) {
+		const contentType = res.headers.get('content-type');
+
+		if ((contentType ?? '').split(';')[0].trimEnd().toLowerCase() === 'text/html' && _followAlternate === true) {
 			const html = await res.text();
 			const window = new Window();
 			const document = window.document;

packages/backend/src/core/entities/NoteEntityService.ts

@@ -170,10 +170,10 @@ export class NoteEntityService implements OnModuleInit {
 
 	@bindThis
 	public async populateMyReaction(note: { id: MiNote['id']; reactions: MiNote['reactions']; reactionAndUserPairCache?: MiNote['reactionAndUserPairCache']; }, meId: MiUser['id'], _hint_?: {
-		myReactions: Map<MiNote['id'], string | null>;
+		myReactionsMap: Map<MiNote['id'], string | null>;
 	}) {
-		if (_hint_?.myReactions) {
-			const reaction = _hint_.myReactions.get(note.id);
+		if (_hint_?.myReactionsMap) {
+			const reaction = _hint_.myReactionsMap.get(note.id);
 			if (reaction) {
 				return this.reactionService.convertLegacyReaction(reaction);
 			} else {

packages/backend/src/models/NoteReaction.ts

@@ -9,7 +9,8 @@ import { MiUser } from './User.js';
 import { MiNote } from './Note.js';
 
 @Entity('note_reaction')
-@Index(['userId', 'noteId'], { unique: true })
+@Index(['userId', 'noteId'])
+@Index(['userId', 'noteId', 'reaction'], { unique: true })
 export class MiNoteReaction {
 	@PrimaryColumn(id())
 	public id: string;

packages/backend/src/models/json-schema/role.ts

@@ -236,6 +236,10 @@ export const packedRolePoliciesSchema = {
 			type: 'integer',
 			optional: false, nullable: false,
 		},
+		reactionsPerNoteLimit: {
+			type: 'integer',
+			optional: false, nullable: false,
+		},
 		antennaLimit: {
 			type: 'integer',
 			optional: false, nullable: false,

packages/frontend/src/components/MkPreview.vue

@@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <template>
 <div :class="$style.preview">
-	<div :class="$style.preview__content1">
+	<div>
 		<MkInput v-model="text">
 			<template #label>Text</template>
 		</MkInput>

packages/frontend/src/components/MkRolePreview.vue

@@ -25,7 +25,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<span :class="$style.bodyName">{{ role.name }}</span>
 			<template v-if="detailed">
 				<span v-if="role.target === 'manual'" :class="$style.bodyUsers">{{ role.usersCount }} users</span>
-				<span v-else-if="role.target === 'conditional'" :class="$style.bodyUsers">({{ i18n.ts._role.conditional }})</span>
+				<span v-else-if="role.target === 'conditional'" :class="$style.bodyUsers">? users</span>
 			</template>
 		</div>
 		<div :class="$style.bodyDescription">{{ role.description }}</div>

packages/frontend/src/const.ts

@@ -89,6 +89,7 @@ export const ROLE_POLICIES = [
 	'alwaysMarkNsfw',
 	'canUpdateBioMedia',
 	'pinLimit',
+	'reactionsPerNoteLimit',
 	'antennaLimit',
 	'wordMuteLimit',
 	'webhookLimit',

packages/frontend/src/pages/about-misskey.vue

@@ -72,10 +72,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 							<img src="https://avatars.githubusercontent.com/u/4439005?v=4" :class="$style.contributorAvatar">
 							<span :class="$style.contributorUsername">@syuilo</span>
 						</a>
-						<a href="https://github.com/tamaina" target="_blank" :class="$style.contributor">
-							<img src="https://avatars.githubusercontent.com/u/7973572?v=4" :class="$style.contributorAvatar">
-							<span :class="$style.contributorUsername">@tamaina</span>
-						</a>
 						<a href="https://github.com/acid-chicken" target="_blank" :class="$style.contributor">
 							<img src="https://avatars.githubusercontent.com/u/20679825?v=4" :class="$style.contributorAvatar">
 							<span :class="$style.contributorUsername">@acid-chicken</span>
@@ -267,6 +263,9 @@ const patronsWithIcon = [{
 }, {
 	name: 'Macop',
 	icon: 'https://assets.misskey-hub.net/patrons/ee052bf550014d36a643ce3dce595640.jpg',
+}, {
+	name: 'なっかあ',
+	icon: 'https://assets.misskey-hub.net/patrons/c2f5f3e394e74a64912284a2f4ca710e.jpg',
 }];
 
 const patrons = [

packages/frontend/src/pages/admin/roles.editor.vue

@@ -417,6 +417,25 @@ SPDX-License-Identifier: AGPL-3.0-only
 				</div>
 			</MkFolder>
 
+			<MkFolder v-if="matchQuery([i18n.ts._role._options.reactionsPerNoteLimit, 'reactionsPerNoteLimit'])">
+				<template #label>{{ i18n.ts._role._options.reactionsPerNoteLimit }}</template>
+				<template #suffix>
+					<span v-if="role.policies.reactionsPerNoteLimit.useDefault" :class="$style.useDefaultLabel">{{ i18n.ts._role.useBaseValue }}</span>
+					<span v-else>{{ role.policies.reactionsPerNoteLimit.value }}</span>
+					<span :class="$style.priorityIndicator"><i :class="getPriorityIcon(role.policies.reactionsPerNoteLimit)"></i></span>
+				</template>
+				<div class="_gaps">
+					<MkSwitch v-model="role.policies.reactionsPerNoteLimit.useDefault" :readonly="readonly">
+						<template #label>{{ i18n.ts._role.useBaseValue }}</template>
+					</MkSwitch>
+					<MkInput v-model="role.policies.reactionsPerNoteLimit.value" :disabled="role.policies.reactionsPerNoteLimit.useDefault" type="number" :readonly="readonly">
+					</MkInput>
+					<MkRange v-model="role.policies.reactionsPerNoteLimit.priority" :min="0" :max="2" :step="1" easing :textConverter="(v) => v === 0 ? i18n.ts._role._priority.low : v === 1 ? i18n.ts._role._priority.middle : v === 2 ? i18n.ts._role._priority.high : ''">
+						<template #label>{{ i18n.ts._role.priority }}</template>
+					</MkRange>
+				</div>
+			</MkFolder>
+
 			<MkFolder v-if="matchQuery([i18n.ts._role._options.antennaMax, 'antennaLimit'])">
 				<template #label>{{ i18n.ts._role._options.antennaMax }}</template>
 				<template #suffix>

packages/frontend/src/pages/admin/roles.vue

@@ -149,6 +149,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 							</MkInput>
 						</MkFolder>
 
+						<MkFolder v-if="matchQuery([i18n.ts._role._options.reactionsPerNoteLimit, 'reactionsPerNoteLimit'])">
+							<template #label>{{ i18n.ts._role._options.reactionsPerNoteLimit }}</template>
+							<template #suffix>{{ policies.reactionsPerNoteLimit }}</template>
+							<MkInput v-model="policies.reactionsPerNoteLimit" type="number">
+							</MkInput>
+						</MkFolder>
+
 						<MkFolder v-if="matchQuery([i18n.ts._role._options.antennaMax, 'antennaLimit'])">
 							<template #label>{{ i18n.ts._role._options.antennaMax }}</template>
 							<template #suffix>{{ policies.antennaLimit }}</template>

packages/frontend/src/pages/flash/flash.vue

@@ -236,10 +236,12 @@ function reportAbuse() {
 
 	const pageUrl = `${url}/play/${flash.value.id}`;
 
-	os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
 		user: flash.value.user,
 		initialComment: `Play: ${pageUrl}\n-----\n`,
-	}, {}, 'closed');
+	}, {
+		closed: () => dispose(),
+	});
 }
 
 function showMenu(ev: MouseEvent) {

packages/frontend/src/pages/gallery/post.vue

@@ -160,10 +160,12 @@ function reportAbuse() {
 
 	const pageUrl = `${url}/gallery/${post.value.id}`;
 
-	os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
 		user: post.value.user,
 		initialComment: `Post: ${pageUrl}\n-----\n`,
-	}, {}, 'closed');
+	}, {
+		closed: () => dispose(),
+	});
 }
 
 function showMenu(ev: MouseEvent) {

packages/frontend/src/pages/page.vue

@@ -245,10 +245,12 @@ function reportAbuse() {
 
 	const pageUrl = `${url}/@${props.username}/pages/${props.pageName}`;
 
-	os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
+	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
 		user: page.value.user,
 		initialComment: `Page: ${pageUrl}\n-----\n`,
-	}, {}, 'closed');
+	}, {
+		closed: () => dispose(),
+	});
 }
 
 function showMenu(ev: MouseEvent) {

packages/frontend/src/pages/timeline.vue

@@ -240,7 +240,7 @@ function closeTutorial(): void {
 }
 
 function switchTlIfNeeded() {
-	if (isBasicTimeline(src.value) && !availableBasicTimelines().includes(src.value)) {
+	if (isBasicTimeline(src.value) && !isAvailableBasicTimeline(src.value)) {
 		src.value = availableBasicTimelines()[0];
 	}
 }

packages/misskey-js/src/consts.ts

@@ -4,9 +4,12 @@ import type {
 	Ad,
 	Announcement,
 	EmojiDetailed,
+	Flash,
+	GalleryPost,
 	InviteCode,
 	MetaDetailed,
 	Note,
+	Page,
 	Role,
 	ReversiGameDetailed,
 	SystemWebhook,
@@ -405,18 +408,18 @@ export type ModerationLogPayloads = {
 		pageId: string;
 		pageUserId: string;
 		pageUserUsername: string;
-		page: any;
+		page: Page;
 	};
 	deleteFlash: {
 		flashId: string;
 		flashUserId: string;
 		flashUserUsername: string;
-		flash: any;
+		flash: Flash;
 	};
 	deleteGalleryPost: {
 		postId: string;
 		postUserId: string;
 		postUserUsername: string;
-		post: any;
+		post: GalleryPost;
 	};
 };