From 76a2f96514bae1b77065a0b049618ba2ff832dd9 Mon Sep 17 00:00:00 2001
From: Miguel Ribeiro <k.d.mintnick@gmail.com>
Date: Sat, 20 Dec 2025 15:36:57 +0000
Subject: [PATCH 1/3] cleanup merges from PRs

---
 includes/i18n/ca.php     | 2 ++
 includes/i18n/cs.php     | 2 ++
 includes/i18n/da.php     | 2 ++
 includes/i18n/de.php     | 2 ++
 includes/i18n/el.php     | 2 ++
 includes/i18n/es.php     | 2 ++
 includes/i18n/fr.php     | 2 ++
 includes/i18n/id.php     | 2 ++
 includes/i18n/it.php     | 2 ++
 includes/i18n/jp.php     | 2 ++
 includes/i18n/ko.php     | 2 ++
 includes/i18n/nl.php     | 2 ++
 includes/i18n/pl.php     | 2 ++
 includes/i18n/pt.php     | 2 ++
 includes/i18n/pt_br.php  | 2 ++
 includes/i18n/ru.php     | 2 ++
 includes/i18n/sl.php     | 2 ++
 includes/i18n/sr.php     | 2 ++
 includes/i18n/sr_lat.php | 2 ++
 includes/i18n/tr.php     | 2 ++
 includes/i18n/uk.php     | 2 ++
 includes/i18n/vi.php     | 2 ++
 includes/version.php     | 2 +-
 23 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/includes/i18n/ca.php b/includes/i18n/ca.php
index 50f0a3b65..2bb480352 100644
--- a/includes/i18n/ca.php
+++ b/includes/i18n/ca.php
@@ -196,6 +196,8 @@
     "telegram_chat_id" => "ID del Xat de Telegram",
     "pushplus" => "Pushplus",
     "pushplus_token" => "Token de Pushplus",
+    "serverchan" => "Serverchan",
+    "serverchan_sendkey" => "Serverchan SendKey",
     "mattermost" => "Mattermost",
     "mattermost_webhook_url" => "URL del Webhook de Mattermost",
     "mattermost_bot_username" => "Nom d'usuari del Bot de Mattermost",
diff --git a/includes/i18n/cs.php b/includes/i18n/cs.php
index 5daeb8fa0..13d276329 100644
--- a/includes/i18n/cs.php
+++ b/includes/i18n/cs.php
@@ -196,6 +196,8 @@
     "telegram_chat_id" => "ID chatu v Telegramu",
     "pushplus" => "Pushplus",
     "pushplus_token" => "Pushplus Token",
+    "serverchan" => "Serverchan",
+    "serverchan_sendkey" => "Serverchan SendKey",
     "mattermost" => "Mattermost",
     "mattermost_webhook_url" => "WebHook URL",
     "mattermost_bot_username" => "Uživatelské jméno služby Mattermost Bot",
diff --git a/includes/i18n/da.php b/includes/i18n/da.php
index 4a34c04c5..09d5f3429 100644
--- a/includes/i18n/da.php
+++ b/includes/i18n/da.php
@@ -196,6 +196,8 @@
     "telegram_chat_id" => "Telegram Chat ID",
     "pushplus" => "Pushplus",
     "pushplus_token" => "Pushplus Token",
+    "serverchan" => "Serverchan",
+    "serverchan_sendkey" => "Serverchan SendKey",
     "mattermost" => "Mattermost",
     "mattermost_webhook_url" => "Mattermost Webhook URL",
     "mattermost_bot_username" => "Mattermost Bot Brugernavn",
diff --git a/includes/i18n/de.php b/includes/i18n/de.php
index 396eddae0..cc4aff4ab 100644
--- a/includes/i18n/de.php
+++ b/includes/i18n/de.php
@@ -195,6 +195,8 @@
     "telegram_chat_id" => "Telegram Chat ID",
     "pushplus" => "Pushplus",
     "pushplus_token" => "Pushplus Token",
+    "serverchan" => "Serverchan",
+    "serverchan_sendkey" => "Serverchan SendKey",
     "mattermost" => "Mattermost",
     "mattermost_webhook_url" => "Mattermost Webhook URL",
     "mattermost_bot_username" => "Mattermost Bot Benutzername",
