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

[V3 Config] Adjust functionality of get_attr (#1342)

Browse Source 
* Intermediate commit

* Add defaulting stuff to config

* Remove set_attr in favor of set_raw

* Modify get_attr

* Fix issue with clearing data
This commit is contained in:
Will
2018-02-26 15:13:01 -05:00
committed by palmtree5
parent c428982c00
commit 64af7800dc
5 changed files with 54 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
redbot/cogs/customcom/customcom.py
View File

@@ -70,7 +70,7 @@ class CommandObj:
async def get(self,
message: discord.Message,
command: str) -> str:
ccinfo = await self.db(message.guild).commands.get_attr(command)
ccinfo = await self.db(message.guild).commands.get_raw(command, default=None)
if not ccinfo:
raise NotFound
else:
@@ -82,7 +82,7 @@ class CommandObj:
response):
"""Create a customcommand"""
# Check if this command is already registered as a customcommand
if await self.db(ctx.guild).commands.get_attr(command):
if await self.db(ctx.guild).commands.get_raw(command, default=None):
raise AlreadyExists()
author = ctx.message.author
ccinfo = {
@@ -96,8 +96,8 @@ class CommandObj:
'response': response
}
await self.db(ctx.guild).commands.set_attr(command,
ccinfo)
await self.db(ctx.guild).commands.set_raw(
command, value=ccinfo)
async def edit(self,
ctx: commands.Context,
@@ -105,11 +105,11 @@ class CommandObj:
response: None):
"""Edit an already existing custom command"""
# Check if this command is registered
if not await self.db(ctx.guild).commands.get_attr(command):
if not await self.db(ctx.guild).commands.get_raw(command, default=None):
raise NotFound()
author = ctx.message.author
ccinfo = await self.db(ctx.guild).commands.get_attr(command)
ccinfo = await self.db(ctx.guild).commands.get_raw(command, default=None)
def check(m):
return m.channel == ctx.channel and m.author == ctx.message.author
@@ -138,18 +138,18 @@ class CommandObj:
author.id
)
await self.db(ctx.guild).commands.set_attr(command,
ccinfo)
await self.db(ctx.guild).commands.set_raw(
command, value=ccinfo)
async def delete(self,
ctx: commands.Context,
command: str):
"""Delete an already exisiting custom command"""
# Check if this command is registered
if not await self.db(ctx.guild).commands.get_attr(command):
if not await self.db(ctx.guild).commands.get_raw(command, default=None):
raise NotFound()
await self.db(ctx.guild).commands.set_attr(command,
None)
await self.db(ctx.guild).commands.set_raw(
command, value=None)
class CustomCommands:
@@ -326,7 +326,7 @@ class CustomCommands:
return
guild = message.guild
prefixes = await self.bot.db.guild(message.guild).get_attr('prefix')
prefixes = await self.bot.db.guild(guild).get_raw('prefix', default=[])
if len(prefixes) < 1:
def_prefixes = await self.bot.get_prefix(message)