From 203b3b5a1af8a631c022316ebfcab2b139e9949a Mon Sep 17 00:00:00 2001 From: Robert Date: Sun, 3 Apr 2016 20:04:35 +0200 Subject: [PATCH 1/4] Update general.py --- cogs/general.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cogs/general.py b/cogs/general.py index 26b2ff4ca..c6fd19120 100644 --- a/cogs/general.py +++ b/cogs/general.py @@ -191,7 +191,7 @@ class General: data += "Channels: " + str(len(server.channels)) + "\n" data += "Roles: " + str(len(server.roles)) + "\n" data += "Created: " + str(server.created_at) + "\n" - data += "Owner: " + server.owner.name + "\n" + data += "Owner: " + server.owner.name + "#{}\n".format(server.owner.discriminator) data += "Icon: " + str(server.icon_url) + "\n" data += "```" await self.bot.say(data) @@ -314,4 +314,4 @@ class NewPoll(): def setup(bot): n = General(bot) bot.add_listener(n.check_poll_votes, "on_message") - bot.add_cog(n) \ No newline at end of file + bot.add_cog(n) From 255842d3e66c28a96bfa6108c694299f0a313607 Mon Sep 17 00:00:00 2001 From: Kowlin Date: Mon, 4 Apr 2016 07:55:02 +0200 Subject: [PATCH 2/4] Formating added to Economyset A small quality of life change... It would be nice if we can make the code not like like it comes from 2002 ;) --- cogs/economy.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cogs/economy.py b/cogs/economy.py index 042007910..7fc50403d 100644 --- a/cogs/economy.py +++ b/cogs/economy.py @@ -108,7 +108,7 @@ class Economy: if self.account_check(id): if id in self.payday_register: seconds = abs(self.payday_register[id] - int(time.perf_counter())) - if seconds >= self.settings["PAYDAY_TIME"]: + if seconds >= self.settings["PAYDAY_TIME"]: self.add_money(id, self.settings["PAYDAY_CREDITS"]) self.payday_register[id] = int(time.perf_counter()) await self.bot.say("{} Here, take some credits. Enjoy! (+{} credits!)".format(author.mention, str(self.settings["PAYDAY_CREDITS"]))) @@ -213,10 +213,10 @@ class Economy: async def economyset(self, ctx): """Changes economy module settings""" if ctx.invoked_subcommand is None: - msg = "" + msg = "```" for k, v in self.settings.items(): msg += str(k) + ": " + str(v) + "\n" - msg += "\nType help economyset to see the list of commands." + msg += "\nType help {}economyset to see the list of commands.```".format(ctx.prefix) await self.bot.say(msg) @economyset.command() @@ -286,7 +286,7 @@ class Economy: return False def set_money(self, id, amount): - if self.account_check(id): + if self.account_check(id): self.bank[id]["balance"] = amount fileIO("data/economy/bank.json", "save", self.bank) return True @@ -301,7 +301,7 @@ class Economy: ('minutes', 60), ('seconds', 1), ) - + result = [] for name, count in intervals: @@ -341,4 +341,4 @@ def setup(bot): handler = logging.FileHandler(filename='data/economy/economy.log', encoding='utf-8', mode='a') handler.setFormatter(logging.Formatter('%(asctime)s %(message)s', datefmt="[%d/%m/%Y %H:%M]")) logger.addHandler(handler) - bot.add_cog(Economy(bot)) \ No newline at end of file + bot.add_cog(Economy(bot)) From 2612366f1af98ba02f44ebc85c13049d9e26e6d3 Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 4 Apr 2016 08:21:56 +0200 Subject: [PATCH 3/4] Update economy.py --- cogs/economy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cogs/economy.py b/cogs/economy.py index 7fc50403d..4559705eb 100644 --- a/cogs/economy.py +++ b/cogs/economy.py @@ -216,7 +216,7 @@ class Economy: msg = "```" for k, v in self.settings.items(): msg += str(k) + ": " + str(v) + "\n" - msg += "\nType help {}economyset to see the list of commands.```".format(ctx.prefix) + msg += "\nType {}help economyset to see the list of commands.```".format(ctx.prefix) await self.bot.say(msg) @economyset.command() From 1f29b3ca163a5eaaa7e8c7cdf08a9a07d5b3bc4f Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 4 Apr 2016 08:22:39 +0200 Subject: [PATCH 4/4] Revert change, wrong branch --- cogs/general.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cogs/general.py b/cogs/general.py index c6fd19120..335ff7353 100644 --- a/cogs/general.py +++ b/cogs/general.py @@ -191,7 +191,7 @@ class General: data += "Channels: " + str(len(server.channels)) + "\n" data += "Roles: " + str(len(server.roles)) + "\n" data += "Created: " + str(server.created_at) + "\n" - data += "Owner: " + server.owner.name + "#{}\n".format(server.owner.discriminator) + data += "Owner: " + server.owner.name + "\n" data += "Icon: " + str(server.icon_url) + "\n" data += "```" await self.bot.say(data)