Fix eval command (#16)

- Reformat code
bankobotv14 · Jan 28, 2021 · 844af8f · 844af8f
1 parent 5326a96
commit 844af8f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,8 +8,7 @@ services:
       - "/etc/timezone:/etc/timezone:ro"
       - "/etc/localtime:/etc/localtime:ro"
       - ./logs:/user/app/logs
-      - ./.env:/usr/app/.env
-    env_file:
+    .env_file:
       - .env
     ports:
       - 127.0.0.1:8045:80
diff --git a/src/main/kotlin/de/nycode/bankobot/BankoBot.kt b/src/main/kotlin/de/nycode/bankobot/BankoBot.kt
@@ -126,8 +126,7 @@ object BankoBot : CoroutineScope {
                 .uuidRepresentation(UuidRepresentation.STANDARD)
                 .applyConnectionString(ConnectionString(Config.MONGO_URL))
                 .build()
-        )
-            .coroutine
+        ).coroutine
         database = client.getDatabase(Config.MONGO_DATABASE)
 
         repositories.blacklist = database.getCollection("blacklist")

diff --git a/src/main/kotlin/de/nycode/bankobot/commands/dev/EvalCommand.kt b/src/main/kotlin/de/nycode/bankobot/commands/dev/EvalCommand.kt
@@ -47,10 +47,11 @@ import kotlin.time.ExperimentalTime
 import kotlin.time.TimeMark
 import kotlin.time.TimeSource
 
-// Because we cannot opt in to kotlin experimental time
-// we need this wrapper
+/**
+ * Wrapper class to measure time in scripts
+ */
 @OptIn(ExperimentalTime::class)
-private class TimeMarker(private val start: TimeMark) {
+class TimeMarker(private val start: TimeMark) {
     private var end: Duration? = null
 
     @Suppress("unused") // Called in scripts
@@ -92,6 +93,7 @@ fun evalCommand() = command("ev") {
                     import de.nycode.bankobot.*
                     import de.nycode.bankobot.utils.*
                     import de.nycode.bankobot.command.*
+                    import de.nycode.bankobot.commands.dev.TimeMarker
                     import kotlinx.coroutines.runBlocking
 
                     timeMarker.markCompileEnd()

diff --git a/src/main/kotlin/de/nycode/bankobot/config/Config.kt b/src/main/kotlin/de/nycode/bankobot/config/Config.kt
@@ -37,9 +37,7 @@ import io.ktor.http.*
 object Config {
 
     val ENVIRONMENT: Environment by getEnv(default = Environment.PRODUCTION) {
-        Environment.valueOf(
-            it
-        )
+        Environment.valueOf(it)
     }
     val LOG_LEVEL: Level by getEnv(default = Level.INFO) { Level.toLevel(it) }