Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-28 22:52:27 +02:00
Code Releases Activity

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

Browse Source
This commit is contained in:
Badlop 2017-06-26 14:38:12 +02:00
parent 4ef1cdec12
commit 1bfb0ab39c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mod_mam_sql.erl
View File

@ -198,15 +198,14 @@ export(_Server) ->
[] []
end}, end},
{archive_msg, {archive_msg,
fun(Host, #archive_msg{us ={_LUser, LServer}, fun(Host, #archive_msg{us ={LUser, LServer},
id = _ID, timestamp = TS, peer = Peer, id = _ID, timestamp = TS, peer = Peer,
bare_peer = {PUser, PServer, <<>>},
type = Type, nick = Nick, packet = Pkt}) type = Type, nick = Nick, packet = Pkt})
when LServer == Host -> when LServer == Host ->
TStmp = now_to_usec(TS), TStmp = now_to_usec(TS),
SUser = case Type of SUser = case Type of
chat -> PUser; chat -> LUser;
groupchat -> jid:encode({PUser, PServer, <<>>}) groupchat -> jid:encode({LUser, LServer, <<>>})
end, end,
BarePeer = jid:encode(jid:tolower(jid:remove_resource(Peer))), BarePeer = jid:encode(jid:tolower(jid:remove_resource(Peer))),
LPeer = jid:encode(jid:tolower(Peer)), LPeer = jid:encode(jid:tolower(Peer)),