Fix #1911 +s channels don't appear in /list even though on the channel #1923
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
slingamn
reviewed
Feb 28, 2022
irc/handlers.go
Outdated
| clientIsOp := client.HasRoleCapabs("sajoin") | ||
| if len(channels) == 0 { | ||
| for _, channel := range server.channels.Channels() { | ||
| if !clientIsOp && channel.flags.HasMode(modes.Secret) { | ||
| if !clientIsOp && channel.flags.HasMode(modes.Secret) && !isUserInThisChannel(clientChannels, channel) { |
There was a problem hiding this comment.
I think you can just check channel.hasClient(client) here and below. It does a lock acquisition, but so does rplList, so that seems fine.
|
Thanks @slingamn, I switched to channel.HasClient. As it stands now this branch only diffs from the master branch on two lines. Let me know if you would like me to resubmit this PR squashing the commits together. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As discussed in #1911 this replicates the intended behavior in which the daemon does list a channel with mode +s in
quote listif the user is joined to that channel.