适配trss

This commit is contained in:
zyc404 2023-10-13 17:23:09 +08:00
parent 20ea8cfabf
commit dfbee2011d

View file

@ -548,7 +548,7 @@ export class chatgpt extends plugin {
await this.reply('本功能当前仅支持API3模式', true) await this.reply('本功能当前仅支持API3模式', true)
return false return false
} }
if (ats.length === 0 || (ats.length === 1 && e.atme)) { if (ats.length === 0 || (ats.length === 1 && (e.atme || e.atBot))) {
let conversationId = _.trimStart(e.msg, '#chatgpt删除对话').trim() let conversationId = _.trimStart(e.msg, '#chatgpt删除对话').trim()
if (!conversationId) { if (!conversationId) {
await this.reply('指令格式错误请同时加上对话id或@某人以删除他当前进行的对话', true) await this.reply('指令格式错误请同时加上对话id或@某人以删除他当前进行的对话', true)
@ -761,14 +761,14 @@ export class chatgpt extends plugin {
if (!e.raw_message || e.msg?.startsWith('#')) { if (!e.raw_message || e.msg?.startsWith('#')) {
return false return false
} }
if (e.isGroup && !e.atme) { if (e.isGroup && !(e.atme || e.atBot)) {
return false return false
} }
if (e.user_id == getUin(e)) return false if (e.user_id == getUin(e)) return false
prompt = e.raw_message.trim() prompt = e.raw_message.trim()
if (e.isGroup && typeof this.e.group.getMemberMap === 'function') { if (e.isGroup && typeof this.e.group.getMemberMap === 'function') {
let mm = await this.e.group.getMemberMap() let mm = await this.e.group.getMemberMap()
let me = mm.get(getUin(e)) let me = mm.get(getUin(e)) || {}
let card = me.card let card = me.card
let nickname = me.nickname let nickname = me.nickname
if (nickname && card) { if (nickname && card) {
@ -797,7 +797,7 @@ export class chatgpt extends plugin {
} }
} else { } else {
let ats = e.message.filter(m => m.type === 'at') let ats = e.message.filter(m => m.type === 'at')
if (!e.atme && ats.length > 0) { if (!(e.atme || e.atBot) && ats.length > 0) {
if (Config.debug) { if (Config.debug) {
logger.mark('艾特别人了,没艾特我,忽略#chat') logger.mark('艾特别人了,没艾特我,忽略#chat')
} }
@ -1324,7 +1324,7 @@ export class chatgpt extends plugin {
return false return false
} }
let ats = e.message.filter(m => m.type === 'at') let ats = e.message.filter(m => m.type === 'at')
if (!e.atme && ats.length > 0) { if (!(e.atme || e.atBot) && ats.length > 0) {
if (Config.debug) { if (Config.debug) {
logger.mark('艾特别人了,没艾特我,忽略#chat1') logger.mark('艾特别人了,没艾特我,忽略#chat1')
} }
@ -1343,7 +1343,7 @@ export class chatgpt extends plugin {
return false return false
} }
let ats = e.message.filter(m => m.type === 'at') let ats = e.message.filter(m => m.type === 'at')
if (!e.atme && ats.length > 0) { if (!(e.atme || e.atBot) && ats.length > 0) {
if (Config.debug) { if (Config.debug) {
logger.mark('艾特别人了,没艾特我,忽略#chat3') logger.mark('艾特别人了,没艾特我,忽略#chat3')
} }
@ -1362,7 +1362,7 @@ export class chatgpt extends plugin {
return false return false
} }
let ats = e.message.filter(m => m.type === 'at') let ats = e.message.filter(m => m.type === 'at')
if (!e.atme && ats.length > 0) { if (!(e.atme || e.atBot) && ats.length > 0) {
if (Config.debug) { if (Config.debug) {
logger.mark('艾特别人了,没艾特我,忽略#chatglm') logger.mark('艾特别人了,没艾特我,忽略#chatglm')
} }
@ -1381,7 +1381,7 @@ export class chatgpt extends plugin {
return false return false
} }
let ats = e.message.filter(m => m.type === 'at') let ats = e.message.filter(m => m.type === 'at')
if (!e.atme && ats.length > 0) { if (!(e.atme || e.atBot) && ats.length > 0) {
if (Config.debug) { if (Config.debug) {
logger.mark('艾特别人了,没艾特我,忽略#bing') logger.mark('艾特别人了,没艾特我,忽略#bing')
} }
@ -1400,7 +1400,7 @@ export class chatgpt extends plugin {
return false return false
} }
let ats = e.message.filter(m => m.type === 'at') let ats = e.message.filter(m => m.type === 'at')
if (!e.atme && ats.length > 0) { if (!(e.atme || e.atBot) && ats.length > 0) {
if (Config.debug) { if (Config.debug) {
logger.mark('艾特别人了,没艾特我,忽略#claude2') logger.mark('艾特别人了,没艾特我,忽略#claude2')
} }
@ -1419,7 +1419,7 @@ export class chatgpt extends plugin {
return false return false
} }
let ats = e.message.filter(m => m.type === 'at') let ats = e.message.filter(m => m.type === 'at')
if (!e.atme && ats.length > 0) { if (!(e.atme || e.atBot) && ats.length > 0) {
if (Config.debug) { if (Config.debug) {
logger.mark('艾特别人了,没艾特我,忽略#claude') logger.mark('艾特别人了,没艾特我,忽略#claude')
} }
@ -1438,7 +1438,7 @@ export class chatgpt extends plugin {
return false return false
} }
let ats = e.message.filter(m => m.type === 'at') let ats = e.message.filter(m => m.type === 'at')
if (!e.atme && ats.length > 0) { if (!(e.atme || e.atBot) && ats.length > 0) {
if (Config.debug) { if (Config.debug) {
logger.mark('艾特别人了,没艾特我,忽略#xh') logger.mark('艾特别人了,没艾特我,忽略#xh')
} }