Add support for reopened GitLab MR (matrix-org#935)

* Add support for reopened GitLab MR Signed-off-by: Kévin Commaille <[email protected]> * Add changelog Signed-off-by: Kévin Commaille <[email protected]> --------- Signed-off-by: Kévin Commaille <[email protected]>
PseudoResonance · May 22, 2024 · e5705e7 · e5705e7
1 parent 6b039c9
commit e5705e7
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 0 deletions.
diff --git a/changelog.d/935.feature b/changelog.d/935.feature
@@ -0,0 +1 @@
+Add support for reopened GitLab MR.
diff --git a/docs/usage/room_configuration/gitlab_project.md b/docs/usage/room_configuration/gitlab_project.md
@@ -46,6 +46,7 @@ the events marked as default below will be enabled. Otherwise, this is ignored.
   - merge_request.close *
   - merge_request.merge *
   - merge_request.open *
+  - merge_request.reopen *
   - merge_request.review.comments *
   - merge_request.review *
   - merge_request.review.individual

diff --git a/src/Bridge.ts b/src/Bridge.ts
@@ -344,6 +344,12 @@ export class Bridge {
             (c, data) => c.onMergeRequestOpened(data),
         );
 
+        this.bindHandlerToQueue<IGitLabWebhookMREvent, GitLabRepoConnection>(
+            "gitlab.merge_request.reopen",
+            (data) => connManager.getConnectionsForGitLabRepo(data.project.path_with_namespace),
+            (c, data) => c.onMergeRequestReopened(data),
+        );
+
         this.bindHandlerToQueue<IGitLabWebhookMREvent, GitLabRepoConnection>(
             "gitlab.merge_request.close",
             (data) => connManager.getConnectionsForGitLabRepo(data.project.path_with_namespace),

diff --git a/src/Connections/GitlabRepo.ts b/src/Connections/GitlabRepo.ts
@@ -63,6 +63,7 @@ export type GitLabRepoResponseItem = GetConnectionsResponseItem<GitLabRepoConnec
 
 type AllowedEventsNames =
     "merge_request.open" |
+    "merge_request.reopen" |
     "merge_request.close" |
     "merge_request.merge" |
     "merge_request.review" |
@@ -80,6 +81,7 @@ type AllowedEventsNames =
 
 const AllowedEvents: AllowedEventsNames[] = [
     "merge_request.open",
+    "merge_request.reopen",
     "merge_request.close",
     "merge_request.merge",
     "merge_request.review",
@@ -565,6 +567,22 @@ export class GitLabRepoConnection extends CommandConnection<GitLabRepoConnection
         });
     }
 
+    public async onMergeRequestReopened(event: IGitLabWebhookMREvent) {
+        if (this.hookFilter.shouldSkip('merge_request', 'merge_request.reopen') || !this.matchesLabelFilter(event)) {
+            return;
+        }
+        log.info(`onMergeRequestReopened ${this.roomId} ${this.path} #${event.object_attributes.iid}`);
+        this.validateMREvent(event);
+        const orgRepoName = event.project.path_with_namespace;
+        const content = `**${event.user.username}** reopened MR [${orgRepoName}#${event.object_attributes.iid}](${event.object_attributes.url}): "${event.object_attributes.title}"`;
+        await this.intent.sendEvent(this.roomId, {
+            msgtype: "m.notice",
+            body: content,
+            formatted_body: md.renderInline(content),
+            format: "org.matrix.custom.html",
+        });
+    }
+
     public async onMergeRequestClosed(event: IGitLabWebhookMREvent) {
         if (this.hookFilter.shouldSkip('merge_request', 'merge_request.close') || !this.matchesLabelFilter(event)) {
             return;

diff --git a/tests/connections/GitlabRepoTest.ts b/tests/connections/GitlabRepoTest.ts
@@ -97,6 +97,7 @@ describe("GitLabRepoConnection", () => {
 				path: "bar/baz",
 				enableHooks: [
 					"merge_request.open",
+					"merge_request.reopen",
 					"merge_request.close",
 					"merge_request.merge",
 					"merge_request.review",

diff --git a/web/components/roomConfig/GitlabRepoConfig.tsx b/web/components/roomConfig/GitlabRepoConfig.tsx
@@ -97,6 +97,7 @@ const ConnectionConfiguration: FunctionComponent<ConnectionConfigurationProps<ne
                 <EventHookCheckbox enabledHooks={enabledHooks} hookEventName="merge_request" onChange={toggleEnabledHook}>Merge requests</EventHookCheckbox>
                 <ul>
                     <EventHookCheckbox enabledHooks={enabledHooks} parentEvent="merge_request" hookEventName="merge_request.open" onChange={toggleEnabledHook}>Opened</EventHookCheckbox>
+                    <EventHookCheckbox enabledHooks={enabledHooks} parentEvent="merge_request" hookEventName="merge_request.reopen" onChange={toggleEnabledHook}>Reopened</EventHookCheckbox>
                     <EventHookCheckbox enabledHooks={enabledHooks} parentEvent="merge_request" hookEventName="merge_request.close" onChange={toggleEnabledHook}>Closed</EventHookCheckbox>
                     <EventHookCheckbox enabledHooks={enabledHooks} parentEvent="merge_request" hookEventName="merge_request.merge" onChange={toggleEnabledHook}>Merged</EventHookCheckbox>
                     <EventHookCheckbox enabledHooks={enabledHooks} parentEvent="merge_request" hookEventName="merge_request.review" onChange={toggleEnabledHook}>Completed review</EventHookCheckbox>