wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-02 17:58:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into subscriber

Browse Source
This commit is contained in:
Kiwi
2017-08-28 19:43:54 +02:00
committed by GitHub
parent e14d6007a7 9af0c5e01a
commit 4f901d0d56
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graph/loaders/comments.js
+5 -8
View File
@@ -11,6 +11,7 @@ const {
CACHE_EXPIRY_COMMENT_COUNT
} = require('../../config');
const ms = require('ms');
const sc = require('snake-case');
const CommentModel = require('../../models/comment');
@@ -112,10 +113,8 @@ const getCommentCountByQuery = (context, {ids, statuses, asset_id, parent_id, au
if (context.user != null && context.user.can(SEARCH_OTHERS_COMMENTS) && action_type) {
query = query.where({
action_counts: {
[action_type.toLowerCase()]: {
$gt: 0,
}
[`action_counts.${sc(action_type.toLowerCase())}`]: {
$gt: 0,
},
});
}
@@ -298,10 +297,8 @@ const getCommentsByQuery = async (ctx, {ids, statuses, asset_id, parent_id, auth
if (ctx.user != null && ctx.user.can(SEARCH_OTHERS_COMMENTS) && action_type) {
comments = comments.where({
action_counts: {
[action_type.toLowerCase()]: {
$gt: 0,
}
[`action_counts.${sc(action_type.toLowerCase())}`]: {
$gt: 0,
},
});
}