Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/processone/ejabberd.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/mod_blocking.erl')
-rw-r--r--src/mod_blocking.erl15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/mod_blocking.erl b/src/mod_blocking.erl
index 1bd7ae3b5..968f3c814 100644
--- a/src/mod_blocking.erl
+++ b/src/mod_blocking.erl
@@ -185,7 +185,8 @@ process_blocklist_block(LUser, LServer, Filter,
riak) ->
{atomic,
begin
- case ejabberd_riak:get(privacy, {LUser, LServer}) of
+ case ejabberd_riak:get(privacy, mod_privacy:privacy_schema(),
+ {LUser, LServer}) of
{ok, #privacy{default = Default, lists = Lists} = P} ->
case lists:keysearch(Default, 1, Lists) of
{value, {_, List}} ->
@@ -205,7 +206,8 @@ process_blocklist_block(LUser, LServer, Filter,
NewList = Filter(List),
NewLists = [{NewDefault, NewList} | NewLists1],
case ejabberd_riak:put(P#privacy{default = NewDefault,
- lists = NewLists}) of
+ lists = NewLists},
+ mod_privacy:privacy_schema()) of
ok ->
{ok, NewDefault, NewList};
Err ->
@@ -389,7 +391,8 @@ process_blocklist_unblock(LUser, LServer, Filter,
process_blocklist_unblock(LUser, LServer, Filter,
riak) ->
{atomic,
- case ejabberd_riak:get(privacy, {LUser, LServer}) of
+ case ejabberd_riak:get(privacy, mod_privacy:privacy_schema(),
+ {LUser, LServer}) of
{error, _} ->
%% No lists, nothing to unblock
ok;
@@ -399,7 +402,8 @@ process_blocklist_unblock(LUser, LServer, Filter,
NewList = Filter(List),
NewLists1 = lists:keydelete(Default, 1, Lists),
NewLists = [{Default, NewList} | NewLists1],
- case ejabberd_riak:put(P#privacy{lists = NewLists}) of
+ case ejabberd_riak:put(P#privacy{lists = NewLists},
+ mod_privacy:privacy_schema()) of
ok ->
{ok, Default, NewList};
Err ->
@@ -489,7 +493,8 @@ process_blocklist_get(LUser, LServer, mnesia) ->
end
end;
process_blocklist_get(LUser, LServer, riak) ->
- case ejabberd_riak:get(privacy, {LUser, LServer}) of
+ case ejabberd_riak:get(privacy, {LUser, LServer},
+ mod_privacy:privacy_schema()) of
{ok, #privacy{default = Default, lists = Lists}} ->
case lists:keysearch(Default, 1, Lists) of
{value, {_, List}} -> List;