From a28074104ddeebea6f5aadbd08dbfed108267c96 Mon Sep 17 00:00:00 2001
From: ILike2WatchMemes <ilike2watchmemes@gmail.com>
Date: Sun, 16 Mar 2025 20:02:39 +0100
Subject: [PATCH 01/12] add link option

---
 .../hannibal2/skyhanni/discord/DiscordBot.kt  |  2 +
 .../discord/command/PullRequestCommand.kt     | 58 +++++++++++++++----
 2 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/DiscordBot.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/DiscordBot.kt
index 346f830..795c5a7 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/DiscordBot.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/DiscordBot.kt
@@ -34,6 +34,7 @@ const val PLEADING_FACE = "🥺"
 const val BIG_X = "❌"
 const val CHECK_MARK = "✅"
 const val PING_HANNIBAL = "<@239858538959077376>"
+const val OPEN_PR_TAG = "1350893914768277624"
 
 fun main() {
     val bot = startBot()
@@ -63,6 +64,7 @@ fun main() {
 
 private fun startBot(): DiscordBot {
     val config = ConfigLoader.load("config.json")
+    val config = ConfigLoader.load("src/main/kotlin/at/hannibal2/skyhanni/discord/config.json")
     val token = config.token
 
     val jda = JDABuilder.createDefault(token).also { builder ->
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..78cdfed 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
@@ -18,6 +18,7 @@ import at.hannibal2.skyhanni.discord.github.GitHubClient
 import at.hannibal2.skyhanni.discord.json.discord.Conclusion
 import at.hannibal2.skyhanni.discord.json.discord.PullRequestJson
 import at.hannibal2.skyhanni.discord.json.discord.RunStatus
+import net.dv8tion.jda.api.entities.channel.ChannelType
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent
 import java.awt.Color
 import java.io.File
@@ -32,7 +33,8 @@ object PullRequestCommand : BaseCommand() {
 
     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.")
+        Option("number", "Number of the pull request you want to display."),
+        Option("link", "Use -l to link a forum post to this pr.", required = false)
     )
 
     override val userCommand: Boolean = true
@@ -47,8 +49,10 @@ object PullRequestCommand : BaseCommand() {
     private val pullRequestPattern = "$BASE/pull/(?<pr>\\d+)".toPattern()
 
     override fun MessageReceivedEvent.execute(args: List<String>) {
-        if (args.size != 1) return wrongUsage("<number>")
+        if (args.size !in 1..2) return wrongUsage("<number>")
         val first = args.first()
+        val link = args.getOrNull(1) == "-l"
+        println(link)
         val prNumber = first.toLongOrNull() ?: run {
             userError("Unknown number $PLEADING_FACE ($first})")
             return
@@ -57,10 +61,10 @@ object PullRequestCommand : BaseCommand() {
             userError("PR number needs to be positive $PLEADING_FACE")
             return
         }
-        loadPrInfos(prNumber)
+        loadPrInfos(prNumber, link)
     }
 
-    private fun MessageReceivedEvent.loadPrInfos(prNumber: Long) {
+    private fun MessageReceivedEvent.loadPrInfos(prNumber: Long, link: Boolean = false) {
         logAction("loads pr infos for #$prNumber")
 
         val prLink = "$BASE/pull/$prNumber"
@@ -93,7 +97,7 @@ object PullRequestCommand : BaseCommand() {
             append("\n")
         }
 
-        var inBeta: Boolean = false
+        var inBeta = false
 
         val labels = pr.labels.map { it.name }.toSet()
 
@@ -216,17 +220,51 @@ object PullRequestCommand : BaseCommand() {
         }
 
         reply(embed(embedTitle, embedBody, readColor(pr)))
+
+        if (link && isFromType(ChannelType.GUILD_PUBLIC_THREAD)) {
+            val post = channel.asThreadChannel()
+            val manager = post.manager
+
+            if (post.name.contains("(PR #")) {
+                reply("Post already linked.")
+                return
+            }
+
+            manager.setName("${post.name} (PR #$prNumber)").queue()
+
+            val tags = post.appliedTags
+            if (tags.any { it.id == OPEN_PR_TAG }) return
+
+            val tag = post.parentChannel.asForumChannel().getAvailableTagById(OPEN_PR_TAG) ?: return
+            manager.setAppliedTags(tags + tag).queue()
+
+            logAction("${author.name} linked pr $prNumber")
+        }
     }
 
     private val labelTypes: Map<String, Set<String>> = mapOf(
         Pair("Type", setOf("Backend", "Bug Fix")),
-        Pair("State", setOf("Detekt", "Merge Conflicts", "Waiting on Dependency PR", "Waiting on Hypixel", "Wrong Title/Changelog")),
+        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())
+    private 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")
     }
@@ -258,7 +296,7 @@ object PullRequestCommand : BaseCommand() {
             return
         }
         val prNumber = args[1].toLongOrNull() ?: run {
-            reply("unknwon number $PLEADING_FACE (${args[1]})")
+            reply("unknown number $PLEADING_FACE (${args[1]})")
             return
         }
 
@@ -288,7 +326,7 @@ object PullRequestCommand : BaseCommand() {
         val (_, downloadTime) = timeExecution {
             github.downloadArtifact(artifactId, fileRaw)
         }
-        reply("artifact downnloaded in ${downloadTime.format()}")
+        reply("artifact downloaded in ${downloadTime.format()}")
 
         Utils.unzipFile(fileRaw, fileUnzipped)
         fileRaw.delete()

From cb846db4444de788e6d54fc7ec3488cbe99f6487 Mon Sep 17 00:00:00 2001
From: ILike2WatchMemes <ilike2watchmemes@gmail.com>
Date: Sun, 16 Mar 2025 20:03:52 +0100
Subject: [PATCH 02/12] fix config link

---
 src/main/kotlin/at/hannibal2/skyhanni/discord/DiscordBot.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/DiscordBot.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/DiscordBot.kt
index 795c5a7..f45cfd7 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/DiscordBot.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/DiscordBot.kt
@@ -64,7 +64,6 @@ fun main() {
 
 private fun startBot(): DiscordBot {
     val config = ConfigLoader.load("config.json")
-    val config = ConfigLoader.load("src/main/kotlin/at/hannibal2/skyhanni/discord/config.json")
     val token = config.token
 
     val jda = JDABuilder.createDefault(token).also { builder ->

From afedf409044d05870ce119a311aa2c9c182709d2 Mon Sep 17 00:00:00 2001
From: ILike2WatchMemes <ilike2watchmemes@gmail.com>
Date: Wed, 19 Mar 2025 00:18:13 +0100
Subject: [PATCH 03/12] updates

---
 .../skyhanni/discord/CommandListener.kt       |   5 +-
 .../at/hannibal2/skyhanni/discord/Database.kt |  51 +++++++++
 .../hannibal2/skyhanni/discord/DiscordBot.kt  |   1 +
 .../skyhanni/discord/LinkListener.kt          |  38 +++++++
 .../at/hannibal2/skyhanni/discord/Utils.kt    |  13 ++-
 .../skyhanni/discord/command/LinkCommands.kt  | 106 ++++++++++++++++++
 .../discord/command/PullRequestCommand.kt     |  31 +----
 7 files changed, 215 insertions(+), 30 deletions(-)
 create mode 100644 src/main/kotlin/at/hannibal2/skyhanni/discord/LinkListener.kt
 create mode 100644 src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.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..2383085 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/CommandListener.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/CommandListener.kt
@@ -10,6 +10,7 @@ import at.hannibal2.skyhanni.discord.command.PullRequestCommand
 import at.hannibal2.skyhanni.discord.command.ServerCommands
 import at.hannibal2.skyhanni.discord.command.TagCommands
 import at.hannibal2.skyhanni.discord.command.TagUndo
+import net.dv8tion.jda.api.entities.channel.ChannelType
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent
 import org.reflections.Reflections
 import java.lang.reflect.Modifier
@@ -62,7 +63,7 @@ object CommandListener {
             return
         }
 
-        if (!command.userCommand) {
+        if (!command.userCommand && channelType != ChannelType.GUILD_PUBLIC_THREAD) {
             if (!hasAdminPermissions()) {
                 reply("No permissions $PLEADING_FACE")
                 return
@@ -74,7 +75,7 @@ object CommandListener {
             }
         }
 
-        // allows to use `!<command> -help` instaed of `!help -<command>`
+        // allows to use `!<command> -help` instead of `!help -<command>`
         if (args.size == 1 && args.first() == "-help") {
             with(HelpCommand) {
                 sendUsageReply(literal)
diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/Database.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/Database.kt
index 30be7da..4c7beda 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/Database.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/Database.kt
@@ -4,10 +4,12 @@ import java.sql.Connection
 import java.sql.DriverManager
 
 data class Tag(val keyword: String, var response: String, var uses: Int)
+data class Link(val channel: String, val pr: Int)
 
 object Database {
     private val connection: Connection = DriverManager.getConnection("jdbc:sqlite:bot.db")
     private val tags = mutableMapOf<String, Tag>()
+    private val links = mutableMapOf<String, Link>()
 
     init {
         val statement = connection.createStatement()
@@ -19,7 +21,16 @@ object Database {
             append("response TEXT, ")
             append("count INTEGER DEFAULT 0)")
         })
+
+        statement.execute(buildString {
+            append("CREATE TABLE IF NOT EXISTS linkedposts (")
+            append("id INTEGER PRIMARY KEY AUTOINCREMENT, ")
+            append("channelid STRING UNIQUE, ")
+            append("pullrequestid INTEGER UNIQUE)")
+        })
+
         loadTagCache()
+        loadLinkCache()
     }
 
     private fun loadTagCache() {
@@ -34,6 +45,17 @@ object Database {
         resultSet.close()
     }
 
+    private fun loadLinkCache() {
+        val statement = connection.prepareStatement("SELECT channelid, pullrequestid FROM linkedposts")
+        val resultSet = statement.executeQuery()
+        while (resultSet.next()) {
+            val channel = resultSet.getString("channelid")
+            val pr = resultSet.getInt("pullrequestid")
+            links[channel] = Link(channel, pr)
+        }
+        resultSet.close()
+    }
+
     private fun ensureCountColumnExists() {
         val statement = connection.prepareStatement("PRAGMA table_info(keywords)")
         val resultSet = statement.executeQuery()
@@ -66,6 +88,19 @@ object Database {
         return updated
     }
 
+    fun addLink(channel: String, pr: Int): Boolean {
+        val statement = connection.prepareStatement(
+            "INSERT OR REPLACE INTO linkedposts (channelid, pullrequestid) VALUES (?, ?)"
+        )
+        statement.setString(1, channel)
+        statement.setInt(2, pr)
+        val updated = statement.executeUpdate() > 0
+        if (updated) {
+            links[channel] = Link(channel, pr)
+        }
+        return updated
+    }
+
     fun getResponse(keyword: String, increment: Boolean = false): String? {
         val key = keyword.lowercase()
         val kObj = tags[key] ?: return null
@@ -81,6 +116,10 @@ object Database {
         return kObj.response
     }
 
+    fun getLink(prNumber: Int): Link? = links.values.find { it.pr == prNumber }
+
+    fun getPullrequest(channel: String): Int? = links[channel]?.pr
+
     fun deleteTag(keyword: String): Boolean {
         val key = keyword.lowercase()
         val statement = connection.prepareStatement("DELETE FROM keywords WHERE keyword = ?")
@@ -90,11 +129,23 @@ object Database {
         return updated
     }
 
+    fun deleteLink(channel: String): Boolean {
+        val statement = connection.prepareStatement("DELETE FROM linkedposts WHERE channelid = ?")
+        statement.setString(1, channel)
+        val updated = statement.executeUpdate() > 0
+        if (updated) links.remove(channel)
+        return updated
+    }
+
     fun listTags(): List<Tag> = tags.values.toList()
 
+    fun listLinks(): List<Link> = links.values.toList()
+
     fun getTagCount(keyword: String): Int? {
         return tags[keyword.lowercase()]?.uses
     }
 
     fun containsKeyword(keyword: String): Boolean = tags.containsKey(keyword.lowercase())
+
+    fun isLinked(channel: String): Boolean = links.containsKey(channel)
 }
diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/DiscordBot.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/DiscordBot.kt
index f45cfd7..fbecc3f 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/DiscordBot.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/DiscordBot.kt
@@ -76,6 +76,7 @@ private fun startBot(): DiscordBot {
     val messageListener = object : ListenerAdapter() {
         override fun onMessageReceived(event: MessageReceivedEvent) {
             CommandListener.onMessage(bot, event)
+            LinkListener.onMessage(bot, event)
         }
     }
     jda.addEventListener(messageListener)
diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/LinkListener.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/LinkListener.kt
new file mode 100644
index 0000000..80b2ead
--- /dev/null
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/LinkListener.kt
@@ -0,0 +1,38 @@
+package at.hannibal2.skyhanni.discord
+
+import at.hannibal2.skyhanni.discord.Utils.messageSend
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent
+
+object LinkListener {
+
+    private const val GITHUB_WEBHOOK_ID = "1347997547368550461"
+    private val githubPattern =
+        "\\[ILike2WatchMemes/DiscordBot] (New comment on pull request|Pull request review submitted:) #(?<pr>\\d+):? .+".toPattern()
+
+    fun onMessage(bot: DiscordBot, event: MessageReceivedEvent) {
+        event.onMessage(bot)
+    }
+
+    private fun MessageReceivedEvent.onMessage(bot: DiscordBot) {
+        if (this.author.id == GITHUB_WEBHOOK_ID) {
+            val embed = this.message.embeds[0]
+
+            val title = embed.title ?: return
+
+            val prNumber = getPr(title)?.toInt() ?: return
+            val link = Database.getLink(prNumber) ?: return
+
+            val guild = bot.jda.getGuildById(BOT.config.allowedServerId) ?: return
+            val channel = guild.getThreadChannelById(link.channel) ?: return
+
+
+            channel.messageSend(this.message.embeds[0])
+        }
+    }
+
+    private fun getPr(title: String): String? {
+        val matcher = githubPattern.matcher(title)
+        if (!matcher.matches()) return null
+        return matcher.group("pr")
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/Utils.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/Utils.kt
index b3a1c4d..da355bc 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/Utils.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/Utils.kt
@@ -8,7 +8,6 @@ import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel
 import net.dv8tion.jda.api.entities.channel.unions.MessageChannelUnion
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent
 import net.dv8tion.jda.api.utils.FileUpload
-import org.slf4j.LoggerFactory
 import java.awt.Color
 import java.awt.Toolkit.getDefaultToolkit
 import java.io.File
@@ -34,6 +33,10 @@ object Utils {
         logAction("Error: $text")
     }
 
+    fun MessageReceivedEvent.userSuccess(text: String) {
+        message.messageReply("✅ $text")
+    }
+
     fun MessageReceivedEvent.reply(embed: MessageEmbed) {
         message.messageReply(embed)
     }
@@ -69,6 +72,14 @@ object Utils {
         }
     }
 
+    fun MessageChannel.messageSend(embed: MessageEmbed, instantly: Boolean = false) {
+        if (instantly) {
+            sendMessageEmbeds(embed).complete()
+        } else {
+            sendMessageEmbeds(embed).queue()
+        }
+    }
+
     fun Message.replyWithConsumer(text: String, consumer: (MessageReceivedEvent) -> Unit) {
         BotMessageHandler.log(text, consumer)
         messageReply(text)
diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt
new file mode 100644
index 0000000..18e445e
--- /dev/null
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt
@@ -0,0 +1,106 @@
+package at.hannibal2.skyhanni.discord.command
+
+import at.hannibal2.skyhanni.discord.Database
+import at.hannibal2.skyhanni.discord.OPEN_PR_TAG
+import at.hannibal2.skyhanni.discord.Option
+import at.hannibal2.skyhanni.discord.PLEADING_FACE
+import at.hannibal2.skyhanni.discord.Utils.logAction
+import at.hannibal2.skyhanni.discord.Utils.reply
+import at.hannibal2.skyhanni.discord.Utils.userError
+import at.hannibal2.skyhanni.discord.Utils.userSuccess
+import at.hannibal2.skyhanni.discord.command.LinkCommand.setTags
+import at.hannibal2.skyhanni.discord.command.LinkCommand.setTitle
+import net.dv8tion.jda.api.entities.channel.ChannelType
+import net.dv8tion.jda.api.entities.channel.forums.ForumTag
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent
+import net.dv8tion.jda.api.managers.channel.concrete.ThreadChannelManager
+
+object LinkCommand : BaseCommand() {
+    override val name = "link"
+
+    override val description = "Link a forum post to a pull request."
+    override val options: List<Option> = listOf(
+        Option("number", "Number of the pull request you want the post to be linked to.")
+    )
+
+    override fun MessageReceivedEvent.execute(args: List<String>) {
+        if (args.size != 1) return wrongUsage("<number>")
+        val first = args.first()
+        val prNumber = first.toIntOrNull() ?: run {
+            userError("Unknown number $PLEADING_FACE ($first})")
+            return
+        }
+        if (prNumber < 1) {
+            userError("PR number needs to be positive $PLEADING_FACE")
+            return
+        }
+
+        if (!isFromType(ChannelType.GUILD_PUBLIC_THREAD)) {
+            userError("Wrong channel $PLEADING_FACE")
+            return
+        }
+
+        val post = channel.asThreadChannel()
+        val manager = post.manager
+
+        if (Database.isLinked(post.id)) {
+            reply("Post already linked to ${Database.getPullrequest(channel.id)} $PLEADING_FACE")
+            return
+        }
+
+        Database.addLink(post.id, prNumber)
+        logAction("${author.name} linked pr $prNumber")
+
+        if (!post.name.contains("(PR #")) manager.setTitle("${post.name} (PR #$prNumber)")
+
+        val tags = post.appliedTags
+        if (tags.none { it.id == OPEN_PR_TAG }) {
+            val tag = post.parentChannel.asForumChannel().getAvailableTagById(OPEN_PR_TAG) ?: return
+            manager.setTags(tags + tag)
+        }
+
+        userSuccess("Successfully linked PR $prNumber to this post.")
+    }
+
+    fun ThreadChannelManager.setTags(tags: List<ForumTag>) {
+        setAppliedTags(tags).queue()
+    }
+
+    fun ThreadChannelManager.setTitle(name: String) {
+        setName(name).queue()
+    }
+}
+
+object UnlinkCommand : BaseCommand() {
+    override val name = "unlink"
+
+    override val description = "Unlink a forum post from a pull request."
+
+    override fun MessageReceivedEvent.execute(args: List<String>) {
+        if (!isFromType(ChannelType.GUILD_PUBLIC_THREAD)) {
+            userError("Wrong channel $PLEADING_FACE")
+            return
+        }
+
+        if (!Database.isLinked(channel.id)) {
+            userError("Post isn't linked to any pull request $PLEADING_FACE")
+            return
+        }
+
+        val post = channel.asThreadChannel()
+        val manager = post.manager
+
+        Database.deleteLink(post.id)
+        logAction("${author.name} unlinked the pull request")
+
+        if (post.name.contains("(PR #")) manager.setTitle(post.name.split("(PR #")[0])
+
+        val tags = post.appliedTags
+        if (tags.any { it.id == OPEN_PR_TAG }) {
+            val tag = post.parentChannel.asForumChannel().getAvailableTagById(OPEN_PR_TAG) ?: return
+            manager.setTags(tags.filter { it != tag })
+        }
+
+        userSuccess("Successfully unlinked this post.")
+    }
+}
\ No newline at end of file
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 78cdfed..fa0562f 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
@@ -33,8 +33,7 @@ object PullRequestCommand : BaseCommand() {
 
     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."),
-        Option("link", "Use -l to link a forum post to this pr.", required = false)
+        Option("number", "Number of the pull request you want to display.")
     )
 
     override val userCommand: Boolean = true
@@ -49,10 +48,8 @@ object PullRequestCommand : BaseCommand() {
     private val pullRequestPattern = "$BASE/pull/(?<pr>\\d+)".toPattern()
 
     override fun MessageReceivedEvent.execute(args: List<String>) {
-        if (args.size !in 1..2) return wrongUsage("<number>")
+        if (args.size != 1) return wrongUsage("<number>")
         val first = args.first()
-        val link = args.getOrNull(1) == "-l"
-        println(link)
         val prNumber = first.toLongOrNull() ?: run {
             userError("Unknown number $PLEADING_FACE ($first})")
             return
@@ -61,10 +58,10 @@ object PullRequestCommand : BaseCommand() {
             userError("PR number needs to be positive $PLEADING_FACE")
             return
         }
-        loadPrInfos(prNumber, link)
+        loadPrInfos(prNumber)
     }
 
-    private fun MessageReceivedEvent.loadPrInfos(prNumber: Long, link: Boolean = false) {
+    private fun MessageReceivedEvent.loadPrInfos(prNumber: Long) {
         logAction("loads pr infos for #$prNumber")
 
         val prLink = "$BASE/pull/$prNumber"
@@ -220,26 +217,6 @@ object PullRequestCommand : BaseCommand() {
         }
 
         reply(embed(embedTitle, embedBody, readColor(pr)))
-
-        if (link && isFromType(ChannelType.GUILD_PUBLIC_THREAD)) {
-            val post = channel.asThreadChannel()
-            val manager = post.manager
-
-            if (post.name.contains("(PR #")) {
-                reply("Post already linked.")
-                return
-            }
-
-            manager.setName("${post.name} (PR #$prNumber)").queue()
-
-            val tags = post.appliedTags
-            if (tags.any { it.id == OPEN_PR_TAG }) return
-
-            val tag = post.parentChannel.asForumChannel().getAvailableTagById(OPEN_PR_TAG) ?: return
-            manager.setAppliedTags(tags + tag).queue()
-
-            logAction("${author.name} linked pr $prNumber")
-        }
     }
 
     private val labelTypes: Map<String, Set<String>> = mapOf(

From a733fef146b681c63ad6822d5214c77f480c312a Mon Sep 17 00:00:00 2001
From: ILike2WatchMemes <ilike2watchmemes@gmail.com>
Date: Fri, 21 Mar 2025 15:02:22 +0100
Subject: [PATCH 04/12] Update PullRequestCommand.kt

---
 .../discord/command/PullRequestCommand.kt     | 316 +++++++-----------
 1 file changed, 128 insertions(+), 188 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 9cfcca9..2377a53 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
@@ -132,12 +132,6 @@ object PullRequestCommand : BaseCommand() {
             }
         }
 
-        if (toTimeMark(pr.updatedAt).passedSince() < 5.seconds) {
-            val text = "${title}${time} \nGitHub actions is loading $PLEADING_FACE"
-            reply(embed(embedTitle, text, readColor(pr)))
-            return
-        }
-
         if (toTimeMark(pr.updatedAt).passedSince() > 400.days && !inBeta) {
             val text = "${title}${time} \nBuild download has expired $PLEADING_FACE"
             reply(embed(embedTitle, text, readColor(pr)))
@@ -156,8 +150,6 @@ object PullRequestCommand : BaseCommand() {
                 }
             }
 
-            val text = "${title}${time} \nBuild needs approval $PLEADING_FACE"
-
             reply(embed(embedTitle, text, readColor(pr)))
             return
         }
@@ -169,219 +161,167 @@ object PullRequestCommand : BaseCommand() {
         }
 
         if (job.status != RunStatus.COMPLETED) {
-            if (job.status != RunStatus.COMPLETED) {
-                val text = when (job.status) {
-                    RunStatus.REQUESTED -> "Build has been requested $PLEADING_FACE"
-                    RunStatus.QUEUED -> "Build is in queue $PLEADING_FACE"
-                    RunStatus.IN_PROGRESS -> "Build is in progress $PLEADING_FACE"
-                    RunStatus.WAITING -> "Build is waiting $PLEADING_FACE"
-                    RunStatus.PENDING -> "Build is pending $PLEADING_FACE"
-                    else -> ""
-                }
-
-                val embedBody = buildString {
-                    append(title)
-                    append(time)
-                    if (!inBeta) {
-                        append("\n")
-                        append(text)
-                    }
-                }
-
-                reply(embed(embedTitle, embedBody, readColor(pr)))
-                return
-            }
-
-            if (job.conclusion != Conclusion.SUCCESS && !inBeta) {
-                reply(embed(embedTitle, "$title$time\nLast development build failed $PLEADING_FACE", Color.red))
-                return
-            }
-
-            if (job.startedAt?.let { toTimeMark(it).passedSince() > 90.days } == true) {
-                reply(embed(embedTitle, "${title}${time} \nBuild download has expired $PLEADING_FACE", readColor(pr)))
-                return
-            }
-
-            if (job.conclusion != Conclusion.SUCCESS) {
-                reply(embed(embedTitle, "$title$time\nLast development build failed $PLEADING_FACE", Color.red))
-                return
-            }
-
-            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 artifactLine = "GitHub".linkTo(artifactLink)
-            val nightlyLine = "Nightly".linkTo(nightlyLink)
-
-            val artifactDisplay = buildString {
-                append(" \n")
-                append("Download the latest development build of this pr!")
-                append("\n")
-                append("> From $artifactLine (requires a GitHub Account)")
-                append("\n")
-                append("> From $nightlyLine (unofficial)")
-                append("\n")
-                append("> (updated ${passedSince(job.completedAt ?: "")})")
+            val text = when (job.status) {
+                RunStatus.REQUESTED -> "Build has been requested $PLEADING_FACE"
+                RunStatus.QUEUED -> "Build is in queue $PLEADING_FACE"
+                RunStatus.IN_PROGRESS -> "Build is in progress $PLEADING_FACE"
+                RunStatus.WAITING -> "Build is waiting $PLEADING_FACE"
+                RunStatus.PENDING -> "Build is pending $PLEADING_FACE"
+                else -> ""
             }
 
             val embedBody = buildString {
                 append(title)
                 append(time)
                 if (!inBeta) {
-                    append(artifactDisplay)
+                    append("\n")
+                    append(text)
                 }
             }
 
             reply(embed(embedTitle, embedBody, readColor(pr)))
+            return
         }
 
-        private val labelTypes: Map<String, Set<String>> = 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()).toSet())
-            if (labelsWithType.isEmpty()) return stringBuilder.append(if (suffix.isNotEmpty()) "> $labelType: $suffix\n" else "")
-            return stringBuilder.append("> $labelType: `${labelsWithType.joinToString("` `")}`$suffix\n")
+        if (job.conclusion != Conclusion.SUCCESS && !inBeta) {
+            reply(embed(embedTitle, "$title$time\nLast development build failed $PLEADING_FACE", Color.red))
+            return
         }
 
-        private val labelTypes: Map<String, Set<String>> = 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())
-            if (labelsWithType.isEmpty()) return stringBuilder.append(if (suffix.isNotEmpty()) "> $labelType: $suffix\n" else "")
-            return stringBuilder.append("> $labelType: `${labelsWithType.joinToString("` `")}`$suffix\n")
+        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 artifactLine = "GitHub".linkTo(artifactLink)
+        val nightlyLine = "Nightly".linkTo(nightlyLink)
+
+        val artifactDisplay = buildString {
+            append(" \n")
+            append("Download the latest development build of this pr!")
+            append("\n")
+            append("> From $artifactLine (requires a GitHub Account)")
+            append("\n")
+            append("> From $nightlyLine (unofficial)")
+            append("\n")
+            append("> (updated ${passedSince(job.completedAt ?: "")})")
         }
 
-        // Colors picked from GitHub
-        private fun readColor(pr: PullRequestJson): Color = when {
-            pr.draft -> Color(101, 108, 118)
-            pr.merged -> Color(130, 86, 208)
-            else -> Color(52, 125, 57)
+        val embedBody = buildString {
+            append(title)
+            append(time)
+            if (!inBeta) {
+                append(artifactDisplay)
+            }
         }
 
-        private fun parseToUnixTime(isoTimestamp: String): Long =
-            Instant.from(DateTimeFormatter.ISO_INSTANT.parse(isoTimestamp)).epochSecond
+        reply(embed(embedTitle, embedBody, readColor(pr)))
+    }
 
-        private fun toTimeMark(stringTime: String): SimpleTimeMark = (parseToUnixTime(stringTime) * 1000).asTimeMark()
+    private val labelTypes: Map<String, Set<String>> = 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 passedSince(stringTime: String): String = "<t:${parseToUnixTime(stringTime)}:R>"
+    private 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")
+    }
 
-        private fun releaseSinceMerge(stringTimeMerge: String, stringTimeLastRelease: String): Boolean {
-            val timeMerge = parseToUnixTime(stringTimeMerge)
-            val timeLastRelease = parseToUnixTime(stringTimeLastRelease)
-            return timeMerge < timeLastRelease
-        }
+    // Colors picked from GitHub
+    private fun readColor(pr: PullRequestJson): Color = when {
+        pr.draft -> Color(101, 108, 118)
+        pr.merged -> Color(130, 86, 208)
+        else -> Color(52, 125, 57)
+    }
 
-        @Suppress("unused") // TODO implement once we can upload the file
-        private fun MessageReceivedEvent.pullRequestArtifactCommand(args: List<String>) {
-            if (args.size != 2) {
-                reply("Usage: `!prupload <number>`")
-                return
-            }
-            val prNumber = args[1].toLongOrNull() ?: run {
-                reply("unknown number $PLEADING_FACE (${args[1]})")
-                return
-            }
+    private fun parseToUnixTime(isoTimestamp: String): Long =
+        Instant.from(DateTimeFormatter.ISO_INSTANT.parse(isoTimestamp)).epochSecond
 
-            val prLink = "$BASE/pull/$prNumber"
-            reply("Looking for pr <$prLink..")
+    private fun toTimeMark(stringTime: String): SimpleTimeMark = (parseToUnixTime(stringTime) * 1000).asTimeMark()
 
-            val pr = github.findPullRequest(prNumber) ?: run {
-                reply("pr is null!")
-                return
-            }
-            val head = pr.head
-            reply("found pr `${pr.title}` (from `${head.user.login}`)")
+    private fun passedSince(stringTime: String): String = "<t:${parseToUnixTime(stringTime)}:R>"
 
-            reply("looking for artifact ..")
-            val lastCommit = head.sha
-            val artifact = github.findArtifact(lastCommit) ?: run {
-                reply("artifact is null!")
-                return
-            }
-            reply("found artifact")
-
-            val artifactId = artifact.id
-            val fileRaw = File("temp/downloads/artifact-$artifactId-raw")
-            fileRaw.createParentDirIfNotExist()
-            val fileUnzipped = File("temp/downloads/artifact-$artifactId-unzipped")
-            reply("Downloading artifact ..")
-            val (_, downloadTime) = timeExecution {
-                github.downloadArtifact(artifactId, fileRaw)
-            }
-            reply("artifact downloaded in ${downloadTime.format()}")
+    private fun releaseSinceMerge(stringTimeMerge: String, stringTimeLastRelease: String): Boolean {
+        val timeMerge = parseToUnixTime(stringTimeMerge)
+        val timeLastRelease = parseToUnixTime(stringTimeLastRelease)
+        return timeMerge < timeLastRelease
+    }
 
-            Utils.unzipFile(fileRaw, fileUnzipped)
-            fileRaw.delete()
+    @Suppress("unused") // TODO implement once we can upload the file
+    private fun MessageReceivedEvent.pullRequestArtifactCommand(args: List<String>) {
+        if (args.size != 2) {
+            reply("Usage: `!prupload <number>`")
+            return
+        }
+        val prNumber = args[1].toLongOrNull() ?: run {
+            reply("unknown number $PLEADING_FACE (${args[1]})")
+            return
+        }
 
-            val displayUrl = "$BASE/actions/runs/$artifactId?pr=$prNumber"
+        val prLink = "$BASE/pull/$prNumber"
+        reply("Looking for pr <$prLink..")
 
-            val modJar = findJarFile(fileUnzipped) ?: run {
-                reply("mod jar not found!")
-                return
-            }
+        val pr = github.findPullRequest(prNumber) ?: run {
+            reply("pr is null!")
+            return
+        }
+        val head = pr.head
+        reply("found pr `${pr.title}` (from `${head.user.login}`)")
 
-            reply("start uploading..")
-            val (_, uploadTime) = timeExecution {
-                channel.uploadFile(modJar, "here is the jar from <$displayUrl>")
-            }
-            reply("Mod jar uploaded in ${uploadTime.format()}")
+        reply("looking for artifact ..")
+        val lastCommit = head.sha
+        val artifact = github.findArtifact(lastCommit) ?: run {
+            reply("artifact is null!")
+            return
+        }
+        reply("found artifact")
+
+        val artifactId = artifact.id
+        val fileRaw = File("temp/downloads/artifact-$artifactId-raw")
+        fileRaw.createParentDirIfNotExist()
+        val fileUnzipped = File("temp/downloads/artifact-$artifactId-unzipped")
+        reply("Downloading artifact ..")
+        val (_, downloadTime) = timeExecution {
+            github.downloadArtifact(artifactId, fileRaw)
+        }
+        reply("artifact downloaded in ${downloadTime.format()}")
+
+        Utils.unzipFile(fileRaw, fileUnzipped)
+        fileRaw.delete()
+
+        val displayUrl = "$BASE/actions/runs/$artifactId?pr=$prNumber"
+
+        val modJar = findJarFile(fileUnzipped) ?: run {
+            reply("mod jar not found!")
+            return
         }
 
-        private fun findJarFile(directory: File): File? {
-            return directory.walkTopDown().firstOrNull { it.isFile && it.name.startsWith("SkyHanni-") }
+        reply("start uploading..")
+        val (_, uploadTime) = timeExecution {
+            channel.uploadFile(modJar, "here is the jar from <$displayUrl>")
         }
+        reply("Mod jar uploaded in ${uploadTime.format()}")
+    }
 
-        fun isPullRequest(event: MessageReceivedEvent, message: String): Boolean {
-            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 ->
-                runDelayed(10.seconds) {
-                    consumer.message.messageDelete()
-                }
+    private fun findJarFile(directory: File): File? {
+        return directory.walkTopDown().firstOrNull { it.isFile && it.name.startsWith("SkyHanni-") }
+    }
+
+    fun isPullRequest(event: MessageReceivedEvent, message: String): Boolean {
+        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 ->
+            runDelayed(10.seconds) {
+                consumer.message.messageDelete()
             }
-            event.loadPrInfos(pr)
-            return true
         }
+        event.loadPrInfos(pr)
+        return true
+    }
 
-    }
\ No newline at end of file
+}
\ No newline at end of file

From 2fcb6e21af4bc52977efd1545a55d31bfd508ef3 Mon Sep 17 00:00:00 2001
From: ILike2WatchMemes <ilike2watchmemes@gmail.com>
Date: Thu, 10 Apr 2025 14:37:55 +0200
Subject: [PATCH 05/12] remove * import

---
 .../skyhanni/discord/command/PullRequestCommand.kt        | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 d62ee3e..015cb65 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
@@ -1,7 +1,13 @@
 package at.hannibal2.skyhanni.discord.command
 
-import at.hannibal2.skyhanni.discord.*
+import at.hannibal2.skyhanni.discord.BIG_X
+import at.hannibal2.skyhanni.discord.BOT
+import at.hannibal2.skyhanni.discord.CHECK_MARK
+import at.hannibal2.skyhanni.discord.Option
+import at.hannibal2.skyhanni.discord.PLEADING_FACE
+import at.hannibal2.skyhanni.discord.SimpleTimeMark
 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

From c40eb435e8ff04b64ad35c2226fe18080b5dd899 Mon Sep 17 00:00:00 2001
From: ILike2WatchMemes <ilike2watchmemes@gmail.com>
Date: Tue, 16 Sep 2025 19:01:25 +0200
Subject: [PATCH 06/12] updates

---
 .../hannibal2/skyhanni/discord/BotConfig.kt   |  6 ++-
 .../skyhanni/discord/CommandListener.kt       |  3 ++
 .../at/hannibal2/skyhanni/discord/Database.kt | 39 +++++++++----------
 .../hannibal2/skyhanni/discord/DiscordBot.kt  |  1 -
 .../skyhanni/discord/LinkListener.kt          | 21 ++++------
 .../skyhanni/discord/command/LinkCommands.kt  | 39 ++++++++++++++-----
 .../discord/command/PullRequestCommand.kt     | 19 ++++++---
 7 files changed, 78 insertions(+), 50 deletions(-)

diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/BotConfig.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/BotConfig.kt
index 63b0650..750f7ae 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/BotConfig.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/BotConfig.kt
@@ -11,6 +11,8 @@ data class BotConfig(
     val githubTokenOwn: String,
     val githubTokenPullRequests: String,
     val editPermissionRoleIds: Map<String, String>,
+	val githubWebhookUserId: String,
+	val openPrTagId: String
 )
 
 object ConfigLoader {
@@ -24,7 +26,9 @@ object ConfigLoader {
 		"TODO: github token with sh mod repo access",
 		mapOf(
 			"user friendly (non important) name" to "TODO: role id"
-		)
+		),
+		"TODO: github webhook 'user' id",
+		"TODO: discord forum open pull request tag id"
 	)
 	fun load(filePath: String): BotConfig {
 	    try {
diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/CommandListener.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/CommandListener.kt
index 69687f0..2cf161f 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/CommandListener.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/CommandListener.kt
@@ -43,6 +43,9 @@ object CommandListener {
             if (this.author.id == BOT_ID) {
                 BotMessageHandler.handle(this)
             }
+            if (this.author.id == BOT.config.githubWebhookUserId) {
+                LinkListener.onMessage(bot, this)
+            }
             return
         }
 
diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/Database.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/Database.kt
index d933af4..f880077 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/Database.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/Database.kt
@@ -4,12 +4,11 @@ import java.sql.Connection
 import java.sql.DriverManager
 
 data class Tag(val keyword: String, var response: String, var uses: Int)
-data class Link(val channel: String, val pr: Int)
 
 object Database {
     private val connection: Connection = DriverManager.getConnection("jdbc:sqlite:bot.db")
     private val tags = mutableMapOf<String, Tag>()
-    private val links = mutableMapOf<String, Link>()
+    private val linkedForumPosts = mutableMapOf<String, Int>() // key = channel id, value = pr number
 
     init {
         val statement = connection.createStatement()
@@ -25,8 +24,8 @@ object Database {
         statement.execute(buildString {
             append("CREATE TABLE IF NOT EXISTS linkedposts (")
             append("id INTEGER PRIMARY KEY AUTOINCREMENT, ")
-            append("channelid STRING UNIQUE, ")
-            append("pullrequestid INTEGER UNIQUE)")
+            append("channel_id STRING UNIQUE, ")
+            append("pullrequest_id INTEGER UNIQUE)")
         })
 
         loadTagCache()
@@ -46,12 +45,12 @@ object Database {
     }
 
     private fun loadLinkCache() {
-        val statement = connection.prepareStatement("SELECT channelid, pullrequestid FROM linkedposts")
+        val statement = connection.prepareStatement("SELECT channel_id, pullrequest_id FROM linkedposts")
         val resultSet = statement.executeQuery()
         while (resultSet.next()) {
-            val channel = resultSet.getString("channelid")
-            val pr = resultSet.getInt("pullrequestid")
-            links[channel] = Link(channel, pr)
+            val channelId = resultSet.getString("channel_id")
+            val pr = resultSet.getInt("pullrequest_id")
+            linkedForumPosts[channelId] = pr
         }
         resultSet.close()
     }
@@ -88,15 +87,15 @@ object Database {
         return updated
     }
 
-    fun addLink(channel: String, pr: Int): Boolean {
+    fun addLink(channelId: String, pr: Int): Boolean {
         val statement = connection.prepareStatement(
-            "INSERT OR REPLACE INTO linkedposts (channelid, pullrequestid) VALUES (?, ?)"
+            "INSERT OR REPLACE INTO linkedposts (channel_id, pullrequest_id) VALUES (?, ?)"
         )
-        statement.setString(1, channel)
+        statement.setString(1, channelId)
         statement.setInt(2, pr)
         val updated = statement.executeUpdate() > 0
         if (updated) {
-            links[channel] = Link(channel, pr)
+            linkedForumPosts[channelId] = pr
         }
         return updated
     }
@@ -116,9 +115,9 @@ object Database {
         return kObj.response
     }
 
-    fun getLink(prNumber: Int): Link? = links.values.find { it.pr == prNumber }
+    fun getChannelId(prNumber: Int): String? = linkedForumPosts.entries.find { it.value == prNumber }?.key
 
-    fun getPullrequest(channel: String): Int? = links[channel]?.pr
+    fun getPullrequest(channelId: String): Int? = linkedForumPosts[channelId]
 
     fun deleteTag(keyword: String): Boolean {
         val key = keyword.lowercase()
@@ -129,17 +128,17 @@ object Database {
         return updated
     }
 
-    fun deleteLink(channel: String): Boolean {
-        val statement = connection.prepareStatement("DELETE FROM linkedposts WHERE channelid = ?")
-        statement.setString(1, channel)
+    fun deleteLink(channelId: String): Boolean {
+        val statement = connection.prepareStatement("DELETE FROM linkedposts WHERE channel_id = ?")
+        statement.setString(1, channelId)
         val updated = statement.executeUpdate() > 0
-        if (updated) links.remove(channel)
+        if (updated) linkedForumPosts.remove(channelId)
         return updated
     }
 
     fun listTags(): List<Tag> = tags.values.toList()
 
-    fun listLinks(): List<Link> = links.values.toList()
+    fun listLinks(): Map<String, Int> = linkedForumPosts
 
     fun getTagCount(keyword: String): Int? {
         return tags[keyword.lowercase()]?.uses
@@ -147,5 +146,5 @@ object Database {
 
     fun containsKeyword(keyword: String): Boolean = tags.containsKey(keyword.lowercase())
 
-    fun isLinked(channel: String): Boolean = links.containsKey(channel)
+    fun isLinked(channelId: String): Boolean = linkedForumPosts.containsKey(channelId)
 }
diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/DiscordBot.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/DiscordBot.kt
index 95f6749..3a5a845 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/DiscordBot.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/DiscordBot.kt
@@ -77,7 +77,6 @@ private fun startBot(): DiscordBot {
     val messageListener = object : ListenerAdapter() {
         override fun onMessageReceived(event: MessageReceivedEvent) {
             CommandListener.onMessage(bot, event)
-            LinkListener.onMessage(bot, event)
         }
     }
     jda.addEventListener(messageListener)
diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/LinkListener.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/LinkListener.kt
index 80b2ead..ba5ffe5 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/LinkListener.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/LinkListener.kt
@@ -5,29 +5,24 @@ import net.dv8tion.jda.api.events.message.MessageReceivedEvent
 
 object LinkListener {
 
-    private const val GITHUB_WEBHOOK_ID = "1347997547368550461"
     private val githubPattern =
-        "\\[ILike2WatchMemes/DiscordBot] (New comment on pull request|Pull request review submitted:) #(?<pr>\\d+):? .+".toPattern()
+        "\\[SkyHanniStudios/DiscordBot] (New comment on pull request|Pull request review submitted:) #(?<pr>\\d+):? .+".toPattern()
 
     fun onMessage(bot: DiscordBot, event: MessageReceivedEvent) {
         event.onMessage(bot)
     }
 
     private fun MessageReceivedEvent.onMessage(bot: DiscordBot) {
-        if (this.author.id == GITHUB_WEBHOOK_ID) {
-            val embed = this.message.embeds[0]
+        val embed = this.message.embeds[0]
+        val title = embed.title ?: return
 
-            val title = embed.title ?: return
+        val prNumber = getPr(title)?.toInt() ?: return
+        val channelId = Database.getChannelId(prNumber) ?: return
 
-            val prNumber = getPr(title)?.toInt() ?: return
-            val link = Database.getLink(prNumber) ?: return
+        val guild = bot.jda.getGuildById(BOT.config.allowedServerId) ?: return
+        val channel = guild.getThreadChannelById(channelId) ?: return
 
-            val guild = bot.jda.getGuildById(BOT.config.allowedServerId) ?: return
-            val channel = guild.getThreadChannelById(link.channel) ?: return
-
-
-            channel.messageSend(this.message.embeds[0])
-        }
+        channel.messageSend(this.message.embeds[0])
     }
 
     private fun getPr(title: String): String? {
diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt
index 18e445e..ef498b1 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.discord.command
 
+import at.hannibal2.skyhanni.discord.BOT
 import at.hannibal2.skyhanni.discord.Database
 import at.hannibal2.skyhanni.discord.OPEN_PR_TAG
 import at.hannibal2.skyhanni.discord.Option
@@ -10,6 +11,7 @@ import at.hannibal2.skyhanni.discord.Utils.userError
 import at.hannibal2.skyhanni.discord.Utils.userSuccess
 import at.hannibal2.skyhanni.discord.command.LinkCommand.setTags
 import at.hannibal2.skyhanni.discord.command.LinkCommand.setTitle
+import at.hannibal2.skyhanni.discord.github.GitHubClient
 import net.dv8tion.jda.api.entities.channel.ChannelType
 import net.dv8tion.jda.api.entities.channel.forums.ForumTag
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent
@@ -30,15 +32,8 @@ object LinkCommand : BaseCommand() {
             userError("Unknown number $PLEADING_FACE ($first})")
             return
         }
-        if (prNumber < 1) {
-            userError("PR number needs to be positive $PLEADING_FACE")
-            return
-        }
 
-        if (!isFromType(ChannelType.GUILD_PUBLIC_THREAD)) {
-            userError("Wrong channel $PLEADING_FACE")
-            return
-        }
+        if (!isValidPrNumber(prNumber)) return
 
         val post = channel.asThreadChannel()
         val manager = post.manager
@@ -51,7 +46,7 @@ object LinkCommand : BaseCommand() {
         Database.addLink(post.id, prNumber)
         logAction("${author.name} linked pr $prNumber")
 
-        if (!post.name.contains("(PR #")) manager.setTitle("${post.name} (PR #$prNumber)")
+        manager.setTitle("${post.name} (PR #$prNumber)")
 
         val tags = post.appliedTags
         if (tags.none { it.id == OPEN_PR_TAG }) {
@@ -69,6 +64,32 @@ object LinkCommand : BaseCommand() {
     fun ThreadChannelManager.setTitle(name: String) {
         setName(name).queue()
     }
+
+    private const val USER = "hannibal002"
+    private const val REPO = "SkyHanni"
+    private val github = GitHubClient(USER, REPO, BOT.config.githubTokenPullRequests)
+
+    private fun MessageReceivedEvent.isValidPrNumber(number: Int): Boolean {
+        if (number <= 0) {
+            userError("PR number needs to be positive $PLEADING_FACE")
+            return false
+        }
+        if (!isFromType(ChannelType.GUILD_PUBLIC_THREAD)) {
+            userError("Wrong channel $PLEADING_FACE")
+            return false
+        }
+
+        try {
+            github.findPullRequest(number) ?: run {
+                userError("Pull request with number $number not found")
+                return false
+            }
+        } catch (e: Exception) {
+            userError("Pull request with number $number not found")
+            return false
+        }
+        return true
+    }
 }
 
 object UnlinkCommand : BaseCommand() {
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 966b609..ad29b4d 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
@@ -18,6 +18,7 @@ import at.hannibal2.skyhanni.discord.github.GitHubClient
 import at.hannibal2.skyhanni.discord.json.discord.Conclusion
 import at.hannibal2.skyhanni.discord.json.discord.PullRequestJson
 import at.hannibal2.skyhanni.discord.json.discord.RunStatus
+import net.dv8tion.jda.api.entities.channel.ChannelType
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent
 import java.awt.Color
 import java.io.File
@@ -48,11 +49,17 @@ object PullRequestCommand : BaseCommand() {
     private val cleanPullRequestPattern = "#(?<pr>\\d+),?".toPattern()
 
     override fun MessageReceivedEvent.execute(args: List<String>) {
-        if (args.size != 1) return wrongUsage("<number>")
-        val first = args.first().removePrefix("#")
-        val prNumber = first.toIntOrNull() ?: run {
-            userError("Unknown number $PLEADING_FACE ($first})")
-            return
+        val prNumber = if (args.isEmpty()) {
+            if (!isFromType(ChannelType.GUILD_PUBLIC_THREAD)) return
+            if (!Database.isLinked(channel.id)) return
+
+            Database.getPullrequest(channel.id) ?: 0
+        } else {
+            val first = args.first().removePrefix("#")
+            first.toIntOrNull() ?: run {
+                userError("Unknown number $PLEADING_FACE ($first})")
+                return
+            }
         }
         if (prNumber < 1) {
             userError("PR number needs to be positive $PLEADING_FACE")
@@ -269,7 +276,7 @@ object PullRequestCommand : BaseCommand() {
             reply("Usage: `!prupload <number>`")
             return
         }
-        val prNumber = args[1].toLongOrNull() ?: run {
+        val prNumber = args[1].toIntOrNull() ?: run {
             reply("unknown number $PLEADING_FACE (${args[1]})")
             return
         }

From 44db0e339dc5410bbe4771b18a86426559578d8e Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Tue, 16 Sep 2025 22:31:04 +0200
Subject: [PATCH 07/12] added more _

---
 .../kotlin/at/hannibal2/skyhanni/discord/Database.kt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/Database.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/Database.kt
index f880077..a1179a6 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/Database.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/Database.kt
@@ -22,10 +22,10 @@ object Database {
         })
 
         statement.execute(buildString {
-            append("CREATE TABLE IF NOT EXISTS linkedposts (")
+            append("CREATE TABLE IF NOT EXISTS linked_posts (")
             append("id INTEGER PRIMARY KEY AUTOINCREMENT, ")
             append("channel_id STRING UNIQUE, ")
-            append("pullrequest_id INTEGER UNIQUE)")
+            append("pull_request_id INTEGER UNIQUE)")
         })
 
         loadTagCache()
@@ -45,11 +45,11 @@ object Database {
     }
 
     private fun loadLinkCache() {
-        val statement = connection.prepareStatement("SELECT channel_id, pullrequest_id FROM linkedposts")
+        val statement = connection.prepareStatement("SELECT channel_id, pull_request_id FROM linked_posts")
         val resultSet = statement.executeQuery()
         while (resultSet.next()) {
             val channelId = resultSet.getString("channel_id")
-            val pr = resultSet.getInt("pullrequest_id")
+            val pr = resultSet.getInt("pull_request_id")
             linkedForumPosts[channelId] = pr
         }
         resultSet.close()
@@ -89,7 +89,7 @@ object Database {
 
     fun addLink(channelId: String, pr: Int): Boolean {
         val statement = connection.prepareStatement(
-            "INSERT OR REPLACE INTO linkedposts (channel_id, pullrequest_id) VALUES (?, ?)"
+            "INSERT OR REPLACE INTO linked_posts (channel_id, pull_request_id) VALUES (?, ?)"
         )
         statement.setString(1, channelId)
         statement.setInt(2, pr)
@@ -129,7 +129,7 @@ object Database {
     }
 
     fun deleteLink(channelId: String): Boolean {
-        val statement = connection.prepareStatement("DELETE FROM linkedposts WHERE channel_id = ?")
+        val statement = connection.prepareStatement("DELETE FROM linked_posts WHERE channel_id = ?")
         statement.setString(1, channelId)
         val updated = statement.executeUpdate() > 0
         if (updated) linkedForumPosts.remove(channelId)

From 50fa292d391690ffce1d82e9be7346ff22cf1790 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Tue, 16 Sep 2025 22:37:23 +0200
Subject: [PATCH 08/12] merged logic into parseValidPrNumber

---
 .../skyhanni/discord/command/LinkCommands.kt  | 17 +++------------
 .../discord/command/PullRequestCommand.kt     | 21 ++++++++++++-------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt
index ef498b1..2fe11b5 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt
@@ -1,16 +1,13 @@
 package at.hannibal2.skyhanni.discord.command
 
-import at.hannibal2.skyhanni.discord.BOT
-import at.hannibal2.skyhanni.discord.Database
-import at.hannibal2.skyhanni.discord.OPEN_PR_TAG
-import at.hannibal2.skyhanni.discord.Option
-import at.hannibal2.skyhanni.discord.PLEADING_FACE
+import at.hannibal2.skyhanni.discord.*
 import at.hannibal2.skyhanni.discord.Utils.logAction
 import at.hannibal2.skyhanni.discord.Utils.reply
 import at.hannibal2.skyhanni.discord.Utils.userError
 import at.hannibal2.skyhanni.discord.Utils.userSuccess
 import at.hannibal2.skyhanni.discord.command.LinkCommand.setTags
 import at.hannibal2.skyhanni.discord.command.LinkCommand.setTitle
+import at.hannibal2.skyhanni.discord.command.PullRequestCommand.parseValidPrNumber
 import at.hannibal2.skyhanni.discord.github.GitHubClient
 import net.dv8tion.jda.api.entities.channel.ChannelType
 import net.dv8tion.jda.api.entities.channel.forums.ForumTag
@@ -27,11 +24,7 @@ object LinkCommand : BaseCommand() {
 
     override fun MessageReceivedEvent.execute(args: List<String>) {
         if (args.size != 1) return wrongUsage("<number>")
-        val first = args.first()
-        val prNumber = first.toIntOrNull() ?: run {
-            userError("Unknown number $PLEADING_FACE ($first})")
-            return
-        }
+        val prNumber = parseValidPrNumber(args.first()) ?: return
 
         if (!isValidPrNumber(prNumber)) return
 
@@ -70,10 +63,6 @@ object LinkCommand : BaseCommand() {
     private val github = GitHubClient(USER, REPO, BOT.config.githubTokenPullRequests)
 
     private fun MessageReceivedEvent.isValidPrNumber(number: Int): Boolean {
-        if (number <= 0) {
-            userError("PR number needs to be positive $PLEADING_FACE")
-            return false
-        }
         if (!isFromType(ChannelType.GUILD_PUBLIC_THREAD)) {
             userError("Wrong channel $PLEADING_FACE")
             return false
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 ad29b4d..c8bb58a 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
@@ -55,17 +55,22 @@ object PullRequestCommand : BaseCommand() {
 
             Database.getPullrequest(channel.id) ?: 0
         } else {
-            val first = args.first().removePrefix("#")
-            first.toIntOrNull() ?: run {
-                userError("Unknown number $PLEADING_FACE ($first})")
-                return
-            }
+            parseValidPrNumber(args.first().removePrefix("#")) ?: return
         }
-        if (prNumber < 1) {
+        loadPrInfos(prNumber)
+    }
+
+    fun MessageReceivedEvent.parseValidPrNumber(rawNumber: String): Int? {
+        val number = rawNumber.toIntOrNull() ?: run {
+            userError("Unknown number $PLEADING_FACE ($rawNumber)")
+            return null
+        }
+        if (number < 1) {
             userError("PR number needs to be positive $PLEADING_FACE")
-            return
+            return null
         }
-        loadPrInfos(prNumber)
+
+        return number
     }
 
     private fun MessageReceivedEvent.loadPrInfos(prNumber: Int, showError: Boolean = true) {

From 222b8e8b450e99036bb7804b0838c2d5a4911f62 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Tue, 16 Sep 2025 22:44:24 +0200
Subject: [PATCH 09/12] made isLinked unnecessary

---
 .../kotlin/at/hannibal2/skyhanni/discord/Database.kt   |  2 --
 .../hannibal2/skyhanni/discord/command/LinkCommands.kt | 10 +++++-----
 .../skyhanni/discord/command/PullRequestCommand.kt     |  4 +---
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/Database.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/Database.kt
index a1179a6..d69b668 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/Database.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/Database.kt
@@ -145,6 +145,4 @@ object Database {
     }
 
     fun containsKeyword(keyword: String): Boolean = tags.containsKey(keyword.lowercase())
-
-    fun isLinked(channelId: String): Boolean = linkedForumPosts.containsKey(channelId)
 }
diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt
index 2fe11b5..6a788eb 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt
@@ -31,13 +31,13 @@ object LinkCommand : BaseCommand() {
         val post = channel.asThreadChannel()
         val manager = post.manager
 
-        if (Database.isLinked(post.id)) {
-            reply("Post already linked to ${Database.getPullrequest(channel.id)} $PLEADING_FACE")
+        Database.getPullrequest(channel.id)?.let {
+            reply("Post already linked to $it $PLEADING_FACE")
             return
         }
 
         Database.addLink(post.id, prNumber)
-        logAction("${author.name} linked pr $prNumber")
+        logAction("linked pr #$prNumber to this channel")
 
         manager.setTitle("${post.name} (PR #$prNumber)")
 
@@ -92,7 +92,7 @@ object UnlinkCommand : BaseCommand() {
             return
         }
 
-        if (!Database.isLinked(channel.id)) {
+        val pr = Database.getPullrequest(channel.id) ?: run {
             userError("Post isn't linked to any pull request $PLEADING_FACE")
             return
         }
@@ -101,7 +101,7 @@ object UnlinkCommand : BaseCommand() {
         val manager = post.manager
 
         Database.deleteLink(post.id)
-        logAction("${author.name} unlinked the pull request")
+        logAction("unlinked pr #$pr from this channel")
 
         if (post.name.contains("(PR #")) manager.setTitle(post.name.split("(PR #")[0])
 
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 c8bb58a..775142b 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/PullRequestCommand.kt
@@ -51,9 +51,7 @@ object PullRequestCommand : BaseCommand() {
     override fun MessageReceivedEvent.execute(args: List<String>) {
         val prNumber = if (args.isEmpty()) {
             if (!isFromType(ChannelType.GUILD_PUBLIC_THREAD)) return
-            if (!Database.isLinked(channel.id)) return
-
-            Database.getPullrequest(channel.id) ?: 0
+            Database.getPullrequest(channel.id) ?: return
         } else {
             parseValidPrNumber(args.first().removePrefix("#")) ?: return
         }

From 65b2efaff78265740e3f72d3376cc59831840e68 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Tue, 16 Sep 2025 22:49:12 +0200
Subject: [PATCH 10/12] title format don't replace wrong titles

---
 .../skyhanni/discord/command/LinkCommands.kt         | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt
index 6a788eb..3462757 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt
@@ -39,7 +39,10 @@ object LinkCommand : BaseCommand() {
         Database.addLink(post.id, prNumber)
         logAction("linked pr #$prNumber to this channel")
 
-        manager.setTitle("${post.name} (PR #$prNumber)")
+        val titleFormat = prNumber.titleFormat()
+        if (!post.name.contains(titleFormat)) {
+            manager.setTitle("${post.name}$titleFormat")
+        }
 
         val tags = post.appliedTags
         if (tags.none { it.id == OPEN_PR_TAG }) {
@@ -81,6 +84,8 @@ object LinkCommand : BaseCommand() {
     }
 }
 
+private fun Int.titleFormat() = " (PR #$this)"
+
 object UnlinkCommand : BaseCommand() {
     override val name = "unlink"
 
@@ -103,7 +108,10 @@ object UnlinkCommand : BaseCommand() {
         Database.deleteLink(post.id)
         logAction("unlinked pr #$pr from this channel")
 
-        if (post.name.contains("(PR #")) manager.setTitle(post.name.split("(PR #")[0])
+        val titleFormat = pr.titleFormat()
+        if (post.name.contains(titleFormat)) {
+            manager.setTitle(post.name.replace(titleFormat, ""))
+        }
 
         val tags = post.appliedTags
         if (tags.any { it.id == OPEN_PR_TAG }) {

From fe49eb6ba813bda5320566ba6c2e4e3ac4e1c623 Mon Sep 17 00:00:00 2001
From: ILike2WatchMemes <ilike2watchmemes@gmail.com>
Date: Wed, 17 Sep 2025 15:25:49 +0200
Subject: [PATCH 11/12] actually link config

---
 .../at/hannibal2/skyhanni/discord/DiscordBot.kt     |  1 -
 .../skyhanni/discord/command/LinkCommands.kt        | 13 ++++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/DiscordBot.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/DiscordBot.kt
index 3a5a845..efa164e 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/DiscordBot.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/DiscordBot.kt
@@ -35,7 +35,6 @@ const val PARTY_FACE = "\uD83E\uDD73"
 const val BIG_X = "❌"
 const val CHECK_MARK = "✅"
 const val PING_HANNIBAL = "<@239858538959077376>"
-const val OPEN_PR_TAG = "1350893914768277624"
 
 fun main() {
     val bot = startBot()
diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt
index 3462757..e48da23 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt
@@ -1,6 +1,9 @@
 package at.hannibal2.skyhanni.discord.command
 
-import at.hannibal2.skyhanni.discord.*
+import at.hannibal2.skyhanni.discord.BOT
+import at.hannibal2.skyhanni.discord.Database
+import at.hannibal2.skyhanni.discord.Option
+import at.hannibal2.skyhanni.discord.PLEADING_FACE
 import at.hannibal2.skyhanni.discord.Utils.logAction
 import at.hannibal2.skyhanni.discord.Utils.reply
 import at.hannibal2.skyhanni.discord.Utils.userError
@@ -45,8 +48,8 @@ object LinkCommand : BaseCommand() {
         }
 
         val tags = post.appliedTags
-        if (tags.none { it.id == OPEN_PR_TAG }) {
-            val tag = post.parentChannel.asForumChannel().getAvailableTagById(OPEN_PR_TAG) ?: return
+        if (tags.none { it.id == BOT.config.openPrTagId }) {
+            val tag = post.parentChannel.asForumChannel().getAvailableTagById(BOT.config.openPrTagId) ?: return
             manager.setTags(tags + tag)
         }
 
@@ -114,8 +117,8 @@ object UnlinkCommand : BaseCommand() {
         }
 
         val tags = post.appliedTags
-        if (tags.any { it.id == OPEN_PR_TAG }) {
-            val tag = post.parentChannel.asForumChannel().getAvailableTagById(OPEN_PR_TAG) ?: return
+        if (tags.any { it.id == BOT.config.openPrTagId }) {
+            val tag = post.parentChannel.asForumChannel().getAvailableTagById(BOT.config.openPrTagId) ?: return
             manager.setTags(tags.filter { it != tag })
         }
 

From dd3d004085c1b9adf1f582745bbcabd196f8978c Mon Sep 17 00:00:00 2001
From: ILike2WatchMemes <ilike2watchmemes@gmail.com>
Date: Fri, 26 Sep 2025 23:24:32 +0200
Subject: [PATCH 12/12] merge

---
 .../skyhanni/discord/command/LinkCommands.kt  | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt
index e48da23..69aa825 100644
--- a/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt
+++ b/src/main/kotlin/at/hannibal2/skyhanni/discord/command/LinkCommands.kt
@@ -13,6 +13,8 @@ import at.hannibal2.skyhanni.discord.command.LinkCommand.setTitle
 import at.hannibal2.skyhanni.discord.command.PullRequestCommand.parseValidPrNumber
 import at.hannibal2.skyhanni.discord.github.GitHubClient
 import net.dv8tion.jda.api.entities.channel.ChannelType
+import net.dv8tion.jda.api.entities.channel.concrete.ForumChannel
+import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel
 import net.dv8tion.jda.api.entities.channel.forums.ForumTag
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent
 import net.dv8tion.jda.api.managers.channel.concrete.ThreadChannelManager
@@ -47,11 +49,7 @@ object LinkCommand : BaseCommand() {
             manager.setTitle("${post.name}$titleFormat")
         }
 
-        val tags = post.appliedTags
-        if (tags.none { it.id == BOT.config.openPrTagId }) {
-            val tag = post.parentChannel.asForumChannel().getAvailableTagById(BOT.config.openPrTagId) ?: return
-            manager.setTags(tags + tag)
-        }
+        post.updateTags(true)
 
         userSuccess("Successfully linked PR $prNumber to this post.")
     }
@@ -87,6 +85,14 @@ object LinkCommand : BaseCommand() {
     }
 }
 
+private fun ThreadChannel.updateTags(add: Boolean) {
+    val tags = appliedTags
+    val tag = parentChannel.asForumChannel().getAvailableTagById(BOT.config.openPrTagId) ?: return
+    if (add && tag !in tags) tags.add(tag) else if (!add && tag in tags) tags.remove(tag)
+
+    manager.setTags(tags)
+}
+
 private fun Int.titleFormat() = " (PR #$this)"
 
 object UnlinkCommand : BaseCommand() {
@@ -116,11 +122,7 @@ object UnlinkCommand : BaseCommand() {
             manager.setTitle(post.name.replace(titleFormat, ""))
         }
 
-        val tags = post.appliedTags
-        if (tags.any { it.id == BOT.config.openPrTagId }) {
-            val tag = post.parentChannel.asForumChannel().getAvailableTagById(BOT.config.openPrTagId) ?: return
-            manager.setTags(tags.filter { it != tag })
-        }
+        post.updateTags(false)
 
         userSuccess("Successfully unlinked this post.")
     }