Merge pull request #1046 from simatec/master

(simatec) Update Dev-Branch

README.md

@@ -52,8 +52,14 @@ When the adapter crashes or another Code error happens, this error message that
 
 ## Changelog
 <!-- ### **WORK IN PROGRESS** -->
-### **WORK IN PROGRESS**
+### 2.9.7 (2023-12-12)
+* (simatec) URL Update
+* (simatec) Fix redis Password
+
+### 2.9.6 (2023-12-10)
+* (simatec) Gotify Notication added
 * (simatec) dependencies updated
+* (simatec) Copypath check added
 
 ### 2.9.5 (2023-11-29)
 * (simatec) dependencies updated

admin/i18n/en/translations.json

@@ -101,6 +101,8 @@
   "Google Drive Path for iobroker backup": "Google Drive path for ioBroker backup",
   "Google Drive path": "Google Drive path",
   "Google Drive: Yes": "Google Drive: Yes",
+  "Gotify": "Gotify",
+  "Gotify instance": "Gotify instance",
   "Grafana API-Key or Service Token": "Grafana API-Key or Service Token",
   "Grafana Backup": "Grafana",
   "Grafana Hostname": "Grafana host name / IP",

admin/i18n/es/translations.json

@@ -101,6 +101,8 @@
   "Google Drive Path for iobroker backup": "Ruta de Google Drive para copia de seguridad de iobroker",
   "Google Drive path": "Ruta de acceso de Google Drive",
   "Google Drive: Yes": "Google Drive: si",
+  "Gotify": "Gotify",
+  "Gotify instance": "Caso Gotify",
   "Grafana API-Key or Service Token": "Grafana API-Key o Token de servicio",
   "Grafana Backup": "Grafana",
   "Grafana Hostname": "Nombre de host / IP de Grafana",

admin/i18n/fr/translations.json

@@ -101,6 +101,8 @@
   "Google Drive Path for iobroker backup": "Google Drive Path pour la sauvegarde iobroker",
   "Google Drive path": "Chemin Google Drive",
   "Google Drive: Yes": "Google Drive: oui",
+  "Gotify": "Gotify",
+  "Gotify instance": "Gotify instance",
   "Grafana API-Key or Service Token": "Grafana API-Key ou jeton de service",
   "Grafana Backup": "Grafana",
   "Grafana Hostname": "Nom d'hôte / IP Grafana",

admin/i18n/it/translations.json

@@ -101,6 +101,8 @@
   "Google Drive Path for iobroker backup": "Percorso di Google Drive per il backup di iobroker",
   "Google Drive path": "Percorso di Google Drive",
   "Google Drive: Yes": "Google Drive: sì",
+  "Gotify": "Gotify",
+  "Gotify instance": "Esempio di guadagno",
   "Grafana API-Key or Service Token": "Token API-Key o servizio Grafana",
   "Grafana Backup": "Grafana",
   "Grafana Hostname": "Nome host / IP Grafana",

admin/i18n/nl/translations.json

@@ -101,6 +101,8 @@
   "Google Drive Path for iobroker backup": "Google Drive Path voor iobroker-back-up",
   "Google Drive path": "Google Drive-pad",
   "Google Drive: Yes": "Google Drive: ja",
+  "Gotify": "Gotify",
+  "Gotify instance": "Vertaling:",
   "Grafana API-Key or Service Token": "Grafana API-Key of Service Token",
   "Grafana Backup": "Grafana",
   "Grafana Hostname": "Grafana hostnaam / IP",

admin/i18n/pl/translations.json

@@ -101,6 +101,8 @@
   "Google Drive Path for iobroker backup": "Ścieżka do Dysku Google do tworzenia kopii zapasowych iobroker",
   "Google Drive path": "Ścieżka Dysku Google",
   "Google Drive: Yes": "Dysk Google: Tak",
+  "Gotify": "Gotify",
+  "Gotify instance": "Gotyfikować",
   "Grafana API-Key or Service Token": "Grafana API-Key or Service Token (ang.)",
   "Grafana Backup": "Grafana",
   "Grafana Hostname": "Nazwa / adres IP hosta Grafana",

