dan/Shasha
1
0
Fork 0
mirror of https://github.com/danbulant/Shasha synced 2026-06-24 17:12:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

avoid muting members of the same rank

Browse source
This commit is contained in:
Neko-Life 2021-08-09 19:30:37 +07:00
parent 68835c4c31
commit a0082ee4cf
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
resources/structures.js
View file

@ -226,7 +226,9 @@ Structures.extend("User", u => {
!(data.moderator.idAdmin || data.moderator.hasPermission("MANAGE_ROLES"))) throw new Error("Missing Permissions"); !(data.moderator.idAdmin || data.moderator.hasPermission("MANAGE_ROLES"))) throw new Error("Missing Permissions");
if (MEM) { if (MEM) {
if (data.moderator.roles.highest.position < MEM.roles.highest.position || MEM.roles.highest.position > guild.member(this.client.user).roles.highest.position) throw new Error("You can't mute someone with higher position than you <:nekokekLife:852865942530949160>"); if (data.moderator.roles.highest.position <= MEM.roles.highest.position ||
MEM.roles.highest.position >= guild.member(this.client.user).roles.highest.position)
throw new Error("You can't mute someone with higher position than you <:nekokekLife:852865942530949160>");
await MEM.mute(data, reason); await MEM.mute(data, reason);
} }
@ -298,8 +300,8 @@ Structures.extend("User", u => {
if (!(CL.isAdmin || CL.hasPermission("BAN_MEMBERS")) || if (!(CL.isAdmin || CL.hasPermission("BAN_MEMBERS")) ||
!(data.moderator.isAdmin || data.moderator.hasPermission("BAN_MEMBERS"))) throw new Error("Missing Permissions"); !(data.moderator.isAdmin || data.moderator.hasPermission("BAN_MEMBERS"))) throw new Error("Missing Permissions");
if (MEM) { if (MEM) {
if (data.moderator.roles.highest.position < MEM.roles.highest.position || if (data.moderator.roles.highest.position <= MEM.roles.highest.position ||
MEM.roles.highest.position > CL.roles.highest.position) MEM.roles.highest.position >= CL.roles.highest.position)
throw new Error("You can't ban someone with higher position than you <:nekokekLife:852865942530949160>"); throw new Error("You can't ban someone with higher position than you <:nekokekLife:852865942530949160>");
} }
if (!guild.DB) await guild.dbLoad(); if (!guild.DB) await guild.dbLoad();
@ -509,14 +511,14 @@ Structures.extend("GuildMember", u => {
*/ */
async setLeaveRoles(roles = []) { async setLeaveRoles(roles = []) {
if (!this.DB) await this.dbLoad(); if (!this.DB) await this.dbLoad();
const banned = await this.guild.fetchBan(this.user).catch(() => { });
// console.log("BANNED:", banned ? true : false);
if (banned) return;
const kicked = (await this.guild.fetchAuditLogs({ "limit": 1, "type": "MEMBER_KICK" }).catch(() => { }))?.entries?.first(); const kicked = (await this.guild.fetchAuditLogs({ "limit": 1, "type": "MEMBER_KICK" }).catch(() => { }))?.entries?.first();
if (kicked?.target.id === this.id) { if (kicked?.target.id === this.id) {
// console.log("KICKED:", true); // console.log("KICKED:", true);
return; return;
} }
const banned = await this.guild.fetchBan(this.user).catch(() => { });
// console.log("BANNED:", banned ? true : false);
if (banned) return;
return this.setDb("leaveRoles", roles); return this.setDb("leaveRoles", roles);
} }