Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-30 16:36:29 +01:00
Code Releases Activity

rename pep_sendlast_offline option to ignore_pep_from_offline (EJAB-1047)

Browse Source 
SVN Revision: 2623
This commit is contained in:
Christophe Romain 2009-09-23 22:00:53 +00:00
parent 479b04a6a3
commit e5a26b388f
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/guide.tex
View File

@ -3462,10 +3462,10 @@ Options:
To specify which nodetree to use. If not defined, the default pubsub To specify which nodetree to use. If not defined, the default pubsub
nodetree is used. Only one nodetree can be used per host, nodetree is used. Only one nodetree can be used per host,
and is shared by all node plugins. and is shared by all node plugins.
\titem{\{pep\_sendlast\_offline, false|true\}} \ind{options!pep\_sendlast\_offline} \titem{\{ignore\_pep\_from\_offline, false|true\}} \ind{options!ignore\_pep\_from\_offline}
To specify whether or not we should get last published PEP items To specify whether or not we should get last published PEP items
from users in our roster which are offline when we connect. Value is true or false. from users in our roster which are offline when we connect. Value is true or false.
If not defined, pubsub assumes false so we only get last items of online contacts. If not defined, pubsub assumes true so we only get last items of online contacts.
\titem{\{last\_item\_cache, false|true\}} \ind{options!last\_item\_cache} \titem{\{last\_item\_cache, false|true\}} \ind{options!last\_item\_cache}
To specify whether or not pubsub should cache last items. Value is true To specify whether or not pubsub should cache last items. Value is true
or false. If not defined, pubsub do not cache last items. On systems with not so many nodes, or false. If not defined, pubsub do not cache last items. On systems with not so many nodes,

2
src/ejabberd.cfg.example
View File

@ -505,7 +505,7 @@
%%{mod_proxy65,[]}, %%{mod_proxy65,[]},
{mod_pubsub, [ {mod_pubsub, [
{access_createnode, pubsub_createnode}, {access_createnode, pubsub_createnode},
{pep_sendlast_offline, false}, {ignore_pep_from_offline, true},
{last_item_cache, false}, {last_item_cache, false},
{plugins, ["flat", "pep"]} % pep requires mod_caps {plugins, ["flat", "pep"]} % pep requires mod_caps
]}, ]},

8
src/mod_pubsub/mod_pubsub.erl
View File

@ -133,7 +133,7 @@
host, host,
access, access,
pep_mapping = [], pep_mapping = [],
pep_sendlast_offline = false, ignore_pep_from_offline = true,
last_item_cache = false, last_item_cache = false,
max_items_node = ?MAXITEMS, max_items_node = ?MAXITEMS,
nodetree = ?STDTREE, nodetree = ?STDTREE,
@ -184,7 +184,7 @@ init([ServerHost, Opts]) ->
?DEBUG("pubsub init ~p ~p",[ServerHost,Opts]), ?DEBUG("pubsub init ~p ~p",[ServerHost,Opts]),
Host = gen_mod:get_opt_host(ServerHost, Opts, "pubsub.@HOST@"), Host = gen_mod:get_opt_host(ServerHost, Opts, "pubsub.@HOST@"),
Access = gen_mod:get_opt(access_createnode, Opts, all), Access = gen_mod:get_opt(access_createnode, Opts, all),
PepOffline = gen_mod:get_opt(pep_sendlast_offline, Opts, false), PepOffline = gen_mod:get_opt(ignore_pep_from_offline, Opts, true),
IQDisc = gen_mod:get_opt(iqdisc, Opts, one_queue), IQDisc = gen_mod:get_opt(iqdisc, Opts, one_queue),
LastItemCache = gen_mod:get_opt(last_item_cache, Opts, false), LastItemCache = gen_mod:get_opt(last_item_cache, Opts, false),
MaxItemsNode = gen_mod:get_opt(max_items_node, Opts, ?MAXITEMS), MaxItemsNode = gen_mod:get_opt(max_items_node, Opts, ?MAXITEMS),
@ -232,7 +232,7 @@ init([ServerHost, Opts]) ->
server_host = ServerHost, server_host = ServerHost,
access = Access, access = Access,
pep_mapping = PepMapping, pep_mapping = PepMapping,
pep_sendlast_offline = PepOffline, ignore_pep_from_offline = PepOffline,
last_item_cache = LastItemCache, last_item_cache = LastItemCache,
max_items_node = MaxItemsNode, max_items_node = MaxItemsNode,
nodetree = NodeTree, nodetree = NodeTree,
@ -500,7 +500,7 @@ send_loop(State) ->
%% this is a hack in a sense that PEP should only be based on presence %% this is a hack in a sense that PEP should only be based on presence
%% and is not able to "store" events of remote users (via s2s) %% and is not able to "store" events of remote users (via s2s)
%% this makes that hack only work for local domain by now %% this makes that hack only work for local domain by now
if State#state.pep_sendlast_offline -> if not State#state.ignore_pep_from_offline ->
{User, Server, Resource} = LJID, {User, Server, Resource} = LJID,
case mod_caps:get_caps({User, Server, Resource}) of case mod_caps:get_caps({User, Server, Resource}) of
nothing -> nothing ->

