From bb0607b9595aca220dde4334ae13c930349f7a88 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Mon, 1 Jun 2020 23:00:49 -0400 Subject: [PATCH] Actually fix pagination with tombstoned items --- lib/frenzy_web/controllers/feed_controller.ex | 2 +- lib/frenzy_web/controllers/group_controller.ex | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/frenzy_web/controllers/feed_controller.ex b/lib/frenzy_web/controllers/feed_controller.ex index c66fcb5..1ef8e86 100644 --- a/lib/frenzy_web/controllers/feed_controller.ex +++ b/lib/frenzy_web/controllers/feed_controller.ex @@ -30,7 +30,7 @@ defmodule FrenzyWeb.FeedController do items = Item - |> where([i], i.feed_id == ^id) + |> where([i], not i.tombstone and i.feed_id == ^id) |> Paginator.paginate(params) |> limit(50) |> Repo.all() diff --git a/lib/frenzy_web/controllers/group_controller.ex b/lib/frenzy_web/controllers/group_controller.ex index 4fdcdcd..0ab0a97 100644 --- a/lib/frenzy_web/controllers/group_controller.ex +++ b/lib/frenzy_web/controllers/group_controller.ex @@ -103,7 +103,7 @@ defmodule FrenzyWeb.GroupController do items = Item - |> where([i], i.feed_id in ^feed_ids) + |> where([i], not i.tombstone and i.feed_id in ^feed_ids) |> Paginator.paginate(params) |> limit(50) |> preload(:feed)