Merge pull request #39 from CSUSTers/dev

hot fix some issue

.github/workflows/docker_push_release.yml

@@ -44,6 +44,7 @@ jobs:
           build-args: |
             TAG=${{ steps.version.outputs.tag }}
             BRANCH=release
+            RELEASE=release
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}

Dockerfile

@@ -6,6 +6,13 @@ FROM golang:alpine AS buildenv
 
 RUN apk add make git tzdata
 
+ARG BRANCH
+ARG TAG
+ARG RELEASE
+
+ENV BRANCH=$BRANCH
+ENV TAG=$TAG
+
 WORKDIR /go/src/app
 COPY . .
 RUN make deploy

Makefile

@@ -1,8 +1,14 @@
 .PHONY: get build test fmt deploy run clean
 
 PROJECT := csust-got
-VERSION ?= $(if $(TAG),$(TAG),$(shell git rev-parse --short HEAD))
-BRANCH ?= $(shell git branch --show-current)
+ifeq ($(VERSION),) 
+	VERSION := $(if $(TAG),$(TAG),$(shell git rev-parse --short HEAD))
+endif
+
+ifeq ($(BRANCH),)
+	BRANCH := $(shell git branch --show-current)
+endif
+
 BUILDTIME := $(shell TZ="Asia/Shanghai" date '+%Y/%m/%d-%H:%M:%S')
 
 FLAGPKG = $(PROJECT)/base

README.md

@@ -36,8 +36,8 @@ docker-compose up -d
 Clone the newest version.
 
 ```bash
-git pull
-docker-compose up -d --build
+docker-compose pull
+docker-compose up -d
 ```
 
 ## Configuration
@@ -60,7 +60,7 @@ bing - <Key Words> 巨硬搜索...
 bilibili - <Key Words> 在B站搜索...
 github - <Key Words> 在github搜索...
 links - 这里有一些链接(加友链at管理)
-ban_myself - 把自己ban掉rand[60,120]秒
+ban_myself - 把自己ban掉rand[40,160]秒
 ban - 我就是要滥权！【Admin】
 ban_soft - 软禁！使某人失去快乐~【Admin】
 fake_ban - [duration] 虚假(真实)的ban

base/hello.go

@@ -108,37 +108,6 @@ func Forward(m *Message) {
 	}
 }
 
