refactor: use Phoenix verified routes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel
2023-12-01 09:49:54 +01:00
parent 4f15535fa9
commit b315e1d7ff
83 changed files with 227 additions and 372 deletions

View File

@@ -5,8 +5,7 @@ defmodule Mobilizon.Service.Activity.Renderer.Comment do
alias Mobilizon.Activities.Activity
alias Mobilizon.Actors.Actor
alias Mobilizon.Service.Activity.Renderer
alias Mobilizon.Web.Endpoint
alias Mobilizon.Web.Router.Helpers, as: Routes
use Mobilizon.Web, :verified_routes
import Mobilizon.Web.Gettext, only: [dgettext: 3]
@behaviour Renderer
@@ -78,11 +77,7 @@ defmodule Mobilizon.Service.Activity.Renderer.Comment do
end
defp event_url(activity) do
Routes.page_url(
Endpoint,
:event,
activity.subject_params["event_uuid"]
)
url(~p"/events/#{activity.subject_params["event_uuid"]}")
end
defp event_comment_url(activity) do

View File

@@ -5,8 +5,7 @@ defmodule Mobilizon.Service.Activity.Renderer.Conversation do
alias Mobilizon.Activities.Activity
alias Mobilizon.Actors.Actor
alias Mobilizon.Service.Activity.Renderer
alias Mobilizon.Web.Endpoint
alias Mobilizon.Web.Router.Helpers, as: Routes
use Mobilizon.Web, :verified_routes
import Mobilizon.Web.Gettext, only: [dgettext: 3]
@behaviour Renderer
@@ -61,11 +60,7 @@ defmodule Mobilizon.Service.Activity.Renderer.Conversation do
end
defp conversation_url(activity) do
Routes.page_url(
Endpoint,
:conversation,
activity.subject_params["conversation_id"]
)
url(~p"/conversations/#{activity.subject_params["conversation_id"]}")
end
defp profile(activity), do: Actor.display_name_and_username(activity.author)

View File

@@ -5,8 +5,7 @@ defmodule Mobilizon.Service.Activity.Renderer.Discussion do
alias Mobilizon.Activities.Activity
alias Mobilizon.Actors.Actor
alias Mobilizon.Service.Activity.Renderer
alias Mobilizon.Web.Endpoint
alias Mobilizon.Web.Router.Helpers, as: Routes
use Mobilizon.Web, :verified_routes
import Mobilizon.Web.Gettext, only: [dgettext: 3]
@behaviour Renderer
@@ -113,12 +112,8 @@ defmodule Mobilizon.Service.Activity.Renderer.Discussion do
end
defp discussion_url(activity) do
Endpoint
|> Routes.page_url(
:discussion,
Actor.preferred_username_and_domain(activity.group),
activity.subject_params["discussion_slug"]
)
~p"/@#{Actor.preferred_username_and_domain(activity.group)}/c/#{activity.subject_params["discussion_slug"]}"
|> url()
|> URI.decode()
end

View File

@@ -5,8 +5,7 @@ defmodule Mobilizon.Service.Activity.Renderer.Event do
alias Mobilizon.Activities.Activity
alias Mobilizon.Actors.Actor
alias Mobilizon.Service.Activity.Renderer
alias Mobilizon.Web.Endpoint
alias Mobilizon.Web.Router.Helpers, as: Routes
use Mobilizon.Web, :verified_routes
import Mobilizon.Web.Gettext, only: [dgettext: 3]
@behaviour Renderer
@@ -81,11 +80,8 @@ defmodule Mobilizon.Service.Activity.Renderer.Event do
end
defp event_url(activity) do
Endpoint
|> Routes.page_url(
:event,
activity.subject_params["event_uuid"]
)
~p"/events/#{activity.subject_params["event_uuid"]}"
|> url()
|> URI.decode()
end

View File

@@ -5,8 +5,7 @@ defmodule Mobilizon.Service.Activity.Renderer.Group do
alias Mobilizon.Activities.Activity
alias Mobilizon.Actors.Actor
alias Mobilizon.Service.Activity.Renderer
alias Mobilizon.Web.Endpoint
alias Mobilizon.Web.Router.Helpers, as: Routes
use Mobilizon.Web, :verified_routes
import Mobilizon.Web.Gettext, only: [dgettext: 3]
@behaviour Renderer
@@ -30,8 +29,8 @@ defmodule Mobilizon.Service.Activity.Renderer.Group do
end
defp group_url(activity) do
Endpoint
|> Routes.page_url(:actor, Actor.preferred_username_and_domain(activity.group))
~p"/@#{Actor.preferred_username_and_domain(activity.group)}"
|> url()
|> URI.decode()
end

View File

@@ -5,8 +5,7 @@ defmodule Mobilizon.Service.Activity.Renderer.Member do
alias Mobilizon.Activities.Activity
alias Mobilizon.Actors.Actor
alias Mobilizon.Service.Activity.Renderer
alias Mobilizon.Web.Endpoint
alias Mobilizon.Web.Router.Helpers, as: Routes
use Mobilizon.Web, :verified_routes
import Mobilizon.Web.Gettext, only: [dgettext: 3]
@behaviour Renderer
@@ -81,12 +80,7 @@ defmodule Mobilizon.Service.Activity.Renderer.Member do
defp member_url(activity) do
group_url =
Endpoint
|> Routes.page_url(
:actor,
Actor.preferred_username_and_domain(activity.group)
)
|> URI.decode()
~p"/@#{Actor.preferred_username_and_domain(activity.group)}" |> url() |> URI.decode()
"#{group_url}/settings/members"
end

View File

@@ -5,8 +5,7 @@ defmodule Mobilizon.Service.Activity.Renderer.Post do
alias Mobilizon.Activities.Activity
alias Mobilizon.Actors.Actor
alias Mobilizon.Service.Activity.Renderer
alias Mobilizon.Web.Endpoint
alias Mobilizon.Web.Router.Helpers, as: Routes
use Mobilizon.Web, :verified_routes
import Mobilizon.Web.Gettext, only: [dgettext: 3]
@behaviour Renderer
@@ -52,12 +51,7 @@ defmodule Mobilizon.Service.Activity.Renderer.Post do
end
defp post_url(activity) do
Endpoint
|> Routes.page_url(
:post,
activity.subject_params["post_slug"]
)
|> URI.decode()
URI.decode(~p"/p/#{activity.subject_params["post_slug"]}")
end
defp profile(activity), do: Actor.display_name_and_username(activity.author)

View File

@@ -5,8 +5,7 @@ defmodule Mobilizon.Service.Activity.Renderer.Resource do
alias Mobilizon.Activities.Activity
alias Mobilizon.Actors.Actor
alias Mobilizon.Service.Activity.Renderer
alias Mobilizon.Web.Endpoint
alias Mobilizon.Web.Router.Helpers, as: Routes
use Mobilizon.Web, :verified_routes
import Mobilizon.Web.Gettext, only: [dgettext: 3]
@behaviour Renderer
@@ -73,8 +72,8 @@ defmodule Mobilizon.Service.Activity.Renderer.Resource do
end
defp resource_url(activity) do
Endpoint
|> Routes.page_url(:resource, activity.subject_params["resource_uuid"])
~p"/resource/#{activity.subject_params["resource_uuid"]}"
|> url()
|> URI.decode()
end