fix chat_write()

This commit is contained in:
urlbot
2014-12-02 16:25:10 +01:00
parent 5922d1b489
commit 1dd4637820

View File

@@ -112,18 +112,9 @@ def chat_write(message):
if debug_enabled(): if debug_enabled():
print(message) print(message)
else: else:
# FIXME: somehow, unicode chars can end up inside a <str> message,
# which seems to make both unicode() and ''.encode('utf8') fail.
try:
msg = str(message)
msg = msg.encode('utf8')
except UnicodeDecodeError as e:
logger('warn', 'encoding msg failed: ' + str(e))
msg = message
xmpp.send_message( xmpp.send_message(
mto=conf('room'), mto=conf('room'),
mbody=msg, mbody=message,
mtype='groupchat' mtype='groupchat'
) )
@@ -276,8 +267,7 @@ class bot(ClientXMPP):
) )
def muc_message(self, msg): def muc_message(self, msg):
print(msg['mucnick']) print('%10s: %s' % (msg['mucnick'], msg['body']))
print(msg['body'])
# don't talk to yourself # don't talk to yourself
if msg['mucnick'] == self.nick: if msg['mucnick'] == self.nick: