From 2bffd5c90edf22c0ba27dcbeb758036939f951a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A9vin=20Commaille?=
 <76261501+zecakeh@users.noreply.github.com>
Date: Wed, 22 May 2024 14:17:29 +0200
Subject: [PATCH] Fix GitLab's ready for review hook (#936)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix GitLab's ready for review hook

As far back as I could go in the docs (GitLab 14.10),
the keys for changes have been `previous` and `current`.

There is a `draft` change that
we can use directly
instead of guessing from the title.
The type of the value depends on
the key of the change.

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>

* Add changelog

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>

---------

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
Co-authored-by: Will Hunt <will@half-shot.uk>
---
 changelog.d/936.bugfix        |  1 +
 src/Connections/GitlabRepo.ts | 12 ++++--------
 src/Gitlab/WebhookTypes.ts    |  6 +++---
 3 files changed, 8 insertions(+), 11 deletions(-)
 create mode 100644 changelog.d/936.bugfix

diff --git a/changelog.d/936.bugfix b/changelog.d/936.bugfix
new file mode 100644
index 00000000..d22b1cab
--- /dev/null
+++ b/changelog.d/936.bugfix
@@ -0,0 +1 @@
+Fix GitLab's ready for review hook.
\ No newline at end of file
diff --git a/src/Connections/GitlabRepo.ts b/src/Connections/GitlabRepo.ts
index ada2b235..f2b754ac 100644
--- a/src/Connections/GitlabRepo.ts
+++ b/src/Connections/GitlabRepo.ts
@@ -622,22 +622,18 @@ export class GitLabRepoConnection extends CommandConnection<GitLabRepoConnection
         log.info(`onMergeRequestUpdate ${this.roomId} ${this.instance}/${this.path} ${event.object_attributes.iid}`);
         this.validateMREvent(event);
         // Check if the MR changed to / from a draft
-        if (!event.changes.title) {
+        if (!event.changes.draft) {
             return;
         }
         const orgRepoName = event.project.path_with_namespace;
         let content: string;
-        const wasDraft = event.changes.title.before.startsWith('Draft: ');
-        const isDraft = event.changes.title.after.startsWith('Draft: ');
-        if (wasDraft && !isDraft) {
+        const isDraft = event.changes.draft.current;
+        if (!isDraft) {
             // Ready for review
             content = `**${event.user.username}** marked MR [${orgRepoName}#${event.object_attributes.iid}](${event.object_attributes.url}) as ready for review "${event.object_attributes.title}" `;
-        } else if (!wasDraft && isDraft) {
+        } else {
             // Back to draft.
             content = `**${event.user.username}** marked MR [${orgRepoName}#${event.object_attributes.iid}](${event.object_attributes.url}) as draft "${event.object_attributes.title}" `;
-        } else {
-            // Nothing changed, drop it.
-            return;
         }
         await this.intent.sendEvent(this.roomId, {
             msgtype: "m.notice",
diff --git a/src/Gitlab/WebhookTypes.ts b/src/Gitlab/WebhookTypes.ts
index c721367a..ac302e9f 100644
--- a/src/Gitlab/WebhookTypes.ts
+++ b/src/Gitlab/WebhookTypes.ts
@@ -64,9 +64,9 @@ export interface IGitLabWebhookMREvent {
     object_attributes: IGitLabMergeRequestObjectAttributes;
     labels: IGitLabLabel[];
     changes: {
-        [key: string]: {
-            before: string;
-            after: string;
+        draft?: {
+            previous: boolean;
+            current: boolean;
         }
     }
 }