Improve admin views (2)

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

lib/graphql/resolvers/admin.ex

@@ -14,9 +14,11 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do
   alias Mobilizon.Events.Event
   alias Mobilizon.Federation.ActivityPub.{Actions, Relay}
   alias Mobilizon.Reports.{Note, Report}
+  alias Mobilizon.Service.Auth.Authenticator
   alias Mobilizon.Service.Statistics
   alias Mobilizon.Storage.Page
   alias Mobilizon.Users.User
+  alias Mobilizon.Web.Email
   import Mobilizon.Web.Gettext
   require Logger
 
@@ -281,6 +283,9 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do
      dgettext("errors", "You need to be logged-in and an administrator to save admin settings")}
   end
 
+  @spec update_user(any, map(), Absinthe.Resolution.t()) ::
+          {:error, :invalid_argument | :user_not_found | binary | Ecto.Changeset.t()}
+          | {:ok, Mobilizon.Users.User.t()}
   def update_user(_parent, %{id: id, notify: notify} = args, %{
         context: %{current_user: %User{role: role}}
       })
@@ -294,7 +299,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do
           [] ->
             {:error, :invalid_argument}
 
-          [change, _] ->
+          [change | _] ->
             case change do
               :email -> change_email(user, Map.get(args, :email), notify)
               :role -> change_role(user, Map.get(args, :role), notify)
@@ -309,22 +314,24 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do
      dgettext("errors", "You need to be logged-in and an administrator to edit an user's details")}
   end
 
-  @spec change_email(User.t(), String.t(), boolean())
+  @spec change_email(User.t(), String.t(), boolean()) :: {:ok, User.t()} | {:error, String.t()}
   defp change_email(%User{email: old_email} = user, new_email, notify) do
     if Authenticator.can_change_email?(user) do
       if new_email != old_email do
         if Email.Checker.valid?(new_email) do
-          case Users.update_user_email(user, new_email) do
-            {:ok, %User{} = user} ->
-              user
-              |> Email.User.send_email_reset_old_email()
-              |> Email.Mailer.send_email_later()
+          case Users.update_user(user, %{email: new_email}) do
+            {:ok, %User{} = updated_user} ->
+              if notify do
+                updated_user
+                |> Email.Admin.user_email_change_old(old_email)
+                |> Email.Mailer.send_email_later()
 
-              user
-              |> Email.User.send_email_reset_new_email()
-              |> Email.Mailer.send_email_later()
+                updated_user
+                |> Email.Admin.user_email_change_new(old_email)
+                |> Email.Mailer.send_email_later()
+              end
 
-              {:ok, user}
+              {:ok, updated_user}
 
             {:error, %Ecto.Changeset{} = err} ->
               Logger.debug(inspect(err))
@@ -339,26 +346,49 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do
     end
   end
 
+  @spec change_role(User.t(), Mobilizon.Users.UserRole.t(), boolean()) ::
+          {:ok, User.t()} | {:error, String.t() | Ecto.Changeset.t()}
   defp change_role(%User{role: old_role} = user, new_role, notify) do
     if old_role != new_role do
-      Users.update_user(user, %{role: new_role})
+      with {:ok, %User{} = user} <- Users.update_user(user, %{role: new_role}) do
+        if notify do
+          user
+          |> Email.Admin.user_role_change(old_role)
+          |> Email.Mailer.send_email_later()
+        end
+
+        {:ok, user}
+      end
+    else
+      {:error, dgettext("errors", "The new role must be different")}
     end
   end
 
-  defp confirm_user(%User{confirmed_at: old_confirmed_at} = user, confirmed, notify) do
-    new_confirmed_at =
-      cond do
-        is_nil(old_confirmed_at) && confirmed ->
-          DateTime.utc_now()
-
-        match?(%DateTime{}, old_confirmed_at) && !confirmed ->
-          nil
-
-        true ->
-          old_confirmed_at
+  @spec confirm_user(User.t(), boolean(), boolean()) ::
+          {:ok, User.t()} | {:error, String.t() | Ecto.Changeset.t()}
+  defp confirm_user(%User{confirmed_at: nil} = user, true, notify) do
+    with {:ok, %User{} = user} <-
+           Users.update_user(user, %{
+             confirmed_at: DateTime.utc_now(),
+             confirmation_sent_at: nil,
+             confirmation_token: nil
+           }) do
+      if notify do
+        user
+        |> Email.Admin.user_confirmation()
+        |> Email.Mailer.send_email_later()
       end
 
