Develop

locales/en-US.yml

@@ -753,6 +753,7 @@ noCrawleDescription: "Ask search engines to not index your profile page, notes,
 lockedAccountInfo: "Unless you set your note visiblity to \"Followers only\", your notes will be visible to anyone, even if you require followers to be manually approved."
 alwaysMarkSensitive: "Mark as sensitive by default"
 loadRawImages: "Load original images instead of showing thumbnails"
+denyaize: "Forcefully disable the nyaize (cat-marking) feature"
 disableShowingAnimatedImages: "Don't play animated images"
 highlightSensitiveMedia: "Highlight sensitive media"
 verificationEmailSent: "A verification email has been sent. Please follow the included link to complete verification."

locales/index.d.ts

@@ -1236,6 +1236,14 @@ export interface Locale extends ILocale {
      * リモートユーザーのため、情報が不完全です。
      */
     "remoteUserCaution": string;
+    /**
+     * 表示されているURLと実際のURLが異なります。フィッシング詐欺などに注意してください。
+     */
+    "phishingCaution": string;
+    /**
+     * 表示上と実際のURLが異なります。
+     */
+    "shortPhishingCaution": string;
     /**
      * アクティビティ
      */
@@ -3028,6 +3036,10 @@ export interface Locale extends ILocale {
      * 添付画像のサムネイルをオリジナル画質にする
      */
     "loadRawImages": string;
+    /**
+     * 猫化(nyaize)を強制的に無効にする
+     */
+    "denyaize": string;
     /**
      * アニメーション画像を再生しない
      */
@@ -5008,6 +5020,18 @@ export interface Locale extends ILocale {
      * リトライ
      */
     "gameRetry": string;
+    /**
+     * QRコード
+     */
+    "qrcode": string;
+    /**
+     * このQRコードをスキャンすると、新規登録時の招待コードが自動で入力されます。
+     */
+    "qrcodeToInvite": string;
+    /**
+     * 指定された絵文字は既に存在します。
+     */
+    "emojiAlreadyExists": string;
     /**
      * 使用しない場合は空欄にしてください
      */

locales/ja-JP.yml

@@ -305,6 +305,8 @@ termsOfService: "利用規約"
 start: "始める"
 home: "ホーム"
 remoteUserCaution: "リモートユーザーのため、情報が不完全です。"
+phishingCaution: "表示されているURLと実際のURLが異なります。フィッシング詐欺などに注意してください。"
+shortPhishingCaution: "表示上と実際のURLが異なります。"
 activity: "アクティビティ"
 images: "画像"
 image: "画像"
@@ -753,6 +755,7 @@ noCrawleDescription: "外部の検索エンジンにあなたのユーザーペ
 lockedAccountInfo: "フォローを承認制にしても、ノートの公開範囲を「フォロワー」にしない限り、誰でもあなたのノートを見ることができます。"
 alwaysMarkSensitive: "デフォルトでメディアをセンシティブ設定にする"
 loadRawImages: "添付画像のサムネイルをオリジナル画質にする"
+denyaize: "猫化(nyaize)を強制的に無効にする"
 disableShowingAnimatedImages: "アニメーション画像を再生しない"
 highlightSensitiveMedia: "メディアがセンシティブであることを分かりやすく表示"
 verificationEmailSent: "確認のメールを送信しました。メールに記載されたリンクにアクセスして、設定を完了してください。"
@@ -1248,6 +1251,9 @@ enableHorizontalSwipe: "スワイプしてタブを切り替える"
 loading: "読み込み中"
 surrender: "やめる"
 gameRetry: "リトライ"
+qrcode: "QRコード"
+qrcodeToInvite: "このQRコードをスキャンすると、新規登録時の招待コードが自動で入力されます。"
+emojiAlreadyExists: "指定された絵文字は既に存在します。"
 notUsePleaseLeaveBlank: "使用しない場合は空欄にしてください"
 useTotp: "ワンタイムパスワードを使う"
 useBackupCode: "バックアップコードを使う"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.8.0",
+	"version": "2024.8.0-enma",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

packages/backend/migration/1710500319651-update-note-reactions-unique-constraint.js

@@ -0,0 +1,13 @@
+export class UpdateNoteReactionsUniqueConstraint1710499309897 {
+  name = 'UpdateNoteReactionsUniqueConstraint1710499309897'
+
+  async up(queryRunner){
+    await queryRunner.query(`CREATE UNIQUE INDEX "IDX_note_reaction_user_note_reaction" ON "note_reaction" ("userId", "noteId", "reaction")`);
+    await queryRunner.query(`DROP INDEX "IDX_ad0c221b25672daf2df320a817"`);
+  }
+
+  async down(queryRunner){
+    await queryRunner.query(`DROP INDEX "IDX_note_reaction_user_note_reaction"`);
+    await queryRunner.query(`CREATE UNIQUE INDEX "IDX_ad0c221b25672daf2df320a817" ON "note_reaction" ("userId", "noteId")`);  }
+}
+

packages/backend/src/core/NoteCreateService.ts

@@ -247,9 +247,6 @@ export class NoteCreateService implements OnApplicationShutdown {
 		if (data.createdAt == null) data.createdAt = new Date();
 		if (data.visibility == null) data.visibility = 'public';
 		if (data.localOnly == null) data.localOnly = false;
-		if (data.channel != null) data.visibility = 'public';
-		if (data.channel != null) data.visibleUsers = [];
-		if (data.channel != null) data.localOnly = true;
 
 		const meta = await this.metaService.fetch();
 

packages/backend/src/core/ReactionService.ts

@@ -179,19 +179,14 @@ export class ReactionService {
 			await this.noteReactionsRepository.insert(record);
 		} catch (e) {
 			if (isDuplicateKeyValueError(e)) {
-				const exists = await this.noteReactionsRepository.findOneByOrFail({
+				const exists = await this.noteReactionsRepository.findOneBy({
 					noteId: note.id,
 					userId: user.id,
+					reaction,
 				});
 
-				if (exists.reaction !== reaction) {
-					// 別のリアクションがすでにされていたら置き換える
-					await this.delete(user, note);
-					await this.noteReactionsRepository.insert(record);
-				} else {
-					// 同じリアクションがすでにされていたらエラー
-					throw new IdentifiableError('51c42bb4-931a-456b-bff7-e5a8a70dd298');
-				}
+				// 同じリアクションがすでにされていたらエラー
+				if (exists) throw new IdentifiableError('51c42bb4-931a-456b-bff7-e5a8a70dd298');
 			} else {
 				throw e;
 			}
@@ -286,42 +281,55 @@ 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) {
 		// if already unreacted
-		const exist = await this.noteReactionsRepository.findOneBy({
-			noteId: note.id,
-			userId: user.id,
+		const exist = await this.noteReactionsRepository.find({
+			where: {
+				noteId: note.id,
+				userId: user.id,
+				reaction
+			}
 		});
 
 		if (exist == null) {
 			throw new IdentifiableError('60527ec9-b4cb-4a88-a6bd-32d3ad26817d', 'not reacted');
 		}
 
+		if (exist.length > 1 && !reaction) {
+			throw new IdentifiableError('b21ffbbf-037c-bfc2-e29a-3edd6174a36b', 'multi reacted');
+		}
+
+		const target = exist[0];
+
+		if (!target) {
+			throw new IdentifiableError('60527ec9-b4cb-4a88-a6bd-32d3ad26817d', 'not reacted');
+		}
+
 		// Delete reaction
-		const result = await this.noteReactionsRepository.delete(exist.id);
+		const result = await this.noteReactionsRepository.delete(target.id);
 
 		if (result.affected !== 1) {
 			throw new IdentifiableError('60527ec9-b4cb-4a88-a6bd-32d3ad26817d', 'not reacted');
 		}
 
 		// Decrement reactions count
-		const sql = `jsonb_set("reactions", '{${exist.reaction}}', (COALESCE("reactions"->>'${exist.reaction}', '0')::int - 1)::text::jsonb)`;
+		const sql = `jsonb_set("reactions", '{${target.reaction}}', (COALESCE("reactions"->>'${target.reaction}', '0')::int - 1)::text::jsonb)`;
 		await this.notesRepository.createQueryBuilder().update()
 			.set({
 				reactions: () => sql,
-				reactionAndUserPairCache: () => `array_remove("reactionAndUserPairCache", '${user.id}/${exist.reaction}')`,
+				reactionAndUserPairCache: () => `array_remove("reactionAndUserPairCache", '${user.id}/${target.reaction}')`,
 			})
 			.where('id = :id', { id: note.id })
 			.execute();
 
 		this.globalEventService.publishNoteStream(note.id, 'unreacted', {
-			reaction: this.decodeReaction(exist.reaction).reaction,
+			reaction: this.decodeReaction(target.reaction).reaction,
 			userId: user.id,
 		});
 
 		//#region 配信
 		if (this.userEntityService.isLocalUser(user) && !note.localOnly) {
-			const content = this.apRendererService.addContext(this.apRendererService.renderUndo(await this.apRendererService.renderLike(exist, note), user));
+			const content = this.apRendererService.addContext(this.apRendererService.renderUndo(await this.apRendererService.renderLike(target, note), user));
 			const dm = this.apDeliverManagerService.createDeliverManager(user, content);
 			if (note.userHost !== null) {
 				const reactee = await this.usersRepository.findOneBy({ id: note.userId });

packages/backend/src/core/activitypub/models/ApNoteService.ts

@@ -6,7 +6,7 @@
 import { forwardRef, Inject, Injectable } from '@nestjs/common';
 import { In } from 'typeorm';
 import { DI } from '@/di-symbols.js';
-import type { PollsRepository, EmojisRepository } from '@/models/_.js';
+import type { PollsRepository, EmojisRepository, UsersRepository } from '@/models/_.js';
 import type { Config } from '@/config.js';
 import type { MiRemoteUser } from '@/models/User.js';
 import type { MiNote } from '@/models/Note.js';
@@ -52,6 +52,9 @@ export class ApNoteService {
 		@Inject(DI.emojisRepository)
 		private emojisRepository: EmojisRepository,
 
+		@Inject(DI.usersRepository)
+		private usersRepository: UsersRepository,
+
 		private idService: IdService,
 		private apMfmService: ApMfmService,
 		private apResolverService: ApResolverService,
@@ -207,6 +210,16 @@ export class ApNoteService {
 			}
 		}
 
+		// SPAM対策
+		const hasNoFF = actor.followersCount === 0 && actor.followingCount === 0;
+		if (actor.username === (actor.name ?? actor.username) && /^[a-z0-9]+$/.test(actor.username) && actor.username.length === 10 && apMentions.length > 0 && hasNoFF) {
+			this.logger.error('Suspected SPAM', {
+				account: `@${actor.username}@${actor.host}`,
+				note: `${note.id}`,
+			});
+			throw new StatusError('SUSPECTED_SPAM', 202, 'Violated SPAM policy.');
+		}
+
 		// 添付ファイル
 		const files: MiDriveFile[] = [];
 

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

@@ -170,12 +170,12 @@ 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>;
+		myReactions: Map<MiNote['id'], string[]>;
 	}) {
 		if (_hint_?.myReactions) {
 			const reaction = _hint_.myReactions.get(note.id);
 			if (reaction) {
-				return this.reactionService.convertLegacyReaction(reaction);
+				return reaction.map(r => this.reactionService.convertLegacyReaction(r));
 			} else {
 				return undefined;
 			}
@@ -184,9 +184,9 @@ export class NoteEntityService implements OnModuleInit {
 		const reactionsCount = Object.values(note.reactions).reduce((a, b) => a + b, 0);
 		if (reactionsCount === 0) return undefined;
 		if (note.reactionAndUserPairCache && reactionsCount <= note.reactionAndUserPairCache.length) {
-			const pair = note.reactionAndUserPairCache.find(p => p.startsWith(meId));
+			const pair = note.reactionAndUserPairCache.filter(p => p.startsWith(meId));
 			if (pair) {
-				return this.reactionService.convertLegacyReaction(pair.split('/')[1]);
+				return pair.map(p => this.reactionService.convertLegacyReaction(p.split('/')[1]));
 			} else {
 				return undefined;
 			}
@@ -197,13 +197,15 @@ export class NoteEntityService implements OnModuleInit {
 			return undefined;
 		}
 
-		const reaction = await this.noteReactionsRepository.findOneBy({
-			userId: meId,
-			noteId: note.id,
+		const reaction = await this.noteReactionsRepository.find({
+      where: {
+        userId: meId,
+        noteId: note.id,
+      }
 		});
 
 		if (reaction) {
-			return this.reactionService.convertLegacyReaction(reaction.reaction);
+			return reaction.map(r => this.reactionService.convertLegacyReaction(r.reaction));
 		}
 
 		return undefined;
@@ -287,7 +289,7 @@ export class NoteEntityService implements OnModuleInit {
 			skipHide?: boolean;
 			withReactionAndUserPairCache?: boolean;
 			_hint_?: {
-				myReactions: Map<MiNote['id'], string | null>;
+				myReactions: Map<MiNote['id'], string[]>;
 				packedFiles: Map<MiNote['fileIds'][number], Packed<'DriveFile'> | null>;
 				packedUsers: Map<MiUser['id'], Packed<'UserLite'>>
 			};
@@ -321,6 +323,10 @@ export class NoteEntityService implements OnModuleInit {
 		const packedFiles = options?._hint_?.packedFiles;
 		const packedUsers = options?._hint_?.packedUsers;
 
+    const myReactions = (meId && Object.keys(note.reactions).length)
+    ? await this.populateMyReaction(note, meId, options?._hint_)
+    : undefined;
+
 		const packed: Packed<'Note'> = await awaitAll({
 			id: note.id,
 			createdAt: this.idService.parse(note.id).date.toISOString(),
@@ -376,8 +382,9 @@ export class NoteEntityService implements OnModuleInit {
 
 				poll: note.hasPoll ? this.populatePoll(note, meId) : undefined,
 
-				...(meId && Object.keys(note.reactions).length > 0 ? {
-					myReaction: this.populateMyReaction(note, meId, options?._hint_),
+				...(myReactions && myReactions.length > 0 ? {
+					myReaction: myReactions[0],
+          myReactions,
 				} : {}),
 			} : {}),
 		});
@@ -401,7 +408,7 @@ export class NoteEntityService implements OnModuleInit {
 		if (notes.length === 0) return [];
 
 		const meId = me ? me.id : null;
-		const myReactionsMap = new Map<MiNote['id'], string | null>();
+		const myReactionsMap = new Map<MiNote['id'], string[]>();
 		if (meId) {
 			const idsNeedFetchMyReaction = new Set<MiNote['id']>();
 
@@ -412,26 +419,26 @@ export class NoteEntityService implements OnModuleInit {
 				if (note.renote && (note.text == null && note.fileIds.length === 0)) { // pure renote
 					const reactionsCount = Object.values(note.renote.reactions).reduce((a, b) => a + b, 0);
 					if (reactionsCount === 0) {
-						myReactionsMap.set(note.renote.id, null);
+						myReactionsMap.set(note.renote.id, []);
 					} else if (reactionsCount <= note.renote.reactionAndUserPairCache.length) {
-						const pair = note.renote.reactionAndUserPairCache.find(p => p.startsWith(meId));
-						myReactionsMap.set(note.renote.id, pair ? pair.split('/')[1] : null);
+						const pair = note.renote.reactionAndUserPairCache.filter(p => p.startsWith(meId));
+						myReactionsMap.set(note.renote.id, pair ? pair.map(p => p.split('/')[1]) : []);
 					} else {
 						idsNeedFetchMyReaction.add(note.renote.id);
 					}
 				} else {
 					if (note.id < oldId) {
 						const reactionsCount = Object.values(note.reactions).reduce((a, b) => a + b, 0);
 						if (reactionsCount === 0) {
-							myReactionsMap.set(note.id, null);
+							myReactionsMap.set(note.id, []);
 						} else if (reactionsCount <= note.reactionAndUserPairCache.length) {
-							const pair = note.reactionAndUserPairCache.find(p => p.startsWith(meId));
-							myReactionsMap.set(note.id, pair ? pair.split('/')[1] : null);
+							const pair = note.reactionAndUserPairCache.filter(p => p.startsWith(meId));
+							myReactionsMap.set(note.id, pair ? pair.map(p => p.split('/')[1]) : []);
 						} else {
 							idsNeedFetchMyReaction.add(note.id);
 						}
 					} else {
-						myReactionsMap.set(note.id, null);
+						myReactionsMap.set(note.id, []);
 					}
 				}
 			}
@@ -442,7 +449,7 @@ export class NoteEntityService implements OnModuleInit {
 			}) : [];
 
 			for (const id of idsNeedFetchMyReaction) {
-				myReactionsMap.set(id, myReactions.find(reaction => reaction.noteId === id)?.reaction ?? null);
+				myReactionsMap.set(id, myReactions.filter(reaction => reaction.noteId === id).map(r => r.reaction));
 			}
 		}
 

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

@@ -368,8 +368,9 @@ export class UserEntityService implements OnModuleInit {
 	@bindThis
 	public getOnlineStatus(user: MiUser): 'unknown' | 'online' | 'active' | 'offline' {
 		if (user.hideOnlineStatus) return 'unknown';
-		if (user.lastActiveDate == null) return 'unknown';
-		const elapsed = Date.now() - user.lastActiveDate.getTime();
+    const activeDate = user.lastActiveDate ?? user.updatedAt;
+		if (activeDate == null) return 'unknown';
+		const elapsed = Date.now() - activeDate.getTime();
 		return (
 			elapsed < USER_ONLINE_THRESHOLD ? 'online' :
 			elapsed < USER_ACTIVE_THRESHOLD ? 'active' :

packages/backend/src/models/NoteReaction.ts

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