Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

The archive_msg export fun requires MUC Service for room archives

This commit is contained in:
Badlop 2021-08-27 12:38:47 +02:00
parent 2229e4c6db
commit 796f567db1
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ejd2sql.erl
View File

@ -165,12 +165,18 @@ import_info(Mod) ->
%%%---------------------------------------------------------------------- %%%----------------------------------------------------------------------
export(LServer, Table, IO, ConvertFun) -> export(LServer, Table, IO, ConvertFun) ->
DbType = ejabberd_option:sql_type(LServer), DbType = ejabberd_option:sql_type(LServer),
LServerConvert = case Table of
archive_msg ->
[LServer | mod_muc_admin:find_hosts(LServer)];
_ ->
LServer
end,
F = fun () -> F = fun () ->
mnesia:read_lock_table(Table), mnesia:read_lock_table(Table),
{_N, SQLs} = {_N, SQLs} =
mnesia:foldl( mnesia:foldl(
fun(R, {N, SQLs} = Acc) -> fun(R, {N, SQLs} = Acc) ->
case ConvertFun(LServer, R) of case ConvertFun(LServerConvert, R) of
[] -> [] ->
Acc; Acc;
SQL1 -> SQL1 ->

4
src/mod_mam_sql.erl
View File

@ -362,10 +362,10 @@ export(_Server) ->
[] []
end}, end},
{archive_msg, {archive_msg,
fun(Host, #archive_msg{us ={LUser, LServer}, fun([Host | HostTail], #archive_msg{us ={LUser, LServer},
id = _ID, timestamp = TS, peer = Peer, id = _ID, timestamp = TS, peer = Peer,
type = Type, nick = Nick, packet = Pkt}) type = Type, nick = Nick, packet = Pkt})
when LServer == Host -> when (LServer == Host) or ([LServer] == HostTail) ->
TStmp = misc:now_to_usec(TS), TStmp = misc:now_to_usec(TS),
SUser = case Type of SUser = case Type of
chat -> LUser; chat -> LUser;