Merge branch 'master' of github.com:coralproject/talk into plugin_examples

graph/resolvers/asset.js

@@ -9,26 +9,31 @@ const Asset = {
   recentComments({id}, _, {loaders: {Comments}}) {
     return Comments.genRecentComments.load(id);
   },
-  comments({id}, {sort, limit}, {loaders: {Comments}}) {
+  comments({id}, {sort, limit, excludeIgnored}, {loaders: {Comments}}) {
     return Comments.getByQuery({
       asset_id: id,
       sort,
       limit,
-      parent_id: null
+      parent_id: null,
+      excludeIgnored,
     });
   },
-  commentCount({id, commentCount}, _, {loaders: {Comments}}) {
+  commentCount({id, commentCount}, {excludeIgnored}, {user, loaders: {Comments}}) {
+    if (user && excludeIgnored) {
+      return Comments.parentCountByAssetIDPersonalized({assetId: id, excludeIgnored});
+    }
     if (commentCount != null) {
       return commentCount;
     }
-
     return Comments.parentCountByAssetID.load(id);
   },
-  totalCommentCount({id, totalCommentCount}, _, {loaders: {Comments}}) {
+  totalCommentCount({id, totalCommentCount}, {excludeIgnored}, {user, loaders: {Comments}}) {
+    if (user && excludeIgnored) {
+      return Comments.countByAssetIDPersonalized({assetId: id, excludeIgnored});
+    }
     if (totalCommentCount != null) {
       return totalCommentCount;
     }
-
     return Comments.countByAssetID.load(id);
   },
   settings({settings = null}, _, {loaders: {Settings}}) {

graph/resolvers/comment.js

@@ -12,16 +12,20 @@ const Comment = {
   recentReplies({id}, _, {loaders: {Comments}}) {
     return Comments.genRecentReplies.load(id);
   },
-  replies({id, asset_id}, {sort, limit}, {loaders: {Comments}}) {
+  replies({id, asset_id}, {sort, limit, excludeIgnored}, {loaders: {Comments}}) {
     return Comments.getByQuery({
       asset_id,
       parent_id: id,
       sort,
-      limit
+      limit,
+      excludeIgnored,
     });
   },
-  replyCount({id}, _, {loaders: {Comments}}) {
-    return Comments.countByParentID.load(id);
+  replyCount({id}, {excludeIgnored}, {user, loaders: {Comments}}) {
+    if (user && excludeIgnored) {
+      return Comments.countByParentIDPersonalized({id, excludeIgnored});      
+    }
+    return Comments.countByParentID.load(id);      
   },
   actions({id}, _, {user, loaders: {Actions}}) {
 

graph/resolvers/root_mutation.js

@@ -23,6 +23,12 @@ const RootMutation = {
   suspendUser(_, {id, message}, {mutators: {User}}) {
     return wrapResponse(null)(User.suspendUser({id, message}));
   },
+  ignoreUser(_, {id}, {mutators: {User}}) {
+    return wrapResponse(null)(User.ignoreUser({id}));
+  },
+  stopIgnoringUser(_, {id}, {mutators: {User}}) {
+    return wrapResponse(null)(User.stopIgnoringUser({id}));
+  },
   setCommentStatus(_, {id, status}, {mutators: {Comment}}) {
     return wrapResponse(null)(Comment.setCommentStatus({id, status}));
   },

graph/resolvers/root_query.js

@@ -19,15 +19,15 @@ const RootQuery = {
 
   // This endpoint is used for loading moderation queues, so hide it in the
   // event that we aren't an admin.
-  comments(_, {query: {action_type, statuses, asset_id, parent_id, limit, cursor, sort}}, {user, loaders: {Comments, Actions}}) {
-    let query = {statuses, asset_id, parent_id, limit, cursor, sort};
+  comments(_, {query: {action_type, statuses, asset_id, parent_id, limit, cursor, sort, excludeIgnored}}, {user, loaders: {Comments, Actions}}) {
+    let query = {statuses, asset_id, parent_id, limit, cursor, sort, excludeIgnored};
 
     if (user != null && user.hasRoles('ADMIN') && action_type) {
       return Actions.getByTypes({action_type, item_type: 'COMMENTS'})
         .then((ids) => {
 
           // Perform the query using the available resolver.
-          return Comments.getByQuery({ids, statuses, asset_id, parent_id, limit, cursor, sort});
+          return Comments.getByQuery({ids, statuses, asset_id, parent_id, limit, cursor, sort, excludeIgnored});
         });
     }
 
@@ -83,6 +83,16 @@ const RootQuery = {
     return user;
   },
 
+  myIgnoredUsers: async (_, args, {user, loaders: {Users}}) => {
+
+    // get currentUser again since context.user was out of date when running test/graph/mutations/ignoreUser
+    const currentUser = (await Users.getByQuery({ids: [user.id], limit: 1}))[0];
+    if ( ! (currentUser && Array.isArray(currentUser.ignoresUsers) && currentUser.ignoresUsers.length)) {
+      return [];
+    }
+    return await Users.getByQuery({ids: currentUser.ignoresUsers});
+  },
+
   // This endpoint is used for loading the user moderation queues (users whose username has been flagged),
   // so hide it in the event that we aren't an admin.
   users(_, {query: {action_type, limit, cursor, sort}}, {user, loaders: {Users, Actions}}) {