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

downstream: drop downstreamConn.unmarshalText

Browse Source 
It's unused.
This commit is contained in:
Simon Ser 2022-08-05 18:43:46 +02:00
parent eba7aa38d2
commit 00919e9412
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
downstream.go
View File

@ -492,14 +492,6 @@ func (dc *downstreamConn) unmarshalEntity(name string) (*upstreamConn, string, e
return net.conn, name, nil return net.conn, name, nil
} }
func (dc *downstreamConn) unmarshalText(uc *upstreamConn, text string) string {
if dc.upstream() != nil {
return text
}
// TODO: smarter parsing that ignores URLs
return strings.ReplaceAll(text, "/"+uc.network.GetName(), "")
}
func (dc *downstreamConn) ReadMessage() (*irc.Message, error) { func (dc *downstreamConn) ReadMessage() (*irc.Message, error) {
msg, err := dc.conn.ReadMessage() msg, err := dc.conn.ReadMessage()
if err != nil { if err != nil {
@ -2520,14 +2512,9 @@ func (dc *downstreamConn) handleMessageRegistered(ctx context.Context, msg *irc.
dc.handleNickServPRIVMSG(ctx, uc, text) dc.handleNickServPRIVMSG(ctx, uc, text)
} }
unmarshaledText := text
if uc.isChannel(upstreamName) {
unmarshaledText = dc.unmarshalText(uc, text)
}
upstreamParams := []string{upstreamName} upstreamParams := []string{upstreamName}
if msg.Command != "TAGMSG" { if msg.Command != "TAGMSG" {
upstreamParams = append(upstreamParams, unmarshaledText) upstreamParams = append(upstreamParams, text)
} }
uc.SendMessageLabeled(ctx, dc.id, &irc.Message{ uc.SendMessageLabeled(ctx, dc.id, &irc.Message{