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

client/coral-framework/graphql/mutations/ignoreUser.graphql

@@ -0,0 +1,7 @@
+mutation ignoreUser ($id: ID!) {
+  ignoreUser(id:$id) {
+    errors {
+      translation_key
+    }
+  }
+}

client/coral-framework/graphql/mutations/index.js

@@ -6,6 +6,12 @@ import POST_DONT_AGREE from './postDontAgree.graphql';
 import DELETE_ACTION from './deleteAction.graphql';
 import ADD_COMMENT_TAG from './addCommentTag.graphql';
 import REMOVE_COMMENT_TAG from './removeCommentTag.graphql';
+import IGNORE_USER from './ignoreUser.graphql';
+import STOP_IGNORING_USER from './stopIgnoringUser.graphql';
+
+import MY_IGNORED_USERS from '../queries/myIgnoredUsers.graphql';
+import STREAM_QUERY from '../queries/streamQuery.graphql';
+import {variablesForStreamQuery} from '../queries';
 
 import commentView from '../fragments/commentView.graphql';
 
@@ -148,3 +154,40 @@ export const removeCommentTag = graphql(REMOVE_COMMENT_TAG, {
       });
     }}),
 });
+
+export const ignoreUser = graphql(IGNORE_USER, {
+  props: ({mutate}) => ({
+    ignoreUser: ({id}) => {
+      return mutate({
+        variables: {
+          id,
+        },
+        refetchQueries: [{
+          query: MY_IGNORED_USERS,
+        }]
+      });
+    }}),
+});
+
+export const stopIgnoringUser = graphql(STOP_IGNORING_USER, {
+  props: ({mutate, ownProps}) => {
+    return {
+      stopIgnoringUser: ({id}) => {
+        return mutate({
+          variables: {
+            id,
+          },
+          refetchQueries: [
+            {
+              query: MY_IGNORED_USERS,
+            },
+            {
+              query: STREAM_QUERY,
+              variables: variablesForStreamQuery(ownProps),
+            }
+          ]
+        });
+      }
+    };
+  }
+});

client/coral-framework/graphql/mutations/stopIgnoringUser.graphql

@@ -0,0 +1,7 @@
+mutation stopIgnoringUser ($id: ID!) {
+  stopIgnoringUser(id:$id) {
+    errors {
+      translation_key
+    }
+  }
+}

client/coral-framework/graphql/queries/index.js

@@ -3,6 +3,7 @@ import STREAM_QUERY from './streamQuery.graphql';
 import LOAD_MORE from './loadMore.graphql';
 import GET_COUNTS from './getCounts.graphql';
 import MY_COMMENT_HISTORY from './myCommentHistory.graphql';
+import MY_IGNORED_USERS from './myIgnoredUsers.graphql';
 import uniqBy from 'lodash/uniqBy';
 import sortBy from 'lodash/sortBy';
 import isNil from 'lodash/isNil';
