DuoDeca_S/galactic-bot
1
0
Fork 0
forked from Galactic/galactic-bot
Code Pull Requests Activity

filter out managed roles for settings that assign

Browse Source
This commit is contained in:
Erik 2022-05-10 22:01:31 +03:00
parent 5a2d1e6d6b
commit 9dc16a293b
Signed by untrusted user: Navy.gif
GPG Key ID: 811EC0CD80E7E5FB
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/structure/components/settings/moderation/Grantable.js
View File

@ -56,7 +56,7 @@ class Grantable extends Setting {
const resolved = await guild.resolveRoles(params); const resolved = await guild.resolveRoles(params);
if (!resolved.length) return { error: true, index: 'RESOLVE_FAIL', params: { type: 'roles' } }; if (!resolved.length) return { error: true, index: 'RESOLVE_FAIL', params: { type: 'roles' } };
this[roles.value](setting.roles, resolved.map((r) => r.id)); this[roles.value](setting.roles, resolved.filter((r) => !r.managed).map((r) => r.id));
} }

12
src/structure/components/settings/moderation/Mute.js
View File

@ -136,6 +136,10 @@ class MuteSetting extends Setting {
response.embeds = [embed]; response.embeds = [embed];
updated.push('role'); updated.push('role');
} else if (opt.name === 'role') {
if(opt.value.managed) return { error: true, index: 'SETTING_MUTE_ROLE_MANAGED' };
setting.role = opt.value.id;
updated.push(opt.name);
} else { } else {
setting[opt.name] = opt.value; setting[opt.name] = opt.value;
updated.push(opt.name); updated.push(opt.name);
@ -193,7 +197,7 @@ class MuteSetting extends Setting {
if (existing) { if (existing) {
const prompt = await interaction.promptInteraction({ const prompt = await interaction.promptInteraction({
content: interaction.format('SETTING_MUTE_ROLEPROMPT', { content: interaction.format(`SETTING_MUTE_ROLEPROMPT${existing.managed ? '_MANAGED' : ''}`, {
name: existing.name, name: existing.name,
id: existing.id id: existing.id
}), }),
@ -224,12 +228,12 @@ class MuteSetting extends Setting {
error: true error: true
}; };
await prompt.update({ content: `${Emojis.working} Working...`, components: [] });
const boolean = this.client.resolver.resolveBoolean(prompt.customId); const boolean = this.client.resolver.resolveBoolean(prompt.customId);
await prompt.update({ content: `${Emojis.working} Working...`, components: [] });
if (boolean) { if (boolean && !existing.managed) {
role = existing; role = existing;
} } else return { index: 'SETTING_MUTE_ABORT', error: true };
} else interaction.editReply({ content: 'Working...', emoji: 'working' }); } else interaction.editReply({ content: 'Working...', emoji: 'working' });
if (!role) { if (!role) {

2
src/structure/components/settings/utility/Autorole.js
View File

@ -57,7 +57,7 @@ class Autorole extends Setting {
if (content.error) return content; if (content.error) return content;
const words = Util.parseQuotes(content).map(([word]) => word); const words = Util.parseQuotes(content).map(([word]) => word);
const params = (await guild.resolveRoles(words)).map((role) => role.id); const params = (await guild.resolveRoles(words)).filter((r) => !r.managed).map((role) => role.id);
if (!params.length) return { error: true, index: 'RESOLVE_FAIL', params: { type: 'roles' } }; if (!params.length) return { error: true, index: 'RESOLVE_FAIL', params: { type: 'roles' } };
this[method](setting.roles, params); this[method](setting.roles, params);

2
src/structure/components/settings/utility/StickyRole.js
View File

@ -58,7 +58,7 @@ class Autorole extends Setting {
if (content.error) return content; if (content.error) return content;
const words = Util.parseQuotes(content).map(([word]) => word); const words = Util.parseQuotes(content).map(([word]) => word);
const params = (await guild.resolveRoles(words)).map((role) => role.id); const params = (await guild.resolveRoles(words)).filter((r) => !r.managed).map((role) => role.id);
if (!params.length) return { error: true, index: 'RESOLVE_FAIL', params: { type: 'roles' } }; if (!params.length) return { error: true, index: 'RESOLVE_FAIL', params: { type: 'roles' } };
this[method](setting.roles, params); this[method](setting.roles, params);