fix: missing filtering on personal feed

TaggrNetwork · Apr 19, 2024 · 7d7de4b · 7d7de4b
1 parent 26f2d15
commit 7d7de4b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/src/backend/env/mod.rs b/src/backend/env/mod.rs
@@ -4208,7 +4208,7 @@ pub(crate) mod tests {
             assert!(state
                 .user(&user_id.to_string())
                 .unwrap()
-                .personal_feed(state, 0, 0)
+                .personal_feed(state, 0)
                 .next()
                 .is_none());
 
@@ -4221,7 +4221,7 @@ pub(crate) mod tests {
                 .users
                 .get(&user_id)
                 .unwrap()
-                .personal_feed(state, 0, 0)
+                .personal_feed(state, 0)
                 .map(|post| post.id)
                 .collect::<Vec<_>>();
             assert_eq!(feed.len(), 1);
@@ -4238,7 +4238,7 @@ pub(crate) mod tests {
                 .users
                 .get(&user_id)
                 .unwrap()
-                .personal_feed(state, 0, 0)
+                .personal_feed(state, 0)
                 .map(|post| post.id)
                 .collect::<Vec<_>>();
             assert_eq!(feed.len(), 1);
@@ -4264,7 +4264,7 @@ pub(crate) mod tests {
                 .users
                 .get(&user_id)
                 .unwrap()
-                .personal_feed(state, 0, 0)
+                .personal_feed(state, 0)
                 .map(|post| post.id)
                 .collect::<Vec<_>>();
             assert_eq!(feed.len(), 2);
@@ -4291,7 +4291,7 @@ pub(crate) mod tests {
                 .users
                 .get(&user_id)
                 .unwrap()
-                .personal_feed(state, 0, 0)
+                .personal_feed(state, 0)
                 .map(|post| post.id)
                 .collect::<Vec<_>>();
             assert_eq!(feed.len(), 2);
@@ -4307,7 +4307,7 @@ pub(crate) mod tests {
                 .users
                 .get(&user_id)
                 .unwrap()
-                .personal_feed(state, 0, 0)
+                .personal_feed(state, 0)
                 .map(|post| post.id)
                 .collect::<Vec<_>>();
             assert_eq!(feed.len(), 3);
@@ -4322,7 +4322,7 @@ pub(crate) mod tests {
                 .users
                 .get(&user_id)
                 .unwrap()
-                .personal_feed(state, 0, 0)
+                .personal_feed(state, 0)
                 .map(|post| post.id)
                 .collect::<Vec<_>>();
             assert_eq!(feed.len(), 2);
@@ -4336,7 +4336,7 @@ pub(crate) mod tests {
                 .users
                 .get(&user_id)
                 .unwrap()
-                .personal_feed(state, 0, 0)
+                .personal_feed(state, 0)
                 .map(|post| post.id)
                 .collect::<Vec<_>>();
             assert!(feed.contains(&post_id));
@@ -4347,7 +4347,7 @@ pub(crate) mod tests {
                 .users
                 .get(&user_id)
                 .unwrap()
-                .personal_feed(state, 0, 0)
+                .personal_feed(state, 0)
                 .map(|post| post.id)
                 .collect::<Vec<_>>();
             assert!(!feed.contains(&post_id));

diff --git a/src/backend/env/user.rs b/src/backend/env/user.rs
@@ -321,7 +321,6 @@ impl User {
     pub fn personal_feed<'a>(
         &'a self,
         state: &'a State,
-        page: usize,
         offset: PostId,
     ) -> Box<dyn Iterator<Item = &'a Post> + 'a> {
         let mut iterators: Vec<Box<dyn Iterator<Item = &'a Post> + 'a>> = self
@@ -336,8 +335,8 @@ impl User {
         }
 
         Box::new(
-            IteratorMerger::new(MergeStrategy::Or, iterators.into_iter().collect())
-                .filter(move |post| {
+            IteratorMerger::new(MergeStrategy::Or, iterators.into_iter().collect()).filter(
+                move |post| {
                     self.followees.contains(&post.user)
                         || !post.matches_filters(&self.filters)
                             && post
@@ -347,9 +346,8 @@ impl User {
                                     self.show_posts_in_realms || self.realms.contains(realm_id)
                                 })
                                 .unwrap_or(true)
-                })
-                .skip(page * CONFIG.feed_page_size)
-                .take(CONFIG.feed_page_size),
+                },
+            ),
         )
     }
 

diff --git a/src/backend/queries.rs b/src/backend/queries.rs
@@ -499,7 +499,10 @@ fn personal_feed() {
         reply(match state.principal_to_user(caller()) {
             None => Default::default(),
             Some(user) => user
-                .personal_feed(state, page, offset)
+                .personal_feed(state, offset)
+                .filter(|post| personal_filter(state, Some(user), post))
+                .skip(page * CONFIG.feed_page_size)
+                .take(CONFIG.feed_page_size)
                 .map(|post| post.with_meta(state))
                 .collect::<Vec<_>>(),
         })