fix(bot): Check if user exist before perform action
This commit is contained in:
parent
6363dd6857
commit
d62b7beaf0
|
@ -9,7 +9,9 @@ func removeRole(discordClient *discordgo.Session, guildID string, userID string,
|
|||
if ! dryrun {
|
||||
err := discordClient.GuildMemberRoleRemove(guild, userID, roleID)
|
||||
if err != nil {
|
||||
logrus.Error(err.Error())
|
||||
logrus.WithFields(logrus.Fields{
|
||||
"id": userID,
|
||||
}).Error(err.Error())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -18,7 +20,9 @@ func addRole(discordClient *discordgo.Session, guildID string, userID string, ro
|
|||
if ! dryrun {
|
||||
err := discordClient.GuildMemberRoleAdd(guild, userID, roleID)
|
||||
if err != nil {
|
||||
logrus.Error(err.Error())
|
||||
logrus.WithFields(logrus.Fields{
|
||||
"id": userID,
|
||||
}).Error(err.Error())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -5,4 +5,4 @@ services:
|
|||
build: .
|
||||
container_name: bot_discord
|
||||
env_file: ./env_file
|
||||
entrypoint: bot --guild=943459216901955604 --top1=798638767359524875 --top10=801787467064672286 --top50=803729539145924649
|
||||
entrypoint: bot --guild=606162827274616845 --top1=798638767359524875 --top10=801787467064672286 --top50=803729539145924649
|
||||
|
|
2
main.go
2
main.go
|
@ -16,7 +16,7 @@ type UserRole struct {
|
|||
}
|
||||
|
||||
// Global var (I know, and i don't care)
|
||||
var api string = "https://preprod.42ctf.org/api/bot/discord?token=" + os.Getenv("AUTH_TOKEN")
|
||||
var api string = os.Getenv("API_URL")
|
||||
var guild string
|
||||
var rolesID map[string]string
|
||||
var Users map[string]*UserRole
|
||||
|
|
22
rank.go
22
rank.go
|
@ -29,7 +29,10 @@ func populateUserRole(discordClient *discordgo.Session) error {
|
|||
Users[id] = &UserRole{Rank: rank, CurrentRole: ""}
|
||||
}
|
||||
} else {
|
||||
logrus.Error("ID not found", id)
|
||||
logrus.WithFields(logrus.Fields{
|
||||
"id": id,
|
||||
"rank": rank,
|
||||
}).Error(err.Error())
|
||||
}
|
||||
}
|
||||
return nil
|
||||
|
@ -53,13 +56,18 @@ func updateUserRole(discordClient *discordgo.Session, dryrun bool) error {
|
|||
Users[id] = &UserRole{Rank: rank, CurrentRole: ""}
|
||||
}
|
||||
} else {
|
||||
logrus.Error("ID not found", id)
|
||||
logrus.WithFields(logrus.Fields{
|
||||
"id": id,
|
||||
"rank": rank,
|
||||
}).Error(err.Error())
|
||||
}
|
||||
if Users[id].Rank != rank {
|
||||
user, exist := Users[id]
|
||||
if exist {
|
||||
if user.Rank != rank {
|
||||
logrus.Info("New rank (", rank, ") for user ", id)
|
||||
if Users[id].CurrentRole != "" {
|
||||
if user.CurrentRole != "" {
|
||||
logrus.Info("Remove role for ", id)
|
||||
removeRole(discordClient, guild, id, Users[id].CurrentRole, dryrun)
|
||||
removeRole(discordClient, guild, id, user.CurrentRole, dryrun)
|
||||
Users[id] = &UserRole{Rank: rank, CurrentRole: ""}
|
||||
}
|
||||
if rank == 1 {
|
||||
|
@ -77,6 +85,7 @@ func updateUserRole(discordClient *discordgo.Session, dryrun bool) error {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
|
@ -101,6 +110,8 @@ func forceUpdate(discordClient *discordgo.Session, dryrun bool) (error) {
|
|||
} else {
|
||||
logrus.Error("ID not found", id)
|
||||
}
|
||||
_, exist := Users[id]
|
||||
if exist {
|
||||
if rank == 1 {
|
||||
logrus.Info("Add role `top1` for ", id)
|
||||
addRole(discordClient, guild, id, rolesID["top1"], dryrun)
|
||||
|
@ -115,5 +126,6 @@ func forceUpdate(discordClient *discordgo.Session, dryrun bool) (error) {
|
|||
Users[id] = &UserRole{Rank: rank, CurrentRole: rolesID["top50"]}
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue