Add fixes for Nextcloud-related webapps (#66)

23 files changed, 255 insertions, 102 deletions

diff --git a/recipes/nextcloud-calendar/index.js b/recipes/nextcloud-calendar/index.js
index 8d77048..dd41f72 100644
--- a/recipes/nextcloud-calendar/index.js
+++ b/recipes/nextcloud-calendar/index.js
@@ -1,5 +1 @@
-module.exports = Ferdium => class NextcloudCarnet extends Ferdium {
-  buildUrl(url) {
-    return `${url}/apps/calendar/`;
-  }
-};
+module.exports = Ferdium => Ferdium;
diff --git a/recipes/nextcloud-calendar/package.json b/recipes/nextcloud-calendar/package.json
index fa8b3d9..027ea9b 100644
--- a/recipes/nextcloud-calendar/package.json
+++ b/recipes/nextcloud-calendar/package.json
@@ -1,13 +1,14 @@
 {
   "id": "nextcloud-calendar",
   "name": "Nextcloud Calendar",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "license": "MIT",
-  "repository": "https://github.com/eandersons/ferdi-recipe-nextcloud-calendar",
+  "repository": "https://github.com/csolisr/ferdium-recipes/tree/master/recipes/nextcloud-calendar/",
   "config": {
     "hasNotificationSound": true,
-    "hasIndirectMessages": true,
-    "hasCustomUrl": true,
-    "serviceURL": "https://{nextcloud}/apps/calendar/"
+    "hasTeamId": true,
+    "urlInputPrefix": "https://",
+    "urlInputSuffix": "/apps/calendar/",
+    "serviceURL": "https://{teamId}/apps/calendar/"
   }
 }
diff --git a/recipes/nextcloud-calendar/service.css b/recipes/nextcloud-calendar/service.css
index a0016ae..6e04c63 100644
--- a/recipes/nextcloud-calendar/service.css
+++ b/recipes/nextcloud-calendar/service.css
@@ -1,15 +1,33 @@
 /* Hide all app links and contacts menu link in the top menu except for
 Calendar */
-#appmenu li:not([data-id="calendar"]), #contactsmenu {display: none;}
+#appmenu li:not([data-id="calendar"]),
+#contactsmenu {
+  display: none;
+}
+
+/* Change the cursor to default for top menu Nextcloud home and Calendar
+links and disable them */
+#nextcloud,
+#appmenu li[data-id="calendar"] a {
+    cursor:default;
+    pointer-events: none;
+}
 
-/* Change the cursor to default for top menu Nextcloud home, Calendar and
-settings links and disable them */
-#nextcloud, #appmenu li[data-id="calendar"] a, #settings {
-    cursor:default; pointer-events: none;
+/* Hide all settings options, except the option to log out */
+#settings #expanddiv li:not([data-id='logout']) {
+  display: none;
+}
+
+/* Fix the margin of the dropdown */
+#settings #expanddiv,
+#settings #expanddiv > ul {
+  min-height: 0;
 }
 
 /* Hide "More" link in the top menu */