diff --git a/includes/i18n/el.php b/includes/i18n/el.php
index d0eba81c7..cb96bee63 100644
--- a/includes/i18n/el.php
+++ b/includes/i18n/el.php
@@ -195,6 +195,8 @@
     "telegram_chat_id" => "Τηλεγραφήματα Chat ID",
     "pushplus" => "Pushplus",
     "pushplus_token" => "Pushplus Token",
+    "serverchan" => "Serverchan",
+    "serverchan_sendkey" => "Serverchan SendKey",
     "mattermost" => "Mattermost",
     "mattermost_webhook_url" => "Mattermost WebHook URL",
     "mattermost_bot_username" => "Mattermost Bot Όνομα χρήστη",
diff --git a/includes/i18n/es.php b/includes/i18n/es.php
index 721695375..f581004dc 100644
--- a/includes/i18n/es.php
+++ b/includes/i18n/es.php
@@ -195,6 +195,8 @@
     "telegram_chat_id" => "ID del Chat de Telegram",
     "pushplus" => "Pushplus",
     "pushplus_token" => "Token de Pushplus",
+    "serverchan" => "Serverchan",
+    "serverchan_sendkey" => "Serverchan SendKey",
     "mattermost" => "Mattermost",
     "mattermost_webhook_url" => "URL del Webhook de Mattermost",
     "mattermost_bot_username" => "Nombre de usuario del Bot de Mattermost",
diff --git a/includes/i18n/fr.php b/includes/i18n/fr.php
index e9af423d4..9371cd23a 100644
--- a/includes/i18n/fr.php
+++ b/includes/i18n/fr.php
@@ -195,6 +195,8 @@
     "telegram_chat_id" => "ID de chat Telegram",
     "pushplus" => "Pushplus",
     "pushplus_token" => "Jeton Pushplus",
+    "serverchan" => "Serverchan",
+    "serverchan_sendkey" => "Serverchan SendKey",
     "mattermost" => "Mattermost",
     "mattermost_webhook_url" => "URL du webhook Mattermost",
     "mattermost_bot_username" => "Nom d'utilisateur du bot Mattermost",
diff --git a/includes/i18n/id.php b/includes/i18n/id.php
index 19c40bd66..7390ccd16 100644
--- a/includes/i18n/id.php
+++ b/includes/i18n/id.php
@@ -196,6 +196,8 @@
     "telegram_chat_id" => "ID Obrolan Telegram",
     "pushplus" => "Pushplus",
     "pushplus_token" => "Token Pushplus",
+    "serverchan" => "Serverchan",
+    "serverchan_sendkey" => "Serverchan SendKey",
     "mattermost" => "Mattermost",
     "mattermost_webhook_url" => "URL Webhook Mattermost",
     "mattermost_bot_username" => "Nama Pengguna Bot Mattermost",
diff --git a/includes/i18n/it.php b/includes/i18n/it.php
index 4c6d35bdc..334206330 100644
--- a/includes/i18n/it.php
+++ b/includes/i18n/it.php
@@ -203,6 +203,8 @@
     "telegram_chat_id" => "Telegram Chat ID",
     "pushplus" => "Pushplus",
     "pushplus_token" => "Pushplus Token",
+    "serverchan" => "Serverchan",
+    "serverchan_sendkey" => "Serverchan SendKey",
     "mattermost" => "Mattermost",
     "mattermost_webhook_url" => "Mattermost Webhook URL",
     "mattermost_bot_username" => "Mattermost Bot Nome utente",
diff --git a/includes/i18n/jp.php b/includes/i18n/jp.php
index c4283a9fd..c3aaf7542 100644
--- a/includes/i18n/jp.php
+++ b/includes/i18n/jp.php
@@ -196,6 +196,8 @@
     "telegram_chat_id" => "TelegramチャットID",
     "pushplus" => "Pushplus",
     "pushplus_token" => "Pushplusトークン",
+    "serverchan" => "Serverchan",
+    "serverchan_sendkey" => "Serverchan SendKey",
     "mattermost" => "Mattermost",
     "mattermost_webhook_url" => "Mattermost Webhook URL",
     "mattermost_bot_username" => "Mattermost Bot ユーザー名",
diff --git a/includes/i18n/ko.php b/includes/i18n/ko.php
index c54cdcad6..b10680b4f 100644
--- a/includes/i18n/ko.php
+++ b/includes/i18n/ko.php
@@ -195,6 +195,8 @@
     "telegram_chat_id" => "텔레그램 채팅 ID",
     "pushplus" => "Pushplus",
     "pushplus_token" => "Pushplus 토큰",
+    "serverchan" => "Serverchan",
+    "serverchan_sendkey" => "Serverchan SendKey",
     "mattermost" => "Mattermost",
     "mattermost_webhook_url" => "Mattermost 웹훅 URL",
     "mattermost_bot_username" => "Mattermost 봇 유저명",
diff --git a/includes/i18n/nl.php b/includes/i18n/nl.php
index d4df203a5..51c61e101 100644
--- a/includes/i18n/nl.php
+++ b/includes/i18n/nl.php
@@ -196,6 +196,8 @@
     "telegram_chat_id" => "Telegram Chat ID",
     "pushplus" => "Pushplus",
     "pushplus_token" => "Pushplus Token",
+    "serverchan" => "Serverchan",
+    "serverchan_sendkey" => "Serverchan SendKey",
     "mattermost" => "Mattermost",
     "mattermost_webhook_url" => "Mattermost Webhook URL",
     "mattermost_bot_username" => "Mattermost Bot Gebruikersnaam",
diff --git a/includes/i18n/pl.php b/includes/i18n/pl.php
index 7d3b4b7aa..66a7a2d5a 100644
--- a/includes/i18n/pl.php
+++ b/includes/i18n/pl.php
@@ -195,6 +195,8 @@
     "telegram_chat_id" => "ID czatu",
     "pushplus" => "Pushplus",
     "pushplus_token" => "Token Pushplus",
+    "serverchan" => "Serverchan",
+    "serverchan_sendkey" => "Serverchan SendKey",
     "mattermost" => "Mattermost",
     "mattermost_webhook_url" => "URL webhooka Mattermost",
     "mattermost_bot_username" => "Nazwa użytkownika bota Mattermost",
diff --git a/includes/i18n/pt.php b/includes/i18n/pt.php
index 145b1c95b..06d8b8e74 100644
--- a/includes/i18n/pt.php
+++ b/includes/i18n/pt.php
@@ -195,6 +195,8 @@
     "telegram_chat_id" => "ID do Chat Telegram",
     "pushplus" => "Pushplus",
     "pushplus_token" => "Token do Pushplus",
+    "serverchan" => "Serverchan",
+    "serverchan_sendkey" => "Serverchan SendKey",
     "mattermost" => "Mattermost",
     "mattermost_webhook_url" => "URL do Hook",
     "mattermost_bot_username" => "Nome de Utilizador do Bot",
diff --git a/includes/i18n/pt_br.php b/includes/i18n/pt_br.php
index 7261fee0e..73fbfc9d0 100644
--- a/includes/i18n/pt_br.php
+++ b/includes/i18n/pt_br.php
@@ -195,6 +195,8 @@
     "telegram_chat_id" => "Chat ID",
     "pushplus" => "Pushplus",
     "pushplus_token" => "Token do Pushplus",
+    "serverchan" => "Serverchan",
+    "serverchan_sendkey" => "Serverchan SendKey",
     "mattermost" => "Mattermost",
     "mattermost_webhook_url" => "Mattermost URL do Webhook",
     "mattermost_bot_username" => "Mattermost Bot Nome de Usuário",
diff --git a/includes/i18n/ru.php b/includes/i18n/ru.php
index e8b9f24fc..d158fd16c 100644
--- a/includes/i18n/ru.php
+++ b/includes/i18n/ru.php
@@ -195,6 +195,8 @@
     "telegram_chat_id" => "Telegram Chat ID",
     "pushplus" => "Pushplus",
     "pushplus_token" => "Токен Pushplus",
+    "serverchan" => "Serverchan",
+    "serverchan_sendkey" => "Serverchan SendKey",
     "mattermost" => "Mattermost",
     "mattermost_webhook_url" => "Mattermost Webhook URL",
     "mattermost_bot_username" => "Mattermost Bot Имя пользователя",
diff --git a/includes/i18n/sl.php b/includes/i18n/sl.php
index f8f458464..32ad4c852 100644
--- a/includes/i18n/sl.php
+++ b/includes/i18n/sl.php
@@ -195,6 +195,8 @@
     "telegram_chat_id" => "ID klepeta Telegrama",
     "pushplus" => "Pushplus",
     "pushplus_token" => "Pushplus žeton",
+    "serverchan" => "Serverchan",
+    "serverchan_sendkey" => "Serverchan SendKey",
     "mattermost" => "Mattermost",
     "mattermost_webhook_url" => "Mattermost Webhook URL",
     "mattermost_bot_username" => "Mattermost Bot Uporabniško ime",
diff --git a/includes/i18n/sr.php b/includes/i18n/sr.php
index 4de1b211a..315edf65a 100644
--- a/includes/i18n/sr.php
+++ b/includes/i18n/sr.php
@@ -195,6 +195,8 @@
     "telegram_chat_id" => "Телеграм чет ID",
     "pushplus" => "Pushplus",
     "pushplus_token" => "Pushplus токен",
+    "serverchan" => "Serverchan",
+    "serverchan_sendkey" => "Serverchan SendKey",
     "mattermost" => "Mattermost",
     "mattermost_webhook_url" => "Mattermost Webhook URL",
     "mattermost_bot_username" => "Mattermost Bot Име корисника",
diff --git a/includes/i18n/sr_lat.php b/includes/i18n/sr_lat.php
index e25f21bb6..9949f1fc7 100644
--- a/includes/i18n/sr_lat.php
+++ b/includes/i18n/sr_lat.php
@@ -195,6 +195,8 @@
     "telegram_chat_id" => "Telegram chat ID",
     "pushplus" => "Pushplus",
     "pushplus_token" => "Pushplus token",
+    "serverchan" => "Serverchan",
+    "serverchan_sendkey" => "Serverchan SendKey",
     "mattermost" => "Mattermost",
     "mattermost_webhook_url" => "Mattermost Webhook URL",
     "mattermost_bot_username" => "Mattermost Bot Korisničko ime",
diff --git a/includes/i18n/tr.php b/includes/i18n/tr.php
index 12e64633f..d1ee8f3a5 100644
--- a/includes/i18n/tr.php
+++ b/includes/i18n/tr.php
@@ -195,6 +195,8 @@
     "telegram_chat_id" => "Telegram Chat ID",
     "pushplus" => "Pushplus",
     "pushplus_token" => "Pushplus Token",
+    "serverchan" => "Serverchan",
+    "serverchan_sendkey" => "Serverchan SendKey",
     "mattermost" => "Mattermost",
     "mattermost_webhook_url" => "Mattermost Webhook URL",
     "mattermost_bot_username" => "Mattermost Bot Kullanıcı Adı",
diff --git a/includes/i18n/uk.php b/includes/i18n/uk.php
index db9e8aebc..3a191586a 100644
--- a/includes/i18n/uk.php
+++ b/includes/i18n/uk.php
@@ -195,6 +195,8 @@
     "telegram_chat_id" => "Telegram Chat ID",
     "pushplus" => "Pushplus",
     "pushplus_token" => "Pushplus токен",
+    "serverchan" => "Serverchan",
+    "serverchan_sendkey" => "Serverchan SendKey",
     "mattermost" => "Mattermost",
     "mattermost_webhook_url" => "Mattermost Webhook URL",
     "mattermost_bot_username" => "Mattermost Bot Ім'я користувача",
diff --git a/includes/i18n/vi.php b/includes/i18n/vi.php
index 10dd17633..bd5ca1a0a 100644
--- a/includes/i18n/vi.php
+++ b/includes/i18n/vi.php
@@ -196,6 +196,8 @@
     "telegram_chat_id" => "ID cuộc trò chuyện Telegram",
     "pushplus" => "Pushplus",
     "pushplus_token" => "Mã thông báo Pushplus",
+    "serverchan" => "Serverchan",
+    "serverchan_sendkey" => "Serverchan SendKey",
     "mattermost" => "Mattermost",
     "mattermost_webhook_url" => "Mattermost Webhook URL",
     "mattermost_bot_username" => "Mattermost Bot Tên người dùng",
diff --git a/includes/version.php b/includes/version.php
index 5417feea9..2391cb826 100644
--- a/includes/version.php
+++ b/includes/version.php
@@ -1,3 +1,3 @@
 <?php
-$version = "v4.5.0";
+$version = "v4.6.0";
 ?>
\ No newline at end of file

From c7ff954caf55d559440da9347c160d02b07ee62f Mon Sep 17 00:00:00 2001
From: Miguel Ribeiro <k.d.mintnick@gmail.com>
Date: Sat, 20 Dec 2025 15:37:12 +0000
Subject: [PATCH 2/3] cleanup merges from PRs

---
 settings.php | 210 ++++++++++++++++++++++++++-------------------------
 1 file changed, 106 insertions(+), 104 deletions(-)

diff --git a/settings.php b/settings.php
index 2ac51ad10..83d5af185 100644
--- a/settings.php
+++ b/settings.php
@@ -415,8 +415,8 @@ class="thin mobile-grow" />
                             placeholder="<?= translate('smtp_address', $i18n) ?>"
                             value="<?= $notificationsEmail['smtp_address'] ?>" />
                         <input type="text" name="smtpport" id="smtpport" autocomplete="off"
-                            placeholder="<?= translate('port', $i18n) ?>"
-                            class="one-third" value="<?= $notificationsEmail['smtp_port'] ?>" />
+                            placeholder="<?= translate('port', $i18n) ?>" class="one-third"
+                            value="<?= $notificationsEmail['smtp_port'] ?>" />
                     </div>
                     <div class="form-group-inline">
                         <div>
@@ -525,8 +525,7 @@ class="one-third" value="<?= $notificationsEmail['smtp_port'] ?>" />
                     </div>
                     <div class="form-group-inline">
                         <input type="text" name="gotifyurl" id="gotifyurl" autocomplete="off"
-                            placeholder="<?= translate('url', $i18n) ?>"
-                            value="<?= $notificationsGotify['url'] ?>" />
+                            placeholder="<?= translate('url', $i18n) ?>" value="<?= $notificationsGotify['url'] ?>" />
                     </div>
                     <div class="form-group-inline">
                         <input type="text" name="gotifytoken" id="gotifytoken" autocomplete="off"
@@ -614,98 +613,70 @@ class="one-third" value="<?= $notificationsEmail['smtp_port'] ?>" />
             </section>
 
             <section class="account-notifications-section">
-    <header class="account-notification-section-header" onclick="openNotificationsSettings('pushplus');">
-        <h3>
-            <i class="fa-solid fa-bell"></i>
-            <?= translate('pushplus', $i18n) ?>
-        </h3>
-    </header>
-    <div class="account-notification-section-settings" data-type="pushplus">
-        <div class="form-group-inline">
-            <input type="checkbox" id="pushplusenabled" name="pushplusenabled"
-                <?= $notificationsPushPlus['enabled'] ? "checked" : "" ?>>
-            <label for="pushplusenabled" class="capitalize"><?= translate('enabled', $i18n) ?></label>
-        </div>
-        <div class="form-group-inline">
-            <input type="text" name="pushplustoken" id="pushplustoken" autocomplete="off"
-                placeholder="<?= translate('pushplus_token', $i18n) ?>"
-                value="<?= $notificationsPushPlus['token'] ? $notificationsPushPlus['token'] : '' ?>" />
-        </div>
-        <div class="buttons">
-            <input type="button" class="secondary-button thin mobile-grow"
-                value="<?= translate('test', $i18n) ?>" id="testNotificationsPushPlus"
-                onClick="testNotificationsPushPlusButton()" />
-            <input type="submit" class="thin mobile-grow" value="<?= translate('save', $i18n) ?>"
-                id="saveNotificationsPushPlus" onClick="saveNotificationsPushPlusButton()" />
-        </div>
-    </div>
-</section>
-
-<section class="account-notifications-section">
-<header class="account-notification-section-header" onclick="openNotificationsSettings('mattermost');">
-        <h3>
-            <i class="fa-solid fa-gauge-simple-high"></i>
-            <?= translate('mattermost', $i18n) ?>
-        </h3>
-    </header>
-    <div class="account-notification-section-settings" data-type="mattermost">
-        <div class="form-group-inline">
-            <input type="checkbox" id="mattermostenabled" name="mattermostenabled"
-                <?= $notificationsMattermost['enabled'] ? "checked" : "" ?>>
-            <label for="mattermostenabled" class="capitalize"><?= translate('enabled', $i18n) ?></label>
-        </div>
-        <div class="form-group-inline">
-            <input type="text" name="mattermostwebhookurl" id="mattermostwebhookurl"
-                placeholder="<?= translate('mattermost_webhook_url', $i18n) ?>"
-                value="<?= $notificationsMattermost['webhook_url'] ? $notificationsMattermost['webhook_url'] : '' ?>" />
-        </div>
-        <div class="form-group-inline">
-            <input type="text" name="mattermostbotusername" id="mattermostbotusername"
-                placeholder="<?= translate('mattermost_bot_username', $i18n) ?>"
-                value="<?= $notificationsMattermost['bot_username'] ? $notificationsMattermost['bot_username'] : '' ?>" />
-        </div>
-        <div class="form-group-inline">
-            <input type="text" name="mattermostboticonemoji" id="mattermostboticonemoji"
-                placeholder="<?= translate('mattermost_bot_icon_emoji', $i18n) ?>"
-                value="<?= $notificationsMattermost['bot_icon_emoji'] ? $notificationsMattermost['bot_icon_emoji'] : '' ?>" />
-        </div>
-        <div class="buttons">
-            <input type="button" class="secondary-button thin mobile-grow"
-                value="<?= translate('test', $i18n) ?>" id="testNotificationsMattermost"
-                onClick="testNotificationsMattermostButton()" />
-            <input type="submit" class="thin mobile-grow" value="<?= translate('save', $i18n) ?>"
-                id="saveNotificationsMattermost" onClick="saveNotificationsMattermostButton()" />
-        </div>
-    </div>
-</section>
+                <header class="account-notification-section-header" onclick="openNotificationsSettings('pushplus');">
+                    <h3>
+                        <i class="fa-solid fa-bell"></i>
+                        <?= translate('pushplus', $i18n) ?>
+                    </h3>
+                </header>
+                <div class="account-notification-section-settings" data-type="pushplus">
+                    <div class="form-group-inline">
+                        <input type="checkbox" id="pushplusenabled" name="pushplusenabled"
+                            <?= $notificationsPushPlus['enabled'] ? "checked" : "" ?>>
+                        <label for="pushplusenabled" class="capitalize"><?= translate('enabled', $i18n) ?></label>
+                    </div>
+                    <div class="form-group-inline">
+                        <input type="text" name="pushplustoken" id="pushplustoken" autocomplete="off"
+                            placeholder="<?= translate('pushplus_token', $i18n) ?>"
+                            value="<?= $notificationsPushPlus['token'] ? $notificationsPushPlus['token'] : '' ?>" />
+                    </div>
+                    <div class="buttons">
+                        <input type="button" class="secondary-button thin mobile-grow"
+                            value="<?= translate('test', $i18n) ?>" id="testNotificationsPushPlus"
+                            onClick="testNotificationsPushPlusButton()" />
+                        <input type="submit" class="thin mobile-grow" value="<?= translate('save', $i18n) ?>"
+                            id="saveNotificationsPushPlus" onClick="saveNotificationsPushPlusButton()" />
+                    </div>
+                </div>
+            </section>
 
