StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-03-16 14:11:50 +00:00
Code Releases Activity

canActOn: add option to allow same level

Browse source
This commit is contained in:
Dragory 2020-01-12 11:38:12 +02:00
parent 63b3519ac4
commit c1b7967d10
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
backend/src/plugins/ZeppelinPlugin.ts
View file

@ -71,14 +71,14 @@ export class ZeppelinPlugin<TConfig extends {} = IBasePluginConfig> extends Plug
throw new PluginRuntimeError(message, this.runtimePluginName, this.guildId); throw new PluginRuntimeError(message, this.runtimePluginName, this.guildId);
} }
protected canActOn(member1, member2) { protected canActOn(member1: Member, member2: Member, allowSameLevel = false) {
if (member1.id === member2.id || member2.id === this.bot.user.id) { if (member2.id === this.bot.user.id) {
return false; return false;
} }
const ourLevel = this.getMemberLevel(member1); const ourLevel = this.getMemberLevel(member1);
const memberLevel = this.getMemberLevel(member2); const memberLevel = this.getMemberLevel(member2);
return ourLevel > memberLevel; return allowSameLevel ? ourLevel >= memberLevel : ourLevel > memberLevel;
} }
/** /**
@ -241,7 +241,7 @@ export class ZeppelinPlugin<TConfig extends {} = IBasePluginConfig> extends Plug
/** /**
* Resolves a role from the passed string. The passed string can be a role ID, a role mention or a role name. * Resolves a role from the passed string. The passed string can be a role ID, a role mention or a role name.
* In the event of duplicate role names, this function will return the first one it comes across. * In the event of duplicate role names, this function will return the first one it comes across.
* @param roleResolvable * @param roleResolvable
*/ */
async resolveRoleId(roleResolvable: string): Promise<string> { async resolveRoleId(roleResolvable: string): Promise<string> {
const roleId = await resolveRoleId(this.bot, this.guildId, roleResolvable); const roleId = await resolveRoleId(this.bot, this.guildId, roleResolvable);