thelounge-plugin-ntfy 1.5.0 → 1.6.1

package/index.js

@@ -87,7 +87,12 @@ const ntfyCommand = {
           return;
         }
 
-        const userListeners = globalActiveListeners.get(client.client.name);
+        let userListeners = globalActiveListeners.get(client.client.name);
+
+        if (!userListeners) {
+          userListeners = new Map();
+          globalActiveListeners.set(client.client.name, userListeners);
+        }
 
         if (all) {
           const networks = client.client.networks;
@@ -95,11 +100,7 @@ const ntfyCommand = {
           let skipped = 0;
 
           for (const net of networks) {
-            if (
-              userListeners &&
-              typeof userListeners.has === "function" &&
-              userListeners.has(net.uuid)
-            ) {
+            if (userListeners.has(net.uuid)) {
               skipped++;
               continue;
             }
@@ -107,16 +108,7 @@ const ntfyCommand = {
             const handler = createHandler(client, net);
             net.irc.on("privmsg", handler);
 
-            if (!userListeners) {
-              const map = new Map();
-              map.set(net.uuid, { handler: handler, client: client });
-              globalActiveListeners.set(client.client.name, map);
-            } else {
-              userListeners.set(net.uuid, {
-                handler: handler,
-                client: client,
-              });
-            }
+            userListeners.set(net.uuid, { handler: handler, client: client });
 
             started++;
           }
@@ -136,11 +128,7 @@ const ntfyCommand = {
             );
           }
         } else {
-          if (
-            userListeners &&
-            typeof userListeners.has === "function" &&
-            userListeners.has(network.uuid)
-          ) {
+          if (userListeners.has(network.uuid)) {
             say("ntfy listener is already running for this network");
             return;
           }
@@ -148,16 +136,7 @@ const ntfyCommand = {
           const handler = createHandler(client, network);
           network.irc.on("privmsg", handler);
 
-          if (!userListeners) {
-            const map = new Map();
-            map.set(network.uuid, { handler: handler, client: client });
-            globalActiveListeners.set(client.client.name, map);
-          } else {
-            userListeners.set(network.uuid, {
-              handler: handler,
-              client: client,
-            });
-          }
+          userListeners.set(network.uuid, { handler: handler, client: client });
 
           say("ntfy listener started for this network");
         }
@@ -177,7 +156,12 @@ const ntfyCommand = {
           all = true;
         }
 
-        const userListeners = globalActiveListeners.get(client.client.name);
+        let userListeners = globalActiveListeners.get(client.client.name);
+
+        if (!userListeners) {
+          userListeners = new Map();
+          globalActiveListeners.set(client.client.name, userListeners);
+        }
 
         if (all) {
           const networks = client.client.networks;
@@ -185,18 +169,16 @@ const ntfyCommand = {
           let skipped = 0;
 
           for (const net of networks) {
-            if (
-              !userListeners ||
-              typeof userListeners.has !== "function" ||
-              !userListeners.has(net.uuid)
-            ) {
+            if (!userListeners.has(net.uuid)) {
               skipped++;
               continue;
             }
 
             const { handler } = userListeners.get(net.uuid);
             net.irc.removeListener("privmsg", handler);
+
             userListeners.delete(net.uuid);
+
             stopped++;
           }
 
@@ -215,17 +197,14 @@ const ntfyCommand = {
             );
           }
         } else {
-          if (
-            !userListeners ||
-            typeof userListeners.has !== "function" ||
-            !userListeners.has(network.uuid)
-          ) {
+          if (!userListeners.has(network.uuid)) {
             say("ntfy listener is not running for this network");
             return;
           }
 
           const { handler } = userListeners.get(network.uuid);
           network.irc.removeListener("privmsg", handler);
+
           userListeners.delete(network.uuid);
 
           say("ntfy listener stopped for this network");
@@ -246,27 +225,24 @@ const ntfyCommand = {
           all = true;
         }
 
-        const userListeners = globalActiveListeners.get(client.client.name);
+        let userListeners = globalActiveListeners.get(client.client.name);
+
+        if (!userListeners) {
+          userListeners = new Map();
+          globalActiveListeners.set(client.client.name, userListeners);
+        }
 
         if (all) {
           const networks = client.client.networks;
           for (const net of networks) {
-            if (
-              userListeners &&
-              typeof userListeners.has === "function" &&
-              userListeners.has(net.uuid)
-            ) {
+            if (userListeners.has(net.uuid)) {
               say(`${net.name}: running`);
             } else {
               say(`${net.name}: not running`);
             }
           }
         } else {
-          if (
-            userListeners &&
-            typeof userListeners.has === "function" &&
-            userListeners.has(network.uuid)
-          ) {
+          if (userListeners.has(network.uuid)) {
             say("ntfy listener is running for this network");
           } else {
             say("ntfy listener is not running for this network");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thelounge-plugin-ntfy",
-  "version": "1.5.0",
+  "version": "1.6.1",
   "description": "A plugin for The Lounge that sends push notifications via ntfy when highlighted",
   "keywords": [
     "thelounge",

package/src/config.js

@@ -122,7 +122,7 @@ const userConfigSchema = {
       properties: {
         notify_on_private_messages: {
           type: "object",
-          additionalProperties: { type: ["boolean", "string"] },
+          additionalProperties: { type: "boolean" },
           default: {},
         },
       },

package/src/handler.js

@@ -10,11 +10,21 @@ function createHandler(client, network) {
       return;
     }
 
+    const isPM = data.target === network.nick;
+
+    const channel = isPM
+      ? network.channels.find((chan) => chan.name === data.nick)
+      : network.channels.find((chan) => chan.name === data.target);
+
+    if (channel.muted) {
+      // Ignore messages in muted channels
+      return;
+    }
+
     const highlightRegex = new RegExp(network.highlightRegex, "i");
     const message = data.message || "";
 
     const mentioned = highlightRegex.test(message);
-    const isPM = data.target === network.nick;
 
     let notify = false;
     let userConfig;