libquassel-api/src/main/kotlin/de/justjanne/libquassel/protocol/api/dispatcher/SyncHandler.kt

@@ -18,7 +18,7 @@ class SyncHandler @Inject constructor(
   private val dispatchers: Map<String, @JvmSuppressWildcards SyncDispatcher>,
 ) {
   @Throws(RpcInvocationFailedException::class)
-  fun invoke(className: String, objectName: ObjectName, method: String, params: QVariantList) {
+  suspend fun invoke(className: String, objectName: ObjectName, method: String, params: QVariantList) {
     dispatchers[className]?.invoke(objectName, method, params)
       ?: throw RpcInvocationFailedException.InvokerNotFoundException(className)
   }

libquassel-api/src/main/kotlin/de/justjanne/libquassel/protocol/api/dto/AliasManagerDto.kt

+/*
+ * libquassel
+ * Copyright (c) 2025 Janne Mareike Koschinski
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+package de.justjanne.libquassel.protocol.api.dto
+
+import de.justjanne.libquassel.protocol.models.QStringList
+import de.justjanne.libquassel.protocol.models.types.QtType
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.into
+import de.justjanne.libquassel.protocol.variant.qVariant
+
+data class AliasManagerDto(
+  val aliases: AliasesDto
+) {
+  data class AliasesDto(
+    val names: List<String?>,
+    val expansions: List<String?>
+  ) {
+    fun serialize(): QVariantMap = mapOf(
+      "names" to qVariant(names, QtType.QStringList),
+      "expansions" to qVariant(expansions, QtType.QStringList)
+    )
+
+    companion object {
+      fun deserialize(data: QVariantMap) = AliasesDto(
+        names = data["names"].into<QStringList>().orEmpty(),
+        expansions = data["expansions"].into<QStringList>().orEmpty(),
+      )
+    }
+  }
+
+  fun serialize(): QVariantMap = mapOf(
+    "Aliases" to qVariant(aliases.serialize(), QtType.QVariantMap)
+  )
+
+  companion object {
+    fun deserialize(data: QVariantMap) = AliasManagerDto(
+      aliases = data["Aliases"].into<QVariantMap>().orEmpty().let(AliasesDto::deserialize)
+    )
+  }
+}

libquassel-api/src/main/kotlin/de/justjanne/libquassel/protocol/api/server/AliasManagerServerApi.kt

@@ -13,18 +13,21 @@ import de.justjanne.libquassel.annotations.ProtocolSide
 import de.justjanne.libquassel.annotations.RpcApi
 import de.justjanne.libquassel.annotations.RpcParam
 import de.justjanne.libquassel.annotations.RpcCall
+import de.justjanne.libquassel.protocol.api.dto.AliasManagerDto
 import de.justjanne.libquassel.protocol.variant.QVariantMap
 
 @RpcApi("AliasManager", side = ProtocolSide.CLIENT)
 interface AliasManagerServerApi {
   @RpcCall("addAlias")
-  fun addAlias(
+  suspend fun addAlias(
     @RpcParam.QString name: String,
     @RpcParam.QString expansion: String
   )
 
   @RpcCall("requestUpdate")
-  fun requestUpdate(
+  suspend fun requestUpdate(
     @RpcParam.QVariantMap properties: QVariantMap
   )
+
+  suspend fun requestUpdate(properties: AliasManagerDto) = requestUpdate(properties.serialize())
 }

libquassel-api/src/main/kotlin/de/justjanne/libquassel/protocol/api/server/BacklogManagerServerApi.kt

@@ -28,7 +28,7 @@ interface BacklogManagerServerApi {
    * [additional] messages will be loaded before [last].
    */
   @RpcCall("requestBacklog")
-  fun requestBacklog(
+  suspend fun requestBacklog(
     @RpcParam.UserType.BufferId bufferId: BufferId,
     @RpcParam.UserType.MsgId first: MsgId = MsgId(-1),
     @RpcParam.UserType.MsgId last: MsgId = MsgId(-1),
@@ -48,7 +48,7 @@ interface BacklogManagerServerApi {
    * Only messages matching [type] and [flags] will be returned and counted.
    */
   @RpcCall("requestBacklogFiltered")
-  fun requestBacklogFiltered(
+  suspend fun requestBacklogFiltered(
     @RpcParam.UserType.BufferId bufferId: BufferId,
     @RpcParam.UserType.MsgId first: MsgId = MsgId(-1),
     @RpcParam.UserType.MsgId last: MsgId = MsgId(-1),
@@ -67,7 +67,7 @@ interface BacklogManagerServerApi {
    * Only messages matching [type] and [flags] will be returned and counted.
    */
   @RpcCall("requestBacklogForward")
-  fun requestBacklogForward(
+  suspend fun requestBacklogForward(
     @RpcParam.UserType.BufferId bufferId: BufferId,
     @RpcParam.UserType.MsgId first: MsgId = MsgId(-1),
     @RpcParam.UserType.MsgId last: MsgId = MsgId(-1),
@@ -86,7 +86,7 @@ interface BacklogManagerServerApi {
    * [additional] messages will be loaded before [last].
    */
   @RpcCall("requestBacklogAll")
-  fun requestBacklogAll(
+  suspend fun requestBacklogAll(
     @RpcParam.UserType.MsgId first: MsgId = MsgId(-1),
     @RpcParam.UserType.MsgId last: MsgId = MsgId(-1),
     @RpcParam.Int limit: Int = -1,
@@ -105,7 +105,7 @@ interface BacklogManagerServerApi {
    * Only messages matching [type] and [flags] will be returned and counted.
    */
   @RpcCall("requestBacklogAllFiltered")
-  fun requestBacklogAllFiltered(
+  suspend fun requestBacklogAllFiltered(
     @RpcParam.UserType.MsgId first: MsgId = MsgId(-1),
     @RpcParam.UserType.MsgId last: MsgId = MsgId(-1),
     @RpcParam.Int limit: Int = -1,

libquassel-api/src/main/kotlin/de/justjanne/libquassel/protocol/api/server/BufferSyncerServerApi.kt

@@ -20,38 +20,38 @@ import de.justjanne.libquassel.protocol.variant.QVariantMap
 @RpcApi("BufferSyncer", side = ProtocolSide.CLIENT)
 interface BufferSyncerServerApi {
   @RpcCall("requestMarkBufferAsRead")
-  fun requestMarkBufferAsRead(@RpcParam.UserType.BufferId buffer: BufferId)
+  suspend fun requestMarkBufferAsRead(@RpcParam.UserType.BufferId buffer: BufferId)
 
   @RpcCall("requestMergeBuffersPermanently")
-  fun requestMergeBuffersPermanently(
+  suspend fun requestMergeBuffersPermanently(
     @RpcParam.UserType.BufferId buffer: BufferId,
     @RpcParam.UserType.BufferId buffer2: BufferId
   )
 
   @RpcCall("requestRemoveBuffer")
-  fun requestRemoveBuffer(@RpcParam.UserType.BufferId buffer: BufferId)
+  suspend fun requestRemoveBuffer(@RpcParam.UserType.BufferId buffer: BufferId)
 
   @RpcCall("requestRenameBuffer")
-  fun requestRenameBuffer(
+  suspend fun requestRenameBuffer(
     @RpcParam.UserType.BufferId buffer: BufferId,
     @RpcParam.QString newName: String
   )
 
   @RpcCall("requestSetLastSeenMsg")
-  fun requestSetLastSeenMsg(
+  suspend fun requestSetLastSeenMsg(
     @RpcParam.UserType.BufferId buffer: BufferId,
     @RpcParam.UserType.MsgId msgId: MsgId
   )
 
   @RpcCall("requestSetMarkerLine")
-  fun requestSetMarkerLine(
+  suspend fun requestSetMarkerLine(
     @RpcParam.UserType.BufferId buffer: BufferId,
     @RpcParam.UserType.MsgId msgId: MsgId
   )
 
   @RpcCall("requestPurgeBufferIds")
-  fun requestPurgeBufferIds()
+  suspend fun requestPurgeBufferIds()
 
   @RpcCall("requestUpdate")
-  fun requestUpdate(@RpcParam.QVariantMap properties: QVariantMap)
+  suspend fun requestUpdate(@RpcParam.QVariantMap properties: QVariantMap)
 }

libquassel-api/src/main/kotlin/de/justjanne/libquassel/protocol/api/server/BufferViewConfigServerApi.kt

@@ -20,20 +20,20 @@ import de.justjanne.libquassel.protocol.variant.QVariantMap
 @RpcApi("BufferViewConfig", side = ProtocolSide.CLIENT)
 interface BufferViewConfigServerApi {
   @RpcCall("requestAddBuffer")
-  fun requestAddBuffer(objectName: ObjectName, @RpcParam.UserType.BufferId buffer: BufferId, @RpcParam.Int pos: Int)
+  suspend fun requestAddBuffer(objectName: ObjectName, @RpcParam.UserType.BufferId buffer: BufferId, @RpcParam.Int pos: Int)
 
   @RpcCall("requestMoveBuffer")
-  fun requestMoveBuffer(objectName: ObjectName, @RpcParam.UserType.BufferId buffer: BufferId, @RpcParam.Int pos: Int)
+  suspend fun requestMoveBuffer(objectName: ObjectName, @RpcParam.UserType.BufferId buffer: BufferId, @RpcParam.Int pos: Int)
 
   @RpcCall("requestRemoveBuffer")
-  fun requestHideBuffer(objectName: ObjectName, @RpcParam.UserType.BufferId buffer: BufferId)
+  suspend fun requestHideBuffer(objectName: ObjectName, @RpcParam.UserType.BufferId buffer: BufferId)
 
   @RpcCall("requestRemoveBufferPermanently")
-  fun requestRemoveBuffer(objectName: ObjectName, @RpcParam.UserType.BufferId buffer: BufferId)
+  suspend fun requestRemoveBuffer(objectName: ObjectName, @RpcParam.UserType.BufferId buffer: BufferId)
 
   @RpcCall("requestSetBufferViewName")
-  fun requestSetBufferViewName(objectName: ObjectName, @RpcParam.QString value: String)
+  suspend fun requestSetBufferViewName(objectName: ObjectName, @RpcParam.QString value: String)
 
   @RpcCall("requestUpdate")
-  fun requestUpdate(objectName: ObjectName, @RpcParam.QVariantMap properties: QVariantMap)
+  suspend fun requestUpdate(objectName: ObjectName, @RpcParam.QVariantMap properties: QVariantMap)
 }

libquassel-api/src/main/kotlin/de/justjanne/libquassel/protocol/api/server/BufferViewManagerServerApi.kt

@@ -19,12 +19,12 @@ import de.justjanne.libquassel.protocol.variant.QVariantMap
 @RpcApi("BufferViewManager", side = ProtocolSide.CLIENT)
 interface BufferViewManagerServerApi {
   @RpcCall("requestCreateBufferView")
-  fun requestCreateBufferView(@RpcParam.QVariantMap properties: QVariantMap)
+  suspend fun requestCreateBufferView(@RpcParam.QVariantMap properties: QVariantMap)
 
   @RpcCall("requestCreateBufferViews")
-  fun requestCreateBufferViews(@RpcParam.QVariantList properties: QVariantList)
+  suspend fun requestCreateBufferViews(@RpcParam.QVariantList properties: QVariantList)
 
   @RpcCall("requestDeleteBufferView")
-  fun requestDeleteBufferView(@RpcParam.Int bufferViewConfigId: Int)
+  suspend fun requestDeleteBufferView(@RpcParam.Int bufferViewConfigId: Int)
 }
 

libquassel-api/src/main/kotlin/de/justjanne/libquassel/protocol/api/server/CertManagerServerApi.kt

@@ -19,5 +19,5 @@ import de.justjanne.libquassel.protocol.variant.QVariantMap
 @RpcApi("CertManager", side = ProtocolSide.CLIENT)
 interface CertManagerServerApi {
   @RpcCall("requestUpdate")
-  fun requestUpdate(objectName: ObjectName, @RpcParam.QVariantMap properties: QVariantMap)
+  suspend fun requestUpdate(objectName: ObjectName, @RpcParam.QVariantMap properties: QVariantMap)
 }

libquassel-api/src/main/kotlin/de/justjanne/libquassel/protocol/api/server/HighlightRuleManagerServerApi.kt

@@ -17,13 +17,13 @@ import de.justjanne.libquassel.annotations.RpcParam
 @RpcApi("HighlightRuleManager", side = ProtocolSide.CLIENT)
 interface HighlightRuleManagerServerApi {
   @RpcCall("requestRemoveHighlightRule")
-  fun requestRemoveHighlightRule(@RpcParam.Int highlightRule: Int)
+  suspend fun requestRemoveHighlightRule(@RpcParam.Int highlightRule: Int)
 
   @RpcCall("requestToggleHighlightRule")
-  fun requestToggleHighlightRule(@RpcParam.Int highlightRule: Int)
+  suspend fun requestToggleHighlightRule(@RpcParam.Int highlightRule: Int)
 
   @RpcCall("requestAddHighlightRule")
-  fun requestAddHighlightRule(
+  suspend fun requestAddHighlightRule(
     @RpcParam.Int id: Int,
     @RpcParam.QString content: String?,
     @RpcParam.Bool isRegEx: Boolean,
@@ -36,8 +36,8 @@ interface HighlightRuleManagerServerApi {
 
   @RpcCall(
     "requestSetHighlightNick")
-  fun requestSetHighlightNick(@RpcParam.Int highlightNick: Int)
+  suspend fun requestSetHighlightNick(@RpcParam.Int highlightNick: Int)
 
   @RpcCall("requestSetNicksCaseSensitive")
-  fun requestSetNicksCaseSensitive(@RpcParam.Bool nicksCaseSensitive: Boolean)
+  suspend fun requestSetNicksCaseSensitive(@RpcParam.Bool nicksCaseSensitive: Boolean)
 }

libquassel-api/src/main/kotlin/de/justjanne/libquassel/protocol/api/server/IdentityServerApi.kt

@@ -19,5 +19,5 @@ import de.justjanne.libquassel.protocol.variant.QVariantMap
 @RpcApi("Identity", side = ProtocolSide.CLIENT)
 interface IdentityServerApi {
   @RpcCall("requestUpdate")
-  fun requestUpdate(objectName: ObjectName, @RpcParam.QVariantMap properties: QVariantMap)
+  suspend fun requestUpdate(objectName: ObjectName, @RpcParam.QVariantMap properties: QVariantMap)
 }

libquassel-api/src/main/kotlin/de/justjanne/libquassel/protocol/api/server/IgnoreListManagerServerApi.kt

@@ -17,7 +17,7 @@ import de.justjanne.libquassel.annotations.RpcParam
 @RpcApi("IgnoreListManager", side = ProtocolSide.CLIENT)
 interface IgnoreListManagerServerApi {
   @RpcCall("requestAddIgnoreListItem")
-  fun requestAddIgnoreListItem(
+  suspend fun requestAddIgnoreListItem(
     @RpcParam.Int type: Int,
     @RpcParam.QString ignoreRule: String?,
     @RpcParam.Bool isRegEx: Boolean,
@@ -28,8 +28,8 @@ interface IgnoreListManagerServerApi {
   )
 
   @RpcCall("requestRemoveIgnoreListItem")
-  fun requestRemoveIgnoreListItem(@RpcParam.QString ignoreRule: String?)
+  suspend fun requestRemoveIgnoreListItem(@RpcParam.QString ignoreRule: String?)
 
   @RpcCall("requestToggleIgnoreRule")
-  fun requestToggleIgnoreRule(@RpcParam.QString ignoreRule: String?)
+  suspend fun requestToggleIgnoreRule(@RpcParam.QString ignoreRule: String?)
 }

libquassel-api/src/main/kotlin/de/justjanne/libquassel/protocol/api/server/IrcListHelperServerApi.kt

@@ -19,5 +19,5 @@ import de.justjanne.libquassel.protocol.models.ids.NetworkId
 @RpcApi("IrcListHelper", side = ProtocolSide.CLIENT)
 interface IrcListHelperServerApi {
   @RpcCall("requestChannelList")
-  fun requestChannelList(@RpcParam.UserType.NetworkId netId: NetworkId, @RpcParam.QStringList channelFilters: QStringList)
+  suspend fun requestChannelList(@RpcParam.UserType.NetworkId netId: NetworkId, @RpcParam.QStringList channelFilters: QStringList)
 }

libquassel-api/src/main/kotlin/de/justjanne/libquassel/protocol/api/server/NetworkConfigServerApi.kt

@@ -17,26 +17,26 @@ import de.justjanne.libquassel.annotations.RpcParam
 @RpcApi("NetworkConfig", side = ProtocolSide.CLIENT)
 interface NetworkConfigServerApi {
   @RpcCall("requestSetAutoWhoDelay")
-  fun requestSetAutoWhoDelay(@RpcParam.Int delay: Int)
+  suspend fun requestSetAutoWhoDelay(@RpcParam.Int delay: Int)
 
   @RpcCall("requestSetAutoWhoEnabled")
-  fun requestSetAutoWhoEnabled(@RpcParam.Bool enabled: Boolean)
+  suspend fun requestSetAutoWhoEnabled(@RpcParam.Bool enabled: Boolean)
 
   @RpcCall("requestSetAutoWhoInterval")
-  fun requestSetAutoWhoInterval(@RpcParam.Int interval: Int)
+  suspend fun requestSetAutoWhoInterval(@RpcParam.Int interval: Int)
 
   @RpcCall("requestSetAutoWhoNickLimit")
-  fun requestSetAutoWhoNickLimit(@RpcParam.Int limit: Int)
+  suspend fun requestSetAutoWhoNickLimit(@RpcParam.Int limit: Int)
 
   @RpcCall("requestSetMaxPingCount")
-  fun requestSetMaxPingCount(@RpcParam.Int count: Int)
+  suspend fun requestSetMaxPingCount(@RpcParam.Int count: Int)
 
   @RpcCall("requestSetPingInterval")
-  fun requestSetPingInterval(@RpcParam.Int interval: Int)
+  suspend fun requestSetPingInterval(@RpcParam.Int interval: Int)
 
   @RpcCall("requestSetPingTimeoutEnabled")
-  fun requestSetPingTimeoutEnabled(@RpcParam.Bool enabled: Boolean)
+  suspend fun requestSetPingTimeoutEnabled(@RpcParam.Bool enabled: Boolean)
 
   @RpcCall("requestSetStandardCtcp")
-  fun requestSetStandardCtcp(@RpcParam.Bool enabled: Boolean)
+  suspend fun requestSetStandardCtcp(@RpcParam.Bool enabled: Boolean)
 }

libquassel-api/src/main/kotlin/de/justjanne/libquassel/protocol/api/server/NetworkServerApi.kt

@@ -19,11 +19,11 @@ import de.justjanne.libquassel.protocol.models.network.NetworkInfoDto
 @RpcApi("Network", side = ProtocolSide.CLIENT)
 interface NetworkServerApi {
   @RpcCall("requestConnect")
-  fun requestConnect(objectName: ObjectName)
+  suspend fun requestConnect(objectName: ObjectName)
 
   @RpcCall("requestDisconnect")
-  fun requestDisconnect(objectName: ObjectName)
+  suspend fun requestDisconnect(objectName: ObjectName)
 
   @RpcCall("requestSetNetworkInfo")
-  fun requestSetNetworkInfo(objectName: ObjectName, @RpcParam.UserType.NetworkInfo info: NetworkInfoDto)
+  suspend fun requestSetNetworkInfo(objectName: ObjectName, @RpcParam.UserType.NetworkInfo info: NetworkInfoDto)
 }

libquassel-api/src/main/kotlin/de/justjanne/libquassel/protocol/api/server/RpcServerApi.kt

@@ -23,23 +23,23 @@ import de.justjanne.libquassel.protocol.variant.QVariantMap
 @RpcApi(side = ProtocolSide.CLIENT)
 interface RpcServerApi {
   @RpcCall(name = "2createIdentity(Identity,QVariantMap)")
-  fun createIdentity(@RpcParam.UserType.Identity identity: IdentityDto, @RpcParam.QVariantMap additional: QVariantMap)
+  suspend fun createIdentity(@RpcParam.UserType.Identity identity: IdentityDto, @RpcParam.QVariantMap additional: QVariantMap)
 
   @RpcCall(name = "2removeIdentity(IdentityId)")
-  fun removeIdentity(@RpcParam.UserType.IdentityId identityId: IdentityId)
+  suspend fun removeIdentity(@RpcParam.UserType.IdentityId identityId: IdentityId)
 
   @RpcCall(name = "2createNetwork(NetworkInfo,QStringList)")
-  fun createNetwork(@RpcParam.UserType.NetworkInfo networkInfo: NetworkInfoDto, @RpcParam.QStringList channels: List<String>)
+  suspend fun createNetwork(@RpcParam.UserType.NetworkInfo networkInfo: NetworkInfoDto, @RpcParam.QStringList channels: List<String>)
 
   @RpcCall(name = "2removeNetwork(NetworkId)")
-  fun removeNetwork(@RpcParam.UserType.NetworkId networkId: NetworkId)
+  suspend fun removeNetwork(@RpcParam.UserType.NetworkId networkId: NetworkId)
 
   @RpcCall(name = "2changePassword(PeerPtr,QString,QString,QString)")
-  fun changePassword(@RpcParam.UserType.PeerPtr peerPtr: ULong, @RpcParam.QString user: String?, @RpcParam.QString old: String?, @RpcParam.QString new: String?)
+  suspend fun changePassword(@RpcParam.UserType.PeerPtr peerPtr: ULong, @RpcParam.QString user: String?, @RpcParam.QString old: String?, @RpcParam.QString new: String?)
 
   @RpcCall(name = "2kickClient(int)")
-  fun requestKickClient(@RpcParam.Int id: Int)
+  suspend fun requestKickClient(@RpcParam.Int id: Int)
 
   @RpcCall(name = "2sendInput(BufferInfo,QString)")
-  fun sendInput(@RpcParam.UserType.BufferInfo bufferInfo: BufferInfo, @RpcParam.QString message: String?)
+  suspend fun sendInput(@RpcParam.UserType.BufferInfo bufferInfo: BufferInfo, @RpcParam.QString message: String?)
 }

libquassel-client/build.gradle.kts

@@ -12,10 +12,21 @@ plugins {
   id("justjanne.publication")
 }
 
+repositories {
+  google()
+  mavenCentral()
+}
+
 dependencies {
-  api(project(":libquassel-protocol"))
   api(project(":libquassel-api"))
-  implementation(libs.slf4j)
+  api(project(":libquassel-persistence"))
+  api(project(":libquassel-protocol"))
+
   implementation(libs.dagger.core)
   ksp(libs.dagger.compiler)
+
+  implementation(libs.slf4j)
+
+  testImplementation(libs.room.runtime)
+  testImplementation(libs.sqlite)
 }

libquassel-client/src/main/kotlin/de/justjanne/libquassel/backend/AliasManagerPersister.kt

@@ -9,10 +9,28 @@
 
 package de.justjanne.libquassel.backend
 
+import de.justjanne.libquassel.persistence.AliasEntity
+import de.justjanne.libquassel.persistence.AliasRepository
 import de.justjanne.libquassel.protocol.api.client.AliasManagerClientApi
+import de.justjanne.libquassel.protocol.api.dto.AliasManagerDto
 import de.justjanne.libquassel.protocol.variant.QVariantMap
 import javax.inject.Inject
 
-class AliasManagerPersister @Inject constructor() : AliasManagerClientApi {
-  override fun update(properties: QVariantMap)  = Unit
+class AliasManagerPersister @Inject constructor(
+  private val repository: AliasRepository,
+) : AliasManagerClientApi {
+  override suspend fun update(properties: QVariantMap) {
+    val data = AliasManagerDto.deserialize(properties)
+    val names = data.aliases.names.requireNoNulls()
+    val expansions = data.aliases.expansions.requireNoNulls()
+    require(names.size == expansions.size) {
+      "Sizes do not match: names=${names.size}, expansions=${expansions.size}"
+    }
+
+    val aliases = names.zip(expansions).mapIndexed { index, (name, expansion) ->
+      AliasEntity(index, name, expansion)
+    }
+
+    repository.sync(aliases)
+  }
 }

libquassel-client/src/main/kotlin/de/justjanne/libquassel/backend/BacklogManagerPersister.kt

@@ -9,16 +9,24 @@
 
 package de.justjanne.libquassel.backend
 
+import de.justjanne.libquassel.persistence.MessageEntity
+import de.justjanne.libquassel.persistence.MessageRepository
 import de.justjanne.libquassel.protocol.api.client.BacklogManagerClientApi
+import de.justjanne.libquassel.protocol.models.Message
 import de.justjanne.libquassel.protocol.models.ids.BufferId
 import de.justjanne.libquassel.protocol.models.ids.MsgId
 import de.justjanne.libquassel.protocol.variant.QVariantList
+import de.justjanne.libquassel.protocol.variant.into
 import javax.inject.Inject
 
-class BacklogManagerPersister @Inject constructor() : BacklogManagerClientApi {
-  override fun receiveBacklog(bufferId: BufferId, first: MsgId, last: MsgId, limit: Int, additional: Int, messages: QVariantList)  = Unit
-  override fun receiveBacklogFiltered(bufferId: BufferId, first: MsgId, last: MsgId, limit: Int, additional: Int, type: Int, flags: Int, messages: QVariantList)  = Unit
-  override fun receiveBacklogForward(bufferId: BufferId, first: MsgId, last: MsgId, limit: Int, type: Int, flags: Int, messages: QVariantList)  = Unit
-  override fun receiveBacklogAll(first: MsgId, last: MsgId, limit: Int, additional: Int, messages: QVariantList)  = Unit
-  override fun receiveBacklogAllFiltered(first: MsgId, last: MsgId, limit: Int, additional: Int, type: Int, flags: Int, messages: QVariantList)  = Unit
+class BacklogManagerPersister @Inject constructor(
+  private val repository: MessageRepository,
+) : BacklogManagerClientApi {
+  override suspend fun receiveBacklog(bufferId: BufferId, first: MsgId, last: MsgId, limit: Int, additional: Int, messages: QVariantList) {
+    repository.sync(bufferId, messages.mapNotNull { it.into<Message>() }.map(MessageEntity.Companion::fromDto))
+  }
+  override suspend fun receiveBacklogFiltered(bufferId: BufferId, first: MsgId, last: MsgId, limit: Int, additional: Int, type: Int, flags: Int, messages: QVariantList)  = Unit
+  override suspend fun receiveBacklogForward(bufferId: BufferId, first: MsgId, last: MsgId, limit: Int, type: Int, flags: Int, messages: QVariantList)  = Unit
+  override suspend fun receiveBacklogAll(first: MsgId, last: MsgId, limit: Int, additional: Int, messages: QVariantList)  = Unit
+  override suspend fun receiveBacklogAllFiltered(first: MsgId, last: MsgId, limit: Int, additional: Int, type: Int, flags: Int, messages: QVariantList)  = Unit
 }

libquassel-client/src/main/kotlin/de/justjanne/libquassel/backend/BufferSyncerPersister.kt

@@ -16,13 +16,13 @@ import de.justjanne.libquassel.protocol.variant.QVariantMap
 import javax.inject.Inject
 
 class BufferSyncerPersister @Inject constructor() : BufferSyncerClientApi {
-  override fun markBufferAsRead(buffer: BufferId)  = Unit
-  override fun mergeBuffersPermanently(buffer: BufferId, buffer2: BufferId)  = Unit
-  override fun removeBuffer(buffer: BufferId)  = Unit
-  override fun renameBuffer(buffer: BufferId, newName: String)  = Unit
-  override fun setMarkerLine(buffer: BufferId, msgId: MsgId)  = Unit
-  override fun setLastSeenMsg(buffer: BufferId, msgId: MsgId)  = Unit
-  override fun setBufferActivity(buffer: BufferId, types: Int)  = Unit
-  override fun setHighlightCount(buffer: BufferId, count: Int)  = Unit
-  override fun update(properties: QVariantMap)  = Unit
+  override suspend fun markBufferAsRead(buffer: BufferId)  = Unit
+  override suspend fun mergeBuffersPermanently(buffer: BufferId, buffer2: BufferId)  = Unit
+  override suspend fun removeBuffer(buffer: BufferId)  = Unit
+  override suspend fun renameBuffer(buffer: BufferId, newName: String)  = Unit
+  override suspend fun setMarkerLine(buffer: BufferId, msgId: MsgId)  = Unit
+  override suspend fun setLastSeenMsg(buffer: BufferId, msgId: MsgId)  = Unit
+  override suspend fun setBufferActivity(buffer: BufferId, types: Int)  = Unit
+  override suspend fun setHighlightCount(buffer: BufferId, count: Int)  = Unit
+  override suspend fun update(properties: QVariantMap)  = Unit
 }

libquassel-client/src/main/kotlin/de/justjanne/libquassel/backend/BufferViewConfigPersister.kt

@@ -16,19 +16,19 @@ import de.justjanne.libquassel.protocol.variant.QVariantMap
 import javax.inject.Inject
 
 class BufferViewConfigPersister @Inject constructor(): BufferViewConfigClientApi {
-  override fun addBuffer(buffer: BufferId, pos: Int)  = Unit
-  override fun moveBuffer(buffer: BufferId, pos: Int)  = Unit
-  override fun removeBuffer(buffer: BufferId)  = Unit
-  override fun removeBufferPermanently(buffer: BufferId)  = Unit
-  override fun setBufferViewName(value: String)  = Unit
-  override fun setAddNewBuffersAutomatically(value: Boolean)  = Unit
-  override fun setAllowedBufferTypes(value: Int)  = Unit
-  override fun setDisableDecoration(value: Boolean)  = Unit
-  override fun setHideInactiveBuffers(value: Boolean)  = Unit
-  override fun setHideInactiveNetworks(value: Boolean)  = Unit
-  override fun setMinimumActivity(value: Int)  = Unit
-  override fun setNetworkId(value: NetworkId)  = Unit
-  override fun setShowSearch(value: Boolean)  = Unit
-  override fun setSortAlphabetically(value: Boolean)  = Unit
-  override fun update(properties: QVariantMap)  = Unit
+  override suspend fun addBuffer(buffer: BufferId, pos: Int)  = Unit
+  override suspend fun moveBuffer(buffer: BufferId, pos: Int)  = Unit
+  override suspend fun removeBuffer(buffer: BufferId)  = Unit
+  override suspend fun removeBufferPermanently(buffer: BufferId)  = Unit
+  override suspend fun setBufferViewName(value: String)  = Unit
+  override suspend fun setAddNewBuffersAutomatically(value: Boolean)  = Unit
+  override suspend fun setAllowedBufferTypes(value: Int)  = Unit
+  override suspend fun setDisableDecoration(value: Boolean)  = Unit
+  override suspend fun setHideInactiveBuffers(value: Boolean)  = Unit
+  override suspend fun setHideInactiveNetworks(value: Boolean)  = Unit
+  override suspend fun setMinimumActivity(value: Int)  = Unit
+  override suspend fun setNetworkId(value: NetworkId)  = Unit
+  override suspend fun setShowSearch(value: Boolean)  = Unit
+  override suspend fun setSortAlphabetically(value: Boolean)  = Unit
+  override suspend fun update(properties: QVariantMap)  = Unit
 }