-    Users.update_user(user, %{confirmed_at: new_confirmed_at})
+      {:ok, user}
+    end
+  end
+
+  defp confirm_user(%User{confirmed_at: %DateTime{}} = _user, true, _notify) do
+    {:error, dgettext("errors", "Can't confirm an already confirmed user")}
+  end
+
+  defp confirm_user(_user, _confirm, _notify) do
+    {:error, dgettext("errors", "Deconfirming users is not supported")}
   end
 
   @spec list_relay_followers(any(), map(), Absinthe.Resolution.t()) ::
@@ -472,13 +502,9 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do
         %{context: %{current_user: %User{role: role}}} = resolution
       )
       when is_admin(role) do
-    case Relay.follow(domain) do
-      {:ok, _activity, _follow} ->
-        Instances.refresh()
-        get_instance(parent, args, resolution)
-
-      {:error, err} ->
-        {:error, err}
+    with {:ok, _activity, _follow} <- Relay.follow(domain) do
+      Instances.refresh()
+      get_instance(parent, args, resolution)
     end
   end
 
@@ -486,12 +512,8 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do
           {:ok, Follower.t()} | {:error, any()}
   def create_relay(_parent, %{address: address}, %{context: %{current_user: %User{role: role}}})
       when is_admin(role) do
-    case Relay.follow(address) do
-      {:ok, _activity, follow} ->
-        {:ok, follow}
-
-      {:error, err} ->
-        {:error, err}
+    with {:ok, _activity, follow} <- Relay.follow(address) do
+      {:ok, follow}
     end
   end
 
@@ -499,12 +521,8 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do
           {:ok, Follower.t()} | {:error, any()}
   def remove_relay(_parent, %{address: address}, %{context: %{current_user: %User{role: role}}})
       when is_admin(role) do
-    case Relay.unfollow(address) do
-      {:ok, _activity, follow} ->
-        {:ok, follow}
-
-      {:error, err} ->
-        {:error, err}
+    with {:ok, _activity, follow} <- Relay.unfollow(address) do
+      {:ok, follow}
     end
   end
 
@@ -516,12 +534,8 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do
         %{context: %{current_user: %User{role: role}}}
       )
       when is_admin(role) do
-    case Relay.accept(address) do
-      {:ok, _activity, follow} ->
-        {:ok, follow}
-
-      {:error, err} ->
-        {:error, err}
+    with {:ok, _activity, follow} <- Relay.accept(address) do
+      {:ok, follow}
     end
   end
 
@@ -533,12 +547,8 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do
         %{context: %{current_user: %User{role: role}}}
       )
       when is_admin(role) do
-    case Relay.reject(address) do
-      {:ok, _activity, follow} ->
-        {:ok, follow}
-
-      {:error, err} ->
-        {:error, err}
+    with {:ok, _activity, follow} <- Relay.reject(address) do
+      {:ok, follow}
     end
   end
 

lib/graphql/resolvers/user.ex

@@ -48,11 +48,11 @@ defmodule Mobilizon.GraphQL.Resolvers.User do
           {:ok, Page.t(User.t())} | {:error, :unauthorized}
   def list_users(
         _parent,
-        %{email: email, page: page, limit: limit, sort: sort, direction: direction},
+        args,
         %{context: %{current_user: %User{role: role}}}
       )
       when is_moderator(role) do
-    {:ok, Users.list_users(email, page, limit, sort, direction)}
+    {:ok, Users.list_users(Keyword.new(args))}
   end
 
   def list_users(_parent, _args, _resolution) do

lib/graphql/schema/admin.ex

@@ -416,7 +416,7 @@ defmodule Mobilizon.GraphQL.Schema.AdminType do
     field :admin_update_user, type: :user do
       arg(:id, non_null(:id), description: "The user's ID")
       arg(:email, :string, description: "The user's new email")
