darkkirb/akkoma
1
0
Fork 0
forked from mirrors/akkoma
Code Pull requests Activity

use fetch_object_from_id for ap protocol handler

Browse source
This commit is contained in:
Charlotte 🦝 Delenk 2023-07-23 09:39:10 +01:00
parent 0f9be97112
commit 5bbeeeeedd
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/protocol_handler/protocol_handler_controller.ex
View file

@ -10,6 +10,7 @@ defmodule Pleroma.Web.AkkomaAPI.ProtocolHandlerController do
alias Pleroma.Activity
alias Pleroma.User
alias Pleroma.Web.Plugs.OAuthScopesPlug
alias Pleroma.Object.Fetcher
@oauth_search_actions [:handle]
@ -43,8 +44,7 @@ defp find_and_redirect(conn, "@" <> identifier) do
end
defp find_and_redirect(%{assigns: %{user: user}} = conn, identifier) do
redirect_to_target(User.get_or_fetch("https://" <> identifier), conn)
|| redirect_to_target(Activity.search(user, "https://" <> identifier, [limit: 1]), conn)
redirect_to_target(Fetcher.fetch_object_from_id("https://" <> identifier), conn)
|| conn |> json_response(:not_found, "Not Found - #{identifier}")
end