Issue #267 - follow-up fix

swentel · Dec 9, 2018 · d283b71 · d283b71
1 parent 89c4143
commit d283b71
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/modules/indieweb_microsub/src/Entity/Storage/MicrosubItemStorage.php b/modules/indieweb_microsub/src/Entity/Storage/MicrosubItemStorage.php
@@ -172,6 +172,7 @@ public function removeItemsBySourceOlderThanTimestamp($timestamp, $source_id) {
       ->delete('microsub_item')
       ->condition('timestamp', $timestamp, '<')
       ->condition('source_id', $source_id)
+      ->condition('is_read', 1)
       ->execute();
   }
 

diff --git a/modules/indieweb_microsub/src/Entity/Storage/MicrosubItemStorageInterface.php b/modules/indieweb_microsub/src/Entity/Storage/MicrosubItemStorageInterface.php
@@ -107,9 +107,9 @@ public function updateItemsToNewChannel($source_id, $channel_id);
   public function itemExists($source_id, $guid);
 
   /**
-   * Removes items by source and older than created time.
+   * Removes items by source and older than created time and is unread.
    *
-   * @param $created
+   * @param $timestamp
    *   The microsub item created time
    * @param $source_id
    *   The source id

diff --git a/modules/indieweb_microsub/src/MicrosubClient/MicrosubClient.php b/modules/indieweb_microsub/src/MicrosubClient/MicrosubClient.php
@@ -33,7 +33,7 @@ public function fetchItems() {
       $url = $source->label();
       $tries = $source->getTries();
       $item_count = $source->getItemCount();
-      $empty = $item_count== 0;
+      $empty = $item_count == 0;
       $source_id = $source->id();
       $channel_id = $source->getChannelId();
       $disable_image_cache = $source->disableImageCache();
@@ -94,7 +94,7 @@ public function fetchItems() {
 
             // Cleanup old items if we can. We do this here because it doesn't
             // make much sense to check this if the hash hasn't changed.
-            if (!$empty && $cleanup_old_items && $items_in_feed && $items_to_keep && $items_in_feed >= $item_count) {
+            if (!$empty && $cleanup_old_items && $items_in_feed && $items_to_keep && $item_count >= $items_to_keep) {
               // We use two queries as not all mysql servers understand limits
               // in sub queries when the main query is a delete.
               $timestamp = \Drupal::entityTypeManager()->getStorage('indieweb_microsub_item')->getTimestampByRangeAndSource($items_to_keep, $source_id);
@@ -395,4 +395,4 @@ protected function getAuthor(&$post, $webmention) {
     }
   }
 
-}
+}