From 38d0e16a8200c13bb1b7ebb51bb6a6796140f0de Mon Sep 17 00:00:00 2001 From: urlbot Date: Sun, 19 Jul 2015 02:22:22 +0200 Subject: [PATCH] using broadcast to all rooms --- plugins.py | 2 ++ urlbot.py | 20 ++++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/plugins.py b/plugins.py index 3eaabb6..24de7fc 100644 --- a/plugins.py +++ b/plugins.py @@ -895,6 +895,8 @@ def command_dsa_watcher(argv, **args): status, title = extract_title(url) if 0 == status: + send_reply('new Debian Security Announce found: %s' % url) + if conf('persistent_locked'): msg = "couldn't get exclusive lock" log.warn(msg) diff --git a/urlbot.py b/urlbot.py index 71f07f3..1b082e8 100755 --- a/urlbot.py +++ b/urlbot.py @@ -98,7 +98,7 @@ def extract_title(url): return (-1, 'error') -def send_reply(message, msg_obj): +def send_reply(message, msg_obj=None): set_conf('request_counter', conf('request_counter') + 1) if str is not type(message): @@ -107,11 +107,19 @@ def send_reply(message, msg_obj): if debug_enabled(): print(message) else: - xmpp.send_message( - mto = msg_obj['from'].bare, - mbody = message, - mtype = 'groupchat' - ) + if msg_obj: + xmpp.send_message( + mto = msg_obj['from'].bare, + mbody = message, + mtype = 'groupchat' + ) + else: # unset msg_obj == broadcast + for room in xmpp.rooms: + xmpp.send_message( + mto = room, + mbody = message, + mtype = 'groupchat' + ) def ratelimit_touch(ignored=None): # FIXME: separate counters hist_ts.append(time.time())