@@ -28,10 +29,10 @@ export const getCounts = (data) => ({asset_id, limit, sort}) => {
     variables: {
       asset_id,
       limit,
-      sort
+      sort,
+      excludeIgnored: data.variables.excludeIgnored,
     },
     updateQuery: (oldData, {fetchMoreResult:{asset}}) => {
-
       return {
         ...oldData,
         asset: {
@@ -52,7 +53,8 @@ export const loadMore = (data) => ({limit, cursor, parent_id = null, asset_id, s
       cursor, // the date of the first/last comment depending on the sort order
       parent_id, // if null, we're loading more top-level comments, if not, we're loading more replies to a comment
       asset_id, // the id of the asset we're currently on
-      sort // CHRONOLOGICAL or REVERSE_CHRONOLOGICAL
+      sort, // CHRONOLOGICAL or REVERSE_CHRONOLOGICAL
+      excludeIgnored: data.variables.excludeIgnored,
     },
     updateQuery: (oldData, {fetchMoreResult:{new_top_level_comments}}) => {
       let updatedAsset;
@@ -119,21 +121,25 @@ export const loadMore = (data) => ({limit, cursor, parent_id = null, asset_id, s
   });
 };
 
+export const variablesForStreamQuery = ({auth}) => {
+
+  // where the query string is from the embeded iframe url
+  let comment_id = getQueryVariable('comment_id');
+  let has_comment = comment_id != null;
+  return {
+    asset_id: getQueryVariable('asset_id'),
+    asset_url: getQueryVariable('asset_url'),
+    comment_id: has_comment ? comment_id : 'no-comment',
+    has_comment,
+    excludeIgnored: Boolean(auth && auth.user && auth.user.id),
+  };
+};
+
 // load the comment stream.
 export const queryStream = graphql(STREAM_QUERY, {
-  options: () => {
-
-    // where the query string is from the embeded iframe url
-    let comment_id = getQueryVariable('comment_id');
-    let has_comment = comment_id != null;
-
+  options: (props) => {
     return {
-      variables: {
-        asset_id: getQueryVariable('asset_id'),
-        asset_url: getQueryVariable('asset_url'),
-        comment_id: has_comment ? comment_id : 'no-comment',
-        has_comment
-      }
+      variables: variablesForStreamQuery(props)
     };
   },
   props: ({data}) => ({
@@ -144,3 +150,11 @@ export const queryStream = graphql(STREAM_QUERY, {
 });
 
 export const myCommentHistory = graphql(MY_COMMENT_HISTORY, {});
+
+export const myIgnoredUsers = graphql(MY_IGNORED_USERS, {
+  props: ({data}) => {
+    return ({
+      myIgnoredUsersData: data
+    });
+  }
+});

client/coral-framework/graphql/queries/loadMore.graphql

@@ -1,9 +1,9 @@
 #import "../fragments/commentView.graphql"
 
-query LoadMoreComments($limit: Int = 5, $cursor: Date, $parent_id: ID, $asset_id: ID, $sort: SORT_ORDER) {
-  new_top_level_comments: comments(query: {limit: $limit, cursor: $cursor, parent_id: $parent_id, asset_id: $asset_id, sort: $sort}) {
+query LoadMoreComments($limit: Int = 5, $cursor: Date, $parent_id: ID, $asset_id: ID, $sort: SORT_ORDER, $excludeIgnored: Boolean) {
+  new_top_level_comments: comments(query: {limit: $limit, cursor: $cursor, parent_id: $parent_id, asset_id: $asset_id, sort: $sort, excludeIgnored: $excludeIgnored}) {
     ...commentView
-    replyCount
+    replyCount(excludeIgnored: $excludeIgnored)
     replies(limit: 3) {
         ...commentView
     }

client/coral-framework/graphql/queries/myIgnoredUsers.graphql

@@ -0,0 +1,6 @@
+query myIgnoredUsers {
+  myIgnoredUsers {
+    id,
+    username,
+  }
+}

client/coral-framework/graphql/queries/streamQuery.graphql

@@ -1,18 +1,18 @@
 #import "../fragments/commentView.graphql"
 
-query AssetQuery($asset_id: ID, $asset_url: String, $comment_id: ID!, $has_comment: Boolean!) {
+query AssetQuery($asset_id: ID, $asset_url: String, $comment_id: ID!, $has_comment: Boolean!, $excludeIgnored: Boolean) {
     # the comment here is for loading one comment and it's children, probably after following a permalink
     # $has_comment is derived from the comment_id query param in the iframe url,
     # which is in turn pulled from the host page url
     comment(id: $comment_id) @include(if: $has_comment) {
       ...commentView
-      replyCount
+      replyCount(excludeIgnored: $excludeIgnored)
       replies {
         ...commentView
       }
       parent {
         ...commentView
-        replyCount
+        replyCount(excludeIgnored: $excludeIgnored)
         replies {
           ...commentView
         }
@@ -36,15 +36,15 @@ query AssetQuery($asset_id: ID, $asset_url: String, $comment_id: ID!, $has_comme
             charCount
             requireEmailConfirmation
         }
-        commentCount
-        totalCommentCount
         lastComment {
           id
         }
-        comments(limit: 10) {
+        commentCount(excludeIgnored: $excludeIgnored)
+        totalCommentCount(excludeIgnored: $excludeIgnored)
+        comments(limit: 10, excludeIgnored: $excludeIgnored) {
             ...commentView
-            replyCount
-            replies(limit: 3) {
+            replyCount(excludeIgnored: $excludeIgnored)
+            replies(limit: 3, excludeIgnored: $excludeIgnored) {
                 ...commentView
             }
         }