thelounge-plugin-ntfy 1.6.0 → 1.6.2

package/index.js

@@ -7,7 +7,6 @@ const {
   loadUserConfig,
   saveUserSetting,
   saveNetworkSetting,
-  PER_NETWORK_KEYS,
 } = require("./src/config.js");
 
 // user -> Map<network.uuid -> handler and client>
@@ -87,7 +86,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 +99,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 +107,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 +127,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 +135,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 +155,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 +168,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 +196,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 +224,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");
@@ -450,10 +425,7 @@ const ntfyCommand = {
                 const setArgs = networkArgs.slice(1);
 
                 if (setArgs.length < 2) {
-                  say("Usage: /ntfy config network set <setting_key> <value>");
-                  say(
-                    `Available per-network settings: ${Array.from(PER_NETWORK_KEYS).join(", ")}`,
-                  );
+                  helpMessage();
                   return;
                 }
 
@@ -475,10 +447,7 @@ const ntfyCommand = {
                 const removeArgs = networkArgs.slice(1);
 
                 if (removeArgs.length < 1) {
-                  say("Usage: /ntfy config network remove <setting_key>");
-                  say(
-                    `Available per-network settings: ${Array.from(PER_NETWORK_KEYS).join(", ")}`,
-                  );
+                  helpMessage();
                   return;
                 }
 

package/package.json

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

package/src/handler.js

@@ -3,6 +3,13 @@
 const { loadUserConfig, getNetworkSetting } = require("./config.js");
 const { PluginLogger } = require("./logger.js");
 
+function stripIrcFormatting(message) {
+  return message.replace(
+    /[\x02\x0F\x16\x1D\x1F]|(?:\x03(?:\d{1,2}(?:,\d{1,2})?)?)/g,
+    "",
+  );
+}
+
 function createHandler(client, network) {
   return async (data) => {
     // Ignore own messages
@@ -95,7 +102,7 @@ function createHandler(client, network) {
           title: isPM
             ? `${network.name}: ${data.nick}`
             : `${network.name} ${data.target}: ${data.nick}`,
-          message: message,
+          message: stripIrcFormatting(message),
         });
       } catch (e) {
         PluginLogger.error("Failed to send ntfy notification", e);