-#more-apps {display: none !important;}
+#more-apps {
+  display: none !important;
+}
 
 /* Hide notifications that are not related to calendar */
 .notifications .notification-wrapper .notification:not([object_type="dav"]) {
@@ -18,4 +36,6 @@ settings links and disable them */
 
 /* Hide "Dismiss all notifications" as this action will dismiss also hidden
 notifications */
-.notification-wrapper .dismiss-all {display: none;}
+.notification-wrapper .dismiss-all {
+  display: none;
+}
diff --git a/recipes/nextcloud-calendar/webview.js b/recipes/nextcloud-calendar/webview.js
index 84c55f2..49ed705 100644
--- a/recipes/nextcloud-calendar/webview.js
+++ b/recipes/nextcloud-calendar/webview.js
@@ -1,12 +1,15 @@
 const _path = _interopRequireDefault(require('path'));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(obj) {
+  return obj && obj.__esModule ? obj : { default: obj };
+}
 
 module.exports = Ferdium => {
   const getMessages = () => {
-    const direct = document.querySelectorAll(
+    const directSelector = document.querySelectorAll(
       '.notifications .notification-wrapper .notification[object_type="dav"]',
-    ).length;
+    );
+    const direct = directSelector ? Ferdium.safeParseInt(selector.length) : 0;
 
     Ferdium.setBadge(direct);
   };
diff --git a/recipes/nextcloud-carnet/index.js b/recipes/nextcloud-carnet/index.js
index f684bbd..dd41f72 100644
--- a/recipes/nextcloud-carnet/index.js
+++ b/recipes/nextcloud-carnet/index.js
@@ -1,5 +1 @@
-module.exports = Ferdium => class NextcloudCarnet extends Ferdium {
-  buildUrl(url) {
-    return `${url}/apps/carnet/`;
-  }
-};
+module.exports = Ferdium => Ferdium;
diff --git a/recipes/nextcloud-carnet/package.json b/recipes/nextcloud-carnet/package.json
index 82c1eb7..67c7515 100644
--- a/recipes/nextcloud-carnet/package.json
+++ b/recipes/nextcloud-carnet/package.json
@@ -1,13 +1,15 @@
 {
   "id": "nextcloud-carnet",
   "name": "Carnet (Nextcloud)",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "license": "MIT",
-  "repository": "https://github.com/eandersons/ferdi-recipe-nextcloud-carnet",
+  "repository": "https://github.com/csolisr/ferdium-recipes/tree/master/recipes/nextcloud-carnet/",
   "config": {
     "hasNotificationSound": true,
     "hasIndirectMessages": true,
-    "hasCustomUrl": true,
-    "serviceURL": "https://{nextcloud}/apps/carnet/"
+    "hasTeamId": true,
+    "urlInputPrefix": "https://",
+    "urlInputSuffix": "/apps/carnet/",
+    "serviceURL": "https://{teamId}/apps/carnet/"
   }
 }
diff --git a/recipes/nextcloud-carnet/service.css b/recipes/nextcloud-carnet/service.css
index 8e767c2..9b2948e 100644
--- a/recipes/nextcloud-carnet/service.css
+++ b/recipes/nextcloud-carnet/service.css
@@ -1,11 +1,41 @@
-/* Hide all app links and contacts link in the top menu except for Carnet */
-#appmenu li:not([data-id="carnet"]), #contactsmenu {display: none;}
+/* Hide all app links and contacts menu link in the top menu except for
+Carnet */
+#appmenu li:not([data-id='carnet']),
+#contactsmenu {
+  display: none;
+}
+
+/* Change the cursor to the default for Nextcloud home and Carnet
+links in the top menu and disable them */
+#nextcloud,
+#appmenu li[data-id='carnet'] a {
+  cursor: default;
+  pointer-events: none;
+}
+
+/* Hide all settings options, except the option to log out */
+#settings #expanddiv li:not([data-id='logout']) {
+  display: none;
+}
 
-/* Change cursor to the default pointer for Nextcloud home, Carnet and settings
-link and disable them in the top menu */
-#nextcloud, #appmenu li[data-id="carnet"] a, #settings {
-    cursor:default; pointer-events: none;
+/* Fix the margin of the dropdown */
+#settings #expanddiv,
+#settings #expanddiv > ul {
+  min-height: 0;
 }
 
 /* Hide "More" link in the top menu */
