fix(log): wrong pos in many alerts
This commit is contained in:
parent
c408afc879
commit
d38c57b830
5 changed files with 46 additions and 46 deletions
32
user/xp.go
32
user/xp.go
|
@ -22,7 +22,7 @@ func (c *Copaing) AddXP(s *discordgo.Session, m *discordgo.Member, xp uint, fn f
|
|||
c.XP += xp
|
||||
if err := c.Save(); err != nil {
|
||||
utils.SendAlert(
|
||||
"exp/level.go - Saving user",
|
||||
"user/xp.go - Saving user",
|
||||
err.Error(),
|
||||
"exp",
|
||||
c.XP,
|
||||
|
@ -44,19 +44,19 @@ func (c *Copaing) AddXP(s *discordgo.Session, m *discordgo.Member, xp uint, fn f
|
|||
func (c *Copaing) SetLastEvent() {
|
||||
client, err := config.GetRedisClient()
|
||||
if err != nil {
|
||||
utils.SendAlert("exp/member.go - Getting redis client (set)", err.Error())
|
||||
utils.SendAlert("user/xp.go - Getting redis client (set)", err.Error())
|
||||
return
|
||||
}
|
||||
t := time.Now().Unix()
|
||||
err = client.Set(context.Background(), c.GenKey(LastEvent), strconv.FormatInt(t, 10), 0).Err()
|
||||
if err != nil {
|
||||
utils.SendAlert("exp/member.go - Setting last event", err.Error(), "time", t, "base_key", c.GenKey(""))
|
||||
utils.SendAlert("user/xp.go - Setting last event", err.Error(), "time", t, "base_key", c.GenKey(""))
|
||||
return
|
||||
}
|
||||
err = client.Set(context.Background(), c.GenKey(AlreadyRemoved), "0", 0).Err()
|
||||
if err != nil {
|
||||
utils.SendAlert(
|
||||
"exp/member.go - Setting already removed to 0",
|
||||
"user/xp.go - Setting already removed to 0",
|
||||
err.Error(),
|
||||
"time",
|
||||
t,
|
||||
|
@ -70,21 +70,21 @@ func (c *Copaing) SetLastEvent() {
|
|||
func (c *Copaing) HourSinceLastEvent() uint {
|
||||
client, err := config.GetRedisClient()
|
||||
if err != nil {
|
||||
utils.SendAlert("exp/member.go - Getting redis client (get)", err.Error())
|
||||
utils.SendAlert("user/xp.go - Getting redis client (get)", err.Error())
|
||||
return 0
|
||||
}
|
||||
res := client.Get(context.Background(), c.GenKey(LastEvent))
|
||||
if errors.Is(res.Err(), redis.Nil) {
|
||||
return 0
|
||||
} else if res.Err() != nil {
|
||||
utils.SendAlert("exp/member.go - Getting last event", res.Err().Error(), "base_key", c.GenKey(""))
|
||||
utils.SendAlert("user/xp.go - Getting last event", res.Err().Error(), "base_key", c.GenKey(""))
|
||||
return 0
|
||||
}
|
||||
t := time.Now().Unix()
|
||||
last, err := strconv.Atoi(res.Val())
|
||||
if err != nil {
|
||||
utils.SendAlert(
|
||||
"exp/member.go - Converting time fetched into int (last event)",
|
||||
"user/xp.go - Converting time fetched into int (last event)",
|
||||
err.Error(),
|
||||
"base_key",
|
||||
c.GenKey(""),
|
||||
|
@ -102,14 +102,14 @@ func (c *Copaing) HourSinceLastEvent() uint {
|
|||
func (c *Copaing) AddXPAlreadyRemoved(xp uint) uint {
|
||||
client, err := config.GetRedisClient()
|
||||
if err != nil {
|
||||
utils.SendAlert("exp/member.go - Getting redis client (set)", err.Error())
|
||||
utils.SendAlert("user/xp.go - Getting redis client (set)", err.Error())
|
||||
return 0
|
||||
}
|
||||
exp := xp + c.XPAlreadyRemoved()
|
||||
err = client.Set(context.Background(), c.GenKey(AlreadyRemoved), exp, 0).Err()
|
||||
if err != nil {
|
||||
utils.SendAlert(
|
||||
"exp/member.go - Setting already removed",
|
||||
"user/xp.go - Setting already removed",
|
||||
err.Error(),
|
||||
"exp already removed",
|
||||
exp,
|
||||
|
@ -124,20 +124,20 @@ func (c *Copaing) AddXPAlreadyRemoved(xp uint) uint {
|
|||
func (c *Copaing) XPAlreadyRemoved() uint {
|
||||
client, err := config.GetRedisClient()
|
||||
if err != nil {
|
||||
utils.SendAlert("exp/member.go - Getting redis client (exp)", err.Error())
|
||||
utils.SendAlert("user/xp.go - Getting redis client (exp)", err.Error())
|
||||
return 0
|
||||
}
|
||||
res := client.Get(context.Background(), fmt.Sprintf("%s:%s", c.GenKey(""), AlreadyRemoved))
|
||||
if errors.Is(res.Err(), redis.Nil) {
|
||||
return 0
|
||||
} else if res.Err() != nil {
|
||||
utils.SendAlert("exp/member.go - Getting already removed", res.Err().Error(), "base_key", c.GenKey(""))
|
||||
utils.SendAlert("user/xp.go - Getting already removed", res.Err().Error(), "base_key", c.GenKey(""))
|
||||
return 0
|
||||
}
|
||||
xp, err := strconv.Atoi(res.Val())
|
||||
if err != nil {
|
||||
utils.SendAlert(
|
||||
"exp/member.go - Converting time fetched into int (already removed)",
|
||||
"user/xp.go - Converting time fetched into int (already removed)",
|
||||
err.Error(),
|
||||
"base_key",
|
||||
c.GenKey(""),
|
||||
|
@ -148,11 +148,11 @@ func (c *Copaing) XPAlreadyRemoved() uint {
|
|||
}
|
||||
if xp < 0 {
|
||||
utils.SendAlert(
|
||||
"exp/member.go - Assertion exp >= 0",
|
||||
"exp is negative",
|
||||
"user/xp.go - Assertion exp >= 0",
|
||||
"xp is negative",
|
||||
"base_key",
|
||||
c.GenKey(""),
|
||||
"exp",
|
||||
"xp",
|
||||
xp,
|
||||
)
|
||||
return 0
|
||||
|
@ -172,7 +172,7 @@ func (c *Copaing) AfterDelete(db *gorm.DB) error {
|
|||
ch := utils.NewTimer(48*time.Hour, func(stop chan<- interface{}) {
|
||||
if err := db.Unscoped().Where("id = ?", id).Delete(c).Error; err != nil {
|
||||
utils.SendAlert(
|
||||
"exp/member.go - Removing user from database", err.Error(),
|
||||
"user/xp.go - Removing user from database", err.Error(),
|
||||
"discord_id", dID,
|
||||
"guild_id", gID,
|
||||
)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue