Publish 1.0

extensions/chromium/runet-censorship-bypass/src/extension-common/37-sync-pac-script-with-pac-provider-api.js

@@ -193,14 +193,16 @@
           // First official, shortened:
           'https://rebrand.ly/ac-chrome-anticensority-pac',
           // Second official, Cloud Flare with caching:
+          'https://anticensority.tk/generated-pac-scripts/anticensority.pac',
+          // GitHub.io (anticensority):
+          '\x68\x74\x74\x70\x73\x3a\x2f\x2f\x61\x6e\x74\x69\x63\x65\x6e\x73\x6f\x72\x69\x74\x79\x2e\x67\x69\x74\x68\x75\x62\x2e\x69\x6f\x2f\x67\x65\x6e\x65\x72\x61\x74\x65\x64\x2d\x70\x61\x63\x2d\x73\x63\x72\x69\x70\x74\x73\x2f\x61\x6e\x74\x69\x63\x65\x6e\x73\x6f\x72\x69\x74\x79\x2e\x70\x61\x63',
+          // GitHub repo (anticensority):
+          '\x68\x74\x74\x70\x73\x3a\x2f\x2f\x72\x61\x77\x2e\x67\x69\x74\x68\x75\x62\x75\x73\x65\x72\x63\x6f\x6e\x74\x65\x6e\x74\x2e\x63\x6f\x6d\x2f\x61\x6e\x74\x69\x63\x65\x6e\x73\x6f\x72\x69\x74\x79\x2f\x67\x65\x6e\x65\x72\x61\x74\x65\x64\x2d\x70\x61\x63\x2d\x73\x63\x72\x69\x70\x74\x73\x2f\x6d\x61\x73\x74\x65\x72\x2f\x61\x6e\x74\x69\x63\x65\x6e\x73\x6f\x72\x69\x74\x79\x2e\x70\x61\x63',
+          // Old, deprecated:
           'https://anticensorship-russia.tk/generated-pac-scripts/anticensority.pac',
-          // GitHub.io:
+          // Google Drive (0.17, anticensority):
-          '\x68\x74\x74\x70\x73\x3a\x2f\x2f\x61\x6e\x74\x69\x63\x65\x6e\x73\x6f\x72\x73\x68\x69\x70\x2d\x72\x75\x73\x73\x69\x61\x2e\x67\x69\x74\x68\x75\x62\x2e\x69\x6f\x2f\x67\x65\x6e\x65\x72\x61\x74\x65\x64\x2d\x70\x61\x63\x2d\x73\x63\x72\x69\x70\x74\x73\x2f\x61\x6e\x74\x69\x63\x65\x6e\x73\x6f\x72\x69\x74\x79\x2e\x70\x61\x63', // eslint-disable-line max-len
+          '\x68\x74\x74\x70\x73\x3a\x2f\x2f\x64\x72\x69\x76\x65\x2e\x67\x6f\x6f\x67\x6c\x65\x2e\x63\x6f\x6d\x2f\x75\x63\x3f\x65\x78\x70\x6f\x72\x74\x3d\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x26\x69\x64\x3d\x30\x42\x32\x6d\x68\x42\x67\x46\x6e\x66\x34\x70\x45\x4c\x56\x6c\x47\x4e\x54\x42\x45\x4d\x58\x4e\x6d\x52\x58\x63',
-          // GitHub repo:
+        ],
-          '\x68\x74\x74\x70\x73\x3a\x2f\x2f\x72\x61\x77\x2e\x67\x69\x74\x68\x75\x62\x75\x73\x65\x72\x63\x6f\x6e\x74\x65\x6e\x74\x2e\x63\x6f\x6d\x2f\x61\x6e\x74\x69\x63\x65\x6e\x73\x6f\x72\x73\x68\x69\x70\x2d\x72\x75\x73\x73\x69\x61\x2f\x67\x65\x6e\x65\x72\x61\x74\x65\x64\x2d\x70\x61\x63\x2d\x73\x63\x72\x69\x70\x74\x73\x2f\x6d\x61\x73\x74\x65\x72\x2f\x61\x6e\x74\x69\x63\x65\x6e\x73\x6f\x72\x69\x74\x79\x2e\x70\x61\x63', // eslint-disable-line max-len
-          // Google Drive (1.0):
-          '\x68\x74\x74\x70\x73\x3a\x2f\x2f\x64\x72\x69\x76\x65\x2e\x67\x6f\x6f\x67\x6c\x65\x2e\x63\x6f\x6d\x2f\x75\x63\x3f\x65\x78\x70\x6f\x72\x74\x3d\x64\x6f\x77\x6e\x6c\x6f\x61\x64\x26\x69\x64\x3d\x30\x42\x39\x53\x4c\x5f\x57\x6a\x42\x37\x72\x78\x59\x56\x30\x4a\x79\x4c\x58\x70\x74\x5a\x6b\x64\x77\x62\x30\x45',
-        ], // eslint-disable-line max-len
       },
       onlyOwnSites: {
         label: 'Только свои сайты и свои прокси',
@@ -539,12 +541,7 @@
       const key = antiCensorRu._currentPacProviderKey;
       if (key !== null) {
         const ifVeryOld = !Object.keys(antiCensorRu.pacProviders).includes(key);
-        const ifNeedsForcing = (oldStorage.version < '0.0.0.2') && !localStorage.getItem('provider-backup');
+        if (ifVeryOld) {
-        if ( ifVeryOld || ifNeedsForcing ) {
-          if (ifNeedsForcing) {
-            console.log('Update forces antizapret...')
-            localStorage.setItem('provider-backup', antiCensorRu._currentPacProviderKey);
-          }
           antiCensorRu._currentPacProviderKey = 'Антизапрет';
         }
       }

extensions/chromium/runet-censorship-bypass/src/extension-common/70-menu-items.js

@@ -39,7 +39,7 @@
 
       support: {
         title: 'Документация / Помощь / Поддержка',
-        getUrl: (blockedUrl) => 'https://rebrand.ly/ac-support',
+        getUrl: (blockedUrl) => 'https://rebrand.ly/ac-wiki',
         order: 99,
       },
 

extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/package.json

@@ -9,7 +9,6 @@
     "babel-plugin-dynamic-import-webpack": "^1.0.1",
     "babel-preset-flow": "^6.23.0",
     "babel-preset-react": "^6.24.1",
-    "babili-webpack-plugin": "^0.0.11",
     "concat-stream": "^1.6.0",
     "csjs-inject": "^1.0.1",
     "flow-bin": "^0.45.0",
@@ -24,7 +23,7 @@
     "build:dev:nocomp": "NODE_ENV=development webpack --define process.env.NODE_ENV=\"'development'\" --env=dev",
     "build:dev": "NODE_ENV=development webpack --debug --define process.env.NODE_ENV=\"'development'\" --output-pathinfo --env=dev",
     "gulp": "cd .. && npm run gulp",
-    "build": "npm run build:dev",
+    "build": "npm run build:prod",
     "start": "cd .. && npm start"
   },
   "dependencies": {

extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/App.js

@@ -79,8 +79,8 @@ export default function getApp(theState) {
         headers: new Headers(headers),
       };
 
-      const ghUrl = `https://api.github.com/repos/anticensorship-russia/for-testing/issues/1/comments${query}`;
+      const ghUrl = `https://api.github.com/repos/anticensority/chromium-extension/issues/10/comments${query}`;
-      //const ghUrl = `http://httpstat.us/418`;
+
       const [error, comments, etag] = await fetch(
         ghUrl,
         params

extensions/chromium/runet-censorship-bypass/src/extension-full/80-error-menu.js

@@ -5,7 +5,6 @@
   chrome.webNavigation.onErrorOccurred.addListener((details) => {
 
     const tabId = details.tabId;
-    console.log(details.url, details.error, details);
     if ( !(details.frameId === 0 && tabId >= 0) ||
           [
             'net::ERR_BLOCKED_BY_CLIENT',
@@ -14,11 +13,9 @@
       return;
     }
 
-    console.log(details.url, details.error, details);
-
     chrome.browserAction.setPopup({
       tabId,
-      popup: './pages/options/index.html#tab=exceptions&status=Правый клик по иконке = меню инструментов!',
+      popup: './pages/options/index.html#tab=exceptions&status=Правый клик по иконке — меню инструментов!',
     });
 
     window.chrome.browserAction.setBadgeBackgroundColor({