diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/37-sync-pac-script-with-pac-provider-api.tmpl.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/37-sync-pac-script-with-pac-provider-api.tmpl.js index 450e406..95c9411 100644 --- a/extensions/chromium/runet-censorship-bypass/src/extension-common/37-sync-pac-script-with-pac-provider-api.tmpl.js +++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/37-sync-pac-script-with-pac-provider-api.tmpl.js @@ -120,8 +120,8 @@ \` Не найдено СВОИХ прокси. Этот PAC-скрипт теперь - работает только со СВОИМИ прокси - (по умолчанию используется локальный TOR и прокси "Антизапрет", для их отключения: Свои прокси -> откл. "Использовать прокси PAC-скрипта"). + работает только со СВОИМИ прокси + (по умолчанию используется локальный TOR и прокси "Антизапрет", для их отключения: Свои прокси -> откл. "Использовать прокси PAC-скрипта"). \`, ); } @@ -573,12 +573,12 @@ } } - if (window.apis.version.isLeq(oldStorage.version, '0.0.1.23')) { + if (window.apis.version.isLeq(oldStorage.version, '0.0.1.25')) { console.log('Switch to Antizapret automatically, only from Anitcensority without own proxies.'); const provKey = antiCensorRu.getCurrentPacProviderKey(); - if (provKey !== 'Антицензорити') { - console.log('Current provider', provKey, '!== Anticensority'); + if (provKey !== 'Антицензорити' && provKey !== 'Антизапрет') { + console.log('Current provider', provKey, '!== Anticensority or Antizapret'); return; // Not Anticensority. } const pacMods = window.apis.pacKitchen.getPacMods(); @@ -587,6 +587,7 @@ return; // Own proxies or Tor are used. } antiCensorRu.setCurrentPacProviderKey('Антизапрет'); + antiCensorRu.setLastModified(0); await new Promise((resolveSwitch) => antiCensorRu.syncWithPacProviderAsync((err, res, warns) => { @@ -596,11 +597,11 @@ } if (err) { console.log( - 'Ungraceful update from 1.23: couldn\\'t fetch Antizapret:', + 'Ungraceful update from 1.25: couldn\\'t fetch Antizapret:', ); console.error(err); } else { - console.log('Update from 1.23 applied successfully.'); + console.log('Update from 1.25 applied successfully.'); } resolveSwitch(); diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/70-menu-items.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/70-menu-items.js index 6008e50..6eed9b3 100644 --- a/extensions/chromium/runet-censorship-bypass/src/extension-common/70-menu-items.js +++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/70-menu-items.js @@ -39,7 +39,7 @@ support: { title: 'Документация / Помощь / Поддержка', - getUrl: (blockedUrl) => 'https://rebrand.ly/ac-wiki', + getUrl: (blockedUrl) => 'https://git.io/ac-wiki', order: 99, }, diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/_locales/en/messages.tmpl.json b/extensions/chromium/runet-censorship-bypass/src/extension-common/_locales/en/messages.tmpl.json index 465596a..7188c02 100644 --- a/extensions/chromium/runet-censorship-bypass/src/extension-common/_locales/en/messages.tmpl.json +++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/_locales/en/messages.tmpl.json @@ -3,7 +3,7 @@ "message": "Runet Censorship Bypass${nameSuffixEn}" }, "extDesc": { - "message": "Circumvent Russian Internet Censorship: https://rebrand.ly/ac-wiki" + "message": "Circumvent Russian Internet Censorship: https://git.io/ac-wiki" }, "proxy": { "message": "proxy" diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/_locales/ru/messages.tmpl.json b/extensions/chromium/runet-censorship-bypass/src/extension-common/_locales/ru/messages.tmpl.json index cf2c2af..acfc907 100644 --- a/extensions/chromium/runet-censorship-bypass/src/extension-common/_locales/ru/messages.tmpl.json +++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/_locales/ru/messages.tmpl.json @@ -3,7 +3,7 @@ "message": "Обход блокировок Рунета${nameSuffixRu}" }, "extDesc": { - "message": "Обход интернет-цензуры в России: https://rebrand.ly/ac-wiki" + "message": "Обход интернет-цензуры в России: https://git.io/ac-wiki" }, "proxy": { "message": "прокси" diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/App.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/App.js index 1238b0f..2d16b76 100644 --- a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/App.js +++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/components/App.js @@ -83,8 +83,8 @@ export default function getApp(theState) { }; // I comment and uncomment this variable manually before release or build: - // const ghUrl = `https://api.github.com/repos/anticensority/chromium-extension/issues/10/comments${query}`; - const ghUrl = `https://api.github.com/repos/anticensority/for-testing/issues/1/comments${query}`; + const ghUrl = `https://api.github.com/repos/anticensority/chromium-extension/issues/10/comments${query}`; + // const ghUrl = `https://api.github.com/repos/anticensority/for-testing/issues/1/comments${query}`; const [error, comments, etag] = await fetch( ghUrl, diff --git a/extensions/chromium/runet-censorship-bypass/src/templates-data.js b/extensions/chromium/runet-censorship-bypass/src/templates-data.js index 6fd77c4..c4277a7 100644 --- a/extensions/chromium/runet-censorship-bypass/src/templates-data.js +++ b/extensions/chromium/runet-censorship-bypass/src/templates-data.js @@ -10,7 +10,7 @@ const pacUrls = [ ]; const commonContext = { - version: '1.24', + version: '1.27', anticensorityPacUrls: [ ...pacUrls, ],