Revert "perf: Reduce database query"

This reverts commit 87c8f9ff953499340496e9c5db09c93eaff08851.

2 files changed, 15 insertions, 29 deletions

diff --git a/src/server/api/endpoints/notes/mentions.ts b/src/server/api/endpoints/notes/mentions.ts
index 56640ec1ab..30844774e0 100644
--- a/src/server/api/endpoints/notes/mentions.ts
+++ b/src/server/api/endpoints/notes/mentions.ts
@@ -1,12 +1,12 @@
 import $ from 'cafy';
 import { ID } from '../../../../misc/cafy-id';
 import define from '../../define';
+import read from '../../../../services/note/read';
 import { Notes, Followings } from '../../../../models';
 import { generateVisibilityQuery } from '../../common/generate-visibility-query';
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query';
 import { makePaginationQuery } from '../../common/make-pagination-query';
 import { Brackets } from 'typeorm';
-import { readMention } from '../../../../services/note/read-mention';
 
 export const meta = {
 	desc: {
@@ -83,7 +83,9 @@ export default define(meta, async (ps, user) => {
 
 	const mentions = await query.take(ps.limit!).getMany();
 
-	readMention(user.id, mentions.map(n => n.id));
+	for (const note of mentions) {
+		read(user.id, note.id);
+	}
 
 	return await Notes.packMany(mentions, user);
 });
diff --git a/src/server/api/stream/index.ts b/src/server/api/stream/index.ts
index 748e894f83..f67faee1ce 100644
--- a/src/server/api/stream/index.ts
+++ b/src/server/api/stream/index.ts
@@ -2,6 +2,7 @@ import autobind from 'autobind-decorator';
 import * as websocket from 'websocket';
 import { readNotification } from '../common/read-notification';
 import call from '../call';
+import readNote from '../../../services/note/read';
 import Channel from './channel';
 import channels from './channels';
 import { EventEmitter } from 'events';
@@ -13,8 +14,6 @@ import { AccessToken } from '../../../models/entities/access-token';
 import { UserProfile } from '../../../models/entities/user-profile';
 import { publishChannelStream, publishGroupMessagingStream, publishMessagingStream } from '../../../services/stream';
 import { UserGroup } from '../../../models/entities/user-group';
-import { readMention } from '../../../services/note/read-mention';
-import { readSpecifiedNote } from '../../../services/note/read-specified-note';
 
 /**
  * Main stream connection
@@ -116,10 +115,9 @@ export default class Connection {
 		switch (type) {
 			case 'api': this.onApiRequest(body); break;
 			case 'readNotification': this.onReadNotification(body); break;
-			case 'readMention': this.onReadMention(body); break;
-			case 'readSpecifiedNote': this.onReadSpecifiedNote(body); break;
-			case 'subNote': this.onSubscribeNote(body); break;
-			case 'sn': this.onSubscribeNote(body); break; // alias
+			case 'subNote': this.onSubscribeNote(body, true); break;
+			case 'sn': this.onSubscribeNote(body, true); break; // alias
+			case 's': this.onSubscribeNote(body, false); break;
 			case 'unsubNote': this.onUnsubscribeNote(body); break;
 			case 'un': this.onUnsubscribeNote(body); break; // alias
 			case 'connect': this.onChannelConnectRequested(body); break;
@@ -172,31 +170,11 @@ export default class Connection {
 		readNotification(this.user!.id, [payload.id]);
 	}
 
-	@autobind
-	private onReadMention(payload: any) {
-		if (!payload.id) return;
-		if (this.user) {
-			// TODO: ある程度まとめてreadMentionするようにする
-			// 具体的には、この箇所ではキュー的な配列にread予定ノートを溜めておくに留めて、別の箇所で定期的にキューにあるノートを配列でreadMentionに渡すような実装にする
-			readMention(this.user.id, [payload.id]);
-		}
-	}
-
-	@autobind
-	private onReadSpecifiedNote(payload: any) {
-		if (!payload.id) return;
-		if (this.user) {
-			// TODO: ある程度まとめてreadSpecifiedNoteするようにする
-			// 具体的には、この箇所ではキュー的な配列にread予定ノートを溜めておくに留めて、別の箇所で定期的にキューにあるノートを配列でreadSpecifiedNoteに渡すような実装にする
-			readSpecifiedNote(this.user.id, [payload.id]);
-		}
-	}
-
 	/**
 	 * 投稿購読要求時
 	 */
 	@autobind
-	private onSubscribeNote(payload: any) {
+	private onSubscribeNote(payload: any, read: boolean) {
 		if (!payload.id) return;
 
 		if (this.subscribingNotes[payload.id] == null) {
@@ -208,6 +186,12 @@ export default class Connection {
 		if (this.subscribingNotes[payload.id] === 1) {
 			this.subscriber.on(`noteStream:${payload.id}`, this.onNoteStreamMessage);
 		}
+
+		if (this.user && read) {
+			// TODO: クライアントでタイムライン読み込みなどすると、一度に大量のreadNoteが発生しクエリ数がすごいことになるので、ある程度まとめてreadNoteするようにする
+			// 具体的には、この箇所ではキュー的な配列にread予定ノートを溜めておくに留めて、別の箇所で定期的にキューにあるノートを配列でreadNoteに渡すような実装にする
+			readNote(this.user.id, payload.id);
+		}
 	}
 
 	/**