-#more-apps {display: none !important;}
+#more-apps {
+  display: none !important;
+}
+
+/* Hide notifications that are not related to Carnet */
+.notifications .notification-wrapper .notification:not([object_type="carnet"]) {
+  display: none;
+}
+
+/* Hide "Dismiss all notifications" as this action will dismiss also hidden
+notifications */
+.notification-wrapper .dismiss-all {
+  display: none;
+}
diff --git a/recipes/nextcloud-carnet/webview.js b/recipes/nextcloud-carnet/webview.js
index e9e6433..b3836a7 100644
--- a/recipes/nextcloud-carnet/webview.js
+++ b/recipes/nextcloud-carnet/webview.js
@@ -4,12 +4,15 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 module.exports = Ferdium => {
   const getMessages = () => {
-    const direct = document.querySelectorAll(
+    const directSelector = document.querySelectorAll(
       '.app-navigation-entry-utils-counter.highlighted',
-    ).length;
-    const indirect = document.querySelectorAll(
+    );
+    const direct = directSelector ? Ferdium.safeParseInt(directSelector.length) : 0;
+
+    const indirectSelector = document.querySelectorAll(
       '.app-navigation-entry-utils-counter:not(.highlighted)',
-    ).length;
+    );
+    const indirect = indirectSelector ? Ferdium.safeParseInt(indirectSelector.length) : 0;
 
     Ferdium.setBadge(direct, indirect);
   };
diff --git a/recipes/nextcloud-cospend/index.js b/recipes/nextcloud-cospend/index.js
index 4ba7df9..dd41f72 100644
--- a/recipes/nextcloud-cospend/index.js
+++ b/recipes/nextcloud-cospend/index.js
@@ -1,5 +1 @@
-module.exports = Ferdium => class NextcloudCarnet extends Ferdium {
-  buildUrl(url) {
-    return `${url}/apps/cospend/`;
-  }
-};
+module.exports = Ferdium => Ferdium;
diff --git a/recipes/nextcloud-cospend/package.json b/recipes/nextcloud-cospend/package.json
index bddfcfd..7367589 100644
--- a/recipes/nextcloud-cospend/package.json
+++ b/recipes/nextcloud-cospend/package.json
@@ -1,13 +1,15 @@
 {
   "id": "nextcloud-cospend",
   "name": "Nextcloud Cospend",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "license": "MIT",
-  "repository": "https://github.com/eandersons/ferdi-recipe-nextcloud-cospend",
+  "repository": "https://github.com/csolisr/ferdium-recipes/tree/master/recipes/nextcloud-cospend/",
   "config": {
     "hasNotificationSound": true,
     "hasIndirectMessages": true,
-    "hasCustomUrl": true,
-    "serviceURL": "https://{nextcloud}/apps/cospend/"
+    "hasTeamId": true,
+    "urlInputPrefix": "https://",
+    "urlInputSuffix": "/apps/cospend/",
+    "serviceURL": "https://{teamId}/apps/cospend/"
   }
 }
diff --git a/recipes/nextcloud-cospend/service.css b/recipes/nextcloud-cospend/service.css
index 764531b..85171b0 100644
--- a/recipes/nextcloud-cospend/service.css
+++ b/recipes/nextcloud-cospend/service.css
@@ -1,12 +1,41 @@
 /* Hide all app links and contacts menu link in the top menu except for
 Cospend */
-#appmenu li:not([data-id="cospend"]), #contactsmenu {display: none;}
+#appmenu li:not([data-id='cospend']),
+#contactsmenu {
+  display: none;
+}
 
-/* Change the cursor to the default for Nextcloud home, Cospend and settings
+/* Change the cursor to the default for Nextcloud home and Cospend
 links in the top menu and disable them */
-#nextcloud, #appmenu li[data-id="cospend"] a, #settings {
-    cursor:default; pointer-events: none;
+#nextcloud,
+#appmenu li[data-id='cospend'] a {
+  cursor: default;
+  pointer-events: none;
+}
+
+/* Hide all settings options, except the option to log out */
+#settings #expanddiv li:not([data-id='logout']) {
+  display: none;
+}
+
+/* Fix the margin of the dropdown */
+#settings #expanddiv,
+#settings #expanddiv > ul {
+  min-height: 0;
 }
 
 /* Hide "More" link in the top menu */
