From e33fd8df64d4ae10f3ddc20aba8a027a17a1b1a0 Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Sat, 5 Mar 2022 16:40:01 +0100
Subject: [PATCH] fix: correct an issue with badly annotated sync calls

---
 .../libquassel/protocol/syncables/common/Network.kt    |  4 ++--
 .../protocol/syncables/state/NetworkState.kt           |  2 +-
 .../protocol/syncables/stubs/IgnoreListManagerStub.kt  |  2 +-
 .../libquassel/protocol/syncables/stubs/NetworkStub.kt | 10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/common/Network.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/common/Network.kt
index cf9b3fb..d0b1782 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/common/Network.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/common/Network.kt
@@ -464,7 +464,7 @@ open class Network(
     super.setIdentity(identityId)
   }
 
-  override fun setMyNick(myNick: String) {
+  override fun setMyNick(myNick: String?) {
     state.update {
       copy(myNick = myNick)
     }
@@ -485,7 +485,7 @@ open class Network(
     super.setNetworkName(networkName)
   }
 
-  override fun setCurrentServer(currentServer: String) {
+  override fun setCurrentServer(currentServer: String?) {
     state.update {
       copy(currentServer = currentServer)
     }
diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/state/NetworkState.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/state/NetworkState.kt
index a864978..632505a 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/state/NetworkState.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/state/NetworkState.kt
@@ -27,7 +27,7 @@ data class NetworkState(
   val myNick: String? = "",
   val latency: Int = 0,
   val networkName: String = "<not initialized>",
-  val currentServer: String = "",
+  val currentServer: String? = null,
   val connected: Boolean = false,
   val connectionState: ConnectionState = ConnectionState.Disconnected,
   val ircUsers: Map<String, IrcUser> = emptyMap(),
diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/stubs/IgnoreListManagerStub.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/stubs/IgnoreListManagerStub.kt
index ac88010..116cdf9 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/stubs/IgnoreListManagerStub.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/stubs/IgnoreListManagerStub.kt
@@ -62,7 +62,7 @@ interface IgnoreListManagerStub : StatefulSyncableStub {
     isActive: Boolean
   ) {
     sync(
-      target = ProtocolSide.CLIENT,
+      target = ProtocolSide.CORE,
       "requestAddIgnoreListItem",
       qVariant(type, QtType.Int),
       qVariant(ignoreRule, QtType.QString),
diff --git a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/stubs/NetworkStub.kt b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/stubs/NetworkStub.kt
index 7d8808c..8d2c897 100644
--- a/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/stubs/NetworkStub.kt
+++ b/libquassel-protocol/src/main/kotlin/de/justjanne/libquassel/protocol/syncables/stubs/NetworkStub.kt
@@ -35,7 +35,7 @@ interface NetworkStub : StatefulSyncableStub {
   }
 
   @SyncedCall(target = ProtocolSide.CLIENT)
-  fun setCurrentServer(currentServer: String) {
+  fun setCurrentServer(currentServer: String?) {
     sync(
       target = ProtocolSide.CLIENT,
       "setCurrentServer",
@@ -44,7 +44,7 @@ interface NetworkStub : StatefulSyncableStub {
   }
 
   @SyncedCall(target = ProtocolSide.CLIENT)
-  fun setMyNick(myNick: String) {
+  fun setMyNick(myNick: String?) {
     sync(
       target = ProtocolSide.CLIENT,
       "setMyNick",
@@ -361,7 +361,7 @@ interface NetworkStub : StatefulSyncableStub {
   @SyncedCall(target = ProtocolSide.CORE)
   fun requestConnect() {
     sync(
-      target = ProtocolSide.CLIENT,
+      target = ProtocolSide.CORE,
       "requestConnect",
     )
   }
@@ -369,7 +369,7 @@ interface NetworkStub : StatefulSyncableStub {
   @SyncedCall(target = ProtocolSide.CORE)
   fun requestDisconnect() {
     sync(
-      target = ProtocolSide.CLIENT,
+      target = ProtocolSide.CORE,
       "requestDisconnect",
     )
   }
@@ -377,7 +377,7 @@ interface NetworkStub : StatefulSyncableStub {
   @SyncedCall(target = ProtocolSide.CORE)
   fun requestSetNetworkInfo(info: NetworkInfo) {
     sync(
-      target = ProtocolSide.CLIENT,
+      target = ProtocolSide.CORE,
       "requestSetNetworkInfo",
       qVariant(info, QuasselType.NetworkInfo),
     )
-- 
GitLab