Simplified refresh system, made feed expiry configurable

Author: ssddanbrown

README.md

@@ -148,6 +148,11 @@ APP_CONFIG_FILE=/app/storage/feeds.txt
 # when posts are fetched.
 # Defaults to true.
 APP_LOAD_POST_THUMBNAILS=true
+
+# The number of minutes before a feed is considered outdated and
+# therefore should be updated upon request.
+# This effectively has a minimum of 5 minutes in the docker setup.
+APP_FEED_UPDATE_FREQUENCY=60
 ```
 
 ## Manual Install

app/Config/ConfiguredFeed.php

@@ -32,7 +32,8 @@ public function jsonSerialize(): mixed
 
     public function isOutdated(): bool
     {
-        $expiry = time() - 3600;
+        $configFrequency = intval(config('app.feed_update_frequency'));
+        $expiry = time() - intval($configFrequency * 60);
         return $this->feed->last_fetched_at <= $expiry;
     }
 

app/Console/Commands/UpdateFeedsCommand.php

@@ -2,11 +2,8 @@
 
 namespace App\Console\Commands;
 
-use App\Jobs\RefreshFeedJob;
-use App\Models\Feed;
+use App\Config\ConfiguredFeedProvider;
 use Illuminate\Console\Command;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Collection;
 
 class UpdateFeedsCommand extends Command
 {
@@ -15,40 +12,24 @@ class UpdateFeedsCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'rss:update-outdated-feeds
-        {--all : Also update dormant feeds}
-        {--outdated-time=24 : Age (in hours) that\'s considered as outdated}';
+    protected $signature = 'rss:update-outdated-feeds';
 
     /**
      * The console command description.
      *
      * @var string
      */
-    protected $description = 'Trigger the processing of outdated feeds';
+    protected $description = 'Trigger the update of outdated feeds';
 
     /**
      * Execute the console command.
      *
      * @return int
      */
-    public function handle()
+    public function handle(ConfiguredFeedProvider $feedProvider)
     {
-        $queryDormant = $this->hasOption('all');
-        $dormantTime = time() - (86400 * 90); // 90 days
-        $outdatedTime = time() - ceil(floatval($this->option('outdated-time')) * 3600);
-        $dormantQuery = function(Builder $query) use ($dormantTime) {
-            $query->where('last_accessed_at', '>', $dormantTime);
-        };
-
-        Feed::query()
-            ->when(!$queryDormant, $dormantQuery)
-            ->where('last_fetched_at', '<', $outdatedTime)
-            ->chunk(100, function(Collection $feeds) {
-                /** @var Feed $feed */
-                foreach ($feeds as $feed) {
-                    dispatch(new RefreshFeedJob($feed));
-                }
-            });
+        $feeds = $feedProvider->getAll();
+        $feeds->reloadOutdatedFeeds();
 
         return 0;
     }

app/Console/Kernel.php

@@ -16,7 +16,7 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        $schedule->command(UpdateFeedsCommand::class, ['--outdated-time=0'])->hourly();
+        $schedule->command(UpdateFeedsCommand::class)->everyFiveMinutes();
     }
 
     /**

config/app.php

@@ -44,6 +44,20 @@
     'load_post_thumbnails' => env('APP_LOAD_POST_THUMBNAILS', true),
 
 
+    /*
+    |--------------------------------------------------------------------------
+    | Application Feed Update Frequency
+    |--------------------------------------------------------------------------
+    |
+    | This value specifies how often a feed should be updated. This is not a
+    | specific guarantee of update on this interval but instead the age in
+    | minutes of when a feed would be considered outdated.
+    |
+    */
+
+    'feed_update_frequency' => env('APP_FEED_UPDATE_FREQUENCY', 60),
+
+
     /*
     |--------------------------------------------------------------------------
     | Application Environment

phpunit.xml

@@ -26,5 +26,7 @@
         <env name="QUEUE_CONNECTION" value="sync"/>
         <env name="SESSION_DRIVER" value="array"/>
         <env name="TELESCOPE_ENABLED" value="false"/>
+        <env name="APP_FEED_UPDATE_FREQUENCY" value="60"/>
+        <env name="APP_LOAD_POST_THUMBNAILS" value="true"/>
     </php>
 </phpunit>

tests/Feature/ConfiguredFeedTest.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace Tests\Feature;
+
+use App\Config\ConfiguredFeed;
+use App\Jobs\RefreshFeedJob;
+use App\Models\Feed;
+use Illuminate\Support\Facades\Queue;
+use Tests\TestCase;
+
+class ConfiguredFeedTest extends TestCase
+{
+
+    public function test_is_outdated_can_be_controlled_by_config()
+    {
+        $now = time();
+        $feed = new Feed();
+        $feed->last_fetched_at = $now - (59 * 60);
+
+        $configuredFeed = new ConfiguredFeed(
+            $feed,
+            'My great feed',
+            'https://example.com',
+            '#fff',
+            ['#a']
+        );
+
+        config()->set('app.feed_update_frequency', 60);
+        $this->assertFalse($configuredFeed->isOutdated());
+
+        $feed->last_fetched_at = $now - (61 * 60);
+        $this->assertTrue($configuredFeed->isOutdated());
+
+        config()->set('app.feed_update_frequency', 5);
+        $feed->last_fetched_at = $now - (4 * 60);
+        $this->assertFalse($configuredFeed->isOutdated());
+
+        $feed->last_fetched_at = $now - (6 * 60);
+        $this->assertTrue($configuredFeed->isOutdated());
+    }
+
+    public function test_start_reloading_dispatched_refresh_job()
+    {
+        $configuredFeed = new ConfiguredFeed(
+            new Feed(),
+            'My great feed',
+            'https://example.com',
+            '#fff',
+            ['#a']
+        );
+        Queue::fake();
+
+        $configuredFeed->startReloading();
+        Queue::assertPushed(RefreshFeedJob::class);
+    }
+
+}