From ea4c80a57d75a09b8e1c7e4d77737ca97c65c979 Mon Sep 17 00:00:00 2001
From: Helium9 <80259183+KeinsWolfi@users.noreply.github.com>
Date: Sun, 16 Mar 2025 14:17:43 +0100
Subject: [PATCH 1/8] Test?

---
 .../hannibal2/skyhanni/discord/command/PullRequestCommand.kt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
index c49bc8b..e670d10 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
@@ -103,6 +103,11 @@ object PullRequestCommand : BaseCommand() {
             append("\n")
             append("> Last Updated: $lastUpdate")
             append("\n")
+            if (pr.merged) {
+                val merged = passedSince(pr.mergedAt ?: "")
+                append("> Merged: $merged")
+                append("\n")
+            }
         }
 
         val lastCommit = head.sha

From ee6e482f37bbfed830156604bc9394e01639e35f Mon Sep 17 00:00:00 2001
From: Helium9 <80259183+KeinsWolfi@users.noreply.github.com>
Date: Sun, 16 Mar 2025 17:09:52 +0100
Subject: [PATCH 2/8] Added hint if PR is in latest beta

---
 .../discord/command/PullRequestCommand.kt     | 24 ++++++
 .../skyhanni/discord/github/GitHubClient.kt   | 16 ++--
 .../discord/json/discord/ReleasesResponse.kt  | 75 +++++++++++++++++++
 3 files changed, 107 insertions(+), 8 deletions(-)
 create mode 100644 src/main/kotlin/at/hannibal2/skyhanni/discord/json/discord/ReleasesResponse.kt

diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
index e670d10..298584e 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
@@ -107,6 +107,24 @@ object PullRequestCommand : BaseCommand() {
                 val merged = passedSince(pr.mergedAt ?: "")
                 append("> Merged: $merged")
                 append("\n")
+
+                val releases = try {
+                    github.getReleases()
+                } catch (e: Exception) {
+                    null
+                }
+                val lastRelease = releases?.firstOrNull()
+                val lastReleaseTime = passedSince(lastRelease?.publishedAt ?: "")
+                append("> Last Release: $lastReleaseTime")
+                append("\n")
+
+                if (releaseSinceMerge(pr.mergedAt ?: "", lastRelease?.publishedAt ?: "")) {
+                    append("> This PR is in the latest beta.")
+                    append("\n")
+                } else {
+                    append("> This PR is not in the latest beta.")
+                    append("\n")
+                }
             }
         }
 
