hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request 'Restore embed route' (#7857) from mkljczk/pleroma:restore-embeds into develop

Browse source 
Reviewed-on: https://git.pleroma.social/pleroma/pleroma/pulls/7857
This commit is contained in:
feld 2026-03-25 19:52:16 +00:00
commit 106a52eb2e
3 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/restore-embeds.fix Normal file
View file

@ -0,0 +1 @@
Restore embeds route

1
lib/pleroma/web/embed_controller.ex
View file

@ -20,6 +20,7 @@ defmodule Pleroma.Web.EmbedController do
conn conn
|> delete_resp_header("x-frame-options") |> delete_resp_header("x-frame-options")
|> delete_resp_header("content-security-policy") |> delete_resp_header("content-security-policy")
|> put_layout({Pleroma.Web.LayoutView, :embed})
|> render("show.html", |> render("show.html",
activity: activity, activity: activity,
author: User.sanitize_html(author), author: User.sanitize_html(author),

2
lib/pleroma/web/router.ex
View file

@ -1032,6 +1032,8 @@ defmodule Pleroma.Web.Router do
pipe_through(:pleroma_html) pipe_through(:pleroma_html)
post("/auth/password", OAuth.PasswordController, :request) post("/auth/password", OAuth.PasswordController, :request)
get("/embed/:id", EmbedController, :show)
end end
scope "/proxy/", Pleroma.Web do scope "/proxy/", Pleroma.Web do