-<section class="account-notifications-section">
-    <header class="account-notification-section-header" onclick="openNotificationsSettings('serverchan');">
-        <h3>
-            <i class="fa-solid fa-paper-plane"></i>
-            <?= translate('serverchan', $i18n) ?>
-        </h3>
-    </header>
-    <div class="account-notification-section-settings" data-type="serverchan">
-        <div class="form-group-inline">
-            <input type="checkbox" id="serverchanenabled" name="serverchanenabled"
-                <?= $notificationsServerchan['enabled'] ? "checked" : "" ?>>
-            <label for="serverchanenabled" class="capitalize"><?= translate('enabled', $i18n) ?></label>
-        </div>
-        <div class="form-group-inline">
-            <input type="text" name="serverchansendkey" id="serverchansendkey" autocomplete="off"
-                placeholder="<?= translate('serverchan_sendkey', $i18n) ?>"
-                value="<?= $notificationsServerchan['sendkey'] ? $notificationsServerchan['sendkey'] : '' ?>" />
-        </div>
-        <div class="buttons">
-            <input type="button" class="secondary-button thin mobile-grow"
-                value="<?= translate('test', $i18n) ?>" id="testNotificationsServerchan"
-                onClick="testNotificationsServerchanButton()" />
-            <input type="submit" class="thin mobile-grow" value="<?= translate('save', $i18n) ?>"
-                id="saveNotificationsServerchan" onClick="saveNotificationsServerchanButton()" />
-        </div>
-    </div>
-</section>
+            <section class="account-notifications-section">
+                <header class="account-notification-section-header" onclick="openNotificationsSettings('mattermost');">
+                    <h3>
+                        <i class="fa-solid fa-gauge-simple-high"></i>
+                        <?= translate('mattermost', $i18n) ?>
+                    </h3>
+                </header>
+                <div class="account-notification-section-settings" data-type="mattermost">
+                    <div class="form-group-inline">
+                        <input type="checkbox" id="mattermostenabled" name="mattermostenabled"
+                            <?= $notificationsMattermost['enabled'] ? "checked" : "" ?>>
+                        <label for="mattermostenabled" class="capitalize"><?= translate('enabled', $i18n) ?></label>
+                    </div>
+                    <div class="form-group-inline">
+                        <input type="text" name="mattermostwebhookurl" id="mattermostwebhookurl"
+                            placeholder="<?= translate('mattermost_webhook_url', $i18n) ?>"
+                            value="<?= $notificationsMattermost['webhook_url'] ? $notificationsMattermost['webhook_url'] : '' ?>" />
+                    </div>
+                    <div class="form-group-inline">
+                        <input type="text" name="mattermostbotusername" id="mattermostbotusername"
+                            placeholder="<?= translate('mattermost_bot_username', $i18n) ?>"
+                            value="<?= $notificationsMattermost['bot_username'] ? $notificationsMattermost['bot_username'] : '' ?>" />
+                    </div>
+                    <div class="form-group-inline">
+                        <input type="text" name="mattermostboticonemoji" id="mattermostboticonemoji"
+                            placeholder="<?= translate('mattermost_bot_icon_emoji', $i18n) ?>"
+                            value="<?= $notificationsMattermost['bot_icon_emoji'] ? $notificationsMattermost['bot_icon_emoji'] : '' ?>" />
+                    </div>
+                    <div class="buttons">
+                        <input type="button" class="secondary-button thin mobile-grow"
+                            value="<?= translate('test', $i18n) ?>" id="testNotificationsMattermost"
+                            onClick="testNotificationsMattermostButton()" />
+                        <input type="submit" class="thin mobile-grow" value="<?= translate('save', $i18n) ?>"
+                            id="saveNotificationsMattermost" onClick="saveNotificationsMattermostButton()" />
+                    </div>
+                </div>
+            </section>
 
             <section class="account-notifications-section">
                 <header class="account-notification-section-header" onclick="openNotificationsSettings('ntfy');">
@@ -743,6 +714,35 @@ class="one-third" value="<?= $notificationsEmail['smtp_port'] ?>" />
                             id="saveNotificationsNtfy" onClick="saveNotificationsNtfyButton()" />
                     </div>
             </section>
+
+            <section class="account-notifications-section">
+                <header class="account-notification-section-header" onclick="openNotificationsSettings('serverchan');">
+                    <h3>
+                        <i class="fa-solid fa-angle-right"></i>
+                        <?= translate('serverchan', $i18n) ?>
+                    </h3>
+                </header>
+                <div class="account-notification-section-settings" data-type="serverchan">
+                    <div class="form-group-inline">
+                        <input type="checkbox" id="serverchanenabled" name="serverchanenabled"
+                            <?= $notificationsServerchan['enabled'] ? "checked" : "" ?>>
+                        <label for="serverchanenabled" class="capitalize"><?= translate('enabled', $i18n) ?></label>
+                    </div>
+                    <div class="form-group-inline">
+                        <input type="text" name="serverchansendkey" id="serverchansendkey" autocomplete="off"
+                            placeholder="<?= translate('serverchan_sendkey', $i18n) ?>"
+                            value="<?= $notificationsServerchan['sendkey'] ? $notificationsServerchan['sendkey'] : '' ?>" />
+                    </div>
+                    <div class="buttons">
+                        <input type="button" class="secondary-button thin mobile-grow"
+                            value="<?= translate('test', $i18n) ?>" id="testNotificationsServerchan"
+                            onClick="testNotificationsServerchanButton()" />
+                        <input type="submit" class="thin mobile-grow" value="<?= translate('save', $i18n) ?>"
+                            id="saveNotificationsServerchan" onClick="saveNotificationsServerchanButton()" />
+                    </div>
+                </div>
+            </section>
+
             <section class="account-notifications-section">
                 <header class="account-notification-section-header" onclick="openNotificationsSettings('webhook');">
                     <h3>
