improve message format

Author: tomiok

botservice/messages/messageCreate.go botservice/messages/message_create.go

@@ -2,6 +2,7 @@ package messages
 
 import (
 	"database/sql"
+	"log"
 	"strings"
 
 	"github.com/bwmarrin/discordgo"
@@ -40,9 +41,12 @@ func MessageCmd(s *discordgo.Session, m *discordgo.MessageCreate) {
 			-**Description:**
 			` + msg.Description
 
-			_, _ = s.ChannelMessageSend(m.ChannelID, message)
-		}
+			_, err = s.ChannelMessageSend(m.ChannelID, message)
 
+			if err != nil {
+				log.Println("cannot send message")
+				log.Println(err.Error())
+			}
+		}
 	}
-
 }

botservice/storage/models.go

@@ -1,10 +1,5 @@
 package storage
 
-import (
-	"log"
-	"strings"
-)
-
 type ResponseCMD struct {
 	ID  int
 	CMD string
@@ -17,21 +12,10 @@ type ChallengeResponse struct {
 	ChallengeType string
 }
 
-func BuildResponse(res string) *ChallengeResponse {
-	values := strings.Split(res, ",")
-
-	// the response from the lib is
-	// type,description,level
-
-	if len(values) != 3 {
-		log.Println("response broken from lib")
-		return &ChallengeResponse{}
-	}
-
+func BuildResponse(desc, level, challengeType string) *ChallengeResponse {
 	return &ChallengeResponse{
-		ChallengeType: values[0],
-		Description:   values[1],
-		Level:         values[2],
+		ChallengeType: challengeType,
+		Description:   desc,
+		Level:         level,
 	}
-
 }

botservice/storage/querys.go botservice/storage/queries.go

@@ -3,9 +3,7 @@ package storage
 import (
 	"github.com/tomiok/challenge-lib"
 	"log"
-	"math/rand"
 	"strings"
-	"time"
 )
 
 func (res *ResponseCMD) GetCmd(cmd string) (*ResponseCMD, error) {
@@ -24,18 +22,13 @@ func (res *ResponseCMD) GetCmd(cmd string) (*ResponseCMD, error) {
 func (res *ChallengeResponse) GetChallenge(cmd string) (*ChallengeResponse, error) {
 	values := strings.Split(cmd, " ")
 
-	if len(values) == 0 || len(values) == 1 {
+	if len(values) == 0 || len(values) == 1 || len(values) == 3 {
 		log.Println("using default values for find a challenge")
 		message := challengelib.FindChallenge("easy", "backend")
-		return BuildResponse(message), nil
+		return BuildResponse(message, "easy", "backend"), nil
 	}
-
-	message := challengelib.FindChallenge(values[0], values[1])
-	return BuildResponse(message), nil
-}
-
-func randomId(count int) int {
-	rand.Seed(time.Now().UTC().UnixNano())
-	// valor entre 1 y count
-	return rand.Intn(count-1) + 1
+	level := values[2]
+	challengeType := values[3]
+	message := challengelib.FindChallenge(level, challengeType)
+	return BuildResponse(message, level, challengeType), nil
 }

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/bwmarrin/discordgo v0.23.2
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/gofiber/fiber/v2 v2.17.0
-	github.com/tomiok/challenge-lib v0.0.2
+	github.com/tomiok/challenge-lib v0.0.4
 	gorm.io/driver/mysql v1.1.2
 	gorm.io/gorm v1.21.13
 )

go.sum

@@ -17,8 +17,8 @@ github.com/jinzhu/now v1.1.2 h1:eVKgfIdy9b6zbWBMgFpfDPoAMifwSZagU9HmEU6zgiI=
 github.com/jinzhu/now v1.1.2/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/klauspost/compress v1.12.2 h1:2KCfW3I9M7nSc5wOqXAlW2v2U6v+w6cbjvbfp+OykW8=
 github.com/klauspost/compress v1.12.2/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg=
-github.com/tomiok/challenge-lib v0.0.2 h1:rqtZRekEVussXQxV80dHJZHBYLmEAcXsTPAL1qqvUbE=
-github.com/tomiok/challenge-lib v0.0.2/go.mod h1:cqcMANTp4P8KnhiOy6EgcryjupblrlzPYECah2V/Sp4=
+github.com/tomiok/challenge-lib v0.0.4 h1:IVZVHzpdVZXnNxcWKq9ZMtMxC14gPtIIxaTt93r0y0k=
+github.com/tomiok/challenge-lib v0.0.4/go.mod h1:cqcMANTp4P8KnhiOy6EgcryjupblrlzPYECah2V/Sp4=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasthttp v1.26.0 h1:k5Tooi31zPG/g8yS6o2RffRO2C9B9Kah9SY8j/S7058=

vendor/modules.txt

@@ -29,7 +29,7 @@ github.com/jinzhu/now
 github.com/klauspost/compress/flate
 github.com/klauspost/compress/gzip
 github.com/klauspost/compress/zlib
-# github.com/tomiok/challenge-lib v0.0.1
+# github.com/tomiok/challenge-lib v0.0.4
 ## explicit
 github.com/tomiok/challenge-lib
 # github.com/valyala/bytebufferpool v1.0.0