|
|
|
@ -384,16 +384,17 @@ client.login("m.login.password", {"user": settings.matrixuser, "password": setti
|
|
|
|
|
ournumber = "1" + ournumber;
|
|
|
|
|
}
|
|
|
|
|
logger.info("Got request from " + event.getSender() + " to set SMS from number to " + ournumber + " for SMS conversation with " + tel + ".");
|
|
|
|
|
client.setRoomTag(room.room_id, "u.matrix-bridge-voxtelesys-sms", {tel: tel, ournumber: ournumber, order: 0.5}).then(function () {
|
|
|
|
|
sendMatrixNotice(room.room_id, "Now sending SMS from " + ournumber + " to " + tel + ".");
|
|
|
|
|
client.setRoomTag(event.getRoomId(), "u.matrix-bridge-voxtelesys-sms", {tel: tel, ournumber: ournumber, order: 0.5}).then(function () {
|
|
|
|
|
sendMatrixNotice(event.getRoomId(), "Now sending SMS from " + ournumber + " to " + tel + ".");
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
var matches = room.name.match(/SMS_([1-9][0-9]+)(?:_([1-9][0-9]+))?/g);
|
|
|
|
|
console.log(room.room_id);
|
|
|
|
|
console.log(event.getRoomId());
|
|
|
|
|
if (matches == null || (matches.length != 1 && matches.length != 2)) {
|
|
|
|
|
client.getRoomTags(room.room_id).then((response) => {
|
|
|
|
|
client.getRoomTags(event.getRoomId()).then((response) => {
|
|
|
|
|
console.log(response);
|
|
|
|
|
if (typeof response.tags["u.matrix-bridge-voxtelesys-sms"] != "undefined") {
|
|
|
|
|
var tel = response.tags["u.matrix-bridge-voxtelesys-sms"].tel;
|
|
|
|
|
var from = response.tags["u.matrix-bridge-voxtelesys-sms"].ournumber;
|
|
|
|
@ -414,14 +415,14 @@ client.login("m.login.password", {"user": settings.matrixuser, "password": setti
|
|
|
|
|
if (matches.length == 1) {
|
|
|
|
|
var tel = matches[0];
|
|
|
|
|
logger.info("Got message for " + tel + " from " + event.getSender() + ", relaying.");
|
|
|
|
|
sendSMS(tel, settings.smsfrom, sevent.getContent().body, function () {
|
|
|
|
|
sendSMS(tel, settings.smsfrom, event.getContent().body, function () {
|
|
|
|
|
client.sendReadReceipt(event, {});
|
|
|
|
|
});
|
|
|
|
|
} else if (matches.length == 2) {
|
|
|
|
|
var tel = matches[0];
|
|
|
|
|
var from = matches[1];
|
|
|
|
|
logger.info("Got message for " + tel + " from " + event.getSender() + ", relaying to " + from + ".");
|
|
|
|
|
sendSMS(tel, from, sevent.getContent().body, function () {
|
|
|
|
|
sendSMS(tel, from, event.getContent().body, function () {
|
|
|
|
|
client.sendReadReceipt(event, {});
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|