Chapril
/
xmpp.chapril.org-ejabberd
mirror of https://github.com/processone/ejabberd.git
24
1
Fork 0
Code Releases Activity

PubSub: fix get_items behaviour with mnesia

This commit is contained in:
Christophe Romain 2017-09-27 11:18:12 +02:00
parent c1d3d1318e
commit 89e504c55f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/node_flat.erl
View File

@ -727,7 +727,7 @@ del_state(#pubsub_state{stateid = {Key, Nidx}, items = Items}) ->
%% relational database), or they can even decide not to persist any items.</p>
get_items(Nidx, _From, _RSM) ->
Items = mnesia:index_read(pubsub_item, Nidx, #pubsub_item.nodeidx),
{result, {lists:reverse(lists:keysort(#pubsub_item.modification, Items)), undefined}}.
{result, {lists:keysort(#pubsub_item.creation, Items), undefined}}.
get_items(Nidx, JID, AccessModel, PresenceSubscription, RosterGroup, _SubId, RSM) ->
SubKey = jid:tolower(JID),
@ -766,8 +766,9 @@ get_items(Nidx, JID, AccessModel, PresenceSubscription, RosterGroup, _SubId, RSM
end.
get_last_items(Nidx, From, Count) when Count > 0 ->
{result, {Items, _}} = get_items(Nidx, From, undefined),
{result, lists:sublist(Items, Count)};
Items = mnesia:index_read(pubsub_item, Nidx, #pubsub_item.nodeidx),
LastItems = lists:reverse(lists:keysort(#pubsub_item.modification, Items)),
{result, lists:sublist(LastItems, Count)};
get_last_items(_Nidx, _From, _Count) ->
{result, []}.