From 2bcc090622c0e62dbff94e52bb6892a51b40ba2a Mon Sep 17 00:00:00 2001
From: maTh <1645099+math-GH@users.noreply.github.com>
Date: Wed, 1 Oct 2025 10:48:07 +0200
Subject: configurable notification timeout (#7942)

Ref #7931
Ref #5466
Ref #6409

added configuration in "Display"
<img width="636" height="167" alt="grafik" src="https://github.com/user-attachments/assets/7bbc9f26-d91b-4dd2-b715-1d3f9b7a9ad3" />

* i18n: fr

* Update app/i18n/pl/conf.php

Co-authored-by: Inverle <inverle@proton.me>

* make fix-all

* max()

* Minor whitespace
(I am not a fan of excessive vertical indenting)

---------

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
Co-authored-by: Inverle <inverle@proton.me>
---
 app/Controllers/categoryController.php | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

(limited to 'app/Controllers/categoryController.php')

diff --git a/app/Controllers/categoryController.php b/app/Controllers/categoryController.php
index 316136b11..5ad83e977 100644
--- a/app/Controllers/categoryController.php
+++ b/app/Controllers/categoryController.php
@@ -70,7 +70,11 @@ class FreshRSS_category_Controller extends FreshRSS_ActionController {
 
 			if ($catDAO->addCategoryObject($cat)) {
 				$url_redirect['a'] = 'index';
-				Minz_Request::good(_t('feedback.sub.category.created', $cat->name()), $url_redirect);
+				Minz_Request::good(
+					_t('feedback.sub.category.created', $cat->name()),
+					$url_redirect,
+					showNotification: FreshRSS_Context::userConf()->good_notification_timeout > 0
+				);
 			} else {
 				Minz_Request::bad(_t('feedback.sub.category.error'), $url_redirect);
 			}
@@ -156,7 +160,11 @@ class FreshRSS_category_Controller extends FreshRSS_ActionController {
 
 			$url_redirect = ['c' => 'subscription', 'params' => ['id' => $id, 'type' => 'category']];
 			if (false !== $categoryDAO->updateCategory($id, $values)) {
-				Minz_Request::good(_t('feedback.sub.category.updated'), $url_redirect);
+				Minz_Request::good(
+					_t('feedback.sub.category.updated'),
+					$url_redirect,
+					showNotification: FreshRSS_Context::userConf()->good_notification_timeout > 0
+				);
 			} else {
 				Minz_Request::bad(_t('feedback.sub.category.error'), $url_redirect);
 			}
@@ -201,7 +209,11 @@ class FreshRSS_category_Controller extends FreshRSS_ActionController {
 			FreshRSS_Context::userConf()->queries = $queries;
 			FreshRSS_Context::userConf()->save();
 
-			Minz_Request::good(_t('feedback.sub.category.deleted'), $url_redirect);
+			Minz_Request::good(
+				_t('feedback.sub.category.deleted'),
+				$url_redirect,
+				showNotification: FreshRSS_Context::userConf()->good_notification_timeout > 0
+			);
 		}
 
 		Minz_Request::forward($url_redirect, true);
@@ -243,7 +255,11 @@ class FreshRSS_category_Controller extends FreshRSS_ActionController {
 				}
 				FreshRSS_Context::userConf()->save();
 
-				Minz_Request::good(_t('feedback.sub.category.emptied'), $url_redirect);
+				Minz_Request::good(
+					_t('feedback.sub.category.emptied'),
+					$url_redirect,
+					showNotification: FreshRSS_Context::userConf()->good_notification_timeout > 0
+				);
 			} else {
 				Minz_Request::bad(_t('feedback.sub.category.error'), $url_redirect);
 			}
@@ -284,7 +300,11 @@ class FreshRSS_category_Controller extends FreshRSS_ActionController {
 				$this->view->_layout(null);
 			} else {
 				if ($ok) {
-					Minz_Request::good(_t('feedback.sub.category.updated'), $url_redirect);
+					Minz_Request::good(
+						_t('feedback.sub.category.updated'),
+						$url_redirect,
+						showNotification: FreshRSS_Context::userConf()->good_notification_timeout > 0
+					);
 				} else {
 					Minz_Request::bad(_t('feedback.sub.category.error'), $url_redirect);
 				}
-- 
cgit v1.2.3