@@ -938,13 +938,12 @@ class="capitalize"><?= translate('request_method', $i18n) ?>:</label>
                     ?>
 
                     <div class="form-group-inline" data-currencyid="<?= $currency['id'] ?>">
-                        <input type="text" class="short" name="symbol" autocomplete="off"
-                            value="<?= $currency['symbol'] ?>" placeholder="$">
-                        <input type="text" name="currency" autocomplete="off"
-                            value="<?= $currency['name'] ?>" placeholder="Currency Name">
-                        <input type="text" name="code" autocomplete="off"
-                            value="<?= $currency['code'] ?>" placeholder="Currency Code"
-                            <?= !$canDelete ? 'disabled' : '' ?>>
+                        <input type="text" class="short" name="symbol" autocomplete="off" value="<?= $currency['symbol'] ?>"
+                            placeholder="$">
+                        <input type="text" name="currency" autocomplete="off" value="<?= $currency['name'] ?>"
+                            placeholder="Currency Name">
+                        <input type="text" name="code" autocomplete="off" value="<?= $currency['code'] ?>"
+                            placeholder="Currency Code" <?= !$canDelete ? 'disabled' : '' ?>>
                         <button class="image-button medium" onClick="editCurrency(<?= $currency['id'] ?>)" name="save"
                             title="<?= translate('save_currency', $i18n) ?>">
                             <?php include "images/siteicons/svg/save.php"; ?>
@@ -1113,7 +1112,8 @@ class="<?= (!isset($aiSettings['type']) || $aiSettings['type'] != 'ollama') ? 'h
                     <option value=""><?= translate('select_ai_model', $i18n) ?></option>
                     <?php if (!empty($aiSettings['model'])): ?>
                         <option value="<?= htmlspecialchars($aiSettings['model']) ?>" selected>
-                            <?= htmlspecialchars($aiSettings['model']) ?></option>
+                            <?= htmlspecialchars($aiSettings['model']) ?>
+                        </option>
                     <?php endif; ?>
                 </select>
             </div>
@@ -1144,7 +1144,9 @@ class="secondary-button thin mobile-grow-force <?= !$canBeExecuted ? 'hidden' :
             <div class="settings-notes">
                 <p><i class="fa-solid fa-circle-info"></i><?= translate('ai_recommendations_info', $i18n) ?></p>
                 <p><i class="fa-solid fa-circle-info"></i><?= translate('may_take_time', $i18n) ?></p>
-                <p><i class="fa-solid fa-circle-info"></i><?= translate('recommendations_visible_on_dashboard', $i18n) ?></p>
+                <p><i
+                        class="fa-solid fa-circle-info"></i><?= translate('recommendations_visible_on_dashboard', $i18n) ?>
+                </p>
             </div>
         </div>
     </section>

From d484f8b50d12fbf0e2e2ca211d2496a6c1d10be2 Mon Sep 17 00:00:00 2001
From: Miguel Ribeiro <k.d.mintnick@gmail.com>
Date: Sat, 20 Dec 2025 15:37:30 +0000
Subject: [PATCH 3/3] extend notification to 180 days

---
 subscriptions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subscriptions.php b/subscriptions.php
index 9095a6b8e..ff76f97d5 100644
--- a/subscriptions.php
+++ b/subscriptions.php
@@ -471,7 +471,7 @@ class="button secondary-button autofill-next-payment hideOnMobile"
             <option value="0"><?= translate('on_due_date', $i18n) ?></option>
             <option value="1">1 <?= translate('day_before', $i18n) ?></option>
             <?php
-            for ($i = 2; $i <= 90; $i++) {
+            for ($i = 2; $i <= 180; $i++) {
               ?>
               <option value="<?= $i ?>"><?= $i ?>   <?= translate('days_before', $i18n) ?></option>
               <?php