sad/soju
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for STATUSMSG

Browse Source 
This passes the STATUSMSG isupport through, and it ignores statusmsg prefix when routing messages through the PRIVMSG, NOTICE, and TAGMSG handler so they will show up in the correct history. Because it doesn't modify the message the statusmsg sigils show up correctly for the user on receipt.

Without this PR the statusmsg messages still come through to the client, but they get misrouted by clients expecting STATUSMSG to be specified in 005 and they don't go into the right channel history.

Closes: https://todo.sr.ht/~emersion/soju/124
This commit is contained in:
Eric Mertens 2023-08-26 03:37:20 -07:00 committed by GitHub
parent 01b28fa85d
commit be3c6d72c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
downstream.go
View File

@ -282,6 +282,7 @@ var passthroughIsupport = map[string]bool{
"NICKLEN": true, "NICKLEN": true,
"PREFIX": true, "PREFIX": true,
"SAFELIST": true, "SAFELIST": true,
"STATUSMSG": true,
"TARGMAX": true, "TARGMAX": true,
"TOPICLEN": true, "TOPICLEN": true,
"USERLEN": true, "USERLEN": true,

11
upstream.go
View File

@ -199,6 +199,7 @@ type upstreamConn struct {
availableUserModes string availableUserModes string
availableChannelModes map[byte]channelModeType availableChannelModes map[byte]channelModeType
availableChannelTypes string availableChannelTypes string
availableStatusMsg string
availableMemberships []xirc.Membership availableMemberships []xirc.Membership
isupport map[string]*string isupport map[string]*string
@ -373,6 +374,7 @@ func connectToUpstream(ctx context.Context, network *network) (*upstreamConn, er
batches: make(map[string]upstreamBatch), batches: make(map[string]upstreamBatch),
serverPrefix: &irc.Prefix{Name: "*"}, serverPrefix: &irc.Prefix{Name: "*"},
availableChannelTypes: stdChannelTypes, availableChannelTypes: stdChannelTypes,
availableStatusMsg: "",
availableChannelModes: stdChannelModes, availableChannelModes: stdChannelModes,
availableMemberships: stdMemberships, availableMemberships: stdMemberships,
isupport: make(map[string]*string), isupport: make(map[string]*string),
@ -632,6 +634,9 @@ func (uc *upstreamConn) handleMessage(ctx context.Context, msg *irc.Message) err
} }
} }
// remove statusmsg sigils from target
target = strings.TrimLeft(target, uc.availableStatusMsg)
if uc.network.equalCasemap(msg.Prefix.Name, serviceNick) { if uc.network.equalCasemap(msg.Prefix.Name, serviceNick) {
uc.logger.Printf("skipping %v from soju's service: %v", msg.Command, msg) uc.logger.Printf("skipping %v from soju's service: %v", msg.Command, msg)
break break
@ -973,6 +978,12 @@ func (uc *upstreamConn) handleMessage(ctx context.Context, msg *irc.Message) err
} else { } else {
uc.availableChannelTypes = stdChannelTypes uc.availableChannelTypes = stdChannelTypes
} }
case "STATUSMSG":
if !negate {
uc.availableStatusMsg = value
} else {
uc.availableStatusMsg = ""
}
case "PREFIX": case "PREFIX":
if !negate { if !negate {
err = uc.handleMemberships(value) err = uc.handleMemberships(value)