Update to Trixnity 5 (#121)

Author: dfuchss

pom.xml

@@ -34,7 +34,6 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <main.class>org.fuchss.matrix.mensa.MainKt</main.class>
-        <matrix-bot-base.version>0.15.2</matrix-bot-base.version>
     </properties>
 
     <dependencyManagement>
@@ -61,7 +60,7 @@
         <dependency>
             <groupId>org.fuchss</groupId>
             <artifactId>matrix-bot-base</artifactId>
-            <version>${matrix-bot-base.version}</version>
+            <version>0.16.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
@@ -91,10 +90,6 @@
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-        </dependency>
     </dependencies>
 
     <repositories>

src/main/kotlin/org/fuchss/matrix/mensa/Config.kt

@@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.fasterxml.jackson.module.kotlin.registerKotlinModule
-import net.folivo.trixnity.core.model.RoomId
+import de.connect2x.trixnity.core.model.RoomId
 import org.fuchss.matrix.bots.IConfig
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory

src/main/kotlin/org/fuchss/matrix/mensa/Main.kt

@@ -2,18 +2,22 @@
 
 package org.fuchss.matrix.mensa
 
+import de.connect2x.lognity.api.backend.Backend
+import de.connect2x.lognity.backend.DefaultBackend
+import de.connect2x.trixnity.client.MatrixClient
+import de.connect2x.trixnity.client.create
+import de.connect2x.trixnity.clientserverapi.client.MatrixClientAuthProviderData
+import de.connect2x.trixnity.clientserverapi.client.classicLogin
+import de.connect2x.trixnity.clientserverapi.model.authentication.IdentifierType
 import io.ktor.http.Url
 import kotlinx.coroutines.runBlocking
-import net.folivo.trixnity.client.MatrixClient
-import net.folivo.trixnity.client.fromStore
-import net.folivo.trixnity.client.login
-import net.folivo.trixnity.clientserverapi.model.authentication.IdentifierType
 import org.fuchss.matrix.bots.MatrixBot
 import org.fuchss.matrix.bots.command.ChangeUsernameCommand
 import org.fuchss.matrix.bots.command.Command
 import org.fuchss.matrix.bots.command.HelpCommand
 import org.fuchss.matrix.bots.command.LogoutCommand
 import org.fuchss.matrix.bots.command.QuitCommand
+import org.fuchss.matrix.bots.helper.createCryptoDriverModule
 import org.fuchss.matrix.bots.helper.createMediaStoreModule
 import org.fuchss.matrix.bots.helper.createRepositoriesModule
 import org.fuchss.matrix.bots.helper.handleCommand
@@ -38,6 +42,8 @@ private val logger: Logger = LoggerFactory.getLogger(MatrixBot::class.java)
 private lateinit var commands: List<Command>
 
 fun main() {
+    Backend.set(DefaultBackend)
+
     runBlocking {
         val config = Config.load()
         val canteenApis: List<CanteenApi> = listOf(SwkaMensa(), MriMensa())
@@ -61,7 +67,7 @@ fun main() {
                 },
                 QuitCommand(config),
                 LogoutCommand(config),
-                ChangeUsernameCommand(),
+                ChangeUsernameCommand(config),
                 ShowCommand(canteenApis, translationService),
                 SubscribeCommand(config)
             )
@@ -89,22 +95,25 @@ fun main() {
 }
 
 private suspend fun getMatrixClient(config: Config): MatrixClient {
-    val existingMatrixClient = MatrixClient.fromStore(createRepositoriesModule(config), createMediaStoreModule(config)).getOrThrow()
+    val existingMatrixClient = MatrixClient.create(createRepositoriesModule(config), createMediaStoreModule(config), createCryptoDriverModule()).getOrNull()
     if (existingMatrixClient != null) {
         return existingMatrixClient
     }
 
     val matrixClient =
         MatrixClient
-            .login(
-                baseUrl = Url(config.baseUrl),
-                identifier = IdentifierType.User(config.username),
-                password = config.password,
-                repositoriesModule = createRepositoriesModule(config),
-                mediaStoreModule = createMediaStoreModule(config),
-                initialDeviceDisplayName = "${MatrixBot::class.java.`package`.name}-${Random.Default.nextInt()}"
+            .create(
+                createRepositoriesModule(config),
+                createMediaStoreModule(config),
+                createCryptoDriverModule(),
+                MatrixClientAuthProviderData
+                    .classicLogin(
+                        baseUrl = Url(config.baseUrl),
+                        identifier = IdentifierType.User(config.username),
+                        password = config.password,
+                        initialDeviceDisplayName = "${MatrixBot::class.java.`package`.name}-${Random.Default.nextInt()}"
+                    ).getOrThrow()
             ).getOrThrow()
-
     return matrixClient
 }
 

src/main/kotlin/org/fuchss/matrix/mensa/handler/CanteenFormatter.kt

@@ -1,6 +1,6 @@
 package org.fuchss.matrix.mensa.handler
 
-import net.folivo.trixnity.core.model.RoomId
+import de.connect2x.trixnity.core.model.RoomId
 import org.fuchss.matrix.bots.MatrixBot
 import org.fuchss.matrix.bots.markdown
 import org.fuchss.matrix.mensa.TranslationService

src/main/kotlin/org/fuchss/matrix/mensa/handler/command/ShowCommand.kt

@@ -1,10 +1,10 @@
 package org.fuchss.matrix.mensa.handler.command
 
-import net.folivo.trixnity.client.room.message.text
-import net.folivo.trixnity.core.model.EventId
-import net.folivo.trixnity.core.model.RoomId
-import net.folivo.trixnity.core.model.UserId
-import net.folivo.trixnity.core.model.events.m.room.RoomMessageEventContent
+import de.connect2x.trixnity.client.room.message.text
+import de.connect2x.trixnity.core.model.EventId
+import de.connect2x.trixnity.core.model.RoomId
+import de.connect2x.trixnity.core.model.UserId
+import de.connect2x.trixnity.core.model.events.m.room.RoomMessageEventContent
 import org.fuchss.matrix.bots.MatrixBot
 import org.fuchss.matrix.bots.command.Command
 import org.fuchss.matrix.mensa.TranslationService

src/main/kotlin/org/fuchss/matrix/mensa/handler/command/SubscribeCommand.kt

@@ -1,9 +1,9 @@
 package org.fuchss.matrix.mensa.handler.command
 
-import net.folivo.trixnity.core.model.EventId
-import net.folivo.trixnity.core.model.RoomId
-import net.folivo.trixnity.core.model.UserId
-import net.folivo.trixnity.core.model.events.m.room.RoomMessageEventContent
+import de.connect2x.trixnity.core.model.EventId
+import de.connect2x.trixnity.core.model.RoomId
+import de.connect2x.trixnity.core.model.UserId
+import de.connect2x.trixnity.core.model.events.m.room.RoomMessageEventContent
 import org.fuchss.matrix.bots.MatrixBot
 import org.fuchss.matrix.bots.command.Command
 import org.fuchss.matrix.bots.markdown