8
src/mod_pubsub/mod_pubsub_odbc.erl
View File

@ -133,7 +133,7 @@
host, host,
access, access,
pep_mapping = [], pep_mapping = [],
pep_sendlast_offline = false, ignore_pep_from_offline = true,
last_item_cache = false, last_item_cache = false,
max_items_node = ?MAXITEMS, max_items_node = ?MAXITEMS,
nodetree = ?STDTREE, nodetree = ?STDTREE,
@ -184,7 +184,7 @@ init([ServerHost, Opts]) ->
?DEBUG("pubsub init ~p ~p",[ServerHost,Opts]), ?DEBUG("pubsub init ~p ~p",[ServerHost,Opts]),
Host = gen_mod:get_opt_host(ServerHost, Opts, "pubsub.@HOST@"), Host = gen_mod:get_opt_host(ServerHost, Opts, "pubsub.@HOST@"),
Access = gen_mod:get_opt(access_createnode, Opts, all), Access = gen_mod:get_opt(access_createnode, Opts, all),
PepOffline = gen_mod:get_opt(pep_sendlast_offline, Opts, false), PepOffline = gen_mod:get_opt(ignore_pep_from_offline, Opts, true),
IQDisc = gen_mod:get_opt(iqdisc, Opts, one_queue), IQDisc = gen_mod:get_opt(iqdisc, Opts, one_queue),
LastItemCache = gen_mod:get_opt(last_item_cache, Opts, false), LastItemCache = gen_mod:get_opt(last_item_cache, Opts, false),
MaxItemsNode = gen_mod:get_opt(max_items_node, Opts, ?MAXITEMS), MaxItemsNode = gen_mod:get_opt(max_items_node, Opts, ?MAXITEMS),
@ -230,7 +230,7 @@ init([ServerHost, Opts]) ->
server_host = ServerHost, server_host = ServerHost,
access = Access, access = Access,
pep_mapping = PepMapping, pep_mapping = PepMapping,
pep_sendlast_offline = PepOffline, ignore_pep_from_offline = PepOffline,
last_item_cache = LastItemCache, last_item_cache = LastItemCache,
max_items_node = MaxItemsNode, max_items_node = MaxItemsNode,
nodetree = NodeTree, nodetree = NodeTree,
@ -326,7 +326,7 @@ send_loop(State) ->
%% this is a hack in a sense that PEP should only be based on presence %% this is a hack in a sense that PEP should only be based on presence
%% and is not able to "store" events of remote users (via s2s) %% and is not able to "store" events of remote users (via s2s)
%% this makes that hack only work for local domain by now %% this makes that hack only work for local domain by now
if State#state.pep_sendlast_offline -> if not State#state.ignore_pep_from_offline ->
{User, Server, Resource} = LJID, {User, Server, Resource} = LJID,
case mod_caps:get_caps({User, Server, Resource}) of case mod_caps:get_caps({User, Server, Resource}) of
nothing -> nothing ->