Add fixes for Nextcloud-related webapps (#66)

4 files changed, 51 insertions, 20 deletions

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);
   };