From 3e5801d5e6fd993bc5b2f8fde8f07efde5121408 Mon Sep 17 00:00:00 2001 From: Ben Kurtovic Date: Sun, 13 Nov 2011 01:36:18 -0500 Subject: [PATCH] !status nocolor for HallowsAG --- bot/commands/afc_status.py | 12 +++++++++--- bot/tasks/afc_statistics.py | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/bot/commands/afc_status.py b/bot/commands/afc_status.py index b296b62..d05ba17 100644 --- a/bot/commands/afc_status.py +++ b/bot/commands/afc_status.py @@ -66,21 +66,27 @@ class Command(BaseCommand): msg = "aggregate is \x0305{0}\x0301 (AfC {1})." self.connection.reply(data, msg.format(agg_num, aggregate)) + elif action.startswith("nocolor") or action == "n": + self.connection.reply(data, self.get_status(color=False)) + else: - msg = "unknown argument: \x0303{0}\x0301. Valid args are 'subs', 'redirs', 'files', 'agg'." + msg = "unknown argument: \x0303{0}\x0301. Valid args are 'subs', 'redirs', 'files', 'agg', 'nocolor'." self.connection.reply(data, msg.format(data.args[0])) else: self.connection.reply(data, self.get_status()) - def get_status(self): + def get_status(self, color=True): subs = self.count_submissions() redirs = self.count_redirects() files = self.count_files() agg_num = self.get_aggregate_number((subs, redirs, files)) aggregate = self.get_aggregate(agg_num) - msg = "Articles for creation {0} (\x0302AFC\x0301: \x0305{1}\x0301; \x0302AFC/R\x0301: \x0305{2}\x0301; \x0302FFU\x0301: \x0305{3}\x0301)." + if color: + msg = "Articles for creation {0} (\x0302AFC\x0301: \x0305{1}\x0301; \x0302AFC/R\x0301: \x0305{2}\x0301; \x0302FFU\x0301: \x0305{3}\x0301)." + else: + msg = "Articles for creation {0} (AFC: {1}; AFC/R: {2}; FFU: {3})." return msg.format(aggregate, subs, redirs, files) def count_submissions(self): diff --git a/bot/tasks/afc_statistics.py b/bot/tasks/afc_statistics.py index 86c25f6..48e1fc1 100644 --- a/bot/tasks/afc_statistics.py +++ b/bot/tasks/afc_statistics.py @@ -292,7 +292,7 @@ class Task(BaseTask): """Update hook for when page is not in our database. A variety of SQL queries are used to gather information about the page, - which are then saved to our database. + which is then saved to our database. """ content = self.get_content(title) if content is None: