Resolve #4458 (#4476)

2019-03-12 09:50:20 +09:00 · 2019-03-12 09:50:20 +09:00 · 5eb02b4901
commit 5eb02b4901
parent 65631525f6
1 changed files with 9 additions and 1 deletions
--- a/src/server/api/endpoints/notes/polls/recommendation.ts
+++ b/src/server/api/endpoints/notes/polls/recommendation.ts
@ -52,10 +52,18 @@ export default define(meta, async (ps, user) => {
 			$ne: user._id,
 			$nin: hideUserIds
 		},
+		visibility: 'public',
 		poll: {
 			$exists: true,
 			$ne: null
-		}
+		},
+		$or: [{
+			'poll.expiresAt': null
+		}, {
+			'poll.expiresAt': {
+				$gt: new Date()
+			}
+		}],
 	}, {
 		limit: ps.limit,
 		skip: ps.offset,