From 6d99b04a7aaaf1bcea034d55ba3655718316e9e4 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 27 Apr 2021 09:06:28 +0200 Subject: [PATCH 1/2] Fix email headers Signed-off-by: Thomas Citharel --- lib/web/email/email.ex | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/lib/web/email/email.ex b/lib/web/email/email.ex index 936503f88..7f6cfd2d4 100644 --- a/lib/web/email/email.ex +++ b/lib/web/email/email.ex @@ -5,7 +5,6 @@ defmodule Mobilizon.Web.Email do use Bamboo.Phoenix, view: Mobilizon.Web.EmailView - alias Ecto.UUID alias Mobilizon.{Config, Events} alias Mobilizon.Events.Event alias Mobilizon.Service.Export.ICalendar @@ -19,27 +18,27 @@ defmodule Mobilizon.Web.Email do |> new_email() |> from({Config.instance_name(), Config.instance_email_from()}) |> put_header("Reply-To", Config.instance_email_reply_to()) - |> put_header("Date", date()) - |> put_header("Message-Id", message_id()) + |> maybe_put_date_header() + |> maybe_put_message_id() |> assign(:instance, instance) |> put_html_layout({EmailView, "email.html"}) |> put_text_layout({EmailView, "email.text"}) end # Generating an UUID randomly causes Bamboo.Test.assert_delivered_email/1 to fail - defp message_id do + defp maybe_put_message_id(email) do if Application.fetch_env!(:mobilizon, :env) == :test do - "TEST_ENV_MESSAGE_ID@#{Config.instance_hostname()}" + put_header(email, "Message-Id", "TEST_ENV_MESSAGE_ID@#{Config.instance_hostname()}") else - "#{UUID.generate()}@#{Config.instance_hostname()}" + email end end - defp date do + defp maybe_put_date_header(email) do if Application.fetch_env!(:mobilizon, :env) == :test do - "REMOVED FOR TESTING" + put_header(email, "Date", "REMOVED FOR TESTING") else - Timex.format!(DateTime.utc_now(), "{WDshort}, {D} {Mshort} {YYYY} {h24}:{m}:{s} {Z}") + email end end From c39f83fa9a4640109dac121acad701c1db7a55e3 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 27 Apr 2021 09:13:45 +0200 Subject: [PATCH 2/2] Cleanup warnings Came in 8185fcd0bde21f0e8cdfd45e2bcbe80b7e2daa11 Signed-off-by: Thomas Citharel --- lib/graphql/resolvers/member.ex | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/graphql/resolvers/member.ex b/lib/graphql/resolvers/member.ex index 7db30908f..44b9caed4 100644 --- a/lib/graphql/resolvers/member.ex +++ b/lib/graphql/resolvers/member.ex @@ -8,7 +8,6 @@ defmodule Mobilizon.GraphQL.Resolvers.Member do alias Mobilizon.Actors.{Actor, Member} alias Mobilizon.Federation.ActivityPub alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor - alias Mobilizon.Federation.ActivityPub.Refresher alias Mobilizon.Storage.Page alias Mobilizon.Users.User import Mobilizon.Web.Gettext @@ -100,7 +99,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Member do def accept_invitation(_parent, %{id: member_id}, %{context: %{current_user: %User{} = user}}) do with %Actor{id: actor_id} <- Users.get_actor_for_user(user), - %Member{actor: %Actor{id: member_actor_id} = actor} = member <- + %Member{actor: %Actor{id: member_actor_id}} = member <- Actors.get_member(member_id), {:is_same_actor, true} <- {:is_same_actor, member_actor_id === actor_id}, {:ok, _activity, %Member{} = member} <-