Merge branch 'master' into 142993479-tags

graph/typeDefs.graphql

@@ -200,6 +200,11 @@ input CommentCountQuery {
   tag: [String]
 }
 
+type EditInfo {
+  edited: Boolean!
+  editableUntil: Date
+}
+
 # Comment is the base representation of user interaction in Talk.
 type Comment {
 
@@ -241,6 +246,9 @@ type Comment {
 
   # The time when the comment was created
   created_at: Date!
+
+  # describes how the comment can be edited
+  editing: EditInfo
 }
 
 ################################################################################
@@ -776,6 +784,23 @@ type StopIgnoringUserResponse implements Response {
   errors: [UserError!]
 }
 
+# Input to editComment mutation
+input EditCommentInput {
+  # Update body of the comment
+  body: String!
+}
+
+type CommentInfoAfterEdit {
+  # New status of the edited comment
+  status: COMMENT_STATUS!
+}
+
+type EditCommentResponse implements Response {
+  comment: CommentInfoAfterEdit!
+  # An array of errors relating to the mutation that occured.
+  errors: [UserError]  
+}
+
 # All mutations for the application are defined on this object.
 type RootMutation {
 
@@ -791,6 +816,9 @@ type RootMutation {
   # Delete an action based on the action id.
   deleteAction(id: ID!): DeleteActionResponse
 
+  # Edit a comment
+  editComment(id: ID!, asset_id: ID!, edit: EditCommentInput): EditCommentResponse
+
   # Sets User status. Requires the `ADMIN` role.
   setUserStatus(id: ID!, status: USER_STATUS!): SetUserStatusResponse