aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2017-06-26 14:38:12 +0200
committerBadlop <badlop@process-one.net>2017-06-26 14:38:12 +0200
commit1bfb0ab39cca5e9ed992c6ba081bc73965c158d2 (patch)
treeb381cd4abd56ada29fa76131ed52f0c3e368e4fb
parentWrite validator for mod_multicast's limits option (diff)
Fix username in mam export (#1510)(thanks to themaverik)
-rw-r--r--src/mod_mam_sql.erl7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mod_mam_sql.erl b/src/mod_mam_sql.erl
index fae14955f..7e02b5791 100644
--- a/src/mod_mam_sql.erl
+++ b/src/mod_mam_sql.erl
@@ -198,15 +198,14 @@ export(_Server) ->
[]
end},
{archive_msg,
- fun(Host, #archive_msg{us ={_LUser, LServer},
+ fun(Host, #archive_msg{us ={LUser, LServer},
id = _ID, timestamp = TS, peer = Peer,
- bare_peer = {PUser, PServer, <<>>},
type = Type, nick = Nick, packet = Pkt})
when LServer == Host ->
TStmp = now_to_usec(TS),
SUser = case Type of
- chat -> PUser;
- groupchat -> jid:encode({PUser, PServer, <<>>})
+ chat -> LUser;
+ groupchat -> jid:encode({LUser, LServer, <<>>})
end,
BarePeer = jid:encode(jid:tolower(jid:remove_resource(Peer))),
LPeer = jid:encode(jid:tolower(Peer)),