projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'remove-twitter-api' into 'develop'
[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..fa9d695f306912fb176aa62087604b034a3d2804 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/status_view.ex
@@
-21,7
+21,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusView do
alias Pleroma.Web.MastodonAPI.StatusView
alias Pleroma.Web.MediaProxy
alias Pleroma.Web.MastodonAPI.StatusView
alias Pleroma.Web.MediaProxy
- import Pleroma.Web.ActivityPub.Visibility, only: [get_visibility: 1]
+ import Pleroma.Web.ActivityPub.Visibility, only: [get_visibility: 1
, visible_for_user?: 2
]
# TODO: Add cached version.
defp get_replied_to_activities([]), do: %{}
# TODO: Add cached version.
defp get_replied_to_activities([]), do: %{}
@@
-333,6
+333,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusView do
reblog: nil,
card: card,
content: content_html,
reblog: nil,
card: card,
content: content_html,
+ text: opts[:with_source] && object.data["source"],
created_at: created_at,
reblogs_count: announcement_count,
replies_count: object.data["repliesCount"] || 0,
created_at: created_at,
reblogs_count: announcement_count,
replies_count: object.data["repliesCount"] || 0,
@@
-364,7
+365,8
@@
defmodule Pleroma.Web.MastodonAPI.StatusView do
expires_at: expires_at,
direct_conversation_id: direct_conversation_id,
thread_muted: thread_muted?,
expires_at: expires_at,
direct_conversation_id: direct_conversation_id,
thread_muted: thread_muted?,
- emoji_reactions: emoji_reactions
+ emoji_reactions: emoji_reactions,
+ parent_visible: visible_for_user?(reply_to, opts[:for])
}
}
end
}
}
end
@@
-377,8
+379,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
+388,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
+399,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
}