merge: don't send real-time updates of replies to blocked users #457 #573 (!566)

View MR for information: TransFem-org/Sharkey!566



Approved-by: Tess K <me@thvxl.se>
Approved-by: fEmber <acomputerdog@gmail.com>

packages/backend/src/core/GlobalEventService.ts

@@ -135,6 +135,7 @@ export interface NoteEventTypes {
 	};
 	replied: {
 		id: MiNote['id'];
+		userId: MiUser['id'];
 	};
 }
 type NoteStreamEventTypes = {

packages/backend/src/core/NoteCreateService.ts

@@ -831,6 +831,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 			if (data.reply) {
 				this.globalEventService.publishNoteStream(data.reply.id, 'replied', {
 					id: note.id,
+					userId: user.id,
 				});
 				// 通知
 				if (data.reply.userHost === null) {

packages/backend/src/server/api/stream/Connection.ts

@@ -201,6 +201,18 @@ export default class Connection {
 
 	@bindThis
 	private async onNoteStreamMessage(data: GlobalEvents['note']['payload']) {
+		// we must not send to the frontend information about notes from
+		// users who blocked the logged-in user, even when they're replies
+		// to notes the logged-in user can see
+		if (data.type === 'replied') {
+			const noteUserId = data.body.body.userId;
+			if (noteUserId !== null) {
+				if (this.userIdsWhoBlockingMe.has(noteUserId)) {
+					return;
+				}
+			}
+		}
+
 		this.sendMessageToWs('noteUpdated', {
 			id: data.body.id,
 			type: data.type,