From 505b3360cb4a6d7ad611363f6b2f6d236e879b6a Mon Sep 17 00:00:00 2001
From: Benjamin Brahmer <info@b-brahmer.de>
Date: Wed, 12 Oct 2022 08:35:46 +0200
Subject: [PATCH] Remove setting for minimum purge interval setting

Signed-off-by: Benjamin Brahmer <info@b-brahmer.de>
---
 CHANGELOG.md                           |  1 +
 lib/AppInfo/Application.php            |  1 -
 src/components/AdminSettings.vue       |  7 -------
 tests/Unit/Service/FeedServiceTest.php | 11 -----------
 4 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 566482276..b0f7ee452 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ The format is mostly based on [Keep a Changelog](https://keepachangelog.com/en/1
 ### Changed
 
 ### Fixed
+- Remove setting for minimum purge interval since it is not used.
 
 # Releases
 ## [18.3.0-beta1] - 2022-10-10
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index 9212cf6ca..950d44383 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -53,7 +53,6 @@ class Application extends App implements IBootstrap
      * List of default settings
      */
     public const DEFAULT_SETTINGS = [
-        'autoPurgeMinimumInterval' => 60,
         'autoPurgeCount'           => 200,
         'purgeUnread'              => false,
         'maxRedirects'             => 10,
diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
index 349c27d5c..5be7a6823 100644
--- a/src/components/AdminSettings.vue
+++ b/src/components/AdminSettings.vue
@@ -14,12 +14,6 @@ SPDX-Licence-Identifier: AGPL-3.0-or-later
 		</NcCheckboxRadioSwitch>
 		<p><em>{{ t('news', 'Disable this if you use a custom updater.') }}</em></p>
 
-		<NcTextField :value.sync="autoPurgeMinimumInterval"
-			:label="t('news', 'Purge interval')"
-			:label-visible="true"
-			@update:value="update('autoPurgeMinimumInterval', autoPurgeMinimumInterval)" />
-		<p><em>{{ t('news', 'Minimum amount of seconds after deleted feeds and folders are removed from the database; values below 60 seconds are ignored.') }}</em></p>
-
 		<NcTextField :value.sync="autoPurgeCount"
 			:label="t('news', 'Maximum read count per feed')"
 			:label-visible="true"
@@ -95,7 +89,6 @@ export default {
 	data() {
 		return {
 			useCronUpdates: loadState('news', 'useCronUpdates') === '1',
-			autoPurgeMinimumInterval: loadState('news', 'autoPurgeMinimumInterval'),
 			autoPurgeCount: loadState('news', 'autoPurgeCount'),
 			purgeUnread: loadState('news', 'purgeUnread') === '1',
 			maxRedirects: loadState('news', 'maxRedirects'),
diff --git a/tests/Unit/Service/FeedServiceTest.php b/tests/Unit/Service/FeedServiceTest.php
index f0c367b7a..bcc367f0c 100644
--- a/tests/Unit/Service/FeedServiceTest.php
+++ b/tests/Unit/Service/FeedServiceTest.php
@@ -67,11 +67,6 @@ class FeedServiceTest extends TestCase
      */
     private $time;
 
-    /**
-     * @var int
-     */
-    private $autoPurgeMinimumInterval;
-
     /**
      * @var \PHPUnit\Framework\MockObject\MockObject|\HTMLPurifier
      */
@@ -98,7 +93,6 @@ class FeedServiceTest extends TestCase
             ->disableOriginalConstructor()
             ->getMock();
         $this->time = 222;
-        $this->autoPurgeMinimumInterval = 10;
         $timeFactory = $this->getMockBuilder(Time::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -131,10 +125,6 @@ class FeedServiceTest extends TestCase
         $config = $this->getMockBuilder(IConfig::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $config->expects($this->any())
-            ->method('getAppValue')
-            ->with('news', 'autoPurgeMinimumInterval')
-            ->will($this->returnValue($this->autoPurgeMinimumInterval));
 
         $this->class = new FeedServiceV2(
             $this->mapper,
@@ -654,7 +644,6 @@ class FeedServiceTest extends TestCase
         $feed2->setId(5);
         $feeds = [$feed1, $feed2];
 
-        $time = $this->time - $this->autoPurgeMinimumInterval;
 
         $this->mapper->expects($this->exactly(1))
             ->method('purgeDeleted')