diff options
| author | lain <lain@soykaf.club> | 2020-02-18 14:56:59 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-02-18 14:56:59 +0000 |
| commit | cf8307e71c3f68bc26a540783a3ca26766b3b56c (patch) | |
| tree | 27465edf4490c4ffefae5ad74fd14b4393fc4c81 /lib | |
| parent | 3fa2ac68df10f6ffe3c1ea76fa10c30da90f4bd0 (diff) | |
| parent | ca7ac068f0d7e6b39f4563bbe8aa987449592909 (diff) | |
| download | pleroma-cf8307e71c3f68bc26a540783a3ca26766b3b56c.tar.gz | |
Merge branch 'fix/status-view/expires_at' into 'develop'
Fix `status.expires_at` type
Closes #1573
See merge request pleroma/pleroma!2222
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/status_view.ex | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex index d4695c1c6..6b0fe9215 100644 --- 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, - expiration when not is_nil(expiration) <- + %ActivityExpiration{scheduled_at: scheduled_at} <- ActivityExpiration.get_by_activity_id(activity.id) do - expiration.scheduled_at + scheduled_at + else + _ -> nil end thread_muted? = |