From ff8734cd34dc2461dd0415af2db8e667ff08494d Mon Sep 17 00:00:00 2001
From: Simon Lecoq <22963968+lowlighter@users.noreply.github.com>
Date: Fri, 9 Apr 2021 12:09:12 +0200
Subject: [PATCH] Fix "merged" state in activity plugin (#218)

---
 source/plugins/activity/index.mjs               | 4 ++--
 source/templates/classic/partials/activity.ejs  | 2 +-
 source/templates/markdown/partials/activity.ejs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/plugins/activity/index.mjs b/source/plugins/activity/index.mjs
index 445cd6c8..3793e51e 100644
--- a/source/plugins/activity/index.mjs
+++ b/source/plugins/activity/index.mjs
@@ -88,8 +88,8 @@
                     case "PullRequestEvent":{
                       if (!["opened", "closed"].includes(payload.action))
                         return null
-                      const {action, pull_request:{user:{login:user}, title, number, additions:added, deletions:deleted, changed_files:changed}} = payload
-                      return {type:"pr", actor, timestamp, repo, action, user, title, number, lines:{added, deleted}, files:{changed}}
+                      const {action, pull_request:{user:{login:user}, title, number, additions:added, deletions:deleted, changed_files:changed, merged}} = payload
+                      return {type:"pr", actor, timestamp, repo, action:(action === "closed")&&(merged) ? "merged" : action, user, title, number, lines:{added, deleted}, files:{changed}}
                     }
                   //Reviewed a pull request
                     case "PullRequestReviewEvent":{
diff --git a/source/templates/classic/partials/activity.ejs b/source/templates/classic/partials/activity.ejs
index b758ed90..b20e8d54 100644
--- a/source/templates/classic/partials/activity.ejs
+++ b/source/templates/classic/partials/activity.ejs
@@ -69,7 +69,7 @@
                   <div class="field">
                     <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16"><path fill-rule="evenodd" d="M7.177 3.073L9.573.677A.25.25 0 0110 .854v4.792a.25.25 0 01-.427.177L7.177 3.427a.25.25 0 010-.354zM3.75 2.5a.75.75 0 100 1.5.75.75 0 000-1.5zm-2.25.75a2.25 2.25 0 113 2.122v5.256a2.251 2.251 0 11-1.5 0V5.372A2.25 2.25 0 011.5 3.25zM11 2.5h-1V4h1a1 1 0 011 1v5.628a2.251 2.251 0 101.5 0V5A2.5 2.5 0 0011 2.5zm1 10.25a.75.75 0 111.5 0 .75.75 0 01-1.5 0zM3.75 12a.75.75 0 100 1.5.75.75 0 000-1.5z"></path></svg>
                     <div class="content">
-                      <%- event.action === "opened" ? `${_("O")}pened` : `${_("M")}erged` %> <span class="issue">#<%= event.number %> <%= event.title %></span>
+                      <%- event.action === "opened" ? `${_("O")}pened` : event.action === "merged" ? `${_("M")}erged` : `${_("C")}losed` %> <span class="issue">#<%= event.number %> <%= event.title %></span>
                     </div>
                   </div>
                   <div class="details">
diff --git a/source/templates/markdown/partials/activity.ejs b/source/templates/markdown/partials/activity.ejs
index 4f070a6e..a8d09c14 100644
--- a/source/templates/markdown/partials/activity.ejs
+++ b/source/templates/markdown/partials/activity.ejs
@@ -22,7 +22,7 @@
       <%_ } else if (type === "issue") { _%>
 * #️⃣ <%- event.action === "opened" ? "Opened" : event.action === "reopened" ? "Reopened" : "Closed" %> [#<%= event.number %> <%= event.title %>](https://github.com/<%= repo %>/issues/<%= event.number %>) in [<%= repo %>](https://github.com/<%= repo %>)
       <%_ } else if (type === "pr") { _%>
-* 🔃 <%- event.action === "opened" ? "Opened" : "Merged" %> [#<%= event.number %> <%= event.title %>](https://github.com/<%= repo %>/pull/<%= event.number %>) in [<%= repo %>](https://github.com/<%= repo %>)
+* 🔃 <%- event.action === "opened" ? "Opened" : event.action === "merged" ? "Merged" : "Closed" %> [#<%= event.number %> <%= event.title %>](https://github.com/<%= repo %>/pull/<%= event.number %>) in [<%= repo %>](https://github.com/<%= repo %>)
   * <%= event.files.changed %> file<%= s(event.files.changed) %> changed `++<%= event.lines.added %> --<%= event.lines.deleted%>`
       <%_ } else if (type === "wiki") { _%>
 * 📝 Updated <%= event.pages.length %> wiki page<%= s(event.pages.length) %> in [<%= repo %>](https://github.com/<%= repo %>/wiki)