hamlab/mobilizon-frontend
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

atom/ics link copy to clipboard: correct URL copied for notificationsview + correct events list (participated + owned) (Issuer #1496)

Browse Source
This commit is contained in:
Laurent GAY
2025-08-05 16:16:26 +02:00
parent 40339a8f5b
commit 9845b3a82d
5 changed files with 209 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/service/export/common.ex
View File

@@ -16,10 +16,10 @@ defmodule Mobilizon.Service.Export.Common do
def fetch_actor_event_feed(name, limit) do
case Actors.get_actor_by_name(name) do
%Actor{} = actor ->
%Page{elements: posts} = Posts.get_public_posts_for_group(actor, 1, limit)
if Actor.public_visibility?(actor) do
%Page{elements: events} = Events.list_public_upcoming_events_for_actor(actor, 1, limit)
%Page{elements: posts} = Posts.get_public_posts_for_group(actor, 1, limit)
{:ok, actor, events, posts}
{:ok, actor, fetch_events_from_actor(actor, limit), posts}
else
{:error, :actor_not_public}
end
@@ -78,7 +78,7 @@ defmodule Mobilizon.Service.Export.Common do
%{
type: :actor,
actor: actor,
events: fetch_actor_private_events(actor, limit),
events: fetch_events_from_actor(actor, limit),
user: user,
token: token
}
@@ -94,6 +94,18 @@ defmodule Mobilizon.Service.Export.Common do
end
end
@spec fetch_actor_private_events(Actor.t(), integer()) :: list(Event.t())
defp fetch_events_from_actor(%Actor{} = actor, limit) do
events_participate = fetch_actor_private_events(actor, limit)
%Page{elements: events_owner} = Events.list_public_upcoming_events_for_actor(actor, 1, limit)
event_participate_ids = events_participate |> Enum.map(fn other -> other.id end)
events_owner =
events_owner |> Enum.filter(fn event -> event.id not in event_participate_ids end)
events_participate ++ events_owner
end
@spec fetch_instance_public_content(integer()) :: {:ok, list(Event.t()), list(Post.t())}
def fetch_instance_public_content(limit) do
%Page{elements: events} = Events.list_public_local_events(1, limit, :begins_on, :desc)