projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'pleroma/develop' into instance-deletion
[akkoma]
/
lib
/
pleroma
/
web
/
metadata
/
utils.ex
diff --git
a/lib/pleroma/web/metadata/utils.ex
b/lib/pleroma/web/metadata/utils.ex
index bc31d66b9a7162b79cbee3c0c121f9df9709bcf4..caca429341b2ac3aed5b7d86d31b65e03f779469 100644
(file)
--- a/
lib/pleroma/web/metadata/utils.ex
+++ b/
lib/pleroma/web/metadata/utils.ex
@@
-7,7
+7,6
@@
defmodule Pleroma.Web.Metadata.Utils do
alias Pleroma.Emoji
alias Pleroma.Formatter
alias Pleroma.HTML
alias Pleroma.Emoji
alias Pleroma.Formatter
alias Pleroma.HTML
- alias Pleroma.Web.MediaProxy
def scrub_html_and_truncate(%{data: %{"content" => content}} = object) do
content
def scrub_html_and_truncate(%{data: %{"content" => content}} = object) do
content
@@
-38,10
+37,6
@@
defmodule Pleroma.Web.Metadata.Utils do
def scrub_html(content), do: content
def scrub_html(content), do: content
- def attachment_url(url) do
- MediaProxy.preview_url(url)
- end
-
def user_name_string(user) do
"#{user.name} " <>
if user.local do
def user_name_string(user) do
"#{user.name} " <>
if user.local do