Migrate to verified routes (for auto-replacable stuff)

2023-08-13 16:21:26 +01:00 · 2023-08-13 16:21:26 +01:00 · 0c9883a033
commit 0c9883a033
parent adec7adce7
23 changed files with 31 additions and 39 deletions
--- a/lib/pleroma/web/feed/user_controller.ex
+++ b/lib/pleroma/web/feed/user_controller.ex
@ -30,7 +30,7 @@ def feed_redirect(%{assigns: %{format: format}} = conn, _params)

  def feed_redirect(conn, %{"nickname" => nickname}) do
    with {_, %User{} = user} <- {:fetch_user, User.get_cached_by_nickname(nickname)} do
-      redirect(conn, external: "#{Routes.user_feed_url(conn, :feed, user.nickname)}.atom")
+      redirect(conn, external: "#{url(~p"/users/#{user.nickname}/feed")}.atom")
    end
  end

--- a/lib/pleroma/web/mastodon_api/controllers/auth_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/auth_controller.ex
@ -91,7 +91,7 @@ def password_reset(conn, params) do
  defp local_mastodon_post_login_path(conn) do
    case get_session(conn, :return_to) do
      nil ->
-        Routes.masto_fe_path(conn, :index, ["getting-started"])
+        ~p"/web/getting-started"

      return_to ->
        delete_session(conn, :return_to)
--- a/lib/pleroma/web/o_auth/o_auth_controller.ex
+++ b/lib/pleroma/web/o_auth/o_auth_controller.ex
@ -449,7 +449,7 @@ def prepare_request(%Plug.Conn{} = conn, %{
      |> Map.put("state", state)

    # Handing the request to Ueberauth
-    redirect(conn, to: Routes.o_auth_path(conn, :request, provider, params))
+    redirect(conn, to: ~p"/oauth/#{provider}?#{params}")
  end

  def request(%Plug.Conn{} = conn, params) do
@ -623,7 +623,7 @@ def login(%User{} = user, %App{} = app, requested_scopes) when is_list(requested
  end

  # Special case: Local MastodonFE
-  defp redirect_uri(%Plug.Conn{} = conn, "."), do: Routes.auth_url(conn, :login)
+  defp redirect_uri(_, "."), do: url(~p"/web/login")

  defp redirect_uri(%Plug.Conn{}, redirect_uri), do: redirect_uri

--- a/lib/pleroma/web/templates/akkoma_api/frontend_switcher/switch.html.eex
+++ b/lib/pleroma/web/templates/akkoma_api/frontend_switcher/switch.html.eex
@ -2,7 +2,7 @@

 <h3>After you submit, you will need to refresh manually to get your new frontend!</h3>

-<%= form_for @conn, Routes.frontend_switcher_path(@conn, :do_switch), fn f -> %>
+<%= form_for @conn, ~p"/akkoma/frontend", fn f -> %>
  <%= select(f, :frontend, @choices) %>

  <%= submit do: "submit" %>
--- a/lib/pleroma/web/templates/feed/feed/tag.atom.eex
+++ b/lib/pleroma/web/templates/feed/feed/tag.atom.eex
@ -9,13 +9,13 @@
      xmlns:ostatus="http://ostatus.org/schema/1.0"
      xmlns:statusnet="http://status.net/schema/api/1/">

-    <id><%= '#{Routes.tag_feed_url(@conn, :feed, @tag)}.rss' %></id>
+    <id><%= '#{url(~p"/tags/#{@tag}")}.rss' %></id>
    <title>#<%= @tag %></title>

    <subtitle><%= Gettext.dpgettext("static_pages", "tag feed description", "These are public toots tagged with #%{tag}. You can interact with them if you have an account anywhere in the fediverse.", tag: @tag) %></subtitle>
    <logo><%= feed_logo() %></logo>
    <updated><%= most_recent_update(@activities) %></updated>
-    <link rel="self" href="<%= '#{Routes.tag_feed_url(@conn, :feed, @tag)}.atom'  %>" type="application/atom+xml"/>
+    <link rel="self" href="<%= '#{url(~p"/tags/#{@tag}")}.atom'  %>" type="application/atom+xml"/>
    <%= for activity <- @activities do %>
    <%= render @view_module, "_tag_activity.atom", Map.merge(assigns, prepare_activity(activity, actor: true)) %>
    <% end %>
--- a/lib/pleroma/web/templates/feed/feed/tag.rss.eex
+++ b/lib/pleroma/web/templates/feed/feed/tag.rss.eex
@ -5,7 +5,7 @@

    <title>#<%= @tag %></title>
    <description><%= Gettext.dpgettext("static_pages", "tag feed description", "These are public toots tagged with #%{tag}. You can interact with them if you have an account anywhere in the fediverse.", tag: @tag) %></description>
-    <link><%= '#{Routes.tag_feed_url(@conn, :feed, @tag)}.rss' %></link>
+    <link><%= '#{url(~p"/tags/#{@tag}")}.rss' %></link>
    <webfeeds:logo><%= feed_logo() %></webfeeds:logo>
    <webfeeds:accentColor>2b90d9</webfeeds:accentColor>
    <%= for activity <- @activities do %>
--- a/lib/pleroma/web/templates/feed/feed/user.atom.eex
+++ b/lib/pleroma/web/templates/feed/feed/user.atom.eex
@ -6,16 +6,16 @@
  xmlns:poco="http://portablecontacts.net/spec/1.0"
  xmlns:ostatus="http://ostatus.org/schema/1.0">

-  <id><%= Routes.user_feed_url(@conn, :feed, @user.nickname) <> ".atom" %></id>
+  <id><%= url(~p"/users/#{@user.nickname}/feed") <> ".atom" %></id>
  <title><%= @user.nickname <> "'s timeline" %></title>
  <updated><%= most_recent_update(@activities, @user) %></updated>
  <logo><%= logo(@user) %></logo>
-  <link rel="self" href="<%= '#{Routes.user_feed_url(@conn, :feed, @user.nickname)}.atom' %>" type="application/atom+xml"/>
+  <link rel="self" href="<%= '#{url(~p"/users/#{@user.nickname}/feed")}.atom' %>" type="application/atom+xml"/>

  <%= render @view_module, "_author.atom", assigns %>

  <%= if last_activity(@activities) do %>
-    <link rel="next" href="<%= '#{Routes.user_feed_url(@conn, :feed, @user.nickname)}.atom?max_id=#{last_activity(@activities).id}' %>" type="application/atom+xml"/>
+    <link rel="next" href="<%= '#{url(~p"/users/#{@user.nickname}/feed")}.atom?max_id=#{last_activity(@activities).id}' %>" type="application/atom+xml"/>
  <% end %>

  <%= for activity <- @activities do %>
--- a/lib/pleroma/web/templates/feed/feed/user.rss.eex
+++ b/lib/pleroma/web/templates/feed/feed/user.rss.eex
@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <rss version="2.0">
  <channel>
-    <guid><%= Routes.user_feed_url(@conn, :feed, @user.nickname) <> ".rss" %></guid>
+    <guid><%= url(~p"/users/#{@user.nickname}/feed") <> ".rss" %></guid>
    <title><%= @user.nickname <> "'s timeline" %></title>
    <updated><%= most_recent_update(@activities, @user) %></updated>
    <image><%= logo(@user) %></image>
-    <link><%= '#{Routes.user_feed_url(@conn, :feed, @user.nickname)}.rss' %></link>
+    <link><%= '#{url(~p"/users/#{@user.nickname}/feed")}.rss' %></link>

    <%= render @view_module, "_author.rss", assigns %>

    <%= if last_activity(@activities) do %>
-      <link rel="next"><%= '#{Routes.user_feed_url(@conn, :feed, @user.nickname)}.rss?max_id=#{last_activity(@activities).id}' %></link>
+      <link rel="next"><%= '#{url(~p"/users/#{@user.nickname}/feed")}.rss?max_id=#{last_activity(@activities).id}' %></link>
    <% end %>

    <%= for activity <- @activities do %>
--- a/lib/pleroma/web/templates/masto_fe/fedibird.html.heex
+++ b/lib/pleroma/web/templates/masto_fe/fedibird.html.heex
@ -8,11 +8,7 @@
      <%= Config.get([:instance, :name]) %>
    </title>
    <link rel="icon" type="image/png" href="/favicon.png" />
-    <link
-      rel="manifest"
-      type="applicaton/manifest+json"
-      {%{href: Routes.masto_fe_path(Pleroma.Web.Endpoint, :manifest)}}
-    />
+    <link rel="manifest" type="applicaton/manifest+json" {%{href: ~p"/web/manifest.json"}} />

    <meta name="theme-color" {%{content: Config.get([:manifest, :theme_color])}} />

--- a/lib/pleroma/web/templates/masto_fe/glitchsoc.html.heex
+++ b/lib/pleroma/web/templates/masto_fe/glitchsoc.html.heex
@ -8,11 +8,7 @@
      <%= Config.get([:instance, :name]) %>
    </title>
    <link rel="icon" type="image/png" href="/favicon.png" />
-    <link
-      rel="manifest"
-      type="applicaton/manifest+json"
-      {%{href: Routes.masto_fe_path(Pleroma.Web.Endpoint, :manifest)}}
-    />
+    <link rel="manifest" type="applicaton/manifest+json" {%{href: ~p"/web/manifest.json"}} />

    <meta name="theme-color" {%{content: Config.get([:manifest, :theme_color])}} />

--- a/lib/pleroma/web/templates/o_auth/mfa/recovery.html.eex
+++ b/lib/pleroma/web/templates/o_auth/mfa/recovery.html.eex
@ -9,7 +9,7 @@
      <%= Gettext.dpgettext("static_pages", "mfa recover page title", "Two-factor recovery") %>
  </div>
  <div class="panel-content">
-      <%= form_for @conn, Routes.mfa_verify_path(@conn, :verify), [as: "mfa"], fn f -> %>
+      <%= form_for @conn, ~p"/oauth/mfa/verify", [as: "mfa"], fn f -> %>
      <div class="input">
        <%= label f, :code, Gettext.dpgettext("static_pages", "mfa recover recovery code prompt", "Recovery code") %>
        <%= text_input f, :code, [autocomplete: false, autocorrect: "off", autocapitalize: "off", autofocus: true, spellcheck: false] %>
@ -21,7 +21,7 @@

      <%= submit Gettext.dpgettext("static_pages", "mfa recover verify recovery code button", "Verify") %>
      <% end %>
-      <a href="<%= Routes.mfa_path(@conn, :show, %{challenge_type: "totp", mfa_token: @mfa_token, state: @state, redirect_uri: @redirect_uri}) %>">
+      <a href="<%= ~p"/oauth/mfa?#{[%{challenge_type: "totp", mfa_token: @mfa_token, state: @state, redirect_uri: @redirect_uri}]}" %>">
        <%= Gettext.dpgettext("static_pages", "mfa recover use 2fa code link", "Enter a two-factor code") %>
      </a>

--- a/lib/pleroma/web/templates/o_auth/mfa/totp.html.eex
+++ b/lib/pleroma/web/templates/o_auth/mfa/totp.html.eex
@ -9,7 +9,7 @@
      <%= Gettext.dpgettext("static_pages", "mfa auth page title", "Two-factor authentication") %>
  </div>
  <div class="panel-content">
-      <%= form_for @conn, Routes.mfa_verify_path(@conn, :verify), [as: "mfa"], fn f -> %>
+      <%= form_for @conn, ~p"/oauth/mfa/verify", [as: "mfa"], fn f -> %>
      <div class="input">
        <%= label f, :code, Gettext.dpgettext("static_pages", "mfa auth code prompt", "Authentication code") %>
        <%= text_input f, :code, [autocomplete: "one-time-code", autocorrect: "off", autocapitalize: "off", autofocus: true, pattern: "[0-9]*", spellcheck: false] %>
@ -21,7 +21,7 @@

      <%= submit Gettext.dpgettext("static_pages", "mfa auth verify code button", "Verify") %>
      <% end %>
-      <a href="<%= Routes.mfa_path(@conn, :show, %{challenge_type: "recovery", mfa_token: @mfa_token, state: @state, redirect_uri: @redirect_uri}) %>">
+      <a href="<%= ~p"/oauth/mfa?#{[%{challenge_type: "recovery", mfa_token: @mfa_token, state: @state, redirect_uri: @redirect_uri}]}" %>">
        <%= Gettext.dpgettext("static_pages", "mfa auth page use recovery code link", "Enter a two-factor recovery code") %>
      </a>
  </div>
--- a/lib/pleroma/web/templates/o_auth/o_auth/consumer.html.eex
+++ b/lib/pleroma/web/templates/o_auth/o_auth/consumer.html.eex
@ -1,6 +1,6 @@
 <h2><%= Gettext.dpgettext("static_pages", "oauth external provider page title", "Sign in with external provider") %></h2>

-<%= form_for @conn, Routes.o_auth_path(@conn, :prepare_request), [as: "authorization", method: "get"], fn f -> %>
+<%= form_for @conn, ~p"/oauth/prepare_request", [as: "authorization", method: "get"], fn f -> %>
  <div style="display: none">
    <%= render @view_module, "_scopes.html", Map.merge(assigns, %{form: f}) %>
  </div>
--- a/lib/pleroma/web/templates/o_auth/o_auth/register.html.eex
+++ b/lib/pleroma/web/templates/o_auth/o_auth/register.html.eex
@ -8,7 +8,7 @@
 <h2><%= Gettext.dpgettext("static_pages", "oauth register page title", "Registration Details") %></h2>

 <p><%= Gettext.dpgettext("static_pages", "oauth register page fill form prompt", "If you'd like to register a new account, please provide the details below.") %></p>
-<%= form_for @conn, Routes.o_auth_path(@conn, :register), [as: "authorization"], fn f -> %>
+<%= form_for @conn, ~p"/oauth/register", [as: "authorization"], fn f -> %>

 <div class="input">
  <%= label f, :nickname, Gettext.dpgettext("static_pages", "oauth register page nickname prompt", "Nickname") %>
--- a/lib/pleroma/web/templates/o_auth/o_auth/show.html.eex
+++ b/lib/pleroma/web/templates/o_auth/o_auth/show.html.eex
@ -5,7 +5,7 @@
 <p class="alert alert-danger" role="alert"><%= Flash.get(@flash, :error) %></p>
 <% end %>

-<%= form_for @conn, Routes.o_auth_path(@conn, :authorize), [as: "authorization"], fn f -> %>
+<%= form_for @conn, ~p"/oauth/authorize", [as: "authorization"], fn f -> %>

 <%= if @user do %>
  <div class="account-header">
--- a/lib/pleroma/web/templates/twitter_api/password/reset.html.eex
+++ b/lib/pleroma/web/templates/twitter_api/password/reset.html.eex
@ -1,5 +1,5 @@
 <h2>Password Reset for <%= @user.nickname %></h2>
-<%= form_for @conn, Routes.reset_password_path(@conn, :do_reset), [as: "data"], fn f -> %>
+<%= form_for @conn, ~p"/api/v1/pleroma/password_reset", [as: "data"], fn f -> %>
  <div class="form-row">
    <%= label f, :password, Gettext.dpgettext("static_pages", "password reset form password prompt", "Password") %>
    <%= password_input f, :password %>
--- a/lib/pleroma/web/templates/twitter_api/remote_follow/follow.html.eex
+++ b/lib/pleroma/web/templates/twitter_api/remote_follow/follow.html.eex
@ -4,7 +4,7 @@
    <h2><%= Gettext.dpgettext("static_pages", "remote follow header", "Remote follow") %></h2>
    <img height="128" width="128" src="<%= avatar_url(@followee) %>">
    <p><%= @followee.nickname %></p>
-    <%= form_for @conn, Routes.remote_follow_path(@conn, :do_follow), [as: "user"], fn f -> %>
+    <%= form_for @conn, ~p"/ostatus_subscribe", [as: "user"], fn f -> %>
    <%= hidden_input f, :id, value: @followee.id %>
    <%= submit Gettext.dpgettext("static_pages", "remote follow authorization button", "Authorize") %>
    <% end %>
--- a/lib/pleroma/web/templates/twitter_api/remote_follow/follow_login.html.eex
+++ b/lib/pleroma/web/templates/twitter_api/remote_follow/follow_login.html.eex
@ -4,7 +4,7 @@
 <h2><%= Gettext.dpgettext("static_pages", "remote follow header, need login", "Log in to follow") %></h2>
 <p><%= @followee.nickname %></p>
 <img height="128" width="128" src="<%= avatar_url(@followee) %>">
-<%= form_for @conn, Routes.remote_follow_path(@conn, :do_follow), [as: "authorization"], fn f -> %>
+<%= form_for @conn, ~p"/ostatus_subscribe", [as: "authorization"], fn f -> %>
 <%= text_input f, :name, placeholder: Gettext.dpgettext("static_pages", "placeholder text for username entry", "Username"), required: true, autocomplete: "username" %>
 <br>
 <%= password_input f, :password, placeholder: Gettext.dpgettext("static_pages", "placeholder text for password entry", "Password"), required: true, autocomplete: "password" %>
--- a/lib/pleroma/web/templates/twitter_api/remote_follow/follow_mfa.html.eex
+++ b/lib/pleroma/web/templates/twitter_api/remote_follow/follow_mfa.html.eex
@ -4,7 +4,7 @@
 <h2><%= Gettext.dpgettext("static_pages", "remote follow mfa header", "Two-factor authentication") %></h2>
 <p><%= @followee.nickname %></p>
 <img height="128" width="128" src="<%= avatar_url(@followee) %>">
-<%= form_for @conn, Routes.remote_follow_path(@conn, :do_follow), [as: "mfa"], fn f -> %>
+<%= form_for @conn, ~p"/ostatus_subscribe", [as: "mfa"], fn f -> %>
 <%= text_input f, :code, placeholder: Gettext.dpgettext("static_pages", "placeholder text for auth code entry", "Authentication code"), required: true %>
 <br>
 <%= hidden_input f, :id, value: @followee.id %>
--- a/lib/pleroma/web/templates/twitter_api/util/status_interact.html.eex
+++ b/lib/pleroma/web/templates/twitter_api/util/status_interact.html.eex
@ -2,7 +2,7 @@
  <h2><%= Gettext.dpgettext("static_pages", "status interact error", "Error: %{error}", error: @error) %></h2>
 <% else %>
  <h2><%= raw Gettext.dpgettext("static_pages", "status interact header", "Interacting with %{nickname}'s %{status_link}", nickname: safe_to_string(html_escape(@nickname)), status_link: safe_to_string(link(Gettext.dpgettext("static_pages", "status interact header - status link text", "status"), to: @status_link))) %></h2>
-  <%= form_for @conn, Routes.util_path(@conn, :remote_subscribe), [as: "status"], fn f -> %>
+  <%= form_for @conn, ~p"/main/ostatus", [as: "status"], fn f -> %>
  <%= hidden_input f, :status_id, value: @status_id %>
  <%= text_input f, :profile, placeholder: Gettext.dpgettext("static_pages", "placeholder text for account id", "Your account ID, e.g. lain@quitter.se") %>
  <%= submit Gettext.dpgettext("static_pages", "status interact authorization button", "Interact") %>
--- a/lib/pleroma/web/templates/twitter_api/util/subscribe.html.eex
+++ b/lib/pleroma/web/templates/twitter_api/util/subscribe.html.eex
@ -2,7 +2,7 @@
  <h2><%= Gettext.dpgettext("static_pages", "remote follow error", "Error: %{error}", error: @error) %></h2>
 <% else %>
  <h2><%= Gettext.dpgettext("static_pages", "remote follow header", "Remotely follow %{nickname}", nickname: @nickname) %></h2>
-  <%= form_for @conn, Routes.util_path(@conn, :remote_subscribe), [as: "user"], fn f -> %>
+  <%= form_for @conn, ~p"/main/ostatus", [as: "user"], fn f -> %>
  <%= hidden_input f, :nickname, value: @nickname %>
  <%= text_input f, :profile, placeholder: Gettext.dpgettext("static_pages", "placeholder text for account id", "Your account ID, e.g. lain@quitter.se") %>
  <%= submit Gettext.dpgettext("static_pages", "remote follow authorization button for following with a remote account", "Follow") %>
--- a/lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
@ -38,7 +38,7 @@ def follow(%{assigns: %{user: user}} = conn, %{"acct" => acct}) do
  defp follow_status(conn, _user, acct) do
    with {:ok, object} <- Fetcher.fetch_object_from_id(acct),
         %Activity{id: activity_id} <- Activity.get_create_by_object_ap_id(object.data["id"]) do
-      redirect(conn, to: Routes.o_status_path(conn, :notice, activity_id))
+      redirect(conn, to: ~p"/notice/#{activity_id}")
    else
      error ->
        handle_follow_error(conn, error)
--- a/lib/pleroma/web/views/masto_fe_view.ex
+++ b/lib/pleroma/web/views/masto_fe_view.ex
@ -85,7 +85,7 @@ def render("manifest.json", _params) do
      background_color: Config.get([:manifest, :background_color]),
      display: "standalone",
      scope: Pleroma.Web.Endpoint.url(),
-      start_url: Routes.masto_fe_path(Pleroma.Web.Endpoint, :index, ["getting-started"]),
+      start_url: ~p"/web/getting-started",
      categories: [
        "social"
      ],