Handle all variation of user preference for regexes
This commit is contained in:
parent
9a328612c4
commit
ed0c0c7d28
|
@ -258,37 +258,44 @@ module.exports = function(request, fs) {
|
||||||
|
|
||||||
if(typeof(user_preferences.domain_youtube) != 'undefined')
|
if(typeof(user_preferences.domain_youtube) != 'undefined')
|
||||||
if(user_preferences.domain_youtube){
|
if(user_preferences.domain_youtube){
|
||||||
if (youtubeRegex.test(str)){
|
if (!youtubeRegex.test(str)){
|
||||||
str = str.replace(youtubeRegex, protocol + user_preferences.domain_youtube)
|
|
||||||
} else {
|
|
||||||
youtubeRegex = /(https?:\/\/)([A-z.]+\.)?youtu(be\.com|\.be)(?=.+)/gm;
|
youtubeRegex = /(https?:\/\/)([A-z.]+\.)?youtu(be\.com|\.be)(?=.+)/gm;
|
||||||
str = str.replace(youtubeRegex, protocol + user_preferences.domain_youtube)
|
|
||||||
}
|
}
|
||||||
|
str = str.replace(youtubeRegex, protocol + user_preferences.domain_youtube);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(typeof(user_preferences.domain_twitter) != 'undefined')
|
if(typeof(user_preferences.domain_twitter) != 'undefined')
|
||||||
if(user_preferences.domain_twitter){
|
if(user_preferences.domain_twitter){
|
||||||
if (twitterRegex.test(str)){
|
if (!twitterRegex.test(str)){
|
||||||
str = str.replace(twitterRegex, protocol + user_preferences.domain_twitter)
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
twitterRegex = /(https?:\/\/)(www\.)?twitter\.com(?=.)/gm;
|
twitterRegex = /(https?:\/\/)(www\.)?twitter\.com(?=.)/gm;
|
||||||
|
}
|
||||||
str = str.replace(twitterRegex, protocol + user_preferences.domain_twitter)
|
str = str.replace(twitterRegex, protocol + user_preferences.domain_twitter)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(typeof(user_preferences.domain_instagram) != 'undefined'){
|
||||||
|
if(user_preferences.domain_instagram){
|
||||||
|
if (!instagramRegex.test(str)){
|
||||||
|
instagramRegex = /(https?:\/\/)(www+\.)?instagram.com(?=.)/gm;
|
||||||
|
}
|
||||||
|
str = str.replace(instagramRegex, protocol + user_preferences.domain_instagram);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(typeof(user_preferences.domain_quora) != 'undefined'){
|
||||||
|
if(user_preferences.domain_quora){
|
||||||
|
if (!quoraRegex.test(str)){
|
||||||
|
quoraRegex = /(https?:\/\/)([A-z.]+\.)?quora\.com(?=.)/gm;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(typeof(user_preferences.domain_instagram) != 'undefined')
|
|
||||||
if(user_preferences.domain_instagram)
|
|
||||||
str = str.replace(instagramRegex, protocol + user_preferences.domain_instagram)
|
|
||||||
|
|
||||||
if(typeof(user_preferences.domain_quora) != 'undefined')
|
|
||||||
if(user_preferences.domain_quora)
|
|
||||||
str = str.replace(quoraRegex, protocol + user_preferences.domain_quora)
|
str = str.replace(quoraRegex, protocol + user_preferences.domain_quora)
|
||||||
|
}
|
||||||
if(typeof(user_preferences.domain_imgur) != 'undefined')
|
}
|
||||||
if(user_preferences.domain_imgur)
|
if(typeof(user_preferences.domain_imgur) != 'undefined'){
|
||||||
|
if(user_preferences.domain_imgur){
|
||||||
|
if (!imgurRegex.test(str)){
|
||||||
|
imgurRegex = /(https?:\/{2})([im]\.)?(stack\.)?imgur\.(com|io)(?=.)/gm;
|
||||||
|
}
|
||||||
str = str.replace(imgurRegex, protocol + user_preferences.domain_imgur)
|
str = str.replace(imgurRegex, protocol + user_preferences.domain_imgur)
|
||||||
|
}
|
||||||
|
}
|
||||||
return str
|
return str
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue