From be84774880e599909a1ce81a62c8e0955beb8b9a Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Wed, 27 Aug 2014 21:49:03 +0100 Subject: [PATCH] Add the ability to mute kills --- dropbot/bot.py | 8 ++++++++ dropbot/stomp_listener.py | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dropbot/bot.py b/dropbot/bot.py index eb64fee..a900116 100644 --- a/dropbot/bot.py +++ b/dropbot/bot.py @@ -46,6 +46,7 @@ class DropBot(ClientXMPP): self.last_killdate = datetime.utcnow() self.kill_corps = [int(x) for x in kwargs.pop('kill_corps', [])] self.kill_check_timeout = kwargs.pop('kill_check_timeout', 300) + self.kills_muted = False self.redis_pool = ConnectionPool.from_url(kwargs.pop('redis_url', 'redis://localhost:6379/0')) self.redis = Redis(connection_pool=self.redis_pool) @@ -610,4 +611,11 @@ class DropBot(ClientXMPP): len(kill['attackers']), intcomma(kill['zkb']['totalValue']), url, + ) + + def cmd_togglekills(self, args, msg): + """Toggles the broadcasting of kills to MUC channels""" + self.kills_muted = not self.kills_muted + return 'Kill messages: {}'.format( + 'muted' if self.kills_muted else 'not muted' ) \ No newline at end of file diff --git a/dropbot/stomp_listener.py b/dropbot/stomp_listener.py index 6e609da..4d11155 100644 --- a/dropbot/stomp_listener.py +++ b/dropbot/stomp_listener.py @@ -25,8 +25,9 @@ class ZKillboardStompListener(object): print message body, html = self.bot.call_command('kill', [], None, no_url=False, raw=kill) text = 'New Kill: {}'.format(body) - for room in self.bot.rooms: - self.bot.send_message(room, text, mtype='groupchat') + if not self.bot.kills_muted: + for room in self.bot.rooms: + self.bot.send_message(room, text, mtype='groupchat') def connect(self, url):