projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
web
/
metadata
/
utils.ex
diff --git
a/lib/pleroma/web/metadata/utils.ex
b/lib/pleroma/web/metadata/utils.ex
index 23bbde1a62345ba51c04209fb575ef822d6f234d..382ecf426cdcea8c7675422827bca4051be2dd00 100644
(file)
--- a/
lib/pleroma/web/metadata/utils.ex
+++ b/
lib/pleroma/web/metadata/utils.ex
@@
-3,6
+3,7
@@
# 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.Emoji
alias Pleroma.Formatter
alias Pleroma.HTML
alias Pleroma.Web.MediaProxy
alias Pleroma.Formatter
alias Pleroma.HTML
alias Pleroma.Web.MediaProxy
@@
-12,8
+13,8
@@
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__
)
- |> Formatter.demojify()
+ |> HTML.get_cached_stripped_html_for_
activity(object, "metadata"
)
+ |>
Emoji.
Formatter.demojify()
|> Formatter.truncate()
end
|> Formatter.truncate()
end
@@
-23,7
+24,7
@@
defmodule Pleroma.Web.Metadata.Utils do
|> HtmlEntities.decode()
|> String.replace(~r/<br\s?\/?>/, " ")
|> HTML.strip_tags()
|> HtmlEntities.decode()
|> String.replace(~r/<br\s?\/?>/, " ")
|> HTML.strip_tags()
- |> Formatter.demojify()
+ |>
Emoji.
Formatter.demojify()
|> Formatter.truncate(max_length)
end
|> Formatter.truncate(max_length)
end
@@
-39,4
+40,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