Skip to content
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
18 changes: 8 additions & 10 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,20 @@ async function main () {
.filter(event => event.payload.action === 'opened')
.value()

const openedPullRequests = chain(events)
// Categorize PRs by their current state (not just the event action)
const allPREvents = chain(events)
.filter(event => event.type === 'PullRequestEvent')
.filter(event => event.payload.action === 'opened')
.value()

const mergedPullRequests = chain(events)
.filter(event => event.type === 'PullRequestEvent')
.filter(event => event.payload.action === 'closed')
const openedPullRequests = allPREvents
.filter(event => event.payload.pull_request?.state === 'open')

const mergedPullRequests = allPREvents
.filter(event => event.payload.pull_request?.merged)
.value()

const closedPullRequests = chain(events)
.filter(event => event.type === 'PullRequestEvent')
.filter(event => event.payload.action === 'closed')
.filter(event => !event.payload.pull_request?.merged)
.value()
const closedPullRequests = allPREvents
.filter(event => event.payload.pull_request?.state === 'closed' && !event.payload.pull_request?.merged)

const context = {
eventTypes,
Expand Down
27 changes: 12 additions & 15 deletions template.md
Original file line number Diff line number Diff line change
@@ -1,29 +1,26 @@
{% if closedIssues.size > 0 %}
## Closed Issues

{%- for event in closedIssues %}
{% for event in closedIssues %}
- [{{event.repo.name}}#{{event.payload.issue.number}}]({{ event.payload.issue.html_url }}) {{ event.payload.issue.title }} - {{event.timeago}}
{%- endfor %}

{% endif %}{% if mergedPullRequests.size > 0 %}
## Merged Pull Requests

{%- for event in mergedPullRequests %}
{% for event in mergedPullRequests %}
- [{{event.repo.name}}#{{event.payload.number}}](https://github.com/{{ event.repo.name }}/pull/{{ event.payload.number }}) {{ event.payload.pull_request.title }} - {{event.timeago}}
{%- endfor %}

{% endif %}{% if closedPullRequests.size > 0 %}
## Closed Pull Requests

{%- for event in closedPullRequests %}
{% for event in closedPullRequests %}
- [{{event.repo.name}}#{{event.payload.number}}](https://github.com/{{ event.repo.name }}/pull/{{ event.payload.number }}) {{ event.payload.pull_request.title }} - {{event.timeago}}
{%- endfor %}

{% endif %}{% if openedIssues.size > 0 %}
## Opened Issues

{%- for event in openedIssues %}
{% for event in openedIssues %}
- [{{event.repo.name}}#{{event.payload.issue.number}}]({{ event.payload.issue.html_url }}) {{ event.payload.issue.title }} - {{event.timeago}}
{%- endfor %}

{% endif %}{% if openedPullRequests.size > 0 %}
## Opened Pull Requests

{%- for event in openedPullRequests %}
{% for event in openedPullRequests %}
- [{{event.repo.name}}#{{event.payload.number}}](https://github.com/{{ event.repo.name }}/pull/{{ event.payload.number }}) {{ event.payload.pull_request.title }} - {{event.timeago}}
{%- endfor %}
{%- endfor %}
{% endif %}