wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-09-10 12:43:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove hasRoles

Browse Source
This commit is contained in:
riley
2017-05-12 09:57:07 -06:00
parent 14b483d089
commit e32ab99edf
8 changed files with 87 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
graph/loaders/comments.js
+3 -3
View File
@@ -226,7 +226,7 @@ const getCommentsByQuery = async ({user}, {ids, statuses, asset_id, parent_id, a
// Only administrators can search for comments with statuses that are not
// `null`, or `'ACCEPTED'`.
if (user != null && user.hasRoles('ADMIN') && statuses) {
if (user != null && user.canViewNonNullOrAcceptedComments() && statuses) {
comments = comments.where({
status: {
$in: statuses
@@ -249,7 +249,7 @@ const getCommentsByQuery = async ({user}, {ids, statuses, asset_id, parent_id, a
}
// Only let an admin request any user or the current user request themself.
if (user && (user.hasRoles('ADMIN') || user.id === author_id) && author_id != null) {
if (user && (user.canViewOthersComments() || user.id === author_id) && author_id != null) {
comments = comments.where({author_id});
}
@@ -403,7 +403,7 @@ const genRecentComments = (_, ids) => {
*/
const genComments = ({user}, ids) => {
let comments;
if (user && user.hasRoles('ADMIN')) {
if (user && user.canViewOthersComments()) {
comments = CommentModel.find({
id: {
$in: ids