-#more-apps {display: none !important;}
+#more-apps {
+  display: none !important;
+}
+
+/* Hide notifications that are not related to Cospend */
+.notifications .notification-wrapper .notification:not([object_type="cospend"]) {
+  display: none;
+}
+
+/* Hide "Dismiss all notifications" as this action will dismiss also hidden
+notifications */
+.notification-wrapper .dismiss-all {
+  display: none;
+}
diff --git a/recipes/nextcloud-cospend/webview.js b/recipes/nextcloud-cospend/webview.js
index e9e6433..b3836a7 100644
--- a/recipes/nextcloud-cospend/webview.js
+++ b/recipes/nextcloud-cospend/webview.js
@@ -4,12 +4,15 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 module.exports = Ferdium => {
   const getMessages = () => {
-    const direct = document.querySelectorAll(
+    const directSelector = document.querySelectorAll(
       '.app-navigation-entry-utils-counter.highlighted',
-    ).length;
-    const indirect = document.querySelectorAll(
+    );
+    const direct = directSelector ? Ferdium.safeParseInt(directSelector.length) : 0;
+
+    const indirectSelector = document.querySelectorAll(
       '.app-navigation-entry-utils-counter:not(.highlighted)',
-    ).length;
+    );
+    const indirect = indirectSelector ? Ferdium.safeParseInt(indirectSelector.length) : 0;
 
     Ferdium.setBadge(direct, indirect);
   };
diff --git a/recipes/nextcloud-news/package.json b/recipes/nextcloud-news/package.json
index 8ea85de..83db65b 100644
--- a/recipes/nextcloud-news/package.json
+++ b/recipes/nextcloud-news/package.json
@@ -1,9 +1,9 @@
 {
   "id": "nextcloud-news",
   "name": "Nextcloud News",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "license": "MIT",
-  "repository": "https://github.com/csolisr/recipes/tree/master/recipes/nextcloud-news/",
+  "repository": "https://github.com/csolisr/ferdium-recipes/tree/master/recipes/nextcloud-news/",
   "config": {
     "hasNotificationSound": true,
     "hasTeamId": true,
diff --git a/recipes/nextcloud-news/service.css b/recipes/nextcloud-news/service.css
index ea90cc9..1a87a84 100644
--- a/recipes/nextcloud-news/service.css
+++ b/recipes/nextcloud-news/service.css
@@ -5,16 +5,37 @@ News */
   display: none;
 }
 
-/* Change the cursor to the default for Nextcloud home, News and settings
+/* Change the cursor to the default for Nextcloud home and News
 links in the top menu and disable them */
 #nextcloud,
-#appmenu li[data-id='news'] a,
-#settings {
+#appmenu li[data-id='news'] a {
   cursor: default;
   pointer-events: none;
 }
 
+/* Hide all settings options, except the option to log out */
+#settings #expanddiv li:not([data-id='logout']) {
+  display: none;
+}
+
+/* Fix the margin of the dropdown */
+#settings #expanddiv,
+#settings #expanddiv > ul {
+  min-height: 0;
+}
+
 /* Hide "More" link in the top menu */
 #more-apps {
   display: none !important;
 }
