tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #7587 from MrPetovan/bug/7576-linkpreview-lookbehind

Browse source 
Remove unevenly supported lookbehind from link preview regular expression
This commit is contained in:
Philipp 2019-08-30 07:26:14 +02:00 committed by GitHub
commit 0cdf094f86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
view/js/linkPreview.js
View file

@ -52,7 +52,7 @@
<div class="clear"></div>\ <div class="clear"></div>\
<hr class="previewseparator">'; <hr class="previewseparator">';
var text; var text;
var urlRegex = /(?<!=)(https?\:\/\/|\s)[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})(\/+[a-z0-9_.\:\;-]*)*(\?[\&\%\|\+a-z0-9_=,\.\:\;-]*)?([\&\%\|\+&a-z0-9_=,\:\;\.-]*)([\!\#\/\&\%\|\+a-z0-9_=,\:\;\.-]*)}*/i; var urlRegex = /^(?:https?\:\/\/|\s)[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})(?:\/+[a-z0-9_.\:\;-]*)*(?:\?[\&\%\|\+a-z0-9_=,\.\:\;-]*)?(?:[\&\%\|\+&a-z0-9_=,\:\;\.-]*)(?:[\!\#\/\&\%\|\+a-z0-9_=,\:\;\.-]*)}*$/i;
var binurl; var binurl;
var block = false; var block = false;
var blockTitle = false; var blockTitle = false;
@ -133,8 +133,7 @@
return; return;
} }
if (trim(text) !== "") { if (trim(text) !== "" && block === false && urlRegex.test(text)) {
if (block === false && urlRegex.test(text)) {
binurl = bin2hex(text); binurl = bin2hex(text);
block = true; block = true;
@ -148,7 +147,6 @@
getContentData(binurl, processContentData); getContentData(binurl, processContentData);
} }
} }
}
}; };
/** /**