Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert edit of existing PR comment back to creating new comments #240

Merged
merged 1 commit into from
Jun 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 8 additions & 59 deletions lib/github-comment.js
Original file line number Diff line number Diff line change
@@ -1,67 +1,16 @@
'use strict'

const githubClient = require('./github-client')
const GQL = require('./github-graphql-client')

const getPRComments = `query getPRComments($owner: String!, $repo: String!, $number: Int!, $cursor: String){
repository(owner: $owner, name: $repo) {
pullRequest(number: $number) {
comments(first: 20, after:$cursor) {
nodes {
id
body
viewerDidAuthor
}
pageInfo {
endCursor
hasNextPage
}
}
labels(first: 15) {
nodes {
name
}
}
}
}
}`

function graphQlIdToRestId (nodeId) {
const decoded = Buffer.from(nodeId, 'base64').toString()
return decoded.match(/\d+$/)[0]
}

exports.getFirstBotComment = function getFirstBotComment ({ owner, repo, number }, cursor = null) {
return GQL(getPRComments, { owner, repo, number, cursor }).then(data => {
const { nodes, pageInfo } = data.repository.pullRequest.comments
const firstBotComment = nodes.find(e => e.viewerDidAuthor)
if (firstBotComment) {
return firstBotComment
}
if (pageInfo.hasNextPage) {
return exports.getFirstBotComment({ owner, repo, number }, pageInfo.endCursor)
}
return null
})
}

exports.createPrComment = function createPrComment ({ owner, repo, number, logger }, body) {
exports.getFirstBotComment({ owner, repo, number, logger }).then((existingComment) => {
if (existingComment) {
const { id: nodeId, body: oldBody } = existingComment
const newBody = `${oldBody}\n${body}`
const id = graphQlIdToRestId(nodeId)
const updatedComment = { owner, repo, id, body: newBody }

return githubClient.issues.editComment(updatedComment).catch((err) => {
logger.error({ existingComment, updatedComment, err }, 'Error while editing existing comment on GitHub')
})
}

return githubClient.issues.createComment({ owner, repo, number, body }).catch((err) => {
logger.error(err, 'Error while creating comment on GitHub')
})
githubClient.issues.createComment({
owner,
repo,
number,
body
}, (err) => {
logger.error(err, 'Error while trying to fetch existing bot comment on GitHub')
if (err) {
logger.error(err, 'Error while creating comment on GitHub')
}
})
}
10 changes: 0 additions & 10 deletions lib/github-graphql-client.js

This file was deleted.

Loading