Browse Source

Disable previews for any activity, but create

tags/v0.9.9
rinpatch 5 years ago
parent
commit
dd1432d695
2 changed files with 12 additions and 3 deletions
  1. +3
    -2
      lib/pleroma/web/metadata/opengraph.ex
  2. +9
    -1
      lib/pleroma/web/ostatus/ostatus_controller.ex

+ 3
- 2
lib/pleroma/web/metadata/opengraph.ex View File

@@ -71,7 +71,7 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
end)
end

defp scrub_html_and_truncate(%{data: %{ "object" => %{ "content" => content}}} = activity) do
defp scrub_html_and_truncate(%{data: %{"object" => %{"content" => content}}} = activity) do
content
# html content comes from DB already encoded, decode first and scrub after
|> HtmlEntities.decode()
@@ -80,7 +80,7 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
|> Formatter.truncate()
end

defp scrub_html_and_truncate(content) do
defp scrub_html_and_truncate(content) when is_binary(content) do
content
# html content comes from DB already encoded, decode first and scrub after
|> HtmlEntities.decode()
@@ -88,6 +88,7 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
|> HTML.strip_tags()
|> Formatter.truncate()
end

defp attachment_url(url) do
MediaProxy.url(url)
end


+ 9
- 1
lib/pleroma/web/ostatus/ostatus_controller.ex View File

@@ -145,7 +145,15 @@ defmodule Pleroma.Web.OStatus.OStatusController do
%User{} = user <- User.get_cached_by_ap_id(activity.data["actor"]) do
case format = get_format(conn) do
"html" ->
Fallback.RedirectController.redirector_with_meta(conn, %{activity: activity, user: user})
# Only Create actvities have a map at object
if is_map(activity.data["object"]) do
Fallback.RedirectController.redirector_with_meta(conn, %{
activity: activity,
user: user
})
else
Fallback.RedirectController.redirector(conn, nil)
end

_ ->
represent_activity(conn, format, activity, user)


Loading…
Cancel
Save