Remove caching because it does not affect performance and may be even worse in some...

[akkoma] / lib / pleroma / web / metadata / opengraph.ex

diff --git a/lib/pleroma/web/metadata/opengraph.ex b/lib/pleroma/web/metadata/opengraph.ex
index 8046c13babf9a4f40c3f6cad92f94f21d43f8932..b158569748d5559da9833e10201d59728a35f63f 100644 (file)
--- a/lib/pleroma/web/metadata/opengraph.ex
+++ b/lib/pleroma/web/metadata/opengraph.ex
@@ -7,7 +7,7 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
 
   @impl Provider
   def build_tags(%{activity: activity, user: user}) do
-    with truncated_content = scrub_html_and_truncate(activity.data["object"]["content"]) do
+    with truncated_content = scrub_html_and_truncate(activity) do
       attachments = build_attachments(activity)
 
       [
@@ -17,10 +17,10 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
            content: user_name_string(user)
          ], []},
         {:meta, [property: "og:url", content: activity.data["id"]], []},
-        {:meta, [property: "og:description", content: truncated_content], []},
-        {:meta, [property: "twitter:card", content: "summary"], []}
+        {:meta, [property: "og:description", content: truncated_content], []}
       ] ++
-        if attachments == [] do
+        if attachments == [] or
+             Enum.any?(activity.data["object"]["tag"], fn tag -> tag == "nsfw" end) do
           [
             {:meta, [property: "og:image", content: attachment_url(User.avatar_url(user))], []},
             {:meta, [property: "og:image:width", content: 120], []},
@@ -45,8 +45,7 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
         {:meta, [property: "og:description", content: truncated_bio], []},
         {:meta, [property: "og:image", content: attachment_url(User.avatar_url(user))], []},
         {:meta, [property: "og:image:width", content: 120], []},
-        {:meta, [property: "og:image:height", content: 120], []},
-        {:meta, [property: "twitter:card", content: "summary"], []}
+        {:meta, [property: "og:image:height", content: 120], []}
       ]
     end
   end
@@ -72,7 +71,16 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
     end)
   end
 
-  defp scrub_html_and_truncate(content) 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()
+    |> String.replace(~r/<br\s?\/?>/, " ")
+    |> HTML.get_cached_stripped_html_for_object(activity, __MODULE__)
+    |> Formatter.truncate()
+  end
+
+  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()