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

Rename bot.db as bot._config (#2967)

Browse Source 
* Rename `bot.db` as `bot._config`

  - Continues work towards strong version guarantees
  - Added methods for cog use for a few things which were previously
  only accessible via direct access.
  - Retained private use in a few internal use locations, though most
  methods were updated away from this.
  - Updated documentation for shared api token users

* changelog

* more detail

* docstring fixes

* Apparently, I forgot to commit something I had locally

  - + a copy/paste failue in the changelog

* *sigh*:

* *sigh*
This commit is contained in:
Michael H
2019-09-01 15:42:28 -04:00
committed by GitHub
parent d86cc7a854
commit 6075c5bde0
17 changed files with 321 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
redbot/core/utils/mod.py
View File

@@ -128,9 +128,10 @@ async def is_mod_or_superior(
elif isinstance(obj, discord.Member):
user = obj
elif isinstance(obj, discord.Role):
if obj.id in await bot.db.guild(obj.guild).mod_role():
gid = obj.guild.id
if obj in await bot.get_admin_role_ids(gid):
return True
if obj.id in await bot.db.guild(obj.guild).admin_role():
if obj in await bot.get_mod_role_ids(gid):
return True
return False
else:
@@ -209,7 +210,7 @@ async def is_admin_or_superior(
elif isinstance(obj, discord.Member):
user = obj
elif isinstance(obj, discord.Role):
return obj.id in await bot.db.guild(obj.guild).admin_role()
return obj.id in await bot.get_admin_role_ids(obj.guild.id)
else:
raise TypeError("Only messages, members or roles may be passed")