Merge remote-tracking branch 'MAIN/develop' into feature/jobs

2019-01-31 15:07:49 +07:00 · 2019-01-31 15:07:49 +07:00 · d3677d2b4d
commit d3677d2b4d
parent ab31adf15b 95d6118090
81 changed files with 910 additions and 337 deletions
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@ -166,10 +166,13 @@ defmodule Pleroma.Web.OStatus.OStatusController do
      end
    else
      {:public?, false} ->
-        {:error, :not_found}
+        conn
+        |> put_status(404)
+        |> Fallback.RedirectController.redirector(nil, 404)

      {:activity, nil} ->
-        {:error, :not_found}
+        conn
+        |> Fallback.RedirectController.redirector(nil, 404)

      e ->
        e