Remove merge label after merge

Author: Matyrobbrt

src/main/java/net/neoforged/automation/Main.java

@@ -61,7 +61,7 @@ public static void main(String[] args) throws IOException, NoSuchAlgorithmExcept
 
         var location = Configuration.load(gitHub, startupConfig);
 
-        var webhook = setupWebhookHandlers(startupConfig, new WebhookHandler(startupConfig, gitHub), location);
+        var webhook = setupWebhookHandlers(startupConfig, new WebhookHandler(startupConfig.get("webhookSecret", ""), gitHub), location);
 
         fileHostService = new FileHostService(Path.of("files"), startupConfig);
 

src/main/java/net/neoforged/automation/webhook/impl/WebhookHandler.java

@@ -35,8 +35,8 @@ public class WebhookHandler implements Handler {
 
     private final Map<GitHubEvent, EventHandler[]> handlers = new IdentityHashMap<>();
 
-    public WebhookHandler(StartupConfiguration configuration, GitHub gitHub) {
-        this.secretToken = configuration.get("webhookSecret", "").getBytes(StandardCharsets.UTF_8);
+    public WebhookHandler(String secretToken, GitHub gitHub) {
+        this.secretToken = secretToken.getBytes(StandardCharsets.UTF_8);
         this.gitHub = gitHub;
     }
 

src/main/java/net/neoforged/automation/webhook/label/MergeLabelHandler.java

@@ -15,5 +15,6 @@ public void onLabelAdded(GitHub gitHub, GHUser actor, GHIssue issue, GHLabel lab
 
         final String title = pr.getTitle() + " (#" + pr.getNumber() + ")";
         GitHubAccessor.merge(pr, title, null, method);
+        issue.removeLabels(label);
     }
 }