wamo/Qvitter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use script element instead of attribute for attachment json, and avoid that header&body in oembed is the same by checking similarity

Browse Source
This commit is contained in:
Hannes Mannerheim 2016-01-21 16:15:56 +01:00
parent 607c309d4a
commit eb3a2af822
4 changed files with 114 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
QvitterPlugin.php
View File

@ -528,8 +528,8 @@ class QvitterPlugin extends Plugin {
$oembed->title = $twitter_username;
}
$oembed_html = str_replace('…','...',$oembed_html); // ellipsis is sometimes stored as html in db, for some reason
$oembed_html = strip_tags(html_entity_decode($oembed_html)); // sometimes we have html charachters that we want to decode and then strip
$oembed_title = strip_tags(html_entity_decode($oembed->title));
$oembed_html = trim(strip_tags(html_entity_decode($oembed_html))); // sometimes we have html charachters that we want to decode and then strip
$oembed_title = trim(strip_tags(html_entity_decode($oembed->title)));
$attachment_url_to_id[$enclosure_o->url]['oembed'] = array(
'type'=> $oembed->type,
'provider'=> $oembed->provider,

3
css/qvitter.css
View File

@ -1942,7 +1942,8 @@ background-repeat: no-repeat;
body.rtl .queet.rtl .expanded-content {
direction:rtl;
}
.stream-item.expanded > div:first-child {
.stream-item.expanded > div:first-child,
.stream-item.expanded > div:first-child > .queet {
border-top-left-radius:6px;
border-top-right-radius:6px;
}

20
js/dom-functions.js
View File

@ -1149,14 +1149,17 @@ function expand_queet(q,doScrolling) {
}
// show certain attachments in expanded content
if(q.attr('data-attachments') != 'undefined') {
if(q.children('script.attachment-json').length > 0
&& q.children('script.attachment-json').text() != 'undefined') {
try {
var attachmentsParsed = JSON.parse(q.attr('data-attachments'));
var attachmentsParsed = JSON.parse(q.children('script.attachment-json').text());
}
catch(e) {
var attachmentsParsed = false;
console.log('could not parse attachment data when expanding the notice: ' + e);
console.log('could not parse attachment json when expanding the notice: ' + e);
console.log("attachment-json: " + q.children('script.attachment-json').text());
}
if(attachmentsParsed !== false) {
$.each(attachmentsParsed, function() {
@ -2053,7 +2056,6 @@ function buildQueetHtml(obj, idInStream, extraClasses, requeeted_by, isConversat
id="' + idPrepend + 'stream-item-' + idInStream + '" \
data-uri="' + URItoUse + '" \
class="stream-item notice ' + extraClasses + '" \
data-attachments=\'' + JSON.stringify(obj.attachments) + '\'\
data-source="' + escape(obj.source) + '" \
data-quitter-id="' + obj.id + '" \
data-conversation-id="' + obj.statusnet_conversation_id + '" \
@ -2062,6 +2064,7 @@ function buildQueetHtml(obj, idInStream, extraClasses, requeeted_by, isConversat
data-in-reply-to-status-id="' + obj.in_reply_to_status_id + '"\
' + requeetedByMe + '>\
<div class="queet" id="' + idPrepend + 'q-' + idInStream + '"' + blockingTooltip + '>\
<script class="attachment-json" type="application/json">' + JSON.stringify(obj.attachments) + '</script>\
' + requeetHtml + '\
' + ostatusHtml + '\
<div class="queet-content">\
@ -2227,14 +2230,15 @@ function buildAttachmentHTML(attachments){
var oembedBody = '';
// not if html it's the same as the title (wordpress does this..)
// don't add body if html it's too similar (80%) to the title (wordpress does this..)
if(this.oembed.oembedHTML !== null
&& this.oembed.oembedHTML.length > 0
&& $.trim(this.oembed.oembedHTML) != $.trim(this.oembed.title)) {
&& this.oembed.oembedHTML.length > 0) {
if(this.oembed.oembedHTML.length > 200) {
this.oembed.oembedHTML = this.oembed.oembedHTML.substring(0,200) + '…';
}
oembedBody = this.oembed.oembedHTML;
if(stringSimilarity(this.oembed.oembedHTML,this.oembed.title.substring(0,200)) < 80) {
oembedBody = this.oembed.oembedHTML;
}
}
if(this.oembed.provider === null) {

103
js/misc-functions.js
View File

@ -880,8 +880,13 @@ function searchForUpdatedNoticeData(obj) {
}
// attachments might have been added/changed/have had time to be processed
if(streamItemFoundInFeed.attr('data-attachments') != JSON.stringify(obj.attachments)) {
streamItemFoundInFeed.attr('data-attachments',JSON.stringify(obj.attachments));
if(queetFoundInFeed.children('script.attachment-json').text() != JSON.stringify(obj.attachments)) {
if(queetFoundInFeed.children('script.attachment-json').length == 0) {
queetFoundInFeed.prepend('<script class="attachment-json" type="application/json">' + JSON.stringify(obj.attachments) + '</script>');
}
else {
queetFoundInFeed.children('script.attachment-json').text(JSON.stringify(obj.attachments));
}
var attachmentsHTMLBuild = buildAttachmentHTML(obj.attachments);
queetFoundInFeed.find('.queet-thumbs').remove();
queetFoundInFeed.find('.oembed-data').remove();
@ -1030,17 +1035,19 @@ function getFullUnshortenedHtmlForQueet(streamItem, cacheOnly) {
var queetId = streamItem.attr('data-quitter-id');
var attachmentMore = queet.find('span.attachment.more');
// only if actually shortened
if(attachmentMore.length>0 && streamItem.attr('data-attachments') != 'undefined') {
if(attachmentMore.length>0
&& queet.children('script.attachment-json').length > 0
&& queet.children('script.attachment-json').text() != 'undefined') {
// first try localstorage cache
var cacheData = localStorageObjectCache_GET('fullQueetHtml',queetId);
if(cacheData) {
queet.find('.queet-text').html(cacheData);
queet.outerHTML(detectRTL(queet.outerHTML()));
}
// then try static html file attachment, that we should have in an array in a data-attachments attribute
// then try static html file attachment, that we should have in the attachment-json script element
else if(cacheOnly === false){
var attachmentId = attachmentMore.attr('data-attachment-id');
$.each(JSON.parse(streamItem.attr('data-attachments')), function(k,attachment) {
$.each(JSON.parse(queet.children('script.attachment-json').text()), function(k,attachment) {
if(attachment.id == attachmentId) {
$.get(attachment.url,function(data){
if(data) {
@ -2160,3 +2167,89 @@ function youTubeEmbedLinkFromURL(url) {
return '//www.youtube.com/embed/' + youtubeId;
}
}
/* ·
·
· String similarity
·
· @params string1, string2:
· @returns (int) percent similarity
·
· · · · · · · · · · · · · */
function stringSimilarity(string1, string2) {
if(typeof string1 != 'string' || typeof string2 != 'string') {
return 0;
}
// trim and strip html tags
string1 = $('<div/>').html($.trim(string1)).text();
string2 = $('<div/>').html($.trim(string2)).text();
var longestStringLength = string1.length;
if(string2.length>string1.length) {
longestStringLength = string2.length;
}
var distanceArray = levenshteinenator(string1, string2);
var distance = distanceArray[distanceArray.length-1][distanceArray[distanceArray.length-1].length-1];
var percentSimilarity = 100-Math.round(distance/longestStringLength*100);
return percentSimilarity;
}
// from http://andrew.hedges.name/experiments/levenshtein/
var levenshteinenator = (function () {
/**
* @param String a
* @param String b
* @return Array
*/
function levenshteinenator(a, b) {
var cost;
var m = a.length;
var n = b.length;
// make sure a.length >= b.length to use O(min(n,m)) space, whatever that is
if (m < n) {
var c = a; a = b; b = c;
var o = m; m = n; n = o;
}
var r = []; r[0] = [];
for (var c = 0; c < n + 1; ++c) {
r[0][c] = c;
}
for (var i = 1; i < m + 1; ++i) {
r[i] = []; r[i][0] = i;
for ( var j = 1; j < n + 1; ++j ) {
cost = a.charAt( i - 1 ) === b.charAt( j - 1 ) ? 0 : 1;
r[i][j] = minimator( r[i-1][j] + 1, r[i][j-1] + 1, r[i-1][j-1] + cost );
}
}
return r;
}
/**
* Return the smallest of the three numbers passed in
* @param Number x
* @param Number y
* @param Number z
* @return Number
*/
function minimator(x, y, z) {
if (x <= y && x <= z) return x;
if (y <= x && y <= z) return y;
return z;
}
return levenshteinenator;
}());