Merge remote-tracking branch 'processone/master' into xep-0198

Conflicts:
	doc/guide.tex
	src/ejabberd_c2s.erl

1 files changed, 39 insertions, 40 deletions

diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl
index 9bb5acfa4..168169a95 100644
--- a/src/mod_pubsub.erl
+++ b/src/mod_pubsub.erl
@@ -13,11 +13,11 @@
 %%% 
 %%%
 %%% The Initial Developer of the Original Code is ProcessOne.
-%%% Portions created by ProcessOne are Copyright 2006-2013, ProcessOne
+%%% Portions created by ProcessOne are Copyright 2006-2014, ProcessOne
 %%% All Rights Reserved.''
-%%% This software is copyright 2006-2013, ProcessOne.
+%%% This software is copyright 2006-2014, ProcessOne.
 %%%
-%%% @copyright 2006-2013 ProcessOne
+%%% @copyright 2006-2014 ProcessOne
 %%% @author Christophe Romain <christophe.romain@process-one.net>
 %%%   [http://www.process-one.net/]
 %%% @version {@vsn}, {@date} {@time}
@@ -827,7 +827,7 @@ send_loop(State) ->
 						      end;
 						  (_) -> ok
 					      end,
-					      Subscriptions)
+					      lists:usort(Subscriptions))
 			end,
 			State#state.plugins),
 	  if not State#state.ignore_pep_from_offline ->
@@ -1166,22 +1166,21 @@ disco_items(Host, Node, From) ->
 %% presence hooks handling functions
 %%
 
