no int casting

Author: stelzo

almanax.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"log"
 	"net/http"
-	"strconv"
 	"strings"
 	"time"
 
@@ -266,7 +265,7 @@ func handleCreateAlmanax(w http.ResponseWriter, r *http.Request) {
 	}
 
 	requestedBonuses := map[string]*Set[string]{}
-	requestedMentions := map[string]*Set[uint64]{}
+	requestedMentions := map[string]*Set[json.Number]{}
 
 	if createWebhook.Mentions != nil {
 
@@ -280,7 +279,7 @@ func handleCreateAlmanax(w http.ResponseWriter, r *http.Request) {
 				requestedBonuses[bonusId] = NewSet[string]()
 			}
 			if _, ok := requestedMentions[bonusId]; !ok {
-				requestedMentions[bonusId] = NewSet[uint64]()
+				requestedMentions[bonusId] = NewSet[json.Number]()
 			}
 			if !possibleBonuses.Has(bonusId) {
 				http.Error(w, "Unknown almanax bonus id: "+bonusId+".", http.StatusBadRequest)
@@ -298,12 +297,7 @@ func handleCreateAlmanax(w http.ResponseWriter, r *http.Request) {
 						return
 					}
 				}
-				discordId, err := mention.DiscordId.Int64()
-				if err != nil {
-					http.Error(w, "Invalid discord id.", http.StatusBadRequest)
-					return
-				}
-				requestedMentions[bonusId].Add(uint64(discordId))
+				requestedMentions[bonusId].Add(mention.DiscordId)
 			}
 		}
 	}
@@ -940,11 +934,7 @@ func buildDiscordHookAlmanax(almanaxSend AlmanaxSend) ([]PreparedHook, error) {
 				if mentions, ok := hookMentions[almBonusType.GetId()]; ok {
 					var mentionStrings []string
 					for _, mention := range mentions {
-						discordId, err := mention.DiscordId.Int64()
-						if err != nil {
-							return nil, err
-						}
-						idStr := strconv.FormatInt(discordId, 10)
+						idStr := mention.DiscordId.String()
 						found := false
 						for _, alreadyInsertedMention := range mentionStrings {
 							if strings.Contains(alreadyInsertedMention, idStr) {
@@ -982,11 +972,7 @@ func buildDiscordHookAlmanax(almanaxSend AlmanaxSend) ([]PreparedHook, error) {
 
 					var mentionStrings []string
 					for _, mention := range mentions {
-						discordId, err := mention.DiscordId.Int64()
-						if err != nil {
-							return nil, err
-						}
-						idStr := strconv.FormatInt(discordId, 10)
+						idStr := mention.DiscordId.String()
 						if mention.IsRole {
 							mentionStrings = append(mentionStrings, "<@&"+idStr+">")
 						} else {

go.mod

@@ -6,7 +6,7 @@ toolchain go1.23.0
 
 require (
 	github.com/JohannesKaufmann/html-to-markdown v1.6.0
-	github.com/dofusdude/dodugo v1.0.0-rc.9
+	github.com/dofusdude/dodugo v1.0.0
 	github.com/go-chi/chi/v5 v5.2.0
 	github.com/google/uuid v1.6.0
 	github.com/jackc/pgx/v5 v5.7.2

go.sum

@@ -19,8 +19,8 @@ github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dofusdude/dodugo v1.0.0-rc.9 h1:4aEEjipVjoKyiSuY1YRNF625lqnTIdiqarbtGFRITt4=
-github.com/dofusdude/dodugo v1.0.0-rc.9/go.mod h1:R/MZWCsB/+GpFctfckhOWmqpCMgmGkB+YC3N3TS3n6Y=
+github.com/dofusdude/dodugo v1.0.0 h1:wjNw2YmiaNYneGn9ZMlnHzJZIP5EurugNs7LmC3zrXc=
+github.com/dofusdude/dodugo v1.0.0/go.mod h1:R/MZWCsB/+GpFctfckhOWmqpCMgmGkB+YC3N3TS3n6Y=
 github.com/go-chi/chi/v5 v5.2.0 h1:Aj1EtB0qR2Rdo2dG4O94RIU35w2lvQSj6BRA4+qwFL0=
 github.com/go-chi/chi/v5 v5.2.0/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=

repository.go

@@ -2,7 +2,9 @@ package main
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
+	"fmt"
 	"log"
 	"sync"
 	"time"
@@ -676,10 +678,12 @@ func (r *Repository) GetAlmanaxDiscordMentions(id uuid.UUID) (map[string][]Menti
 		var bonusId string
 
 		var mention MentionDTO
-		err = rows.Scan(&bonusId, &mention.DiscordId, &mention.IsRole, &mention.PingDaysBefore)
+		var discordId uint64
+		err = rows.Scan(&bonusId, discordId, &mention.IsRole, &mention.PingDaysBefore)
 		if err != nil {
 			return res, err
 		}
+		mention.DiscordId = json.Number(fmt.Sprint(discordId))
 
 		res[bonusId] = append(res[bonusId], mention)
 	}
@@ -723,12 +727,12 @@ func (r *Repository) CreateAlmanaxHook(createHook CreateAlmanaxHook) (uuid.UUID,
 	if createHook.Mentions != nil {
 		for bonus, mentions := range *createHook.Mentions {
 			for _, mention := range mentions {
-				var discordId uuid.UUID
-				err = r.conn.QueryRow(r.ctx, "insert into discord_mentions (discord_id, is_role) values ($1, $2) returning id", mention.DiscordId, mention.IsRole).Scan(&discordId)
+				var discordMentionId uuid.UUID
+				err = r.conn.QueryRow(r.ctx, "insert into discord_mentions (discord_id, is_role) values ($1, $2) returning id", mention.DiscordId.String(), mention.IsRole).Scan(&discordMentionId)
 				if err != nil {
 					return id, err
 				}
-				_, err = r.conn.Exec(r.ctx, "insert into almanax_mentions (almanax_webhook_id, almanax_bonus_id, discord_mention_id, ping_days_before) values ($1, $2, $3, $4)", id, bonus, discordId, mention.PingDaysBefore)
+				_, err = r.conn.Exec(r.ctx, "insert into almanax_mentions (almanax_webhook_id, almanax_bonus_id, discord_mention_id, ping_days_before) values ($1, $2, $3, $4)", id, bonus, discordMentionId, mention.PingDaysBefore)
 				if err != nil {
 					return id, err
 				}