diff --git a/.gitea/issue_template/bug.md b/.gitea/issue_template/bug.md deleted file mode 100644 index c4016d4..0000000 --- a/.gitea/issue_template/bug.md +++ /dev/null @@ -1,32 +0,0 @@ ---- -name: "Report a bug" -about: "Is libredirect not behaving as expected? Report a bug so that it can be fixed as soon as possible." -labels: - - "Kind: Bug" ---- - -## What happened? - -## What did you expect to happen? - -## Steps to reproduce: - -1. -2. -3. - - - -## Debug information: - -Browser and version number: -Libredirect version: - -## Screenshots/Videos - - - -
- - -- [ ] I have checked on codeberg and github and can confirm this issue is not a duplicate. diff --git a/.gitea/issue_template/feature.md b/.gitea/issue_template/feature.md deleted file mode 100644 index 0e13c21..0000000 --- a/.gitea/issue_template/feature.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -name: "Suggest a new feature" -about: "Is there something missing that you want to see in libredirect? Suggest a feature so it will exist in a future release." -labels: - - "Kind: Feature" ---- - -## Describe your current issue/inconvenience - -## Explain how this new feature will solve this - -
- - -- [ ] I have checked on codeberg and github and can confirm this issue is not a duplicate. diff --git a/Privacy-Policy.md b/Privacy-Policy.md index a70cb23..e472d10 100644 --- a/Privacy-Policy.md +++ b/Privacy-Policy.md @@ -3,7 +3,7 @@ - LibRedirect does not collect any Personal Information of any kind. - LibRedirect doesn't embed any kind of analytics in its code. - All aspects of the url redirections work locally, except OpenStreetMap (OSM) reverse geocoding, done via the [OSM Nomantim API](https://nominatim.org/release-docs/develop/api/Overview/). -- When you visit your settings page and go to ex YouTube, it will connect to this [repository](https://github.com/libredirect/instances) and specifically [this](https://raw.githubusercontent.com/libredirect/instances/main/data.json) and [this](https://raw.githubusercontent.com/libredirect/instances/main/blacklist.json) url to get the latest public instances list for it. +- When you visit your settings page and go to ex YouTube, it will connect to this [repository](https://gitler.moe/suwako/libreredirect-instances) and specifically [this](https://gitler.moe/suwako/libreredirect-instances/raw/branch/main/data.json) and [this](https://gitler.moe/suwako/libreredirect-instances/raw/branch/main/blacklist.json) url to get the latest public instances list for it. ## Future Changes diff --git a/README.md b/README.md index 6424a2e..38ebef0 100644 --- a/README.md +++ b/README.md @@ -1,51 +1,24 @@ - +# Libre Redirect -A browser extension that redirects YouTube, Twitter, TikTok... requests to alternative privacy friendly frontends and backends. +[検閲が大嫌い](https://github.com/libredirect/browser_extension/issues/693)。\ +だからLibRedirectをフォークしました。 - - - -  - - - - -## Translate - - - - -## Development -Install [Node.js](https://nodejs.org/) +## 開発 ```bash -git clone https://github.com/libredirect/browser_extension -cd browser_extension -npm install -npm run html # Generates html using Pug -npm run start # Runs in firefox in debug mode using Web-ext +git clone https://gitler.moe/suwako/libreredirect +cd libreredirect +npm i +npm run html +npm run start ``` -### Build and Run on Chromium manually -1. Open `chrome://extensions` -2. Enable `dev mode` -3. Select `load unpacked extension` -4. Select `src` folder -### Build a zip package for Firefox +### Chromium向けビルドと実行 +1. `chrome://extensions`にアクセスして +2. `デベロッパー モード`を有効にして +3. `パッケージ化されていない拡張機能を読み込む`をクリックして +4. `src`フォルダーを開いて + +### Firefox向けZIPパッケージを創作 ```bash npm run build ``` -### Install the zip package on Firefox (temporarily) -3. Type in the address bar: `about:debugging#/runtime/this-firefox` -4. Press `Load Temporary Add-on...` -5. Select `libredirect-VERSION.zip` from `web-ext-artifacts` folder - -### Install the zip package on Firefox ESR, Developer Edition, Nightly -3. Type in the address bar: `about:config` -4. Set `xpinstall.signatures.required` to `false` -5. Type in the address bar: `about:addons` -6. Click on the gear shaped `settings` button and select `Install Add-on From File...` -7. Select `libredirect-VERSION.zip` from `web-ext-artifacts` folder - ---- - -Forked from [Privacy Redirect](https://github.com/SimonBrazell/privacy-redirect) diff --git a/package.json b/package.json index 76eb63e..a93e85d 100644 --- a/package.json +++ b/package.json @@ -1,27 +1,26 @@ { - "name": "libredirect", - "description": "Redirects YouTube, Twitter, TikTok and more to privacy friendly frontends.", + "name": "libreredirect", + "description": "Redirects YouTube, Twitter, TikTok and more to privacy friendly frontends without censor.", "engines": { "node": ">=16.13.1", "npm": ">=8.1.2" }, "scripts": { "start": "web-ext run", - "start_ar": "web-ext run --firefox=/home/esmail/Downloads/ar/firefox/firefox --pref font.language.group=ar", "build": "web-ext build", "test": "web-ext lint", "html": "pug --basedir ./ --obj ./src/config.json src/pages/options/index.pug --out src/pages/options/ && pug --basedir ./ --obj ./src/config.json src/pages/popup/popup.pug --out src/pages/popup/" }, "repository": { "type": "git", - "url": "git+https://github.com/libredirect/libredirect.git" + "url": "git+https://gitler.moe/suwako/libreredirect.git" }, - "author": "LibRedirect", + "author": "suwako", "license": "GPL-3.0-only", "bugs": { - "url": "https://github.com/libredirect/libredirect/issues" + "url": "https://gitler.moe/suwako/libreredirect/issues" }, - "homepage": "https://libredirect.github.io", + "homepage": "https://076.moe/libreredirect", "devDependencies": { "web-ext": "^7.2.0", "pug-cli": "^1.0.0-alpha6" @@ -35,4 +34,4 @@ "overwriteDest": true } } -} \ No newline at end of file +} diff --git a/src/_locales/ar/messages.json b/src/_locales/ar/messages.json index 47bed42..5eff01d 100644 --- a/src/_locales/ar/messages.json +++ b/src/_locales/ar/messages.json @@ -1,6 +1,6 @@ { "extensionName": { - "message": "LibRedirect", + "message": "Libre Redirect", "description": "extension name" }, "extensionDescription": { diff --git a/src/_locales/bs/messages.json b/src/_locales/bs/messages.json index 06c50c3..3134e40 100644 --- a/src/_locales/bs/messages.json +++ b/src/_locales/bs/messages.json @@ -1,6 +1,6 @@ { "extensionName": { - "message": "LibRedirect", + "message": "Libre Redirect", "description": "name of the extension" }, "extensionDescription": { diff --git a/src/_locales/cs/messages.json b/src/_locales/cs/messages.json index 1abe86d..672a3c6 100644 --- a/src/_locales/cs/messages.json +++ b/src/_locales/cs/messages.json @@ -1,6 +1,6 @@ { "extensionName": { - "message": "LibRedirect", + "message": "Libre Redirect", "description": "name of the extension" }, "extensionDescription": { diff --git a/src/_locales/de/messages.json b/src/_locales/de/messages.json index 442afb9..2b22ad9 100644 --- a/src/_locales/de/messages.json +++ b/src/_locales/de/messages.json @@ -1,6 +1,6 @@ { "extensionName": { - "message": "LibRedirect", + "message": "Libre Redirect", "description": "name of the extension" }, "extensionDescription": { diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index 4879dc8..60ff4a9 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -1,6 +1,6 @@ { "extensionName": { - "message": "LibRedirect", + "message": "Libre Redirect", "description": "name of the extension" }, "extensionDescription": { diff --git a/src/_locales/es/messages.json b/src/_locales/es/messages.json index 53acec4..12c5f65 100644 --- a/src/_locales/es/messages.json +++ b/src/_locales/es/messages.json @@ -1,6 +1,6 @@ { "extensionName": { - "message": "LibRedirect", + "message": "Libre Redirect", "description": "name of the extension" }, "extensionDescription": { diff --git a/src/_locales/fr/messages.json b/src/_locales/fr/messages.json index 065661e..ee65c2c 100644 --- a/src/_locales/fr/messages.json +++ b/src/_locales/fr/messages.json @@ -1,6 +1,6 @@ { "extensionName": { - "message": "LibRedirect", + "message": "Libre Redirect", "description": "name of the extension" }, "extensionDescription": { diff --git a/src/_locales/gl/messages.json b/src/_locales/gl/messages.json index 69efef8..9f5f9d0 100644 --- a/src/_locales/gl/messages.json +++ b/src/_locales/gl/messages.json @@ -1,6 +1,6 @@ { "extensionName": { - "message": "LibRedirect", + "message": "Libre Redirect", "description": "name of the extension" }, "extensionDescription": { diff --git a/src/_locales/hr/messages.json b/src/_locales/hr/messages.json index bcb6764..9603a16 100644 --- a/src/_locales/hr/messages.json +++ b/src/_locales/hr/messages.json @@ -1,6 +1,6 @@ { "extensionName": { - "message": "LibRedirect", + "message": "Libre Redirect", "description": "name of the extension" }, "extensionDescription": { diff --git a/src/_locales/id/messages.json b/src/_locales/id/messages.json index 7157b5f..f234ed2 100644 --- a/src/_locales/id/messages.json +++ b/src/_locales/id/messages.json @@ -1,6 +1,6 @@ { "extensionName": { - "message": "LibRedirect", + "message": "Libre Redirect", "description": "name of the extension" }, "extensionDescription": { diff --git a/src/_locales/it/messages.json b/src/_locales/it/messages.json index b8f229a..87a4986 100644 --- a/src/_locales/it/messages.json +++ b/src/_locales/it/messages.json @@ -1,6 +1,6 @@ { "extensionName": { - "message": "LibRedirect", + "message": "Libre Redirect", "description": "name of the extension" }, "extensionDescription": { diff --git a/src/_locales/ja/messages.json b/src/_locales/ja/messages.json index 43d1937..10d055e 100644 --- a/src/_locales/ja/messages.json +++ b/src/_locales/ja/messages.json @@ -1,6 +1,6 @@ { "extensionName": { - "message": "LibRedirect", + "message": "Libre Redirect", "description": "name of the extension" }, "extensionDescription": { diff --git a/src/_locales/ko/messages.json b/src/_locales/ko/messages.json index 85b72c9..aa40d6d 100644 --- a/src/_locales/ko/messages.json +++ b/src/_locales/ko/messages.json @@ -1,6 +1,6 @@ { "extensionName": { - "message": "LibRedirect", + "message": "Libre Redirect", "description": "name of the extension" }, "extensionDescription": { diff --git a/src/_locales/nb_NO/messages.json b/src/_locales/nb_NO/messages.json index 4686001..6a364a4 100644 --- a/src/_locales/nb_NO/messages.json +++ b/src/_locales/nb_NO/messages.json @@ -1,6 +1,6 @@ { "extensionName": { - "message": "LibRedirect", + "message": "Libre Redirect", "description": "name of the extension" }, "extensionDescription": { diff --git a/src/_locales/nl/messages.json b/src/_locales/nl/messages.json index 91699ac..a289da7 100644 --- a/src/_locales/nl/messages.json +++ b/src/_locales/nl/messages.json @@ -1,6 +1,6 @@ { "extensionName": { - "message": "LibRedirect", + "message": "Libre Redirect", "description": "name of the extension" }, "extensionDescription": { diff --git a/src/_locales/pl/messages.json b/src/_locales/pl/messages.json index f05b08e..af2b25a 100644 --- a/src/_locales/pl/messages.json +++ b/src/_locales/pl/messages.json @@ -1,6 +1,6 @@ { "extensionName": { - "message": "LibRedirect", + "message": "Libre Redirect", "description": "name of the extension" }, "extensionDescription": { diff --git a/src/_locales/pt/messages.json b/src/_locales/pt/messages.json index 81f08a2..dd7658b 100644 --- a/src/_locales/pt/messages.json +++ b/src/_locales/pt/messages.json @@ -1,6 +1,6 @@ { "extensionName": { - "message": "LibRedirect", + "message": "Libre Redirect", "description": "name of the extension" }, "extensionDescription": { diff --git a/src/_locales/pt_BR/messages.json b/src/_locales/pt_BR/messages.json index a55d9e1..ca93cda 100644 --- a/src/_locales/pt_BR/messages.json +++ b/src/_locales/pt_BR/messages.json @@ -1,6 +1,6 @@ { "extensionName": { - "message": "LibRedirect", + "message": "Libre Redirect", "description": "Nome da Extensão" }, "extensionDescription": { diff --git a/src/_locales/ro/messages.json b/src/_locales/ro/messages.json index caf221e..559fdc9 100644 --- a/src/_locales/ro/messages.json +++ b/src/_locales/ro/messages.json @@ -1,6 +1,6 @@ { "extensionName": { - "message": "LibRedirect", + "message": "Libre Redirect", "description": "name of the extension" }, "extensionDescription": { diff --git a/src/_locales/ru/messages.json b/src/_locales/ru/messages.json index b1ff0c4..2dfb835 100644 --- a/src/_locales/ru/messages.json +++ b/src/_locales/ru/messages.json @@ -1,6 +1,6 @@ { "extensionName": { - "message": "LibRedirect", + "message": "Libre Redirect", "description": "name of the extension" }, "extensionDescription": { diff --git a/src/_locales/sr/messages.json b/src/_locales/sr/messages.json index b14cb2d..981df28 100644 --- a/src/_locales/sr/messages.json +++ b/src/_locales/sr/messages.json @@ -1,6 +1,6 @@ { "extensionName": { - "message": "LibRedirect", + "message": "Libre Redirect", "description": "name of the extension" }, "extensionDescription": { diff --git a/src/_locales/tr/messages.json b/src/_locales/tr/messages.json index 6b5c4bc..890a0e0 100644 --- a/src/_locales/tr/messages.json +++ b/src/_locales/tr/messages.json @@ -1,6 +1,6 @@ { "extensionName": { - "message": "LibRedirect", + "message": "Libre Redirect", "description": "name of the extension" }, "extensionDescription": { diff --git a/src/_locales/uk/messages.json b/src/_locales/uk/messages.json index 9d6350c..b81b803 100644 --- a/src/_locales/uk/messages.json +++ b/src/_locales/uk/messages.json @@ -1,6 +1,6 @@ { "extensionName": { - "message": "LibRedirect", + "message": "Libre Redirect", "description": "name of the extension" }, "extensionDescription": { diff --git a/src/_locales/vi/messages.json b/src/_locales/vi/messages.json index 020eea7..59b506c 100644 --- a/src/_locales/vi/messages.json +++ b/src/_locales/vi/messages.json @@ -1,6 +1,6 @@ { "extensionName": { - "message": "LibRedirect", + "message": "Libre Redirect", "description": "name of the extension" }, "extensionDescription": { diff --git a/src/_locales/zh_Hans/messages.json b/src/_locales/zh_Hans/messages.json index 08803d2..b297605 100644 --- a/src/_locales/zh_Hans/messages.json +++ b/src/_locales/zh_Hans/messages.json @@ -1,6 +1,6 @@ { "extensionName": { - "message": "LibRedirect", + "message": "Libre Redirect", "description": "name of the extension" }, "extensionDescription": { diff --git a/src/assets/images/libredirect-128.png b/src/assets/images/libreredirect-128.png similarity index 100% rename from src/assets/images/libredirect-128.png rename to src/assets/images/libreredirect-128.png diff --git a/src/assets/images/libredirect-16.png b/src/assets/images/libreredirect-16.png similarity index 100% rename from src/assets/images/libredirect-16.png rename to src/assets/images/libreredirect-16.png diff --git a/src/assets/images/libredirect-32.png b/src/assets/images/libreredirect-32.png similarity index 100% rename from src/assets/images/libredirect-32.png rename to src/assets/images/libreredirect-32.png diff --git a/src/assets/images/libredirect-48.png b/src/assets/images/libreredirect-48.png similarity index 100% rename from src/assets/images/libredirect-48.png rename to src/assets/images/libreredirect-48.png diff --git a/src/assets/images/libredirect.png b/src/assets/images/libreredirect.png similarity index 100% rename from src/assets/images/libredirect.png rename to src/assets/images/libreredirect.png diff --git a/src/assets/images/libredirect.svg b/src/assets/images/libreredirect.svg similarity index 99% rename from src/assets/images/libredirect.svg rename to src/assets/images/libreredirect.svg index 87cb1e9..c88528c 100644 --- a/src/assets/images/libredirect.svg +++ b/src/assets/images/libreredirect.svg @@ -10,7 +10,7 @@ inkscape:export-xdpi="78.019997" inkscape:export-ydpi="78.019997" inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20, custom)" - sodipodi:docname="libredirect.svg" + sodipodi:docname="libreredirect.svg" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" diff --git a/src/assets/images/mixi-icon.png b/src/assets/images/mixi-icon.png new file mode 100644 index 0000000..d7a9d24 Binary files /dev/null and b/src/assets/images/mixi-icon.png differ diff --git a/src/assets/images/pixiv-icon.png b/src/assets/images/pixiv-icon.png new file mode 100644 index 0000000..f98916a Binary files /dev/null and b/src/assets/images/pixiv-icon.png differ diff --git a/src/assets/javascripts/services.js b/src/assets/javascripts/services.js index 65695de..e49fd5e 100644 --- a/src/assets/javascripts/services.js +++ b/src/assets/javascripts/services.js @@ -46,6 +46,8 @@ function regexArray(service, url, config, frontend) { async function redirectAsync(url, type, initiator, forceRedirection) { await init() + console.log(url.hostname) + console.log(url.pathname) return redirect(url, type, initiator, forceRedirection) } @@ -537,6 +539,45 @@ function redirect(url, type, initiator, forceRedirection) { if (url.hostname == "i.pinimg.com") return `${randomInstance}/image_proxy.php?url=${url.href}` return randomInstance } + case "spliti": { + if (url.hostname == "news.mixi.jp") { + if (url.search) { + let nid = url.search.split("?")[1].split("&") + let mid + nid.forEach(x => { + if (x.startsWith("id=")) nid = x.split("=")[1] + if (x.startsWith("media_id=")) mid = x.split("=")[1] + }) + if (url.pathname.startsWith('/view_news.pl') && url.pathname != '/') return `${randomInstance}/?url=view_news.pl?id=${nid}&media_id=${mid}` + if (url.pathname.startsWith('/list_news_category.pl') && url.pathname != '/') return `${randomInstance}/?url=list_news_category.pl?id=${nid}` + } + return randomInstance + } + } + case "vixip": { + if (url.hostname == "pixiv.net" || url.hostname == "www.pixiv.net") { + let path = url.pathname + if (url.pathname.startsWith('/en')) path = path.splice(3) + console.log(path) + if (path.startsWith('/users')) { + const illustid = /\/(\d+)\/?$/.exec(url.pathname)[1] + if (path.includes('/illusts')) return `${randomInstance}/users/illusts/?id=${illustid}` + if (path.includes('/manga')) return `${randomInstance}/users/manga/?id=${illustid}` + return `${randomInstance}/users/?id=${illustid}` + } + + if (path.startsWith('/artworks')) { + const illustid = /\/(\d+)\/?$/.exec(url.pathname)[1] + return `${randomInstance}/artworks/?id=${illustid}` + } + + if (path.startsWith('/tags')) { + const q = path.split("/")[2] + return `${randomInstance}/search/?q=${q}` + } + return randomInstance + } + } default: { return `${randomInstance}${url.pathname}${url.search}` } @@ -638,14 +679,16 @@ function reverse(url) { } const defaultInstances = { - 'invidious': ['https://inv.vern.cc'], + 'invidious': ['https://youtube.owacon.moe'], 'piped': ['https://pipedapi-libre.kavin.rocks'], 'pipedMaterial': ['https://piped-material.xn--17b.net'], 'cloudtube': ['https://tube.cadence.moe'], 'poketube': ['https://poketube.fun'], 'proxiTok': ['https://proxitok.pabloferreiro.es'], 'send': ['https://send.vis.ee'], - 'nitter': ['https://nitter.net'], + 'nitter': ['https://twitter.owacon.moe'], + 'spliti': ['https://mixi.owacon.moe'], + 'vixip': ['https://pixiv.owacon.moe'], 'libreddit': ['https://libreddit.spike.codes'], 'teddit': ['https://teddit.net'], 'scribe': ['https://scribe.rip'], diff --git a/src/assets/javascripts/utils.js b/src/assets/javascripts/utils.js index 6644f8e..936b496 100644 --- a/src/assets/javascripts/utils.js +++ b/src/assets/javascripts/utils.js @@ -35,16 +35,13 @@ function getOptions() { function getBlacklist(options) { return new Promise(resolve => { let url - if (options.fetchInstances == 'github') { - url = 'https://raw.githubusercontent.com/libredirect/instances/main/blacklist.json' - } - else if (options.fetchInstances == 'codeberg') { - url = 'https://codeberg.org/LibRedirect/instances/raw/branch/main/blacklist.json' - } - else { - resolve('disabled') - return - } + if (options.fetchInstances == 'gitler') { + url = 'https://gitler.moe/suwako/libreredirect-instances/raw/branch/main/blacklist.json' + } + else { + resolve('disabled') + return + } const http = new XMLHttpRequest() http.open("GET", url, true) http.onreadystatechange = () => { @@ -68,16 +65,13 @@ function getBlacklist(options) { function getList(options) { return new Promise(resolve => { let url - if (options.fetchInstances == 'github') { - url = 'https://raw.githubusercontent.com/libredirect/instances/main/data.json' - } - else if (options.fetchInstances == 'codeberg') { - url = 'https://codeberg.org/LibRedirect/instances/raw/branch/main/data.json' - } - else { - resolve('disabled') - return - } + if (options.fetchInstances == 'gitler') { + url = 'https://gitler.moe/suwako/libreredirect-instances/raw/branch/main/blacklist.json' + } + else { + resolve('disabled') + return + } const http = new XMLHttpRequest() http.open("GET", url, true) http.onreadystatechange = () => { diff --git a/src/config.json b/src/config.json index cd5dc5f..eac1a1f 100644 --- a/src/config.json +++ b/src/config.json @@ -129,6 +129,57 @@ "embeddable": false, "url": "https://music.youtube.com" }, + "mixi": { + "frontends": { + "spliti": { + "name": "Spliti", + "embeddable": false, + "instanceList": true, + "url": "https://gitler.moe/suwako/spliti", + "localhost": true + } + }, + "targets": [ + "^https?:\\/{2}(news\\.|)mixi\\.jp(\\/|$)" + ], + "name": "Mixi", + "options": { + "enabled": false, + "redirectType": "main_frame", + "unsupportedUrls": "bypass", + "frontend": "spliti", + "instance": "public" + }, + "imageType": "png", + "embeddable": true, + "url": "https://news.mixi.jp" + }, + "pixiv": { + "frontends": { + "vixip": { + "name": "Vixip", + "embeddable": false, + "instanceList": true, + "url": "https://gitler.moe/suwako/vixip", + "localhost": true + } + }, + "targets": [ + "^https?:\\/{2}(www\\.|)pixiv\\.net(\\/|$)", + "^https?:\\/{2}(www\\.|)pixiv\\.net(\\/en\\.|)(\\/|$)" + ], + "name": "Pixiv", + "options": { + "enabled": false, + "redirectType": "main_frame", + "unsupportedUrls": "bypass", + "frontend": "vixip", + "instance": "public" + }, + "imageType": "png", + "embeddable": true, + "url": "https://pixiv.net" + }, "twitter": { "frontends": { "nitter": { @@ -420,7 +471,7 @@ } }, "targets": [ - "^https?:\\/{2}search\\.libredirect\\.invalid" + "^https?:\\/{2}search\\.libreredirect\\.invalid" ], "name": "Search", "options": { @@ -431,7 +482,7 @@ }, "imageType": "svgMono", "embeddable": false, - "url": "https://search.libredirect.invalid" + "url": "https://search.libreredirect.invalid" }, "translate": { "frontends": { @@ -455,7 +506,7 @@ }, "targets": [ "^https?:\\/{2}translate\\.google(\\.[a-z]{2,3}){1,2}\\/", - "^https?:\\/{2}translate\\.libredirect\\.invalid" + "^https?:\\/{2}translate\\.libreredirect\\.invalid" ], "name": "Translate", "options": { @@ -466,7 +517,7 @@ }, "imageType": "svgMono", "embeddable": false, - "url": "https://translate.libredirect.invalid" + "url": "https://translate.libreredirect.invalid" }, "maps": { "frontends": { @@ -482,7 +533,7 @@ } }, "targets": [ - "^https?:\\/{2}maps\\.libredirect\\.invalid", + "^https?:\\/{2}maps\\.libreredirect\\.invalid", "^https?:\\/{2}(((www|maps)\\.)?(google\\.).*(\\/maps)|maps\\.(google\\.).*)" ], "name": "Maps", @@ -493,7 +544,7 @@ }, "imageType": "svgMono", "embeddable": false, - "url": "https://maps.libredirect.invalid" + "url": "https://maps.libreredirect.invalid" }, "sendFiles": { "frontends": { @@ -504,7 +555,7 @@ } }, "targets": [ - "^https?:\\/{2}send\\.libredirect\\.invalid", + "^https?:\\/{2}send\\.libreredirect\\.invalid", "^https?:\\/{2}send\\.firefox\\.com\\/?$", "^https?:\\/{2}sendfiles\\.online\\/?$" ], @@ -516,7 +567,7 @@ }, "imageType": "svgMono", "embeddable": false, - "url": "https://send.libredirect.invalid" + "url": "https://send.libreredirect.invalid" }, "textStorage": { "frontends": { @@ -527,7 +578,7 @@ } }, "targets": [ - "^https?:\\/{2}paste\\.libredirect\\.invalid" + "^https?:\\/{2}paste\\.libreredirect\\.invalid" ], "name": "Paste Text", "options": { @@ -537,7 +588,7 @@ }, "imageType": "svgMono", "embeddable": false, - "url": "https://paste.libredirect.invalid" + "url": "https://paste.libreredirect.invalid" }, "reuters": { "frontends": { @@ -809,7 +860,7 @@ } }, "targets": [ - "^https?:\\/{2}speedtest\\.libredirect\\.invalid\\/", + "^https?:\\/{2}speedtest\\.libreredirect\\.invalid\\/", "^https?:\\/{2}(www\\.)?fast\\.com\\/$", "^https?:\\/{2}(www\\.)?speedtest\\.net\\/$" ], @@ -821,7 +872,7 @@ }, "imageType": "svgMono", "embeddable": false, - "url": "https://speedtest.libredirect.invalid" + "url": "https://speedtest.libreredirect.invalid" }, "meet": { "name": "Meet", @@ -833,7 +884,7 @@ } }, "targets": [ - "^https?:\\/{2}meet\\.libredirect\\.invalid\\/" + "^https?:\\/{2}meet\\.libreredirect\\.invalid\\/" ], "options": { "enabled": false, @@ -842,7 +893,7 @@ }, "imageType": "svgMono", "embeddable": false, - "url": "https://meet.libredirect.invalid" + "url": "https://meet.libreredirect.invalid" } } -} \ No newline at end of file +} diff --git a/src/manifest.json b/src/manifest.json index e2f79bd..ea1f202 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -14,10 +14,10 @@ "persistent": true }, "icons": { - "16": "assets/images/libredirect-16.png", - "32": "assets/images/libredirect-32.png", - "48": "assets/images/libredirect-48.png", - "128": "assets/images/libredirect-128.png" + "16": "assets/images/libreredirect-16.png", + "32": "assets/images/libreredirect-32.png", + "48": "assets/images/libreredirect-48.png", + "128": "assets/images/libreredirect-128.png" }, "permissions": [ "webRequest", @@ -35,10 +35,10 @@ "browser_style": false, "default_popup": "pages/popup/popup.html", "default_icon": { - "16": "assets/images/libredirect-16.png", - "32": "assets/images/libredirect-32.png", - "48": "assets/images/libredirect-48.png", - "128": "assets/images/libredirect-128.png" + "16": "assets/images/libreredirect-16.png", + "32": "assets/images/libreredirect-32.png", + "48": "assets/images/libreredirect-48.png", + "128": "assets/images/libreredirect-128.png" } }, "options_ui": { @@ -49,9 +49,9 @@ "chrome_settings_overrides": { "search_provider": { "name": "__MSG_extensionName__", - "keyword": "@libredirect", + "keyword": "@libreredirect", "favicon_url": "https://raw.githubusercontent.com/libredirect/libredirect/master/src/assets/images/libredirect-16.png", - "search_url": "https://search.libredirect.invalid/?q={searchTerms}", + "search_url": "https://search.libreredirect.invalid/?q={searchTerms}", "encoding": "UTF-8", "is_default": false } @@ -85,4 +85,4 @@ "default_locale": "en", "update_url": "https://raw.githubusercontent.com/libredirect/libredirect/master/src/updates/updates.xml", "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAroWDSoSRZ1scj+eJRrvnhJbrqXTKnhQuxs6+AJg16sqr0bsMdFV+MSY4i4xnK+K5WOYkBliWXgUyk/wzicoAjOnSJddrL/Md4FuWHI2NVIkrlsLOrYkygi5OLqGPajRH/w8Cdmg7KzEpXe/OnYV0/qS8li8huEdTzdeLdhfbiVl1j3DOr4OJALQ7mPeeNFHFo/oVQ+OkSezWLezA5jUGfhtzPYV6u1TXzX7lCi8E/BbDbwkvvXOMcjXCv08kjdLOY2djCA2a6zr0xAb3q8DlexAMZ8vMof7AQRFtBKhLc9n9VFoipMMdBOVQQj/eIcRILBrmkcZNnJxFKiHNJ+NcZQIDAQAB" -} \ No newline at end of file +} diff --git a/src/pages/background/background.js b/src/pages/background/background.js index d7f96a3..3cff1c1 100644 --- a/src/pages/background/background.js +++ b/src/pages/background/background.js @@ -53,7 +53,7 @@ browser.webRequest.onBeforeRequest.addListener( } if (!newUrl) { - const match = url.href.match(/^https?:\/{2}.*\.libredirect\.invalid.*/) + const match = url.href.match(/^https?:\/{2}.*\.libreredirect\.invalid.*/) if (match) { browser.tabs.update({ url: browser.runtime.getURL(`/pages/messages/no_instance.html`) @@ -302,4 +302,4 @@ browser.runtime.onMessage.addListener((request, sender, sendResponse) => { } }) } -}); \ No newline at end of file +}); diff --git a/src/pages/options/index.js b/src/pages/options/index.js index 002a8aa..31222ad 100644 --- a/src/pages/options/index.js +++ b/src/pages/options/index.js @@ -238,9 +238,7 @@ function createList(frontend, networks, document, redirects, blacklist) { const content = sortedInstances .map(x => { const cloudflare = blacklist.cloudflare.includes(x) ? - ` - cloudflare - ` : "" + `cloudflare` : "" const warnings = [cloudflare].join(" ") return `
@@ -316,4 +314,4 @@ async function ping(frontend) { } span.innerHTML = `${text}` } -} \ No newline at end of file +} diff --git a/src/pages/options/widgets/general.js b/src/pages/options/widgets/general.js index 5b6c4bc..040d1e7 100644 --- a/src/pages/options/widgets/general.js +++ b/src/pages/options/widgets/general.js @@ -22,7 +22,7 @@ async function exportSettings() { options.version = browser.runtime.getManifest().version let resultString = JSON.stringify(options, null, " ") exportSettingsElement.href = "data:application/json;base64," + btoa(resultString) - exportSettingsElement.download = `libredirect-settings-v${options.version}.json` + exportSettingsElement.download = `libreredirect-settings-v${options.version}.json` return } exportSettings() diff --git a/src/pages/options/widgets/general.pug b/src/pages/options/widgets/general.pug index 52ea21c..11faa9b 100644 --- a/src/pages/options/widgets/general.pug +++ b/src/pages/options/widgets/general.pug @@ -13,8 +13,7 @@ section(class="option-block" id="general_page") div(class="some-block option-block") h4 Fetch public instances select(id="fetch-instances") - option(value="github") GitHub - option(value="codeberg") Codeberg + option(value="gitler") Gitler option(value="disable") Disable div(class="some-block option-block") @@ -61,4 +60,4 @@ section(class="option-block" id="general_page") path(d="M6,13c0-1.65,0.67-3.15,1.76-4.24L6.34,7.34C4.9,8.79,4,10.79,4,13c0,4.08,3.05,7.44,7,7.93v-2.02 C8.17,18.43,6,15.97,6,13z") x(data-localise="__MSG_resetSettings__") Reset Settings - script(type="module" src="./widgets/general.js") \ No newline at end of file + script(type="module" src="./widgets/general.js") diff --git a/src/pages/options/widgets/services.pug b/src/pages/options/widgets/services.pug index 5d09b39..d9e5acd 100644 --- a/src/pages/options/widgets/services.pug +++ b/src/pages/options/widgets/services.pug @@ -42,7 +42,7 @@ each val, service in services if (service == 'search') div(class="some-block option-block") - h4 Set LibRedirect as Default Search Engine + h4 Set Libre Redirect as Default Search Engine each val, frontend in services[service].frontends @@ -72,4 +72,4 @@ each val, service in services div(class=network) div(class="checklist") if (network == 'clearnet') - div(class="some-block option-block loading") Loading... \ No newline at end of file + div(class="some-block option-block loading") Loading... diff --git a/src/pages/widgets/head.pug b/src/pages/widgets/head.pug index 0c6e9fd..891008f 100644 --- a/src/pages/widgets/head.pug +++ b/src/pages/widgets/head.pug @@ -1,7 +1,7 @@ head meta(charset="utf-8") meta(name="viewport" content="width=device-width, initial-scale=1") - link(rel="icon" type="image/x-icon" href="../../../assets/images/libredirect.svg") + link(rel="icon" type="image/x-icon" href="../../../assets/images/libreredirect.svg") link(href="../stylesheets/styles.css" rel="stylesheet") title Settings - script(type="module" src="./init.js") \ No newline at end of file + script(type="module" src="./init.js") diff --git a/src/pages/widgets/links.pug b/src/pages/widgets/links.pug index 318c72f..a748927 100644 --- a/src/pages/widgets/links.pug +++ b/src/pages/widgets/links.pug @@ -15,7 +15,7 @@ section(class="links" id="links") span=services[key].name div(class="title") - a(target="_blank" href="https://libredirect.github.io") + a(target="_blank" href="https://gitler.moe/suwako/libreredirect") img(class='dark' src="/assets/images/about-icon.svg") img(class='light' src="/assets/images/about-icon-light.svg") diff --git a/src/updates/updates.xml b/src/updates/updates.xml index 8cd4cee..2c760be 100644 --- a/src/updates/updates.xml +++ b/src/updates/updates.xml @@ -1,6 +1,6 @@ - +