Merge pull request #862 from shy1132/master

fix #850 + refine firefox client-web-legacy fix

Author: dimdenGD

scripts/background_v2.js

@@ -59,17 +59,21 @@ chrome.webRequest.onBeforeSendHeaders.addListener(
     },
     ["blocking", "requestHeaders"]
 );
-chrome.webRequest.onBeforeSendHeaders.addListener(
+chrome.webRequest.onBeforeSendHeaders.addListener( //this isnt particularly elegant solution
     function(details) {
         for (let i = 0; i < details.requestHeaders.length; i++) {
             if (details.requestHeaders[i].name.toLowerCase() === 'user-agent') {
                 if (details.requestHeaders[i].value.toLowerCase().includes('firefox')) {
-                    let rvRegex = /rv:(\d+\.\d+)/;
+                    let latest = 128; //if this ever breaks set this to latest firefox version
+                    let rvRegex = /rv:(\d+\.\d+)/; //gecko version (whats important here)
+                    let versionRegex = /Firefox\/(\d+(?:\.\d+)+)/; //browser version
                     let rvMatch = details.requestHeaders[i].value.match(rvRegex);
-                    if (rvMatch) {
+                    let versionMatch = details.requestHeaders[i].value.match(versionRegex);
+                    if (rvMatch && versionMatch) {
                         let rv = parseFloat(rvMatch[1]);
-                        if (rv < 110) {
-                            details.requestHeaders[i].value = details.requestHeaders[i].value.replace(rvRegex, 'rv:110.0'); //twitter serves client-web-legacy if rv is less than 110, which breaks request signing
+                        let version = parseFloat(versionMatch[1]);
+                        if (rv < latest || version < latest) { //rv 110 is cutoff point between client-web-legacy and client-web, so we should just spoof browser and rv to latest
+                            details.requestHeaders[i].value = details.requestHeaders[i].value.replace(rvRegex, `rv:${latest}.0`).replace(versionRegex, `Firefox/${latest}.0`);
                         }
                     }
                 }

scripts/helpers.js

@@ -3764,7 +3764,7 @@ function renderNotification(n, options = {}) {
                     document.body.appendChild(a);
                     a.click();
                     a.remove();
-                } else if(n.entry.clientEventInfo.element === "users_followed_you") {
+                } else if(n.entry.clientEventInfo.element === "users_followed_you" || n.entry.clientEventInfo.element === "follow_from_recommended_user") {
                     let a = document.createElement('a');
                     a.href = `/${user.screen_name}/followers`;
                     document.body.appendChild(a);

scripts/twchallenge.js

@@ -63,7 +63,7 @@ window.addEventListener('message', e => {
             solveCallbacks[id].reject('Solver errored during initialization');
             delete solveCallbacks[id];
         }
-        alert(`There was an error in initializing security header generator: ${data.error}. OldTwitter doesn't allow unsigned requests anymore for your account security.`);
+        alert(`There was an error in initializing security header generator:\n${data.error}\nUser Agent: ${navigator.userAgent}\nOldTwitter doesn't allow unsigned requests anymore for your account security.`);
         console.error('Error initializing solver:');
         console.error(data.error);
     } else if(data.action === 'ready') {
@@ -163,9 +163,9 @@ async function initChallenge() {
         console.error(`Error during challenge init:`);
         console.error(e);
         if(location.hostname === 'twitter.com') {
-            alert(`There was an error in initializing security header generator: ${e}. OldTwitter doesn't allow unsigned requests anymore for your account security. Currently the main reason for this happening is social network tracker protection blocking the script. Try disabling such settings in your browser and extensions that do that and refresh the page. Also using OldTwitter from twitter.com domain is not supported.`);
+            alert(`There was an error in initializing security header generator: ${e}\nUser Agent: ${navigator.userAgent}\nOldTwitter doesn't allow unsigned requests anymore for your account security. Currently the main reason for this happening is social network tracker protection blocking the script. Try disabling such settings in your browser and extensions that do that and refresh the page. Also using OldTwitter from twitter.com domain is not supported.`);
         } else {
-            alert(`There was an error in initializing security header generator: ${e}. OldTwitter doesn't allow unsigned requests anymore for your account security. Currently the main reason for this happening is social network tracker protection blocking the script. Try disabling such settings in your browser and extensions that do that and refresh the page.`);
+            alert(`There was an error in initializing security header generator: ${e}\nUser Agent: ${navigator.userAgent}\nOldTwitter doesn't allow unsigned requests anymore for your account security. Currently the main reason for this happening is social network tracker protection blocking the script. Try disabling such settings in your browser and extensions that do that and refresh the page.`);
         }
         return false;
     }