From 04e1e48f1746533609372311becdd6800b005f50 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Tue, 8 Jan 2019 21:02:00 +0900
Subject: Hide invisible notes from timeline (#3852)

---
 src/server/api/endpoints/users/notes.ts | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'src/server/api/endpoints/users/notes.ts')

diff --git a/src/server/api/endpoints/users/notes.ts b/src/server/api/endpoints/users/notes.ts
index ec2dab1290..6c336683ab 100644
--- a/src/server/api/endpoints/users/notes.ts
+++ b/src/server/api/endpoints/users/notes.ts
@@ -155,10 +155,23 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 	//#region Construct query
 	const sort = { } as any;
 
+	const visibleQuery = me == null ? [{
+		visibility: { $in: [ 'public', 'home' ] }
+	}] : [{
+		visibility: { $in: [ 'public', 'home' ] }
+	}, {
+		// myself (for specified/private)
+		userId: me._id
+	}, {
+		// to me (for specified)
+		visibleUserIds: { $in: [ me._id ] }
+	}];
+
 	const query = {
 		$and: [ {} ],
 		deletedAt: null,
-		userId: user._id
+		userId: user._id,
+		$or: visibleQuery
 	} as any;
 
 	if (ps.sinceId) {
-- 
cgit v1.2.3-freya