projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
credo fix
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
status_view.ex
diff --git
a/lib/pleroma/web/mastodon_api/views/status_view.ex
b/lib/pleroma/web/mastodon_api/views/status_view.ex
index 8e37150931a9c4c3a0ab7c1ff510e226c5091e49..2c49bedb36760f23698836d988eb952845b9c982 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/status_view.ex
@@
-377,8
+377,8
@@
defmodule Pleroma.Web.MastodonAPI.StatusView do
page_url_data = URI.parse(page_url)
page_url_data =
page_url_data = URI.parse(page_url)
page_url_data =
- if
rich_media[:url] != nil
do
- URI.merge(page_url_data, URI.parse(rich_media[
:url
]))
+ if
is_binary(rich_media["url"])
do
+ URI.merge(page_url_data, URI.parse(rich_media[
"url"
]))
else
page_url_data
end
else
page_url_data
end
@@
-386,11
+386,9
@@
defmodule Pleroma.Web.MastodonAPI.StatusView do
page_url = page_url_data |> to_string
image_url =
page_url = page_url_data |> to_string
image_url =
- if
rich_media[:image] != nil
do
- URI.merge(page_url_data, URI.parse(rich_media[
:image
]))
+ if
is_binary(rich_media["image"])
do
+ URI.merge(page_url_data, URI.parse(rich_media[
"image"
]))
|> to_string
|> to_string
- else
- nil
end
%{
end
%{
@@
-399,8
+397,8
@@
defmodule Pleroma.Web.MastodonAPI.StatusView do
provider_url: page_url_data.scheme <> "://" <> page_url_data.host,
url: page_url,
image: image_url |> MediaProxy.url(),
provider_url: page_url_data.scheme <> "://" <> page_url_data.host,
url: page_url,
image: image_url |> MediaProxy.url(),
- title: rich_media[
:title
] || "",
- description: rich_media[
:description
] || "",
+ title: rich_media[
"title"
] || "",
+ description: rich_media[
"description"
] || "",
pleroma: %{
opengraph: rich_media
}
pleroma: %{
opengraph: rich_media
}