diff --git a/app/http/endpoints/api/customisation/updatecolours.go b/app/http/endpoints/api/customisation/updatecolours.go index 41a0ae1..1ac3962 100644 --- a/app/http/endpoints/api/customisation/updatecolours.go +++ b/app/http/endpoints/api/customisation/updatecolours.go @@ -2,7 +2,6 @@ package customisation import ( "context" - "fmt" "github.com/TicketsBot/GoPanel/botcontext" dbclient "github.com/TicketsBot/GoPanel/database" "github.com/TicketsBot/GoPanel/rpc" @@ -19,9 +18,9 @@ func UpdateColours(ctx *gin.Context) { botContext, err := botcontext.ContextForGuild(guildId) if err != nil { - ctx.JSON(500, utils.ErrorJson(err)) - return - } + ctx.JSON(500, utils.ErrorJson(err)) + return + } // Allow votes premiumTier, err := rpc.PremiumClient.GetTierByGuildId(guildId, true, botContext.Token, botContext.RateLimiter) @@ -58,17 +57,14 @@ func UpdateColours(ctx *gin.Context) { colourCode := colourCode hex := hex - fmt.Printf("%d: %d\n", colourCode, hex) - group.Go(func() error { - fmt.Printf("%d: %d\n", colourCode, hex.Int()) return dbclient.Client.CustomColours.Set(guildId, colourCode.Int16(), hex.Int()) }) } if err := group.Wait(); err != nil { ctx.JSON(500, utils.ErrorJson(err)) - return + return } ctx.JSON(200, utils.SuccessResponse) diff --git a/go.mod b/go.mod index 0385353..4b26c1d 100644 --- a/go.mod +++ b/go.mod @@ -6,9 +6,9 @@ require ( github.com/BurntSushi/toml v0.3.1 github.com/TicketsBot/archiverclient v0.0.0-20220326163414-558fd52746dc github.com/TicketsBot/common v0.0.0-20220311020409-8068ba1c2ea3 - github.com/TicketsBot/database v0.0.0-20220603222812-d2517d32e85c + github.com/TicketsBot/database v0.0.0-20220607161420-8fe66810f22a github.com/TicketsBot/logarchiver v0.0.0-20220326162808-cdf0310f5e1c - github.com/TicketsBot/worker v0.0.0-20220411233045-a69c2a4c8b30 + github.com/TicketsBot/worker v0.0.0-20220607165600-98de220b5d33 github.com/apex/log v1.1.2 github.com/getsentry/sentry-go v0.13.0 github.com/gin-contrib/static v0.0.0-20191128031702-f81c604d8ac2 @@ -22,7 +22,7 @@ require ( github.com/jackc/pgx/v4 v4.7.1 github.com/pasztorpisti/qs v0.0.0-20171216220353-8d6c33ee906c github.com/pkg/errors v0.9.1 - github.com/rxdn/gdl v0.0.0-20220209151849-19fd8c86af50 + github.com/rxdn/gdl v0.0.0-20220606005624-88c41fdba66a github.com/sirupsen/logrus v1.5.0 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 ) diff --git a/go.sum b/go.sum index 365f96f..ad5900c 100644 --- a/go.sum +++ b/go.sum @@ -12,12 +12,15 @@ github.com/TicketsBot/database v0.0.0-20220603220658-115fdacde285 h1:aJlqo6SoOAU github.com/TicketsBot/database v0.0.0-20220603220658-115fdacde285/go.mod h1:F57cywrZsnper1cy56Bx0c/HEsxQBLHz3Pl98WXblWw= github.com/TicketsBot/database v0.0.0-20220603222812-d2517d32e85c h1:7DxcAIeoo1KORMPt1SiQOunv+O9kZ6tx1kYCbMzINNA= github.com/TicketsBot/database v0.0.0-20220603222812-d2517d32e85c/go.mod h1:F57cywrZsnper1cy56Bx0c/HEsxQBLHz3Pl98WXblWw= +github.com/TicketsBot/database v0.0.0-20220607161420-8fe66810f22a/go.mod h1:F57cywrZsnper1cy56Bx0c/HEsxQBLHz3Pl98WXblWw= github.com/TicketsBot/logarchiver v0.0.0-20220326162808-cdf0310f5e1c h1:OqGjFH6mbE6gd+NqI2ARJdtH3UUvhiAkD0r0fhGJK2s= github.com/TicketsBot/logarchiver v0.0.0-20220326162808-cdf0310f5e1c/go.mod h1:jgi2OXQKsd5nUnTIRkwvPmeuD/i7OhN68LKMssuQY1c= github.com/TicketsBot/ttlcache v1.6.1-0.20200405150101-acc18e37b261 h1:NHD5GB6cjlkpZFjC76Yli2S63/J2nhr8MuE6KlYJpQM= github.com/TicketsBot/ttlcache v1.6.1-0.20200405150101-acc18e37b261/go.mod h1:2zPxDAN2TAPpxUPjxszjs3QFKreKrQh5al/R3cMXmYk= github.com/TicketsBot/worker v0.0.0-20220411233045-a69c2a4c8b30 h1:gfW/cIeA1DyH53q96Jqq+gqdIsuzIYYGHljwbHrChWY= github.com/TicketsBot/worker v0.0.0-20220411233045-a69c2a4c8b30/go.mod h1:ljMAQMiB5Gf3jgI9EGugAPAErjh2Ykwx3toD8z33KGY= +github.com/TicketsBot/worker v0.0.0-20220607165600-98de220b5d33 h1:ZwUPy3Zu6k+mHDFo18sZN2XG9rgUBWYsdmqdozWficc= +github.com/TicketsBot/worker v0.0.0-20220607165600-98de220b5d33/go.mod h1:5Kfk5wFwSM5YU51SF0SF3hNNBW8XWcHFbC5ICiidKDA= github.com/apex/log v1.1.2 h1:bnDuVoi+o98wOdVqfEzNDlY0tcmBia7r4YkjS9EqGYk= github.com/apex/log v1.1.2/go.mod h1:SyfRweFO+TlkIJ3DVizTSeI1xk7jOIIqOnUPZQTTsww= github.com/apex/logs v0.0.3/go.mod h1:XzxuLZ5myVHDy9SAmYpamKKRNApGj54PfYLcFrXqDwo= @@ -282,6 +285,8 @@ github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThC github.com/rxdn/gdl v0.0.0-20210527173953-25dde613ff0a/go.mod h1:jvcb1N6AdaGx3/e8MoLedO6qSo/+UdA5GGHOA8cnAeU= github.com/rxdn/gdl v0.0.0-20220209151849-19fd8c86af50 h1:xkWpJfblzNEzt/wQ0OB/vqJdLBnSCYIcuVE6z396MWY= github.com/rxdn/gdl v0.0.0-20220209151849-19fd8c86af50/go.mod h1:rENs8TxMsoYSJRssegNS/+fy18NCI9EUdCJX8R83PlY= +github.com/rxdn/gdl v0.0.0-20220606005624-88c41fdba66a h1:q14vLjN6OeEpi9DZjMZaEJDkPOSjP2mwNphIRZ6InI0= +github.com/rxdn/gdl v0.0.0-20220606005624-88c41fdba66a/go.mod h1:HtxfLp4OaoPoDJHQ4JOx/QeLH2d40VgT3wNOf7ETsRE= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/schollz/progressbar/v3 v3.8.2 h1:2kZJwZCpb+E/V79kGO7daeq+hUwUJW0A5QD1Wv455dA= github.com/schollz/progressbar/v3 v3.8.2/go.mod h1:9KHLdyuXczIsyStQwzvW8xiELskmX7fQMaZdN23nAv8=