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

[V3 Bank/Economy] Fix #1404 and an issue with [p]bank reset (#1407)

Browse Source 
* [V3 Bank] fix an issue with checks

* [V3 Economy] fix issues with [p]bank reset
This commit is contained in:
palmtree5 2018-03-12 15:10:46 -08:00 committed by Will
parent 4fcf32b5e9
commit 22a342d36d
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
redbot/cogs/bank/bank.py
View File

@ -1,3 +1,5 @@
import discord
from redbot.core import checks, bank from redbot.core import checks, bank
from redbot.core.i18n import CogI18n from redbot.core.i18n import CogI18n
from discord.ext import commands from discord.ext import commands
@ -17,6 +19,8 @@ def check_global_setting_guildowner():
if await ctx.bot.is_owner(author): if await ctx.bot.is_owner(author):
return True return True
if not await bank.is_global(): if not await bank.is_global():
if not isinstance(ctx.channel, discord.abc.GuildChannel):
return False
permissions = ctx.channel.permissions_for(author) permissions = ctx.channel.permissions_for(author)
return author == ctx.guild.owner or permissions.administrator return author == ctx.guild.owner or permissions.administrator
@ -33,6 +37,8 @@ def check_global_setting_admin():
if await ctx.bot.is_owner(author): if await ctx.bot.is_owner(author):
return True return True
if not await bank.is_global(): if not await bank.is_global():
if not isinstance(ctx.channel, discord.abc.GuildChannel):
return False
permissions = ctx.channel.permissions_for(author) permissions = ctx.channel.permissions_for(author)
is_guild_owner = author == ctx.guild.owner is_guild_owner = author == ctx.guild.owner
admin_role = await ctx.bot.db.guild(ctx.guild).admin_role() admin_role = await ctx.bot.db.guild(ctx.guild).admin_role()

15
redbot/cogs/economy/economy.py
View File

@ -216,18 +216,9 @@ class Economy:
) )
) )
else: else:
if await bank.is_global(): await bank.wipe_bank()
# Bank being global means that the check would cause only await ctx.send(_("All bank accounts of this guild have been "
# the owner and any co-owners to be able to run the command "deleted."))
# so if we're in the function, it's safe to assume that the
# author is authorized to use owner-only commands
user = ctx.author
else:
user = ctx.guild.owner
success = await bank.wipe_bank()
if success:
await ctx.send(_("All bank accounts of this guild have been "
"deleted."))
@commands.command() @commands.command()
@guild_only_check() @guild_only_check()