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

Avoid regex

Browse Source
This commit is contained in:
Skylar Ittner 2022-02-03 18:26:42 -07:00
parent 4d00868681
commit e4c4d1936b
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
main.js
View File

@ -260,7 +260,9 @@ function sendMatrix(roomid, body, media, callback) {
logger.error(err); logger.error(err);
}); });
} else { } else {
callback(true); if (typeof callback == "function") {
callback(true);
}
} }
} }
@ -339,12 +341,15 @@ function sendSMS(number, from, body, callback) {
*/ */
function sendMMS(number, from, mediauri, mimetype, callback) { function sendMMS(number, from, mediauri, mimetype, callback) {
logger.info("Sending MMS to " + number + " from " + from); logger.info("Sending MMS to " + number + " from " + from);
var mediauriregex = /^mxc:\/\/([a-zA-Z0-9\-]+\.[a-zA-Z0-9]{2,})\/([a-z0-9]+)$/; var urichunks = mediauri.split("/"); // should result in something like [ "mxc:", "", "matrix.org", "mediaidhere90473473" ]
var matches = mediauriregex.exec(mediauri); if (urichunks.length < 4) {
logger.error("Invalid media uri");
return;
}
var httpmediaurl = settings.mediaurlpath; var httpmediaurl = settings.mediaurlpath;
httpmediaurl = httpmediaurl.replace("{{server-name}}", matches[0]); httpmediaurl = httpmediaurl.replace("{{server-name}}", urichunks[2]);
httpmediaurl = httpmediaurl.replace("{{media-id}}", matches[1]); httpmediaurl = httpmediaurl.replace("{{media-id}}", urichunks[3]);
var data = { var data = {
to: [number], to: [number],
from: from, from: from,