From 399c43480f10d59b4c861225b59e80e78688db3d Mon Sep 17 00:00:00 2001 From: kraftwerk28 Date: Tue, 29 Jun 2021 19:04:23 +0300 Subject: [PATCH] Refine code --- .../spigot_tg_bridge/ApiService.kt | 24 -------- .../org/kraftwerk28/spigot_tg_bridge/TgBot.kt | 61 +++++++++++++------ 2 files changed, 42 insertions(+), 43 deletions(-) diff --git a/src/main/kotlin/org/kraftwerk28/spigot_tg_bridge/ApiService.kt b/src/main/kotlin/org/kraftwerk28/spigot_tg_bridge/ApiService.kt index 28d9e5d..abda980 100644 --- a/src/main/kotlin/org/kraftwerk28/spigot_tg_bridge/ApiService.kt +++ b/src/main/kotlin/org/kraftwerk28/spigot_tg_bridge/ApiService.kt @@ -1,12 +1,7 @@ package org.kraftwerk28.spigot_tg_bridge -import okhttp3.logging.HttpLoggingInterceptor -import okhttp3.OkHttpClient import com.google.gson.annotations.SerializedName as Name -import retrofit2.converter.gson.GsonConverterFactory import retrofit2.http.* -import java.time.Duration -import retrofit2.Retrofit interface TgApiService { data class TgResponse(val ok: Boolean, val result: T?, val description: String?) @@ -74,23 +69,4 @@ interface TgApiService { suspend fun setMyCommands( @Body commands: SetMyCommands, ): TgResponse - - companion object { - fun create(token: String): TgApiService { - val interceptor = HttpLoggingInterceptor().apply { - level = HttpLoggingInterceptor.Level.NONE; - } - val client = OkHttpClient - .Builder() - .addInterceptor(interceptor) - .readTimeout(Duration.ZERO) - .build(); - val r = Retrofit.Builder() - .baseUrl("https://api.telegram.org/bot$token/") - .client(client) - .addConverterFactory(GsonConverterFactory.create()) - .build() - return r.create(TgApiService::class.java) - } - } } diff --git a/src/main/kotlin/org/kraftwerk28/spigot_tg_bridge/TgBot.kt b/src/main/kotlin/org/kraftwerk28/spigot_tg_bridge/TgBot.kt index 85533ff..96bdf46 100644 --- a/src/main/kotlin/org/kraftwerk28/spigot_tg_bridge/TgBot.kt +++ b/src/main/kotlin/org/kraftwerk28/spigot_tg_bridge/TgBot.kt @@ -3,6 +3,11 @@ package org.kraftwerk28.spigot_tg_bridge import org.kraftwerk28.spigot_tg_bridge.Constants as C import kotlinx.coroutines.* import kotlinx.coroutines.channels.* +import okhttp3.OkHttpClient +import okhttp3.logging.HttpLoggingInterceptor +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory +import java.time.Duration class TgBot( private val plugin: Plugin, @@ -10,14 +15,15 @@ class TgBot( private val pollTimeout: Int = 30, ) { private val api: TgApiService - val updateChan = Channel() - val scope = CoroutineScope(Dispatchers.Default) - val pollJob: Job - val handlerJob: Job - var currentOffset: Long = -1 - var me: TgApiService.User - var commandRegex: Regex - val commandMap = config.commands.run { + private val client: OkHttpClient + private val updateChan = Channel() + private val scope = CoroutineScope(Dispatchers.Default) + private val pollJob: Job + private val handlerJob: Job + private var currentOffset: Long = -1 + private var me: TgApiService.User + private var commandRegex: Regex + private val commandMap = config.commands.run { mapOf( online to ::onlineHandler, time to ::timeHandler, @@ -26,14 +32,28 @@ class TgBot( } init { - api = TgApiService.create(config.botToken) + val interceptor = HttpLoggingInterceptor().apply { + level = HttpLoggingInterceptor.Level.NONE; + } + + client = OkHttpClient + .Builder() + .addInterceptor(interceptor) + .readTimeout(Duration.ZERO) + .build(); + + api = Retrofit.Builder() + .baseUrl("https://api.telegram.org/bot${config.botToken}/") + .client(client) + .addConverterFactory(GsonConverterFactory.create()) + .build() + .create(TgApiService::class.java) + runBlocking { me = api.getMe().result!! - // I don't put optional @username in regex since bot is - // only used in group chats + // I intentionally don't put optional @username in regex + // since bot is only used in group chats commandRegex = """^\/(\w+)(?:@${me.username})$""".toRegex() - - val commands = config.commands.run { listOf(time, online, chatID) } .zip(C.COMMAND_DESC.run { listOf(timeDesc, onlineDesc, chatIDDesc) @@ -41,8 +61,10 @@ class TgBot( .map { TgApiService.BotCommand(it.first!!, it.second) } .let { TgApiService.SetMyCommands(it) } + api.deleteWebhook(true) api.setMyCommands(commands) } + pollJob = scope.launch { try { while (true) { @@ -54,6 +76,7 @@ class TgBot( } } catch (e: CancellationException) {} } + handlerJob = scope.launch { try { while (true) { @@ -63,7 +86,7 @@ class TgBot( } } - suspend fun pollUpdates() { + private suspend fun pollUpdates() { val updatesResponse = api .getUpdates(offset = currentOffset, timeout = pollTimeout) updatesResponse.result?.let { updates -> @@ -74,7 +97,7 @@ class TgBot( } } - suspend fun handleUpdate() { + private suspend fun handleUpdate() { val update = updateChan.receive() update.message?.text?.let { println("Text: $it") @@ -85,6 +108,10 @@ class TgBot( } fun stop() { + client.run { + dispatcher.executorService.shutdown() + connectionPool.evictAll() + } runBlocking { pollJob.cancelAndJoin() handlerJob.cancelAndJoin() @@ -96,7 +123,6 @@ class TgBot( if (!config.allowedChats.contains(msg.chat.id)) { return } - if (plugin.server.worlds.isEmpty()) { api.sendMessage( msg.chat.id, @@ -105,7 +131,6 @@ class TgBot( ) return } - // TODO: handle multiple worlds val time = plugin.server.worlds.first().time val text = C.TIMES_OF_DAY.run { @@ -117,7 +142,6 @@ class TgBot( else -> "" } } + " ($time)" - api.sendMessage(msg.chat.id, text, replyToMessageId = msg.messageId) } @@ -126,7 +150,6 @@ class TgBot( if (!config.allowedChats.contains(msg.chat.id)) { return } - val playerList = plugin.server.onlinePlayers val playerStr = plugin.server .onlinePlayers