thelounge-plugin-ntfy 1.6.1 → 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>
@@ -426,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;
                 }
 
@@ -451,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.1",
+  "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);