From 4380c48b4be7c2137a81225bfdf42a2ac37927de Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Sun, 23 Oct 2016 14:11:21 +0200
Subject: Add irc names callback only on command. Fixes #51

---
 bridge/irc/irc.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'bridge/irc')

diff --git a/bridge/irc/irc.go b/bridge/irc/irc.go
index 833fd569..9c391500 100644
--- a/bridge/irc/irc.go
+++ b/bridge/irc/irc.go
@@ -44,7 +44,9 @@ func New(config config.Protocol, origin string, c chan config.Message) *Birc {
 func (b *Birc) Command(msg *config.Message) string {
 	switch msg.Text {
 	case "!users":
+		b.i.AddCallback(ircm.RPL_ENDOFNAMES, b.endNames)
 		b.i.SendRaw("NAMES " + msg.Channel)
+		b.i.ClearCallback(ircm.RPL_ENDOFNAMES)
 	}
 	return ""
 }
@@ -133,7 +135,6 @@ func (b *Birc) handleNewConnection(event *irc.Event) {
 	i.AddCallback("PRIVMSG", b.handlePrivMsg)
 	i.AddCallback("CTCP_ACTION", b.handlePrivMsg)
 	i.AddCallback(ircm.RPL_TOPICWHOTIME, b.handleTopicWhoTime)
-	i.AddCallback(ircm.RPL_ENDOFNAMES, b.endNames)
 	i.AddCallback(ircm.RPL_NAMREPLY, b.storeNames)
 	i.AddCallback(ircm.NOTICE, b.handleNotice)
 	//i.AddCallback(ircm.RPL_MYINFO, func(e *irc.Event) { flog.Infof("%s: %s", e.Code, strings.Join(e.Arguments[1:], " ")) })
-- 
cgit v1.2.3