aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-08-13 10:25:42 -0500
committerAlex Gleason <alex@alexgleason.me>2021-08-13 10:25:42 -0500
commitb7bbf42acda9b26bc084f6655d6bc6f1a4a1bac5 (patch)
tree4892e93d82da84cccf6eb8bd85c8d4220327052b
parentdc63aaf84f07a6f8042f43617d8ec356fed85cec (diff)
downloadpleroma-b7bbf42acda9b26bc084f6655d6bc6f1a4a1bac5.tar.gz
Streamer: fix crash in MastodonAPI.StatusView
-rw-r--r--lib/pleroma/web/mastodon_api/views/status_view.ex14
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
index da44e0a74..463f34198 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -65,11 +65,19 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
defp get_context_id(_), do: nil
- defp reblogged?(activity, user) do
- object = Object.normalize(activity, fetch: false) || %{}
- present?(user && user.ap_id in (object.data["announcements"] || []))
+ # Check if the user reblogged this status
+ defp reblogged?(activity, %User{ap_id: ap_id}) do
+ with %Object{data: %{"announcements" => announcements}} when is_list(announcements) <-
+ Object.normalize(activity, fetch: false) do
+ ap_id in announcements
+ else
+ _ -> false
+ end
end
+ # False if the user is logged out
+ defp reblogged?(_activity, _user), do: false
+
def render("index.json", opts) do
reading_user = opts[:for]