diff --git a/src/bot.ts b/src/bot.ts index ba5c2aa..a61ffc5 100644 --- a/src/bot.ts +++ b/src/bot.ts @@ -51,15 +51,13 @@ export function rolePermissionCheck(...roles: (string | string[])[]) { }; } -client.permissions.register('lbry.curator', rolePermissionCheck(client.config.curatorRoles)); -client.permissions.register('lbry.trusted', rolePermissionCheck(client.config.trustedRoles)); client.permissions.register('lbry.admin', rolePermissionCheck(client.config.adminRoles)); client.permissions.register( - 'lbry.curatorOrAdmin', + 'lbry.curator', rolePermissionCheck(client.config.curatorRoles, client.config.adminRoles) ); client.permissions.register( - 'lbry.trustedOrAdmin', + 'lbry.trusted', rolePermissionCheck(client.config.trustedRoles, client.config.adminRoles) ); /* #endregion */ diff --git a/src/commands/curator/abandon.ts b/src/commands/curator/abandon.ts index a895797..d38ae9d 100644 --- a/src/commands/curator/abandon.ts +++ b/src/commands/curator/abandon.ts @@ -9,7 +9,7 @@ export default class AbandonCommand extends GeneralCommand { description: 'Abandon a support on a claim.', category: 'Curator', aliases: ['aban', 'drop'], - userPermissions: ['lbry.curatorOrAdmin'], + userPermissions: ['lbry.curator'], metadata: { examples: ['abandon @channel#a/video#b'], usage: '' diff --git a/src/commands/curator/balance.ts b/src/commands/curator/balance.ts index 830722e..99da3d7 100644 --- a/src/commands/curator/balance.ts +++ b/src/commands/curator/balance.ts @@ -10,7 +10,7 @@ export default class BalanceCommand extends GeneralCommand { description: 'Shows your account balance.', category: 'Curator', aliases: ['bal'], - userPermissions: ['lbry.curatorOrAdmin'], + userPermissions: ['lbry.curator'], metadata: { examples: ['balance', 'balance @user'], usage: '', diff --git a/src/commands/curator/support.ts b/src/commands/curator/support.ts index f5f44d2..4e73476 100644 --- a/src/commands/curator/support.ts +++ b/src/commands/curator/support.ts @@ -10,7 +10,7 @@ export default class SupportCommand extends GeneralCommand { description: 'Support a claim.', category: 'Curator', aliases: ['sup'], - userPermissions: ['lbry.curatorOrAdmin'], + userPermissions: ['lbry.curator'], metadata: { examples: ['support @channel#a/video#b 2.0'], usage: ' ' diff --git a/src/commands/curator/supports.ts b/src/commands/curator/supports.ts index 2d3c4da..91186f4 100644 --- a/src/commands/curator/supports.ts +++ b/src/commands/curator/supports.ts @@ -11,7 +11,7 @@ export default class SupportsCommand extends GeneralCommand { description: 'List supports.', category: 'Curator', aliases: ['sups'], - userPermissions: ['lbry.curatorOrAdmin'], + userPermissions: ['lbry.curator'], metadata: { examples: ['supports', 'supports @user', 'supports @user @channel#a/video#b'], usage: '[user] [claim]' diff --git a/src/commands/trusted/tabandon.ts b/src/commands/trusted/tabandon.ts index ebb2fcb..b3128a6 100644 --- a/src/commands/trusted/tabandon.ts +++ b/src/commands/trusted/tabandon.ts @@ -10,7 +10,7 @@ export default class TAbandonCommand extends GeneralCommand { description: 'Abandon a support on a claim from the trusted account.', category: 'Trusted', aliases: ['taban', 'tdrop'], - userPermissions: ['lbry.trustedOrAdmin'], + userPermissions: ['lbry.trusted'], metadata: { examples: ['tabandon @channel#a/video#b'], usage: '' diff --git a/src/commands/trusted/tbalance.ts b/src/commands/trusted/tbalance.ts index a4fe724..3c3232e 100644 --- a/src/commands/trusted/tbalance.ts +++ b/src/commands/trusted/tbalance.ts @@ -8,7 +8,7 @@ export default class TBalanceCommand extends GeneralCommand { description: 'Shows the trusted account balance.', category: 'Trusted', aliases: ['tbal'], - userPermissions: ['lbry.trustedOrAdmin'], + userPermissions: ['lbry.trusted'], metadata: { examples: ['tbalance'] } diff --git a/src/commands/trusted/tsupport.ts b/src/commands/trusted/tsupport.ts index 6bce8cc..0f6f65e 100644 --- a/src/commands/trusted/tsupport.ts +++ b/src/commands/trusted/tsupport.ts @@ -10,7 +10,7 @@ export default class TSupportCommand extends GeneralCommand { description: 'Support a claim from the trusted account.', category: 'Trusted', aliases: ['tsup'], - userPermissions: ['lbry.trustedOrAdmin'], + userPermissions: ['lbry.trusted'], metadata: { examples: ['tsupport @channel#a/video#b 2.0'], usage: ' ' diff --git a/src/commands/trusted/tsupports.ts b/src/commands/trusted/tsupports.ts index d8adb35..33f3151 100644 --- a/src/commands/trusted/tsupports.ts +++ b/src/commands/trusted/tsupports.ts @@ -9,7 +9,7 @@ export default class TSupportsCommand extends GeneralCommand { description: 'List supports from the trusted account.', category: 'Trusted', aliases: ['tsups'], - userPermissions: ['lbry.trustedOrAdmin'], + userPermissions: ['lbry.trusted'], metadata: { examples: ['tsupports @channel#a/video#b'], usage: '[claim]' diff --git a/src/util/abstracts.ts b/src/util/abstracts.ts index 39f59ef..57bc8c7 100644 --- a/src/util/abstracts.ts +++ b/src/util/abstracts.ts @@ -76,10 +76,10 @@ export abstract class GeneralCommand extends DexareCommand { if (missing.length > 0) { if (missing.includes('dexare.elevated')) return `The \`${this.name}\` command can only be used by the bot developers or elevated users.`; - else if (missing.includes('lbry.curator') || missing.includes('lbry.curatorOrAdmin')) + else if (missing.includes('lbry.curator')) return `The \`${this.name}\` command can only be ran by LBRY curators.`; - else if (missing.includes('lbry.trusted') || missing.includes('lbry.trustedOrAdmin')) - return `The \`${this.name}\` command can only be ran by LBRY trusteds.`; + else if (missing.includes('lbry.trusted')) + return `The \`${this.name}\` command can only be ran by Trusted account users.`; else if (missing.includes('lbry.admin')) return `The \`${this.name}\` command can only be ran by LBRY admins.`; else if (missing.includes('dexare.nsfwchannel'))