nick12
/
hmn
forked from hmn/hmn
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added logs

This commit is contained in:
Asaf Gartner 2022-03-27 19:41:21 +03:00
parent febec72325
commit 70cd2ec72b
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/twitch/twitch.go
View File

@ -350,7 +350,7 @@ func notifyDiscordOfLiveStream(ctx context.Context, dbConn db.ConnOrTx, twitchLo
err = discord.SendMessages(ctx, dbConn, discord.MessageToSend{ err = discord.SendMessages(ctx, dbConn, discord.MessageToSend{
ChannelID: config.Config.Discord.StreamsChannelID, ChannelID: config.Config.Discord.StreamsChannelID,
Req: discord.CreateMessageRequest{ Req: discord.CreateMessageRequest{
Content: fmt.Sprintf("%s is live: https://twitch.tv/%s\n%s", twitchLogin, twitchLogin, title), Content: fmt.Sprintf("%s is live: https://twitch.tv/%s\n> %s", twitchLogin, twitchLogin, title),
}, },
}) })
} }
@ -358,11 +358,12 @@ func notifyDiscordOfLiveStream(ctx context.Context, dbConn db.ConnOrTx, twitchLo
} }
func processEventSubNotification(ctx context.Context, dbConn db.ConnOrTx, notification *twitchNotification) { func processEventSubNotification(ctx context.Context, dbConn db.ConnOrTx, notification *twitchNotification) {
log := logging.ExtractLogger(ctx)
log.Debug().Interface("Notification", notification).Msg("Processing twitch notification")
if notification.Type == notificationTypeNone { if notification.Type == notificationTypeNone {
return return
} }
log := logging.ExtractLogger(ctx)
status := streamStatus{ status := streamStatus{
TwitchID: notification.TwitchID, TwitchID: notification.TwitchID,
Live: false, Live: false,
@ -387,11 +388,13 @@ func processEventSubNotification(ctx context.Context, dbConn db.ConnOrTx, notifi
} }
} }
log.Debug().Interface("Status", status).Msg("Updating status")
inserted, err := updateStreamStatusInDB(ctx, dbConn, &status) inserted, err := updateStreamStatusInDB(ctx, dbConn, &status)
if err != nil { if err != nil {
log.Error().Err(err).Msg("failed to update twitch stream status") log.Error().Err(err).Msg("failed to update twitch stream status")
} }
if inserted { if inserted {
log.Debug().Msg("Notifying discord")
err = notifyDiscordOfLiveStream(ctx, dbConn, status.TwitchLogin, status.Title) err = notifyDiscordOfLiveStream(ctx, dbConn, status.TwitchLogin, status.Title)
if err != nil { if err != nil {
log.Error().Err(err).Msg("failed to notify discord") log.Error().Err(err).Msg("failed to notify discord")
@ -400,8 +403,10 @@ func processEventSubNotification(ctx context.Context, dbConn db.ConnOrTx, notifi
} }
func updateStreamStatusInDB(ctx context.Context, conn db.ConnOrTx, status *streamStatus) (bool, error) { func updateStreamStatusInDB(ctx context.Context, conn db.ConnOrTx, status *streamStatus) (bool, error) {
log := logging.ExtractLogger(ctx)
inserted := false inserted := false
if isStatusRelevant(status) { if isStatusRelevant(status) {
log.Debug().Msg("Status relevant")
_, err := db.QueryOne(ctx, conn, models.TwitchStream{}, _, err := db.QueryOne(ctx, conn, models.TwitchStream{},
` `
SELECT $columns SELECT $columns
@ -411,6 +416,7 @@ func updateStreamStatusInDB(ctx context.Context, conn db.ConnOrTx, status *strea
status.TwitchID, status.TwitchID,
) )
if err == db.NotFound { if err == db.NotFound {
log.Debug().Msg("Inserting new stream")
inserted = true inserted = true
} else if err != nil { } else if err != nil {
return false, oops.New(err, "failed to query existing stream") return false, oops.New(err, "failed to query existing stream")
@ -432,6 +438,7 @@ func updateStreamStatusInDB(ctx context.Context, conn db.ConnOrTx, status *strea
return false, oops.New(err, "failed to insert twitch streamer into db") return false, oops.New(err, "failed to insert twitch streamer into db")
} }
} else { } else {
log.Debug().Msg("Stream not relevant")
_, err := conn.Exec(ctx, _, err := conn.Exec(ctx,
` `
DELETE FROM twitch_streams WHERE twitch_id = $1 DELETE FROM twitch_streams WHERE twitch_id = $1
@ -441,7 +448,6 @@ func updateStreamStatusInDB(ctx context.Context, conn db.ConnOrTx, status *strea
if err != nil { if err != nil {
return false, oops.New(err, "failed to remove twitch streamer from db") return false, oops.New(err, "failed to remove twitch streamer from db")
} }
inserted = false
} }
return inserted, nil return inserted, nil
} }

2
src/website/twitch.go
View File

@ -40,6 +40,8 @@ func TwitchEventSubCallback(c *RequestContext) ResponseData {
return res return res
} }
c.Logger.Debug().Str("Body", string(body[:])).Str("Type", messageType).Msg("Got twitch webhook")
if messageType == "webhook_callback_verification" { if messageType == "webhook_callback_verification" {
type challengeReq struct { type challengeReq struct {
Challenge string `json:"challenge"` Challenge string `json:"challenge"`