Fixed tg.me with unknown subdirs

Closes #988
This commit is contained in:
Igor Zhukov 2015-11-29 21:20:55 +03:00
parent 2e994c1080
commit 6344873f10

View File

@ -1269,23 +1269,6 @@ angular.module('izhukov.utils', [])
url = (match[5] ? '' : protocol) + match[4]; url = (match[5] ? '' : protocol) + match[4];
} }
var tgMeMatch;
if (tld == 'me' &&
(tgMeMatch = url.match(/^https?:\/\/telegram\.me\/(.+)/))) {
var path = tgMeMatch[1].split('/');
switch (path[0]) {
case 'joinchat':
url = 'tg://join?invite=' + path[1];
break;
case 'addstickers':
url = 'tg://addstickers?set=' + path[1];
break;
default:
var domainQuery = path[0].split('?');
url = 'tg://resolve?domain=' + domainQuery[0] + (domainQuery[1] ? '&' + domainQuery[1] : '');
}
}
} else { // IP address } else { // IP address
url = (match[5] ? '' : 'http://') + match[4]; url = (match[5] ? '' : 'http://') + match[4];
} }
@ -1579,10 +1562,12 @@ angular.module('izhukov.utils', [])
url = 'tg://addstickers?set=' + path[1]; url = 'tg://addstickers?set=' + path[1];
break; break;
default: default:
if (!path[1]) {
var domainQuery = path[0].split('?'); var domainQuery = path[0].split('?');
url = 'tg://resolve?domain=' + domainQuery[0] + (domainQuery[1] ? '&' + domainQuery[1] : ''); url = 'tg://resolve?domain=' + domainQuery[0] + (domainQuery[1] ? '&' + domainQuery[1] : '');
} }
} }
}
html.push( html.push(
'<a href="', '<a href="',
encodeEntities(url), encodeEntities(url),