projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix `status.expires_at` type
[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 e1e92034f04b00f985c8784a095a66012aae4826..6b0fe921531621224926af185bde5740e7b714f1 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/status_view.ex
@@
-175,9
+175,11
@@
defmodule Pleroma.Web.MastodonAPI.StatusView do
expires_at =
with true <- client_posted_this_activity,
expires_at =
with true <- client_posted_this_activity,
-
expiration when not is_nil(expiration)
<-
+
%ActivityExpiration{scheduled_at: scheduled_at}
<-
ActivityExpiration.get_by_activity_id(activity.id) do
ActivityExpiration.get_by_activity_id(activity.id) do
- expiration.scheduled_at
+ scheduled_at
+ else
+ _ -> nil
end
thread_muted? =
end
thread_muted? =
@@
-321,11
+323,9
@@
defmodule Pleroma.Web.MastodonAPI.StatusView do
nil
end
nil
end
- site_name = rich_media[:site_name] || page_url_data.host
-
%{
type: "link",
%{
type: "link",
- provider_name:
site_name
,
+ provider_name:
page_url_data.host
,
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(),