Merge remote-tracking branch 'upstream/develop' into feature/filter_exif

[akkoma] / lib / pleroma / web / ostatus / ostatus_controller.ex

diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
index f346cc9afa94871b5a73f44734d8508f54b8de0f..00bffbd5da253f2b74ed5cbb82c26045a0f1a469 100644 (file)
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -12,19 +12,24 @@ defmodule Pleroma.Web.OStatus.OStatusController do
   action_fallback(:errors)
 
   def feed_redirect(conn, %{"nickname" => nickname}) do
-    with {_, %User{} = user} <- {:user, User.get_cached_by_nickname(nickname)} do
-      case get_format(conn) do
-        "html" -> Fallback.RedirectController.redirector(conn, nil)
-        "activity+json" -> ActivityPubController.call(conn, :user)
-        _ -> redirect(conn, external: OStatus.feed_path(user))
-      end
-    else
-      {:user, nil} -> {:error, :not_found}
+    case get_format(conn) do
+      "html" ->
+        Fallback.RedirectController.redirector(conn, nil)
+
+      "activity+json" ->
+        ActivityPubController.call(conn, :user)
+
+      _ ->
+        with %User{} = user <- User.get_cached_by_nickname(nickname) do
+          redirect(conn, external: OStatus.feed_path(user))
+        else
+          nil -> {:error, :not_found}
+        end
     end
   end
 
   def feed(conn, %{"nickname" => nickname} = params) do
-    with {_, %User{} = user} <- {:user, User.get_cached_by_nickname(nickname)} do
+    with %User{} = user <- User.get_cached_by_nickname(nickname) do
       query_params =
         Map.take(params, ["max_id"])
         |> Map.merge(%{"whole_db" => true, "actor_id" => user.ap_id})
@@ -43,7 +48,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
       |> put_resp_content_type("application/atom+xml")
       |> send_resp(200, response)
     else
-      {:user, nil} -> {:error, :not_found}
+      nil -> {:error, :not_found}
     end
   end
 
@@ -102,7 +107,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
 
   def activity(conn, %{"uuid" => uuid}) do
     with id <- o_status_url(conn, :activity, uuid),
-         {_, %Activity{} = activity} <- {:activity, Activity.get_by_ap_id(id)},
+         {_, %Activity{} = activity} <- {:activity, Activity.normalize(id)},
          {_, true} <- {:public?, ActivityPub.is_public?(activity)},
          %User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
       case get_format(conn) do