From 6bb45a87268157aab961a6a4a728d9a9bbe043b0 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Fri, 15 Dec 2023 23:04:29 +0100
Subject: Add filter actions (auto mark read) at category and global levels
 (#5942)

* Add filter actions (auto mark read) at category level
fix https://github.com/FreshRSS/FreshRSS/issues/3497

* Add filter actions (auto mark read) at global level
fix https://github.com/FreshRSS/FreshRSS/issues/2788

* Fix feed category ID

* Minor comment
---
 app/views/category/update.phtml         | 10 ++++++++++
 app/views/configure/reading.phtml       | 15 +++++++++++++++
 app/views/helpers/category/update.phtml | 22 +++++++++++++++++++++-
 app/views/subscription/category.phtml   | 10 ----------
 app/views/subscription/index.phtml      |  2 +-
 5 files changed, 47 insertions(+), 12 deletions(-)
 create mode 100644 app/views/category/update.phtml
 delete mode 100644 app/views/subscription/category.phtml

(limited to 'app/views')

diff --git a/app/views/category/update.phtml b/app/views/category/update.phtml
new file mode 100644
index 000000000..daf4523bb
--- /dev/null
+++ b/app/views/category/update.phtml
@@ -0,0 +1,10 @@
+<?php
+declare(strict_types=1);
+/** @var FreshRSS_View $this */
+
+if (!Minz_Request::paramBoolean('ajax')) {
+	$this->partial('aside_subscription');
+}
+if ($this->category) {
+	$this->renderHelper('category/update');
+}
diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml
index 5f22d4daf..94cf51977 100644
--- a/app/views/configure/reading.phtml
+++ b/app/views/configure/reading.phtml
@@ -345,6 +345,21 @@
 			</div>
 		</fieldset>
 
+		<fieldset>
+			<legend><?= _t('sub.feed.filteractions') ?></legend>
+			<div class="form-group">
+				<label class="group-name" for="filteractions_read"><?= _t('conf.reading.read.when') ?></label>
+				<div class="group-controls">
+					<textarea name="filteractions_read" id="filteractions_read" class="w100"><?php
+						foreach (FreshRSS_Context::$user_conf->filtersAction('read') as $filterRead) {
+							echo $filterRead->getRawInput(), PHP_EOL;
+						}
+					?></textarea>
+					<p class="help"><?= _i('help') ?> <?= _t('sub.feed.filteractions.help') ?></p>
+				</div>
+			</div>
+		</fieldset>
+
 		<fieldset>
 			<legend><?= _t('conf.reading.headline.misc') ?></legend>
 			<div class="form-group">
diff --git a/app/views/helpers/category/update.phtml b/app/views/helpers/category/update.phtml
index 4e3b7ae9e..68132ad27 100644
--- a/app/views/helpers/category/update.phtml
+++ b/app/views/helpers/category/update.phtml
@@ -12,7 +12,7 @@
 		<a href="<?= _url('index', 'index', 'get', 'c_' . $this->category->id()) ?>"><?= _i('link') ?> <?= _t('gen.action.filter') ?></a>
 	</div>
 
-	<form method="post" action="<?= _url('subscription', 'category', 'id', $this->category->id(), '#', 'slider') ?>" autocomplete="off">
+	<form method="post" action="<?= _url('category', 'update', 'id', $this->category->id(), '#', 'slider') ?>" autocomplete="off">
 		<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
 
 		<legend><?= _t('sub.category.information') ?></legend>
@@ -68,6 +68,26 @@
 		</div>
 		<?php endif; ?>
 
+		<legend><?= _t('sub.feed.filteractions') ?></legend>
+		<div class="form-group">
+			<label class="group-name" for="filteractions_read"><?= _t('conf.reading.read.when') ?></label>
+			<div class="group-controls">
+				<textarea name="filteractions_read" id="filteractions_read" class="w100"><?php
+					foreach ($this->category->filtersAction('read') as $filterRead) {
+						echo $filterRead->getRawInput(), PHP_EOL;
+					}
+				?></textarea>
+				<p class="help"><?= _i('help') ?> <?= _t('sub.feed.filteractions.help') ?></p>
+			</div>
+		</div>
+
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<button type="submit" class="btn btn-important"><?= _t('gen.action.submit') ?></button>
+				<button type="reset" class="btn"><?= _t('gen.action.cancel') ?></button>
+			</div>
+		</div>
+
 		<legend><?= _t('sub.category.archiving') ?></legend>
 		<?php
 			$archiving = $this->category->attributes('archiving');
diff --git a/app/views/subscription/category.phtml b/app/views/subscription/category.phtml
deleted file mode 100644
index daf4523bb..000000000
--- a/app/views/subscription/category.phtml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-declare(strict_types=1);
-/** @var FreshRSS_View $this */
-
-if (!Minz_Request::paramBoolean('ajax')) {
-	$this->partial('aside_subscription');
-}
-if ($this->category) {
-	$this->renderHelper('category/update');
-}
diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index 280799f2d..a1a874b31 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -34,7 +34,7 @@
 		?>
 		<div class="box">
 			<div class="box-title">
-				<a class="configure open-slider" href="<?= _url('subscription', 'category', 'id', $cat->id()) ?>" data-cat-position="<?= $cat->attributes('position') ?>"><?= _i('configure') ?></a>
+				<a class="configure open-slider" href="<?= _url('category', 'update', 'id', $cat->id()) ?>" data-cat-position="<?= $cat->attributes('position') ?>"><?= _i('configure') ?></a>
 				<h2><?= $cat->name() ?><?php if ($cat->kind() == FreshRSS_Category::KIND_DYNAMIC_OPML) { echo " " . _i('opml-dyn'); } ?></h2>
 			</div>
 			<ul class="box-content drop-zone scrollbar-thin" dropzone="move" data-cat-id="<?= $cat->id() ?>">
-- 
cgit v1.2.3