luzifer/twitch-bot
1
0
Fork 0
Code Issues1 Pull requests Activity

[core] Lint: Move duplicate value extraction to central position

Browse source 
Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
Knut Ahlers 2022-04-17 14:56:51 +02:00
parent 585161930d
commit 5fe727d7dc
Signed by: luzifer
GPG key ID: 0066F03ED215AD7D
1 changed files with 15 additions and 24 deletions

39
irc.go
View file

@ -395,27 +395,28 @@ func (i ircHandler) handleTwitchUsernotice(m *irc.Message) {
"trailing": m.Trailing(), "trailing": m.Trailing(),
}).Trace("IRC USERNOTICE event") }).Trace("IRC USERNOTICE event")
evtData := plugins.FieldCollectionFromData(map[string]any{
"channel": i.getChannel(m), // Compatibility to plugins.DeriveChannel
"user": m.Tags["login"], // Compatibility to plugins.DeriveUser
})
switch m.Tags["msg-id"] { switch m.Tags["msg-id"] {
case "": case "":
// Notices SHOULD have msg-id tags... // Notices SHOULD have msg-id tags...
log.WithField("msg", m).Warn("Received usernotice without msg-id") log.WithField("msg", m).Warn("Received usernotice without msg-id")
case "announcement": case "announcement":
evtData := plugins.FieldCollectionFromData(map[string]any{ evtData.SetFromData(map[string]any{
"channel": i.getChannel(m), // Compatibility to plugins.DeriveChannel
"color": m.Tags["msg-param-color"], "color": m.Tags["msg-param-color"],
"message": m.Trailing(), "message": m.Trailing(),
"user": m.Tags["login"], // Compatibility to plugins.DeriveUser
}) })
log.WithFields(log.Fields(evtData.Data())).Info("Announcement was made") log.WithFields(log.Fields(evtData.Data())).Info("Announcement was made")
go handleMessage(i.c, m, eventTypeAnnouncement, evtData) go handleMessage(i.c, m, eventTypeAnnouncement, evtData)
case "giftpaidupgrade": case "giftpaidupgrade":
evtData := plugins.FieldCollectionFromData(map[string]interface{}{ evtData.SetFromData(map[string]interface{}{
"channel": i.getChannel(m), // Compatibility to plugins.DeriveChannel "gifter": m.Tags["msg-param-sender-login"],
"gifter": m.Tags["msg-param-sender-login"],
"user": m.Tags["login"], // Compatibility to plugins.DeriveUser
}) })
log.WithFields(log.Fields(evtData.Data())).Info("User upgraded to paid sub") log.WithFields(log.Fields(evtData.Data())).Info("User upgraded to paid sub")
@ -423,10 +424,8 @@ func (i ircHandler) handleTwitchUsernotice(m *irc.Message) {
case "raid": case "raid":
vc, _ := strconv.ParseInt(string(m.Tags["msg-param-viewerCount"]), 10, 64) vc, _ := strconv.ParseInt(string(m.Tags["msg-param-viewerCount"]), 10, 64)
evtData := plugins.FieldCollectionFromData(map[string]interface{}{ evtData.SetFromData(map[string]interface{}{
"channel": i.getChannel(m), // Compatibility to plugins.DeriveChannel
"from": m.Tags["login"], "from": m.Tags["login"],
"user": m.Tags["login"], // Compatibility to plugins.DeriveUser
"viewercount": vc, "viewercount": vc,
}) })
log.WithFields(log.Fields(evtData.Data())).Info("Incoming raid") log.WithFields(log.Fields(evtData.Data())).Info("Incoming raid")
@ -440,51 +439,43 @@ func (i ircHandler) handleTwitchUsernotice(m *irc.Message) {
message = "" message = ""
} }
evtData := plugins.FieldCollectionFromData(map[string]interface{}{ evtData.SetFromData(map[string]interface{}{
"channel": i.getChannel(m), // Compatibility to plugins.DeriveChannel
"from": m.Tags["login"], "from": m.Tags["login"],
"message": message, "message": message,
"subscribed_months": m.Tags["msg-param-cumulative-months"], "subscribed_months": m.Tags["msg-param-cumulative-months"],
"plan": m.Tags["msg-param-sub-plan"], "plan": m.Tags["msg-param-sub-plan"],
"user": m.Tags["login"], // Compatibility to plugins.DeriveUser
}) })
log.WithFields(log.Fields(evtData.Data())).Info("User re-subscribed") log.WithFields(log.Fields(evtData.Data())).Info("User re-subscribed")
go handleMessage(i.c, m, eventTypeResub, evtData) go handleMessage(i.c, m, eventTypeResub, evtData)
case "sub": case "sub":
evtData := plugins.FieldCollectionFromData(map[string]interface{}{ evtData.SetFromData(map[string]interface{}{
"channel": i.getChannel(m), // Compatibility to plugins.DeriveChannel "from": m.Tags["login"],
"from": m.Tags["login"], "plan": m.Tags["msg-param-sub-plan"],
"plan": m.Tags["msg-param-sub-plan"],
"user": m.Tags["login"], // Compatibility to plugins.DeriveUser
}) })
log.WithFields(log.Fields(evtData.Data())).Info("User subscribed") log.WithFields(log.Fields(evtData.Data())).Info("User subscribed")
go handleMessage(i.c, m, eventTypeSub, evtData) go handleMessage(i.c, m, eventTypeSub, evtData)
case "subgift", "anonsubgift": case "subgift", "anonsubgift":
evtData := plugins.FieldCollectionFromData(map[string]interface{}{ evtData.SetFromData(map[string]interface{}{
"channel": i.getChannel(m), // Compatibility to plugins.DeriveChannel
"from": m.Tags["login"], "from": m.Tags["login"],
"gifted_months": m.Tags["msg-param-gift-months"], "gifted_months": m.Tags["msg-param-gift-months"],
"origin_id": m.Tags["msg-param-origin-id"], "origin_id": m.Tags["msg-param-origin-id"],
"plan": m.Tags["msg-param-sub-plan"], "plan": m.Tags["msg-param-sub-plan"],
"to": m.Tags["msg-param-recipient-user-name"], "to": m.Tags["msg-param-recipient-user-name"],
"user": m.Tags["login"], // Compatibility to plugins.DeriveUser
}) })
log.WithFields(log.Fields(evtData.Data())).Info("User gifted a sub") log.WithFields(log.Fields(evtData.Data())).Info("User gifted a sub")
go handleMessage(i.c, m, eventTypeSubgift, evtData) go handleMessage(i.c, m, eventTypeSubgift, evtData)
case "submysterygift": case "submysterygift":
evtData := plugins.FieldCollectionFromData(map[string]interface{}{ evtData.SetFromData(map[string]interface{}{
"channel": i.getChannel(m), // Compatibility to plugins.DeriveChannel
"from": m.Tags["login"], "from": m.Tags["login"],
"number": m.Tags["msg-param-mass-gift-count"], "number": m.Tags["msg-param-mass-gift-count"],
"origin_id": m.Tags["msg-param-origin-id"], "origin_id": m.Tags["msg-param-origin-id"],
"plan": m.Tags["msg-param-sub-plan"], "plan": m.Tags["msg-param-sub-plan"],
"user": m.Tags["login"], // Compatibility to plugins.DeriveUser
}) })
log.WithFields(log.Fields(evtData.Data())).Info("User gifted subs to the community") log.WithFields(log.Fields(evtData.Data())).Info("User gifted subs to the community")