self.room = room
self.nick = nick
self.__set_logger(log_file, log_level)
+ self.__seen = dict()
self.register_plugin('xep_0030') # Service Discovery
self.register_plugin('xep_0045') # Multi-User Chat
self.register_plugin('xep_0199') # self Ping
# and the XML streams are ready for use. We want to
# listen for this event so that we we can initialize
# our roster.
- self.add_event_handler("session_start", self.start)
+ self.add_event_handler('session_start', self.start)
# Handles MUC message and dispatch
- self.add_event_handler("groupchat_message", self.muc_message)
+ self.add_event_handler('message', self.message)
+ self.add_event_handler('got_online', self._view)
# Discover bot internal command (ie. help)
for name, value in inspect.getmembers(self):
self.log.setLevel(log_level)
self.log.debug('set logger, log level : %s' % log_level)
- def muc_message(self, msg):
- # ignore message from self
- body = msg['body']
- mucfrom = msg['mucnic']
+ def message(self, msg):
+ if msg['type'] not in ('groupchat', 'chat'):
+ self.log.warning('Unhandled message')
+ return
if msg['mucnick'] == self.nick:
return
+ body = msg['body'].strip()
if not body.startswith(MUCBot.prefix):
return
+ if msg['from'] not in self.__seen:
+ self.log.warning('Will not handle message '
+ 'from unseen jid: %s' % msg['from'])
+ #return
args = body[1:].split()
cmd = args.pop(0)
if cmd not in self.commands:
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.send_message(mto=msg['from'].bare, mbody=reply, mtype='groupchat')
+ if self.log.level < 10 and reply:
+ self.send_message(mto=msg['from'].bare, mbody=reply, mtype='groupchat')
+
+ def _view(self, pres):
+ nick = pres['from']
+ status = (pres['type'], pres['status'])
+ self.__seen.update({nick: status})
def start(self, event):
"""
text = self.commands[args[0]].__doc__.strip() or 'undocumented'
else:
text = 'That command is not defined.'
- return text
+ if message['type'] == 'groupchat':
+ to = message['from'].bare
+ else:
+ to = message['from']
+ self.send_message(mto=to, mbody=text, mtype=message['type'])