summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-03-12 09:50:20 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-03-12 09:50:20 +0900
commit5eb02b49017ab6cc38d18d6f0a3d7fd8acf29e58 (patch)
treeb84d7e9d3b86d0858db22a5dd0fb898a41eada18 /src/server
parentUpdate README.md [AUTOGEN] (#4474) (diff)
downloadsharkey-5eb02b49017ab6cc38d18d6f0a3d7fd8acf29e58.tar.gz
sharkey-5eb02b49017ab6cc38d18d6f0a3d7fd8acf29e58.tar.bz2
sharkey-5eb02b49017ab6cc38d18d6f0a3d7fd8acf29e58.zip
Resolve #4458 (#4476)
Diffstat (limited to 'src/server')
-rw-r--r--src/server/api/endpoints/notes/polls/recommendation.ts10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/server/api/endpoints/notes/polls/recommendation.ts b/src/server/api/endpoints/notes/polls/recommendation.ts
index 0a05e89c6f..9adabdf0e9 100644
--- 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,