aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/metadata
diff options
context:
space:
mode:
authorSadposter <hannah+pleroma@coffee-and-dreams.uk>2019-04-10 10:44:54 +0100
committerSadposter <hannah+pleroma@coffee-and-dreams.uk>2019-04-10 10:44:54 +0100
commitbe8350baa2f8c9cf9be3f53ee4a0041dada1386f (patch)
tree8414fc2108941ccadd9b9fd4dd37c9d3cf731399 /lib/pleroma/web/metadata
parent589629cf3e1bee9a4f6e92b8456d8614eff73c89 (diff)
parentc8440b5e0c97c5d5c03e4b99e30a61df6ab95319 (diff)
downloadpleroma-be8350baa2f8c9cf9be3f53ee4a0041dada1386f.tar.gz
Merge branch 'develop' into feature/user-status-subscriptions
Diffstat (limited to 'lib/pleroma/web/metadata')
-rw-r--r--lib/pleroma/web/metadata/utils.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/metadata/utils.ex b/lib/pleroma/web/metadata/utils.ex
index 23bbde1a6..58385a3d1 100644
--- a/lib/pleroma/web/metadata/utils.ex
+++ b/lib/pleroma/web/metadata/utils.ex
@@ -12,7 +12,7 @@ defmodule Pleroma.Web.Metadata.Utils do
# 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(object, __MODULE__)
+ |> HTML.get_cached_stripped_html_for_activity(object, "metadata")
|> Formatter.demojify()
|> Formatter.truncate()
end