admin/i18n/pt/translations.json

@@ -101,6 +101,8 @@
   "Google Drive Path for iobroker backup": "Caminho do Google Drive para backup do iobroker",
   "Google Drive path": "Caminho do Google Drive",
   "Google Drive: Yes": "Google Drive: sim",
+  "Gotify": "Gotify",
+  "Gotify instance": "Exemplo de identificação",
   "Grafana API-Key or Service Token": "Gráfico API-Key ou Token de Serviço",
   "Grafana Backup": "Grafana",
   "Grafana Hostname": "Nome / IP do host Grafana",

admin/i18n/ru/translations.json

@@ -101,6 +101,8 @@
   "Google Drive Path for iobroker backup": "Путь для резервного копирования ioBroker",
   "Google Drive path": "Путь",
   "Google Drive: Yes": "Google Диск: Да",
+  "Gotify": "Gotify",
+  "Gotify instance": "Gotify пример",
   "Grafana API-Key or Service Token": "Grafana API-Key или сервисный токен",
   "Grafana Backup": "Grafana",
   "Grafana Hostname": "Имя хоста / IP",

admin/i18n/uk/translations.json

@@ -101,6 +101,8 @@
   "Google Drive Path for iobroker backup": "Шлях Google Drive для резервного копіювання ioBroker",
   "Google Drive path": "Шлях Google Drive",
   "Google Drive: Yes": "Диск Google: так",
+  "Gotify": "Gotify",
+  "Gotify instance": "Зареєструватися",
   "Grafana API-Key or Service Token": "API-ключ або маркер служби Grafana",
   "Grafana Backup": "Графана",
   "Grafana Hostname": "Ім'я хосту Grafana / IP",

admin/i18n/zh-cn/translations.json

@@ -101,6 +101,8 @@
   "Google Drive Path for iobroker backup": "ioBroker 备份的 Google Drive 路径",
   "Google Drive path": "谷歌云端硬盘路径",
   "Google Drive: Yes": "谷歌驱动器：是的",
+  "Gotify": "Gotify",
+  "Gotify instance": "评 注",
   "Grafana API-Key or Service Token": "Grafana API 密钥或服务令牌",
   "Grafana Backup": "格拉法纳",
   "Grafana Hostname": "Grafana 主机名/IP",

admin/index_m.html

@@ -817,13 +817,14 @@ <h6 class="translate title" style="background-color:#174475; font-size: 0.9rem;
                 <div class="row">
                     <div class="input-field col s11 m2">
                         <select class="value" id="notificationsType">
-                        <option value="Telegram" class="translate">Telegram</option>
-                        <option value="E-Mail" class="translate">E-Mail</option>
-                        <option value="Pushover" class="translate">Pushover</option>
-                        <option value="WhatsApp" class="translate">WhatsApp</option>
-                        <option value="Signal" class="translate">Signal</option>
-                        <option value="Matrix" class="translate">Matrix</option>
-                        <option value="Discord" class="translate">Discord</option>
+                            <option value="E-Mail" class="translate">E-Mail</option>
+                            <option value="Discord" class="translate">Discord</option>
+                            <option value="Gotify" class="translate">Gotify</option>
+                            <option value="Matrix" class="translate">Matrix</option>
+                            <option value="Pushover" class="translate">Pushover</option>
+                            <option value="Signal" class="translate">Signal</option>
+                            <option value="Telegram" class="translate">Telegram</option>
+                            <option value="WhatsApp" class="translate">WhatsApp</option>
                         </select>
                         <label for="notificationsType" class="translate">notifications type</label>
                     </div>
@@ -889,6 +890,32 @@ <h6 class="translate title" style="background-color:#174475; font-size: 0.9rem;
                         <label for="whatsappOnlyError" class="translate">Notification only on errors</label>
                     </div>
                 </div>
