From: Badlop <badlop@process-one.net>
Date: Mon, 26 Jun 2017 12:38:12 +0000 (+0200)
Subject: Fix username in mam export (#1510)(thanks to themaverik)
X-Git-Tag: 17.06~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1bfb0ab39cca5e9ed992c6ba081bc73965c158d2;p=ejabberd

Fix username in mam export (#1510)(thanks to themaverik)
---

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)),