Merge pull request #98 from anatawa12/user-note-for-featured

User note for featured

CHANGELOG.md

@@ -17,6 +17,7 @@
 ### General
 - こんにりらみすきー部がハイライトから除外されるようになりました
 - モデレーターがユーザーのアイコンもしくはバナー画像を未設定状態にできる機能を追加
+- Fix: ハイライトでユーザミュートが機能しない問題
 
 ### Client
 - リアクションの横幅を150pxに制限するかどうかユーザーが選べるように

packages/backend/src/server/api/endpoints/notes/featured.ts

@@ -10,6 +10,8 @@ import { Endpoint } from '@/server/api/endpoint-base.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { DI } from '@/di-symbols.js';
 import { FeaturedService } from '@/core/FeaturedService.js';
+import { isUserRelated } from '@/misc/is-user-related.js';
+import { CacheService } from '@/core/CacheService.js';
 
 export const meta = {
 	tags: ['notes'],
@@ -50,6 +52,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 		private noteEntityService: NoteEntityService,
 		private featuredService: FeaturedService,
+		private cacheService: CacheService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			let noteIds: string[];
@@ -84,10 +87,26 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoinAndSelect('renote.user', 'renoteUser')
 				.leftJoinAndSelect('note.channel', 'channel');
 
-			const notes = await query.getMany();
-			notes.sort((a, b) => a.id > b.id ? -1 : 1);
+			let notes = await query.getMany();
+
+			if (me != null) {
+				// user mute and blocking
+				const [
+					userIdsWhoMeMuting,
+				] = await Promise.all([
+					this.cacheService.userMutingsCache.fetch(me.id),
+				]);
+
+				notes = notes.filter(note => {
+					if (isUserRelated(note, userIdsWhoMeMuting, true)) return false;
+
+					return true;
+				});
 
-			// TODO: ミュート等考慮
+				// TODO: フィルタで件数が減った場合の埋め合わせ処理
+			}
+
+			notes.sort((a, b) => a.id > b.id ? -1 : 1);
 
 			return await this.noteEntityService.packMany(notes, me);
 		});

packages/backend/src/server/api/endpoints/users/featured-notes.ts

@@ -9,6 +9,8 @@ import { Endpoint } from '@/server/api/endpoint-base.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { DI } from '@/di-symbols.js';
 import { FeaturedService } from '@/core/FeaturedService.js';
+import { isUserRelated } from '@/misc/is-user-related.js';
+import { CacheService } from '@/core/CacheService.js';
 
 export const meta = {
 	tags: ['notes'],
@@ -46,6 +48,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 
 		private noteEntityService: NoteEntityService,
 		private featuredService: FeaturedService,
+		private cacheService: CacheService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			let noteIds = await this.featuredService.getPerUserNotesRanking(ps.userId, 50);
@@ -69,10 +72,32 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoinAndSelect('renote.user', 'renoteUser')
 				.leftJoinAndSelect('note.channel', 'channel');
 
-			const notes = await query.getMany();
-			notes.sort((a, b) => a.id > b.id ? -1 : 1);
+			let notes = await query.getMany();
+
+			if (me != null) {
+				// user mute and blocking
+				const [
+					userIdsWhoMeMuting,
+					userIdsWhoBlockingMe,
+				] = await Promise.all([
+					this.cacheService.userMutingsCache.fetch(me.id),
+					this.cacheService.userBlockedCache.fetch(me.id),
+				]);
+
+				notes = notes.filter(note => {
+					if (note.userId === me.id) {
+						return true;
+					}
+					if (isUserRelated(note, userIdsWhoBlockingMe, true)) return false;
+					if (isUserRelated(note, userIdsWhoMeMuting, true)) return false;
+
+					return true;
+				});
 
-			// TODO: ミュート等考慮
+				// Get next page if notes is empty?
+			}
+
+			notes.sort((a, b) => a.id > b.id ? -1 : 1);
 
 			return await this.noteEntityService.packMany(notes, me);
 		});