projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into feature/matstodon-statuses-by-name
[akkoma]
/
lib
/
pleroma
/
web
/
metadata
/
utils.ex
diff --git
a/lib/pleroma/web/metadata/utils.ex
b/lib/pleroma/web/metadata/utils.ex
index a166800d4d28d4c54f2f46c57cbd53d7453384a9..720bd451968f51167abdaeaca39def5843d12a74 100644
(file)
--- a/
lib/pleroma/web/metadata/utils.ex
+++ b/
lib/pleroma/web/metadata/utils.ex
@@
-1,10
+1,10
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright
\xc2\xa9
2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright
©
2017-2019 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Metadata.Utils do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Metadata.Utils do
- alias Pleroma.HTML
alias Pleroma.Formatter
alias Pleroma.Formatter
+ alias Pleroma.HTML
alias Pleroma.Web.MediaProxy
def scrub_html_and_truncate(%{data: %{"content" => content}} = object) do
alias Pleroma.Web.MediaProxy
def scrub_html_and_truncate(%{data: %{"content" => content}} = object) do
@@
-12,19
+12,19
@@
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 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
|> Formatter.demojify()
|> 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()
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
end
def attachment_url(url) do
@@
-39,4
+39,11
@@
defmodule Pleroma.Web.Metadata.Utils do
"(@#{user.nickname})"
end
end
"(@#{user.nickname})"
end
end
+
+ @spec fetch_media_type(list(String.t()), String.t()) :: String.t() | nil
+ def fetch_media_type(supported_types, media_type) do
+ Enum.find(supported_types, fn support_type ->
+ String.starts_with?(media_type, support_type)
+ end)
+ end
end
end