Skip to content
Snippets Groups Projects
Commit b6c85aed authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Attempt to correct join/part issue

parent 03f062b8
Branches
Tags
No related merge requests found
...@@ -307,14 +307,14 @@ class IrcChannel( ...@@ -307,14 +307,14 @@ class IrcChannel(
removeUserMode(network().ircUser(nick), mode) removeUserMode(network().ircUser(nick), mode)
} }
override fun addChannelMode(mode: Char, value: String) { override fun addChannelMode(mode: Char, value: String?) {
when (network().channelModeType(mode)) { when (network().channelModeType(mode)) {
INetwork.ChannelModeType.A_CHANMODE -> INetwork.ChannelModeType.A_CHANMODE ->
_A_channelModes.getOrPut(mode, ::mutableSetOf).add(value) _A_channelModes.getOrPut(mode, ::mutableSetOf).add(value!!)
INetwork.ChannelModeType.B_CHANMODE -> INetwork.ChannelModeType.B_CHANMODE ->
_B_channelModes[mode] = value _B_channelModes[mode] = value!!
INetwork.ChannelModeType.C_CHANMODE -> INetwork.ChannelModeType.C_CHANMODE ->
_C_channelModes[mode] = value _C_channelModes[mode] = value!!
INetwork.ChannelModeType.D_CHANMODE -> INetwork.ChannelModeType.D_CHANMODE ->
_D_channelModes.add(mode) _D_channelModes.add(mode)
INetwork.ChannelModeType.NOT_A_CHANMODE -> INetwork.ChannelModeType.NOT_A_CHANMODE ->
...@@ -323,7 +323,7 @@ class IrcChannel( ...@@ -323,7 +323,7 @@ class IrcChannel(
super.addChannelMode(mode, value) super.addChannelMode(mode, value)
} }
override fun removeChannelMode(mode: Char, value: String) { override fun removeChannelMode(mode: Char, value: String?) {
when (network().channelModeType(mode)) { when (network().channelModeType(mode)) {
INetwork.ChannelModeType.A_CHANMODE -> INetwork.ChannelModeType.A_CHANMODE ->
_A_channelModes.getOrPut(mode, ::mutableSetOf).remove(value) _A_channelModes.getOrPut(mode, ::mutableSetOf).remove(value)
......
...@@ -16,7 +16,7 @@ interface IIrcChannel : ISyncableObject { ...@@ -16,7 +16,7 @@ interface IIrcChannel : ISyncableObject {
fun initSetProperties(properties: QVariantMap) fun initSetProperties(properties: QVariantMap)
@Slot @Slot
fun addChannelMode(mode: Char, value: String) { fun addChannelMode(mode: Char, value: String?) {
SYNC("addChannelMode", ARG(mode, Type.QChar), ARG(value, Type.QString)) SYNC("addChannelMode", ARG(mode, Type.QChar), ARG(value, Type.QString))
} }
...@@ -47,7 +47,7 @@ interface IIrcChannel : ISyncableObject { ...@@ -47,7 +47,7 @@ interface IIrcChannel : ISyncableObject {
} }
@Slot @Slot
fun removeChannelMode(mode: Char, value: String) { fun removeChannelMode(mode: Char, value: String?) {
SYNC("removeChannelMode", ARG(mode, Type.QChar), ARG(value, Type.QString)) SYNC("removeChannelMode", ARG(mode, Type.QChar), ARG(value, Type.QString))
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment