Update custom sites (set useragent Facebookbot)

background.js

@@ -58,7 +58,7 @@ var remove_cookies = [];
 var remove_cookies_select_hold, remove_cookies_select_drop;
 
 // Set User-Agent
-var use_google_bot, use_bing_bot, use_msn_bot;
+var use_google_bot, use_bing_bot, use_facebook_bot;
 // Set Referer
 var use_facebook_referer, use_google_referer, use_twitter_referer;
 // Set random IP-address
@@ -96,7 +96,7 @@ function initSetRules() {
   remove_cookies_select_hold = {};
   use_google_bot = [];
   use_bing_bot = [];
-  use_msn_bot = [];
+  use_facebook_bot = [];
   use_facebook_referer = [];
   use_google_referer = [];
   use_twitter_referer = [];
@@ -123,8 +123,7 @@ const userAgentMobileG = "Chrome/80.0.3987.92 Mobile Safari/537.36 (compatible ;
 const userAgentDesktopB = "Mozilla/5.0 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)";
 const userAgentMobileB = "Chrome/80.0.3987.92 Mobile Safari/537.36 (compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)";
 
-const userAgentDesktopM = 'Mozilla/5.0 (compatible; MSNbot/1.1; +http://search.msn.com/msnbot.htm)';
+const userAgentDesktopF = 'facebookexternalhit/1.1 (+http://www.facebook.com/externalhit_uatext.php)';
-const userAgentMobileM = 'Chrome/80.0.3987.92 Mobile Safari/537.36 (compatible; MSNbot/1.1 +http://search.msn.com/msnbot.htm)';
 
 var enabledSites = [];
 var disabledSites = [];
@@ -291,9 +290,9 @@ function set_rules(sites, sites_updated, sites_custom) {
             if (!use_bing_bot.includes(domain))
               use_bing_bot.push(domain);
             break;
-          case 'msnbot':
+          case 'facebookbot':
-            if (!use_msn_bot.includes(domain))
+            if (!use_facebook_bot.includes(domain))
-              use_msn_bot.push(domain);
+              use_facebook_bot.push(domain);
             break;
           }
         }
@@ -347,7 +346,7 @@ function set_rules(sites, sites_updated, sites_custom) {
   blockedJsInlineDomains = Object.keys(blockedJsInline);
   disableJavascriptInline();
   use_random_ip = Object.keys(random_ip);
-  change_headers = use_google_bot.concat(use_bing_bot, use_msn_bot, use_facebook_referer, use_google_referer, use_twitter_referer, use_random_ip);
+  change_headers = use_google_bot.concat(use_bing_bot, use_facebook_bot, use_facebook_referer, use_google_referer, use_twitter_referer, use_random_ip);
 }
 
 // add grouped sites to en/disabledSites (and exclude sites)
@@ -922,7 +921,7 @@ if (matchUrlDomain(change_headers, details.url) && !ignore_types.includes(detail
     !(matchUrlDomain('wsj.com', details.url) && (enabledSites.includes('#options_disable_gb_wsj') || !details.url.includes('/articles/')));
   var bingbotEnabled = matchUrlDomain(use_bing_bot, details.url) && 
     !(matchUrlDomain('stratfor.com', details.url) && details.url.match(/(\/(\d){4}-([a-z]||-)+-forecast(-([a-z]|-)+)?|-forecast-(\d){4}-([a-z]|[0-9]||-)+)$/));
-  var msnbotEnabled = matchUrlDomain(use_msn_bot, details.url);
+  var facebookbotEnabled = matchUrlDomain(use_facebook_bot, details.url);
 
   // if referer exists, set it
   requestHeaders = requestHeaders.map(function (requestHeader) {
@@ -982,11 +981,11 @@ if (matchUrlDomain(change_headers, details.url) && !ignore_types.includes(detail
     })
   }
 
-  // override User-Agent to use Msnbot
+  // override User-Agent to use Facebookbot
-  if (msnbotEnabled) {
+  if (facebookbotEnabled) {
     requestHeaders.push({
       "name": "User-Agent",
-      "value": useUserAgentMobile ? userAgentMobileM : userAgentDesktopM
+      "value": userAgentDesktopF
     })
   }
 

changelog.txt

@@ -9,6 +9,7 @@ Fix Noz.de (no amp)
 Fix Substack (redundant text)
 Fix The Athletic (regwall)
 Update custom flex sites (identify on dom)
+Update custom sites (set useragent Facebookbot)
 
 * v2.9.6.0 (2022-12-04)
 Add DN.no

contentScript.js

@@ -1589,7 +1589,7 @@ else if (matchDomain('lesinrocks.com')) {
 }
 
 else if (matchDomain('lexpress.fr')) {
-  let ads = document.querySelectorAll('div[class^="block_pub"], div.bottom-bar-full, div.tead, div.ban-bottom');
+  let ads = document.querySelectorAll('div[class^="block_pub"], div.bottom-bar-full, div.tead, div.ban-bottom, div.placeholder--ban-atf');
   removeDOMElement(...ads);
 }
 

options/options_custom.js

@@ -1,7 +1,7 @@
 var ext_api = chrome || browser;
 var url_loc = (typeof browser === 'object') ? 'firefox' : 'chrome';
 
-var useragent_options = ['', 'googlebot', 'bingbot'];
+var useragent_options = ['', 'googlebot', 'bingbot', 'facebookbot'];
 var referer_options = ['', 'facebook', 'google', 'twitter'];
 var random_ip_options = ['', 'all', 'eu'];
 

sites.js

@@ -818,7 +818,7 @@ var defaultSites = {
   "Haaretz": {
     domain: "haaretz.co.il",
     allow_cookies: 1,
-    useragent: "msnbot"
+    useragent: "facebookbot"
   },
   "Handelszeitung.ch": {
     allow_cookies: 1,
@@ -1914,7 +1914,7 @@ var defaultSites = {
   "The Marker": {
     domain: "themarker.com",
     allow_cookies: 1,
-    useragent: "msnbot"
+    useragent: "facebookbot"
   },
   "The Market.ch": {
     domain: "themarket.ch",