From 91496a0d24d58621503ae86ee217b0ce27d256f2 Mon Sep 17 00:00:00 2001
From: wn_ <invalid@email.com>
Date: Mon, 6 Jan 2025 00:25:56 +0000
Subject: Add the ability to copy an existing filter.

---
 classes/Pref_Filters.php | 71 ++++++++++++++++++++++++++++++++++++++++++++----
 js/PrefFilterTree.js     | 22 +++++++++++++++
 2 files changed, 87 insertions(+), 6 deletions(-)

diff --git a/classes/Pref_Filters.php b/classes/Pref_Filters.php
index f3a39f0e5..5d1221df4 100644
--- a/classes/Pref_Filters.php
+++ b/classes/Pref_Filters.php
@@ -505,6 +505,25 @@ class Pref_Filters extends Handler_Protected {
 		$sth->execute([...$ids, $_SESSION['uid']]);
 	}
 
+	private function _copy_rules_and_actions(int $filter_id, ?int $src_filter_id = null): bool {
+		$sth = $this->pdo->prepare('INSERT INTO ttrss_filters2_rules
+					(filter_id, reg_exp, inverse, filter_type, feed_id, cat_id, match_on, cat_filter)
+					SELECT :filter_id, reg_exp, inverse, filter_type, feed_id, cat_id, match_on, cat_filter
+					FROM ttrss_filters2_rules
+					WHERE filter_id = :src_filter_id');
+
+		if (!$sth->execute(['filter_id' => $filter_id, 'src_filter_id' => $src_filter_id]))
+			return false;
+
+		$sth = $this->pdo->prepare('INSERT INTO ttrss_filters2_actions
+			(filter_id, action_id, action_param)
+			SELECT :filter_id, action_id, action_param
+			FROM ttrss_filters2_actions
+			WHERE filter_id = :src_filter_id');
+
+		return $sth->execute(['filter_id' => $filter_id, 'src_filter_id' => $src_filter_id]);
+	}
+
 	private function _save_rules_and_actions(int $filter_id): void {
 
 		$sth = $this->pdo->prepare("DELETE FROM ttrss_filters2_rules WHERE filter_id = ?");
@@ -587,11 +606,24 @@ class Pref_Filters extends Handler_Protected {
 		}
 	}
 
-	function add(): void {
-		$enabled = checkbox_to_sql_bool($_REQUEST["enabled"] ?? false);
-		$match_any_rule = checkbox_to_sql_bool($_REQUEST["match_any_rule"] ?? false);
-		$title = clean($_REQUEST["title"]);
-		$inverse = checkbox_to_sql_bool($_REQUEST["inverse"] ?? false);
+	/**
+	 * @param null|array{'src_filter_id': int, 'title': string, 'enabled': 0|1, 'match_any_rule': 0|1, 'inverse': 0|1} $props
+	 */
+	function add(?array $props = null): void {
+		if ($props === null) {
+			$src_filter_id = null;
+			$title = clean($_REQUEST['title']);
+			$enabled = checkbox_to_sql_bool($_REQUEST['enabled'] ?? false);
+			$match_any_rule = checkbox_to_sql_bool($_REQUEST['match_any_rule'] ?? false);
+			$inverse = checkbox_to_sql_bool($_REQUEST['inverse'] ?? false);
+		} else {
+			// see checkbox_to_sql_bool() for 0 vs false justification
+			$src_filter_id = $props['src_filter_id'];
+			$title = clean($props['title']);
+			$enabled = $props['enabled'];
+			$match_any_rule = $props['match_any_rule'];
+			$inverse = $props['inverse'];
+		}
 
 		$this->pdo->beginTransaction();
 
@@ -609,12 +641,37 @@ class Pref_Filters extends Handler_Protected {
 
 		if ($row = $sth->fetch()) {
 			$filter_id = $row['id'];
-			$this->_save_rules_and_actions($filter_id);
+
+			if ($src_filter_id === null)
+				$this->_save_rules_and_actions($filter_id);
+			else
+				$this->_copy_rules_and_actions($filter_id, $src_filter_id);
 		}
 
 		$this->pdo->commit();
 	}
 
+	function copy(): void {
+		/** @var array<int, int> */
+		$src_filter_ids = array_map('intval', array_filter(explode(',', clean($_REQUEST['ids'] ?? ''))));
+
+		$src_filters = ORM::for_table('ttrss_filters2')
+			->where('owner_uid', $_SESSION['uid'])
+			->where_id_in($src_filter_ids)
+			->find_many();
+
+		foreach ($src_filters as $src_filter) {
+			// see checkbox_to_sql_bool() for 0+1 justification
+			$this->add([
+				'src_filter_id' => $src_filter->id,
+				'title' => sprintf(__('Copy of %s'), $src_filter->title),
+				'enabled' => 0,
+				'match_any_rule' => $src_filter->match_any_rule ? 1 : 0,
+				'inverse' => $src_filter->inverse ? 1 : 0,
+			]);
+		}
+	}
+
 	function index(): void {
 		if (array_key_exists("search", $_REQUEST)) {
 			$filter_search = clean($_REQUEST["search"]);
@@ -649,6 +706,8 @@ class Pref_Filters extends Handler_Protected {
 
 					<button dojoType="dijit.form.Button" onclick="return Filters.edit()">
 						<?= __('Create filter') ?></button>
+					<button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').copySelectedFilters()">
+						<?= __('Copy') ?></button>
 					<button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').joinSelectedFilters()">
 						<?= __('Combine') ?></button>
 					<button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').removeSelectedFilters()">
diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js
index 4ccddfa75..10c4d7de3 100644
--- a/js/PrefFilterTree.js
+++ b/js/PrefFilterTree.js
@@ -165,6 +165,28 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 				alert(__("No filters selected."));
 			}
 
+			return false;
+		},
+		copySelectedFilters: function() {
+			const sel_rows = this.getSelectedFilters();
+
+			if (sel_rows.length > 0) {
+				if (confirm(__("Copy selected filters?"))) {
+					Notify.progress("Copying selected filters...");
+
+					const query = {
+						op: "Pref_Filters", method: "copy",
+						ids: sel_rows.toString()
+					};
+
+					xhr.post("backend.php", query, () => {
+						this.reload();
+					});
+				}
+			} else {
+				alert(__("No filters selected."));
+			}
+
 			return false;
 		},
 });
-- 
cgit v1.2.3-54-g00ecf


From 0da9ef81bd6ed41bfdbd736290778c3d19df0647 Mon Sep 17 00:00:00 2001
From: wn_ <invalid@email.com>
Date: Mon, 6 Jan 2025 14:17:35 +0000
Subject: Prompt for the new filter name when only copying one.

This also reworks 'Pref_Filters' a bit so it's easier to retrieve filter titles.
---
 classes/Pref_Filters.php | 20 +++++++++++++-------
 js/PrefFilterTree.js     | 22 ++++++++++++++++------
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/classes/Pref_Filters.php b/classes/Pref_Filters.php
index 5d1221df4..719094263 100644
--- a/classes/Pref_Filters.php
+++ b/classes/Pref_Filters.php
@@ -258,7 +258,7 @@ class Pref_Filters extends Handler_Protected {
 		];
 
 		foreach ($filters as $filter) {
-			$name = $this->_get_name($filter->id);
+			$details = $this->_get_details($filter->id);
 
 			if ($filter_search &&
 				mb_stripos($filter->title, $filter_search) === false &&
@@ -273,8 +273,9 @@ class Pref_Filters extends Handler_Protected {
 			$item = [
 				'id' => 'FILTER:' . $filter->id,
 				'bare_id' => $filter->id,
-				'name' => $name[0],
-				'param' => $name[1],
+				'bare_name' => $details['title'],
+				'name' => $details['title_summary'],
+				'param' => $details['actions_summary'],
 				'checkbox' => false,
 				'last_triggered' => $filter->last_triggered ? TimeHelper::make_local_datetime($filter->last_triggered) : null,
 				'enabled' => sql_bool_to_bool($filter->enabled),
@@ -745,9 +746,9 @@ class Pref_Filters extends Handler_Protected {
 	}
 
 	/**
-	 * @return array<int, string>
+	 * @return array{'title': string, 'title_summary': string, 'actions_summary': string}
 	 */
-	private function _get_name(int $id): array {
+	private function _get_details(int $id): array {
 
 		$filter = ORM::for_table("ttrss_filters2")
 			->table_alias('f')
@@ -763,10 +764,11 @@ class Pref_Filters extends Handler_Protected {
 			->find_one();
 
 		if ($filter) {
+			$title = $filter->title ?: __('[No caption]');
 			$title_summary = [
 				sprintf(
 				_ngettext("%s (%d rule)", "%s (%d rules)", (int) $filter->num_rules),
-				($filter->title ? $filter->title : __("[No caption]")),
+				$title,
 				$filter->num_rules)];
 
 			if ($filter->match_any_rule) array_push($title_summary, __("matches any rule"));
@@ -805,7 +807,11 @@ class Pref_Filters extends Handler_Protected {
 					"<li class='text-muted'><em>" . sprintf(_ngettext("(+%d action)", "(+%d actions)", $actions_not_shown), $actions_not_shown)) . "</em></li>";
 			}
 
-			return [implode(", ", $title_summary), implode("", $actions_summary)];
+			return [
+				'title' => $title,
+				'title_summary' => implode(', ', $title_summary),
+				'actions_summary' => implode('', $actions_summary),
+			];
 		}
 
 		return [];
diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js
index 10c4d7de3..e94542a16 100644
--- a/js/PrefFilterTree.js
+++ b/js/PrefFilterTree.js
@@ -171,13 +171,23 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 			const sel_rows = this.getSelectedFilters();
 
 			if (sel_rows.length > 0) {
-				if (confirm(__("Copy selected filters?"))) {
-					Notify.progress("Copying selected filters...");
+				const query = {op: "Pref_Filters", method: "copy", ids: sel_rows.toString()};
+				let proceed = false;
+
+				if (sel_rows.length === 1) {
+					const selected_filter = this.model.getCheckedItems()[0];
+					const new_title = prompt(__("Name for copied filter:"), 'Copy - ' + this.model.store.getValue(selected_filter, "bare_name"));
+
+					if (new_title) {
+						query.new_title = new_title;
+						proceed = true;
+					}
+				} else if (sel_rows.length > 1) {
+					proceed = confirm(__("Copy selected filters?"));
+				}
 
-					const query = {
-						op: "Pref_Filters", method: "copy",
-						ids: sel_rows.toString()
-					};
+				if (proceed) {
+					Notify.progress("Copying selected filters...");
 
 					xhr.post("backend.php", query, () => {
 						this.reload();
-- 
cgit v1.2.3-54-g00ecf


From 2eb3c150c2f63b4e4e11ec699fae144e60dc7109 Mon Sep 17 00:00:00 2001
From: wn_ <invalid@email.com>
Date: Mon, 6 Jan 2025 14:30:54 +0000
Subject: Fix a return type warning in 'Pref_Filters'.

'Pref_Filters#get_details()' gets passed the ID of an existing filter, so we don't need to handle some edge case of it not existing.
---
 classes/Pref_Filters.php | 84 +++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 44 deletions(-)

diff --git a/classes/Pref_Filters.php b/classes/Pref_Filters.php
index 719094263..26ae03e16 100644
--- a/classes/Pref_Filters.php
+++ b/classes/Pref_Filters.php
@@ -763,58 +763,54 @@ class Pref_Filters extends Handler_Protected {
 			->group_by_expr('f.title, f.match_any_rule, f.inverse')
 			->find_one();
 
-		if ($filter) {
-			$title = $filter->title ?: __('[No caption]');
-			$title_summary = [
-				sprintf(
-				_ngettext("%s (%d rule)", "%s (%d rules)", (int) $filter->num_rules),
-				$title,
-				$filter->num_rules)];
-
-			if ($filter->match_any_rule) array_push($title_summary, __("matches any rule"));
-			if ($filter->inverse) array_push($title_summary, __("inverse"));
-
-			$actions = ORM::for_table("ttrss_filters2_actions")
-				->where("filter_id", $id)
-				->order_by_asc('id')
-				->find_many();
-
-			/** @var array<string> $actions_summary */
-			$actions_summary = [];
-			$cumulative_score = 0;
-
-			// we're going to show a summary adjustment so we skip individual score action descriptions here
-			foreach ($actions as $action) {
-				if ($action->action_id == self::ACTION_SCORE) {
-					$cumulative_score += (int) $action->action_param;
-					continue;
-				}
+		$title = $filter->title ?: __('[No caption]');
+		$title_summary = [
+			sprintf(
+			_ngettext("%s (%d rule)", "%s (%d rules)", (int) $filter->num_rules),
+			$title,
+			$filter->num_rules)];
+
+		if ($filter->match_any_rule) array_push($title_summary, __("matches any rule"));
+		if ($filter->inverse) array_push($title_summary, __("inverse"));
+
+		$actions = ORM::for_table("ttrss_filters2_actions")
+			->where("filter_id", $id)
+			->order_by_asc('id')
+			->find_many();
 
-				array_push($actions_summary, "<li>" . self::_get_action_name($action) . "</li>");
-			}
+		/** @var array<string> $actions_summary */
+		$actions_summary = [];
+		$cumulative_score = 0;
 
-			// inject a fake action description using cumulative filter score
-			if ($cumulative_score != 0) {
-				array_unshift($actions_summary,
-					"<li>" . self::_get_action_name(["action_id" => self::ACTION_SCORE, "action_param" => $cumulative_score]) . "</li>");
+		// we're going to show a summary adjustment so we skip individual score action descriptions here
+		foreach ($actions as $action) {
+			if ($action->action_id == self::ACTION_SCORE) {
+				$cumulative_score += (int) $action->action_param;
+				continue;
 			}
 
-			if (count($actions_summary) > self::MAX_ACTIONS_TO_DISPLAY) {
-				$actions_not_shown = count($actions_summary) - self::MAX_ACTIONS_TO_DISPLAY;
-				$actions_summary = array_slice($actions_summary, 0, self::MAX_ACTIONS_TO_DISPLAY);
+			array_push($actions_summary, "<li>" . self::_get_action_name($action) . "</li>");
+		}
 
-				array_push($actions_summary,
-					"<li class='text-muted'><em>" . sprintf(_ngettext("(+%d action)", "(+%d actions)", $actions_not_shown), $actions_not_shown)) . "</em></li>";
-			}
+		// inject a fake action description using cumulative filter score
+		if ($cumulative_score != 0) {
+			array_unshift($actions_summary,
+				"<li>" . self::_get_action_name(["action_id" => self::ACTION_SCORE, "action_param" => $cumulative_score]) . "</li>");
+		}
 
-			return [
-				'title' => $title,
-				'title_summary' => implode(', ', $title_summary),
-				'actions_summary' => implode('', $actions_summary),
-			];
+		if (count($actions_summary) > self::MAX_ACTIONS_TO_DISPLAY) {
+			$actions_not_shown = count($actions_summary) - self::MAX_ACTIONS_TO_DISPLAY;
+			$actions_summary = array_slice($actions_summary, 0, self::MAX_ACTIONS_TO_DISPLAY);
+
+			array_push($actions_summary,
+				"<li class='text-muted'><em>" . sprintf(_ngettext("(+%d action)", "(+%d actions)", $actions_not_shown), $actions_not_shown)) . "</em></li>";
 		}
 
-		return [];
+		return [
+			'title' => $title,
+			'title_summary' => implode(', ', $title_summary),
+			'actions_summary' => implode('', $actions_summary),
+		];
 	}
 
 	function join(): void {
-- 
cgit v1.2.3-54-g00ecf


From e546e739146dbeabd2d35dba5dbe2cb50e2f5f76 Mon Sep 17 00:00:00 2001
From: wn_ <invalid@email.com>
Date: Mon, 6 Jan 2025 15:49:37 +0000
Subject: Use 'clone' wording for filter duplication.

---
 classes/Pref_Filters.php | 12 ++++++------
 js/PrefFilterTree.js     | 11 ++++++-----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/classes/Pref_Filters.php b/classes/Pref_Filters.php
index 26ae03e16..665693d81 100644
--- a/classes/Pref_Filters.php
+++ b/classes/Pref_Filters.php
@@ -506,7 +506,7 @@ class Pref_Filters extends Handler_Protected {
 		$sth->execute([...$ids, $_SESSION['uid']]);
 	}
 
-	private function _copy_rules_and_actions(int $filter_id, ?int $src_filter_id = null): bool {
+	private function _clone_rules_and_actions(int $filter_id, ?int $src_filter_id = null): bool {
 		$sth = $this->pdo->prepare('INSERT INTO ttrss_filters2_rules
 					(filter_id, reg_exp, inverse, filter_type, feed_id, cat_id, match_on, cat_filter)
 					SELECT :filter_id, reg_exp, inverse, filter_type, feed_id, cat_id, match_on, cat_filter
@@ -646,13 +646,13 @@ class Pref_Filters extends Handler_Protected {
 			if ($src_filter_id === null)
 				$this->_save_rules_and_actions($filter_id);
 			else
-				$this->_copy_rules_and_actions($filter_id, $src_filter_id);
+				$this->_clone_rules_and_actions($filter_id, $src_filter_id);
 		}
 
 		$this->pdo->commit();
 	}
 
-	function copy(): void {
+	function clone(): void {
 		/** @var array<int, int> */
 		$src_filter_ids = array_map('intval', array_filter(explode(',', clean($_REQUEST['ids'] ?? ''))));
 
@@ -665,7 +665,7 @@ class Pref_Filters extends Handler_Protected {
 			// see checkbox_to_sql_bool() for 0+1 justification
 			$this->add([
 				'src_filter_id' => $src_filter->id,
-				'title' => sprintf(__('Copy of %s'), $src_filter->title),
+				'title' => sprintf(__('Clone of %s'), $src_filter->title),
 				'enabled' => 0,
 				'match_any_rule' => $src_filter->match_any_rule ? 1 : 0,
 				'inverse' => $src_filter->inverse ? 1 : 0,
@@ -707,8 +707,8 @@ class Pref_Filters extends Handler_Protected {
 
 					<button dojoType="dijit.form.Button" onclick="return Filters.edit()">
 						<?= __('Create filter') ?></button>
-					<button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').copySelectedFilters()">
-						<?= __('Copy') ?></button>
+					<button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').cloneSelectedFilters()">
+						<?= __('Clone') ?></button>
 					<button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').joinSelectedFilters()">
 						<?= __('Combine') ?></button>
 					<button dojoType="dijit.form.Button" onclick="return dijit.byId('filterTree').removeSelectedFilters()">
diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js
index e94542a16..288826202 100644
--- a/js/PrefFilterTree.js
+++ b/js/PrefFilterTree.js
@@ -167,27 +167,28 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 
 			return false;
 		},
-		copySelectedFilters: function() {
+		cloneSelectedFilters: function() {
 			const sel_rows = this.getSelectedFilters();
 
 			if (sel_rows.length > 0) {
-				const query = {op: "Pref_Filters", method: "copy", ids: sel_rows.toString()};
+				const query = {op: "Pref_Filters", method: "clone", ids: sel_rows.toString()};
 				let proceed = false;
 
 				if (sel_rows.length === 1) {
 					const selected_filter = this.model.getCheckedItems()[0];
-					const new_title = prompt(__("Name for copied filter:"), 'Copy - ' + this.model.store.getValue(selected_filter, "bare_name"));
+					const new_title = prompt(__("Name for new filter:"),
+						__("Clone of %s").replace("%s", this.model.store.getValue(selected_filter, "bare_name")));
 
 					if (new_title) {
 						query.new_title = new_title;
 						proceed = true;
 					}
 				} else if (sel_rows.length > 1) {
-					proceed = confirm(__("Copy selected filters?"));
+					proceed = confirm(__("Clone selected filters?"));
 				}
 
 				if (proceed) {
-					Notify.progress("Copying selected filters...");
+					Notify.progress(__("Cloning selected filters..."));
 
 					xhr.post("backend.php", query, () => {
 						this.reload();
-- 
cgit v1.2.3-54-g00ecf


From 5a93056c1c0e15eb3fcd8a222cb265cc363fb3a9 Mon Sep 17 00:00:00 2001
From: wn_ <invalid@email.com>
Date: Mon, 6 Jan 2025 16:04:27 +0000
Subject: Fix setting a custom title when cloning a single filter.

---
 classes/Pref_Filters.php | 3 ++-
 js/PrefFilterTree.js     | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/classes/Pref_Filters.php b/classes/Pref_Filters.php
index 665693d81..28de1ab82 100644
--- a/classes/Pref_Filters.php
+++ b/classes/Pref_Filters.php
@@ -655,6 +655,7 @@ class Pref_Filters extends Handler_Protected {
 	function clone(): void {
 		/** @var array<int, int> */
 		$src_filter_ids = array_map('intval', array_filter(explode(',', clean($_REQUEST['ids'] ?? ''))));
+		$new_filter_title = count($src_filter_ids) === 1 ? clean($_REQUEST['new_filter_title'] ?? null) : null;
 
 		$src_filters = ORM::for_table('ttrss_filters2')
 			->where('owner_uid', $_SESSION['uid'])
@@ -665,7 +666,7 @@ class Pref_Filters extends Handler_Protected {
 			// see checkbox_to_sql_bool() for 0+1 justification
 			$this->add([
 				'src_filter_id' => $src_filter->id,
-				'title' => sprintf(__('Clone of %s'), $src_filter->title),
+				'title' => $new_filter_title ?? sprintf(__('Clone of %s'), $src_filter->title),
 				'enabled' => 0,
 				'match_any_rule' => $src_filter->match_any_rule ? 1 : 0,
 				'inverse' => $src_filter->inverse ? 1 : 0,
diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js
index 288826202..e63dd5797 100644
--- a/js/PrefFilterTree.js
+++ b/js/PrefFilterTree.js
@@ -176,11 +176,11 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree"], functio
 
 				if (sel_rows.length === 1) {
 					const selected_filter = this.model.getCheckedItems()[0];
-					const new_title = prompt(__("Name for new filter:"),
+					const new_filter_title = prompt(__("Name for new filter:"),
 						__("Clone of %s").replace("%s", this.model.store.getValue(selected_filter, "bare_name")));
 
-					if (new_title) {
-						query.new_title = new_title;
+					if (new_filter_title) {
+						query.new_filter_title = new_filter_title;
 						proceed = true;
 					}
 				} else if (sel_rows.length > 1) {
-- 
cgit v1.2.3-54-g00ecf