mirror of
https://github.com/ikechan8370/chatgpt-plugin.git
synced 2025-12-17 22:07:10 +00:00
Merge branch 'ikechan8370:v2' into v2
This commit is contained in:
commit
4a6cad2e4e
6 changed files with 79 additions and 71 deletions
|
|
@ -803,7 +803,7 @@ export class chatgpt extends plugin {
|
|||
if (!msg || e.msg?.startsWith('#')) {
|
||||
return false
|
||||
}
|
||||
if ((e.isGroup || e.group_id) && !(e.atme || e.atBot)) {
|
||||
if ((e.isGroup || e.group_id) && !(e.atme || e.atBot || (e.at === e.self_id))) {
|
||||
return false
|
||||
}
|
||||
if (e.user_id == getUin(e)) return false
|
||||
|
|
@ -1639,7 +1639,7 @@ export class chatgpt extends plugin {
|
|||
opt.groupId = e.group_id
|
||||
opt.qq = e.sender.user_id
|
||||
opt.nickname = e.sender.card
|
||||
opt.groupName = e.group.name
|
||||
opt.groupName = e.group.name || e.group_name
|
||||
opt.botName = e.isGroup ? (e.group.pickMember(getUin(e)).card || e.group.pickMember(getUin(e)).nickname) : e.bot.nickname
|
||||
let master = (await getMasterQQ())[0]
|
||||
if (master && e.group) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue