aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/metadata
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-03-04 18:29:13 +0000
committerkaniini <nenolod@gmail.com>2019-03-04 18:29:13 +0000
commitd45dbdce5a478a004711baad963d7134988402ed (patch)
tree6dfcc121950f9513ae82bfc147c6dbc1b3b069a6 /lib/pleroma/web/metadata
parentca5d894e6811e0020facabdaa12d2fd263b497c5 (diff)
parent0245ce842fad4dd53f3c6f6e4a146fc857e8eb1d (diff)
downloadpleroma-d45dbdce5a478a004711baad963d7134988402ed.tar.gz
Merge branch 'feature/add-status-text-to-notifications' into 'develop'
Add status text to notifications (mentions and reposts) Closes #696 See merge request pleroma/pleroma!897
Diffstat (limited to 'lib/pleroma/web/metadata')
-rw-r--r--lib/pleroma/web/metadata/utils.ex4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/metadata/utils.ex b/lib/pleroma/web/metadata/utils.ex
index a166800d4..5fc9c9e7b 100644
--- a/lib/pleroma/web/metadata/utils.ex
+++ b/lib/pleroma/web/metadata/utils.ex
@@ -17,14 +17,14 @@ defmodule Pleroma.Web.Metadata.Utils do
|> Formatter.truncate()
end
- def scrub_html_and_truncate(content) when is_binary(content) do
+ def scrub_html_and_truncate(content, max_length \\ 200) when is_binary(content) do
content
# html content comes from DB already encoded, decode first and scrub after
|> HtmlEntities.decode()
|> String.replace(~r/<br\s?\/?>/, " ")
|> HTML.strip_tags()
|> Formatter.demojify()
- |> Formatter.truncate()
+ |> Formatter.truncate(max_length)
end
def attachment_url(url) do