From ba94886e721014154391279e410a7c7aba295796 Mon Sep 17 00:00:00 2001
From: Skylar Ittner <skylar@netsyms.com>
Date: Wed, 16 Jun 2021 14:12:11 -0600
Subject: [PATCH] Remove duplicate callbacks

---
 main.js | 50 ++++++++++++++++++++++----------------------------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/main.js b/main.js
index ad08bde..7a681cd 100644
--- a/main.js
+++ b/main.js
@@ -168,16 +168,12 @@ function getAndUploadFile(url, callback) {
  */
 function sendMatrix(roomid, body, media, callback) {
 
-    if (body == "" && typeof media != "undefined") {
-        body = "Attachment";
-    }
-
     if (Array.isArray(media)) {
         for (var i = 0; i < media.length; i++) {
             getAndUploadFile(media[i], function (uri, mimetype) {
                 if (mimetype == "image/jpg" || mimetype == "image/jpeg" || mimetype == "image/png" || mimetype == "image/gif") {
                     var content = {
-                        body: body,
+                        body: "Image",
                         msgtype: "m.image",
                         url: uri,
                         info: {
@@ -186,7 +182,7 @@ function sendMatrix(roomid, body, media, callback) {
                     };
                 } else {
                     var content = {
-                        body: body,
+                        body: "File",
                         msgtype: "m.file",
                         url: uri,
                         info: {
@@ -195,13 +191,7 @@ function sendMatrix(roomid, body, media, callback) {
                     };
                 }
                 client.sendEvent(roomid, "m.room.message", content, "").then((res) => {
-                    if (typeof callback == "function") {
-                        callback(true);
-                    }
                 }).catch((err) => {
-                    if (typeof callback == "function") {
-                        callback(false);
-                    }
                     if (err.data.error == "Unknown room") {
                         return;
                     }
@@ -211,23 +201,27 @@ function sendMatrix(roomid, body, media, callback) {
         }
     }
 
-    var content = {
-        body: body,
-        msgtype: "m.text"
-    }
-    client.sendEvent(roomid, "m.room.message", content, "").then((res) => {
-        if (typeof callback == "function") {
-            callback(true);
-        }
-    }).catch((err) => {
-        if (typeof callback == "function") {
-            callback(false);
-        }
-        if (err.data.error == "Unknown room") {
-            return;
+    if (body != "") {
+        var content = {
+            body: body,
+            msgtype: "m.text"
         }
-        logger.error(err);
-    });
+        client.sendEvent(roomid, "m.room.message", content, "").then((res) => {
+            if (typeof callback == "function") {
+                callback(true);
+            }
+        }).catch((err) => {
+            if (typeof callback == "function") {
+                callback(false);
+            }
+            if (err.data.error == "Unknown room") {
+                return;
+            }
+            logger.error(err);
+        });
+    } else {
+        callback(true);
+    }
 }
 
 /**