Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve conflicts

Browse source
This commit is contained in:
syuilo 2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/server/api/endpoints/posts/trend.ts
View file

@ -38,24 +38,24 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
if (pollErr) return rej('invalid poll param');
const query = {
created_at: {
createdAt: {
$gte: new Date(Date.now() - ms('1days'))
},
repost_count: {
repostCount: {
$gt: 0
}
} as any;
if (reply != undefined) {
query.reply_id = reply ? { $exists: true, $ne: null } : null;
query.replyId = reply ? { $exists: true, $ne: null } : null;
}
if (repost != undefined) {
query.repost_id = repost ? { $exists: true, $ne: null } : null;
query.repostId = repost ? { $exists: true, $ne: null } : null;
}
if (media != undefined) {
query.media_ids = media ? { $exists: true, $ne: null } : null;
query.mediaIds = media ? { $exists: true, $ne: null } : null;
}
if (poll != undefined) {
@ -68,7 +68,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
limit: limit,
skip: offset,
sort: {
repost_count: -1,
repostCount: -1,
_id: -1
}
});