+
+/* Hide notifications that are not related to News */
+.notifications .notification-wrapper .notification:not([object_type="news"]) {
+  display: none;
+}
+
+/* Hide "Dismiss all notifications" as this action will dismiss also hidden
+notifications */
+.notification-wrapper .dismiss-all {
+  display: none;
+}
diff --git a/recipes/nextcloud-news/webview.js b/recipes/nextcloud-news/webview.js
index c5e295e..33bf0c5 100644
--- a/recipes/nextcloud-news/webview.js
+++ b/recipes/nextcloud-news/webview.js
@@ -6,10 +6,10 @@ function _interopRequireDefault(obj) {
 
 module.exports = Ferdium => {
   const getMessages = () => {
-    const selector = document.querySelector(
+    const directSelector = document.querySelector(
       '.subscriptions-feed .app-navigation-entry-utils-counter',
     );
-    const direct = selector ? Ferdium.safeParseInt(selector.textContent) : 0;
+    const direct = directSelector ? Ferdium.safeParseInt(directSelector.textContent) : 0;
 
     Ferdium.setBadge(direct);
   };
diff --git a/recipes/nextcloud-talk/index.js b/recipes/nextcloud-talk/index.js
index 8b520e9..dd41f72 100644
--- a/recipes/nextcloud-talk/index.js
+++ b/recipes/nextcloud-talk/index.js
@@ -1,5 +1 @@
-module.exports = Ferdium => class Nextcloud extends Ferdium {
-  buildUrl(url) {
-    return `${url}/apps/spreed/`;
-  }
-};
+module.exports = Ferdium => Ferdium;
diff --git a/recipes/nextcloud-talk/package.json b/recipes/nextcloud-talk/package.json
index ac55283..8ce25ac 100644
--- a/recipes/nextcloud-talk/package.json
+++ b/recipes/nextcloud-talk/package.json
@@ -1,12 +1,15 @@
 {
   "id": "nextcloud-talk",
   "name": "Nextcloud Talk",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "license": "MIT",
+  "repository": "https://github.com/csolisr/ferdium-recipes/tree/master/recipes/nextcloud-tasks/",
   "config": {
     "hasNotificationSound": true,
     "hasIndirectMessages": true,
-    "hasCustomUrl": true,
-    "serviceURL": "https://{nextcloud}/apps/spreed/"
+    "hasTeamId": true,
+    "urlInputPrefix": "https://",
+    "urlInputSuffix": "/apps/spreed/",
+    "serviceURL": "https://{teamId}/apps/spreed/"
   }
 }
diff --git a/recipes/nextcloud-talk/service.css b/recipes/nextcloud-talk/service.css
index f4f08bc..ccdba58 100644
--- a/recipes/nextcloud-talk/service.css
+++ b/recipes/nextcloud-talk/service.css
@@ -3,20 +3,34 @@
   display: none;
 }
 
-/* Change cursor to the default pointer for top menu Nextcloud home, Talk and
-settings links and disable them */
-#nextcloud, #appmenu li[data-id="spreed"] a, #settings {
+/* Change cursor to the default pointer for top menu Nextcloud home and Talk
+links and disable them */
+#nextcloud,
+#appmenu li[data-id="spreed"] a {
   cursor: default;
   pointer-events: none;
 }
 
+/* Hide all settings options, except the option to log out */
+#settings #expanddiv li:not([data-id='logout']) {
+  display: none;
+}
+
+/* Fix the margin of the dropdown */
+#settings #expanddiv,
+#settings #expanddiv > ul {
+  min-height: 0;
+}
+
 /* Hide "More" link in the top menu */
 #more-apps {
   display: none !important;
 }
 
