More improvements to alternate messaging system (#4274)
Ylian Saint-Hilaire committed
Jul 18, 2022 at 12:07 UTC
12aa42f4bfa9d8101e818bed9d0355dfe7704ced
1 file changed
+12
-1
views/default.handlebars
+12
-1
@@ -7639,8 +7639,19 @@
7639
function altDeviceChat(e, i) {
7640
if (xxdialogMode) return;
7641
var url = serverinfo.altmessenging[i].url.split('{0}').join(currentNode._id.split('/')[2]).split('{1}').join(currentNode._id.split('/')[2]).split('{2}').join(currentNode._id.split('/')[2]).split('{3}').join(currentNode._id.split('/')[2]);
7642
+ var userid1 = encodeURIComponentEx(userinfo._id.split('/')[2]); // userid
7643
+ var userid2 = encodeURIComponentEx(userinfo._id.split('/').join('-')); // user-domain-userid
7644
+ var userid3 = userid1, userid4 = userid2;
7645
+ if (userinfo.realname != null) {
7646
+ userid3 = encodeURIComponentEx(userinfo.realname.split(' ').join('')); // real name with no empty spaces
7647
+ userid4 = encodeURIComponentEx(userinfo.realname.split(' ').join('-')); // real name with - instead of spaces
7648
+ }
7649
+ url = url.split('{4}').join(userid1).split('{5}').join(userid2).split('{6}').join(userid3).split('{7}').join(userid4);
7650
var localurl = url;
7643
- if (typeof serverinfo.altmessenging[i].localurl == 'string') { localurl = serverinfo.altmessenging[i].localurl.split('{0}').join(currentNode._id.split('/')[2]).split('{1}').join(currentNode._id.split('/')[2]).split('{2}').join(currentNode._id.split('/')[2]).split('{3}').join(currentNode._id.split('/')[2]); }
7651
+ if (typeof serverinfo.altmessenging[i].localurl == 'string') {
7652
+ localurl = serverinfo.altmessenging[i].localurl.split('{0}').join(currentNode._id.split('/')[2]).split('{1}').join(currentNode._id.split('/')[2]).split('{2}').join(currentNode._id.split('/')[2]).split('{3}').join(currentNode._id.split('/')[2]);
7653
+ localurl = localurl.split('{4}').join(userid1).split('{5}').join(userid2).split('{6}').join(userid3).split('{7}').join(userid4);
7654
+ }
7655
if (url != '') { meshserver.send({ action: 'msg', type: 'openUrl', nodeid: currentNode._id, url: url }); }
7656
if (localurl != '') { safeNewWindow(localurl, 'altmessenger:' + currentNode._id, 'directories=no,titlebar=no,toolbar=no,location=no,status=no,menubar=no,scrollbars=no,resizable=no,width=400,height=560'); }
7657
}