summaryrefslogtreecommitdiff
path: root/src/mod_mam.erl
diff options
context:
space:
mode:
authorPaweł Chmielowski <pchmielowski@process-one.net>2015-12-09 09:46:45 +0100
committerPaweł Chmielowski <pchmielowski@process-one.net>2015-12-09 09:47:03 +0100
commitbe4d687a8650e549ae3c1417b766ee36ded1245c (patch)
tree94b739db9a5f5009c00456c4082fffe8ce2c128d /src/mod_mam.erl
parentDon't let "reopen_log" rotate files (EJAB-1243) (diff)
Fix problem with handling of old db entries in mod_mam
Diffstat (limited to 'src/mod_mam.erl')
-rw-r--r--src/mod_mam.erl7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mod_mam.erl b/src/mod_mam.erl
index cfc1e213..89b8ddad 100644
--- a/src/mod_mam.erl
+++ b/src/mod_mam.erl
@@ -712,9 +712,10 @@ select(LServer, #jid{luser = LUser} = JidRequestor,
#xmlel{} = El = xml_stream:parse_element(XML),
Now = usec_to_now(jlib:binary_to_integer(TS)),
PeerJid = jid:tolower(jid:from_string(PeerBin)),
- T = if Kind /= <<"">> ->
- jlib:binary_to_atom(Kind);
- true -> chat
+ T = case Kind of
+ <<"">> -> chat;
+ null -> chat;
+ _ -> jlib:binary_to_atom(Kind)
end,
{TS, jlib:binary_to_integer(TS),
msg_to_el(#archive_msg{timestamp = Now,