From 0bb521512a85dc7eca35976658ab0ed0378cf833 Mon Sep 17 00:00:00 2001 From: patrickxia Date: Thu, 23 May 2024 18:05:55 -0400 Subject: [PATCH] Do not bridge CTCP commands other than ACTION (irc) (#2090) CTCP commands other than ACTION are designed for client-to-client interaction on IRC networks. Drop such messages when we receive them. Also get rid of a "CTCP_ACTION" handler in the handler registration. This 1) can't do anything (if anything, we wanted the string constant girc.CTCP_ACTION, which is "ACTION") 2) doesn't do anything in this context, because CTCP handlers are registered separately: https://github.com/lrstanley/girc/blob/f47717952bf9258e02eac14f1b9723bcf084e618/ctcp.go#L205 The PRIVMSG handler already listens to all CTCPs. Thanks to @lexande for the bug report (found on a live instance). --- bridge/irc/handlers.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bridge/irc/handlers.go b/bridge/irc/handlers.go index e5aa1fc7..cb2cc855 100644 --- a/bridge/irc/handlers.go +++ b/bridge/irc/handlers.go @@ -134,7 +134,6 @@ func (b *Birc) handleNewConnection(client *girc.Client, event girc.Event) { i.Handlers.Clear("INVITE") i.Handlers.AddBg("PRIVMSG", b.handlePrivMsg) - i.Handlers.AddBg("CTCP_ACTION", b.handlePrivMsg) i.Handlers.Add(girc.RPL_TOPICWHOTIME, b.handleTopicWhoTime) i.Handlers.AddBg(girc.NOTICE, b.handleNotice) i.Handlers.AddBg("JOIN", b.handleJoinPart) @@ -206,7 +205,11 @@ func (b *Birc) handlePrivMsg(client *girc.Client, event girc.Event) { b.Log.Debugf("== Receiving PRIVMSG: %s %s %#v", event.Source.Name, event.Last(), event) // set action event - if event.IsAction() { + if ok, ctcp := event.IsCTCP(); ok { + if ctcp.Command != girc.CTCP_ACTION { + b.Log.Debugf("dropping user ctcp, command: %s", ctcp.Command) + return + } rmsg.Event = config.EventUserAction }