Netsyms/matrix-bridge-voxtelesys
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove duplicate callbacks

Browse Source
This commit is contained in:
Skylar Ittner 2021-06-16 14:12:11 -06:00
parent 70fadb06a0
commit ba94886e72
1 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
main.js
View File

@ -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,6 +201,7 @@ function sendMatrix(roomid, body, media, callback) {
} }
} }
if (body != "") {
var content = { var content = {
body: body, body: body,
msgtype: "m.text" msgtype: "m.text"
@ -228,6 +219,9 @@ function sendMatrix(roomid, body, media, callback) {
} }
logger.error(err); logger.error(err);
}); });
} else {
callback(true);
}
} }
/** /**