4 files changed, 36 insertions, 18 deletions

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++;