diff --git a/home.html b/home.html index 99970f5..0880b8d 100644 --- a/home.html +++ b/home.html @@ -385,6 +385,9 @@ + diff --git a/js/interface_common.js b/js/interface_common.js index 5ad554e..cfb1f11 100644 --- a/js/interface_common.js +++ b/js/interface_common.js @@ -807,7 +807,10 @@ function fillElemWithTxt(elem, txt, htmlFormatMsgOpt) { elem.html(formatted.html); elem.find('a').each(function (i, elem) { var href = elem.getAttribute('href'); - if (href && href[0] === '#') + if (elem.classList.contains('link-shortened')) { + $(elem).on('click mouseup', {preventDefault: true}, muteEvent); + fetchShortenedURI(href); + } else if (href && href[0] === '#') $(elem) .on('click', {preventDefault: true}, muteEvent) .on('mouseup', {route: href}, routeOnClick) @@ -819,6 +822,31 @@ function fillElemWithTxt(elem, txt, htmlFormatMsgOpt) { return formatted; } +function fetchShortenedURI(req) { + // FIXME need to check if ret for req is cached here + if (parseInt(twisterVersion) < 93500) { + console.warn('can\'t fetch URI "' + req + '": daemon is obsolete, version 0.9.35 or higher is required'); + return; + } + twisterRpc('decodeshorturl', [req], + function gotShortURI(req, ret) { + // FIXME need to cache ret here + var elems = $('.link-shortened[href="' + req + '"]') + .attr('href', ret) + .removeClass('link-shortened') + .off('click mouseup') + .on('click mouseup', muteEvent) + ; + for (var i = 0; i < elems.length; i++) + if (elems[i].text === req) + elems[i].text = ret; + }, req, + function (req, ret) { + console.warn('can\'t fetch URI "' + req + '": ' + ret.message); + }, req + ); +} + function routeOnClick(event) { function routeNewTab(event) { diff --git a/js/twister_formatpost.js b/js/twister_formatpost.js index dd6ae98..6dcc8bd 100644 --- a/js/twister_formatpost.js +++ b/js/twister_formatpost.js @@ -25,6 +25,7 @@ $(document).ready(function() { _htmlFormatMsgLinkTemplateHashtag = _htmlFormatMsgLinkTemplateHashtag[0].cloneNode(); _htmlFormatMsgLinkTemplateHashtag.removeAttribute('id'); } + twister.tmpl.linkShortened = extractTemplate('#template-link-shortened')[0]; }); // format "userpost" to html element @@ -626,36 +627,33 @@ function htmlFormatMsg(msg, opt) { + '
' ); } else { - if (getSubStrEnd(msg.str, i + 1, whiteSpacesUrl, false, '') < k) // use only first word as href target, others drop silently - k = getSubStrEnd(msg.str, i + 1, whiteSpacesUrl, false, ''); + if ((x = getSubStrEnd(msg.str, i + 1, whiteSpacesUrl, false, '')) < k) // use only first word as href target, others drop silently + k = x; + linkName = applyHtml( // we're handling markup inside [] of []() + markout(markout(markout(markout( + {str: linkName, htmlEntities: msg.htmlEntities}, + markoutOpt, '*', 'b'), // bold + markoutOpt, '~', 'i'), // italic + markoutOpt, '_', 'u'), // underlined + markoutOpt, '-', 's') // striketrough + ) + .replace(/&(?!lt;|gt;)/g, '&'); if (markoutOpt === 'apply') { - msg = msgAddHtmlEntity(msg, j - 1, getSubStrEnd(msg.str, k + 1, ')', true, '') + 2, - newHtmlEntityLink(_htmlFormatMsgLinkTemplateExternal, - proxyURL(msg.str.slice(i, k + 1)), - applyHtml( // we're trying markup inside [] of []() - markout(markout(markout(markout( - {str: linkName, htmlEntities: msg.htmlEntities}, - markoutOpt, '*', 'b'), // bold - markoutOpt, '~', 'i'), // italic - markoutOpt, '_', 'u'), // underlined - markoutOpt, '-', 's') // striketrough - ) - .replace(/&(?!lt;|gt;)/g, '&') - ) - ); + if (msg.str.slice(i, i + 6).toLowerCase() === 'twist:' && msg.str[i + 17] === '=' + && getSubStrStart(msg.str, i + 16, stopCharsRightHashtags, false, '') === i + 6) + msg = msgAddHtmlEntity(msg, j - 1, getSubStrEnd(msg.str, k + 1, ')', true, '') + 2, + newHtmlEntityLink(twister.tmpl.linkShortened, + msg.str.slice(i, i + 18), linkName) + ); + else + msg = msgAddHtmlEntity(msg, j - 1, getSubStrEnd(msg.str, k + 1, ')', true, '') + 2, + newHtmlEntityLink(_htmlFormatMsgLinkTemplateExternal, + proxyURL(msg.str.slice(i, k + 1)), linkName) + ); } else { // markoutOpt === 'clear' so we're clearing markup str = msg.str.slice(i, k + 1); msg = msgAddHtmlEntity(msg, j - 1, getSubStrEnd(msg.str, k + 1, ')', true, '') + 2, - applyHtml( // we're trying to clear markup inside [] of []() - markout(markout(markout(markout( - {str: linkName, htmlEntities: msg.htmlEntities}, - markoutOpt, '*', 'b'), // bold - markoutOpt, '~', 'i'), // italic - markoutOpt, '_', 'u'), // underlined - markoutOpt, '-', 's') // striketrough - ) - .replace(/&(?!lt;|gt;)/g, '&') - ); + linkName); // here we put link target as plain text to handle it usual way (search http[s]:// and so on) i = msg.i + 1 msg.str = msg.str.slice(0, i) + ' ' + str + msg.str.slice(i); @@ -692,6 +690,12 @@ function htmlFormatMsg(msg, opt) { i = msg.i; } } + } else if (msg.str.slice(i, i + 6).toLowerCase() === 'twist:' && msg.str[i + 17] === '=' + && getSubStrStart(msg.str, i + 16, stopCharsRightHashtags, false, '') === i + 6) { + str = msg.str.slice(i, i + 18); + msg = msgAddHtmlEntity(msg, i, i + str.length, + newHtmlEntityLink(twister.tmpl.linkShortened, str, str)); + i = msg.i; } } diff --git a/network.html b/network.html index 0873a4e..f20d991 100644 --- a/network.html +++ b/network.html @@ -256,6 +256,9 @@ +
diff --git a/options.html b/options.html index 596c46f..a0cb76e 100644 --- a/options.html +++ b/options.html @@ -461,6 +461,9 @@ +
diff --git a/tmobile.html b/tmobile.html index aa5eb3a..0094030 100644 --- a/tmobile.html +++ b/tmobile.html @@ -817,6 +817,9 @@ +