Check if merge_commit_sha is null instead of checking mergeablility

drakon64 · Nov 13, 2024 · 1f65365 · 1f65365
1 parent 44cd195
commit 1f65365
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Anyder/EventProcessors/GitHubWebhookEventProcessor.cs b/Anyder/EventProcessors/GitHubWebhookEventProcessor.cs
@@ -45,7 +45,7 @@ from file in await Program.GitHubClient.ListPullRequestFiles(
             return;
         }
 
-        bool mergeable;
+        string? mergeCommitSha;
 
         while (true)
         {
@@ -61,11 +61,11 @@ from file in await Program.GitHubClient.ListPullRequestFiles(
                 continue;
             }
 
-            mergeable = pullRequest.Mergeable.Value;
+            mergeCommitSha = pullRequest.MergeCommitSha;
             break;
         }
 
-        if (!mergeable)
+        if (mergeCommitSha is null)
         {
             return;
         }

diff --git a/Elpis/Models/GitHub/PullRequest/PullRequest.cs b/Elpis/Models/GitHub/PullRequest/PullRequest.cs
@@ -1,6 +1,11 @@
+using System.Text.Json.Serialization;
+
 namespace Elpis.Models.GitHub.PullRequest;
 
 public class PullRequest
 {
     public required bool? Mergeable { get; init; }
+
+    [JsonPropertyName("merge_commit_sha")]
+    public string? MergeCommitSha { get; init; }
 }