From d1386903dabb41b969cfc2e00331c20f477cf03d Mon Sep 17 00:00:00 2001
From: Knut Ahlers <knut@ahlers.me>
Date: Sat, 16 Oct 2021 14:06:25 +0200
Subject: [PATCH] [core] Add submysterygift event, add more event data to
 events

Signed-off-by: Knut Ahlers <knut@ahlers.me>
---
 events.go | 20 +++++++++++---------
 irc.go    | 35 +++++++++++++++++++++--------------
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/events.go b/events.go
index e7cf7f9..f129be3 100644
--- a/events.go
+++ b/events.go
@@ -3,15 +3,16 @@ package main
 func ptrStr(s string) *string { return &s }
 
 var (
-	eventTypeJoin    = ptrStr("join")
-	eventTypeHost    = ptrStr("host")
-	eventTypePart    = ptrStr("part")
-	eventTypePermit  = ptrStr("permit")
-	eventTypeRaid    = ptrStr("raid")
-	eventTypeResub   = ptrStr("resub")
-	eventTypeSub     = ptrStr("sub")
-	eventTypeSubgift = ptrStr("subgift")
-	eventTypeWhisper = ptrStr("whisper")
+	eventTypeJoin           = ptrStr("join")
+	eventTypeHost           = ptrStr("host")
+	eventTypePart           = ptrStr("part")
+	eventTypePermit         = ptrStr("permit")
+	eventTypeRaid           = ptrStr("raid")
+	eventTypeResub          = ptrStr("resub")
+	eventTypeSub            = ptrStr("sub")
+	eventTypeSubgift        = ptrStr("subgift")
+	eventTypeSubmysterygift = ptrStr("submysterygift")
+	eventTypeWhisper        = ptrStr("whisper")
 
 	eventTypeTwitchCategoryUpdate = ptrStr("category_update")
 	eventTypeTwitchStreamOffline  = ptrStr("stream_offline")
@@ -27,6 +28,7 @@ var (
 		eventTypeResub,
 		eventTypeSub,
 		eventTypeSubgift,
+		eventTypeSubmysterygift,
 		eventTypeWhisper,
 
 		eventTypeTwitchCategoryUpdate,
diff --git a/irc.go b/irc.go
index c1154c1..186b13d 100644
--- a/irc.go
+++ b/irc.go
@@ -267,51 +267,58 @@ func (i ircHandler) handleTwitchUsernotice(m *irc.Message) {
 		log.WithField("msg", m).Warn("Received usernotice without msg-id")
 
 	case "raid":
-		log.WithFields(log.Fields{
+		evtData := plugins.FieldCollection{
 			"channel":     i.getChannel(m),
 			"from":        m.Tags["login"],
 			"viewercount": m.Tags["msg-param-viewerCount"],
-		}).Info("Incoming raid")
+		}
+		log.WithFields(log.Fields(evtData)).Info("Incoming raid")
 
-		go handleMessage(i.c, m, eventTypeRaid, nil)
+		go handleMessage(i.c, m, eventTypeRaid, evtData)
 
 	case "resub":
-		log.WithFields(log.Fields{
+		evtData := plugins.FieldCollection{
 			"channel":           i.getChannel(m),
 			"from":              m.Tags["login"],
 			"subscribed_months": m.Tags["msg-param-cumulative-months"],
 			"plan":              m.Tags["msg-param-sub-plan"],
-		}).Info("User re-subscribed")
+		}
+		log.WithFields(log.Fields(evtData)).Info("User re-subscribed")
 
-		go handleMessage(i.c, m, eventTypeResub, nil)
+		go handleMessage(i.c, m, eventTypeResub, evtData)
 
 	case "sub":
-		log.WithFields(log.Fields{
+		evtData := plugins.FieldCollection{
 			"channel": i.getChannel(m),
 			"from":    m.Tags["login"],
 			"plan":    m.Tags["msg-param-sub-plan"],
-		}).Info("User subscribed")
+		}
+		log.WithFields(log.Fields(evtData)).Info("User subscribed")
 
-		go handleMessage(i.c, m, eventTypeSub, nil)
+		go handleMessage(i.c, m, eventTypeSub, evtData)
 
 	case "subgift", "anonsubgift":
-		log.WithFields(log.Fields{
+		evtData := plugins.FieldCollection{
 			"channel":       i.getChannel(m),
 			"from":          m.Tags["login"],
 			"gifted_months": m.Tags["msg-param-gift-months"],
 			"plan":          m.Tags["msg-param-sub-plan"],
 			"to":            m.Tags["msg-param-recipient-user-name"],
-		}).Info("User gifted a sub")
+		}
+		log.WithFields(log.Fields(evtData)).Info("User gifted a sub")
 
-		go handleMessage(i.c, m, eventTypeSubgift, nil)
+		go handleMessage(i.c, m, eventTypeSubgift, evtData)
 
 	case "submysterygift":
-		log.WithFields(log.Fields{
+		evtData := plugins.FieldCollection{
 			"channel": i.getChannel(m),
 			"from":    m.Tags["login"],
 			"number":  m.Tags["msg-param-mass-gift-count"],
 			"plan":    m.Tags["msg-param-sub-plan"],
-		}).Info("User gifted subs to the community")
+		}
+		log.WithFields(log.Fields(evtData)).Info("User gifted subs to the community")
+
+		go handleMessage(i.c, m, eventTypeSubmysterygift, evtData)
 
 	}
 }