Hopefully fix ratelimits on diffs

Author: Matyrobbrt

src/main/java/net/neoforged/automation/command/BackportCommand.java

@@ -7,7 +7,6 @@
 import net.neoforged.automation.runner.GitRunner;
 import net.neoforged.automation.util.DiffUtils;
 import net.neoforged.automation.util.FunctionalInterfaces;
-import net.neoforged.automation.util.Util;
 import net.neoforged.automation.webhook.handler.AutomaticLabelHandler;
 import org.eclipse.jgit.transport.RefSpec;
 import org.jetbrains.annotations.Nullable;
@@ -106,9 +105,7 @@ public static void generateAndApply(GitHub gh, GHPullRequest pr, Configuration c
                                     }
                                 }
 
-                                try (var is = GitHubAccessor.readDiff(pr)) {
-                                    runner.writeFile("__diff", new String(is.readAllBytes()));
-                                }
+                                runner.writeFile("__diff", GitHubAccessor.readDiff(pr));
                                 runner.git("apply", "--ignore-whitespace", "__diff");
                                 runner.exec("rm", "__diff");
 
@@ -219,7 +216,7 @@ private static void run(ActionRunner runner, Configuration.ConditionalValue<Stri
         return Map.of(
                 "pr", Map.of(
                         "base", pr.getBase().getRef(),
-                        "changedFiles", DiffUtils.detectChangedFiles(Util.readLines(GitHubAccessor.readDiff(pr)))
+                        "changedFiles", DiffUtils.detectChangedFiles(GitHubAccessor.readDiff(pr).trim().split("\n"))
                 ),
                 "target", branch
         );

src/main/java/net/neoforged/automation/util/Util.java

@@ -1,19 +1,7 @@
 package net.neoforged.automation.util;
 
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-
 public class Util {
     public static <E extends Throwable> void sneakyThrow(Throwable e) throws E {
         throw (E) e;
     }
-
-    public static String[] readLines(InputStream i) {
-        try (var in = i) {
-            return new String(in.readAllBytes(), StandardCharsets.UTF_8).split("\n");
-        } catch (Exception ex) {
-            sneakyThrow(ex);
-            return new String[0];
-        }
-    }
 }

src/main/java/org/kohsuke/github/GitHubAccessor.java

@@ -21,7 +21,6 @@
 import org.kohsuke.github.function.InputStreamFunction;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.StringReader;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
@@ -177,14 +176,15 @@ public static GHLabel getLabel(GHRepository repo, String name) {
         }
     }
 
-    public static InputStream readDiff(GHPullRequest pr) {
+    public static String readDiff(GHPullRequest pr) {
         try {
-            var conn = pr.getDiffUrl().openConnection();
-            conn.setRequestProperty("Authorization", pr.root().getClient().getEncodedAuthorization());
-            return conn.getInputStream();
+            return pr.root().createRequest()
+                    .withAccept("application/vnd.github.diff")
+                    .withUrlPath(pr.getApiRoute())
+                    .fetchStream(s -> new String(s.readAllBytes(), StandardCharsets.UTF_8));
         } catch (Exception ex) {
             Util.sneakyThrow(ex);
-            return null;
+            return "";
         }
     }
 }