+                <!-- Gotify -->
+                <div class="row gotify">
+                    <div class="input-field col s12 m6 l3 gotify">
+                        <select id="gotifyInstance" class="value"></select>
+                        <label for="gotifyInstance" class="translate">Gotify instance</label>
+                    </div>
+                    <div class="input-field col s12 m6 l3 gotify">
+                        <select class="value" id="gotifyNoticeType">
+                        <option value="longGotifyNotice" class="translate">Long Notifications</option>
+                        <option value="shortGotifyNotice" class="translate">Short Notifications</option>
+                        </select>
+                        <label class="translate" for="gotifyNoticeType">Notification Style</label>
+                    </div>
+                </div>
+                <div class="row gotify">
+                    <div class="input-field col s12 m6 l3 gotify">
+                        <input type="number" class="value" id="gotifyWaitToSend" min="0" max="20"/>
+                        <label for="gotifyWaitToSend" class="translate">Waiting for the send (seconds)</label>
+                    </div>
+                </div>
+                <div class="row gotify">
+                    <div class="input-field col s12 m6 l3 gotify">
+                        <input class="value" id="gotifyOnlyError" type="checkbox"/>
+                        <label for="gotifyOnlyError" class="translate">Notification only on errors</label>
+                    </div>
+                </div>
                 <!-- Signal -->
                 <div class="row signal">
                     <div class="input-field col s12 m6 l3 signal">

admin/index_m.js

@@ -1135,6 +1135,10 @@ function load(settings, onChange) {
         fillInstances('whatsappInstance', instances, settings['whatsappInstance'], 'whatsapp-cmb');
     });
 
+    getAdapterInstances('gotify', function (instances) {
+        fillInstances('gotifyInstance', instances, settings['gotifyInstance'], 'gotify');
+    });
+
     getAdapterInstances('signal-cmb', function (instances) {
         fillInstances('signalInstance', instances, settings['signalInstance'], 'signal-cmb');
     });
@@ -1583,6 +1587,7 @@ function showHideSettings(settings) {
             $('.email').hide();
             $('.pushover').hide();
             $('.whatsapp').hide();
+            $('.gotify').hide();
             $('.signal').hide();
             $('.matrix').hide();
             $('.discord').hide();
@@ -1591,6 +1596,7 @@ function showHideSettings(settings) {
             $('.telegram').hide();
             $('.pushover').hide();
             $('.whatsapp').hide();
+            $('.gotify').hide();
             $('.signal').hide();
             $('.matrix').hide();
             $('.discord').hide();
@@ -1599,13 +1605,15 @@ function showHideSettings(settings) {
             $('.telegram').hide();
             $('.email').hide();
             $('.whatsapp').hide();
+            $('.gotify').hide();
             $('.signal').hide();
             $('.matrix').hide();
             $('.discord').hide();
             $('.pushover').show();
         } else if ($(this).val() === 'WhatsApp') {
             $('.telegram').hide();
             $('.email').hide();
+            $('.gotify').hide();
             $('.pushover').hide();
             $('.signal').hide();
             $('.matrix').hide();
@@ -1614,6 +1622,7 @@ function showHideSettings(settings) {
         } else if ($(this).val() === 'Signal') {
             $('.telegram').hide();
             $('.email').hide();
+            $('.gotify').hide();
             $('.pushover').hide();
             $('.whatsapp').hide();
             $('.matrix').hide();
@@ -1622,6 +1631,7 @@ function showHideSettings(settings) {
         } else if ($(this).val() === 'Matrix') {
             $('.telegram').hide();
             $('.email').hide();
+            $('.gotify').hide();
             $('.pushover').hide();
             $('.whatsapp').hide();
             $('.signal').hide();
@@ -1630,11 +1640,21 @@ function showHideSettings(settings) {
         } else if ($(this).val() === 'Discord') {
             $('.telegram').hide();
             $('.email').hide();
+            $('.gotify').hide();
             $('.pushover').hide();
             $('.whatsapp').hide();
             $('.signal').hide();
             $('.matrix').hide();
             $('.discord').show();
+        } else if ($(this).val() === 'Gotify') {
+            $('.telegram').hide();
+            $('.email').hide();
+            $('.discord').hide();
+            $('.pushover').hide();
+            $('.whatsapp').hide();
+            $('.signal').hide();
+            $('.matrix').hide();
+            $('.gotify').show();
         }
     }).trigger('change');