GitHub
/
ergo
mirror of https://github.com/ergochat/ergo.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix duplicated JOIN line sent to resuming clients 

Resuming clients without the resume capability would receive
two JOIN lines per channel.
This commit is contained in:
Shivaram Lingamneni 2020-11-25 22:39:07 -05:00
parent 453257aace
commit 8d44fa3c3f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
irc/channel.go
View File

@ -993,19 +993,19 @@ func (channel *Channel) resumeAndAnnounce(session *Session) {
// but really we should send it to voiced clients // but really we should send it to voiced clients
if !channel.flags.HasMode(modes.Auditorium) { if !channel.flags.HasMode(modes.Auditorium) {
for _, member := range channel.Members() { for _, member := range channel.Members() {
for _, session := range member.Sessions() { for _, mSes := range member.Sessions() {
if session.capabilities.Has(caps.Resume) { if mSes == session || mSes.capabilities.Has(caps.Resume) {
continue continue
} }
if session.capabilities.Has(caps.ExtendedJoin) { if mSes.capabilities.Has(caps.ExtendedJoin) {
session.Send(nil, details.nickMask, "JOIN", chname, details.accountName, details.realname) mSes.Send(nil, details.nickMask, "JOIN", chname, details.accountName, details.realname)
} else { } else {
session.Send(nil, details.nickMask, "JOIN", chname) mSes.Send(nil, details.nickMask, "JOIN", chname)
} }
if 0 < len(oldModes) { if 0 < len(oldModes) {
session.Send(nil, channel.server.name, "MODE", chname, oldModes, details.nick) mSes.Send(nil, channel.server.name, "MODE", chname, oldModes, details.nick)
} }
} }
} }