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

fix jlib calls from previous patch

Browse Source
This commit is contained in:
Christophe Romain 2010-05-28 12:33:11 +02:00
parent 07e870271e
commit 7ce3291603
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mod_pubsub/mod_pubsub.erl
View File

@ -2443,7 +2443,7 @@ set_affiliations(Host, Node, From, EntitiesEls) ->
Action = fun(#pubsub_node{owners = Owners, type = Type, id = NodeId}=N) -> Action = fun(#pubsub_node{owners = Owners, type = Type, id = NodeId}=N) ->
case lists:member(Owner, Owners) of case lists:member(Owner, Owners) of
true -> true ->
OwnerJID = exmpp_jid:make(Owner), OwnerJID = jlib:make_jid(Owner),
FilteredEntities = case Owners of FilteredEntities = case Owners of
[Owner] -> [E || E <- Entities, element(1, E) =/= OwnerJID]; [Owner] -> [E || E <- Entities, element(1, E) =/= OwnerJID];
_ -> Entities _ -> Entities
@ -3560,7 +3560,7 @@ set_cached_item({_, ServerHost, _}, NodeId, ItemId, Publisher, Payload) ->
set_cached_item(ServerHost, NodeId, ItemId, Publisher, Payload); set_cached_item(ServerHost, NodeId, ItemId, Publisher, Payload);
set_cached_item(Host, NodeId, ItemId, Publisher, Payload) -> set_cached_item(Host, NodeId, ItemId, Publisher, Payload) ->
case is_last_item_cache_enabled(Host) of 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 _ -> ok
end. end.
unset_cached_item({_, ServerHost, _}, NodeId) -> unset_cached_item({_, ServerHost, _}, NodeId) ->

4
src/mod_pubsub/mod_pubsub_odbc.erl
View File

@ -2270,7 +2270,7 @@ set_affiliations(Host, Node, From, EntitiesEls) ->
Owners = node_owners_call(Type, NodeId), Owners = node_owners_call(Type, NodeId),
case lists:member(Owner, Owners) of case lists:member(Owner, Owners) of
true -> true ->
OwnerJID = exmpp_jid:make(Owner), OwnerJID = jlib:make_jid(Owner),
FilteredEntities = case Owners of FilteredEntities = case Owners of
[Owner] -> [E || E <- Entities, element(1, E) =/= OwnerJID]; [Owner] -> [E || E <- Entities, element(1, E) =/= OwnerJID];
_ -> Entities _ -> Entities
@ -3394,7 +3394,7 @@ set_cached_item({_, ServerHost, _}, NodeId, ItemId, Publisher, Payload) ->
set_cached_item(ServerHost, NodeId, ItemId, Publisher, Payload); set_cached_item(ServerHost, NodeId, ItemId, Publisher, Payload);
set_cached_item(Host, NodeId, ItemId, Publisher, Payload) -> set_cached_item(Host, NodeId, ItemId, Publisher, Payload) ->
case is_last_item_cache_enabled(Host) of 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 _ -> ok
end. end.
unset_cached_item({_, ServerHost, _}, NodeId) -> unset_cached_item({_, ServerHost, _}, NodeId) ->

6
src/mod_pubsub/pubsub_odbc.patch
View File

@ -1,5 +1,5 @@
--- mod_pubsub.erl 2010-05-28 11:46:24.000000000 +0200 --- mod_pubsub.erl 2010-05-28 12:30:32.000000000 +0200
+++ mod_pubsub_odbc.erl 2010-05-28 11:55:17.000000000 +0200 +++ mod_pubsub_odbc.erl 2010-05-28 12:32:45.000000000 +0200
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
%%% 6.2.3.1, 6.2.3.5, and 6.3. For information on subscription leases see %%% 6.2.3.1, 6.2.3.5, and 6.3. For information on subscription leases see
%%% XEP-0060 section 12.18. %%% XEP-0060 section 12.18.
@ -570,7 +570,7 @@
+ Owners = node_owners_call(Type, NodeId), + Owners = node_owners_call(Type, NodeId),
case lists:member(Owner, Owners) of case lists:member(Owner, Owners) of
true -> true ->
OwnerJID = exmpp_jid:make(Owner), OwnerJID = jlib:make_jid(Owner),
@@ -2450,24 +2277,7 @@ @@ -2450,24 +2277,7 @@
end, end,
lists:foreach( lists:foreach(