mirror of
https://github.com/processone/ejabberd.git
synced 2024-10-09 15:06:54 +02:00
* 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
This commit is contained in:
parent
6a785fa536
commit
340562e452
@ -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
|
||||
|
@ -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", [],
|
||||
|
@ -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}], []}].
|
||||
|
@ -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)].
|
||||
|
||||
|
@ -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) ->
|
||||
|
@ -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",
|
||||
|
Loading…
Reference in New Issue
Block a user