From e987b888481e3e68f6259e96e7c54af84d168c3c Mon Sep 17 00:00:00 2001
From: Evgeniy Khramtsov <ekhramtsov@process-one.net>
Date: Tue, 13 Sep 2016 12:30:05 +0300
Subject: Make common tests working again

---
 src/mod_blocking.erl | 44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

(limited to 'src/mod_blocking.erl')

diff --git a/src/mod_blocking.erl b/src/mod_blocking.erl
index 55e3ca151..b3bbff96e 100644
--- a/src/mod_blocking.erl
+++ b/src/mod_blocking.erl
@@ -74,39 +74,37 @@ process_iq(IQ) ->
 
 -spec process_iq_get({error, stanza_error()} | {result, xmpp_element() | undefined},
 		     iq(), userlist()) ->
-			    {error, stanza_error()} | {result, block_list()}.
+			    {error, stanza_error()} |
+			    {result, xmpp_element() | undefined}.
 process_iq_get(_, #iq{lang = Lang, from = From,
 		      sub_els = [#block_list{}]}, _) ->
     #jid{luser = LUser, lserver = LServer} = From,
-    {stop, process_blocklist_get(LUser, LServer, Lang)};
+    process_blocklist_get(LUser, LServer, Lang);
 process_iq_get(Acc, _, _) -> Acc.
 
 -spec process_iq_set({error, stanza_error()} |
 		     {result, xmpp_element() | undefined} |
 		     {result, xmpp_element() | undefined, userlist()},
 		     iq()) -> {error, stanza_error()} |
-			      {result, undefined} |
-			      {result, undefined, userlist()}.
-process_iq_set(_, #iq{from = From, lang = Lang, sub_els = [SubEl]}) ->
+			      {result, xmpp_element() | undefined} |
+			      {result, xmpp_element() | undefined, userlist()}.
+process_iq_set(Acc, #iq{from = From, lang = Lang, sub_els = [SubEl]}) ->
     #jid{luser = LUser, lserver = LServer} = From,
-    Res = case SubEl of
-	      #block{items = []} ->
-		  Txt = <<"No items found in this query">>,
-		  {error, xmpp:err_bad_request(Txt, Lang)};
-	      #block{items = Items} ->
-		  JIDs = [jid:tolower(Item) || Item <- Items],
-		  process_blocklist_block(LUser, LServer, JIDs, Lang);
-	      #unblock{items = []} ->
-		  process_blocklist_unblock_all(LUser, LServer, Lang);
-	      #unblock{items = Items} ->
-		  JIDs = [jid:tolower(Item) || Item <- Items],
-		  process_blocklist_unblock(LUser, LServer, JIDs, Lang);
-	      _ ->
-		  Txt = <<"Only <block/> and <unblock/> are allowed "
-			  "in this request">>,
-		  {error, xmpp:err_bad_request(Txt, Lang)}
-	  end,
-    {stop, Res};
+    case SubEl of
+	#block{items = []} ->
+	    Txt = <<"No items found in this query">>,
+	    {error, xmpp:err_bad_request(Txt, Lang)};
+	#block{items = Items} ->
+	    JIDs = [jid:tolower(Item) || Item <- Items],
+	    process_blocklist_block(LUser, LServer, JIDs, Lang);
+	#unblock{items = []} ->
+	    process_blocklist_unblock_all(LUser, LServer, Lang);
+	#unblock{items = Items} ->
+	    JIDs = [jid:tolower(Item) || Item <- Items],
+	    process_blocklist_unblock(LUser, LServer, JIDs, Lang);
+	_ ->
+	    Acc
+    end;
 process_iq_set(Acc, _) -> Acc.
 
 -spec list_to_blocklist_jids([listitem()], [ljid()]) -> [ljid()].
-- 
cgit v1.2.3