Merge remote-tracking branch 'origin/develop' into pool-usage

[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..9b600737fb490b8ae6912fcb1134c7bdaab41441 100644 (file)
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -1,30 +1,41 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.OStatus.OStatusController do
   use Pleroma.Web, :controller
 
-  alias Pleroma.{User, Activity}
+  alias Pleroma.{User, Activity, Object}
   alias Pleroma.Web.OStatus.{FeedRepresenter, ActivityRepresenter}
   alias Pleroma.Repo
   alias Pleroma.Web.{OStatus, Federator}
   alias Pleroma.Web.XML
+  alias Pleroma.Web.ActivityPub.ObjectView
   alias Pleroma.Web.ActivityPub.ActivityPubController
   alias Pleroma.Web.ActivityPub.ActivityPub
 
+  plug(Pleroma.Web.FederatingPlug when action in [:salmon_incoming])
   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 +54,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
 
@@ -85,7 +96,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
            %User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
         case get_format(conn) do
           "html" -> redirect(conn, to: "/notice/#{activity.id}")
-          _ -> represent_activity(conn, activity, user)
+          _ -> represent_activity(conn, nil, activity, user)
         end
       else
         {:public?, false} ->
@@ -102,12 +113,12 @@ 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
+      case format = get_format(conn) do
         "html" -> redirect(conn, to: "/notice/#{activity.id}")
-        _ -> represent_activity(conn, activity, user)
+        _ -> represent_activity(conn, format, activity, user)
       end
     else
       {:public?, false} ->
@@ -125,14 +136,14 @@ defmodule Pleroma.Web.OStatus.OStatusController do
     with {_, %Activity{} = activity} <- {:activity, Repo.get(Activity, id)},
          {_, true} <- {:public?, ActivityPub.is_public?(activity)},
          %User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
-      case get_format(conn) do
+      case format = get_format(conn) do
         "html" ->
           conn
           |> put_resp_content_type("text/html")
-          |> send_file(200, "priv/static/index.html")
+          |> send_file(200, Pleroma.Plugs.InstanceStatic.file_path("index.html"))
 
         _ ->
-          represent_activity(conn, activity, user)
+          represent_activity(conn, format, activity, user)
       end
     else
       {:public?, false} ->
@@ -146,7 +157,24 @@ defmodule Pleroma.Web.OStatus.OStatusController do
     end
   end
 
-  defp represent_activity(conn, activity, user) do
+  defp represent_activity(
+         conn,
+         "activity+json",
+         %Activity{data: %{"type" => "Create"}} = activity,
+         _user
+       ) do
+    object = Object.normalize(activity.data["object"])
+
+    conn
+    |> put_resp_header("content-type", "application/activity+json")
+    |> json(ObjectView.render("object.json", %{object: object}))
+  end
+
+  defp represent_activity(_conn, "activity+json", _, _) do
+    {:error, :not_found}
+  end
+
+  defp represent_activity(conn, _, activity, user) do
     response =
       activity
       |> ActivityRepresenter.to_simple_form(user, true)