From 942dc68edc9a4a92990f7474dd275bebc3024080 Mon Sep 17 00:00:00 2001 From: Damian Zaremba Date: Wed, 11 Dec 2024 12:50:29 +0000 Subject: [PATCH] Cleanup mysql generation --- pkg/cbng/database/cluebot/cluebot.go | 10 +++++----- pkg/cbng/wikipedia/wikipedia.go | 20 +++++--------------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/pkg/cbng/database/cluebot/cluebot.go b/pkg/cbng/database/cluebot/cluebot.go index 0e9dbb0..0300861 100644 --- a/pkg/cbng/database/cluebot/cluebot.go +++ b/pkg/cbng/database/cluebot/cluebot.go @@ -41,8 +41,6 @@ func (ci *CluebotInstance) GenerateVandalismId(logger *logrus.Entry, ctx context _, span := metrics.OtelTracer.Start(ctx, "database.cluebot.GenerateVandalismId") defer span.End() - var vandalismId int64 - db := ci.getDatabaseConnection() defer db.Close() @@ -50,12 +48,14 @@ func (ci *CluebotInstance) GenerateVandalismId(logger *logrus.Entry, ctx context if err != nil { logger.Errorf("Error running query: %v", err) span.SetStatus(codes.Error, err.Error()) - return vandalismId, err + return 0, err } - if vandalismId, err := res.LastInsertId(); err != nil { + + vandalismId, err := res.LastInsertId() + if err != nil { logger.Errorf("Failed to get insert id: %v", err) span.SetStatus(codes.Error, err.Error()) - return vandalismId, err + return 0, err } logger.Debugf("Generated id %v", vandalismId) diff --git a/pkg/cbng/wikipedia/wikipedia.go b/pkg/cbng/wikipedia/wikipedia.go index c2041ed..739d828 100644 --- a/pkg/cbng/wikipedia/wikipedia.go +++ b/pkg/cbng/wikipedia/wikipedia.go @@ -453,21 +453,11 @@ func (w *WikipediaApi) GetWarningLevel(l *logrus.Entry, parentCtx context.Contex matches := regexp.MustCompile(`.*(\d{2}:\d{2}, \d+ [a-zA-Z]+ \d{4} \(UTC\))`).FindAllStringSubmatch(page.Data, -1) level := 0 for _, match := range matches { - mlevel, err := strconv.Atoi(match[1]) - if err != nil { - span.SetStatus(codes.Error, err.Error()) - logger.Warnf("Failed to parse '%v' into int: %v", match[1], err) - continue - } - if match[2] != "" { - t, err := time.Parse("15:04, 02 January 2006 (MST)", match[2]) - if err != nil { - span.SetStatus(codes.Error, err.Error()) - logger.Warnf("Failed to parse '%v' into time: %v", match[2], err) - continue - } - if mlevel > level && t.Second() <= (2*24*60*60) { - level = mlevel + if matchLevel, err := strconv.Atoi(match[1]); err == nil { + if t, err := time.Parse("15:04, 02 January 2006 (MST)", match[2]); err == nil { + if matchLevel > level && t.Second() <= (2*24*60*60) { + level = matchLevel + } } } }