Changeset 29981

Timestamp:

02/12/09 23:47:01 (4 years ago)

Author:

drry

Message:

• fixed 2 filters.
  
  • "FeedBurner? - Extinguish burning feeds"
    
  • "RSS Ads - Remove Trend Match, solve Feed Metrix"
    
• et cetera.
  

Files:

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

lang/javascript/userscripts/ldrprefav.user.js

@@ -25 +25 @@
         const filters = {
                 "FeedBurner - Extinguish burning feeds" : function(f) {
-                        var re = /<a(?: [^>]+?)? href="[ \t\r\n]*http:\/\/[^\/]+\/~\w\/[^>]+>[\s\S]+?<\/a>|<img(?: [^>]+?)? src="[ \t\r\n]*http:\/\/[^\/]+\/~\w\/[^>]+>(?:<\/img>)?/g;
-                        if (! /^http:\/\/feed(?:s\.feedburner\.(?:com|jp)|proxy\.google\.com)\//.test(f.channel.feedlink) &&
+                        var re = /<a(?: [^>]+?)? href="http:\/\/(?:[^\/]+\/~[a-z0-9]|feedads\.googleadservices\.com)\/[^>]+>[\s\S]+?<\/a>|<img(?: [^>]+?)? src="http:\/\/(?:[^\/]+\/~[a-z0-9]|feedads\.googleadservices\.com)\/[^>]+>(?:<\/img>)?/g;
+                        if (! /^http:\/\/feed(?:s2?\.feedburner\.(?:com|jp)|proxy\.google\.com)\//.test(f.channel.feedlink) &&
                             ! (f.items[0] &&
                                (/^http:\/\/[^\/]+\/~r\/[^~]+?\/~\d\//.test(f.items[0].link) ||
                                 re.test(f.items[0].body)))) return;
 
-                        filter(f.items, function(i) { return i.body.replace(/[^?]+/g, "").length < i.body.length / 10 });
+                        filter(f.items, function(i) i.body.replace(/[^?]+/g, "").length < i.body.length / 10);
                         foreach(f.items, function(i) {
                                 i.body = i.body.replace(re, "");
@@ -45 +45 @@
                         if (! (item && /^http:\/\/[^\/]+\/click\.phdo\?/.test(item.link))) return;
 
-                        filter(f.items, function(i) { return i.title.indexOf("AD: ") != 0 });
+                        filter(f.items, function(i) i.title.indexOf("AD: ") != 0);
                         var re = /<img(?: [^>]+?)? src="[ \t\r\n]*http:\/\/www\.pheedo\.jp\/(?:img\.phdo|feeds\/tracker\.php)\?[^>]+>(?:<\/img>)?/g;
                         foreach(f.items, function(i) {
@@ -56 +56 @@
                 },
                 "RSS Ads - Remove Trend Match, solve Feed Metrix" : function(f) {
-                        //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="[ \t\r\n]*http:\/\/rss\.rssad\.jp\/[^>]+>[\s\S]+?<\/a>|<img(?: [^>]+?)? src="[ \t\r\n]*http:\/\/rss\.rssad\.jp\/[^>]+>(?:<\/img>)?/g;
+                        //filter(f.items, function(i) i.author != "rssad.jp");
+                        filter(f.items, function(i) i.title.indexOf("PR: ") != 0);
+                        var re = /<a(?: [^>]+?)? href="[ \t\r\n]*http:\/\/rss\.rssad\.jp\/[^>]+>[\s\S]+?<\/a>|<img(?: [^>]+?)? src="[ \t\r\n]*http:\/\/rss\.rssad\.jp\/[^>]+>(?:<\/img>)?|<a(?: [^>]+?)? href="[^"]+?\/ck\.php\?[^>]+><img(?: [^>]+?)? src="[^"]+?\/avw\.php\?[^>]+>(?:<\/img>)?/g;
                         foreach(f.items, function(i) {
                                 i.body = i.body.replace(re, "");
@@ -93 +93 @@
                         if (! /^http:\/\/[^.]+\.seesaa\.net\//.test(f.channel.link)) return;
 
-                        filter(f.items, function(i) { return i.link.indexOf("http://match.seesaa.jp/") != 0 });
+                        filter(f.items, function(i) i.link.indexOf("http://match.seesaa.jp/") != 0);
                 },
                 "Userscripts.org - Trim spam" : function(f) {
                         if (f.channel.link.indexOf("//userscripts.org/") < 0) return;
 
-                        filter(f.items, function(i) { return i.title.toLowerCase().indexOf("scrap") < 0 });
+                        filter(f.items, function(i) i.title.toLowerCase().indexOf("scrap") < 0);
                 },
                 "National Geographic News - Enlarge photos" : function(f) {
@@ -134 +134 @@
                 },
                 "livedoor Blog - Enlarge thumbnails" : function(f) {
-                        if (//! f.items.some(function(i) { return i.body.indexOf('"http://image.blog.livedoor.jp/') > -1 }) &&
+                        if (//! f.items.some(function(i) i.body.indexOf('"http://image.blog.livedoor.jp/') > -1) &&
                             ! /^http:\/\/(?:blog|[^.]+)\.livedoor\.(?:jp|biz)\//.test(f.channel.link)) return;
 
@@ -239 +239 @@
                         foreach(f.items, function(i) {
                                 if (i.link.indexOf("/photos/cns!") < 0) {
-                                        i.link = i.link.replace(re1, function(m) { return m.toLowerCase() });
+                                        i.link = i.link.replace(re1, function(m) m.toLowerCase());
                                         i.body = i.body.replace(re2, "");
                                 } else
@@ -431 +431 @@
 }
 
-function isFiltered(n) { return filteredIDs.indexOf(parseInt(n)) > -1 };
-function isPreFiltered(n) { return preFilteredIDs.indexOf(parseInt(n)) > -1 };
+function isFiltered(n) filteredIDs.indexOf(parseInt(n)) > -1;
+function isPreFiltered(n) preFilteredIDs.indexOf(parseInt(n)) > -1;