From: Egor Kislitsyn Date: Tue, 18 Feb 2020 10:52:11 +0000 (+0400) Subject: Fix `status.expires_at` type X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=2ef70b55f528d0e18e52b99c36400109f52b8262;p=akkoma Fix `status.expires_at` type --- 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? =