[Config] Rewrite (#869)

This commit is contained in:
Will
2017-07-30 19:40:31 -04:00
committed by Twentysix
parent 5c2be25dfc
commit 99bfb2fc7a
14 changed files with 636 additions and 724 deletions

View File

@@ -81,24 +81,24 @@ class Alias:
if global_:
curr_aliases = self._aliases.entries()
curr_aliases.append(alias.to_json())
await self._aliases.set("entries", curr_aliases)
await self._aliases.entries.set(curr_aliases)
else:
curr_aliases = self._aliases.guild(ctx.guild).entries()
curr_aliases.append(alias.to_json())
await self._aliases.guild(ctx.guild).set("entries", curr_aliases)
await self._aliases.guild(ctx.guild).entries.set(curr_aliases)
await self._aliases.guild(ctx.guild).set("enabled", True)
await self._aliases.guild(ctx.guild).enabled.set(True)
return alias
async def delete_alias(self, ctx: commands.Context, alias_name: str,
global_: bool=False) -> bool:
if global_:
aliases = self.unloaded_global_aliases()
setter_func = self._aliases.set
setter_func = self._aliases.entries.set
else:
aliases = self.unloaded_aliases(ctx.guild)
setter_func = self._aliases.guild(ctx.guild).set
setter_func = self._aliases.guild(ctx.guild).entries.set
did_delete_alias = False
@@ -110,7 +110,6 @@ class Alias:
did_delete_alias = True
await setter_func(
"entries",
[a.to_json() for a in to_keep]
)
@@ -355,8 +354,9 @@ class Alias:
await ctx.send(box("\n".join(names), "diff"))
async def on_message(self, message: discord.Message):
aliases = list(self.unloaded_aliases(message.guild)) + \
list(self.unloaded_global_aliases())
aliases = list(self.unloaded_global_aliases())
if message.guild is not None:
aliases = aliases + list(self.unloaded_aliases(message.guild))
if len(aliases) == 0:
return