Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-08 21:43:07 +02:00
Code Releases Activity

Use more efficient way to calculate changes in set_privacy_list

Browse Source
This commit is contained in:
Paweł Chmielowski 2023-05-02 11:43:18 +02:00
parent d95a1bac3e
commit 8e64992f47
1 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/mod_privacy_sql.erl
View File

@ -422,6 +422,12 @@ set_privacy_list_new(ID, RItems) ->
end, end,
RItems). RItems).
calculate_difference(List1, List2) ->
Set1 = gb_sets:from_list(List1),
Set2 = gb_sets:from_list(List2),
{gb_sets:subtract(Set1, Set2),
gb_sets:subtract(Set2, Set1)}.
set_privacy_list(ID, RItems) -> set_privacy_list(ID, RItems) ->
case ejabberd_sql:sql_query_t( case ejabberd_sql:sql_query_t(
?SQL("select @(t)s, @(value)s, @(action)s, @(ord)d, @(match_all)b, " ?SQL("select @(t)s, @(value)s, @(action)s, @(ord)d, @(match_all)b, "
@ -429,25 +435,15 @@ set_privacy_list(ID, RItems) ->
"@(match_presence_out)b from privacy_list_data " "@(match_presence_out)b from privacy_list_data "
"where id=%(ID)d")) of "where id=%(ID)d")) of
{selected, ExistingItems} -> {selected, ExistingItems} ->
{ToAdd2, ToDelete2} = {ToAdd2, ToDelete2} = calculate_difference(RItems, ExistingItems),
lists:foldr( ToAdd3 = if
fun(Value, {ToAdd, ToDelete}) -> ToDelete2 /= [] ->
case lists:splitwith(fun(E) -> E /= Value end, ToAdd) of ejabberd_sql:sql_query_t(
{_S, []} -> ?SQL("delete from privacy_list_data where id=%(ID)d")),
{ToAdd, [Value | ToDelete]}; RItems;
{Pfx, [_ | Rest]} -> true ->
{Pfx ++ Rest, ToDelete} ToAdd2
end end,
end, {RItems, []}, ExistingItems),
ToAdd3 =
if
ToDelete2 /= [] ->
ejabberd_sql:sql_query_t(
?SQL("delete from privacy_list_data where id=%(ID)d")),
RItems;
true ->
ToAdd2
end,
lists:foreach( lists:foreach(
fun({SType, SValue, SAction, Order, MatchAll, MatchIQ, fun({SType, SValue, SAction, Order, MatchAll, MatchIQ,
MatchMessage, MatchPresenceIn, MatchPresenceOut}) -> MatchMessage, MatchPresenceIn, MatchPresenceOut}) ->