ejabberd - Comments for "PubSub : missing tag when configuring subscription option"

Ok, I've committed that last

mfoss — Tue, 01 Sep 2009 08:22:13 +0000

Ok, I've committed that last patch to SVN.

We are almost there. This one

clochix — Mon, 31 Aug 2009 13:03:39 +0000

We are almost there.

This one works for me:

@@ -2464,9 +2464,15 @@                                                                                                      
        {error, notfound} ->                                                                                                
            {error, ?ERR_EXTENDED(?ERR_NOT_ACCEPTABLE, "invalid-subid")};                                                   
        {result, #pubsub_subscription{options = Options}} ->                                                                
-           pubsub_subscription:get_options_xform(Lang, Options)                                                            
+            {result, XdataEl} = pubsub_subscription:get_options_xform(Lang, Options),                                      
+            [N] = mnesia:dirty_match_object({pubsub_node,'_',NodeID,'_','_','_','_'}),                                     
+            {_,Node} = N#pubsub_node.nodeid,                                                                               
+            NodeIDStr = node_to_string(Node),                                                                              
+            SubscriberStr = jlib:jid_to_string(Subscriber),                                                                
+            OptionsEl = {xmlelement, "options", [{"node", NodeIDStr}, {"jid", SubscriberStr}, {"subid", SubID}], [XdataEl]},
+            PubsubEl = {xmlelement, "pubsub", [{"xmlns", ?NS_PUBSUB}], [OptionsEl]},                                        
+            {result, PubsubEl}                                                                                              
     end.                                                                                                                    
-                                                                                                                            
 set_options(Host, Node, JID, SubID, Configuration) ->                                                                       
     Action = fun(#pubsub_node{type = Type, id = NodeID}) ->                                                                 
                     case lists:member("subscription-options", features(Type)) of

Please note that pubsub_subscription:get_options_xform return a tuple {result, xmlelement}, and read_sub should also return a tuple.

Can you try this patch? It

mfoss — Mon, 31 Aug 2009 10:52:45 +0000

Can you try this patch? It includes your improvements and the NodeID string. Again, I didn't test it.

--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -2464,7 +2464,13 @@ read_sub(Subscriber, NodeID, SubID, Lang) ->
        {error, notfound} ->
            {error, ?ERR_EXTENDED(?ERR_NOT_ACCEPTABLE, "invalid-subid")};
        {result, #pubsub_subscription{options = Options}} ->
-           pubsub_subscription:get_options_xform(Lang, Options)
+           XdataEl = pubsub_subscription:get_options_xform(Lang, Options),
+           [N] = mnesia:dirty_match_object({pubsub_node,'_',NodeID,'_','_','_','_'}),
+           {'_',NodeIDStr} = N#pubsub_node.nodeid,
+           SubscriberStr = jlib:jid_to_string(Subscriber),
+           OptionsEl = {xmlelement, "options", [{"node", NodeIDStr}, {"jid", SubscriberStr}, {"subid", SubID}], [XdataEl]},
+           PubsubEl = {xmlelement, "pubsub", [{"xmlns", ?NS_PUBSUB}], [OptionsEl]},
+           PubsubEl
     end.

 set_options(Host, Node, JID, SubID, Configuration) ->

Another try

clochix — Mon, 31 Aug 2009 00:01:48 +0000

Thanks. Actually, it didn't work and throw an error.

Here's another try :

@@ -2464,9 +2464,11 @@                                                                                                      
        {error, notfound} ->                                                                                                
            {error, ?ERR_EXTENDED(?ERR_NOT_ACCEPTABLE, "invalid-subid")};                                                   
        {result, #pubsub_subscription{options = Options}} ->                                                                
-           pubsub_subscription:get_options_xform(Lang, Options)                                                            
+            {result, XdataEl} = pubsub_subscription:get_options_xform(Lang, Options),                                      
+            OptionsEl = {xmlelement, "options", [{"jid", jlib:jid_to_string(Subscriber)}, {"subid", SubID}], [XdataEl]},   
+            PubsubEl = {xmlelement, "pubsub", [{"xmlns", ?NS_PUBSUB}], [OptionsEl]},                                       
+            {result, PubsubEl}                                                                                             
     end.

The node attribute is missing, I don't know how to convert from NodeID to a node name.

Here is a small patch for

mfoss — Sun, 30 Aug 2009 19:21:22 +0000

Here is a small patch for ejabberd trunk SVN that I've written following your description:

--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -2464,7 +2464,10 @@ read_sub(Subscriber, NodeID, SubID, Lang) ->
        {error, notfound} ->
            {error, ?ERR_EXTENDED(?ERR_NOT_ACCEPTABLE, "invalid-subid")};
        {result, #pubsub_subscription{options = Options}} ->
-           pubsub_subscription:get_options_xform(Lang, Options)
+           XdataEl = pubsub_subscription:get_options_xform(Lang, Options),
+           OptionsEl = {xmlelement, "options", [{"node", NodeID}, {"jid", Subscriber}], [XdataEl]},
+           PubsubEl = {xmlelement, "pubsub", [{"xmlns", ?NS_PUBSUB}], [OptionsEl]},
+           PubsubEl
     end.

 set_options(Host, Node, JID, SubID, Configuration) ->

I didn't try it and I am not mod_pubsub expert.

If you try it, please comment if it solves the problem completely or not.