From 583e0fac537c022145725d17105101b981d8e04f Mon Sep 17 00:00:00 2001
From: Alex Kirk <akirk@users.noreply.github.com>
Date: Fri, 21 Feb 2025 15:00:25 +0100
Subject: [PATCH] Delete old posts after processing items

---
 friends.php             |  2 +-
 includes/class-feed.php | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/friends.php b/friends.php
index 1ac13d3a..5d8d20f4 100644
--- a/friends.php
+++ b/friends.php
@@ -60,7 +60,7 @@
 add_action( 'plugins_loaded', array( __NAMESPACE__ . '\Friends', 'init' ) );
 add_action( 'admin_init', array( __NAMESPACE__ . '\Plugin_Installer', 'register_hooks' ) );
 
-if ( is_admin() && FRIENDS_VERSION > get_option( 'friends_plugin_version' ) ) {
+if ( is_admin() && version_compare( get_option( 'friends_plugin_version' ), FRIENDS_VERSION, '<' ) ) {
 	add_action( 'admin_init', array( __NAMESPACE__ . '\Friends', 'upgrade_plugin' ) );
 }
 
diff --git a/includes/class-feed.php b/includes/class-feed.php
index 549a2f6b..7775cea0 100644
--- a/includes/class-feed.php
+++ b/includes/class-feed.php
@@ -120,10 +120,6 @@ public function cron_friends_refresh_feeds() {
 			$feed->set_polling_now();
 			$this->retrieve_feed( $feed );
 			$feed->was_polled();
-			$friend_user = $feed->get_friend_user();
-			if ( $friend_user ) {
-				$friend_user->delete_outdated_posts();
-			}
 		}
 	}
 
@@ -144,7 +140,6 @@ public function friends_retrieve_user_feeds( $user_id ) {
 				$feed->set_polling_now();
 				$this->retrieve_feed( $feed );
 				$feed->was_polled();
-				$friend_user->delete_outdated_posts();
 			}
 		}
 	}
@@ -299,10 +294,6 @@ public function retrieve_friend_posts( $ignore_due_date = false ) {
 			$feed->set_polling_now();
 			$this->retrieve_feed( $feed );
 			$feed->was_polled();
-			$friend_user = $feed->get_friend_user();
-			if ( $friend_user ) {
-				$friend_user->delete_outdated_posts();
-			}
 		}
 	}
 
@@ -728,6 +719,8 @@ public function process_incoming_feed_items( array $items, User_Feed $user_feed
 
 		do_action( 'friends_retrieved_new_posts', $user_feed, $new_posts, $modified_posts, $friend_user );
 
+		$friend_user->delete_outdated_posts();
+
 		return $new_posts;
 	}