Compare commits

..

No commits in common. "1e56fc66ce0b34e81454325f31629778be344562" and "7775d6600817d3c23516e3c7acb67ea550c8a341" have entirely different histories.

View File

@ -10,7 +10,7 @@ export class welcomeNewcomerSetting extends plugin {
priority: -1000, priority: -1000,
rule: [ rule: [
{ {
reg: '^#设置欢迎(文案|图片)([\\s\\S]*)?$', reg: '^#设置欢迎(文案|图片)([\\s\\S]*)$',
fnc: 'setWelcome', fnc: 'setWelcome',
}, },
{ {
@ -31,8 +31,8 @@ export class welcomeNewcomerSetting extends plugin {
* @returns {Promise<boolean|*>} * @returns {Promise<boolean|*>}
*/ */
async setWelcome(e) { async setWelcome(e) {
if (!(e.isMaster || ['owner', 'admin'].includes(e.sender?.role))) { if (!(e.isMaster || e.group?.is_owner || e.group?.is_admin)) {
return e.reply('只有群主或管理员可以设置欢迎消息哦~', true); return e.reply('只有群主或管理员可以设置欢迎消息哦..', true);
} }
const groupId = e.group_id; const groupId = e.group_id;
const type = e.msg.includes('文案') ? 'text' : 'image'; const type = e.msg.includes('文案') ? 'text' : 'image';
@ -72,11 +72,13 @@ export class welcomeNewcomerSetting extends plugin {
} }
async clearWelcome(e) { async clearWelcome(e) {
if (!(e.isMaster || ['owner', 'admin'].includes(e.sender?.role))) { if (!(e.isMaster || e.group?.is_owner || e.group?.is_admin)) {
return e.reply('只有群主或管理员可以设置欢迎消息哦~', true); return e.reply('只有群主或管理员可以清除设置哦..', true);
} }
const groupId = e.group_id; const groupId = e.group_id;
const allCfg = configControl.get('newcomer') || {}; const allCfg = configControl.get('newcomer') || {};
if (!allCfg[groupId]) return e.reply('该群没有设置欢迎消息..', true); if (!allCfg[groupId]) return e.reply('该群没有设置欢迎消息..', true);
delete allCfg[groupId]; delete allCfg[groupId];
await configControl.set('newcomer', allCfg); await configControl.set('newcomer', allCfg);