diff options
Diffstat (limited to 'src/mod_blocking.erl')
| -rw-r--r-- | src/mod_blocking.erl | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/mod_blocking.erl b/src/mod_blocking.erl index 5195bfb7..3f9e9025 100644 --- a/src/mod_blocking.erl +++ b/src/mod_blocking.erl @@ -5,7 +5,7 @@ %%% Created : 24 Aug 2008 by Stephan Maka <stephan@spaceboyz.net> %%% %%% -%%% ejabberd, Copyright (C) 2002-2016 ProcessOne +%%% ejabberd, Copyright (C) 2002-2017 ProcessOne %%% %%% This program is free software; you can redistribute it and/or %%% modify it under the terms of the GNU General Public License as @@ -114,7 +114,7 @@ listitems_to_jids([], JIDs) -> JIDs; listitems_to_jids([#listitem{type = jid, action = deny, value = JID} = Item | Items], - JIDs) -> + JIDs) -> Match = case Item of #listitem{match_all = true} -> true; @@ -155,13 +155,13 @@ process_block(#iq{from = #jid{luser = LUser, lserver = LServer}, end, Mod = db_mod(LServer), case Mod:process_blocklist_block(LUser, LServer, Filter) of - {atomic, {ok, Default, List}} -> - UserList = make_userlist(Default, List), + {atomic, {ok, Default, List}} -> + UserList = make_userlist(Default, List), broadcast_list_update(LUser, LServer, UserList, Default), broadcast_event(LUser, LServer, #block{items = [jid:make(J) || J <- JIDs]}), xmpp:make_iq_result(IQ); - _Err -> + _Err -> ?ERROR_MSG("Error processing ~p: ~p", [{LUser, LServer, JIDs}, _Err]), Err = xmpp:err_internal_server_error(<<"Database failure">>, Lang), xmpp:make_error(IQ, Err) @@ -179,12 +179,12 @@ process_unblock_all(#iq{from = #jid{luser = LUser, lserver = LServer}, case Mod:unblock_by_filter(LUser, LServer, Filter) of {atomic, ok} -> xmpp:make_iq_result(IQ); - {atomic, {ok, Default, List}} -> - UserList = make_userlist(Default, List), + {atomic, {ok, Default, List}} -> + UserList = make_userlist(Default, List), broadcast_list_update(LUser, LServer, UserList, Default), broadcast_event(LUser, LServer, #unblock{}), xmpp:make_iq_result(IQ); - _Err -> + _Err -> ?ERROR_MSG("Error processing ~p: ~p", [{LUser, LServer}, _Err]), Err = xmpp:err_internal_server_error(<<"Database failure">>, Lang), xmpp:make_error(IQ, Err) @@ -205,13 +205,13 @@ process_unblock(#iq{from = #jid{luser = LUser, lserver = LServer}, case Mod:unblock_by_filter(LUser, LServer, Filter) of {atomic, ok} -> xmpp:make_iq_result(IQ); - {atomic, {ok, Default, List}} -> - UserList = make_userlist(Default, List), + {atomic, {ok, Default, List}} -> + UserList = make_userlist(Default, List), broadcast_list_update(LUser, LServer, UserList, Default), broadcast_event(LUser, LServer, #unblock{items = [jid:make(J) || J <- JIDs]}), xmpp:make_iq_result(IQ); - _Err -> + _Err -> ?ERROR_MSG("Error processing ~p: ~p", [{LUser, LServer, JIDs}, _Err]), Err = xmpp:err_internal_server_error(<<"Database failure">>, Lang), xmpp:make_error(IQ, Err) @@ -243,12 +243,12 @@ process_get(#iq{from = #jid{luser = LUser, lserver = LServer}, lang = Lang} = IQ) -> Mod = db_mod(LServer), case Mod:process_blocklist_get(LUser, LServer) of - error -> + error -> Err = xmpp:err_internal_server_error(<<"Database failure">>, Lang), xmpp:make_error(IQ, Err); - List -> + List -> LJIDs = listitems_to_jids(List, []), - Items = [jid:make(J) || J <- LJIDs], + Items = [jid:make(J) || J <- LJIDs], xmpp:make_iq_result(IQ, #block_list{items = Items}) end. |