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

irc: drop needMarshaling from applyChannelModes return values

Browse Source 
Not used anymore.
This commit is contained in:
Simon Ser 2022-08-05 19:44:56 +02:00
parent a02a06de0d
commit f646dc9ff2
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
irc.go
View File

@ -87,11 +87,7 @@ type channelModes map[byte]string
// and applies the corresponding channel mode and user membership changes on that channel.
//
// If ch.modes is nil, channel modes are not updated.
//
// needMarshaling is a list of indexes of mode arguments that represent entities
// that must be marshaled when sent downstream.
func applyChannelModes(ch *upstreamChannel, modeStr string, arguments []string) (needMarshaling map[int]struct{}, err error) {
needMarshaling = make(map[int]struct{}, len(arguments))
func applyChannelModes(ch *upstreamChannel, modeStr string, arguments []string) error {
nextArgument := 0
var plusMinus byte
outer:
@ -102,13 +98,13 @@ outer:
continue
}
if plusMinus != '+' && plusMinus != '-' {
return nil, fmt.Errorf("malformed modestring %q: missing plus/minus", modeStr)
return fmt.Errorf("malformed modestring %q: missing plus/minus", modeStr)
}
for _, membership := range ch.conn.availableMemberships {
if membership.Mode == mode {
if nextArgument >= len(arguments) {
return nil, fmt.Errorf("malformed modestring %q: missing mode argument for %c%c", modeStr, plusMinus, mode)
return fmt.Errorf("malformed modestring %q: missing mode argument for %c%c", modeStr, plusMinus, mode)
}
member := arguments[nextArgument]
m := ch.Members.Get(member)
@ -120,7 +116,6 @@ outer:
m.Remove(membership)
}
}
needMarshaling[nextArgument] = struct{}{}
nextArgument++
continue outer
}
@ -157,7 +152,7 @@ outer:
}
}
}
return needMarshaling, nil
return nil
}
func (cm channelModes) Format() (modeString string, parameters []string) {

4
upstream.go
View File

@ -1175,7 +1175,7 @@ func (uc *upstreamConn) handleMessage(ctx context.Context, msg *irc.Message) err
return err
}
_, err = applyChannelModes(ch, modeStr, msg.Params[2:])
err = applyChannelModes(ch, modeStr, msg.Params[2:])
if err != nil {
return err
}
@ -1227,7 +1227,7 @@ func (uc *upstreamConn) handleMessage(ctx context.Context, msg *irc.Message) err
firstMode := ch.modes == nil
ch.modes = make(map[byte]string)
if _, err := applyChannelModes(ch, modeStr, msg.Params[3:]); err != nil {
if err := applyChannelModes(ch, modeStr, msg.Params[3:]); err != nil {
return err
}