{t('user_no_comment')}
} ); @@ -90,14 +90,16 @@ const withQuery = graphql( username, } comments { - id - body - asset { + nodes { id - title - url + body + asset { + id + title + url + } + created_at } - created_at } } }` diff --git a/graph/loaders/assets.js b/graph/loaders/assets.js index d741992797..11f77df604 100644 --- a/graph/loaders/assets.js +++ b/graph/loaders/assets.js @@ -49,7 +49,8 @@ const getAssetsForMetrics = async ({loaders: {Actions, Comments}}) => { const ids = actions.map(({item_id}) => item_id); - return Comments.getByQuery({ids}); + return Comments.getByQuery({ids}) + .then((connection) => connection.nodes); }; /** diff --git a/graph/loaders/comments.js b/graph/loaders/comments.js index 92483c0f74..8360f88ce5 100644 --- a/graph/loaders/comments.js +++ b/graph/loaders/comments.js @@ -293,9 +293,24 @@ const getCommentsByQuery = async ({user}, {ids, statuses, asset_id, parent_id, a } } - return comments - .sort({created_at: sort === 'REVERSE_CHRONOLOGICAL' ? -1 : 1}) - .limit(limit); + let query = comments + .sort({created_at: sort === 'REVERSE_CHRONOLOGICAL' ? -1 : 1}); + if (limit) { + query = query.limit(limit + 1); + } + return query.then((nodes) => { + let hasNextPage = false; + if (limit && nodes.length > limit) { + hasNextPage = true; + nodes.splice(limit, 1); + } + return Promise.resolve({ + startCursor: nodes.length ? nodes[0].created_at : null, + endCursor: nodes.length ? nodes[nodes.length - 1].created_at : null, + hasNextPage, + nodes, + }); + }); }; /** diff --git a/graph/mutators/comment.js b/graph/mutators/comment.js index 8acb2f8edc..7d234c7558 100644 --- a/graph/mutators/comment.js +++ b/graph/mutators/comment.js @@ -338,9 +338,9 @@ const edit = async (context, {id, asset_id, edit: {body}}) => { const status = await resolveNewCommentStatus(context, {asset_id, body}, wordlist, settings); // Execute the edit. - await CommentsService.edit(id, context.user.id, {body, status}); + const comment = await CommentsService.edit(id, context.user.id, {body, status}); - return {status}; + return comment; }; module.exports = (context) => { diff --git a/graph/resolvers/asset.js b/graph/resolvers/asset.js index 747e2534ef..41710ba35d 100644 --- a/graph/resolvers/asset.js +++ b/graph/resolvers/asset.js @@ -1,11 +1,4 @@ const Asset = { - lastComment({id}, _, {loaders: {Comments}}) { - return Comments.getByQuery({ - asset_id: id, - limit: 1, - parent_id: null - }).then((data) => data[0]); - }, recentComments({id}, _, {loaders: {Comments}}) { return Comments.genRecentComments.load(id); }, diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql index 1abb894b85..7f5982779d 100644 --- a/graph/typeDefs.graphql +++ b/graph/typeDefs.graphql @@ -76,7 +76,7 @@ type User { ignoredUsers: [User!] # returns all comments based on a query. - comments(query: CommentsQuery): [Comment!] + comments(query: CommentsQuery): CommentConnection! # reliable is the reference to a given user's Reliability. If the requesting # user does not have permission to access the reliability, null will be @@ -229,7 +229,7 @@ type Comment { recentReplies: [Comment!] # the replies that were made to the comment. - replies(sort: SORT_ORDER = CHRONOLOGICAL, limit: Int = 3, excludeIgnored: Boolean): [Comment!] + replies(sort: SORT_ORDER = CHRONOLOGICAL, limit: Int = 3, excludeIgnored: Boolean): CommentConnection! # The count of replies on a comment. replyCount(excludeIgnored: Boolean): Int @@ -253,6 +253,22 @@ type Comment { editing: EditInfo } +# CommentConnection represents a paginable subset of a comment list. +type CommentConnection { + + # Indicates that there are more comments after this subset. + hasNextPage: Boolean! + + # Cursor of first comment in subset. + startCursor: Date + + # Cursor of last comment in subset. + endCursor: Date + + # Subset of comments. + nodes: [Comment!]! +} + ################################################################################ ## Actions ################################################################################ @@ -462,14 +478,11 @@ 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, excludeIgnored: Boolean): [Comment!] + comments(sort: SORT_ORDER = REVERSE_CHRONOLOGICAL, limit: Int = 10, excludeIgnored: Boolean): CommentConnection! # The count of top level comments on the asset. commentCount(excludeIgnored: Boolean): Int @@ -576,7 +589,7 @@ type RootQuery { asset(id: ID, url: String): Asset # Comments returned based on a query. - comments(query: CommentsQuery!): [Comment!] + comments(query: CommentsQuery!): CommentConnection # Return the count of comments satisfied by the query. Note that this edge is # expensive as it is not batched. Requires the `ADMIN` role. diff --git a/locales/en.yml b/locales/en.yml index 2f0b415117..ea32486172 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -27,6 +27,7 @@ en: characters_remaining: "characters remaining" comment_is_best: "This comment is one of the best" comment_offensive: "This comment is offensive" + comment_singular: Comment comment_plural: Comments comment_post_banned_word: "Your comment contains one or more words that are not permitted, so it will not be published. If you think this message is incorrect, please contact our moderation team." comment_post_notif: "Your comment has been posted." diff --git a/locales/es.yml b/locales/es.yml index 9f1424e7a8..d658bcfcf3 100644 --- a/locales/es.yml +++ b/locales/es.yml @@ -31,6 +31,7 @@ es: characters_remaining: "carácteres restantes" comment_is_best: "Este comentario es uno de los mejores" comment_offensive: "Este comentario es ofensivo" + comment_singular: Comentario comment_plural: Comentarios comment_post_banned_word: "Tu comentario contiene una o más palabras que no está\ n permitidas en nuestro espacio, por lo que no será publicado. Si crees que es\ diff --git a/test/server/graph/queries/asset.js b/test/server/graph/queries/asset.js index 757b338743..a11155c47b 100644 --- a/test/server/graph/queries/asset.js +++ b/test/server/graph/queries/asset.js @@ -45,16 +45,25 @@ describe('graph.queries.asset', () => { query assetCommentsQuery($id: ID!) { asset(id: $id) { comments(limit: 10) { - id - body + nodes { + id + body + created_at + } + startCursor + endCursor + hasNextPage } } } `; const res = await graphql(schema, assetCommentsQuery, {}, context, {id: asset.id}); expect(res.erros).is.empty; - const comments = res.data.asset.comments; - expect(comments.length).to.equal(2); + const {nodes, startCursor, endCursor, hasNextPage} = res.data.asset.comments; + expect(nodes.length).to.equal(2); + expect(startCursor).to.equal(nodes[0].created_at); + expect(endCursor).to.equal(nodes[1].created_at); + expect(hasNextPage).to.be.false; }); it('can query comments edge to exclude comments ignored by user', async () => { @@ -65,7 +74,7 @@ describe('graph.queries.asset', () => { asset_id: asset.id, body: `hello there! ${String(Math.random()).slice(2)}`, }))); - + // Add the second user to the list of ignored users. context.user.ignoresUsers.push(users[1].id); @@ -73,8 +82,10 @@ describe('graph.queries.asset', () => { query assetCommentsQuery($id: ID!, $url: String!, $excludeIgnored: Boolean!) { asset(id: $id, url: $url) { comments(limit: 10, excludeIgnored: $excludeIgnored) { - id - body + nodes { + id + body + } } } } @@ -90,8 +101,8 @@ describe('graph.queries.asset', () => { console.error(res.errors); } expect(res.errors).is.empty; - const comments = res.data.asset.comments; - expect(comments.length).to.equal(1); + const nodes = res.data.asset.comments.nodes; + expect(nodes.length).to.equal(1); } });