From 40a4cb2e7caa70e009736ead303ce016ddac3a71 Mon Sep 17 00:00:00 2001 From: kaliko Date: Sat, 15 Nov 2014 14:06:38 +0100 Subject: [PATCH] Moved the send logic to Plugin --- sid/echo.py | 17 +++++++++-------- sid/feeds.py | 40 +++++++++++++++++++--------------------- sid/plugin.py | 15 +++++++++++++++ sid/sid.py | 10 ++++------ 4 files changed, 47 insertions(+), 35 deletions(-) diff --git a/sid/echo.py b/sid/echo.py index aec0b9d..bb7e66a 100644 --- a/sid/echo.py +++ b/sid/echo.py @@ -39,9 +39,7 @@ class Echo(Plugin): nick = pres['muc']['nick'] self.online.add(nick) while self.inbox.get(nick, []): - self.bot.send_message(mto=self.bot.room, - mbody=self.inbox.get(nick).pop(), - mtype='groupchat') + self.send(self.inbox.get(nick).pop()) self.inbox.pop(nick) def _went_offline(self, pres): @@ -51,16 +49,19 @@ class Echo(Plugin): @botcmd def tell(self, message, args): - """drop a message to be delivred when someone gets online. + """drop a message to be sent when someone gets online. !tell queue : messages in queue !tell : append to in queue""" if not len(args): - return 'Missing arguments:\n{}'.format(self.tell.__doc__) + self.send('Missing arguments:\n{}'.format(self.tell.__doc__)) + return if len(args) == 1 and args[0] == 'queue': - return '\n'.join(['{0}:\n\t{1}'.format(k, '\n'.join(v)) - for k, v in self.inbox.items()]) + self.send('\n'.join(['{0}:\n\t{1}'.format(k, '\n'.join(v)) + for k, v in self.inbox.items()])) + return if len(args) < 2: - return 'Please provide a message:\n{}'.format(self.tell.__doc__) + self.send('Please provide a message:\n{}'.format(self.tell.__doc__)) + return sender = message['from'].resource recipient = message['body'].split()[1] tell_msg = ' '.join(message['body'].split()[2:]) diff --git a/sid/feeds.py b/sid/feeds.py index f06befa..ae07005 100644 --- a/sid/feeds.py +++ b/sid/feeds.py @@ -47,31 +47,24 @@ class FeedMonitor(threading.Thread): threading.Thread.__init__(self) self.feeds_list = plugin.FEEDS self.tempo = plugin.TEMPO - self.bot = plugin.bot + self.plugin = plugin self.last_check = datetime.datetime.utcnow() self.seen = dict() self.thread_killed = False - def send(self, message): - """simple wrapper around bot send_message method""" - self.bot.send_message(mto=self.bot.room, - mbody=message[1], - mhtml=message[0], - mtype='groupchat') - def new_posts(self, feed): """Send new posts in feed""" parsed_feed = feed_parse(feed) # Cannot resolve address if 'status' not in parsed_feed: - self.bot.log.error('Error from "%s": %s.' % + self.plugin.log.error('Error from "%s": %s.' % (feed, parsed_feed.bozo_exception.__repr__())) return # unusual return http code if parsed_feed.status != 200: - self.bot.log.error( + self.plugin.log.error( 'Got code %(status)d from "%(href)s" (please update).' % parsed_feed) return @@ -80,8 +73,8 @@ class FeedMonitor(threading.Thread): # Avoid looping over all posts if possible if feed_updated and strtm_to_dtm(feed_updated) < self.last_check: - self.bot.log.debug('updated : %s' % strtm_to_dtm(feed_updated)) - self.bot.log.debug('last check: %s' % self.last_check) + self.plugin.log.debug('updated : %s' % strtm_to_dtm(feed_updated)) + self.plugin.log.debug('last check: %s' % self.last_check) return title = '"%s":' % parsed_feed.feed.get('title', 'n/a') @@ -94,14 +87,14 @@ class FeedMonitor(threading.Thread): # Fills with post id when first started (prevent from posting all # entries at startup) self.seen[feed_id] = {p.id for p in parsed_feed.entries} - #return + return # Detecting new post entries = {p.id for p in parsed_feed.entries} new_entries = [p for p in parsed_feed.entries if p.id in entries - self.seen.get(feed_id)] for post in new_entries: - self.bot.log.info(post.title) + self.plugin.log.info(post.title) body = '%(title)s %(link)s' % post text.append(body) @@ -113,18 +106,17 @@ class FeedMonitor(threading.Thread): # Updating self.seen self.seen[feed_id] = entries if len(text) > 1: - self.bot.log.debug('
'.join(xhtml)) - self.send(('
'.join(xhtml), '\n'.join(text))) + self.plugin.send({'mbody':'
'.join(xhtml), 'mhtml':'\n'.join(text)}) def run(self): while not self.thread_killed: - self.bot.log.debug('feeds check') + self.plugin.log.debug('feeds check') for feed in self.feeds_list: try: self.new_posts(feed) except Exception as err: - self.bot.log.error('feeds thread crashed: %s' % err) - self.bot.log.error(''.join(traceback.format_exc())) + self.plugin.log.error('feeds thread crashed: %s' % err) + self.plugin.log.error(''.join(traceback.format_exc())) self.thread_killed = True self.last_check = datetime.datetime.utcnow() for _ in list(range(self.tempo)): @@ -167,5 +159,11 @@ class Feeds(Plugin): !feeds : registred feeds list !feeds last : last check time""" if 'last' in args: - return 'Last feeds check: %s' % self.th_mon.last_check - return '\n'.join(Feeds.FEEDS) + self.send('Last feeds check: %s' % self.th_mon.last_check) + return + html = ['{1}'.format(u, u[7:]) for u in Feeds.FEEDS] + msg = { + 'mbody': 'Feeds:\n' + '\n'.join(Feeds.FEEDS), + 'mhtml': 'Feeds:
' + '
'.join(html) + } + self.send(msg) diff --git a/sid/plugin.py b/sid/plugin.py index 15f43ab..2b49bc9 100644 --- a/sid/plugin.py +++ b/sid/plugin.py @@ -23,5 +23,20 @@ class Plugin(object): self.bot = bot self.log = bot.log + def send(self, msg): + """ + Send msg to the current groupchat defined in self.bot.room + msg = { + mbody: 'text', + mhtml: 'text, # optional' + } + """ + if isinstance(msg, str): + msg = {'mbody':msg} + msg.setdefault('mhtml', None) + self.bot.send_message(mto=self.bot.room, + mtype='groupchat', + **msg) + def shutdown(self): pass diff --git a/sid/sid.py b/sid/sid.py index 726f7fa..53fd569 100644 --- a/sid/sid.py +++ b/sid/sid.py @@ -103,14 +103,12 @@ class MUCBot(sleekxmpp.ClientXMPP): if args: self.log.debug('arg: {0}'.format(args)) try: - reply = self.commands[cmd](msg, args) + self.commands[cmd](msg, args) except Exception as err: reply = ''.join(traceback.format_exc()) self.log.exception('An error occurred processing: {0}: {1}'.format(body, reply)) - self.log.info(self.log.level) - if self.log.level >= 20 or not reply: - return - self.send_message(mto=msg['from'].bare, mbody=reply, mtype='groupchat') + if self.log.level < 20 and reply: + self.send_message(mto=msg['from'].bare, mbody=reply, mtype='groupchat') def start(self, event): """ @@ -182,4 +180,4 @@ class MUCBot(sleekxmpp.ClientXMPP): text = self.commands[args[0]].__doc__.strip() or 'undocumented' else: text = 'That command is not defined.' - return text + self.send_message(mto=message['from'].bare, mbody=text, mtype='groupchat') -- 2.39.2