Commit 525010fc authored by Yann Leboulanger's avatar Yann Leboulanger

don't fail when we receive a MAM message without a body. Fixes #8140

parent d111a415
......@@ -1103,21 +1103,22 @@ class Logger:
time_col = int(float(time.mktime(tim)))
else:
time_col = int(float(time.time()))
if msg:
if self.jid_is_from_pm(with_) or nick:
# It's a groupchat message
if nick:
# It's a message from a groupchat occupent
type_ = 'gc_msg'
with_ = with_ + '/' + nick
else:
# It's a server message message, we don't log them
return
if not msg:
return
if self.jid_is_from_pm(with_) or nick:
# It's a groupchat message
if nick:
# It's a message from a groupchat occupent
type_ = 'gc_msg'
with_ = with_ + '/' + nick
else:
if direction == 'from':
type_ = 'chat_msg_recv'
elif direction == 'to':
type_ = 'chat_msg_sent'
# It's a server message message, we don't log them
return
else:
if direction == 'from':
type_ = 'chat_msg_recv'
elif direction == 'to':
type_ = 'chat_msg_sent'
jid_id = self.get_jid_id(with_)
where_sql = 'jid_id = %s AND message=?' % jid_id
if type_ == 'gc_msg':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment