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

Block RPL_{CREATIONTIME,TOPICWHOTIME} for detached channels

Browse Source 
Closes: https://todo.sr.ht/~emersion/soju/132
This commit is contained in:
Simon Ser 2021-12-09 12:12:20 +01:00
parent bad8154da8
commit e397cc2a1f
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
upstream.go
View File

@ -1155,9 +1155,9 @@ func (uc *upstreamConn) handleMessage(ctx context.Context, msg *irc.Message) err
if _, err := applyChannelModes(ch, modeStr, msg.Params[3:]); err != nil { if _, err := applyChannelModes(ch, modeStr, msg.Params[3:]); err != nil {
return err return err
} }
if firstMode {
c := uc.network.channels.Value(channel) c := uc.network.channels.Value(channel)
if c == nil || !c.Detached { if firstMode && (c == nil || !c.Detached) {
modeStr, modeParams := ch.modes.Format() modeStr, modeParams := ch.modes.Format()
uc.forEachDownstream(func(dc *downstreamConn) { uc.forEachDownstream(func(dc *downstreamConn) {
@ -1171,7 +1171,6 @@ func (uc *upstreamConn) handleMessage(ctx context.Context, msg *irc.Message) err
}) })
}) })
} }
}
case rpl_creationtime: case rpl_creationtime:
var channel, creationTime string var channel, creationTime string
if err := parseMessageParams(msg, nil, &channel, &creationTime); err != nil { if err := parseMessageParams(msg, nil, &channel, &creationTime); err != nil {
@ -1185,7 +1184,9 @@ func (uc *upstreamConn) handleMessage(ctx context.Context, msg *irc.Message) err
firstCreationTime := ch.creationTime == "" firstCreationTime := ch.creationTime == ""
ch.creationTime = creationTime ch.creationTime = creationTime
if firstCreationTime {
c := uc.network.channels.Value(channel)
if firstCreationTime && (c == nil || !c.Detached) {
uc.forEachDownstream(func(dc *downstreamConn) { uc.forEachDownstream(func(dc *downstreamConn) {
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{
Prefix: dc.srv.prefix(), Prefix: dc.srv.prefix(),
@ -1195,14 +1196,16 @@ func (uc *upstreamConn) handleMessage(ctx context.Context, msg *irc.Message) err
}) })
} }
case rpl_topicwhotime: case rpl_topicwhotime:
var name, who, timeStr string var channel, who, timeStr string
if err := parseMessageParams(msg, nil, &name, &who, &timeStr); err != nil { if err := parseMessageParams(msg, nil, &channel, &who, &timeStr); err != nil {
return err return err
} }
ch, err := uc.getChannel(name)
ch, err := uc.getChannel(channel)
if err != nil { if err != nil {
return err return err
} }
firstTopicWhoTime := ch.TopicWho == nil firstTopicWhoTime := ch.TopicWho == nil
ch.TopicWho = irc.ParsePrefix(who) ch.TopicWho = irc.ParsePrefix(who)
sec, err := strconv.ParseInt(timeStr, 10, 64) sec, err := strconv.ParseInt(timeStr, 10, 64)
@ -1210,7 +1213,9 @@ func (uc *upstreamConn) handleMessage(ctx context.Context, msg *irc.Message) err
return fmt.Errorf("failed to parse topic time: %v", err) return fmt.Errorf("failed to parse topic time: %v", err)
} }
ch.TopicTime = time.Unix(sec, 0) ch.TopicTime = time.Unix(sec, 0)
if firstTopicWhoTime {
c := uc.network.channels.Value(channel)
if firstTopicWhoTime && (c == nil || !c.Detached) {
uc.forEachDownstream(func(dc *downstreamConn) { uc.forEachDownstream(func(dc *downstreamConn) {
topicWho := dc.marshalUserPrefix(uc.network, ch.TopicWho) topicWho := dc.marshalUserPrefix(uc.network, ch.TopicWho)
dc.SendMessage(&irc.Message{ dc.SendMessage(&irc.Message{