Feature: Split PR & issues into separate events

README.md

@@ -44,7 +44,9 @@ Events we support:
 - IssueCommentEvent - You commented on a issue
 - IssuesEvent - You opened a issue
 - MemberEvent - You joined a org/repo as a member
-- PullRequestEvent - You opened a pr.
+- PullRequestOpenEvent - You opened a pr.
+- PullRequestMergeEvent - You merged a pr.
+- PullRequestCloseEvent - You closed a pr.
 - PullRequestReviewCommentEvent - You commented on a pr review
 - PullRequestReviewEvent - You reviewed a pr
 - ReleaseEvent - You released a new version

docs/Configuration.md

@@ -161,19 +161,22 @@ The setting can be used in two ways:
 ##### Supported Events
 The following list of events is supported for the [`disabled_events`](#disabled_events) and [`whitelisted_events`](#whitelisted_events) setting.
 
-| Type:         | Disabled Actions:                                 |
-| ------------- | ------------------------------------------------- |
-| `comments`    | Commenting on Issues                              |
-| `create_repo` | Creating a new Repository                         |
-| `fork`        | Forking a Repository                              |
-| `issues`      | Opening or closing Issues                         |
-| `member`      | Getting added as a Collaborator/Member            |
-| `pr`          | Opening, closing or Merging a Pull request        |
-| `push`        | All commits performed                             |
-| `release`     | Publishing a new Release                          |
-| `review`      | Approving or requesting Changes in a Pull request |
-| `star`        | Starring a Repository                             |
-| `wiki`        | Creating a new Wiki page                          |
+| Type:          | Disabled Actions:                                 |
+| -------------- | ------------------------------------------------- |
+| `comments`     | Commenting on Issues                              |
+| `create_repo`  | Creating a new Repository                         |
+| `fork`         | Forking a Repository                              |
+| `issues_open`  | Opening Issues                                    |
+| `issues_close` | Closing Issues                                    |
+| `member`       | Getting added as a Collaborator/Member            |
+| `pr_open`      | Opening a Pull request                            |
+| `pr_merge`     | Merging a Pull request                            |
+| `pr_close`     | Closing a Pull request                            |
+| `push`         | All commits performed                             |
+| `release`      | Publishing a new Release                          |
+| `review`       | Approving or requesting Changes in a Pull request |
+| `star`         | Starring a Repository                             |
+| `wiki`         | Creating a new Wiki page                          |
 
 #### `commit_name`
 > **Default:** `readme-bot`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "activity-readme",
-  "version": "2.4.1",
+  "version": "2.5.0",
   "description": "Updates README with the recent GitHub activity of a user. This project is a fork of https://github.com/jamesgeorge007/github-activity-readme",
   "main": "src/index.js",
   "keywords": [

src/config.js

@@ -20,7 +20,7 @@ const defaultVals = {
     text: "Last Updated: {DATE}",
     format: "dddd, mmmm dS, yyyy, h:MM:ss TT",
   },
-  ignored_repos:[],
+  ignored_repos: [],
   comments: "💬 Commented on {ID} in {REPO}",
   push: "⬆️ Pushed {AMOUNT} commit(s) to {REPO}",
   issue_opened: "❗️ Opened issue {ID} in {REPO}",

src/eventList.js

@@ -6,9 +6,12 @@ module.exports = [
   "push",
   "create_repo",
   "fork",
-  "issues",
+  "issues_open",
+  "issues_close",
   "member",
-  "pr",
+  "pr_open",
+  "pr_merge",
+  "pr_close",
   "release",
   "review",
   "star",

src/events/IssuesCloseEvent.js

@@ -0,0 +1,16 @@
+const { issue_closed } = require("../config");
+const makeCustomUrl = require("../functions/makeCustomUrl");
+const toUrlFormat = require("../functions/toUrlFormat");
+
+const IssuesEvent = (item) => {
+  if (item.payload.action === "closed") {
+    return issue_closed
+      .replace(/{ID}/g, toUrlFormat(item, "issue_close"))
+      .replace(/{REPO}/g, toUrlFormat(item.repo.name, "issue_close"))
+      .replace(/{URL}/g, makeCustomUrl(item, "issue_close"));
+  } else {
+    return "";
+  }
+};
+
+module.exports = IssuesEvent;

src/events/IssuesEvent.js → src/events/IssuesOpenEvent.js

@@ -1,4 +1,4 @@
-const { issue_opened, issue_closed } = require("../config");
+const { issue_opened } = require("../config");
 const makeCustomUrl = require("../functions/makeCustomUrl");
 const toUrlFormat = require("../functions/toUrlFormat");
 
@@ -8,13 +8,6 @@ const IssuesEvent = (item) => {
       .replace(/{ID}/g, toUrlFormat(item, "issue_open"))
       .replace(/{REPO}/g, toUrlFormat(item.repo.name, "issue_open"))
       .replace(/{URL}/g, makeCustomUrl(item, "issue_open"));
-  } else if (item.payload.action === "closed") {
-    return issue_closed
-      .replace(/{ID}/g, toUrlFormat(item, "issue_close"))
-      .replace(/{REPO}/g, toUrlFormat(item.repo.name, "issue_close"))
-      .replace(/{URL}/g, makeCustomUrl(item, "issue_close"));
-  } else {
-    return "";
   }
 };
 

src/events/PullRequestCloseEvent.js

@@ -0,0 +1,15 @@
+const { pr_closed } = require("../config");
+const makeCustomUrl = require("../functions/makeCustomUrl");
+const toUrlFormat = require("../functions/toUrlFormat");
+
+const PullRequestCloseEvent = (item) => {
+  if (item.payload.action === "closed" && !item.payload.pull_request.merged) {
+    return pr_closed
+      .replace(/{ID}/g, toUrlFormat(item, "pr_close"))
+      .replace(/{REPO}/g, toUrlFormat(item.repo.name, "pr_close"))
+      .replace(/{URL}/g, makeCustomUrl(item, "pr_close"));
+  } else {
+    return "";
+  }
+};
+module.exports = PullRequestCloseEvent;

src/events/PullRequestMergeEvent.js

@@ -0,0 +1,16 @@
+const { pr_merged } = require("../config");
+const makeCustomUrl = require("../functions/makeCustomUrl");
+const toUrlFormat = require("../functions/toUrlFormat");
+
+const PullRequestMergeEvent = (item) => {
+  if (item.payload.action === "merge") {
+    return pr_merged
+      .replace(/{ID}/g, toUrlFormat(item, "pr_merge"))
+      .replace(/{REPO}/g, toUrlFormat(item.repo.name, "pr_merge"))
+      .replace(/{URL}/g, makeCustomUrl(item, "pr_merge"));
+  } else {
+    return "";
+  }
+};
+
+module.exports = PullRequestMergeEvent;

src/events/PullRequestOpenEvent.js

@@ -0,0 +1,16 @@
+const { pr_opened } = require("../config");
+const makeCustomUrl = require("../functions/makeCustomUrl");
+const toUrlFormat = require("../functions/toUrlFormat");
+
+const PullRequestOpenEvent = (item) => {
+  if (item.payload.action === "opened") {
+    return pr_opened
+      .replace(/{ID}/g, toUrlFormat(item, "pr_open"))
+      .replace(/{REPO}/g, toUrlFormat(item.repo.name, "pr_open"))
+      .replace(/{URL}/g, makeCustomUrl(item, "pr_open"));
+  } else {
+    return "";
+  }
+};
+
+module.exports = PullRequestOpenEvent;

src/serializers.js

@@ -10,8 +10,11 @@ const IssueCommentEvent = require("./events/IssueCommentEvent");
 const CommitCommentEvent = require("./events/CommitCommentEvent");
 const PullRequestReviewCommentEvent = require("./events/PullRequestReviewCommentEvent");
 const PushEvent = require("./events/PushEvent");
-const IssuesEvent = require("./events/IssuesEvent");
-const PullRequestEvent = require("./events/PullRequestEvent");
+const IssuesOpenEvent = require("./events/IssuesOpenEvent");
+const IssuesCloseEvent = require("./events/IssuesCloseEvent");
+const PullRequestOpenEvent = require("./events/PullRequestOpenEvent");
+const PullRequestMergeEvent = require("./events/PullRequestMergeEvent");
+const PullRequestCloseEvent = require("./events/PullRequestCloseEvent");
 const CreateEvent = require("./events/CreateEvent");
 const ForkEvent = require("./events/ForkEvent");
 const GollumEvent = require("./events/GollumEvent");
@@ -32,12 +35,24 @@ if (!disabled_events.includes("push")) {
   serializers.PushEvent = PushEvent;
 }
 
-if (!disabled_events.includes("issues")) {
-  serializers.IssuesEvent = IssuesEvent;
+if (!disabled_events.includes("issues_open")) {
+  serializers.IssuesOpenEvent = IssuesOpenEvent;
 }
 
-if (!disabled_events.includes("pr")) {
-  serializers.PullRequestEvent = PullRequestEvent;
+if (!disabled_events.includes("issues_close")) {
+  serializers.IssuesCloseEvent = IssuesCloseEvent;
+}
+
+if (!disabled_events.includes("pr_open")) {
+  serializers.PullRequestOpenEvent = PullRequestOpenEvent;
+}
+
+if (!disabled_events.includes("pr_merge")) {
+  serializers.PullRequestMergeEvent = PullRequestMergeEvent;
+}
+
+if (!disabled_events.includes("pr_close")) {
+  serializers.PullRequestCloseEvent = PullRequestCloseEvent;
 }
 
 if (!disabled_events.includes("create_repo")) {