From 40d68cd3fb1deba64cb431e928e07f2687d13ddc Mon Sep 17 00:00:00 2001 From: Janne Mareike Koschinski <janne@kuschku.de> Date: Sun, 21 Feb 2021 17:58:20 +0100 Subject: [PATCH] Correct wrongly defined sync calls --- .../de/justjanne/libquassel/state/protocol/AliasManager.kt | 7 +++++++ .../libquassel/state/protocol/BufferSyncerProtocol.kt | 7 +++++++ .../libquassel/state/protocol/BufferViewManagerProtocol.kt | 6 ++++++ .../libquassel/state/protocol/IgnoreListManagerProtocol.kt | 7 +++++++ .../libquassel/state/protocol/IrcListHelperProtocol.kt | 6 ------ 5 files changed, 27 insertions(+), 6 deletions(-) diff --git a/libquassel-state/src/main/kotlin/de/justjanne/libquassel/state/protocol/AliasManager.kt b/libquassel-state/src/main/kotlin/de/justjanne/libquassel/state/protocol/AliasManager.kt index 4dcc277..0421c96 100644 --- a/libquassel-state/src/main/kotlin/de/justjanne/libquassel/state/protocol/AliasManager.kt +++ b/libquassel-state/src/main/kotlin/de/justjanne/libquassel/state/protocol/AliasManager.kt @@ -14,6 +14,7 @@ import de.justjanne.libquassel.annotations.ProtocolSide import de.justjanne.libquassel.annotations.SyncedCall import de.justjanne.libquassel.annotations.SyncedObject import de.justjanne.libquassel.protocol.models.types.QtType +import de.justjanne.libquassel.protocol.variant.QVariantMap import de.justjanne.libquassel.protocol.variant.qVariant @SyncedObject("AliasManager") @@ -33,4 +34,10 @@ interface AliasManager : SyncableProtocol { qVariant(expansion, QtType.QString) ) } + + @SyncedCall(target = ProtocolSide.CLIENT) + override fun update(properties: QVariantMap) = super.update(properties) + + @SyncedCall(target = ProtocolSide.CORE) + override fun requestUpdate(properties: QVariantMap) = super.requestUpdate(properties) } diff --git a/libquassel-state/src/main/kotlin/de/justjanne/libquassel/state/protocol/BufferSyncerProtocol.kt b/libquassel-state/src/main/kotlin/de/justjanne/libquassel/state/protocol/BufferSyncerProtocol.kt index 0f1e5dc..a828ee4 100644 --- a/libquassel-state/src/main/kotlin/de/justjanne/libquassel/state/protocol/BufferSyncerProtocol.kt +++ b/libquassel-state/src/main/kotlin/de/justjanne/libquassel/state/protocol/BufferSyncerProtocol.kt @@ -17,6 +17,7 @@ import de.justjanne.libquassel.protocol.models.ids.BufferId import de.justjanne.libquassel.protocol.models.ids.MsgId import de.justjanne.libquassel.protocol.models.types.QtType import de.justjanne.libquassel.protocol.models.types.QuasselType +import de.justjanne.libquassel.protocol.variant.QVariantMap import de.justjanne.libquassel.protocol.variant.qVariant @SyncedObject("BufferSyncer") @@ -236,4 +237,10 @@ interface BufferSyncerProtocol : SyncableProtocol { "requestPurgeBufferIds" ) } + + @SyncedCall(target = ProtocolSide.CLIENT) + override fun update(properties: QVariantMap) = super.update(properties) + + @SyncedCall(target = ProtocolSide.CORE) + override fun requestUpdate(properties: QVariantMap) = super.requestUpdate(properties) } diff --git a/libquassel-state/src/main/kotlin/de/justjanne/libquassel/state/protocol/BufferViewManagerProtocol.kt b/libquassel-state/src/main/kotlin/de/justjanne/libquassel/state/protocol/BufferViewManagerProtocol.kt index a74319c..3ec5dae 100644 --- a/libquassel-state/src/main/kotlin/de/justjanne/libquassel/state/protocol/BufferViewManagerProtocol.kt +++ b/libquassel-state/src/main/kotlin/de/justjanne/libquassel/state/protocol/BufferViewManagerProtocol.kt @@ -84,4 +84,10 @@ interface BufferViewManagerProtocol : SyncableProtocol { qVariant(bufferViewConfigId, QtType.Int), ) } + + @SyncedCall(target = ProtocolSide.CLIENT) + override fun update(properties: QVariantMap) = super.update(properties) + + @SyncedCall(target = ProtocolSide.CORE) + override fun requestUpdate(properties: QVariantMap) = super.requestUpdate(properties) } diff --git a/libquassel-state/src/main/kotlin/de/justjanne/libquassel/state/protocol/IgnoreListManagerProtocol.kt b/libquassel-state/src/main/kotlin/de/justjanne/libquassel/state/protocol/IgnoreListManagerProtocol.kt index 0265d16..fd5db8e 100644 --- a/libquassel-state/src/main/kotlin/de/justjanne/libquassel/state/protocol/IgnoreListManagerProtocol.kt +++ b/libquassel-state/src/main/kotlin/de/justjanne/libquassel/state/protocol/IgnoreListManagerProtocol.kt @@ -14,6 +14,7 @@ import de.justjanne.libquassel.annotations.ProtocolSide import de.justjanne.libquassel.annotations.SyncedCall import de.justjanne.libquassel.annotations.SyncedObject import de.justjanne.libquassel.protocol.models.types.QtType +import de.justjanne.libquassel.protocol.variant.QVariantMap import de.justjanne.libquassel.protocol.variant.qVariant @SyncedObject(name = "IgnoreListManager") @@ -153,4 +154,10 @@ interface IgnoreListManagerProtocol : SyncableProtocol { qVariant(ignoreRule, QtType.QString), ) } + + @SyncedCall(target = ProtocolSide.CLIENT) + override fun update(properties: QVariantMap) = super.update(properties) + + @SyncedCall(target = ProtocolSide.CORE) + override fun requestUpdate(properties: QVariantMap) = super.requestUpdate(properties) } diff --git a/libquassel-state/src/main/kotlin/de/justjanne/libquassel/state/protocol/IrcListHelperProtocol.kt b/libquassel-state/src/main/kotlin/de/justjanne/libquassel/state/protocol/IrcListHelperProtocol.kt index ccb26f8..1ee81d9 100644 --- a/libquassel-state/src/main/kotlin/de/justjanne/libquassel/state/protocol/IrcListHelperProtocol.kt +++ b/libquassel-state/src/main/kotlin/de/justjanne/libquassel/state/protocol/IrcListHelperProtocol.kt @@ -83,10 +83,4 @@ interface IrcListHelperProtocol : SyncableProtocol { qVariant(netId, QuasselType.NetworkId), ) } - - @SyncedCall(target = ProtocolSide.CLIENT) - override fun update(properties: QVariantMap) = super.update(properties) - - @SyncedCall(target = ProtocolSide.CORE) - override fun requestUpdate(properties: QVariantMap) = super.requestUpdate(properties) } -- GitLab