Merge branch 'master' into subscriptions

graph/typeDefs.graphql

@@ -140,6 +140,9 @@ input CommentsQuery {
 
   # Sort the results by created_at.
   sort: SORT_ORDER = REVERSE_CHRONOLOGICAL
+
+  # Exclude comments ignored by the requesting user
+  excludeIgnored: Boolean
 }
 
 # CommentCountQuery allows the ability to query comment counts by specific
@@ -185,10 +188,10 @@ type Comment {
   recentReplies: [Comment]
 
   # the replies that were made to the comment.
-  replies(sort: SORT_ORDER = CHRONOLOGICAL, limit: Int = 3): [Comment]
+  replies(sort: SORT_ORDER = CHRONOLOGICAL, limit: Int = 3, excludeIgnored: Boolean): [Comment]
 
   # The count of replies on a comment.
-  replyCount: Int
+  replyCount(excludeIgnored: Boolean): Int
 
   # Actions completed on the parent. Requires the `ADMIN` role.
   actions: [Action]
@@ -413,17 +416,20 @@ type Asset {
   # The URL that the asset is located on.
   url: String
 
+  # Returns last comment
+  lastComment: Comment
+
   # Returns recent comments
   recentComments: [Comment]
 
   # The top level comments that are attached to the asset.
-  comments(sort: SORT_ORDER = REVERSE_CHRONOLOGICAL, limit: Int = 10): [Comment]
+  comments(sort: SORT_ORDER = REVERSE_CHRONOLOGICAL, limit: Int = 10, excludeIgnored: Boolean): [Comment]
 
   # The count of top level comments on the asset.
-  commentCount: Int
+  commentCount(excludeIgnored: Boolean): Int
 
   # The total count of all comments made on the asset.
-  totalCommentCount: Int
+  totalCommentCount(excludeIgnored: Boolean): Int
 
   # The settings (rectified with the global settings) that should be applied to
   # this asset.
@@ -537,15 +543,18 @@ type RootQuery {
   # role.
   me: User
 
+  # Users that the currently logged in user ignores
+  myIgnoredUsers: [User]
+
   # Users returned based on a query.
   users(query: UsersQuery): [User]
 
   # Asset metrics related to user actions are saturated into the assets
-  # returned.
+  # returned. Parameters `from` and `to` are related to the action created_at field.
   assetMetrics(from: Date!, to: Date!, sort: ASSET_METRICS_SORT!, limit: Int = 10): [Asset!]
 
   # Comment metrics related to user actions are saturated into the comments
-  # returned.
+  # returned. Parameters `from` and `to` are related to the action created_at field.
   commentMetrics(from: Date!, to: Date!, sort: ACTION_TYPE!, limit: Int = 10): [Comment!]
 }
 
@@ -703,6 +712,18 @@ type RemoveCommentTagResponse implements Response {
   errors: [UserError]
 }
 
+# Response to ignoreUser mutation
+type IgnoreUserResponse implements Response {
+  # An array of errors relating to the mutation that occured.
+  errors: [UserError]
+}
+
+# Response to stopIgnoringUser mutation
+type StopIgnoringUserResponse implements Response {
+  # An array of errors relating to the mutation that occured.
+  errors: [UserError]
+}
+
 # All mutations for the application are defined on this object.
 type RootMutation {
 
@@ -735,6 +756,12 @@ type RootMutation {
 
   # Remove tag from comment.
   removeCommentTag(id: ID!, tag: String!): RemoveCommentTagResponse
+
+  # Ignore comments by another user
+  ignoreUser(id: ID!): IgnoreUserResponse
+
+  # Stop Ignoring comments by another user
+  stopIgnoringUser(id: ID!): StopIgnoringUserResponse
 }
 
 ################################################################################