CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-23 11:13:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Core] Multiple mod admin roles (#2783)

Browse Source 
* Adds Schema versioning
  - Adds Migration tool
  - Adds tool to migrate to allow multiple admin and mod roles
  - Supports Multiple mod and admin roles

* Ensures migration is run prior to cog load and connection to discord

* Updates to not rely on singular mod/admin role id

* Update requires logic for multiple mod/admin roles

* Add new commands for managing mod/admin roles

* Feedback

Update strings
Update docstrings
Add aliases

* Use snowflakelist

* paginate

* Change variable name

* Fix mistake

* handle settings view fix

* Fix name error

* I'm bad at Ux

* style fix
This commit is contained in:
DiscordLiz
2019-06-23 23:36:00 -04:00
committed by Michael H
parent 71d0bd0d07
commit 6bdc9606f6
8 changed files with 161 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
redbot/cogs/audio/audio.py
View File

@@ -3051,34 +3051,29 @@ class Audio(commands.Cog):
return await self._skip_action(ctx, skip_to_track)
async def _can_instaskip(self, ctx, member):
mod_role = await ctx.bot.db.guild(ctx.guild).mod_role()
admin_role = await ctx.bot.db.guild(ctx.guild).admin_role()
dj_enabled = await self.config.guild(ctx.guild).dj_enabled()
if dj_enabled:
is_active_dj = await self._has_dj_role(ctx, member)
else:
is_active_dj = False
is_owner = member.id == self.bot.owner_id
is_server_owner = member.id == ctx.guild.owner_id
is_coowner = any(x == member.id for x in self.bot._co_owners)
is_admin = (
discord.utils.get(ctx.guild.get_member(member.id).roles, id=admin_role) is not None
)
is_mod = discord.utils.get(ctx.guild.get_member(member.id).roles, id=mod_role) is not None
is_bot = member.bot is True
is_other_channel = await self._channel_check(ctx)
if member.bot:
return True
return (
is_active_dj
or is_owner
or is_server_owner
or is_coowner
or is_admin
or is_mod
or is_bot
or is_other_channel
)
if member.id == ctx.guild.owner_id:
return True
if dj_enabled:
if await self._has_dj_role(ctx, member):
return True
if await ctx.bot.is_owner(member):
return True
if await ctx.bot.is_mod(member):
return True
if await self._channel_check(ctx):
return True
return False
async def _is_alone(self, ctx, member):
try: