thelounge-plugin-ntfy 1.6.2 → 1.6.4

package/index.js

@@ -252,39 +252,42 @@ const ntfyCommand = {
       }
 
       case "test": {
-        const { NtfyClient } = await import("ntfy");
+        try {
+          const { NtfyClient } = await import("ntfy");
 
-        const [userConfig, errors] = loadUserConfig(client.client.name);
+          const [userConfig, errors] = loadUserConfig(client.client.name);
 
-        if (errors.length > 0) {
-          say("Cannot test ntfy due to invalid configuration:");
-          for (const error of errors) {
-            say(`- ${error.instancePath} ${error.message}`);
+          if (errors.length > 0) {
+            say("Cannot test ntfy due to invalid configuration:");
+            for (const error of errors) {
+              say(`- ${error.instancePath} ${error.message}`);
+            }
+            return;
           }
-          return;
-        }
 
-        let ntfyAuth;
+          let ntfyAuth;
 
-        if (userConfig.ntfy.token) {
-          ntfyAuth = userConfig.ntfy.token;
-        } else if (userConfig.ntfy.username && userConfig.ntfy.password) {
-          ntfyAuth = {
-            username: userConfig.ntfy.username,
-            password: userConfig.ntfy.password,
-          };
-        }
+          if (userConfig.ntfy.token) {
+            ntfyAuth = {
+              username: "",
+              password: userConfig.ntfy.token,
+            };
+          } else if (userConfig.ntfy.username && userConfig.ntfy.password) {
+            ntfyAuth = {
+              username: userConfig.ntfy.username,
+              password: userConfig.ntfy.password,
+            };
+          }
 
-        const ntfyClient = new NtfyClient({
-          server: userConfig.ntfy.server,
-          topic: userConfig.ntfy.topic,
-          priority: userConfig.ntfy.priority,
-          tags: ["speech_balloon"],
-          authorization: ntfyAuth,
-        });
+          const ntfyClient = new NtfyClient({
+            server: userConfig.ntfy.server,
+            topic: userConfig.ntfy.topic,
+            priority: userConfig.ntfy.priority,
+            tags: ["speech_balloon"],
+            authorization: ntfyAuth,
+          });
 
-        try {
-          ntfyClient.publish({
+          await ntfyClient.publish({
             title: `${network.name} #afakechannel: ntfy`,
             message: `Hello, ${client.client.name}!`,
           });

package/package.json

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

package/src/handler.js

@@ -19,13 +19,18 @@ function createHandler(client, network) {
 
     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);
+    try {
+      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;
+      if (channel && channel.muted) {
+        // Ignore messages in muted channels
+        return;
+      }
+    } catch (e) {
+      PluginLogger.error("Failed to determine channel mute status", e);
+      PluginLogger.debug(`Data: ${JSON.stringify(data)}`);
     }
 
     const highlightRegex = new RegExp(network.highlightRegex, "i");
@@ -98,7 +103,7 @@ function createHandler(client, network) {
           authorization: ntfyAuth,
         });
 
-        ntfyClient.publish({
+        await ntfyClient.publish({
           title: isPM
             ? `${network.name}: ${data.nick}`
             : `${network.name} ${data.target}: ${data.nick}`,

package/docker-compose.yml

@@ -1,17 +0,0 @@
-services:
-  thelounge:
-    image: ghcr.io/thelounge/thelounge:latest
-    container_name: thelounge
-    network_mode: bridge
-    ports:
-      - 9000:9000
-    restart: unless-stopped
-    volumes:
-      - $PWD/tl:/var/opt/thelounge
-      - $PWD/src:/var/opt/thelounge/packages/thelounge-plugin-ntfy/src
-      - $PWD/index.js:/var/opt/thelounge/packages/thelounge-plugin-ntfy/index.js
-      - $PWD/package.json:/var/opt/thelounge/packages/thelounge-plugin-ntfy/package.json
-      - $PWD/package-lock.json:/var/opt/thelounge/packages/thelounge-plugin-ntfy/package-lock.json
-
-# Installation: su node -c "thelounge install file:/var/opt/thelounge/packages/thelounge-plugin-ntfy"
-# Removal: su node -c "thelounge uninstall thelounge-plugin-ntfy"

package/misc/api.txt

@@ -1,53 +0,0 @@
-https://thelounge.chat/docs/api
-
-api
-    Commands
-        add(commandText: string, command: Command)
-    Config
-        getConfig()
-        getPersistentStorageDir()
-    Logger
-        error(...args)
-        warn(...args)
-        info(...args)
-        debug(...args)
-    Stylesheets
-        addFile(filename: String)
-
-command
-    input(client: Client, target: Target, command: String, args: String[])
-    allowDisconnected: bool
-
-target
-    network: String
-    chan: String
-
-client
-    runAsUser(command: String, targetId: String)
-    createChannel(attributes: Attributes)
-    sendToBrowser(event: String, data: Object)
-    getChannel(channelId: Number)
-    sendMessage(text: String, chan: Chan)
-
-attributes
-    id: Number
-    messages: Msg[]
-    name: string
-    key: String
-    topic: String
-    type: Chan.Type
-    state: Chan.State
-    firstUnread: Number
-    unread: Number
-    highlight: Number
-    users: String -> User Map
-
-Chan.Type
-    CHANNEL
-    LOBBY
-    QUERY
-    SPECIAL
-
-Chan.State
-    PARTED
-    JOINED