-caps_update(#jid{luser = U, lserver = S, lresource = R} = From, To, _Features) ->
-    Pid = ejabberd_sm:get_session_pid(U, S, R),
-    presence_probe(From, To, Pid).
-
-presence_probe(#jid{luser = User, lserver = Server, lresource = Resource} = JID,
-  JID, Pid) ->
-    presence(Server, {presence, JID, Pid}),
-    presence(Server, {presence, User, Server, [Resource], JID});
-presence_probe(#jid{luser = User, lserver = Server},
-  #jid{luser = User, lserver = Server}, _Pid) ->
-    %% ignore presence_probe from other ressources for the current user
-    %% this way, we do not send duplicated last items if user already connected with other clients
+caps_update(#jid{luser = U, lserver = S, lresource = R}, #jid{lserver = Host} = JID, _Features)
+	when Host =/= S ->
+    presence(Host, {presence, U, S, [R], JID});
+caps_update(_From, _To, _Feature) ->
+    ok.
+
+presence_probe(#jid{luser = U, lserver = S, lresource = R} = JID, JID, Pid) ->
+    presence(S, {presence, JID, Pid}),
+    presence(S, {presence, U, S, [R], JID});
+presence_probe(#jid{luser = U, lserver = S}, #jid{luser = U, lserver = S}, _Pid) ->
+    %% ignore presence_probe from my other ressources
+    %% to not get duplicated last items
     ok;
-presence_probe(#jid{luser = User, lserver = Server, lresource = Resource},
-  #jid{lserver = Host} = JID, _Pid) ->
-    presence(Host, {presence, User, Server, [Resource], JID}).
+presence_probe(#jid{luser = U, lserver = S, lresource = R}, #jid{lserver = Host} = JID, _Pid) ->
+    presence(Host, {presence, U, S, [R], JID}).
 
 presence(ServerHost, Presence) ->
     SendLoop = case
@@ -1621,7 +1620,7 @@ command_disco_info(_Host, ?NS_PUBSUB_GET_PENDING,
 node_disco_info(Host, Node, From) ->
     node_disco_info(Host, Node, From, true, true).
 
-node_disco_info(Host, Node, From, Identity, Features) ->
+node_disco_info(Host, Node, From, _Identity, _Features) ->
 %    Action =
 %	fun(#pubsub_node{type = Type, id = NodeId}) ->
 %		I = case Identity of
@@ -1910,7 +1909,7 @@ iq_get_vcard(Lang) ->
 		[{xmlcdata,
 		  <<(translate:translate(Lang,
 					 <<"ejabberd Publish-Subscribe module">>))/binary,
-		    "\nCopyright (c) 2004-2013 ProcessOne">>}]}].
+		    "\nCopyright (c) 2004-2014 ProcessOne">>}]}].
 
 -spec(iq_pubsub/6 ::
 (
@@ -2952,10 +2951,7 @@ publish_item(Host, ServerHost, Node, Publisher, ItemId, Payload, Access) ->
 		     PublishModel = get_option(Options, publish_model),
 		     DeliverPayloads = get_option(Options, deliver_payloads),
 		     PersistItems = get_option(Options, persist_items),
-		     MaxItems = case PersistItems of
-				  false -> 0;
-				  true -> max_items(Host, Options)
-				end,
+		     MaxItems = max_items(Host, Options),
 		     PayloadCount = payload_xmlelements(Payload),
 		     PayloadSize = byte_size(term_to_binary(Payload)) - 2,
 		     PayloadMaxSize = get_option(Options, max_payload_size),
@@ -3359,6 +3355,8 @@ send_items(Host, Node, NodeId, Type, {U, S, R} = LJID,
 	       _ -> []
 	     end,
     Stanza = case ToSend of
+	       [] ->
+		   undefined;
 	       [LastItem] ->
 		   {ModifNow, ModifUSR} =
 		       LastItem#pubsub_item.modification,
@@ -3372,11 +3370,13 @@ send_items(Host, Node, NodeId, Type, {U, S, R} = LJID,
 					attrs = nodeAttr(Node),
 					children = itemsEls(ToSend)}])
 	     end,
-    case is_tuple(Host) of
-      false ->
+    case {is_tuple(Host), Stanza} of
+      {_, undefined} ->
+	  ok;
+      {false, _} ->
 	  ejabberd_router:route(service_jid(Host),
 				jlib:make_jid(LJID), Stanza);
-      true ->
+      {true, _} ->
 	  case ejabberd_sm:get_session_pid(U, S, R) of
 	    C2SPid when is_pid(C2SPid) ->
 		ejabberd_c2s:broadcast(C2SPid,
@@ -4156,7 +4156,7 @@ presence_can_deliver({User, Server, Resource}, true) ->
 		       ({session, _, _ , _, undefined, _}, _Acc) -> false;
 		       ({session, _, {_, _, R}, _, _Priority, _}, _Acc) ->
 			   case Resource of
-			       [] -> true;
+			       <<>> -> true;
 			       R -> true;
 			       _ -> false
 			   end
@@ -4442,15 +4442,7 @@ broadcast_stanza(Host, _Node, _NodeId, _Type, NodeOptions, SubsByDepth, NotifyTy
 broadcast_stanza({LUser, LServer, LResource}, Publisher, Node, NodeId, Type, NodeOptions, SubsByDepth, NotifyType, BaseStanza, SHIM) ->
     broadcast_stanza({LUser, LServer, LResource}, Node, NodeId, Type, NodeOptions, SubsByDepth, NotifyType, BaseStanza, SHIM),
     %% Handles implicit presence subscriptions
-    SenderResource = case LResource of
-	[] -> 
-	    case user_resources(LUser, LServer) of
-		[Resource|_] -> Resource;
-		_ -> <<>>
-	    end;
-	_ ->
-	    LResource
-    end,
+    SenderResource = user_resource(LUser, LServer, LResource),
     case ejabberd_sm:get_session_pid(LUser, LServer, SenderResource) of
 	C2SPid when is_pid(C2SPid) ->
 	    Stanza = case get_option(NodeOptions, notification_type, headline) of
@@ -4461,8 +4453,8 @@ broadcast_stanza({LUser, LServer, LResource}, Publisher, Node, NodeId, Type, Nod
 	    %% Also, add "replyto" if entity has presence subscription to the account owner
 	    %% See XEP-0163 1.1 section 4.3.1
 	    ejabberd_c2s:broadcast(C2SPid,
-	        {pep_message, binary_to_list(Node)++"+notify"},
-	        _Sender = jlib:make_jid(LUser, LServer, ""),
+	        {pep_message, <<((Node))/binary, "+notify">>},
+	        _Sender = jlib:make_jid(LUser, LServer, <<"">>),
 	        _StanzaToSend = add_extended_headers(Stanza,
 	            _ReplyTo = extended_headers([jlib:jid_to_string(Publisher)])));
 	_ ->
@@ -4527,6 +4519,13 @@ subscribed_nodes_by_jid(NotifyType, SubsByDepth) ->
 user_resources(User, Server) ->
     ejabberd_sm:get_user_resources(User, Server).
 
+user_resource(User, Server, <<>>) ->
+    case user_resources(User, Server) of
+	[R | _] -> R;
+	_ -> <<>>
+    end;
+user_resource(_, _, Resource) -> Resource.
+
 %%%%%%% Configuration handling
 
 %%<p>There are several reasons why the default node configuration options request might fail:</p>