diff --git a/.gitignore b/.gitignore index 256559d..64591f5 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ npm-debug.log package-lock.json .vscode .vs -coverage \ No newline at end of file +coverage +.idea \ No newline at end of file diff --git a/src/markdown/markdownIssues.js b/src/markdown/markdownIssues.js index 9747b1f..cd89ecd 100644 --- a/src/markdown/markdownIssues.js +++ b/src/markdown/markdownIssues.js @@ -1,4 +1,3 @@ - const moment = require('moment') module.exports = (issues, headDate, tailDate) => { @@ -9,11 +8,10 @@ module.exports = (issues, headDate, tailDate) => { data = [] } data = data.filter((item) => { - if (moment(item.created_at).isBetween(tailDate, headDate) && (item.user.login !== 'weekly-digest[bot]')) { - return true - } else { - return false - } + const itemCreatedAt = moment(item.created_at) + const isWeeklyDigest = (item.user.login === 'weekly-digest[bot]') + const isPullRequest = item.hasOwnProperty('pull_request') + return itemCreatedAt.isBetween(tailDate, headDate) && !isWeeklyDigest && !isPullRequest }) if (data.length === 0) { issuesString += `Last week, no issues were created.\n`