Jerry/crystelf-plugin
1
0
Fork 0
mirror of https://github.com/Jerryplusy/crystelf-plugin.git synced 2025-10-14 05:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: Jerry:7775d6600817d3c23516e3c7acb67ea550c8a341
Branches Tags
Jerry:main
...
compare: Jerry:1e56fc66ce0b34e81454325f31629778be344562
Branches Tags
Jerry:main

2 Commits
7775d66008 ... 1e56fc66ce

Author SHA1 Message Date
Jerryplusy
1e56fc66ce fix:修复正则 2025-10-04 23:33:39 +08:00
Jerryplusy
a099f1c460 fix:修复管理员判断逻辑 2025-10-04 23:06:45 +08:00
1 changed files with 5 additions and 7 deletions
Show Stats Expand all files Collapse all files

12
apps/welcome-set.js
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 || e.group?.is_owner || e.group?.is_admin)) { if (!(e.isMaster || ['owner', 'admin'].includes(e.sender?.role))) {
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,13 +72,11 @@ export class welcomeNewcomerSetting extends plugin {
} }
async clearWelcome(e) { async clearWelcome(e) {
if (!(e.isMaster || e.group?.is_owner || e.group?.is_admin)) { if (!(e.isMaster || ['owner', 'admin'].includes(e.sender?.role))) {
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);