-/* Hide notifications that are not related to calendar */
-.notifications .notification-wrapper .notification {display: none;}
+/* Hide notifications that are not related to Talk */
+.notifications .notification-wrapper .notification {
+  display: none;
+}
 .notifications .notification-wrapper .notification[object_type="chat"],
 .notifications .notification-wrapper .notification[object_type="room"]  {
   display: initial;
@@ -24,4 +38,6 @@ settings links and disable them */
 
 /* Hide "Dismiss all notifications" as this action will dismiss also hidden
 notifications */
-.notification-wrapper .dismiss-all {display: none;}
+.notification-wrapper .dismiss-all {
+  display: none;
+}
diff --git a/recipes/nextcloud-talk/webview.js b/recipes/nextcloud-talk/webview.js
index 1ae3783..77b969b 100644
--- a/recipes/nextcloud-talk/webview.js
+++ b/recipes/nextcloud-talk/webview.js
@@ -5,21 +5,24 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 module.exports = Ferdium => {
   const getMessages = () => {
     let direct = 0;
+
     const notificationWrapper = document.querySelector(
       '.notifications .notification-wrapper',
     );
 
     if (notificationWrapper) {
-      direct = notificationWrapper.querySelectorAll(
+      const directSelector = notificationWrapper.querySelectorAll(
         '.notification[object_type="chat"], .notification[object_type="room"]',
-      ).length;
+      );
+      direct = directSelector ? Ferdium.safeParseInt(directSelector.length) : 0;
     }
 
     let indirect = 0;
 
     for (const counter of document.querySelectorAll('.app-navigation-entry__counter')) {
-        indirect += Number(counter.textContent);
-      }
+      const entryCounter = Ferdium.safeParseInt(counter.textContent) : 0;
+      indirect += entryCounter;
+    }
 
     if (document.title.startsWith("*")) {
       indirect++;
diff --git a/recipes/nextcloud-tasks/index.js b/recipes/nextcloud-tasks/index.js
index f5f6746..dd41f72 100644
--- a/recipes/nextcloud-tasks/index.js
+++ b/recipes/nextcloud-tasks/index.js
@@ -1,5 +1 @@
-module.exports = Ferdium => class NextcloudCarnet extends Ferdium {
-  buildUrl(url) {
-    return `${url}/apps/tasks/`;
-  }
-};
+module.exports = Ferdium => Ferdium;
diff --git a/recipes/nextcloud-tasks/package.json b/recipes/nextcloud-tasks/package.json
index c1b0558..91942e4 100644
--- a/recipes/nextcloud-tasks/package.json
+++ b/recipes/nextcloud-tasks/package.json
@@ -1,13 +1,15 @@
 {
   "id": "nextcloud-tasks",
   "name": "Nextcloud Tasks",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "license": "MIT",
-  "repository": "https://github.com/eandersons/ferdi-recipe-nextcloud-tasks",
+  "repository": "https://github.com/csolisr/ferdium-recipes/tree/master/recipes/nextcloud-tasks/",
   "config": {
     "hasNotificationSound": true,
     "hasIndirectMessages": true,
-    "hasCustomUrl": true,
-    "serviceURL": "https://{nextcloud}/apps/tasks/"
+    "hasTeamId": true,
+    "urlInputPrefix": "https://",
+    "urlInputSuffix": "/apps/tasks/",
+    "serviceURL": "https://{teamId}/apps/tasks/"
   }
 }
diff --git a/recipes/nextcloud-tasks/service.css b/recipes/nextcloud-tasks/service.css
index 805b44b..7f8495f 100644
--- a/recipes/nextcloud-tasks/service.css
+++ b/recipes/nextcloud-tasks/service.css
@@ -1,12 +1,42 @@
 /* Hide all app links and contacts menu link in the top menu except for
 Tasks */
-#appmenu li:not([data-id="tasks"]), #contactsmenu {display: none;}
+#appmenu li:not([data-id="tasks"]),
+#contactsmenu {
+  display: none;
+}
 
-/* Change the cursor to the default for Nextcloud home, Tasks and settings
+/* Change the cursor to the default for Nextcloud home and Tasks
 links in the top menu and disable them */
-#nextcloud, #appmenu li[data-id="tasks"] a, #settings {
-    cursor: default; pointer-events: none;
+#nextcloud,
+#appmenu li[data-id="tasks"] a {
+    cursor: default;
+    pointer-events: none;
+}
+
+/* Hide all settings options, except the option to log out */
+#settings #expanddiv li:not([data-id='logout']) {
+  display: none;
+}
+
+/* Fix the margin of the dropdown */
+#settings #expanddiv,
+#settings #expanddiv > ul {
+  min-height: 0;
 }
 
 /* Hide "More" link in the top menu */
-#more-apps {display: none !important;}
+#more-apps {
+  display: none !important;
+}
+
+/* Hide notifications that are not related to Tasks */
+.notifications .notification-wrapper .notification:not([object_type="tasks"]) {
+    display: none;
+}
+
+/* Hide "Dismiss all notifications" as this action will dismiss also hidden
+notifications */
+.notification-wrapper .dismiss-all {
+  display: none;
+}
+
diff --git a/recipes/nextcloud-tasks/webview.js b/recipes/nextcloud-tasks/webview.js
index e9e6433..717fed7 100644
--- a/recipes/nextcloud-tasks/webview.js
+++ b/recipes/nextcloud-tasks/webview.js
@@ -1,15 +1,20 @@
 const _path = _interopRequireDefault(require('path'));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(obj) {
+  return obj && obj.__esModule ? obj : { default: obj };
+}
 
 module.exports = Ferdium => {
   const getMessages = () => {
-    const direct = document.querySelectorAll(
+    const directSelector = document.querySelectorAll(
       '.app-navigation-entry-utils-counter.highlighted',
-    ).length;
-    const indirect = document.querySelectorAll(
+    );
+    const direct = directSelector ? Ferdium.safeParseInt(directSelector.length) : 0;
+
+    const indirectSelector = document.querySelectorAll(
       '.app-navigation-entry-utils-counter:not(.highlighted)',
-    ).length;
+    );
+    const indirect = indirectSelector ? Ferdium.safeParseInt(indirectSelector.length) : 0;
 
     Ferdium.setBadge(direct, indirect);
   };