🔖 2.1.3 - enforce expires_at

Author: acrylic-style

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "net.azisaba"
-version = "2.1.2"
+version = "2.1.3"
 
 repositories {
     mavenCentral()

src/main/kotlin/net/azisaba/guildchatdiscord/commands/LinkCommand.kt

@@ -41,18 +41,18 @@ object LinkCommand : CommandHandler {
             defer.respond { content = "コードが無効です。" }
             return
         }
-        val discordId = DatabaseManager.query("SELECT `discord_id` FROM `users` WHERE `link_code` = ?") { stmt ->
+        val discordIdAndExpiresAt = DatabaseManager.query("SELECT `discord_id`, `expires_at` FROM `users` WHERE `link_code` = ?") { stmt ->
             stmt.setString(1, code)
             stmt.executeQuery().use { rs ->
                 if (rs.next()) {
-                    rs.getLong("discord_id")
+                    Pair(rs.getLong("discord_id"), rs.getLong("expires_at"))
                 } else {
-                    -1L
+                    Pair(-1L, 0L)
                 }
             }
         }
-        if (discordId != -1L) {
-            // already linked
+        if (discordIdAndExpiresAt.first != -1L || discordIdAndExpiresAt.second < System.currentTimeMillis()) {
+            // already linked or expired
             defer.respond { content = "コードが無効です。" }
             return
         }

src/main/kotlin/net/azisaba/guildchatdiscord/util/DatabaseManager.kt

@@ -20,6 +20,7 @@ object DatabaseManager {
                 `minecraft_uuid` VARCHAR(36) NOT NULL UNIQUE,
                 `minecraft_name` VARCHAR(16) NOT NULL,
                 `link_code` VARCHAR(8) NOT NULL UNIQUE,
+                `expires_at` BIGINT NOT NULL DEFAULT 0,
                 PRIMARY KEY (`id`)
             )
         """.trimIndent()) { it.executeUpdate() }