From f27f70d2481c9a72e658f45541982f0af4a1c6db Mon Sep 17 00:00:00 2001
From: Hubert Hirtz <hubert@hirtzfr.eu>
Date: Sat, 1 Aug 2020 18:28:28 +0200
Subject: Show incoming NOTICEs

---
 irc/states.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'irc/states.go')

diff --git a/irc/states.go b/irc/states.go
index 8f16d95..1817882 100644
--- a/irc/states.go
+++ b/irc/states.go
@@ -661,7 +661,7 @@ func (s *Session) handle(msg Message) (err error) {
 		if c, ok := s.channels[channel]; ok {
 			c.Topic = msg.Params[2]
 		}
-	case "PRIVMSG":
+	case "PRIVMSG", "NOTICE":
 		s.evts <- s.privmsgToEvent(msg)
 	case "TAGMSG":
 		nick, _, _ := FullMask(msg.Prefix)
@@ -753,10 +753,11 @@ func (s *Session) privmsgToEvent(msg Message) (ev Event) {
 		t = time.Now()
 	}
 
-	if target == s.lNick {
+	if !s.IsChannel(target) {
 		// PRIVMSG to self
 		ev = QueryMessageEvent{
 			UserEvent: UserEvent{Nick: nick},
+			Command:   msg.Command,
 			Content:   msg.Params[1],
 			Time:      t,
 		}
@@ -765,6 +766,7 @@ func (s *Session) privmsgToEvent(msg Message) (ev Event) {
 		ev = ChannelMessageEvent{
 			UserEvent:    UserEvent{Nick: nick},
 			ChannelEvent: ChannelEvent{Channel: msg.Params[0]},
+			Command:      msg.Command,
 			Content:      msg.Params[1],
 			Time:         t,
 		}
-- 
cgit v1.2.3