pleroma

commit: 61ba54897ee727527b31c5f18ac599a7f788d63b
parent 21720db8596a50d84200db5c564267cfe992580d
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Fri, 13 Aug 2021 15:42:12 +0000

Merge branch 'streamer-crash-fix' into 'develop'

Streamer crash fix

See merge request pleroma/pleroma!3508
Diffstat:
M
lib/pleroma/web/mastodon_api/views/status_view.ex
14
+++++++++++---

1 file 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
@@ -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]