This commit is contained in:
Skylar Ittner 2021-07-12 21:09:59 -06:00
parent dd3533d0a5
commit a3edc31aff

18
main.js
View File

@ -109,13 +109,13 @@ function createOrJoinSMSRoom(tel, ournumber, callback) {
if (inRoom) { if (inRoom) {
// we're already in the room, do nothing // we're already in the room, do nothing
logger.debug("Room " + roomName + " already joined."); logger.debug("Room " + roomName + " already joined.");
client.setRoomTag(res.room_id, "com.netsyms.matrix-bridge-voxtelesys.sms", {tel: tel, ournumber: ournumber, order: 0.5}); client.setRoomTag(res.room_id, "u.matrix-bridge-voxtelesys-sms", {tel: tel, ournumber: ournumber, order: 0.5});
callback(res.room_id); callback(res.room_id);
} else { } else {
// not in the room, join it // not in the room, join it
client.joinRoom(res.room_id).then((room) => { client.joinRoom(res.room_id).then((room) => {
logger.debug("Room " + roomName + " joined."); logger.debug("Room " + roomName + " joined.");
client.setRoomTag(room.room_id, "com.netsyms.matrix-bridge-voxtelesys.sms", {tel: tel, ournumber: ournumber, order: 0.5}); client.setRoomTag(room.room_id, "u.matrix-bridge-voxtelesys-sms", {tel: tel, ournumber: ournumber, order: 0.5});
callback(room.room_id); callback(room.room_id);
}); });
} }
@ -364,7 +364,7 @@ client.login("m.login.password", {"user": settings.matrixuser, "password": setti
logger.info("Got request to start new SMS conversation with " + tel + " using " + ournumber + " from " + event.getSender() + "."); logger.info("Got request to start new SMS conversation with " + tel + " using " + ournumber + " from " + event.getSender() + ".");
sendMatrixNotice(event.getRoomId(), "Starting conversation with " + tel); sendMatrixNotice(event.getRoomId(), "Starting conversation with " + tel);
createOrJoinSMSRoom(tel, ournumber, function (roomid) { createOrJoinSMSRoom(tel, ournumber, function (roomid) {
//client.setRoomTag(roomid, "com.netsyms.matrix-bridge-voxtelesys.sms", {tel: tel, ournumber: ournumber}); //client.setRoomTag(roomid, "u.matrix-bridge-voxtelesys-sms", {tel: tel, ournumber: ournumber});
}); });
} }
return; return;
@ -384,19 +384,19 @@ client.login("m.login.password", {"user": settings.matrixuser, "password": setti
ournumber = "1" + ournumber; ournumber = "1" + ournumber;
} }
logger.info("Got request from " + event.getSender() + " to set SMS from number to " + ournumber + " for SMS conversation with " + tel + "."); logger.info("Got request from " + event.getSender() + " to set SMS from number to " + ournumber + " for SMS conversation with " + tel + ".");
client.setRoomTag(event.getRoomId(), "com.netsyms.matrix-bridge-voxtelesys.sms", {tel: tel, ournumber: ournumber, order: 0.5}).then(function () { client.setRoomTag(room.room_id, "u.matrix-bridge-voxtelesys-sms", {tel: tel, ournumber: ournumber, order: 0.5}).then(function () {
sendMatrixNotice(event.getRoomId(), "Now sending SMS from " + ournumber + " to " + tel + "."); sendMatrixNotice(room.room_id, "Now sending SMS from " + ournumber + " to " + tel + ".");
}); });
} }
return; return;
} }
var matches = room.name.match(/SMS_([1-9][0-9]+)(?:_([1-9][0-9]+))?/g); var matches = room.name.match(/SMS_([1-9][0-9]+)(?:_([1-9][0-9]+))?/g);
console.log(room.getAliases()); console.log(room.room_id);
if (matches == null || (matches.length != 1 && matches.length != 2)) { if (matches == null || (matches.length != 1 && matches.length != 2)) {
client.getRoomTags(room.room_id).then((response) => { client.getRoomTags(room.room_id).then((response) => {
if (typeof response.tags["com.netsyms.matrix-bridge-voxtelesys.sms"] != "undefined") { if (typeof response.tags["u.matrix-bridge-voxtelesys-sms"] != "undefined") {
var tel = response.tags["com.netsyms.matrix-bridge-voxtelesys.sms"].tel; var tel = response.tags["u.matrix-bridge-voxtelesys-sms"].tel;
var from = response.tags["com.netsyms.matrix-bridge-voxtelesys.sms"].ournumber; var from = response.tags["u.matrix-bridge-voxtelesys-sms"].ournumber;
logger.info("Got message for " + tel + " from " + event.getSender() + ", relaying to " + from + "."); logger.info("Got message for " + tel + " from " + event.getSender() + ", relaying to " + from + ".");
sendSMS( sendSMS(
tel, tel,