Merge branch 'fix-tootdon-oauth' into 'develop'

[akkoma] / lib / pleroma / web / activity_pub / activity_pub.ex

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index db986f8f2f19b8176a421977f58c05a900264855..4f7be4293332cb09bc75e86e337fe8a1589e7d62 100644 (file)
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -158,14 +158,14 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
 
   # Only search through last 100_000 activities by default
   defp restrict_recent(query, _) do
-    since = Repo.aggregate(Activity, :max, :id) - 100_000
+    since = (Repo.aggregate(Activity, :max, :id) || 0) - 100_000
 
     from activity in query,
       where: activity.id > ^since
   end
 
-  defp restrict_blocked(query, %{"blocking_user" => user}) do
-    blocks = user.info["blocks"] || []
+  defp restrict_blocked(query, %{"blocking_user" => %User{info: info}}) do
+    blocks = info["blocks"] || []
     from activity in query,
       where: fragment("not (?->>'actor' = ANY(?))", activity.data, ^blocks)
   end