tommy/mobilizon
1
0
Fork 0
forked from potsda.mn/mobilizon
Code Pull requests Activity

Fix ICS feed missing events: order by "begins_on" DESC so that the latest events are always included

Browse source 
potsda.mn/mobilizon#37
This commit is contained in:
summersamara 2023-12-20 02:09:46 +01:00 committed by Thomas Citharel
parent 2fba6379f1
commit 31411bfc03
No known key found for this signature in database
GPG key ID: A061B9DDE0CA0773
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/mobilizon/events/events.ex
View file

@ -387,13 +387,15 @@ defmodule Mobilizon.Events do
|> Repo.stream() |> Repo.stream()
end end
@spec list_public_local_events(integer | nil, integer | nil) :: Page.t(Event.t()) @spec list_public_local_events(integer | nil, integer | nil, atom | nil, atom | nil) ::
def list_public_local_events(page \\ nil, limit \\ nil) do Page.t(Event.t())
def list_public_local_events(page \\ nil, limit \\ nil, sort \\ nil, direction \\ nil) do
Event Event
|> filter_public_visibility() |> filter_public_visibility()
|> filter_draft() |> filter_draft()
|> filter_local() |> filter_local()
|> preload_for_event() |> preload_for_event()
|> event_order_by(sort, direction)
|> Page.build_page(page, limit) |> Page.build_page(page, limit)
end end

2
lib/service/export/common.ex
View file

@ -96,7 +96,7 @@ defmodule Mobilizon.Service.Export.Common do
@spec fetch_instance_public_content(integer()) :: {:ok, list(Event.t()), list(Post.t())} @spec fetch_instance_public_content(integer()) :: {:ok, list(Event.t()), list(Post.t())}
def fetch_instance_public_content(limit) do def fetch_instance_public_content(limit) do
%Page{elements: events} = Events.list_public_local_events(1, limit) %Page{elements: events} = Events.list_public_local_events(1, limit, :begins_on, :desc)
%Page{elements: posts} = Posts.list_public_local_posts(1, limit) %Page{elements: posts} = Posts.list_public_local_posts(1, limit)
{:ok, events, posts} {:ok, events, posts}
end end