Skip to content

Commit fc99c46

Browse files
dfuchssdfuchss
committed
Update to Trixnity 5
1 parent c73d941 commit fc99c46

File tree

6 files changed

+35
-31
lines changed

6 files changed

+35
-31
lines changed

‎pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
<properties>
3535
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3636
<main.class>org.fuchss.matrix.mensa.MainKt</main.class>
37-
<matrix-bot-base.version>0.15.2</matrix-bot-base.version>
3837
</properties>
3938

4039
<dependencyManagement>
@@ -61,7 +60,7 @@
6160
<dependency>
6261
<groupId>org.fuchss</groupId>
6362
<artifactId>matrix-bot-base</artifactId>
64-
<version>${matrix-bot-base.version}</version>
63+
<version>0.16.0-SNAPSHOT</version>
6564
</dependency>
6665
<dependency>
6766
<groupId>org.jetbrains.kotlin</groupId>
@@ -91,10 +90,6 @@
9190
<version>${junit.version}</version>
9291
<scope>test</scope>
9392
</dependency>
94-
<dependency>
95-
<groupId>org.slf4j</groupId>
96-
<artifactId>slf4j-simple</artifactId>
97-
</dependency>
9893
</dependencies>
9994

10095
<repositories>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
55
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
66
import com.fasterxml.jackson.module.kotlin.readValue
77
import com.fasterxml.jackson.module.kotlin.registerKotlinModule
8-
import net.folivo.trixnity.core.model.RoomId
8+
import de.connect2x.trixnity.core.model.RoomId
99
import org.fuchss.matrix.bots.IConfig
1010
import org.slf4j.Logger
1111
import org.slf4j.LoggerFactory

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

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,22 @@
22

33
package org.fuchss.matrix.mensa
44

5+
import de.connect2x.lognity.api.backend.Backend
6+
import de.connect2x.lognity.backend.DefaultBackend
7+
import de.connect2x.trixnity.client.MatrixClient
8+
import de.connect2x.trixnity.client.create
9+
import de.connect2x.trixnity.clientserverapi.client.MatrixClientAuthProviderData
10+
import de.connect2x.trixnity.clientserverapi.client.classicLogin
11+
import de.connect2x.trixnity.clientserverapi.model.authentication.IdentifierType
512
import io.ktor.http.Url
613
import kotlinx.coroutines.runBlocking
7-
import net.folivo.trixnity.client.MatrixClient
8-
import net.folivo.trixnity.client.fromStore
9-
import net.folivo.trixnity.client.login
10-
import net.folivo.trixnity.clientserverapi.model.authentication.IdentifierType
1114
import org.fuchss.matrix.bots.MatrixBot
1215
import org.fuchss.matrix.bots.command.ChangeUsernameCommand
1316
import org.fuchss.matrix.bots.command.Command
1417
import org.fuchss.matrix.bots.command.HelpCommand
1518
import org.fuchss.matrix.bots.command.LogoutCommand
1619
import org.fuchss.matrix.bots.command.QuitCommand
20+
import org.fuchss.matrix.bots.helper.createCryptoDriverModule
1721
import org.fuchss.matrix.bots.helper.createMediaStoreModule
1822
import org.fuchss.matrix.bots.helper.createRepositoriesModule
1923
import org.fuchss.matrix.bots.helper.handleCommand
@@ -38,6 +42,8 @@ private val logger: Logger = LoggerFactory.getLogger(MatrixBot::class.java)
3842
private lateinit var commands: List<Command>
3943

4044
fun main() {
45+
Backend.set(DefaultBackend)
46+
4147
runBlocking {
4248
val config = Config.load()
4349
val canteenApis: List<CanteenApi> = listOf(SwkaMensa(), MriMensa())
@@ -61,7 +67,7 @@ fun main() {
6167
},
6268
QuitCommand(config),
6369
LogoutCommand(config),
64-
ChangeUsernameCommand(),
70+
ChangeUsernameCommand(config),
6571
ShowCommand(canteenApis, translationService),
6672
SubscribeCommand(config)
6773
)
@@ -89,22 +95,25 @@ fun main() {
8995
}
9096

9197
private suspend fun getMatrixClient(config: Config): MatrixClient {
92-
val existingMatrixClient = MatrixClient.fromStore(createRepositoriesModule(config), createMediaStoreModule(config)).getOrThrow()
98+
val existingMatrixClient = MatrixClient.create(createRepositoriesModule(config), createMediaStoreModule(config), createCryptoDriverModule()).getOrNull()
9399
if (existingMatrixClient != null) {
94100
return existingMatrixClient
95101
}
96102

97103
val matrixClient =
98104
MatrixClient
99-
.login(
100-
baseUrl = Url(config.baseUrl),
101-
identifier = IdentifierType.User(config.username),
102-
password = config.password,
103-
repositoriesModule = createRepositoriesModule(config),
104-
mediaStoreModule = createMediaStoreModule(config),
105-
initialDeviceDisplayName = "${MatrixBot::class.java.`package`.name}-${Random.Default.nextInt()}"
105+
.create(
106+
createRepositoriesModule(config),
107+
createMediaStoreModule(config),
108+
createCryptoDriverModule(),
109+
MatrixClientAuthProviderData
110+
.classicLogin(
111+
baseUrl = Url(config.baseUrl),
112+
identifier = IdentifierType.User(config.username),
113+
password = config.password,
114+
initialDeviceDisplayName = "${MatrixBot::class.java.`package`.name}-${Random.Default.nextInt()}"
115+
).getOrThrow()
106116
).getOrThrow()
107-
108117
return matrixClient
109118
}
110119

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.fuchss.matrix.mensa.handler
22

3-
import net.folivo.trixnity.core.model.RoomId
3+
import de.connect2x.trixnity.core.model.RoomId
44
import org.fuchss.matrix.bots.MatrixBot
55
import org.fuchss.matrix.bots.markdown
66
import org.fuchss.matrix.mensa.TranslationService

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package org.fuchss.matrix.mensa.handler.command
22

3-
import net.folivo.trixnity.client.room.message.text
4-
import net.folivo.trixnity.core.model.EventId
5-
import net.folivo.trixnity.core.model.RoomId
6-
import net.folivo.trixnity.core.model.UserId
7-
import net.folivo.trixnity.core.model.events.m.room.RoomMessageEventContent
3+
import de.connect2x.trixnity.client.room.message.text
4+
import de.connect2x.trixnity.core.model.EventId
5+
import de.connect2x.trixnity.core.model.RoomId
6+
import de.connect2x.trixnity.core.model.UserId
7+
import de.connect2x.trixnity.core.model.events.m.room.RoomMessageEventContent
88
import org.fuchss.matrix.bots.MatrixBot
99
import org.fuchss.matrix.bots.command.Command
1010
import org.fuchss.matrix.mensa.TranslationService

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.fuchss.matrix.mensa.handler.command
22

3-
import net.folivo.trixnity.core.model.EventId
4-
import net.folivo.trixnity.core.model.RoomId
5-
import net.folivo.trixnity.core.model.UserId
6-
import net.folivo.trixnity.core.model.events.m.room.RoomMessageEventContent
3+
import de.connect2x.trixnity.core.model.EventId
4+
import de.connect2x.trixnity.core.model.RoomId
5+
import de.connect2x.trixnity.core.model.UserId
6+
import de.connect2x.trixnity.core.model.events.m.room.RoomMessageEventContent
77
import org.fuchss.matrix.bots.MatrixBot
88
import org.fuchss.matrix.bots.command.Command
99
import org.fuchss.matrix.bots.markdown

0 commit comments

Comments
 (0)