diff options
author | Christophe Romain <christophe.romain@process-one.net> | 2009-01-03 00:25:40 +0000 |
---|---|---|
committer | Christophe Romain <christophe.romain@process-one.net> | 2009-01-03 00:25:40 +0000 |
commit | e710a24860af9cb127478c8735b08f4bf1ff3697 (patch) | |
tree | adfef3c00f4244898d9cda7bc64cfb78e0520b09 /src/mod_pubsub/pubsub.hrl | |
parent | * src/ejabberd_c2s.erl: Remove useless comment and port Alexey fix to 2.0.x b... (diff) |
PubSub cleanup, EJAB-827 fix, EJAB-701 partial fix
SVN Revision: 1766
Diffstat (limited to '')
-rw-r--r-- | src/mod_pubsub/pubsub.hrl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mod_pubsub/pubsub.hrl b/src/mod_pubsub/pubsub.hrl index b4ceed4fa..61ed88dbe 100644 --- a/src/mod_pubsub/pubsub.hrl +++ b/src/mod_pubsub/pubsub.hrl @@ -72,7 +72,7 @@ %%% lserver = string(), %%% lresource = string()}. -%%% @type usr() = {User::string(), Server::string(), Resource::string()}. +%%% @type ljid() = {User::string(), Server::string(), Resource::string()}. %%% @type affiliation() = none | owner | publisher | outcast. %%% @type subscription() = none | pending | unconfigured | subscribed. @@ -81,7 +81,7 @@ %%% nodeid = {Host::host(), Node::pubsubNode()}, %%% parentid = {Host::host(), Node::pubsubNode()}, %%% type = nodeType(), -%%% owners = [usr()], +%%% owners = [ljid()], %%% options = [nodeOption()]}. %%% <p>This is the format of the <tt>nodes</tt> table. The type of the table %%% is: <tt>set</tt>,<tt>ram/disc</tt>.</p> @@ -94,7 +94,7 @@ }). %%% @type pubsubState() = #pubsub_state{ -%%% stateid = {jid(), {Host::host(), Node::pubsubNode()}}, +%%% stateid = {ljid(), {Host::host(), Node::pubsubNode()}}, %%% items = [ItemId::string()], %%% affiliation = affiliation(), %%% subscription = subscription()}. @@ -108,8 +108,8 @@ %% @type pubsubItem() = #pubsub_item{ %% itemid = {ItemId::string(), {Host::host(),Node::pubsubNode()}}, -%% creation = {JID::jid(), now()}, -%% modification = {JID::jid(), now()}, +%% creation = {ljid(), now()}, +%% modification = {ljid(), now()}, %% payload = XMLContent::string()}. %%% <p>This is the format of the <tt>published items</tt> table. The type of the %%% table is: <tt>set</tt>,<tt>disc</tt>,<tt>fragmented</tt>.</p> |