Merge pull request #21 from kraftwerk28/ign-auth

Basic IGNAuth implementation (still not ready) + stability fixes

Author: kraftwerk28

src/main/kotlin/org/kraftwerk28/spigot_tg_bridge/AsyncJavaPlugin.kt

@@ -0,0 +1,31 @@
+package org.kraftwerk28.spigot_tg_bridge
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancelAndJoin
+import org.bukkit.plugin.java.JavaPlugin
+
+open class AsyncJavaPlugin : JavaPlugin() {
+    private val scope = CoroutineScope(Dispatchers.Default)
+
+    override fun onEnable() {
+        runBlocking { onEnableAsync() }
+    }
+
+    override fun onDisable() {
+        runBlocking {
+            onDisableAsync()
+            scope.coroutineContext[Job]?.cancelAndJoin()
+        }
+    }
+
+    open suspend fun onEnableAsync() = Unit
+
+    open suspend fun onDisableAsync() = Unit
+
+    fun <T> launch(f: suspend () -> T) = scope.launch { f() }
+}

src/main/kotlin/org/kraftwerk28/spigot_tg_bridge/BotCommands.kt

@@ -6,12 +6,16 @@ class BotCommands(cfg: FileConfiguration) {
     val time: String?
     val online: String?
     val chatID: String?
+    val linkIgn: String?
+    val getAllLinked: String?
 
     init {
         cfg.run {
             time = getString("commands.time")
             online = getString("commands.online")
             chatID = getString("commands.chat_id")
+            linkIgn = getString("commands.link_ign")
+            getAllLinked = getString("commands.list_linked")
         }
     }
 }

src/main/kotlin/org/kraftwerk28/spigot_tg_bridge/CommandHandler.kt

