Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: 新增黑名单用户及VIP用户处理逻辑，同时修改ALLOW_USERS的校验为userid（SenderStaffId），将用户相关校验统一为userid #190

Merged
merged 20 commits into from
Apr 9, 2023
Merged

feat: 新增黑名单用户及VIP用户处理逻辑，同时修改ALLOW_USERS的校验为userid（SenderStaffId），将用户相关校验统一为userid #190

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
170b036
perf: 新增VIP用户处理逻辑（管理员和VIP用户不受请求次数限制），同时修改ALLOW_USERS的校验为userid（Sender…
ffinly Apr 9, 2023
cc7bbd1
Update process_request.go
ffinly Apr 9, 2023
ad10e3a
Update README.md
ffinly Apr 9, 2023
37c94a9
Update config.example.yml
ffinly Apr 9, 2023
f3e8b74
Update docker-compose.yml
ffinly Apr 9, 2023
b6fa52d
Update tools.go
ffinly Apr 9, 2023
69e01ed
Update main.go
ffinly Apr 9, 2023
485b84a
Update README.md
ffinly Apr 9, 2023
ef67c52
Update config.example.yml
ffinly Apr 9, 2023
05de949
Update config.go
ffinly Apr 9, 2023
06098f8
Update docker-compose.yml
ffinly Apr 9, 2023
687a762
Update main.go
ffinly Apr 9, 2023
0303a4a
Update main.go
ffinly Apr 9, 2023
c79fb61
Update main.go
ffinly Apr 9, 2023
0fd72cc
Update main.go
ffinly Apr 9, 2023
e85d421
Update config.example.yml
ffinly Apr 9, 2023
664e19b
Update README.md
ffinly Apr 9, 2023
51d9595
Update main.go
ffinly Apr 9, 2023
bfad3ff
Update main.go
ffinly Apr 9, 2023
b80658e
Update main.go
ffinly Apr 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update main.go
  • Loading branch information
@ffinly
ffinly authored Apr 9, 2023
commit bfad3ff507ae48e129f3354a54b8bcf3fcc984b3
4 changes: 2 additions & 2 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func Start() {
logger.Debug(fmt.Sprintf("dingtalk callback parameters: %#v", msgObj))

if public.Config.ChatType != "0" && msgObj.ConversationType != public.Config.ChatType {
_, err = msgObj.ReplyToDingtalk(string(dingbot.MARKDOWN), "** 🤷 很抱歉，管理员禁用了这种聊天方式，请选择其他聊天方式与机器人对话！**")
_, err = msgObj.ReplyToDingtalk(string(dingbot.MARKDOWN), "**🤷 抱歉，管理员禁用了这种聊天方式，请选择其他聊天方式与机器人对话！**")
if err != nil {
logger.Warning(fmt.Errorf("send message error: %v", err))
return err
Expand All @@ -58,7 +58,7 @@ func Start() {
}
// 不在允许群组，不在允许用户（包括在黑名单），满足任一条件，拒绝会话；管理员不受限制
if (!public.JudgeGroup(msgObj.GetChatTitle()) || !public.JudgeUsers(msgObj.SenderStaffId)) && !public.JudgeAdminUsers(msgObj.SenderStaffId) {
_, err = msgObj.ReplyToDingtalk(string(dingbot.MARKDOWN), "** 🤷 很抱歉，您的身份信息未被认证通过，无法使用机器人对话功能。**\n>如需继续使用，请联系管理员申请访问权限。")
_, err = msgObj.ReplyToDingtalk(string(dingbot.MARKDOWN), "**🤷 抱歉，您的身份信息未被认证通过，无法使用机器人对话功能。**\n>如需继续使用，请联系管理员申请访问权限。")
if err != nil {
logger.Warning(fmt.Errorf("send message error: %v", err))
return err
Expand Down