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 'remotes/origin/develop' into media-preview-proxy-nostream
[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 0882d680e63aefcc833544eb34f2d2250e09e4d1..4f7f27f35df601476a1f14d36c92339e97c10721 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/status_view.ex
@@
-8,7
+8,6
@@
defmodule Pleroma.Web.MastodonAPI.StatusView do
require Pleroma.Constants
alias Pleroma.Activity
require Pleroma.Constants
alias Pleroma.Activity
- alias Pleroma.ActivityExpiration
alias Pleroma.HTML
alias Pleroma.Object
alias Pleroma.Repo
alias Pleroma.HTML
alias Pleroma.Object
alias Pleroma.Repo
@@
-245,8
+244,8
@@
defmodule Pleroma.Web.MastodonAPI.StatusView do
expires_at =
with true <- client_posted_this_activity,
expires_at =
with true <- client_posted_this_activity,
- %
ActivityExpiration
{scheduled_at: scheduled_at} <-
-
ActivityExpiration.get_by_activity_id
(activity.id) do
+ %
Oban.Job
{scheduled_at: scheduled_at} <-
+
Pleroma.Workers.PurgeExpiredActivity.get_expiration
(activity.id) do
scheduled_at
else
_ -> nil
scheduled_at
else
_ -> nil