@@ -16,7 +16,7 @@ class CommandHandler(private val plugin: Plugin) : CommandExecutor {
         if (sender !is ConsoleCommandSender) return false
         return when (label) {
             C.COMMANDS.PLUGIN_RELOAD -> {
-                plugin.reload()
+                plugin.launch { plugin.reload() }
                 true
             }
             else -> false

src/main/kotlin/org/kraftwerk28/spigot_tg_bridge/Configuration.kt

@@ -17,13 +17,15 @@ class Configuration(plugin: Plugin) {
     val logPlayerAsleep: Boolean
     val onlineString: String
     val nobodyOnlineString: String
+    val enableIgnAuth: Boolean
 
     // Telegram bot stuff
     val botToken: String
     val allowedChats: List<Long>
     val logFromTGtoMC: Boolean
     val allowWebhook: Boolean
     val webhookConfig: Map<String, Any>?
+    val pollTimeout: Int
 
     var commands: BotCommands
 
@@ -78,10 +80,14 @@ class Configuration(plugin: Plugin) {
             )!!
             // isEnabled = getBoolean("enable", true)
             allowedChats = getLongList("chats")
+            enableIgnAuth = getBoolean("enableIgnAuth", false)
+
             botToken = getString("botToken") ?: throw Exception(C.WARN.noToken)
             allowWebhook = getBoolean("useWebhook", false)
             @Suppress("unchecked_cast")
             webhookConfig = get("webhookConfig") as Map<String, Any>?
+            pollTimeout = getInt("pollTimeout", 30)
+
             logJoinLeave = getBoolean("logJoinLeave", false)
             onlineString = getString("strings.online", "Online")!!
             nobodyOnlineString = getString(

src/main/kotlin/org/kraftwerk28/spigot_tg_bridge/Constants.kt

@@ -8,7 +8,7 @@ object Constants {
         const val noUsername = "Bot username must be defined."
     }
     object INFO {
-        const val reloading = "Reloading plugin... This may take some time."
+        const val reloading = "Reloading..."
         const val reloadComplete = "Reload completed."
     }
     object TIMES_OF_DAY {

src/main/kotlin/org/kraftwerk28/spigot_tg_bridge/Entities.kt

@@ -0,0 +1,59 @@
+package org.kraftwerk28.spigot_tg_bridge
+
+import java.sql.Date
+import com.google.gson.annotations.SerializedName as Name
+
+data class TgResponse<T>(
+    val ok: Boolean,
+    val result: T?,
+    val description: String?,
+)
+
+data class WebhookOptions(val drop_pending_updates: Boolean)
+
+data class User(
+    @Name("id") val id: Long,
+    @Name("is_bot") val isBot: Boolean,
+    @Name("first_name") val firstName: String,
+    @Name("last_name") val lastName: String? = null,
+    @Name("username") val username: String? = null,
+    @Name("language_code") val languageCode: String? = null,
+)
+
+data class Chat(
+    val id: Long,
+    val type: String,
+    val title: String? = null,
+    val username: String? = null,
+    @Name("first_name") val firstName: String? = null,
+    @Name("last_name") val lastName: String? = null,
+)
+
+data class Message(
+    @Name("message_id") val messageId: Long,
+    val from: User? = null,
+    @Name("sender_chat") val senderChat: Chat? = null,
+    val date: Long,
+    val chat: Chat,
+    @Name("reply_to_message") val replyToMessage: Message? = null,
+    val text: String? = null,
+)
+
+data class Update(
+    @Name("update_id") val updateId: Long,
+    val message: Message? = null,
+)
+
+data class BotCommand(val command: String, val description: String)
+
+data class SetMyCommands(val commands: List<BotCommand>)
+
+data class DbLinkedUser(
+    val tgId: Long,
+    val tgFirstName: String,
+    val tgLastName: String?,
+    val tgUsername: String?,
+    val minecraftUuid: String,
+    val minecraftUsername: String,
+    val createdTimestamp: Date,
+)

src/main/kotlin/org/kraftwerk28/spigot_tg_bridge/EventHandler.kt

@@ -9,15 +9,16 @@ import org.bukkit.event.player.PlayerJoinEvent
 import org.bukkit.event.player.PlayerQuitEvent
 
 class EventHandler(
+    private val plugin: Plugin,
+    private val config: Configuration,
     private val tgBot: TgBot,
-    private val config: Configuration
 ) : Listener {
 
     @EventHandler
     fun onPlayerChat(event: AsyncPlayerChatEvent) {
         if (!config.logFromMCtoTG) return
         event.run {
-            tgBot.sendMessageToTelegram(message, player.displayName)
+            sendMessage(message, player.displayName)
         }
     }
 
@@ -26,15 +27,15 @@ class EventHandler(
         if (!config.logJoinLeave) return
         val username = event.player.displayName.fullEscape()
         val text = config.joinString.replace("%username%", username)
-        tgBot.sendMessageToTelegram(text)
+        sendMessage(text)
     }
 
     @EventHandler
     fun onPlayerLeave(event: PlayerQuitEvent) {
         if (!config.logJoinLeave) return
         val username = event.player.displayName.fullEscape()
         val text = config.leaveString.replace("%username%", username)
-        tgBot.sendMessageToTelegram(text)
+        sendMessage(text)
     }
 
     @EventHandler
@@ -43,7 +44,7 @@ class EventHandler(
         event.deathMessage?.let {
             val username = event.entity.displayName.fullEscape()
             val text = it.replace(username, "<i>$username</i>")
-            tgBot.sendMessageToTelegram(text)
+            sendMessage(text)
         }
     }
 
@@ -53,6 +54,12 @@ class EventHandler(
         if (event.bedEnterResult != PlayerBedEnterEvent.BedEnterResult.OK)
             return
         val text = "<i>${event.player.displayName}</i> fell asleep."
-        tgBot.sendMessageToTelegram(text)
+        sendMessage(text)
+    }
+
+    private fun sendMessage(text: String, username: String? = null) {
+        plugin.launch {
+            tgBot.sendMessageToTelegram(text, username)
+        }
     }
 }

src/main/kotlin/org/kraftwerk28/spigot_tg_bridge/IgnAuth.kt

@@ -0,0 +1,90 @@
+package org.kraftwerk28.spigot_tg_bridge
+
+import java.sql.Connection
+import java.sql.DriverManager
+import java.sql.SQLException
+
+const val INIT_DB_QUERY = """
+create table if not exists user (
+    tg_id bigint not null primary key,
+    tg_username varchar,
+    tg_first_name varchar not null,
+    tg_last_name varchar,
+    mc_username varchar,
+    mc_uuid varchar,
+    linked_timestamp datetime default current_timestamp
+);
+"""
+
+class IgnAuth(
+    fileName: String,
+    val plugin: Plugin,
+    var conn: Connection? = null,
+) {
+    init {
+        plugin.launch {
+            initializeConnection(fileName)
+        }
+    }
+
+    suspend fun initializeConnection(fileName: String) = try {
+        DriverManager.getConnection("jdbc:sqlite:$fileName").apply {
+            createStatement().execute(INIT_DB_QUERY)
+        }.also {
+            conn = it
+        }
+    } catch (e: SQLException) {
+        plugin.logger.info(e.message)
+    }
+
+    suspend fun close() = conn?.run {
+        close()
+    }
+
+    suspend fun linkUser(
+        tgId: Long,
+        tgUsername: String? = null,
+        tgFirstName: String,
+        tgLastName: String? = null,
+        minecraftUsername: String?,
+        minecraftUuid: String,
+    ): Boolean = conn?.stmt(
+        """
+        insert into user (
+            tg_id,
+            tg_username,
+            tg_first_name,
+            tg_last_name,
+            mc_uuid,
+            mc_username,
+        )
+        values (?, ?, ?, ?, ?, ?)
+        """,
+        tgId,
+        tgUsername,
+        tgFirstName,
+        tgLastName,
+        minecraftUuid,
+        minecraftUsername,
+    )?.run {
+        execute()
+    } ?: false
+
+    suspend fun getLinkedUserByIgn(ign: String) =
+        conn?.stmt("select * from user where mc_uuid = ?", ign)?.first {
+            toLinkedUser()
+        }
+
+    suspend fun getLinkedUserByTgId(id: Long) =
+        conn?.stmt("select * from user where tg_id = ?", id)?.first {
+            toLinkedUser()
+        }
+
+    suspend fun unlinkUserByTgId(id: Long) =
+        conn?.stmt("delete from user where tg_id = ?", id)?.run {
+            executeUpdate() > 0
+        }
+
+    suspend fun getAllLinkedUsers() =
+        conn?.stmt("select * from user")?.map { toLinkedUser() }
+}