From 80cae65b98113476c6a96caebc3857dda03e1f2c Mon Sep 17 00:00:00 2001 From: vaalacat Date: Sun, 28 Apr 2024 03:52:02 +0000 Subject: [PATCH] fix: unbind --- .drone.yml | 12 ++++++++---- services/tgbot/unbind.go | 34 ++++++++++++++++++++++++---------- 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/.drone.yml b/.drone.yml index b2d6839..43490ac 100644 --- a/.drone.yml +++ b/.drone.yml @@ -58,8 +58,10 @@ steps: image: git.vaala.cloud/vaalacat/drone-docker-buildx:24 privileged: true environment: - HTTP_PROXY: http://10.10.0.17:7890 - HTTPS_PROXY: http://10.10.0.17:7890 + HTTP_PROXY: + from_secret: HTTP_PROXY + HTTPS_PROXY: + from_secret: HTTP_PROXY settings: mirror: https://docker.lab.vaala.tech debug: true @@ -88,8 +90,10 @@ steps: image: git.vaala.cloud/vaalacat/drone-docker-buildx:24 privileged: true environment: - HTTP_PROXY: http://10.10.0.17:7890 - HTTPS_PROXY: http://10.10.0.17:7890 + HTTP_PROXY: + from_secret: HTTP_PROXY + HTTPS_PROXY: + from_secret: HTTP_PROXY settings: mirror: https://docker.lab.vaala.tech debug: true diff --git a/services/tgbot/unbind.go b/services/tgbot/unbind.go index b41b815..bf42f6e 100644 --- a/services/tgbot/unbind.go +++ b/services/tgbot/unbind.go @@ -5,24 +5,38 @@ import ( "tg-mc/models" tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api/v5" + "github.com/samber/lo" "github.com/sirupsen/logrus" ) func UnbindHandler(msg *tgbotapi.Message, i interface{}) { logrus.Infof("id is %d", msg.Chat.ID) - u, err := models.GetUserByTGID(msg.From.ID) + if len(msg.CommandArguments()) == 0 { + m := tgbotapi.NewMessage(msg.Chat.ID, "请输入正确的参数") + conf.Bot.Send(m) + return + } + + us, err := models.GetUsersByTGID(msg.From.ID) if err != nil { m := tgbotapi.NewMessage(msg.Chat.ID, "你还没有绑定") conf.Bot.Send(m) return } - err = u.Delete(msg.From.ID) - if err != nil { - m := tgbotapi.NewMessage(msg.Chat.ID, "解绑失败") - conf.Bot.Send(m) - return - } - m := tgbotapi.NewMessage(msg.Chat.ID, "解绑成功") - conf.Bot.Send(m) - return + + lo.Map(us, func(u models.User, _ int) bool { + if u.MCName == msg.CommandArguments() { + u.Status = 0 + err = u.Delete(msg.From.ID) + if err != nil { + m := tgbotapi.NewMessage(msg.Chat.ID, "解绑失败") + conf.Bot.Send(m) + return false + } + m := tgbotapi.NewMessage(msg.Chat.ID, "解绑成功") + conf.Bot.Send(m) + return false + } + return true + }) }