Merge pull request #2064 from slingamn/issue2063

fix #2063
ergochat · May 23, 2023 · bf33fba · bf33fba
2 parents 2c0928f + 0710c7e
commit bf33fba
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/irc/channel.go b/irc/channel.go
@@ -1228,20 +1228,26 @@ func (channel *Channel) CanSpeak(client *Client) (bool, modes.Mode) {
 	channel.stateMutex.RLock()
 	memberData, hasClient := channel.members[client]
 	channel.stateMutex.RUnlock()
-	clientModes := memberData.modes
+
+	highestMode := func() modes.Mode {
+		if !hasClient {
+			return modes.Mode(0)
+		}
+		return memberData.modes.HighestChannelUserMode()
+	}
 
 	if !hasClient && channel.flags.HasMode(modes.NoOutside) {
 		// TODO: enforce regular +b bans on -n channels?
 		return false, modes.NoOutside
 	}
-	if channel.isMuted(client) && clientModes.HighestChannelUserMode() == modes.Mode(0) {
+	if channel.isMuted(client) && highestMode() == modes.Mode(0) {
 		return false, modes.BanMask
 	}
-	if channel.flags.HasMode(modes.Moderated) && clientModes.HighestChannelUserMode() == modes.Mode(0) {
+	if channel.flags.HasMode(modes.Moderated) && highestMode() == modes.Mode(0) {
 		return false, modes.Moderated
 	}
 	if channel.flags.HasMode(modes.RegisteredOnlySpeak) && client.Account() == "" &&
-		clientModes.HighestChannelUserMode() == modes.Mode(0) {
+		highestMode() == modes.Mode(0) {
 		return false, modes.RegisteredOnlySpeak
 	}
 	return true, modes.Mode('?')

diff --git a/irctest b/irctest
+140 −136		.github/workflows/test-devel.yml
+30 −26		.github/workflows/test-devel_release.yml
+157 −153		.github/workflows/test-stable.yml
+4 −1		README.md
+38 −0		irctest/server_tests/chmodes/no_external.py
+11 −11		make_workflows.py
+6 −2		workflows.yml