-      arg(:confirmed, :string, description: "Manually confirm the user's account")
+      arg(:confirmed, :boolean, description: "Manually confirm the user's account")
       arg(:role, :user_role, description: "Set user's new role")
 
       arg(:notify, :boolean,

lib/graphql/schema/user.ex

@@ -280,6 +280,11 @@ defmodule Mobilizon.GraphQL.Schema.UserType do
     @desc "List instance users"
     field :users, :users do
       arg(:email, :string, default_value: "", description: "Filter users by email")
+
+      arg(:current_sign_in_ip, :string,
+        description: "Filter users by current signed-in IP address"
+      )
+
       arg(:page, :integer, default_value: 1, description: "The page in the paginated users list")
       arg(:limit, :integer, default_value: 10, description: "The limit of users per page")
 

lib/mobilizon/users/users.ex

@@ -272,23 +272,14 @@ defmodule Mobilizon.Users do
   @doc """
   Returns the list of users.
   """
-  @spec list_users(String.t(), integer | nil, integer | nil, atom, atom) ::
-          Page.t(User.t())
-  def list_users(email, page, limit \\ nil, sort, direction)
-
-  def list_users("", page, limit, sort, direction) do
+  @spec list_users(Keyword.t()) :: Page.t(User.t())
+  def list_users(options) do
     User
-    |> sort(sort, direction)
+    |> filter_by_email(Keyword.get(options, :email))
+    |> filter_by_ip(Keyword.get(options, :current_sign_in_ip))
+    |> sort(Keyword.get(options, :sort), Keyword.get(options, :direction))
     |> preload([u], [:actors, :feed_tokens, :settings, :default_actor])
-    |> Page.build_page(page, limit)
-  end
-
-  def list_users(email, page, limit, sort, direction) do
-    User
-    |> where([u], ilike(u.email, ^"%#{email}%"))
-    |> sort(sort, direction)
-    |> preload([u], [:actors, :feed_tokens, :settings, :default_actor])
-    |> Page.build_page(page, limit)
+    |> Page.build_page(Keyword.get(options, :page), Keyword.get(options, :limit))
   end
 
   @doc """
@@ -527,4 +518,16 @@ defmodule Mobilizon.Users do
   defp update_user_default_actor_query(user_id) do
     where(User, [u], u.id == ^user_id)
   end
+
+  @spec filter_by_email(Ecto.Queryable.t(), String.t() | nil) :: Ecto.Query.t()
+  defp filter_by_email(query, nil), do: query
+  defp filter_by_email(query, ""), do: query
+  defp filter_by_email(query, email), do: where(query, [q], ilike(q.email, ^"%#{email}%"))
+
+  @spec filter_by_ip(Ecto.Queryable.t(), String.t() | nil) :: Ecto.Query.t()
+  defp filter_by_ip(query, nil), do: query
+  defp filter_by_ip(query, ""), do: query
+
+  defp filter_by_ip(query, current_sign_in_ip),
+    do: where(query, [q], q.current_sign_in_ip == ^current_sign_in_ip)
 end

lib/web/email/admin.ex

@@ -32,4 +32,100 @@ defmodule Mobilizon.Web.Email.Admin do
     |> assign(:report, report)
     |> render(:report)
   end
+
+  @spec user_email_change_old(User.t(), String.t()) :: Bamboo.Email.t()
+  def user_email_change_old(
+        %User{
+          locale: user_locale,
+          email: new_email
+        },
+        old_email
+      ) do
+    Gettext.put_locale(user_locale)
+
+    subject =
+      gettext(
+        "An administrator manually changed the email attached to your account on %{instance}",
+        instance: Config.instance_name()
+      )
+
+    Email.base_email(to: old_email, subject: subject)
+    |> assign(:locale, user_locale)
+    |> assign(:subject, subject)
+    |> assign(:new_email, new_email)
+    |> assign(:old_email, old_email)
+    |> assign(:offer_unsupscription, false)
+    |> render(:admin_user_email_changed_old)
+  end
+
+  @spec user_email_change_new(User.t(), String.t()) :: Bamboo.Email.t()
+  def user_email_change_new(
+        %User{
+          locale: user_locale,
+          email: new_email
+        },
+        old_email
+      ) do
+    Gettext.put_locale(user_locale)
+
+    subject =
+      gettext(
+        "An administrator manually changed the email attached to your account on %{instance}",
+        instance: Config.instance_name()
+      )
+
+    Email.base_email(to: new_email, subject: subject)
+    |> assign(:locale, user_locale)
+    |> assign(:subject, subject)
+    |> assign(:old_email, old_email)
+    |> assign(:new_email, new_email)
+    |> assign(:offer_unsupscription, false)
+    |> render(:admin_user_email_changed_new)
+  end
+
+  @spec user_role_change(User.t(), atom()) :: Bamboo.Email.t()
+  def user_role_change(
+        %User{
+          locale: user_locale,
+          email: email,
+          role: new_role
+        },
+        old_role
+      ) do
+    Gettext.put_locale(user_locale)
+
+    subject =
+      gettext(
+        "An administrator updated your role on %{instance}",
+        instance: Config.instance_name()
+      )
+
+    Email.base_email(to: email, subject: subject)
+    |> assign(:locale, user_locale)
+    |> assign(:subject, subject)
+    |> assign(:old_role, old_role)
+    |> assign(:new_role, new_role)
+    |> assign(:offer_unsupscription, false)
+    |> render(:admin_user_role_changed)
+  end
+
+  @spec user_confirmation(User.t()) :: Bamboo.Email.t()
+  def user_confirmation(%User{
+        locale: user_locale,
+        email: email
+      }) do
+    Gettext.put_locale(user_locale)
+
+    subject =
+      gettext(
+        "An administrator confirmed your account on %{instance}",
+        instance: Config.instance_name()
+      )
+
+    Email.base_email(to: email, subject: subject)
+    |> assign(:locale, user_locale)
+    |> assign(:subject, subject)
+    |> assign(:offer_unsupscription, false)
+    |> render(:admin_user_confirmation)
+  end
 end

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

@@ -0,0 +1,8 @@
+<%= case @role do %>
+    <% :administrator -> %>
+        <b><%= gettext "Administrator" %></b>
+    <% :moderator -> %>
+        <b><%= gettext "Moderator" %></b>
+    <% :user -> %>
+    <b><%= gettext "User" %></b>
+<% end %>

lib/web/templates/email/admin/_role.text.eex

@@ -0,0 +1 @@
+<%= case @role do %><% :administrator -> %><%= gettext "Administrator" %><% :moderator -> %><%= gettext "Moderator" %><% :user -> %><%= gettext "User" %><% end %>

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

@@ -0,0 +1,82 @@
+<!-- HERO -->
+<tr>
+  <td bgcolor="#474467" align="center" style="padding: 0px 10px 0px 10px;">
+    <!--[if (gte mso 9)|(IE)]>
+      <table align="center" border="0" cellspacing="0" cellpadding="0" width="600">
+        <tr>
+          <td align="center" valign="top" width="600">
+    <![endif]-->
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" style="max-width: 600px;" >
+      <tr>
+        <td bgcolor="#ffffff" align="center" valign="top" style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;">
+          <h1 style="font-size: 48px; font-weight: 400; margin: 0;">
+            <%= gettext "An administrator manually confirmed your account" %>
+          </h1>
+        </td>
+      </tr>
+    </table>
+    <!--[if (gte mso 9)|(IE)]>
+    </td>
+  </tr>
+</table>
+    <![endif]-->
+  </td>
+</tr>
+<!-- COPY BLOCK -->
+<tr>
+  <td bgcolor="#E6E4F4" align="center" style="padding: 0px 10px 0px 10px;">
+    <!--[if (gte mso 9)|(IE)]>
+      <table align="center" border="0" cellspacing="0" cellpadding="0" width="600">
+        <tr>
+          <td align="center" valign="top" width="600">
+    <![endif]-->
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" style="max-width: 600px;" >
+      <!-- COPY -->
+      <tr>
+        <td bgcolor="#ffffff" align="left" style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >
+          <p style="margin: 0;">
+            <%= gettext("Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just manually confirmed your account.", %{instance: @instance_name}) |> raw %>
+          </p>
+        </td>
+      </tr>
+      <tr>
+        <td bgcolor="#ffffff" align="left" style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >
+          <p style="margin: 0;">
+            <%= gettext("You may now login using your credentials on the service.") %>
+          </p>
+        </td>
+      </tr>
+      <tr>
+        <td bgcolor="#ffffff" align="left">
+          <table width="100%" border="0" cellspacing="0" cellpadding="0">
+            <tr>
+              <td bgcolor="#ffffff" align="center" style="padding: 20px 30px 60px 30px;">
+                <table border="0" cellspacing="0" cellpadding="0">
+                  <tr>
+                    <td align="center" style="border-radius: 3px;" bgcolor="#3C376E">
+                      <a href={"#{ "#{Mobilizon.Web.Endpoint.url()}/login" }"} target="_blank" style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #3C376E; display: inline-block;">
+                        <%= gettext "Login on %{instance}", %{instance: @instance_name} %>
+                      </a>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td bgcolor="#ffffff" align="left" style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 20px;" >
+          <p style="margin: 0">
+            <%= gettext("If something doesn't feel right to you, please contact the instance administrator through the contact methods %{start_link}on the instance's about page%{end_link}.", %{start_link: "<a href=\"#{Mobilizon.Web.Endpoint.url()}/about/instance\">", end_link: "</a>"}) |> raw %>
+          </p>
+        </td>
+      </tr>
+    </table>
+    <!--[if (gte mso 9)|(IE)]>
+    </td>
+  </tr>
+</table>
+    <![endif]-->
+  </td>
+</tr>

lib/web/templates/email/admin_user_confirmation.text.eex

@@ -0,0 +1,7 @@
+<%= gettext "An administrator manually confirmed your account" %>
+==
+<%= gettext "Hi there! We just wanted to inform you that an administrator from %{instance} just manually confirmed your account.", %{instance: @instance_name} %>
+
+<%= gettext "You may now login using your credentials on the service:" %> <%= "#{Mobilizon.Web.Endpoint.url()}/login" %>
+
+<%= gettext "If something doesn't feel right to you, please contact the instance administrator through the contact methods on the instance's about page: %{about_page}.", %{about_page: "#{Mobilizon.Web.Endpoint.url()}/about/instance"} %>

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

@@ -0,0 +1,56 @@
+<!-- HERO -->
+<tr>
+  <td bgcolor="#474467" align="center" style="padding: 0px 10px 0px 10px;">
+    <!--[if (gte mso 9)|(IE)]>
+      <table align="center" border="0" cellspacing="0" cellpadding="0" width="600">
+        <tr>
+          <td align="center" valign="top" width="600">
+    <![endif]-->
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" style="max-width: 600px;" >
+      <tr>
+        <td bgcolor="#ffffff" align="center" valign="top" style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;">
+          <h1 style="font-size: 48px; font-weight: 400; margin: 0;">
+            <%= gettext "An administrator manually changed the email attached to your account" %>
+          </h1>
+        </td>
+      </tr>
+    </table>
+    <!--[if (gte mso 9)|(IE)]>
+    </td>
+  </tr>
+</table>
+    <![endif]-->
+  </td>
+</tr>
+<!-- COPY BLOCK -->
+<tr>
+  <td bgcolor="#E6E4F4" align="center" style="padding: 0px 10px 0px 10px;">
+    <!--[if (gte mso 9)|(IE)]>
+      <table align="center" border="0" cellspacing="0" cellpadding="0" width="600">
+        <tr>
+          <td align="center" valign="top" width="600">
+    <![endif]-->
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" style="max-width: 600px;" >
+      <!-- COPY -->
+      <tr>
+        <td bgcolor="#ffffff" align="left" style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >
+          <p style="margin: 0;">
+            <%= gettext("Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just manually changed your account email from <b>%{old_email}</b> to <b>%{new_email}</b> (this one).", %{instance: @instance_name, old_email: @old_email, new_email: @new_email}) |> raw %>
+          </p>
+        </td>
+      </tr>
+      <tr>
+        <td bgcolor="#ffffff" align="left" style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 20px;" >
+          <p style="margin: 0">
+            <%= gettext("If something doesn't feel right to you, please contact the instance administrator through the contact methods %{start_link}on the instance's about page%{end_link}.", %{start_link: "<a href=\"#{Mobilizon.Web.Endpoint.url()}/about/instance\">", end_link: "</a>"}) |> raw %>
+          </p>
+        </td>
+      </tr>
+    </table>
+    <!--[if (gte mso 9)|(IE)]>
+    </td>
+  </tr>
+</table>
+    <![endif]-->
+  </td>
+</tr>

lib/web/templates/email/admin_user_email_changed_new.text.eex

@@ -0,0 +1,4 @@
+<%= gettext "An administrator manually changed the email attached to your account" %>
+==
+<%= gettext "Hi there! We just wanted to inform you that an administrator from %{instance} just manually changed your account email from %{old_email} (this one) to %{new_email}.", %{instance: @instance_name, old_email: @old_email, new_email: @new_email} %>
+<%= gettext "If something doesn't feel right to you, please contact the instance administrator through the contact methods on the instance's about page: %{about_page}.", %{about_page: "#{Mobilizon.Web.Endpoint.url()}/about/instance"} %>

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

@@ -0,0 +1,56 @@
+<!-- HERO -->
+<tr>
+  <td bgcolor="#474467" align="center" style="padding: 0px 10px 0px 10px;">
+    <!--[if (gte mso 9)|(IE)]>
+      <table align="center" border="0" cellspacing="0" cellpadding="0" width="600">
+        <tr>
+          <td align="center" valign="top" width="600">
+    <![endif]-->
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" style="max-width: 600px;" >
+      <tr>
+        <td bgcolor="#ffffff" align="center" valign="top" style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;">
+          <h1 style="font-size: 48px; font-weight: 400; margin: 0;">
+            <%= gettext "An administrator manually changed the email attached to your account" %>
+          </h1>
+        </td>
+      </tr>
+    </table>
+    <!--[if (gte mso 9)|(IE)]>
+    </td>
+  </tr>
+</table>
+    <![endif]-->
+  </td>
+</tr>
+<!-- COPY BLOCK -->
+<tr>
+  <td bgcolor="#E6E4F4" align="center" style="padding: 0px 10px 0px 10px;">
+    <!--[if (gte mso 9)|(IE)]>
+      <table align="center" border="0" cellspacing="0" cellpadding="0" width="600">
+        <tr>
+          <td align="center" valign="top" width="600">
+    <![endif]-->
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" style="max-width: 600px;" >
+      <!-- COPY -->
+      <tr>
+        <td bgcolor="#ffffff" align="left" style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >
+          <p style="margin: 0;">
+            <%= gettext("Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just manually changed your account email from <b>%{old_email}</b> (this one) to <b>%{new_email}</b>.", %{instance: @instance_name, old_email: @old_email, new_email: @new_email}) |> raw %>
+          </p>
+        </td>
+      </tr>
+      <tr>
+        <td bgcolor="#ffffff" align="left" style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 20px;" >
+          <p style="margin: 0">
+            <%= gettext("If something doesn't feel right to you, please contact the instance administrator through the contact methods %{start_link}on the instance's about page%{end_link}.", %{start_link: "<a href=\"#{Mobilizon.Web.Endpoint.url()}/about/instance\">", end_link: "</a>"}) |> raw %>
+          </p>
+        </td>
+      </tr>
+    </table>
+    <!--[if (gte mso 9)|(IE)]>
+    </td>
+  </tr>
+</table>
+    <![endif]-->
+  </td>
+</tr>

lib/web/templates/email/admin_user_email_changed_old.text.eex

@@ -0,0 +1,4 @@
+<%= gettext "An administrator manually changed the email attached to your account" %>
+==
+<%= gettext "Hi there! We just wanted to inform you that an administrator from %{instance} just manually changed your account email from %{old_email} (this one) to %{new_email}.", %{instance: @instance_name, old_email: @old_email, new_email: @new_email} %>
+<%= gettext "If something doesn't feel right to you, please contact the instance administrator through the contact methods on the instance's about page: %{about_page}.", %{about_page: "#{Mobilizon.Web.Endpoint.url()}/about/instance"} %>

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

@@ -0,0 +1,78 @@
+<!-- HERO -->
+<tr>
+  <td bgcolor="#474467" align="center" style="padding: 0px 10px 0px 10px;">
+    <!--[if (gte mso 9)|(IE)]>
+      <table align="center" border="0" cellspacing="0" cellpadding="0" width="600">
+        <tr>
+          <td align="center" valign="top" width="600">
+    <![endif]-->
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" style="max-width: 600px;" >
+      <tr>
+        <td bgcolor="#ffffff" align="center" valign="top" style="padding: 40px 20px 20px 20px; border-radius: 4px 4px 0px 0px; color: #3A384C; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 48px; font-weight: 400; line-height: 48px;">
+          <h1 style="font-size: 48px; font-weight: 400; margin: 0;">
+            <%= gettext "An administrator changed your role" %>
+          </h1>
+        </td>
+      </tr>
+    </table>
+    <!--[if (gte mso 9)|(IE)]>
+    </td>
+  </tr>
+</table>
+    <![endif]-->
+  </td>
+</tr>
+<!-- COPY BLOCK -->
+<tr>
+  <td bgcolor="#E6E4F4" align="center" style="padding: 0px 10px 0px 10px;">
+    <!--[if (gte mso 9)|(IE)]>
+      <table align="center" border="0" cellspacing="0" cellpadding="0" width="600">
+        <tr>
+          <td align="center" valign="top" width="600">
+    <![endif]-->
+    <table border="0" cellpadding="0" cellspacing="0" width="100%" style="max-width: 600px;" >
+      <!-- COPY -->
+      <tr>
+        <td bgcolor="#ffffff" align="left" style="padding: 20px 30px 0px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >
+          <p style="margin: 0;">
+            <%= gettext("Hi there! We just wanted to inform you that an administrator from <b>%{instance}</b> just changed your account role.", %{instance: @instance_name}) |> raw %>
+          </p>
+        </td>
+      </tr>
+      <tr>
+        <td bgcolor="#ffffff" align="left" style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;" >
+          <table width="100%">
+            <tr>
+              <td bgcolor="#ffffff" align="left">
+                <%= gettext "Old role" %>
+              </td>
+              <td bgcolor="#ffffff" align="left">
+                <%= render("admin/_role.html", role: @old_role) %>
+              </td>
+            </tr>
+            <tr>
+              <td bgcolor="#ffffff" align="left">
+                <%= gettext "New role" %>
+              </td>
+              <td bgcolor="#ffffff" align="left">
+                <%= render("admin/_role.html", role: @new_role) %>
+              </td>
+            </tr>
+          </table>
+        </td>
+      </tr>
+      <tr>
+        <td bgcolor="#ffffff" align="left" style="padding: 20px 30px 40px 30px; color: #474467; font-family: 'Roboto', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; line-height: 20px;" >
+          <p style="margin: 0">
+            <%= gettext("If something doesn't feel right to you, please contact the instance administrator through the contact methods %{start_link}on the instance's about page%{end_link}.", %{start_link: "<a href=\"#{Mobilizon.Web.Endpoint.url()}/about/instance\">", end_link: "</a>"}) |> raw %>
+          </p>
+        </td>
+      </tr>
+    </table>
+    <!--[if (gte mso 9)|(IE)]>
+    </td>
+  </tr>
+</table>
+    <![endif]-->
+  </td>
+</tr>

lib/web/templates/email/admin_user_role_changed.text.eex

@@ -0,0 +1,8 @@
+<%= gettext "An administrator changed your role" %>
+==
+<%= gettext "Hi there! We just wanted to inform you that an administrator from %{instance} just changed your account role.", %{instance: @instance_name} %>
+
+<%= gettext "Old role:" %> <%= render("admin/_role.text", role: @old_role) %>
+<%= gettext "New role:" %> <%= render("admin/_role.text", role: @new_role) %>
+
+<%= gettext "If something doesn't feel right to you, please contact the instance administrator through the contact methods on the instance's about page: %{about_page}.", %{about_page: "#{Mobilizon.Web.Endpoint.url()}/about/instance"} %>

lib/web/templates/email/email_changed_new.text.eex

@@ -1,5 +1,5 @@
 <%= gettext "Confirm new email" %>
 ==
-<%= gettext "Hi there! It seems like you wanted to change the email address linked to your account on <b>%{instance}</b>. If you still wish to do so, please click the button below to confirm the change. You will then be able to log in to %{instance} with this new email address.", %{instance: @instance_name} %>
+<%= gettext "Hi there! It seems like you wanted to change the email address linked to your account on %{instance}. If you still wish to do so, please click the button below to confirm the change. You will then be able to log in to %{instance} with this new email address.", %{instance: @instance_name} %>
 <%= Routes.page_url(Mobilizon.Web.Endpoint, :user_email_validation, @token) %>
 <%= gettext "If you didn't trigger the change yourself, please ignore this message." %>