-// History is handle for command `history`
-// func History(m *Message) {
-// 	command, _ := entities.FromMessage(m)
-// 	historyID := rand.Intn(m.ID) + 1
-// 	if command.Argc() > 0 {
-// 		id, ok := util.ParseNumberAndHandleError(m, command.Arg(0), util.NewRangeInt(0, m.ID))
-// 		if ok {
-// 			historyID = id
-// 		} else {
-// 			return
-// 		}
-// 	}
-// 	msg := fmt.Sprintf("https://t.me/c/%v/%v", chatIDToStr(m.Chat.ID), historyID)
-// 	util.SendReply(m.Chat, msg, m)
-// }
-
-// func chatIDToStr(chatID int64) string {
-// 	chatNum := chatID
-// 	if chatNum < 0 {
-// 		chatNum *= -1
-// 	}
-// 	chatStr := strconv.FormatInt(chatNum, 10)
-// 	if chatStr[0] == '1' {
-// 		chatStr = chatStr[1:]
-// 	}
-// 	for chatStr[0] == '0' {
-// 		chatStr = chatStr[1:]
-// 	}
-// 	return chatStr
-// }
-
 // FakeBanMyself is handle for command `fake_ban_myself`.
 // Use it to just get a reply like command `ban_myself`.
 func FakeBanMyself(m *Message) {

base/yiban.go

@@ -48,7 +48,7 @@ func Yiban(m *Message) {
 	}
 	tel = orm.GetYiban(m.Sender.ID)
 	if tel == "" {
-		util.SendMessage(m.Chat, "不知道你的易班手机号是什么呢~\n命令带上手机号参数可以进行一次性查询，bot不保存您的手机号")
+		util.SendMessage(m.Chat, "亦之的群友特供版自动打卡推送\n不知道你的易班手机号是什么呢~\n命令带上手机号参数可以进行一次性查询，bot不保存您的手机号")
 		util.SendMessage(m.Chat, "如果需要bot记住您手机号，请使用 /sub_yiban 命令带上手机号参数，后续查询 /yiban 不再需要填写参数，每日打卡结果bot会推送通知")
 		return
 	}

config.yaml

@@ -10,7 +10,7 @@ white_list:
   enabled: true
 restrict:
   kill_duration: 300    # restrict duration for command `kill` [second]
-  fake_ban_cd: 1080     # restrict CD for command `kill` or `fake ban xxx` [minutes]
+  fake_ban_cd: 840      # restrict CD for command `kill` or `fake ban xxx` [minutes]
 rate_limit:
   max_token: 20         # token bucket size, must [int]
   limit: 0.5            # how many tokens get every seconds [float64]

entities/command.go

@@ -15,14 +15,15 @@ type BotCommand struct {
 }
 
 var (
-	spaces, _ = regexp.Compile(`\s+`)
+	spaces, _   = regexp.Compile(`\s+`)
+	cmdRegex, _ = regexp.Compile(`/[0-9a-zA-Z_]+`)
 )
 
 // FromMessage - get command in a message
 func FromMessage(msg *Message) *BotCommand {
 	args := splitText(strings.TrimSpace(msg.Text))
-	if len(args) == 0 {
-		return &BotCommand{"", []string{}}
+	if len(args) == 0 || !cmdRegex.MatchString(args[0]) {
+		return nil
 	}
 	name := args[0]
 	if idx := strings.IndexRune(name, '@'); idx != -1 {

main.go

@@ -64,7 +64,7 @@ func main() {
 
 	bot.Handle("/fake_ban_myself", base.FakeBanMyself)
 	bot.Handle("/fake_ban", util.GroupCommand(restrict.FakeBan))
-	bot.Handle("/kill", util.GroupCommand(restrict.FakeBan))
+	bot.Handle("/kill", util.GroupCommand(restrict.Kill))
 	bot.Handle("/ban_myself", util.GroupCommand(restrict.BanMyself))
 	bot.Handle("/ban", util.GroupCommand(restrict.Ban))
 	bot.Handle("/ban_soft", util.GroupCommand(restrict.SoftBan))
@@ -172,7 +172,7 @@ func shutdownFilter(update *Update) bool {
 	}
 	if update.Message.Text != "" {
 		cmd := entities.FromMessage(update.Message)
-		if cmd.Name() == "boot" {
+		if cmd != nil && cmd.Name() == "boot" {
 			return true
 		}
 	}

restrict/ban.go

@@ -44,7 +44,7 @@ func BanCommand(m *Message, hard bool) {
 	cmd := entities.FromMessage(m)
 	banTime, err := time.ParseDuration(cmd.Arg(0))
 	if err != nil {
-		banTime = time.Duration(rand.Intn(60)+60) * time.Second
+		banTime = time.Duration(rand.Intn(120)+40) * time.Second
 	}
 	var banTarget *User = nil
 	if !util.CanRestrictMembers(m.Chat, m.Sender) {

restrict/fake-ban.go

@@ -17,7 +17,7 @@ func FakeBan(m *Message) {
 	cmd := entities.FromMessage(m)
 	banTime, err := time.ParseDuration(cmd.Arg(0))
 	if err != nil {
-		banTime = time.Duration(60+rand.Intn(60)) * time.Second
+		banTime = time.Duration(40+rand.Intn(120)) * time.Second
 	}
 	ExecFakeBan(m, banTime)
 }

restrict/rate.go

@@ -37,7 +37,7 @@ func checkRate(m *Message, limiter *rate.Limiter) bool {
 		return limiter.AllowN(time.Now(), rateConfig.StickerCost)
 	}
 	cmd := entities.FromMessage(m)
-	if cmd.Name() != "" {
+	if cmd != nil {
 		return limiter.AllowN(time.Now(), rateConfig.CommandCost)
 	}
 	return limiter.AllowN(time.Now(), rateConfig.Cost)