add fetching of shortened URIs

see a00dfcf247
and also cb020faba8 for daemon version

home.html

@@ -385,6 +385,9 @@
     <a id="external-page-link-template" rel="nofollow" target="_blank"></a>
     <!-- template for user links in message (open profile modal) -->
     <a id="hashtag-link-template" class="open-hashtag-modal"></a>
+    <div id="template-link-shortened">
+        <a class="link-shortened" rel="nofollow" target="_blank"></a>
+    </div>
 
     <!-- template para ir dentro de avatar-row -->
     <a id="avatar-row-template" class="open-profile-modal" href="">

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) {

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,13 +627,9 @@ function htmlFormatMsg(msg, opt) {
                                 + '</samp><br>'
                             );
                         } else {
-                            if (getSubStrEnd(msg.str, i + 1, whiteSpacesUrl, false, '') < k)  // use only first word as href target, others drop silently
+                            if ((x = 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, '');
+                                k = x;
-                            if (markoutOpt === 'apply') {
+                            linkName = applyHtml(  // we're handling markup inside [] of []()
-                                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
@@ -640,22 +637,23 @@ function htmlFormatMsg(msg, opt) {
                                         markoutOpt, '_', 'u'),  // underlined
                                         markoutOpt, '-', 's')  // striketrough
                             )
-                                            .replace(/&(?!lt;|gt;)/g, '&amp;')
+                                .replace(/&(?!lt;|gt;)/g, '&amp;');
-                                    )
+                            if (markoutOpt === 'apply') {
+                                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 []()
+                                    linkName);
-                                        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, '&amp;')
-                                );
                                 // 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;
         }
     }
 

network.html

@@ -256,6 +256,9 @@
     <a id="external-page-link-template" rel="nofollow" target="_blank"></a>
     <!-- template for user links in message (open profile modal) -->
     <a id="hashtag-link-template" class="open-hashtag-modal"></a>
+    <div id="template-link-shortened">
+        <a class="link-shortened" rel="nofollow" target="_blank"></a>
+    </div>
 
     <div class="prompt-wrapper">
       <div class="modal-header">

options.html

@@ -461,6 +461,9 @@
     <a id="external-page-link-template" rel="nofollow" target="_blank"></a>
     <!-- template for user links in message (open profile modal) -->
     <a id="hashtag-link-template" class="open-hashtag-modal"></a>
+    <div id="template-link-shortened">
+        <a class="link-shortened" rel="nofollow" target="_blank"></a>
+    </div>
   </div>
 
   <audio id="player"></audio>

tmobile.html

@@ -817,6 +817,9 @@
     <a id="external-page-link-template" rel="nofollow" target="_blank"></a>
     <!-- template for user links in message (open profile modal) -->
     <a id="hashtag-link-template" class="open-hashtag-modal"></a>
+    <div id="template-link-shortened">
+        <a class="link-shortened" rel="nofollow" target="_blank"></a>
+    </div>
 
     <!-- template para ir dentro de avatar-row -->
     <a id="avatar-row-template" class="open-profile-modal" href="">