use a deleted flag for deleted feeds to handle undo

1 files changed, 16 insertions, 0 deletions

diff --git a/db/feedmapper.php b/db/feedmapper.php
index 9e371f1f0..438f2e78c 100644
--- a/db/feedmapper.php
+++ b/db/feedmapper.php
@@ -88,6 +88,7 @@ class FeedMapper extends Mapper implements IMapper {
 				'AND (`items`.`status` & ' . StatusFlag::UNREAD . ') = ' .
 				StatusFlag::UNREAD . ' ' .
 			'WHERE `feeds`.`user_id` = ? ' .
+			'AND `feeds`.`deleted_at` = 0 ' .
 			'GROUP BY `feeds`.`id`';
 		$params = array($userId);
 
@@ -137,5 +138,20 @@ class FeedMapper extends Mapper implements IMapper {
 	}
 
 
+	public function getToDelete($deleteOlderThan, $userId=null) {
+		$sql = 'SELECT * FROM `*PREFIX*news_feeds` ' .
+			'WHERE `deleted_at` > 0 ' .
+			'AND `deleted_at` < ?';
+		$params = array($deleteOlderThan);
+
+		// we need to sometimes only delete feeds of a user
+		if($userId !== null) {
+			$sql .= ' AND `user_id` = ?';
+			array_push($params, $userId);
+		}
+
+		return $this->findAllRows($sql, $params);
+	}
+
 
 }
\ No newline at end of file