fumiama/ReiBot
1
0
Fork 0
mirror of https://github.com/fumiama/ReiBot.git synced 2026-06-09 12:30:47 +08:00
Code Activity

fix: 管理员ban人权限超过本群范围

Browse Source
This commit is contained in:
源文雨
2022-07-06 13:30:25 +08:00
parent 49b40bc238
commit 439591cd6c
3 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
rule.go
View File

@@ -5,7 +5,6 @@ import (
"os"
"strconv"
"strings"
"time"
"unsafe"
ctrl "github.com/FloatTech/zbpctrl"
@@ -39,17 +38,6 @@ func init() {
if err != nil {
panic(err)
}
err = m.D.Open(time.Hour * 24)
if err != nil {
panic(err)
}
err = m.InitBlock()
if err != nil {
panic(err)
}
OnMessage(func(ctx *Ctx) bool {
return m.IsBlocked(ctx.Message.From.ID)
}).SetBlock(true).thirdPriority()
OnMessageCommandGroup([]string{
"启用", "enable", "禁用", "disable",
}, UserOrGrpAdmin).SetBlock(true).secondPriority().Handle(func(ctx *Ctx) {
@@ -136,20 +124,41 @@ func init() {
grp = -ctx.Message.From.ID
}
msg := "**" + args[0] + "报告**"
issu := SuperUserPermission(ctx)
if strings.Contains(model.Command, "允许") || strings.Contains(model.Command, "permit") {
for _, usr := range args[1:] {
uid, err := strconv.ParseInt(usr, 10, 64)
if err == nil {
service.Permit(uid, grp)
msg += "\n+ 已允许" + usr
if issu {
service.Permit(uid, grp)
msg += "\n+ 已允许" + usr
} else {
member, err := ctx.Caller.GetChatMember(tgba.GetChatMemberConfig{ChatConfigWithUser: tgba.ChatConfigWithUser{ChatID: ctx.Message.Chat.ID, UserID: uid}})
if err == nil && !member.HasLeft() && !member.WasKicked() {
service.Permit(uid, grp)
msg += "\n+ 已允许" + usr
} else {
msg += "\nx " + usr + " 不在本群"
}
}
}
}
} else {
for _, usr := range args[1:] {
uid, err := strconv.ParseInt(usr, 10, 64)
if err == nil {
service.Ban(uid, grp)
msg += "\n- 已禁止" + usr
if issu {
service.Ban(uid, grp)
msg += "\n- 已禁止" + usr
} else {
member, err := ctx.Caller.GetChatMember(tgba.GetChatMemberConfig{ChatConfigWithUser: tgba.ChatConfigWithUser{ChatID: ctx.Message.Chat.ID, UserID: uid}})
if err == nil && !member.HasLeft() && !member.WasKicked() {
service.Ban(uid, grp)
msg += "\n- 已禁止" + usr
} else {
msg += "\nx " + usr + " 不在本群"
}
}
}
}
}