Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Eyre-S committed Jul 18, 2024
1 parent ce40cd2 commit 1c06626
Show file tree
Hide file tree
Showing 15 changed files with 55 additions and 53 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,10 @@ dependencies {
modImplementation "com.kotori316:scalable-cats-force-fabric:3.0.0:dev"
modImplementation "net.fabricmc:fabric-language-kotlin:1.11.0+kotlin.2.0.0"

implementation include("com.github.pengrad:java-telegram-bot-api:7.7.0")
implementation include("cc.sukazyo:morny-system-lib:2.0.0-alpha20-SNAPSHOT")
implementation include("cc.sukazyo:da4a:0.1.0-SNAPSHOT")
implementation include("cc.sukazyo:resource-tools:0.3.1-SNAPSHOT")
implementation include("cc.sukazyo:da4a:0.2.0-SNAPSHOT")
implementation include("cc.sukazyo:resource-tools:0.3.1")
implementation include("io.circe:circe-core_3:0.14.9")
implementation include("io.circe:circe-generic_3:0.14.9")
implementation include("io.circe:circe-parser_3:0.14.9")
Expand All @@ -102,7 +103,6 @@ dependencies {
runtimeOnly include("cc.sukazyo:messiva:0.2.0")
runtimeOnly include("org.jline:jline:3.21.0")
runtimeOnly include("org.fusesource.jansi:jansi:2.4.0")
runtimeOnly include("com.github.pengrad:java-telegram-bot-api:6.2.0")
runtimeOnly include("com.squareup.okhttp3:okhttp:4.12.0")
runtimeOnly include("com.squareup.okio:okio:3.6.0")
runtimeOnly include("com.squareup.okio:okio-jvm:3.6.0")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents
import net.minecraft.server.MinecraftServer
import org.apache.logging.log4j.{Logger, LogManager}

import scala.compiletime.uninitialized

object ModMinecraftTelegram extends ModInitializer {

val MODID = "minecraft_telegram_connector"
Expand All @@ -18,26 +20,26 @@ object ModMinecraftTelegram extends ModInitializer {
given logger: Logger = LogManager.getLogger(NAME)
// TODO: there's bugs in resource-tools, disabled temporarily
val resources: ResourcePackage = ResourcePackage.get("minecraft_telegram_connector.mixins.json")
var SERVER: MinecraftServer = _
var SERVER: MinecraftServer = uninitialized

var bot: Bot = _
var config: Config = _
var bot: Bot = uninitialized
var config: Config = uninitialized

private object ServerStartingCallback extends ServerLifecycleEvents.ServerStarting {
override def onServerStarting(server: net.minecraft.server.MinecraftServer): Unit = {

ModMinecraftTelegram.SERVER = server
if !server.isDedicated then
logger warn "Server is NOT a dedicated server, will NOT RUN the telegram connector bot!"
logger warn s"This mod ($NAME) is ONLY AVAILABLE on a DEDICATED SERVER!!!"
logger `warn` "Server is NOT a dedicated server, will NOT RUN the telegram connector bot!"
logger `warn` s"This mod ($NAME) is ONLY AVAILABLE on a DEDICATED SERVER!!!"
return;

try {
bot = Bot(config.bot)
} catch case e: BotConfig.LoginFailedException =>
logger error "Failed to initialize to the Telegram Bot !"
logger errorExceptionSimple e
logger warn s"$NAME will NOT WORKS!!!"
logger `error` "Failed to initialize to the Telegram Bot !"
logger `errorExceptionSimple` e
logger `warn` s"$NAME will NOT WORKS!!!"

}
}
Expand All @@ -53,8 +55,8 @@ object ModMinecraftTelegram extends ModInitializer {

this.config = ConfigManager.read[Config]("config")

ServerLifecycleEvents.SERVER_STARTING register this.ServerStartingCallback
ServerLifecycleEvents.SERVER_STOPPING register this.ServerStoppingCallback
ServerLifecycleEvents.SERVER_STARTING `register` this.ServerStartingCallback
ServerLifecycleEvents.SERVER_STOPPING `register` this.ServerStoppingCallback

}

Expand Down
16 changes: 8 additions & 8 deletions src/main/scala/cc/sukazyo/minecraft_telegram/bot/Bot.scala
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ class Bot (config: BotConfig)(using logger: Logger) {

private object actionRunner extends ActionRunner

logger info s"Logged in to bot successfully : bot @${bot_user.username}[${bot_user.id}]"
logger `info` s"Logged in to bot successfully : bot @${bot_user.username}[${bot_user.id}]"

ServerMessageEvents.CHAT_MESSAGE register MinecraftChatMessageListener()
ServerMessageEvents.GAME_MESSAGE register MinecraftGameMessageListener()
ServerMessageEvents.COMMAND_MESSAGE register MinecraftCommandMessageListener()
ServerMessageEvents.CHAT_MESSAGE `register` MinecraftChatMessageListener()
ServerMessageEvents.GAME_MESSAGE `register` MinecraftGameMessageListener()
ServerMessageEvents.COMMAND_MESSAGE `register` MinecraftCommandMessageListener()
for (i <- MinecraftServerLifecycleListener() :: Nil)
ServerLifecycleEvents.SERVER_STARTED register i.ServerStarted
ServerLifecycleEvents.SERVER_STOPPED register i.ServerStopped
ServerLifecycleEvents.SERVER_STARTED `register` i.ServerStarted
ServerLifecycleEvents.SERVER_STOPPED `register` i.ServerStopped

eventManager += BotIgnoringOutdatedMessage()
eventManager += OnMinecraftCommandExecute()
Expand All @@ -41,13 +41,13 @@ class Bot (config: BotConfig)(using logger: Logger) {
def start (): Unit = {
account.setUpdatesListener(eventManager, eventManager.OnGetUpdateFailed)
actionRunner.start()
logger info "Started Telegram Listener"
logger `info` "Started Telegram Listener"
}

def shutdown (): Unit = {
account.removeGetUpdatesListener()
actionRunner.setDisabled()
logger info "Stopped Telegram bot"
logger `info` "Stopped Telegram bot"
}

def runs (func: ActionRunner.Action): Unit = {
Expand Down
12 changes: 6 additions & 6 deletions src/main/scala/cc/sukazyo/minecraft_telegram/bot/BotConfig.scala
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@ case class BotConfig (

for (i <- 1 to 3) {
try {
logger info s"Trying to login to bot... ($i/3)"
logger `info` s"Trying to login to bot... ($i/3)"
val aboutMe: GetMeResponse = GetMe().unsafeExecute
boundary break Right(aboutMe.user)
boundary `break` Right(aboutMe.user)
} catch case e: EventRuntimeException =>
logger error s"Failed to login to bot:"
logger errorExceptionSimple e
logger warn "Waiting for next try..."
Thread sleep 1000
logger `error` s"Failed to login to bot:"
logger `errorExceptionSimple` e
logger `warn` "Waiting for next try..."
Thread `sleep` 1000
}

Left(LoginFailedException())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ trait BotExt (using bot: Bot) {
override def sendMessage (message: Text): Unit = {

val plainMessage = message.getString
logger info message.getString
logger `info` message.getString

bot.runs { () =>
SendMessage(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class BotIgnoringOutdatedMessage (using bot: Bot)(using logger: Logger) extends
override def onMessage (using event: EventEnv): Unit = {

if event.update.message.date*1000L < bot.startEpochMillis then
logger debug "telegram message is cancelled"
logger `debug` "telegram message is cancelled"
event.setEventCanceled

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class OnMinecraftCommandExecute (using bot: Bot)(using logger: Logger) extends E

if message.chat.id != minecraftLinkedChat then return;
if message.text == null then return;
if !(message.text startsWith "//") then return;
if !(message.text `startsWith` "//") then return;

if !message.chat.memberHasPermission(message.from, ChatMember.Status.administrator) then
SendMessage(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ extends Thread(s"${ModMinecraftTelegram.NAME}/ActionRunner") {
executing = true
try elem.apply()
catch case e: Throwable =>
logger error "Failed to execute an bot action:"
logger errorExceptionSimple e
logger `error` "Failed to execute an bot action:"
logger `errorExceptionSimple` e
finally executing = false
} catch case e: NoSuchElementException => ()
if this.actionPool.isEmpty then
if disabled then
logger info s"ActionRunner is disabled with ${this.actionPool.size} remaining tasks"
logger `info` s"ActionRunner is disabled with ${this.actionPool.size} remaining tasks"
return;
try Thread.sleep(Long.MaxValue)
catch case e: InterruptedException => ()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cc.sukazyo.minecraft_telegram.bot.internal
import cc.sukazyo.cono.morny.system.telegram_api.event.{EventEnv, EventListener, EventRuntimeException}
import cc.sukazyo.minecraft_telegram.ModMinecraftTelegram.logger
import cc.sukazyo.minecraft_telegram.utils.Log4jExtension.LoggerExt
import cc.sukazyo.std.throwable
import cc.sukazyo.std.throwable.ThrowableExtensions
import com.google.gson.GsonBuilder
import com.pengrad.telegrambot.{ExceptionHandler, TelegramException, UpdatesListener}
import com.pengrad.telegrambot.model.Update
Expand All @@ -24,9 +24,9 @@ class UpdateManager extends UpdatesListener {
this.register(listener*)

private class EventRunner (using update: Update) extends Thread {
this setName s"upd-${update.updateId()}-nn"
this `setName` s"upd-${update.updateId()}-nn"
private def updateThreadName (t: String): Unit =
this setName s"upd-${update.updateId()}-$t"
this `setName` s"upd-${update.updateId()}-$t"

override def run (): Unit = {

Expand Down Expand Up @@ -78,15 +78,15 @@ class UpdateManager extends UpdatesListener {
} catch case e => {
val errorMessage = StringBuilder()
errorMessage ++= "Event throws unexpected exception:\n"
errorMessage ++= throwable.ThrowableExtensions(e).toLogString
errorMessage ++= e.toLogString
e match
case actionFailed: EventRuntimeException.ActionFailed =>
errorMessage ++= "\ntg-api action: response track: "
errorMessage ++= (GsonBuilder().setPrettyPrinting().create().toJson(
actionFailed.response
) indent 4) ++= "\n"
) `indent` 4) ++= "\n"
case _ =>
logger error errorMessage.toString
logger `error` errorMessage.toString
}
}

Expand All @@ -112,15 +112,15 @@ class UpdateManager extends UpdatesListener {

if (e.response != null) {
import com.google.gson.GsonBuilder
logger error
logger `error`
s"""Failed get updates: ${e.getMessage}
| server responses:
|${GsonBuilder().setPrettyPrinting().create.toJson(e.response) indent 4}
|${GsonBuilder().setPrettyPrinting().create.toJson(e.response) `indent` 4}
|""".stripMargin
}

logger error "Failed get updates from Telegram Server:"
logger errorExceptionSimple e
logger `error` "Failed get updates from Telegram Server:"
logger `errorExceptionSimple` e

}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class MinecraftChatMessageListener (using bot: Bot)(using logger: Logger) extend
override def onChatMessage (message: SignedMessage, sender: ServerPlayerEntity, params: MessageType.Parameters): Unit = {
bot.runs { () =>

logger debug "received chat message"
logger `debug` "received chat message"
val senderName = sender.getDisplayName.getString
val senderTag = s"<$senderName>"
val plainMessage = message.getContent.getString
Expand All @@ -25,7 +25,7 @@ class MinecraftChatMessageListener (using bot: Bot)(using logger: Logger) extend
s"$senderTag $plainMessage"
).entities(MessageEntity(MessageEntity.Type.bold, 0, senderTag.length))
.unsafeExecute
logger debug "synced chat message"
logger `debug` "synced chat message"

}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class MinecraftCommandMessageListener (using bot: Bot)(using logger: Logger) ext
override def onCommandMessage (message: SignedMessage, source: ServerCommandSource, params: MessageType.Parameters): Unit = {
bot.runs { () =>

logger debug "received command message"
logger `debug` "received command message"
val senderName = source.getDisplayName.getString
val senderTag = s"[$senderName]"
val plainMessage = message.getContent.getString
Expand All @@ -25,7 +25,7 @@ class MinecraftCommandMessageListener (using bot: Bot)(using logger: Logger) ext
s"$senderTag $plainMessage"
).entities(MessageEntity(MessageEntity.Type.bold, 0, senderTag.length))
.unsafeExecute
logger debug "synced command message"
logger `debug` "synced command message"

}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class MinecraftGameMessageListener (using bot: Bot)(using logger: Logger) extend
s"""${Prefixes.SERVER_MESSAGE}${message.getString}"""
).entities(MessageEntity(MessageEntity.Type.bold, 0, 1))
.unsafeExecute
logger debug "synced game message to telegram"
logger `debug` "synced game message to telegram"

}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class MinecraftServerLifecycleListener (using bot: Bot)(using logger: Logger) ex
|🟢 ${server.getServerName} Server Started!""".stripMargin
).parseMode(ParseMode.HTML)
.unsafeExecute
logger debug "synced server started state to telegram"
logger `debug` "synced server started state to telegram"
}
}

Expand All @@ -34,7 +34,7 @@ class MinecraftServerLifecycleListener (using bot: Bot)(using logger: Logger) ex
|🔴 ${server.getServerName} Server Stopped!""".stripMargin
).parseMode(ParseMode.HTML)
.unsafeExecute
logger debug "synced server stopped state to telegram"
logger `debug` "synced server stopped state to telegram"
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cc.sukazyo.minecraft_telegram.config

import cc.sukazyo.minecraft_telegram.config.ProxyConfig.ProxyType
import io.circe.{Codec, Decoder, HCursor, Json}
import io.circe.{Codec, HCursor, Json}
import io.circe.generic.semiauto.deriveCodec
import io.circe.Decoder.Result

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ object Log4jExtension {
implicit class LoggerExt (logger: Logger) {

def errorExceptionSimple (e: Throwable): Unit = {
logger error e.toString
logger `error` e.toString
var caused: Throwable = e.getCause
while (caused != null)
logger error s" - Caused by: ${caused.toString}"
logger `error` s" - Caused by: ${caused.toString}"
caused = caused.getCause
}

Expand Down

0 comments on commit 1c06626

Please sign in to comment.