potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

Merge branch 'bugs' into 'main'

Browse source 
Include organizer actor in icalendar export

Closes #907 et #913

See merge request framasoft/mobilizon!1104
This commit is contained in:
Thomas Citharel 2021-11-09 13:33:52 +00:00
parent 6d9fe639d6 cf69c8b375
commit 800060a926
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/service/export/icalendar.ex
View file

@ -3,6 +3,7 @@ defmodule Mobilizon.Service.Export.ICalendar do
Export an event to iCalendar format. Export an event to iCalendar format.
""" """
alias Mobilizon.Actors.Actor
alias Mobilizon.Addresses.Address alias Mobilizon.Addresses.Address
alias Mobilizon.{Config, Events} alias Mobilizon.{Config, Events}
alias Mobilizon.Events.{Event, EventOptions} alias Mobilizon.Events.{Event, EventOptions}
@ -119,7 +120,8 @@ defmodule Mobilizon.Service.Export.ICalendar do
dtend: ends_on(event), dtend: ends_on(event),
description: HTML.strip_tags(event.description), description: HTML.strip_tags(event.description),
uid: event.uuid, uid: event.uuid,
url: event.url url: event.url,
organizer: organizer(event)
} }
icalendar_event = icalendar_event =
@ -161,4 +163,12 @@ defmodule Mobilizon.Service.Export.ICalendar do
end end
defp shift_tz(%DateTime{} = date, _), do: date defp shift_tz(%DateTime{} = date, _), do: date
defp organizer(%Event{attributed_to: %Actor{} = group}) do
Actor.display_name(group)
end
defp organizer(%Event{organizer_actor: %Actor{} = profile}) do
Actor.display_name(profile)
end
end end

8
lib/web/templates/email/email.html.heex
View file

@ -141,12 +141,14 @@
<!-- ADDRESS --> <!-- ADDRESS -->
<tr> <tr>
<td bgcolor="#ECEBF2" align="center" style="padding: 30px 30px 30px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 18px;" > <td bgcolor="#ECEBF2" align="center" style="padding: 30px 30px 30px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 18px;" >
<p style="margin: 0;"> <%= if @offer_unsupscription do %>
<%= if @offer_unsupscription do %> <p>
<a href={"#{Mobilizon.Web.Endpoint.url()}/settings/notifications"}> <a href={"#{Mobilizon.Web.Endpoint.url()}/settings/notifications"}>
<%= gettext("Manage your notification settings") %> <%= gettext("Manage your notification settings") %>
</a> </a>
<% end %> </p>
<% end %>
<p style="margin: 0;">
<%= gettext("<b>%{instance}</b> is powered by Mobilizon.", instance: @instance_name) |> raw %><br /> <%= gettext("<b>%{instance}</b> is powered by Mobilizon.", instance: @instance_name) |> raw %><br />
<a href="https://joinmobilizon.org"><%= gettext "Learn more about Mobilizon here!" %></a> <a href="https://joinmobilizon.org"><%= gettext "Learn more about Mobilizon here!" %></a>
</p> </p>

1
test/service/export/icalendar_test.exs
View file

@ -26,6 +26,7 @@ defmodule Mobilizon.Service.ICalendarTest do
DTSTART:#{Value.to_ics(event.begins_on)}Z DTSTART:#{Value.to_ics(event.begins_on)}Z
GEO:#{event.physical_address |> Address.coords() |> Tuple.to_list() |> Enum.join(";")} GEO:#{event.physical_address |> Address.coords() |> Tuple.to_list() |> Enum.join(";")}
LOCATION:#{Address.representation(event.physical_address)} LOCATION:#{Address.representation(event.physical_address)}
ORGANIZER:#{event.organizer_actor.name}
SUMMARY:#{event.title} SUMMARY:#{event.title}
UID:#{event.uuid} UID:#{event.uuid}
URL:#{event.url} URL:#{event.url}