amalthea-mc/spigot-tg-bridge
1
0
Fork 0
mirror of https://github.com/amalthea-mc/spigot-tg-bridge.git synced 2024-11-12 13:41:05 +00:00
Code Issues Projects Releases Wiki Activity

feature: release 0.0.14

Browse Source 
Changelog:
  - fixed delayed plugin start (issue with long polling)
This commit is contained in:
kraftwerk28 2020-07-25 14:37:07 +03:00
parent 4a00808ab5
commit 5e52b18805
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/gradle.xml
View File

@ -8,6 +8,7 @@
<option name="testRunner" value="GRADLE" /> <option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="$PROJECT_DIR$/../../../../Program Files/Gradle/gradle-6.5.1" />
<option name="modules"> <option name="modules">
<set> <set>
<option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$" />

21
src/main/kotlin/org/kraftwerk28/spigot_tg_bridge/TgBot.kt
View File

@ -32,6 +32,7 @@ class TgBot(private val plugin: Plugin, private val config: Configuration) {
val slashRegex = "^/+".toRegex() val slashRegex = "^/+".toRegex()
val commands = config.commands val commands = config.commands
skipUpdates()
bot = bot { bot = bot {
token = config.botToken token = config.botToken
logLevel = HttpLoggingInterceptor.Level.NONE logLevel = HttpLoggingInterceptor.Level.NONE
@ -45,14 +46,13 @@ class TgBot(private val plugin: Plugin, private val config: Configuration) {
}.filterKeys { it != null } }.filterKeys { it != null }
dispatch { dispatch {
cmdBinding.forEach { text, handler -> cmdBinding.forEach { (text, handler) ->
command(text!!, handler as HandleUpdate) command(text!!.replace(slashRegex, ""), handler)
} }
text(null, ::onText) text(null, ::onText)
} }
} }
bot.setMyCommands(getBotCommands()) bot.setMyCommands(getBotCommands())
bot.skipUpdates()
config.webhookConfig?.let { _ -> config.webhookConfig?.let { _ ->
plugin.logger.info("Running in webhook mode.") plugin.logger.info("Running in webhook mode.")
@ -173,10 +173,21 @@ class TgBot(private val plugin: Plugin, private val config: Configuration) {
return cmdList.zip(descList).map { BotCommand(it.first, it.second) } return cmdList.zip(descList).map { BotCommand(it.first, it.second) }
} }
private fun skipUpdates() {
bot {
token = config.botToken
timeout = 0
}.skipUpdates()
}
companion object { companion object {
fun escapeHTML(s: String) = fun escapeHTML(s: String) = s
s.replace("&", "&amp;").replace(">", "&gt;").replace("<", "&lt;") .replace("&", "&amp;")
.replace(">", "&gt;")
.replace("<", "&lt;")
fun escapeColorCodes(s: String) = s.replace("\u00A7.".toRegex(), "") fun escapeColorCodes(s: String) = s.replace("\u00A7.".toRegex(), "")
fun fullEscape(s: String) = escapeColorCodes(escapeHTML(s)) fun fullEscape(s: String) = escapeColorCodes(escapeHTML(s))
} }
} }

2
src/main/resources/plugin.yml
View File

@ -1,5 +1,5 @@
name: SpigotTGBridge name: SpigotTGBridge
version: 0.0.13 version: 0.0.14
api-version: '1.15' api-version: '1.15'
main: org.kraftwerk28.spigot_tg_bridge.Plugin main: org.kraftwerk28.spigot_tg_bridge.Plugin
description: Telegram <-> Minecraft communication plugin for Spigot. description: Telegram <-> Minecraft communication plugin for Spigot.