scout_ante/dashboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump worker

Browse Source
This commit is contained in:
rxdn 2021-07-27 14:07:24 +01:00
parent e0c1828f4b
commit cc326c5611
10 changed files with 56 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/http/endpoints/api/autoclose/autoclosepost.go
View File

@ -31,7 +31,11 @@ func PostAutoClose(ctx *gin.Context) {
return
}
premiumTier := rpc.PremiumClient.GetTierByGuildId(guildId, true, botContext.Token, botContext.RateLimiter)
premiumTier, err := rpc.PremiumClient.GetTierByGuildId(guildId, true, botContext.Token, botContext.RateLimiter)
if err != nil {
ctx.JSON(500, utils.ErrorJson(err))
return
}
if premiumTier < premium.Premium {
settings.SinceOpenWithNoResponse = nil

7
app/http/endpoints/api/panel/multipanelcreate.go
View File

@ -56,7 +56,12 @@ func MultiPanelCreate(ctx *gin.Context) {
}
// get premium status
premiumTier := rpc.PremiumClient.GetTierByGuildId(guildId, true, botContext.Token, botContext.RateLimiter)
premiumTier, err := rpc.PremiumClient.GetTierByGuildId(guildId, true, botContext.Token, botContext.RateLimiter)
if err != nil {
ctx.JSON(500, utils.ErrorJson(err))
return
}
messageId, err := data.sendEmbed(&botContext, premiumTier > premium.None, panels)
if err != nil {

6
app/http/endpoints/api/panel/multipanelupdate.go
View File

@ -84,7 +84,11 @@ func MultiPanelUpdate(ctx *gin.Context) {
}
// get premium status
premiumTier := rpc.PremiumClient.GetTierByGuildId(guildId, true, botContext.Token, botContext.RateLimiter)
premiumTier, err := rpc.PremiumClient.GetTierByGuildId(guildId, true, botContext.Token, botContext.RateLimiter)
if err != nil {
ctx.JSON(500, utils.ErrorJson(err))
return
}
// send new message
messageId, err := data.sendEmbed(&botContext, premiumTier > premium.None, panels)

6
app/http/endpoints/api/panel/panelcreate.go
View File

@ -68,7 +68,11 @@ func CreatePanel(ctx *gin.Context) {
data.MessageId = 0
// Check panel quota
premiumTier := rpc.PremiumClient.GetTierByGuildId(guildId, false, botContext.Token, botContext.RateLimiter)
premiumTier, err := rpc.PremiumClient.GetTierByGuildId(guildId, false, botContext.Token, botContext.RateLimiter)
if err != nil {
ctx.JSON(500, utils.ErrorJson(err))
return
}
if premiumTier == premium.None {
panels, err := dbclient.Client.Panel.GetByGuild(guildId)

6
app/http/endpoints/api/panel/panelupdate.go
View File

@ -64,7 +64,11 @@ func UpdatePanel(ctx *gin.Context) {
return
}
premiumTier := rpc.PremiumClient.GetTierByGuildId(guildId, true, botContext.Token, botContext.RateLimiter)
premiumTier, err := rpc.PremiumClient.GetTierByGuildId(guildId, true, botContext.Token, botContext.RateLimiter)
if err != nil {
ctx.JSON(500, utils.ErrorJson(err))
return
}
for _, multiPanel := range multiPanels {
panels, err := dbclient.Client.MultiPanelTargets.GetPanels(multiPanel.Id)

7
app/http/endpoints/api/premium.go
View File

@ -3,6 +3,7 @@ package api
import (
"github.com/TicketsBot/GoPanel/botcontext"
"github.com/TicketsBot/GoPanel/rpc"
"github.com/TicketsBot/GoPanel/utils"
"github.com/TicketsBot/common/premium"
"github.com/gin-gonic/gin"
)
@ -19,7 +20,11 @@ func PremiumHandler(ctx *gin.Context) {
return
}
premiumTier := rpc.PremiumClient.GetTierByGuildId(guildId, true, botContext.Token, botContext.RateLimiter)
premiumTier, err := rpc.PremiumClient.GetTierByGuildId(guildId, true, botContext.Token, botContext.RateLimiter)
if err != nil {
ctx.JSON(500, utils.ErrorJson(err))
return
}
ctx.JSON(200, gin.H{
"premium": premiumTier >= premium.Premium,

8
app/http/endpoints/api/ticket/sendmessage.go
View File

@ -7,6 +7,7 @@ import (
"github.com/TicketsBot/GoPanel/database"
"github.com/TicketsBot/GoPanel/rpc"
"github.com/TicketsBot/GoPanel/rpc/cache"
"github.com/TicketsBot/GoPanel/utils"
"github.com/TicketsBot/common/premium"
"github.com/gin-gonic/gin"
"github.com/rxdn/gdl/rest"
@ -59,7 +60,12 @@ func SendMessage(ctx *gin.Context) {
}
// Verify guild is premium
premiumTier := rpc.PremiumClient.GetTierByGuildId(guildId, true, botContext.Token, botContext.RateLimiter)
premiumTier, err := rpc.PremiumClient.GetTierByGuildId(guildId, true, botContext.Token, botContext.RateLimiter)
if err != nil {
ctx.JSON(500, utils.ErrorJson(err))
return
}
if premiumTier == premium.None {
ctx.AbortWithStatusJSON(402, gin.H{
"success": false,

7
app/http/endpoints/root/webchatws.go
View File

@ -177,7 +177,12 @@ func WebChatWs(ctx *gin.Context) {
}
// Verify the guild is premium
premiumTier := rpc.PremiumClient.GetTierByGuildId(authData.GuildId, true, botContext.Token, botContext.RateLimiter)
premiumTier, err := rpc.PremiumClient.GetTierByGuildId(authData.GuildId, true, botContext.Token, botContext.RateLimiter)
if err != nil {
ctx.JSON(500, utils.ErrorJson(err))
return
}
if premiumTier == premium.None {
fmt.Println(4)
conn.Close()

10
app/http/middleware/verifywhitelabel.go
View File

@ -4,16 +4,22 @@ import (
"fmt"
"github.com/TicketsBot/GoPanel/config"
"github.com/TicketsBot/GoPanel/rpc"
"github.com/TicketsBot/GoPanel/utils"
"github.com/TicketsBot/common/premium"
"github.com/gin-gonic/gin"
)
func VerifyWhitelabel(isApi bool) func(ctx *gin.Context) {
return func(ctx *gin.Context) {
userId := ctx.Keys["userid"].(uint64)
if rpc.PremiumClient.GetTierByUser(userId, false) < premium.Whitelabel {
tier, err := rpc.PremiumClient.GetTierByUser(userId, false)
if err != nil {
ctx.JSON(500, utils.ErrorJson(err))
return
}
if tier < premium.Whitelabel {
var isForced bool
for _, id := range config.Conf.ForceWhitelabel {
if id == userId {

6
go.mod
View File

@ -5,9 +5,9 @@ go 1.14
require (
github.com/BurntSushi/toml v0.3.1
github.com/TicketsBot/archiverclient v0.0.0-20210220155137-a562b2f1bbbb
github.com/TicketsBot/common v0.0.0-20210604175952-03cfa14c16e1
github.com/TicketsBot/database v0.0.0-20210724134842-d5a99b5a6f18
github.com/TicketsBot/worker v0.0.0-20210715115321-395f29f5d5e1
github.com/TicketsBot/common v0.0.0-20210727122454-304ff13e33cb
github.com/TicketsBot/database v0.0.0-20210725125137-5540e9ff7484
github.com/TicketsBot/worker v0.0.0-20210727130432-3df3cd1246a3
github.com/apex/log v1.1.2
github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff // indirect
github.com/gin-contrib/static v0.0.0-20191128031702-f81c604d8ac2