@@ -172,6 +190,12 @@ object PullRequestCommand : BaseCommand() {
 
     private fun passedSince(stringTime: String): String = "<t:${parseToUnixTime(stringTime)}:R>"
 
+    private fun releaseSinceMerge(stringTimeMerge: String, stringTimeLastRelease: String): Boolean {
+        val timeMerge = parseToUnixTime(stringTimeMerge)
+        val timeLastRelease = parseToUnixTime(stringTimeLastRelease)
+        return timeMerge < timeLastRelease
+    }
+
     @Suppress("unused") // TODO implement once we can upload the file
     private fun MessageReceivedEvent.pullRequestArtifactCommand(args: List<String>) {
         if (args.size != 2) {
diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/github/GitHubClient.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/github/GitHubClient.kt
index d3478bc..1f4b719 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/github/GitHubClient.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/github/GitHubClient.kt
@@ -1,12 +1,6 @@
 package at.hannibal2.skyhanni.discord.github
 
-import at.hannibal2.skyhanni.discord.json.discord.Artifact
-import at.hannibal2.skyhanni.discord.json.discord.ArtifactResponse
-import at.hannibal2.skyhanni.discord.json.discord.CheckRun
-import at.hannibal2.skyhanni.discord.json.discord.CheckRunsResponse
-import at.hannibal2.skyhanni.discord.json.discord.Job
-import at.hannibal2.skyhanni.discord.json.discord.JobsResponse
-import at.hannibal2.skyhanni.discord.json.discord.PullRequestJson
+import at.hannibal2.skyhanni.discord.json.discord.*
 import com.google.gson.Gson
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -69,7 +63,8 @@ class GitHubClient(user: String, repo: String, private val token: String) {
 
     private inline fun <reified T : Any, R> readJson(url: String, crossinline block: (T) -> R): R? =
         readBody(url) { body ->
-            block(gson.fromJson(body.string(), T::class.java))
+            val type = object : com.google.gson.reflect.TypeToken<T>() {}.type
+            block(gson.fromJson(body.string(), type))
         }
 
     inline fun <T> readBody(url: String, block: (ResponseBody) -> T): T? {
@@ -84,4 +79,9 @@ class GitHubClient(user: String, repo: String, private val token: String) {
         val request = Request.Builder().url(url).header("Authorization", "token $token").build()
         return client.newCall(request).execute()
     }
+
+    fun getReleases(): List<Release>? {
+        val url = "$base/releases"
+        return readJson<List<Release>, List<Release>?>(url) { it }
+    }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/json/discord/ReleasesResponse.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/json/discord/ReleasesResponse.kt
new file mode 100644
index 0000000..425dbfe
--- /dev/null
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/json/discord/ReleasesResponse.kt
@@ -0,0 +1,75 @@
+package at.hannibal2.skyhanni.discord.json.discord
+
+import com.google.gson.annotations.SerializedName
+
+data class Release (
+    @SerializedName("url") val url: String,
+    @SerializedName("assets_url") val assetsUrl: String,
+    @SerializedName("upload_url") val uploadUrl: String,
+    @SerializedName("html_url") val htmlUrl: String,
+    @SerializedName("id") val id: Int,
+    @SerializedName("author") val author: User,
+    @SerializedName("node_id") val nodeId: String,
+    @SerializedName("tag_name") val tagName: String,
+    @SerializedName("target_commitish") val targetCommitish: String?,
+    @SerializedName("name") val name: String,
+    @SerializedName("draft") val draft: Boolean,
+    @SerializedName("prerelease") val prerelease: Boolean,
+    @SerializedName("created_at") val createdAt: String,
+    @SerializedName("published_at") val publishedAt: String,
+    @SerializedName("assets") val assets: List<Asset>,
+    @SerializedName("tarball_url") val tarballUrl: String,
+    @SerializedName("zipball_url") val zipballUrl: String,
+    @SerializedName("body") val body: String,
+    @SerializedName("reactions") val reactions: Reactions,
+)
+
+data class Asset (
+    @SerializedName("url") val url: String,
+    @SerializedName("id") val id: Int,
+    @SerializedName("node_id") val nodeId: String,
+    @SerializedName("name") val name: String,
+    @SerializedName("label") val label: String?,
+    @SerializedName("uploader") val uploader: User,
+    @SerializedName("content_type") val contentType: String,
+    @SerializedName("state") val state: String,
+    @SerializedName("size") val size: Int,
+    @SerializedName("download_count") val downloadCount: Int,
+    @SerializedName("created_at") val createdAt: String,
+    @SerializedName("updated_at") val updatedAt: String,
+    @SerializedName("browser_download_url") val browserDownloadUrl: String,
+)
+
+data class User (
+    @SerializedName("login") val login: String,
+    @SerializedName("id") val id: Int,
+    @SerializedName("node_id") val nodeId: String,
+    @SerializedName("avatar_url") val avatarUrl: String,
+    @SerializedName("gravatar_id") val gravatarId: String,
+    @SerializedName("url") val url: String,
+    @SerializedName("html_url") val htmlUrl: String,
+    @SerializedName("followers_url") val followersUrl: String,
+    @SerializedName("following_url") val followingUrl: String,
+    @SerializedName("gists_url") val gistsUrl: String,
+    @SerializedName("starred_url") val starredUrl: String,
+    @SerializedName("subscriptions_url") val subscriptionsUrl: String,
+    @SerializedName("organizations_url") val organizationsUrl: String,
+    @SerializedName("repos_url") val reposUrl: String,
+    @SerializedName("events_url") val eventsUrl: String,
+    @SerializedName("received_events_url") val receivedEventsUrl: String,
+    @SerializedName("type") val type: String,
+    @SerializedName("site_admin") val siteAdmin: Boolean,
+)
+
+data class Reactions (
+    @SerializedName("url") val url: String,
+    @SerializedName("total_count") val totalCount: Int,
+    @SerializedName("+1") val plusOne: Int,
+    @SerializedName("-1") val minusOne: Int,
+    @SerializedName("laugh") val laugh: Int,
+    @SerializedName("hooray") val hooray: Int,
+    @SerializedName("confused") val confused: Int,
+    @SerializedName("heart") val heart: Int,
+    @SerializedName("rocket") val rocket: Int,
+    @SerializedName("eyes") val eyes: Int
+)
\ No newline at end of file

From fe28770ae37d3d1c6a6e82f42ca7c2294be32492 Mon Sep 17 00:00:00 2001
From: Helium9 <80259183+KeinsWolfi@users.noreply.github.com>
Date: Sun, 16 Mar 2025 17:19:51 +0100
Subject: [PATCH 3/8] Formatting

---
 .../skyhanni/discord/command/PullRequestCommand.kt    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
index 298584e..ab1ac45 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
@@ -99,11 +99,12 @@ object PullRequestCommand : BaseCommand() {
         val time = buildString {
             val lastUpdate = passedSince(pr.updatedAt)
             val created = passedSince(pr.createdAt)
-            append("> Created: $created")
-            append("\n")
-            append("> Last Updated: $lastUpdate")
-            append("\n")
-            if (pr.merged) {
+            if (!pr.merged) {
+                append("> Created: $created")
+                append("\n")
+                append("> Last Updated: $lastUpdate")
+                append("\n")
+            } else {
                 val merged = passedSince(pr.mergedAt ?: "")
                 append("> Merged: $merged")
                 append("\n")

From 681fd0b06811d92db48634ae69210386e5cdb0c6 Mon Sep 17 00:00:00 2001
From: Helium9 <80259183+KeinsWolfi@users.noreply.github.com>
Date: Sun, 16 Mar 2025 17:35:47 +0100
Subject: [PATCH 4/8] Formatting

---
 .../hannibal2/skyhanni/discord/DiscordBot.kt  |  2 +
 .../discord/command/PullRequestCommand.kt     | 47 ++++++++++++++-----
 2 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/DiscordBot.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/DiscordBot.kt
index 78f1ac0..346f830 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/DiscordBot.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/DiscordBot.kt
@@ -31,6 +31,8 @@ class DiscordBot(val jda: JDA, val config: BotConfig) {
 }
 
 const val PLEADING_FACE = "🥺"
+const val BIG_X = "❌"
+const val CHECK_MARK = "✅"
 const val PING_HANNIBAL = "<@239858538959077376>"
 
 fun main() {
diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
index 0a493fa..d1c46f3 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
@@ -1,11 +1,7 @@
 package at.hannibal2.skyhanni.discord.command
 
-import at.hannibal2.skyhanni.discord.BOT
-import at.hannibal2.skyhanni.discord.Option
-import at.hannibal2.skyhanni.discord.PLEADING_FACE
-import at.hannibal2.skyhanni.discord.SimpleTimeMark
+import at.hannibal2.skyhanni.discord.*
 import at.hannibal2.skyhanni.discord.SimpleTimeMark.Companion.asTimeMark
-import at.hannibal2.skyhanni.discord.Utils
 import at.hannibal2.skyhanni.discord.Utils.createParentDirIfNotExist
 import at.hannibal2.skyhanni.discord.Utils.embed
 import at.hannibal2.skyhanni.discord.Utils.format
@@ -96,6 +92,8 @@ object PullRequestCommand : BaseCommand() {
             append("\n")
         }
 
+        var inBeta: Boolean = false
+
         val time = buildString {
             val lastUpdate = passedSince(pr.updatedAt)
             val created = passedSince(pr.createdAt)
@@ -115,15 +113,13 @@ object PullRequestCommand : BaseCommand() {
                     null
                 }
                 val lastRelease = releases?.firstOrNull()
-                val lastReleaseTime = passedSince(lastRelease?.publishedAt ?: "")
-                append("> Last Release: $lastReleaseTime")
-                append("\n")
 
                 if (releaseSinceMerge(pr.mergedAt ?: "", lastRelease?.publishedAt ?: "")) {
-                    append("> This PR is in the latest beta.")
+                    append("> This PR is in the latest beta $CHECK_MARK")
                     append("\n")
+                    inBeta = true
                 } else {
-                    append("> This PR is not in the latest beta.")
+                    append("> This PR is not in the latest beta $BIG_X")
                     append("\n")
                 }
             }
@@ -132,7 +128,14 @@ object PullRequestCommand : BaseCommand() {
         val lastCommit = head.sha
 
         val job = github.getRun(lastCommit, "Build and test") ?: run {
-            val text = "${title}${time} \nArtifact does not exist $PLEADING_FACE (expired or first pr of contributor)"
+            val text = buildString {
+                append(title)
+                append(time)
+                if (!inBeta) {
+                    append("\n")
+                    append("Artifact does not exist $PLEADING_FACE (expired or first pr of contributor)")
+                }
+            }
             reply(embed(embedTitle, text, readColor(pr)))
             return
         }
@@ -151,7 +154,17 @@ object PullRequestCommand : BaseCommand() {
                 Status.PENDING -> "Run is pending $PLEADING_FACE"
                 else -> ""
             }
-            reply(embed(embedTitle, "${title}${time} \n $text", readColor(pr)))
+
+            val embedBody = buildString {
+                append(title)
+                append(time)
+                if (!inBeta) {
+                    append("\n")
+                    append(text)
+                }
+            }
+
+            reply(embed(embedTitle, embedBody, readColor(pr)))
             return
         }
 
@@ -174,7 +187,15 @@ object PullRequestCommand : BaseCommand() {
             append("> (updated ${passedSince(job.completedAt ?: "")})")
         }
 
-        reply(embed(embedTitle, "$title$time$artifactDisplay", readColor(pr)))
+        val embedBody = buildString {
+            append(title)
+            append(time)
+            if (!inBeta) {
+                append(artifactDisplay)
+            }
+        }
+
+        reply(embed(embedTitle, embedBody, readColor(pr)))
     }
 
     // Colors picked from GitHub

From 5bf0a66220f470bef53102adb1df05e1c08c43e8 Mon Sep 17 00:00:00 2001
From: Helium9 <80259183+KeinsWolfi@users.noreply.github.com>
Date: Sun, 16 Mar 2025 18:51:58 +0100
Subject: [PATCH 5/8] Fixed

---
 .../discord/command/PullRequestCommand.kt     | 36 +++++++++----------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
index 3a26134..d64c3be 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
@@ -60,7 +60,7 @@ object PullRequestCommand : BaseCommand() {
         loadPrInfos(prNumber)
     }
 
-    private fun MessageReceivedEvent.loadPrInfos(prNumber: Int) {
+    private fun MessageReceivedEvent.loadPrInfos(prNumber: Long) {
         logAction("loads pr infos for #$prNumber")
 
         val prLink = "$BASE/pull/$prNumber"
@@ -102,22 +102,12 @@ object PullRequestCommand : BaseCommand() {
             val created = passedSince(pr.createdAt)
             append("> Created: $created")
             append("\n")
-            append("> Last Updated: $lastUpdate")
-            append("\n")
-            appendLabelCategory("Type", labels, this)
-            appendLabelCategory("State", labels, this)
-            appendLabelCategory("Milestone", labels, this, pr.milestone?.let { " `${it.title}`" } ?: "")
-        }
-
-        if (toTimeMark(pr.updatedAt).passedSince() > 400.days) {
-            val text = "${title}${time} \nBuild download has expired $PLEADING_FACE"
-            reply(embed(embedTitle, text, readColor(pr)))
-            return
             if (!pr.merged) {
-                append("> Created: $created")
-                append("\n")
                 append("> Last Updated: $lastUpdate")
                 append("\n")
+                appendLabelCategory("Type", labels, this)
+                appendLabelCategory("State", labels, this)
+                appendLabelCategory("Milestone", labels, this, pr.milestone?.let { " `${it.title}`" } ?: "")
             } else {
                 val merged = passedSince(pr.mergedAt ?: "")
                 append("> Merged: $merged")
@@ -128,6 +118,7 @@ object PullRequestCommand : BaseCommand() {
                 } catch (e: Exception) {
                     null
                 }
+
                 val lastRelease = releases?.firstOrNull()
 
                 if (releaseSinceMerge(pr.mergedAt ?: "", lastRelease?.publishedAt ?: "")) {
@@ -141,6 +132,12 @@ object PullRequestCommand : BaseCommand() {
             }
         }
 
+        if (toTimeMark(pr.updatedAt).passedSince() > 400.days && !inBeta) {
+            val text = "${title}${time} \nBuild download has expired $PLEADING_FACE"
+            reply(embed(embedTitle, text, readColor(pr)))
+            return
+        }
+
         val lastCommit = head.sha
 
         val job = github.getRun(lastCommit, "Build and test") ?: run {
@@ -149,16 +146,15 @@ object PullRequestCommand : BaseCommand() {
                 append(time)
                 if (!inBeta) {
                     append("\n")
-                    append("Artifact does not exist $PLEADING_FACE (expired or first pr of contributor)")
+                    append("Build needs approval $PLEADING_FACE")
                 }
             }
-            val text = "${title}${time} \nBuild needs approval $PLEADING_FACE"
 
             reply(embed(embedTitle, text, readColor(pr)))
             return
         }
 
-        if (job.startedAt?.let { toTimeMark(it).passedSince() > 90.days } == true) {
+        if (job.startedAt?.let { toTimeMark(it).passedSince() > 90.days } == true && !inBeta) {
             reply(embed(embedTitle, "${title}${time} \nBuild download has expired $PLEADING_FACE", readColor(pr)))
 
             return
@@ -187,7 +183,7 @@ object PullRequestCommand : BaseCommand() {
             return
         }
 
-        if (job.conclusion != Conclusion.SUCCESS) {
+        if (job.conclusion != Conclusion.SUCCESS && !inBeta) {
             reply(embed(embedTitle, "$title$time\nLast development build failed $PLEADING_FACE", Color.red))
             return
         }
@@ -195,8 +191,8 @@ object PullRequestCommand : BaseCommand() {
         val match = job.htmlUrl?.let { runIdRegex.matchEntire(it) }
         val runId = match?.groups?.get("RunId")?.value
 
-        val artifactLink = "$base/actions/runs/$runId?pr=$prNumber"
-        val nightlyLink = "https://nightly.link/$user/$repo/actions/runs/$runId/Development%20Build.zip"
+        val artifactLink = "$BASE/actions/runs/$runId?pr=$prNumber"
+        val nightlyLink = "https://nightly.link/$USER/$REPO/actions/runs/$runId/Development%20Build.zip"
         val artifactLine = "GitHub".linkTo(artifactLink)
         val nightlyLine = "Nightly".linkTo(nightlyLink)
 

From 9cfcfa33ce58dfe529db45dd883c26c68309a5f7 Mon Sep 17 00:00:00 2001
From: DavidArthurCole <davidarthurcole23@gmail.com>
Date: Wed, 19 Mar 2025 21:43:42 -0400
Subject: [PATCH 6/8] Done

---
 .../skyhanni/discord/CommandListener.kt       |   6 +-
 .../discord/command/PullRequestCommand.kt     | 186 ++++++++++--------
 .../discord/command/RepoPullRequestCommand.kt |  14 ++
 3 files changed, 121 insertions(+), 85 deletions(-)
 create mode 100644 src/main/kotlin/at/hannibal2/skyhanni/discord/command/RepoPullRequestCommand.kt

diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/CommandListener.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/CommandListener.kt
index 17d66a4..f7a6ee2 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/CommandListener.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/CommandListener.kt
@@ -7,6 +7,7 @@ import at.hannibal2.skyhanni.discord.Utils.reply
 import at.hannibal2.skyhanni.discord.command.BaseCommand
 import at.hannibal2.skyhanni.discord.command.HelpCommand
 import at.hannibal2.skyhanni.discord.command.PullRequestCommand
+import at.hannibal2.skyhanni.discord.command.RepoPullRequestCommand
 import at.hannibal2.skyhanni.discord.command.ServerCommands
 import at.hannibal2.skyhanni.discord.command.TagCommands
 import at.hannibal2.skyhanni.discord.command.TagUndo
@@ -17,6 +18,8 @@ import java.lang.reflect.Modifier
 object CommandListener {
     private const val BOT_ID = "1343351725381128193"
 
+    private val pullRequestCommand: PullRequestCommand = PullRequestCommand()
+
     var commands = listOf<BaseCommand>()
         private set
     private var commandsMap = mapOf<String, BaseCommand>()
@@ -49,7 +52,8 @@ object CommandListener {
         }
 
         if (ServerCommands.isKnownServerUrl(this, message)) return
-        if (PullRequestCommand.isPullRequest(this, message)) return
+        if (pullRequestCommand.isPullRequest(this, message)) return
+        if (RepoPullRequestCommand.isPullRequest(this, message)) return
 
         if (!isCommand(message)) return
 
diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
index d64c3be..0763dea 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
@@ -26,26 +26,25 @@ import java.time.format.DateTimeFormatter
 import kotlin.time.Duration.Companion.days
 import kotlin.time.Duration.Companion.seconds
 
-object PullRequestCommand : BaseCommand() {
+open class PullRequestCommand : BaseCommand() {
 
-    override val name: String = "pr"
+    open val disableBuildInfo: Boolean = false
+    open val repo get() = "SkyHanni"
+    private val user get() = "hannibal002"
+    private val base get() = "https://github.com/$user/$repo"
+
+    private val pullRequestPattern = "$base/pull/(?<pr>\\d+)".toPattern()
+    private val github by lazy { GitHubClient(user, repo, BOT.config.githubToken) }
+    private val runIdRegex =
+        Regex("https://github\\.com/[\\w.]+/[\\w.]+/actions/runs/(?<RunId>\\d+)/job/(?<JobId>\\d+)")
 
+    override val name: String = "pr"
     override val description: String = "Displays useful information about a pull request on Github."
     override val options: List<Option> = listOf(
         Option("number", "Number of the pull request you want to display.")
     )
-
     override val userCommand: Boolean = true
 
-    private const val USER = "hannibal002"
-    private const val REPO = "SkyHanni"
-    private val github = GitHubClient(USER, REPO, BOT.config.githubToken)
-    private const val BASE = "https://github.com/$USER/$REPO"
-
-    private val runIdRegex =
-        Regex("https://github\\.com/[\\w.]+/[\\w.]+/actions/runs/(?<RunId>\\d+)/job/(?<JobId>\\d+)")
-    private val pullRequestPattern = "$BASE/pull/(?<pr>\\d+)".toPattern()
-
     override fun MessageReceivedEvent.execute(args: List<String>) {
         if (args.size != 1) return wrongUsage("<number>")
         val first = args.first()
@@ -60,85 +59,40 @@ object PullRequestCommand : BaseCommand() {
         loadPrInfos(prNumber)
     }
 
-    private fun MessageReceivedEvent.loadPrInfos(prNumber: Long) {
-        logAction("loads pr infos for #$prNumber")
-
-        val prLink = "$BASE/pull/$prNumber"
-
-        val pr = try {
+    private fun MessageReceivedEvent.getPrJsonOrNull(prNumber: Long): PullRequestJson? {
+        return try {
             github.findPullRequest(prNumber) ?: run {
                 reply("pr is null!")
-                return
+                return null
             }
         } catch (e: IllegalStateException) {
             if (e.message?.contains(" code:404 ") == true) {
-                val issueUrl = "$BASE/issues/$prNumber"
+                val issueUrl = "${base}/issues/$prNumber"
                 val issue = "issue".linkTo(issueUrl)
                 val text = "This pull request does not yet exist or is an $issue"
                 reply(embed("Not found $PLEADING_FACE", text, Color.red))
-                return
+                return null
             }
             reply("Could not load pull request infos for #$prNumber: ${e.message}")
-            return
-        }
-
-        val head = pr.head
-        val userName = head.user.login
-        val userProfile = "https://github.com/$userName"
-        val prNumberDisplay = "#$prNumber".linkTo(prLink)
-        val userNameDisplay = userName.linkTo(userProfile)
-        val embedTitle = pr.title
-        val title = buildString {
-            append("> $prNumberDisplay by $userNameDisplay")
-            append("\n")
-        }
-
-        var inBeta: Boolean = false
-
-        val labels = pr.labels.map { it.name }.toSet()
-
-        val time = buildString {
-            val lastUpdate = passedSince(pr.updatedAt)
-            val created = passedSince(pr.createdAt)
-            append("> Created: $created")
-            append("\n")
-            if (!pr.merged) {
-                append("> Last Updated: $lastUpdate")
-                append("\n")
-                appendLabelCategory("Type", labels, this)
-                appendLabelCategory("State", labels, this)
-                appendLabelCategory("Milestone", labels, this, pr.milestone?.let { " `${it.title}`" } ?: "")
-            } else {
-                val merged = passedSince(pr.mergedAt ?: "")
-                append("> Merged: $merged")
-                append("\n")
-
-                val releases = try {
-                    github.getReleases()
-                } catch (e: Exception) {
-                    null
-                }
-
-                val lastRelease = releases?.firstOrNull()
-
-                if (releaseSinceMerge(pr.mergedAt ?: "", lastRelease?.publishedAt ?: "")) {
-                    append("> This PR is in the latest beta $CHECK_MARK")
-                    append("\n")
-                    inBeta = true
-                } else {
-                    append("> This PR is not in the latest beta $BIG_X")
-                    append("\n")
-                }
-            }
+            return null
         }
+    }
 
+    private fun MessageReceivedEvent.loadBuildResultsOrNull(
+        prNumber: Long,
+        pr: PullRequestJson,
+        inBeta: Boolean,
+        title: String,
+        time: String,
+        embedTitle: String
+    ): String? {
         if (toTimeMark(pr.updatedAt).passedSince() > 400.days && !inBeta) {
             val text = "${title}${time} \nBuild download has expired $PLEADING_FACE"
             reply(embed(embedTitle, text, readColor(pr)))
-            return
+            return null
         }
 
-        val lastCommit = head.sha
+        val lastCommit = pr.head.sha
 
         val job = github.getRun(lastCommit, "Build and test") ?: run {
             val text = buildString {
@@ -151,13 +105,13 @@ object PullRequestCommand : BaseCommand() {
             }
 
             reply(embed(embedTitle, text, readColor(pr)))
-            return
+            return null
         }
 
         if (job.startedAt?.let { toTimeMark(it).passedSince() > 90.days } == true && !inBeta) {
             reply(embed(embedTitle, "${title}${time} \nBuild download has expired $PLEADING_FACE", readColor(pr)))
 
-            return
+            return null
         }
 
         if (job.status != RunStatus.COMPLETED) {
@@ -180,23 +134,23 @@ object PullRequestCommand : BaseCommand() {
             }
 
             reply(embed(embedTitle, embedBody, readColor(pr)))
-            return
+            return null
         }
 
         if (job.conclusion != Conclusion.SUCCESS && !inBeta) {
             reply(embed(embedTitle, "$title$time\nLast development build failed $PLEADING_FACE", Color.red))
-            return
+            return null
         }
 
         val match = job.htmlUrl?.let { runIdRegex.matchEntire(it) }
         val runId = match?.groups?.get("RunId")?.value
 
-        val artifactLink = "$BASE/actions/runs/$runId?pr=$prNumber"
-        val nightlyLink = "https://nightly.link/$USER/$REPO/actions/runs/$runId/Development%20Build.zip"
+        val artifactLink = "$base/actions/runs/$runId?pr=$prNumber"
+        val nightlyLink = "https://nightly.link/$user/$repo/actions/runs/$runId/Development%20Build.zip"
         val artifactLine = "GitHub".linkTo(artifactLink)
         val nightlyLine = "Nightly".linkTo(nightlyLink)
 
-        val artifactDisplay = buildString {
+        return buildString {
             append(" \n")
             append("Download the latest development build of this pr!")
             append("\n")
@@ -206,11 +160,75 @@ object PullRequestCommand : BaseCommand() {
             append("\n")
             append("> (updated ${passedSince(job.completedAt ?: "")})")
         }
+    }
+
+    fun MessageReceivedEvent.loadPrInfos(prNumber: Long) {
+        logAction("loads pr infos for #$prNumber")
+        val prLink = "$base/pull/$prNumber"
+        val pr = this.getPrJsonOrNull(prNumber) ?: return
+
+        val head = pr.head
+        val userName = head.user.login
+        val userProfile = "https://github.com/$userName"
+        val prNumberDisplay = "#$prNumber".linkTo(prLink)
+        val userNameDisplay = userName.linkTo(userProfile)
+        val embedTitle = pr.title
+        val title = buildString {
+            append("> $prNumberDisplay by $userNameDisplay")
+            append("\n")
+        }
+
+        var inBeta = false
+        val labels = pr.labels.map { it.name }.toSet()
+
+        val time = buildString {
+            val lastUpdate = passedSince(pr.updatedAt)
+            val created = passedSince(pr.createdAt)
+            append("> Created: $created")
+            append("\n")
+            if (!pr.merged) {
+                append("> Last Updated: $lastUpdate")
+                append("\n")
+                appendLabelCategory("Type", labels, this)
+                appendLabelCategory("State", labels, this)
+                appendLabelCategory("Milestone", labels, this, pr.milestone?.let { " `${it.title}`" } ?: "")
+            } else {
+                val merged = passedSince(pr.mergedAt ?: "")
+                append("> Merged: $merged")
+                append("\n")
+
+                val releases = try {
+                    github.getReleases()
+                } catch (e: Exception) {
+                    null
+                }
+
+                val lastRelease = releases?.firstOrNull()
+
+                if (releaseSinceMerge(pr.mergedAt ?: "", lastRelease?.publishedAt ?: "")) {
+                    append("> This PR is in the latest beta $CHECK_MARK")
+                    append("\n")
+                    inBeta = true
+                } else {
+                    append("> This PR is not in the latest beta $BIG_X")
+                    append("\n")
+                }
+            }
+        }
+
+        val artifactDisplay = loadBuildResultsOrNull(
+            prNumber,
+            pr,
+            inBeta,
+            title,
+            time,
+            embedTitle
+        )
 
         val embedBody = buildString {
             append(title)
             append(time)
-            if (!inBeta) {
+            if (!inBeta && !disableBuildInfo) {
                 append(artifactDisplay)
             }
         }
@@ -262,7 +280,7 @@ object PullRequestCommand : BaseCommand() {
             return
         }
 
-        val prLink = "$BASE/pull/$prNumber"
+        val prLink = "$base/pull/$prNumber"
         reply("Looking for pr <$prLink..")
 
         val pr = github.findPullRequest(prNumber) ?: run {
@@ -293,7 +311,7 @@ object PullRequestCommand : BaseCommand() {
         Utils.unzipFile(fileRaw, fileUnzipped)
         fileRaw.delete()
 
-        val displayUrl = "$BASE/actions/runs/$artifactId?pr=$prNumber"
+        val displayUrl = "$base/actions/runs/$artifactId?pr=$prNumber"
 
         val modJar = findJarFile(fileUnzipped) ?: run {
             reply("mod jar not found!")
diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/RepoPullRequestCommand.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/RepoPullRequestCommand.kt
new file mode 100644
index 0000000..35e5a16
--- /dev/null
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/RepoPullRequestCommand.kt
@@ -0,0 +1,14 @@
+package at.hannibal2.skyhanni.discord.command
+
+import at.hannibal2.skyhanni.discord.*
+
+object RepoPullRequestCommand : PullRequestCommand() {
+    override val repo get() = "SkyHanni-REPO"
+    override var disableBuildInfo: Boolean = true
+
+    override val name: String = "repopr"
+    override val description: String = "Displays useful information about a repo pull request on Github."
+    override val options: List<Option> = listOf(
+        Option("number", "Number of the repo pull request you want to display.")
+    )
+}

From f06e20f3dd4e90faaf064132261b39e6f756e91d Mon Sep 17 00:00:00 2001
From: DavidArthurCole <davidarthurcole23@gmail.com>
Date: Wed, 19 Mar 2025 22:12:21 -0400
Subject: [PATCH 7/8] Fixes

---
 .../skyhanni/discord/CommandListener.kt          |  8 ++++----
 .../discord/command/PullRequestCommand.kt        | 16 ++++++----------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/CommandListener.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/CommandListener.kt
index f7a6ee2..8460801 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/CommandListener.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/CommandListener.kt
@@ -51,10 +51,6 @@ object CommandListener {
             TagCommands.lastMessages.remove(this.author.id)
         }
 
-        if (ServerCommands.isKnownServerUrl(this, message)) return
-        if (pullRequestCommand.isPullRequest(this, message)) return
-        if (RepoPullRequestCommand.isPullRequest(this, message)) return
-
         if (!isCommand(message)) return
 
         val split = message.substring(1).split(" ")
@@ -66,6 +62,10 @@ object CommandListener {
             return
         }
 
+        if (ServerCommands.isKnownServerUrl(this, message)) return
+        if (command.name == "pr" && pullRequestCommand.isPullRequest(this, message)) return
+        if (command.name == "repopr" && RepoPullRequestCommand.isPullRequest(this, message)) return
+
         if (!command.userCommand) {
             if (!hasAdminPermissions()) {
                 reply("No permissions $PLEADING_FACE")
diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
index 0763dea..bb1184b 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
@@ -162,7 +162,7 @@ open class PullRequestCommand : BaseCommand() {
         }
     }
 
-    fun MessageReceivedEvent.loadPrInfos(prNumber: Long) {
+    private fun MessageReceivedEvent.loadPrInfos(prNumber: Long) {
         logAction("loads pr infos for #$prNumber")
         val prLink = "$base/pull/$prNumber"
         val pr = this.getPrJsonOrNull(prNumber) ?: return
@@ -216,19 +216,15 @@ open class PullRequestCommand : BaseCommand() {
             }
         }
 
-        val artifactDisplay = loadBuildResultsOrNull(
-            prNumber,
-            pr,
-            inBeta,
-            title,
-            time,
-            embedTitle
-        )
+        val artifactDisplay =
+            if (disableBuildInfo) null
+            else loadBuildResultsOrNull(prNumber, pr, inBeta, title, time, embedTitle)
+                ?: return
 
         val embedBody = buildString {
             append(title)
             append(time)
-            if (!inBeta && !disableBuildInfo) {
+            if (!inBeta && artifactDisplay != null) {
                 append(artifactDisplay)
             }
         }

From b1831ccfdfdc7212fbdb14c4c769ee1fbec6cb45 Mon Sep 17 00:00:00 2001
From: DavidArthurCole <davidarthurcole23@gmail.com>
Date: Wed, 19 Mar 2025 22:23:58 -0400
Subject: [PATCH 8/8] Overrides for labels

---
 .../discord/command/PullRequestCommand.kt     | 22 +++++++++++--------
 .../discord/command/RepoPullRequestCommand.kt | 11 ++++++++++
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
index bb1184b..0e1843a 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
@@ -30,11 +30,11 @@ open class PullRequestCommand : BaseCommand() {
 
     open val disableBuildInfo: Boolean = false
     open val repo get() = "SkyHanni"
-    private val user get() = "hannibal002"
+    protected val user get() = "hannibal002"
     private val base get() = "https://github.com/$user/$repo"
 
     private val pullRequestPattern = "$base/pull/(?<pr>\\d+)".toPattern()
-    private val github by lazy { GitHubClient(user, repo, BOT.config.githubToken) }
+    open val github by lazy { GitHubClient(user, repo, BOT.config.githubToken) }
     private val runIdRegex =
         Regex("https://github\\.com/[\\w.]+/[\\w.]+/actions/runs/(?<RunId>\\d+)/job/(?<JobId>\\d+)")
 
@@ -162,6 +162,12 @@ open class PullRequestCommand : BaseCommand() {
         }
     }
 
+    open fun StringBuilder.appendLabelCategories(labels: Set<String>, pr: PullRequestJson) {
+        appendLabelCategory("Type", labels, this)
+        appendLabelCategory("State", labels, this)
+        appendLabelCategory("Milestone", labels, this, pr.milestone?.let { " `${it.title}`" } ?: "")
+    }
+
     private fun MessageReceivedEvent.loadPrInfos(prNumber: Long) {
         logAction("loads pr infos for #$prNumber")
         val prLink = "$base/pull/$prNumber"
@@ -189,9 +195,7 @@ open class PullRequestCommand : BaseCommand() {
             if (!pr.merged) {
                 append("> Last Updated: $lastUpdate")
                 append("\n")
-                appendLabelCategory("Type", labels, this)
-                appendLabelCategory("State", labels, this)
-                appendLabelCategory("Milestone", labels, this, pr.milestone?.let { " `${it.title}`" } ?: "")
+                appendLabelCategories(labels, pr)
             } else {
                 val merged = passedSince(pr.mergedAt ?: "")
                 append("> Merged: $merged")
@@ -232,15 +236,15 @@ open class PullRequestCommand : BaseCommand() {
         reply(embed(embedTitle, embedBody, readColor(pr)))
     }
 
-    private val labelTypes: Map<String, Set<String>> = mapOf(
+    open val labelTypes: Map<String, Set<String>> get() = mapOf(
         Pair("Type", setOf("Backend", "Bug Fix")),
         Pair("State", setOf("Detekt", "Merge Conflicts", "Waiting on Dependency PR", "Waiting on Hypixel", "Wrong Title/Changelog")),
         Pair("Milestone", setOf("Soon")),
         Pair("Misc", setOf("Good First Issue"))
     )
 
-    private fun appendLabelCategory(labelType: String, labels: Set<String>, stringBuilder: StringBuilder, suffix: String = ""): StringBuilder {
-        val labelsWithType = labels.intersect(labelTypes[labelType] ?: setOf())
+    protected fun appendLabelCategory(labelType: String, labels: Set<String>, stringBuilder: StringBuilder, suffix: String = ""): StringBuilder {
+        val labelsWithType = labels.intersect((labelTypes[labelType] ?: setOf()).toSet())
         if (labelsWithType.isEmpty()) return stringBuilder.append(if (suffix.isNotEmpty()) "> $labelType: $suffix\n" else "")
         return stringBuilder.append("> $labelType: `${labelsWithType.joinToString("` `")}`$suffix\n")
     }
@@ -329,7 +333,7 @@ open class PullRequestCommand : BaseCommand() {
         val matcher = pullRequestPattern.matcher(message)
         if (!matcher.matches()) return false
         val pr = matcher.group("pr")?.toLongOrNull() ?: return false
-        event.replyWithConsumer("Next time just type `!pr $pr` $PLEADING_FACE") { consumer ->
+        event.replyWithConsumer("Next time just type `!$name $pr` $PLEADING_FACE") { consumer ->
             runDelayed(10.seconds) {
                 consumer.message.messageDelete()
             }
diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/RepoPullRequestCommand.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/RepoPullRequestCommand.kt
index 35e5a16..4414b16 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/RepoPullRequestCommand.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/RepoPullRequestCommand.kt
@@ -1,10 +1,21 @@
 package at.hannibal2.skyhanni.discord.command
 
 import at.hannibal2.skyhanni.discord.*
+import at.hannibal2.skyhanni.discord.github.GitHubClient
+import at.hannibal2.skyhanni.discord.json.discord.PullRequestJson
 
 object RepoPullRequestCommand : PullRequestCommand() {
     override val repo get() = "SkyHanni-REPO"
     override var disableBuildInfo: Boolean = true
+    override val github get() = GitHubClient(user, repo, BOT.config.githubToken)
+
+    override val labelTypes: Map<String, Set<String>> get() = mapOf(
+        Pair("Misc", setOf("Merge Conflicts", "Part of SkyHanni PR", "Wait on Hypixel"))
+    )
+
+    override fun StringBuilder.appendLabelCategories(labels: Set<String>, pr: PullRequestJson) {
+        appendLabelCategory("Misc", labels, this)
+    }
 
     override val name: String = "repopr"
     override val description: String = "Displays useful information about a repo pull request on Github."