Merge branch 'release/2.2.0' into 'stable'v2.2.0

Release/2.2.0

See merge request pleroma/secteam/pleroma!19

1 files changed, 0 insertions, 151 deletions

diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
deleted file mode 100644
index de1b0b3f0..000000000
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ /dev/null
@@ -1,151 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Web.OStatus.OStatusController do
-  use Pleroma.Web, :controller
-
-  alias Fallback.RedirectController
-  alias Pleroma.Activity
-  alias Pleroma.Object
-  alias Pleroma.Plugs.RateLimiter
-  alias Pleroma.User
-  alias Pleroma.Web.ActivityPub.ActivityPubController
-  alias Pleroma.Web.ActivityPub.Visibility
-  alias Pleroma.Web.Endpoint
-  alias Pleroma.Web.Metadata.PlayerView
-  alias Pleroma.Web.Router
-
-  plug(Pleroma.Plugs.EnsureAuthenticatedPlug,
-    unless_func: &Pleroma.Web.FederatingPlug.federating?/1
-  )
-
-  plug(
-    RateLimiter,
-    [name: :ap_routes, params: ["uuid"]] when action in [:object, :activity]
-  )
-
-  plug(
-    Pleroma.Plugs.SetFormatPlug
-    when action in [:object, :activity, :notice]
-  )
-
-  action_fallback(:errors)
-
-  def object(%{assigns: %{format: format}} = conn, _params)
-      when format in ["json", "activity+json"] do
-    ActivityPubController.call(conn, :object)
-  end
-
-  def object(%{assigns: %{format: format}} = conn, _params) do
-    with id <- Endpoint.url() <> conn.request_path,
-         {_, %Activity{} = activity} <-
-           {:activity, Activity.get_create_by_object_ap_id_with_object(id)},
-         {_, true} <- {:public?, Visibility.is_public?(activity)} do
-      case format do
-        _ -> redirect(conn, to: "/notice/#{activity.id}")
-      end
-    else
-      reason when reason in [{:public?, false}, {:activity, nil}] ->
-        {:error, :not_found}
-
-      e ->
-        e
-    end
-  end
-
-  def activity(%{assigns: %{format: format}} = conn, _params)
-      when format in ["json", "activity+json"] do
-    ActivityPubController.call(conn, :activity)
-  end
-
-  def activity(%{assigns: %{format: format}} = conn, _params) do
-    with id <- Endpoint.url() <> conn.request_path,
-         {_, %Activity{} = activity} <- {:activity, Activity.normalize(id)},
-         {_, true} <- {:public?, Visibility.is_public?(activity)} do
-      case format do
-        _ -> redirect(conn, to: "/notice/#{activity.id}")
-      end
-    else
-      reason when reason in [{:public?, false}, {:activity, nil}] ->
-        {:error, :not_found}
-
-      e ->
-        e
-    end
-  end
-
-  def notice(%{assigns: %{format: format}} = conn, %{"id" => id}) do
-    with {_, %Activity{} = activity} <- {:activity, Activity.get_by_id_with_object(id)},
-         {_, true} <- {:public?, Visibility.is_public?(activity)},
-         %User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
-      cond do
-        format in ["json", "activity+json"] ->
-          if activity.local do
-            %{data: %{"id" => redirect_url}} = Object.normalize(activity)
-            redirect(conn, external: redirect_url)
-          else
-            {:error, :not_found}
-          end
-
-        activity.data["type"] == "Create" ->
-          %Object{} = object = Object.normalize(activity)
-
-          RedirectController.redirector_with_meta(
-            conn,
-            %{
-              activity_id: activity.id,
-              object: object,
-              url: Router.Helpers.o_status_url(Endpoint, :notice, activity.id),
-              user: user
-            }
-          )
-
-        true ->
-          RedirectController.redirector(conn, nil)
-      end
-    else
-      reason when reason in [{:public?, false}, {:activity, nil}] ->
-        conn
-        |> put_status(404)
-        |> RedirectController.redirector(nil, 404)
-
-      e ->
-        e
-    end
-  end
-
-  # Returns an HTML embedded <audio> or <video> player suitable for embed iframes.
-  def notice_player(conn, %{"id" => id}) do
-    with %Activity{data: %{"type" => "Create"}} = activity <- Activity.get_by_id_with_object(id),
-         true <- Visibility.is_public?(activity),
-         %Object{} = object <- Object.normalize(activity),
-         %{data: %{"attachment" => [%{"url" => [url | _]} | _]}} <- object,
-         true <- String.starts_with?(url["mediaType"], ["audio", "video"]) do
-      conn
-      |> put_layout(:metadata_player)
-      |> put_resp_header("x-frame-options", "ALLOW")
-      |> put_resp_header(
-        "content-security-policy",
-        "default-src 'none';style-src 'self' 'unsafe-inline';img-src 'self' data: https:; media-src 'self' https:;"
-      )
-      |> put_view(PlayerView)
-      |> render("player.html", url)
-    else
-      _error ->
-        conn
-        |> put_status(404)
-        |> RedirectController.redirector(nil, 404)
-    end
-  end
-
-  defp errors(conn, {:error, :not_found}) do
-    render_error(conn, :not_found, "Not found")
-  end
-
-  defp errors(conn, {:fetch_user, nil}), do: errors(conn, {:error, :not_found})
-
-  defp errors(conn, _) do
-    render_error(conn, :internal_server_error, "Something went wrong")
-  end
-end