From 6ec79144a08abce89fb296591745a170ad6538ad Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Oct 2023 03:30:56 +0000 Subject: [PATCH 01/13] build(deps): bump actions/setup-node from 2 to 3 Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2 to 3. - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/setup-node dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/labels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index ab9f2fe..e014b39 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v3 with: node-version: '14' - uses: EddieHubCommunity/gh-action-open-source-labels@main From 4155a23e66555e3aac78156776e7261792323e8a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Oct 2023 03:32:07 +0000 Subject: [PATCH 02/13] build(deps): bump reqwest from 0.11.20 to 0.11.21 Bumps [reqwest](https://github.com/seanmonstar/reqwest) from 0.11.20 to 0.11.21. - [Release notes](https://github.com/seanmonstar/reqwest/releases) - [Changelog](https://github.com/seanmonstar/reqwest/blob/master/CHANGELOG.md) - [Commits](https://github.com/seanmonstar/reqwest/compare/v0.11.20...v0.11.21) --- updated-dependencies: - dependency-name: reqwest dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 28 +++++++++++++++++++++++++--- Cargo.toml | 2 +- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d070cf8..e46b916 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2802,9 +2802,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "78fdbab6a7e1d7b13cc8ff10197f47986b41c639300cc3c8158cac7847c9bbef" dependencies = [ "base64 0.21.4", "bytes 1.5.0", @@ -2827,6 +2827,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded 0.7.1", + "system-configuration", "tokio 1.32.0", "tokio-native-tls", "tower-service", @@ -3320,6 +3321,27 @@ dependencies = [ "libc", ] +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tagptr" version = "0.2.0" @@ -3956,7 +3978,7 @@ dependencies = [ "rand 0.8.5", "redis", "regex", - "reqwest 0.11.20", + "reqwest 0.11.21", "rusty-hook", "scraper", "serde", diff --git a/Cargo.toml b/Cargo.toml index a5a81d2..c02b2f8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ repository = "https://github.com/neon-mmd/websurfx" license = "AGPL-3.0" [dependencies] -reqwest = {version="0.11.20",features=["json"]} +reqwest = {version="0.11.21",features=["json"]} tokio = {version="1.32.0",features=["rt-multi-thread","macros"]} serde = {version="1.0.188",features=["derive"]} handlebars = { version = "4.4.0", features = ["dir_source"] } From 6cf4a63db7e0fbf31b73dd0ed2985876a4363f3e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Oct 2023 05:36:44 +0000 Subject: [PATCH 03/13] build(deps): bump actions/stale from 5 to 8 Bumps [actions/stale](https://github.com/actions/stale) from 5 to 8. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v5...v8) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 5bae815..c4d68e0 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -19,7 +19,7 @@ jobs: pull-requests: write steps: - - uses: actions/stale@v5 + - uses: actions/stale@v8 with: repo-token: ${{ secrets.GITHUB_TOKEN }} stale-issue-message: 'Stale issue message' From 89e5895519deb671ac28d3d8e8b09dc6f117bce2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Oct 2023 05:44:41 +0000 Subject: [PATCH 04/13] build(deps): bump actions/checkout from 2 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Commits](https://github.com/actions/checkout/compare/v2...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/contributors.yml | 2 +- .github/workflows/mega-linter.yml | 2 +- .github/workflows/rust.yml | 4 ++-- .github/workflows/rust_format.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/contributors.yml b/.github/workflows/contributors.yml index d57a508..0ac59da 100644 --- a/.github/workflows/contributors.yml +++ b/.github/workflows/contributors.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0 + uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 with: fetch-depth: 0 ref: ${{ github.event.repository.default_branch }} diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml index c8f6cec..02bdaac 100644 --- a/.github/workflows/mega-linter.yml +++ b/.github/workflows/mega-linter.yml @@ -32,7 +32,7 @@ jobs: steps: # Git Checkout - name: Checkout Code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 5d538ea..d82bde3 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -25,7 +25,7 @@ jobs: run: | sudo apt-get update sudo apt-get install -y --no-install-recommends liblua5.4-dev liblua5.3-dev liblua5.2-dev liblua5.1-0-dev libluajit-5.1-dev - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: rustup toolchain install stable --profile minimal - uses: Swatinem/rust-cache@v2 with: @@ -39,7 +39,7 @@ jobs: cache-on-failure: '' cache-all-crates: '' save-if: '' - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }} - name: Build run: cargo build --verbose diff --git a/.github/workflows/rust_format.yml b/.github/workflows/rust_format.yml index 1c1e16e..1b7c9fa 100644 --- a/.github/workflows/rust_format.yml +++ b/.github/workflows/rust_format.yml @@ -17,7 +17,7 @@ jobs: run: | sudo apt-get update sudo apt-get install -y --no-install-recommends liblua5.4-dev liblua5.3-dev liblua5.2-dev liblua5.1-0-dev libluajit-5.1-dev - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install minimal stable with clippy and rustfmt uses: actions-rs/toolchain@v1 with: From c324c7441199f69cd58595411d4e35eabf503621 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Oct 2023 05:53:06 +0000 Subject: [PATCH 05/13] build(deps): bump wow-actions/contributors-list from 1.1.0 to 1.2.0 Bumps [wow-actions/contributors-list](https://github.com/wow-actions/contributors-list) from 1.1.0 to 1.2.0. - [Release notes](https://github.com/wow-actions/contributors-list/releases) - [Changelog](https://github.com/wow-actions/contributors-list/blob/master/CHANGELOG.md) - [Commits](https://github.com/wow-actions/contributors-list/compare/b9e91f91a51a55460fdcae64daad0cb8122cdd53...242b53835016268d20e79eeff6f42193c02be8c8) --- updated-dependencies: - dependency-name: wow-actions/contributors-list dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/contributors.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/contributors.yml b/.github/workflows/contributors.yml index 0ac59da..75aecf3 100644 --- a/.github/workflows/contributors.yml +++ b/.github/workflows/contributors.yml @@ -23,7 +23,7 @@ jobs: ref: ${{ github.event.repository.default_branch }} - name: Update contributors list - uses: wow-actions/contributors-list@b9e91f91a51a55460fdcae64daad0cb8122cdd53 # v1.1.0 + uses: wow-actions/contributors-list@242b53835016268d20e79eeff6f42193c02be8c8 # v1.2.0 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} svgPath: images/contributors_list.svg From 0fbb52308231c6c3d40f9c7d7a97e438697783f7 Mon Sep 17 00:00:00 2001 From: neon_arch Date: Tue, 3 Oct 2023 20:52:16 +0300 Subject: [PATCH 06/13] ci(Mergify): configuration update Signed-off-by: neon_arch --- .mergify.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .mergify.yml diff --git a/.mergify.yml b/.mergify.yml new file mode 100644 index 0000000..8c2f886 --- /dev/null +++ b/.mergify.yml @@ -0,0 +1,18 @@ +pull_request_rules: + - name: Automatic merge on approval + conditions: + - "status-success=checks/approved" + - "#approved-reviews-by>=2" + actions: + queue: + method: squash + - name: automatic update of pull requests where more 5 commits behind + conditions: + - "#commits-behind>5" + actions: + update: + - name: delete head branch after merge + conditions: + - merged + actions: + delete_head_branch: {} \ No newline at end of file From a9f54b40275283fff88f4bf9ecc9dff51c64f5f8 Mon Sep 17 00:00:00 2001 From: neon_arch Date: Tue, 3 Oct 2023 21:11:29 +0300 Subject: [PATCH 07/13] =?UTF-8?q?=F0=9F=9A=80=20chore:=20bump=20the=20app?= =?UTF-8?q?=20version=20(#299)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cargo.lock | 20 ++++++++++---------- Cargo.toml | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e46b916..dcba881 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -448,9 +448,9 @@ checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytecount" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" +checksum = "ad152d03a2c813c80bb94fedbf3a3f02b28f793e39e7c214c8a0bcc196343de7" [[package]] name = "byteorder" @@ -991,9 +991,9 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "add4f07d43996f76ef320709726a556a9d4f965d9410d8d0271132d2f8293480" dependencies = [ "errno-dragonfly", "libc", @@ -1866,9 +1866,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -2802,9 +2802,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.21" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78fdbab6a7e1d7b13cc8ff10197f47986b41c639300cc3c8158cac7847c9bbef" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ "base64 0.21.4", "bytes 1.5.0", @@ -3954,7 +3954,7 @@ dependencies = [ [[package]] name = "websurfx" -version = "1.0.1" +version = "1.0.7" dependencies = [ "actix-cors", "actix-files", @@ -3978,7 +3978,7 @@ dependencies = [ "rand 0.8.5", "redis", "regex", - "reqwest 0.11.21", + "reqwest 0.11.22", "rusty-hook", "scraper", "serde", diff --git a/Cargo.toml b/Cargo.toml index c02b2f8..db0fab2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "websurfx" -version = "1.0.1" +version = "1.0.7" edition = "2021" description = "An open-source alternative to Searx that provides clean, ad-free, and organic results with incredible speed while keeping privacy and security in mind." repository = "https://github.com/neon-mmd/websurfx" From 6bc434cebd70863cc2d719bdfe1e2accb6cfce32 Mon Sep 17 00:00:00 2001 From: Niloth P <20315308+Niloth-p@users.noreply.github.com> Date: Wed, 4 Oct 2023 01:00:19 +0530 Subject: [PATCH 08/13] docs(readme): Add Codefactor badge --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 6bdfc02..7245849 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,12 @@ src="https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod" /> + CodeFactor +

From 5d26a2ec6d13fff0896df47780e9225e553dfb89 Mon Sep 17 00:00:00 2001 From: alamin655 Date: Wed, 4 Oct 2023 09:17:21 +0530 Subject: [PATCH 09/13] =?UTF-8?q?=F0=9F=93=9D=20Codefactor=20code=20covera?= =?UTF-8?q?ge=20shield=20badge=20(#301)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7245849..77789c4 100644 --- a/README.md +++ b/README.md @@ -41,12 +41,11 @@ src="https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod" /> - CodeFactor - + />

From 57410378a4ab14cbc9f633b74bf7825d35a08462 Mon Sep 17 00:00:00 2001 From: alamin655 Date: Wed, 4 Oct 2023 09:28:05 +0530 Subject: [PATCH 10/13] =?UTF-8?q?=F0=9F=93=9D=20Codefactor=20code=20covera?= =?UTF-8?q?ge=20shield=20badge=20(#301)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 77789c4..6161143 100644 --- a/README.md +++ b/README.md @@ -35,17 +35,18 @@ src="https://img.shields.io/maintenance/yes/2023?style=flat-square" /> + + CodeFactor + Gitpod - CodeFactor

From 074975bc20e97257651feac2a8a43ed3e4a89edf Mon Sep 17 00:00:00 2001 From: alamin655 Date: Wed, 4 Oct 2023 09:29:18 +0530 Subject: [PATCH 11/13] =?UTF-8?q?=F0=9F=9A=80=20chore:=20bump=20the=20app?= =?UTF-8?q?=20version=20(#301)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index db0fab2..cdeffa5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "websurfx" -version = "1.0.7" +version = "1.0.8" edition = "2021" description = "An open-source alternative to Searx that provides clean, ad-free, and organic results with incredible speed while keeping privacy and security in mind." repository = "https://github.com/neon-mmd/websurfx" From 01cb86deddc12332cc8eb206e01253b9523d6245 Mon Sep 17 00:00:00 2001 From: alamin655 Date: Wed, 4 Oct 2023 09:29:47 +0530 Subject: [PATCH 12/13] =?UTF-8?q?=F0=9F=9A=80=20chore:=20bump=20the=20app?= =?UTF-8?q?=20version=20(#301)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index dcba881..6bcb939 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3954,7 +3954,7 @@ dependencies = [ [[package]] name = "websurfx" -version = "1.0.7" +version = "1.0.8" dependencies = [ "actix-cors", "actix-files", From 5e63f37d706e9182996fc42a4748914d3ca50f55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Mota?= Date: Wed, 4 Oct 2023 19:17:42 +0100 Subject: [PATCH 13/13] =?UTF-8?q?=F0=9F=93=9D=20Three=20points=20listed=20?= =?UTF-8?q?under=20the=20`Features`=20section=20(#304)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add additional features to README * 🚀 chore: bump the app version (#304) * 🚀 chore: bump the app version (#304) --------- Co-authored-by: alamin655 --- Cargo.lock | 2 +- Cargo.toml | 2 +- README.md | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6bcb939..1d45c38 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3954,7 +3954,7 @@ dependencies = [ [[package]] name = "websurfx" -version = "1.0.8" +version = "1.0.9" dependencies = [ "actix-cors", "actix-files", diff --git a/Cargo.toml b/Cargo.toml index cdeffa5..a291449 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "websurfx" -version = "1.0.8" +version = "1.0.9" edition = "2021" description = "An open-source alternative to Searx that provides clean, ad-free, and organic results with incredible speed while keeping privacy and security in mind." repository = "https://github.com/neon-mmd/websurfx" diff --git a/README.md b/README.md index 6161143..b5b7e3b 100644 --- a/README.md +++ b/README.md @@ -112,6 +112,9 @@ # Features 🚀 - 🎨 Make Websurfx uniquely yours with twelve color schemes provided by default. It also supports creation of custom themes and color schemes in a quick and easy way, so unleash your creativity! +- 🚀 Easy to setup with docker or on bare metal with various installation/deployement options. +- ⛔ Search filtering to filter search results based on four different levels. +- 💾 Different caching levels focusing on reliability, speed and resiliancy. - 🔐 Fast, private, and secure - 🆓 100% free and open source - 💨 Ad-free and clean results