merge: Add followers tab to following feed + fix duplication (resolves #729) (!705)

View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/705

Closes #729

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>

1 files changed, 77 insertions, 20 deletions

diff --git a/packages/backend/src/server/api/endpoints/notes/following.ts b/packages/backend/src/server/api/endpoints/notes/following.ts
index 83e8f404e9..b6604b9798 100644
--- a/packages/backend/src/server/api/endpoints/notes/following.ts
+++ b/packages/backend/src/server/api/endpoints/notes/following.ts
@@ -4,12 +4,14 @@
  */
 
 import { Inject, Injectable } from '@nestjs/common';
+import { ObjectLiteral, SelectQueryBuilder } from 'typeorm';
 import { SkLatestNote, MiFollowing } from '@/models/_.js';
 import type { NotesRepository } from '@/models/_.js';
 import { Endpoint } from '@/server/api/endpoint-base.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { DI } from '@/di-symbols.js';
 import { QueryService } from '@/core/QueryService.js';
+import { ApiError } from '@/server/api/error.js';
 
 export const meta = {
 	tags: ['notes'],
@@ -27,12 +29,26 @@ export const meta = {
 			ref: 'Note',
 		},
 	},
+
+	errors: {
+		bothWithRepliesAndWithFiles: {
+			message: 'Specifying both includeReplies and filesOnly is not supported',
+			code: 'BOTH_INCLUDE_REPLIES_AND_FILES_ONLY',
+			id: '91c8cb9f-36ed-46e7-9ca2-7df96ed6e222',
+		},
+		bothWithFollowersAndIncludeNonPublic: {
+			message: 'Specifying both list:followers and includeNonPublic is not supported',
+			code: 'BOTH_LIST_FOLLOWERS_AND_INCLUDE_NON_PUBLIC',
+			id: '7a1b9cb6-235b-4e58-9c00-32c1796f502c',
+		},
+	},
 } as const;
 
 export const paramDef = {
 	type: 'object',
 	properties: {
-		mutualsOnly: { type: 'boolean', default: false },
+		list: { type: 'string', enum: ['following', 'followers', 'mutuals'], default: 'following' },
+
 		filesOnly: { type: 'boolean', default: false },
 		includeNonPublic: { type: 'boolean', default: false },
 		includeReplies: { type: 'boolean', default: false },
@@ -58,12 +74,40 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private queryService: QueryService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
+			if (ps.includeReplies && ps.filesOnly) throw new ApiError(meta.errors.bothWithRepliesAndWithFiles);
+			if (ps.list === 'followers' && ps.includeNonPublic) throw new ApiError(meta.errors.bothWithFollowersAndIncludeNonPublic);
+
 			const query = this.notesRepository
 				.createQueryBuilder('note')
 				.setParameter('me', me.id)
 
 				// Limit to latest notes
-				.innerJoin(SkLatestNote, 'latest', 'note.id = latest.note_id')
+				.innerJoin(
+					(sub: SelectQueryBuilder<SkLatestNote>) => {
+						sub
+							.from(SkLatestNote, 'latest')
+
+							// Return only one note per user
+							.addSelect('latest.user_id', 'user_id')
+							.addSelect('MAX(latest.note_id)', 'note_id')
+							.groupBy('latest.user_id');
+
+						// Match selected note types.
+						if (!ps.includeNonPublic) {
+							sub.andWhere('latest.is_public = true');
+						}
+						if (!ps.includeReplies) {
+							sub.andWhere('latest.is_reply = false');
+						}
+						if (!ps.includeQuotes) {
+							sub.andWhere('latest.is_quote = false');
+						}
+
+						return sub;
+					},
+					'latest',
+					'note.id = latest.note_id',
+				)
 
 				// Avoid N+1 queries from the "pack" method
 				.innerJoinAndSelect('note.user', 'user')
@@ -72,14 +116,15 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				.leftJoinAndSelect('reply.user', 'replyUser')
 				.leftJoinAndSelect('renote.user', 'renoteUser')
 				.leftJoinAndSelect('note.channel', 'channel')
+			;
 
-				// Limit to followers
-				.innerJoin(MiFollowing, 'following', 'latest.user_id = following."followeeId"')
-				.andWhere('following."followerId" = :me');
-
-			// Limit to mutuals, if requested
-			if (ps.mutualsOnly) {
-				query.innerJoin(MiFollowing, 'mutuals', 'latest.user_id = mutuals."followerId" AND mutuals."followeeId" = :me');
+			// Select the appropriate collection of users
+			if (ps.list === 'followers') {
+				addFollower(query);
+			} else if (ps.list === 'following') {
+				addFollowee(query);
+			} else {
+				addMutual(query);
 			}
 
 			// Limit to files, if requested
@@ -87,17 +132,6 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				query.andWhere('note."fileIds" != \'{}\'');
 			}
 
-			// Match selected note types.
-			if (!ps.includeNonPublic) {
-				query.andWhere('latest.is_public');
-			}
-			if (!ps.includeReplies) {
-				query.andWhere('latest.is_reply = false');
-			}
-			if (!ps.includeQuotes) {
-				query.andWhere('latest.is_quote = false');
-			}
-
 			// Match selected user types.
 			if (!ps.includeBots) {
 				query.andWhere('"user"."isBot" = false');
@@ -119,3 +153,26 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		});
 	}
 }
+
+/**
+ * Limit to followers (they follow us)
+ */
+function addFollower<T extends SelectQueryBuilder<ObjectLiteral>>(query: T): T {
+	return query.innerJoin(MiFollowing, 'follower', 'follower."followerId" = latest.user_id AND follower."followeeId" = :me');
+}
+
+/**
+ * Limit to followees (we follow them)
+ */
+function addFollowee<T extends SelectQueryBuilder<ObjectLiteral>>(query: T): T {
+	return query.innerJoin(MiFollowing, 'followee', 'followee."followerId" = :me AND followee."followeeId" = latest.user_id');
+}
+
+/**
+ * Limit to mutuals (they follow us AND we follow them)
+ */
+function addMutual<T extends SelectQueryBuilder<ObjectLiteral>>(query: T): T {
+	addFollower(query);
+	addFollowee(query);
+	return query;
+}