diff --git a/.github/workflows/contributors.yml b/.github/workflows/contributors.yml index d57a508..75aecf3 100644 --- a/.github/workflows/contributors.yml +++ b/.github/workflows/contributors.yml @@ -17,13 +17,13 @@ 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 }} - 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 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 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: 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' 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 diff --git a/Cargo.lock b/Cargo.lock index 21dce61..560acdb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -449,9 +449,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" @@ -992,9 +992,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", @@ -1867,9 +1867,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" @@ -2813,9 +2813,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ "base64 0.21.4", "bytes 1.5.0", @@ -2838,6 +2838,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded 0.7.1", + "system-configuration", "tokio 1.32.0", "tokio-native-tls", "tower-service", @@ -3331,6 +3332,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" @@ -3943,7 +3965,7 @@ dependencies = [ [[package]] name = "websurfx" -version = "1.0.1" +version = "1.0.9" dependencies = [ "actix-cors", "actix-files", @@ -3967,7 +3989,7 @@ dependencies = [ "rand 0.8.5", "redis", "regex", - "reqwest 0.11.20", + "reqwest 0.11.22", "rusty-hook", "scraper", "serde", diff --git a/Cargo.toml b/Cargo.toml index cf9df90..2e543b6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "websurfx" -version = "1.0.1" +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" 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"] } diff --git a/README.md b/README.md index 6bdfc02..b5b7e3b 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,12 @@ src="https://img.shields.io/maintenance/yes/2023?style=flat-square" /> + + CodeFactor +