twisterarmy
/
twister-html
mirror of https://github.com/twisterarmy/twister-html.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

add fetching of shortened URIs 

see a00dfcf247
and also cb020faba8 for daemon version
readme-update
Simon Grim 8 years ago
parent
68fe2b0174
commit
3e43fdb594
6 changed files with 71 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      home.html
  2. 30
      js/interface_common.js
  3. 56
      js/twister_formatpost.js
  4. 3
      network.html
  5. 3
      options.html
  6. 3
      tmobile.html

3
home.html
Unescape View File

@ -385,6 +385,9 @@ @@ -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="">

30
js/interface_common.js
Unescape View File

@ -807,7 +807,10 @@ function fillElemWithTxt(elem, txt, htmlFormatMsgOpt) { @@ -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) { @@ -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) {

56
js/twister_formatpost.js
Unescape View File

@ -25,6 +25,7 @@ $(document).ready(function() { @@ -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) { @@ -626,36 +627,33 @@ 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
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, '&amp;');
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, '&amp;')
)
);
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, '&amp;')
);
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) { @@ -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;
}
}

3
network.html
Unescape View File

@ -256,6 +256,9 @@ @@ -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">

3
options.html
Unescape View File

@ -461,6 +461,9 @@ @@ -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>

3
tmobile.html
Unescape View File

@ -817,6 +817,9 @@ @@ -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="">

Write Preview
Loading…
Cancel
Save