diff options
| author | Christophe Romain <chris.romain@gmail.com> | 2010-05-28 12:33:11 +0200 |
|---|---|---|
| committer | Christophe Romain <chris.romain@gmail.com> | 2010-05-28 12:33:11 +0200 |
| commit | 7ce3291603b79d931e9bfe1a461d33a6776be521 (patch) | |
| tree | 84220ce4fbbfcd4a71e4c96a5c05b3c4065af642 /src | |
| parent | make last_item_cache feature cluster aware (EJAB-1234) (diff) | |
fix jlib calls from previous patch
Diffstat (limited to 'src')
| -rw-r--r-- | src/mod_pubsub/mod_pubsub.erl | 4 | ||||
| -rw-r--r-- | src/mod_pubsub/mod_pubsub_odbc.erl | 4 | ||||
| -rw-r--r-- | src/mod_pubsub/pubsub_odbc.patch | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl index 5120f723f..fa1e58f76 100644 --- a/src/mod_pubsub/mod_pubsub.erl +++ b/src/mod_pubsub/mod_pubsub.erl @@ -2443,7 +2443,7 @@ set_affiliations(Host, Node, From, EntitiesEls) -> Action = fun(#pubsub_node{owners = Owners, type = Type, id = NodeId}=N) -> case lists:member(Owner, Owners) of true -> - OwnerJID = exmpp_jid:make(Owner), + OwnerJID = jlib:make_jid(Owner), FilteredEntities = case Owners of [Owner] -> [E || E <- Entities, element(1, E) =/= OwnerJID]; _ -> Entities @@ -3560,7 +3560,7 @@ set_cached_item({_, ServerHost, _}, NodeId, ItemId, Publisher, Payload) -> set_cached_item(ServerHost, NodeId, ItemId, Publisher, Payload); set_cached_item(Host, NodeId, ItemId, Publisher, Payload) -> case is_last_item_cache_enabled(Host) of - true -> mnesia:dirty_write({pubsub_last_item, NodeId, ItemId, {now(), jlib:short_prepd_bare_jid(Publisher)}, Payload}); + true -> mnesia:dirty_write({pubsub_last_item, NodeId, ItemId, {now(), jlib:jid_tolower(jlib:jid_remove_resource(Publisher))}, Payload}); _ -> ok end. unset_cached_item({_, ServerHost, _}, NodeId) -> diff --git a/src/mod_pubsub/mod_pubsub_odbc.erl b/src/mod_pubsub/mod_pubsub_odbc.erl index 3f9ec04bd..2ed6d2268 100644 --- a/src/mod_pubsub/mod_pubsub_odbc.erl +++ b/src/mod_pubsub/mod_pubsub_odbc.erl @@ -2270,7 +2270,7 @@ set_affiliations(Host, Node, From, EntitiesEls) -> Owners = node_owners_call(Type, NodeId), case lists:member(Owner, Owners) of true -> - OwnerJID = exmpp_jid:make(Owner), + OwnerJID = jlib:make_jid(Owner), FilteredEntities = case Owners of [Owner] -> [E || E <- Entities, element(1, E) =/= OwnerJID]; _ -> Entities @@ -3394,7 +3394,7 @@ set_cached_item({_, ServerHost, _}, NodeId, ItemId, Publisher, Payload) -> set_cached_item(ServerHost, NodeId, ItemId, Publisher, Payload); set_cached_item(Host, NodeId, ItemId, Publisher, Payload) -> case is_last_item_cache_enabled(Host) of - true -> mnesia:dirty_write({pubsub_last_item, NodeId, ItemId, {now(), jlib:short_prepd_bare_jid(Publisher)}, Payload}); + true -> mnesia:dirty_write({pubsub_last_item, NodeId, ItemId, {now(), jlib:jid_tolower(jlib:jid_remove_resource(Publisher))}, Payload}); _ -> ok end. unset_cached_item({_, ServerHost, _}, NodeId) -> diff --git a/src/mod_pubsub/pubsub_odbc.patch b/src/mod_pubsub/pubsub_odbc.patch index 8a3b2050f..6ede7dfed 100644 --- a/src/mod_pubsub/pubsub_odbc.patch +++ b/src/mod_pubsub/pubsub_odbc.patch @@ -1,5 +1,5 @@ ---- mod_pubsub.erl 2010-05-28 11:46:24.000000000 +0200 -+++ mod_pubsub_odbc.erl 2010-05-28 11:55:17.000000000 +0200 +--- mod_pubsub.erl 2010-05-28 12:30:32.000000000 +0200 ++++ mod_pubsub_odbc.erl 2010-05-28 12:32:45.000000000 +0200 @@ -42,7 +42,7 @@ %%% 6.2.3.1, 6.2.3.5, and 6.3. For information on subscription leases see %%% XEP-0060 section 12.18. @@ -570,7 +570,7 @@ + Owners = node_owners_call(Type, NodeId), case lists:member(Owner, Owners) of true -> - OwnerJID = exmpp_jid:make(Owner), + OwnerJID = jlib:make_jid(Owner), @@ -2450,24 +2277,7 @@ end, lists:foreach( |