Pr cleanup

Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>

index.js

@@ -26,8 +26,8 @@ module.exports = app => {
 			comment.minusOne(context, payload.comment.id)
 			return
 		}
-		const isMerged = await pr.isMerged(context, payload.issue.number)
-		const isClosed = await pr.isClosed(context, payload.issue.number)
+		const isMerged = await pr.isMerged(context)
+		const isClosed = await pr.isClosed(context)
 		if (isMerged || isClosed) {
 			// should not be merged
 			logger.debug('PR is already merged or closed just carry on')

lib/pr.js

@@ -1,13 +1,11 @@
 module.exports = {
 	isMerged: async function(context, id) {
-		const params = context.repo({ pull_number: id })
-		const pr = await context.github.pullRequests.get(params)
+		const pr = await this.getPR(context)
 		return pr.data.merged === true
 	},
 
-  isClosed: async function(context, id) {
-		const params = context.repo({ pull_number: id })
-		const pr = await context.github.pullRequests.get(params)
+  isClosed: async function(context) {
+		const pr = await this.getPR(context)
 		return pr.data.state === 'closed'
 	},
 
@@ -17,6 +15,7 @@ module.exports = {
 	},
 
 	getPR: async function(context) {
-		return context.github.pullRequests.get(context.issue())
+		const params = context.repo({ pull_number: context.payload.issue.number })
+		return context.github.pullRequests.get(params)
 	}
 }