sjw/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-25 17:35:59 +01:00
Code Issues Releases Wiki Activity

/notice/:id - send the FE index even if 404

Browse Source 
this allows to open private activities by URL when you are logged in,
and to let the FE display a 404 page
This commit is contained in:
href 2019-01-27 22:51:50 +01:00
parent 16ab1437d6
commit 71bb90073b
No known key found for this signature in database
GPG Key ID: EE8296C1A152C325
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/pleroma/web/ostatus/ostatus_controller.ex
View File

@ -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

4
lib/pleroma/web/router.ex
View File

@ -523,10 +523,10 @@ defmodule Fallback.RedirectController do
alias Pleroma.Web.Metadata
alias Pleroma.User
def redirector(conn, _params) do
def redirector(conn, _params, code \\ 200) do
conn
|> put_resp_content_type("text/html")
|> send_file(200, index_file_path())
|> send_file(code, index_file_path())
end
def redirector_with_meta(conn, %{"maybe_nickname_or_id" => maybe_nickname_or_id} = params) do