sergiotarxz
/
Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bug when no posts are in the db.

This commit is contained in:
Roger Braun 2017-11-05 12:05:25 +01:00
parent 8a1a7191fd
commit 046bee34d3
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/activity_pub/activity_pub.ex
View File

@ -157,7 +157,7 @@ defp restrict_favorited_by(query, _), do: query
# Only search through last 100_000 activities by default # Only search through last 100_000 activities by default
defp restrict_recent(query, _) do 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, from activity in query,
where: activity.id > ^since where: activity.id > ^since

2
test/web/activity_pub/activity_pub_test.exs
View File

@ -82,6 +82,8 @@ test "retrieves activities that have a given context" do
describe "public fetch activities" do describe "public fetch activities" do
test "retrieves public activities" do test "retrieves public activities" do
activities = ActivityPub.fetch_public_activities
%{public: public} = ActivityBuilder.public_and_non_public %{public: public} = ActivityBuilder.public_and_non_public
activities = ActivityPub.fetch_public_activities activities = ActivityPub.fetch_public_activities