Changeset 10939

Timestamp:

05/02/08 17:06:43 (5 years ago)

Author:

drry

Message:

• added 2 filters.
  
  • "Twitter - Remove insistent username prefixes and body text"
    
  • "Remove bodies same as its title"
    
• fixed 2 filters.
  
  • "CR LF TO BR"
    
  • "Trim spaces"
    
• et cetera.
  

Files:

• lang/javascript/userscripts/ldrprefav.user.js (modified) (17 diffs)

lang/javascript/userscripts/ldrprefav.user.js

@@ -24 +24 @@
         const filters = {
                 "FeedBurner - Unburn, raw feeds" : function(f) {
-                        var re = /<a(?: [^>]+?)? href="\s*http:\/\/[^\/]+\/~\w\/[^>]+>[\s\S]+?<\/a>|<img(?: [^>]+?)? src="\s*http:\/\/[^\/]+\/~\w\/[^>]+>(?:<\/img>)?/g;
+                        var re = /<a(?: [^>]+?)? href="[ \t\r\n]*http:\/\/[^\/]+\/~\w\/[^>]+>[\s\S]+?<\/a>|<img(?: [^>]+?)? src="[ \t\r\n]*http:\/\/[^\/]+\/~\w\/[^>]+>(?:<\/img>)?/g;
                         if (! /^http:\/\/feeds\.feedburner\.(?:com|jp)\//.test(f.channel.feedlink) &&
                             ! (f.items[0] &&
@@ -33 +33 @@
                         foreach(f.items, function(i) {
                                 i.body = i.body.replace(re, "");
-                                if ((PREFILTER & 8) < 1 || ! truePermalinks[i.link]) return;
+                                if ((PREFILTER & 1 << 3) < 1 || ! truePermalinks[i.link]) return;
                                 var link = i.link;
                                 i.link = truePermalinks[i.link];
@@ -46 +46 @@
 
                         filter(f.items, function(i) { return i.title.indexOf("AD: ") != 0 });
-                        var re = /<img(?: [^>]+?)? src="\s*http:\/\/www\.pheedo\.jp\/(?:img\.phdo|feeds\/tracker\.php)\?[^>]+>(?:<\/img>)?/g;
+                        var re = /<img(?: [^>]+?)? src="[ \t\r\n]*http:\/\/www\.pheedo\.jp\/(?:img\.phdo|feeds\/tracker\.php)\?[^>]+>(?:<\/img>)?/g;
                         foreach(f.items, function(i) {
                                 i.body = i.body.replace(re, "");
-                                if ((PREFILTER & 16) < 1 || ! truePermalinks[i.link]) return;
+                                if ((PREFILTER & 1 << 4) < 1 || ! truePermalinks[i.link]) return;
                                 var link = i.link;
                                 i.link = truePermalinks[i.link];
@@ -58 +58 @@
                         //filter(f.items, function(i) { return i.author != "rssad.jp" });
                         filter(f.items, function(i) { return i.title.indexOf("PR: ") != 0 });
-                        var re = /<a(?: [^>]+?)? href="\s*http:\/\/rss\.rssad\.jp\/[^>]+>[\s\S]+?<\/a>|<img(?: [^>]+?)? src="\s*http:\/\/rss\.rssad\.jp\/[^>]+>(?:<\/img>)?/g;
+                        var re = /<a(?: [^>]+?)? href="[ \t\r\n]*http:\/\/rss\.rssad\.jp\/[^>]+>[\s\S]+?<\/a>|<img(?: [^>]+?)? src="[ \t\r\n]*http:\/\/rss\.rssad\.jp\/[^>]+>(?:<\/img>)?/g;
                         foreach(f.items, function(i) {
                                 i.body = i.body.replace(re, "");
-                                if ((PREFILTER & 32) < 1 || ! truePermalinks[i.link]) return;
+                                if ((PREFILTER & 1 << 5) < 1 || ! truePermalinks[i.link]) return;
                                 var link = i.link;
                                 i.link = truePermalinks[i.link];
@@ -75 +75 @@
                         if (f.channel.link != "http://news.nationalgeographic.com") return;
 
-                        var RE_THMB = /(?=(<img)(?: [^>]+?)?( src="\s*http:\/\/news\.nationalgeographic\.com\/news\/)(images\/)thumbs\/([^"]+?_)\d+x\d+(\.jpg")[^>]*(>(?:<\/img>)?))/;
+                        var RE_THMB = /(?=(<img)(?: [^>]+?)?( src="[ \t\r\n]*http:\/\/news\.nationalgeographic\.com\/news\/)(images\/)thumbs\/([^"]+?_)\d+x\d+(\.jpg")[^>]*(>(?:<\/img>)?))/;
                         foreach(f.items, function(i) {
                                 if (i.title.indexOf("VIDEO: ") == 0 || i.title.indexOf("PHOTOS:") > -1) return;
@@ -115 +115 @@
                         if (! /^http:\/\/[^.]+\.blogspot\.com\//.test(f.channel.link)) return;
 
-                        var re1 = /(<img(?: [^>]+?)? src="\s*http:\/\/bp\d\.blogger\.com\/_[^"]+?\/s)\d{1,4}(?=\/[^"]+?\.(?:jpe?g|gif|png)")/ig;
+                        var re1 = /(<img(?: [^>]+?)? src="[ \t\r\n]*http:\/\/bp\d\.blogger\.com\/_[^"]+?\/s)\d{1,4}(?=\/[^"]+?\.(?:jpe?g|gif|png)")/ig;
                         var re2 = /(<img(?: [^>]+?)?) (?:width|height)="\d+"/g;
                         foreach(f.items, function(i) {
@@ -148 +148 @@
                 },
                 "TinyURL - UnTinyURL" : function(f) {
-                        if ((PREFILTER & 64) < 1) return;
+                        if ((PREFILTER & 1 << 6) < 1) return;
 
                         var re = /http:\/\/(?:preview\.)?tinyurl\.com\/[a-z0-9]+/g;
@@ -179 +179 @@
 
                         var re1 = /\/(?:B(?=log\/)|L(?=ists\/))/g;
-                        var re2 = /<img(?: [^>]+?)? src="\s*http:\/\/c\.(?:services\.spaces\.)?live.com\/(?:CollectionWebService\/)?c\.gif\?[^"]+"[^>]*>(?:<\/img>)?/g;
+                        var re2 = /<img(?: [^>]+?)? src="[ \t\r\n]*http:\/\/c\.(?:services\.spaces\.)?live.com\/(?:CollectionWebService\/)?c\.gif\?[^"]+"[^>]*>(?:<\/img>)?/g;
                         foreach(f.items, function(i) {
                                 i.link = i.link.replace(re1, function(m) { return m.toLowerCase() });
@@ -185 +185 @@
                         });
                 },
+                "Twitter - Remove insistent username prefixes and body text" : function(f) {
+                        var re1 = /^\w+:/;
+                        if (f.channel.feedlink.indexOf("http://twitter.com/statuses/user_timeline/") != 0 ||
+                            ! f.items[0] || ! re1.test(f.items[0].title)) return;
+
+                        var re2 = /https?:\/\/[-\w!#$%&'()*+,.\/:;=?@~]+/g;
+                        foreach(f.items, function(i) {
+                                var body = i.body;
+                                i.title = i.title.replace(re1, "");
+                                i.body = "";
+                                while (re2.test(body)) {
+                                        i.body += '<a href="' + RegExp.lastMatch + '">' + RegExp.lastMatch + "</a> ";
+                                }
+                        });
+                },
+                "Remove bodies same as its title" : function(f) {
+                        foreach(f.items, function(i) { if (i.body == i.title) i.body = ""; });
+                },
                 "CR LF TO BR" : function(f) {
                         if (! f.items[0] || /<(?:p|br)[> ]/.test(f.items[0].body)) return;
 
-                        var re = /(?=\r?\n|\r)/g;
-                        foreach(f.items, function(i) {
-                                i.body = "<p>" + i.body.replace(re, "<p>");
+                        var re = /(?:\r?\n|\r)+/g;
+                        foreach(f.items, function(i) {
+                                i.body = "<p>" + i.body.replace(re, "</p><p>") + "</p>";
                         });
                 },
@@ -205 +223 @@
                                 //i.body = i.body.replace(/<br(?: [^>]+)?>(?:<\/br>)?\s*(?=<br(?: [^>]+)?>(?:<\/br>)?)|(^|<[ap](?: [^>]+)?>|<\/p>)(?:\s+|<br(?: [^>]+)?>(?:<\/br>)?)+|(?:\s+|<br(?: [^>]+)?>(?:<\/br>)?)+(?=$|<\/[ap]>|<p(?: [^>]+)?>)|<a(?: [^>]+)?>(?:\s+|<br(?: [^>]+)?>(?:<\/br>)?)*<\/a>/g, "$1") // BUG? hanged up...
                                 i.body = i.body.replace(/<br(?: [^>]+)?>(?:<\/br>)?\s*(?=<br(?: [^>]+)?>(?:<\/br>)?)|(^|<[ap](?: [^>]+)?>|<\/p>)(?:\s|<br(?: [^>]+)?>(?:<\/br>)?)+|(?:\s|<br(?: [^>]+)?>(?:<\/br>)?)+(?=$|<\/[ap]>|<p(?: [^>]+)?>)|<a(?: [^>]+)?>(?:\s+|<br(?: [^>]+)?>(?:<\/br>)?)*<\/a>/g, "$1")
-                                               .replace(/<(p(?:re)?)(?: [^>]+)?>(?:\s|<br(?: [^>]+)?>(?:<\/br>)?)*<\/\1>/g, "");
+                                               .replace(/<(p(?:re)?|div)(?: [^>]+)?>(?:\s|<br(?: [^>]+)?>(?:<\/br>)?)*<\/\1>/g, "");
                         });
                 }
@@ -213 +231 @@
                 "FeedBurner - Resolve permalink" : function(f) {
                         var re = /^http:\/\/[^\/]+\/~r\/[^~]+?\/~\d\//;
-                        if ((PREFILTER & 8) < 1 ||
+                        if ((PREFILTER & 1 << 3) < 1 ||
                             ! (f.items[0] && re.test(f.items[0].link))) return;
 
@@ -219 +237 @@
                 },
                 "Pheedo - Resolve permalink" : function(f) {
-                        if ((PREFILTER & 16) < 1) return;
+                        if ((PREFILTER & 1 << 4) < 1) return;
                         var item;
                         for (var i = 0; item = f.items[i++];)
@@ -231 +249 @@
                 },
                 "RSS Ad - Resolve permalink" : function(f) {
-                        if ((PREFILTER & 32) < 1) return;
+                        if ((PREFILTER & 1 << 5) < 1) return;
                         var item;
                         for (var i = 0; item = f.items[i++];)
@@ -243 +261 @@
                 },
                 "TinyURL - Resolve" : function(f) {
-                        if ((PREFILTER & 64) < 1) return;
+                        if ((PREFILTER & 1 << 6) < 1) return;
 
                         foreach(f.items, function(i) {
@@ -251 +269 @@
                 },
                 "Flickr - Prefetch thumbnails" : function(f) { // http://userscripts.org/scripts/show/14809
-                        if ((PREFILTER & 1) < 1 ||
+                        if ((PREFILTER & 1 << 0) < 1 ||
                             ! /^http:\/\/(?:api|www)\.flickr\.com\//.test(f.channel.feedlink)) return;
 
@@ -260 +278 @@
                 },
                 "4U - Prefetch thumbnails" : function(f) {
-                        if ((PREFILTER & 2) < 1 ||
+                        if ((PREFILTER & 1 << 1) < 1 ||
                             f.channel.feedlink != "http://4u.straightline.jp/rss") return;
 
@@ -269 +287 @@
                 },
                 "Prefetch Images from secure sites" : function(f) {
-                        if ((PREFILTER & 4) < 1) return;
+                        if ((PREFILTER & 1 << 2) < 1) return;
                         var link = f.channel.link;
                         if (link.indexOf("http://ffffound.com/") != 0 &&