correction about Phoenix upgrade - #1814

lib/service/formatter/formatter.ex

@@ -11,7 +11,7 @@ defmodule Mobilizon.Service.Formatter do
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Federation.ActivityPub.Actor, as: ActivityPubActor
   alias Mobilizon.Service.Formatter.HTML
-  alias Phoenix.HTML.Tag
+  alias PhoenixHTMLHelpers.Tag
 
   alias Mobilizon.Web.Endpoint
 

lib/service/metadata/actor.ex

@@ -1,6 +1,6 @@
 defimpl Mobilizon.Service.Metadata, for: Mobilizon.Actors.Actor do
   alias Phoenix.HTML
-  alias Phoenix.HTML.Tag
+  alias PhoenixHTMLHelpers.Tag
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Web.JsonLD.ObjectView
   use Mobilizon.Web, :verified_routes

lib/service/metadata/comment.ex

@@ -1,5 +1,5 @@
 defimpl Mobilizon.Service.Metadata, for: Mobilizon.Discussions.Comment do
-  alias Phoenix.HTML.Tag
+  alias PhoenixHTMLHelpers.Tag
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Discussions.Comment
   import Mobilizon.Service.Metadata.Utils, only: [escape_text: 1]

lib/service/metadata/event.ex

@@ -1,6 +1,6 @@
 defimpl Mobilizon.Service.Metadata, for: Mobilizon.Events.Event do
   alias Phoenix.HTML
-  alias Phoenix.HTML.Tag
+  alias PhoenixHTMLHelpers.Tag
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Addresses.Address
   alias Mobilizon.Events.{Event, EventOptions}

lib/service/metadata/instance.ex

@@ -4,7 +4,7 @@ defmodule Mobilizon.Service.Metadata.Instance do
   """
 
   alias Phoenix.HTML
-  alias Phoenix.HTML.Tag
+  alias PhoenixHTMLHelpers.Tag
 
   alias Mobilizon.Config
   alias Mobilizon.Service.Metadata.Utils

lib/service/metadata/post.ex

@@ -1,6 +1,6 @@
 defimpl Mobilizon.Service.Metadata, for: Mobilizon.Posts.Post do
   alias Phoenix.HTML
-  alias Phoenix.HTML.Tag
+  alias PhoenixHTMLHelpers.Tag
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Medias.{File, Media}
   alias Mobilizon.Posts.Post

lib/web/templates/email/anonymous_participation_confirmation.html.heex

@@ -45,7 +45,8 @@
         >
           <p style="margin: 0;">
             {gettext(
-              "Hi there! You just registered to join this event: « <b>%{title}</b> ». Please confirm the e-mail address you provided:",
+              "Hi there! You just registered to join this event: « <b>%{title}</b>
+            ». Please confirm the e-mail address you provided:",
               title: escape_html(@participant.event.title)
             )
             |> raw}

lib/web/templates/email/email.html.heex

@@ -187,8 +187,7 @@
                   {gettext("<b>%{instance}</b> is powered by Mobilizon.",
                     instance: @instance_name
                   )
-                  |> raw}
-                  <br />
+                  |> raw} <br />
                   <a href="https://mobilizon.org">
                     {gettext("Learn more about Mobilizon here!")}
                   </a>

lib/web/templates/email/group_suspension.html.heex

@@ -48,7 +48,8 @@
         >
           <p style="margin: 0;">
             {gettext(
-              "Your instance's moderation team has decided to suspend <b>%{group_name}</b> (%{group_address}). You are no longer a member of this group.",
+              "Your instance's moderation team has decided to suspend <b>%{group_name}</b>
+            (%{group_address}). You are no longer a member of this group.",
               group_name: escape_html(display_name(@group)),
               group_address: preferred_username_and_domain(@group)
             )

lib/web/templates/email/instance_follow.html.heex

@@ -47,8 +47,7 @@
             {gettext("<b>%{name}</b> just requested to follow your instance.",
               name: escape_html(display_name_and_username(@follower))
             )
-            |> raw}
-            <br />
+            |> raw} <br />
             <%= if @follower.type == :Application do %>
               {gettext("If you accept, this instance will receive all of your public events.")}
             <% else %>

lib/web/templates/email/registration_confirmation.html.heex

@@ -45,7 +45,8 @@
         >
           <p style="margin: 0;">
             {gettext(
-              "You created an account on <b>%{host}</b> with this email address. You are one click away from activating it.",
+              "You created an account on <b>%{host}</b>
+            with this email address. You are one click away from activating it.",
               host: @instance_name
             )
             |> raw}

lib/web/views/auth_view.ex

@@ -6,7 +6,7 @@ defmodule Mobilizon.Web.AuthView do
   use Mobilizon.Web, :view
   alias Mobilizon.Service.Metadata.Instance
   alias Mobilizon.Web.PageView
-  alias Phoenix.HTML.Tag
+  alias PhoenixHTMLHelpers.Tag
 
   @spec render(String.t(), map()) :: String.t() | Plug.Conn.t()
   def render(

lib/web/views/error_helpers.ex

@@ -3,10 +3,6 @@ defmodule Mobilizon.Web.ErrorHelpers do
   Conveniences for translating and building error messages.
   """
 
-  import Phoenix.HTML
-  import Phoenix.HTML.Form
-  use PhoenixHTMLHelpers
-
   @doc """
   Translates an error message using gettext.
   """