* src/mod_irc/mod_irc.erl: Announce disco#info (thanks to Spike)

* src/mod_muc/mod_muc.erl: Announce disco#info disco#items
* src/mod_proxy65/mod_proxy65_service.erl: No announce disco#items
* src/mod_pubsub/mod_pubsub.erl: Announce disco#info disco#items
* src/mod_vcard.erl: Announce disco#info

SVN Revision: 1686

diff --git a/ChangeLog b/ChangeLog
index 7679c38df3cb34105638193e2dd91388796e69cc..24085ba5910bd37b13faf9c07f27cb39cff9e955 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-11-26  Badlop  <badlop@process-one.net>
 
+       * src/mod_irc/mod_irc.erl: Announce disco#info (thanks to Spike)
+       * src/mod_muc/mod_muc.erl: Announce disco#info disco#items
+       * src/mod_proxy65/mod_proxy65_service.erl: No announce disco#items
+       * src/mod_pubsub/mod_pubsub.erl: Announce disco#info disco#items
+       * src/mod_vcard.erl: Announce disco#info
+
        * src/gen_mod.erl: First store module options in ETS and Mnesia,
        then start the module. In case of failure, remove options from
        ETS. Until now the module was started before the options were

diff --git a/src/mod_irc/mod_irc.erl b/src/mod_irc/mod_irc.erl
index dd86037b954c2436d28bdf66d281783f6e44825e..dedd4f778f9cd012d575e05574d0496f9c5a3b99 100644 (file)
--- a/src/mod_irc/mod_irc.erl
+++ b/src/mod_irc/mod_irc.erl
@@ -309,12 +309,10 @@ iq_disco(Lang) ->
       [{"category", "conference"},
        {"type", "irc"},
        {"name", translate:translate(Lang, "IRC Transport")}], []},
-     {xmlelement, "feature",
-      [{"var", ?NS_MUC}], []},
-     {xmlelement, "feature",
-      [{"var", ?NS_REGISTER}], []},
-     {xmlelement, "feature",
-      [{"var", ?NS_VCARD}], []}].
+     {xmlelement, "feature", [{"var", ?NS_DISCO_INFO}], []},
+     {xmlelement, "feature", [{"var", ?NS_MUC}], []},
+     {xmlelement, "feature", [{"var", ?NS_REGISTER}], []},
+     {xmlelement, "feature", [{"var", ?NS_VCARD}], []}].
 
 iq_get_vcard(Lang) ->
     [{xmlelement, "FN", [],

diff --git a/src/mod_muc/mod_muc.erl b/src/mod_muc/mod_muc.erl
index 812c8de97761be9b9afcaad642bb0d49fc250bc8..880540bef44fa925c9371ac13f99a0f6dcce007f 100644 (file)
--- a/src/mod_muc/mod_muc.erl
+++ b/src/mod_muc/mod_muc.erl
@@ -508,6 +508,8 @@ iq_disco_info(Lang) ->
       [{"category", "conference"},
        {"type", "text"},
        {"name", translate:translate(Lang, "Chatrooms")}], []},
+     {xmlelement, "feature", [{"var", ?NS_DISCO_INFO}], []},
+     {xmlelement, "feature", [{"var", ?NS_DISCO_ITEMS}], []},
      {xmlelement, "feature", [{"var", ?NS_MUC}], []},
      {xmlelement, "feature", [{"var", ?NS_REGISTER}], []},
      {xmlelement, "feature", [{"var", ?NS_VCARD}], []}].

diff --git a/src/mod_proxy65/mod_proxy65_service.erl b/src/mod_proxy65/mod_proxy65_service.erl
index 2b252c1222a9f23386e8ae234f34bb810b741c34..23f41d4efa10c2a94a1f04f30e94969365258801 100644 (file)
--- a/src/mod_proxy65/mod_proxy65_service.erl
+++ b/src/mod_proxy65/mod_proxy65_service.erl
@@ -196,7 +196,6 @@ iq_disco_info(Lang, Name) ->
        {"type", "bytestreams"},
        {"name", translate:translate(Lang, Name)}], []},
      ?FEATURE(?NS_DISCO_INFO),
-     ?FEATURE(?NS_DISCO_ITEMS),
      ?FEATURE(?NS_VCARD),
      ?FEATURE(?NS_BYTESTREAMS)].
 

diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index 24f39c9f2e4f94408694f9f37a02c51dc9a01ff0..a1d6febf237d83766ceb70180c834f5545eede3c 100644 (file)
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -760,6 +760,8 @@ iq_disco_info(Host, SNode, From, Lang) ->
               [{"category", "pubsub"},
                {"type", "service"},
                {"name", translate:translate(Lang, "Publish-Subscribe")}], []},
+             {xmlelement, "feature", [{"var", ?NS_DISCO_INFO}], []},
+             {xmlelement, "feature", [{"var", ?NS_DISCO_ITEMS}], []},
              {xmlelement, "feature", [{"var", ?NS_PUBSUB}], []},
              {xmlelement, "feature", [{"var", ?NS_VCARD}], []}] ++
             lists:map(fun(Feature) ->

diff --git a/src/mod_vcard.erl b/src/mod_vcard.erl
index 004a238d18e2ddc8049b9a2488fc61305254fd7f..c2c00b9542c252e789e74d1ccc16d08e65c31146 100644 (file)
--- a/src/mod_vcard.erl
+++ b/src/mod_vcard.erl
@@ -138,9 +138,9 @@ get_sm_features(Acc, _From, _To, Node, _Lang) ->
        [] ->
            case Acc of
                {result, Features} ->
-                   {result, [?NS_VCARD | Features]};
+                   {result, [?NS_DISCO_INFO, ?NS_VCARD | Features]};
                empty ->
-                   {result, [?NS_VCARD]}
+                   {result, [?NS_DISCO_INFO, ?NS_VCARD]}
            end;
        _ ->
            Acc
@@ -378,6 +378,8 @@ do_route(ServerHost, From, To, Packet) ->
                                                    {"name",
                                                     translate:translate(Lang, "vCard User Search")}],
                                                   []},
+                                                 {xmlelement, "feature",
+                                                  [{"var", ?NS_DISCO_INFO}], []},
                                                  {xmlelement, "feature",
                                                   [{"var", ?NS_SEARCH}], []},
                                                  {xmlelement, "feature",