Remove duplicate callbacks

master
Skylar Ittner 3 years ago
parent 70fadb06a0
commit ba94886e72

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

Loading…
Cancel
Save