From 4cabe21440519e1cfa4a3f15ced9911258ba5874 Mon Sep 17 00:00:00 2001
From: alamin655 <129589283+alamin655@users.noreply.github.com>
Date: Fri, 16 Jun 2023 16:01:05 +0530
Subject: [PATCH 01/35] Create mega-linter.yml

---
 .github/workflows/mega-linter.yml | 91 +++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 .github/workflows/mega-linter.yml

diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml
new file mode 100644
index 0000000..da2a1ca
--- /dev/null
+++ b/.github/workflows/mega-linter.yml
@@ -0,0 +1,91 @@
+---
+# MegaLinter GitHub Action configuration file
+# More info at https://megalinter.io
+name: MegaLinter
+
+on:
+  # Trigger mega-linter at every push. Action will also be visible from Pull Requests to main
+  push: # Comment this line to trigger action only on pull-requests (not recommended if you don't pay for GH Actions)
+  pull_request:
+    branches: [rolling]
+
+env: # Comment env block if you don't want to apply fixes
+  # Apply linter fixes configuration
+  APPLY_FIXES: all # When active, APPLY_FIXES must also be defined as environment variable (in github/workflows/mega-linter.yml or other CI tool)
+  APPLY_FIXES_EVENT: pull_request # Decide which event triggers application of fixes in a commit or a PR (pull_request, push, all)
+  APPLY_FIXES_MODE: commit # If APPLY_FIXES is used, defines if the fixes are directly committed (commit) or posted in a PR (pull_request)
+
+concurrency:
+  group: ${{ github.ref }}-${{ github.workflow }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: MegaLinter
+    runs-on: ubuntu-latest
+    permissions:
+      # Give the default GITHUB_TOKEN write permission to commit and push, comment issues & post new PR
+      # Remove the ones you do not need
+      contents: write
+      issues: write
+      pull-requests: write
+    steps:
+      # Git Checkout
+      - name: Checkout Code
+        uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
+          fetch-depth: 0 # If you use VALIDATE_ALL_CODEBASE = true, you can remove this line to improve performances
+
+      # MegaLinter
+      - name: MegaLinter
+        id: ml
+        # You can override MegaLinter flavor used to have faster performances
+        # More info at https://megalinter.io/flavors/
+        uses: oxsecurity/megalinter@v7
+        env:
+          # All available variables are described in documentation
+          # https://megalinter.io/configuration/
+          VALIDATE_ALL_CODEBASE: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} # Validates all source when push on main, else just the git diff with main. Override with true if you always want to lint all sources
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          # ADD YOUR CUSTOM ENV VARIABLES HERE OR DEFINE THEM IN A FILE .mega-linter.yml AT THE ROOT OF YOUR REPOSITORY
+          # DISABLE: COPYPASTE,SPELL # Uncomment to disable copy-paste and spell checks
+
+      # Upload MegaLinter artifacts
+      - name: Archive production artifacts
+        if: ${{ success() }} || ${{ failure() }}
+        uses: actions/upload-artifact@v3
+        with:
+          name: MegaLinter reports
+          path: |
+            megalinter-reports
+            mega-linter.log
+
+      # Create pull request if applicable (for now works only on PR from same repository, not from forks)
+      - name: Create Pull Request with applied fixes
+        id: cpr
+        if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'pull_request' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository) && !contains(github.event.head_commit.message, 'skip fix')
+        uses: peter-evans/create-pull-request@v5
+        with:
+          token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
+          commit-message: "[MegaLinter] Apply linters automatic fixes"
+          title: "[MegaLinter] Apply linters automatic fixes"
+          labels: bot
+      - name: Create PR output
+        if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'pull_request' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository) && !contains(github.event.head_commit.message, 'skip fix')
+        run: |
+          echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
+          echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
+
+      # Push new commit if applicable (for now works only on PR from same repository, not from forks)
+      - name: Prepare commit
+        if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'commit' && github.ref != 'refs/heads/main' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository) && !contains(github.event.head_commit.message, 'skip fix')
+        run: sudo chown -Rc $UID .git/
+      - name: Commit and push applied linter fixes
+        if: steps.ml.outputs.has_updated_sources == 1 && (env.APPLY_FIXES_EVENT == 'all' || env.APPLY_FIXES_EVENT == github.event_name) && env.APPLY_FIXES_MODE == 'commit' && github.ref != 'refs/heads/main' && (github.event_name == 'push' || github.event.pull_request.head.repo.full_name == github.repository) && !contains(github.event.head_commit.message, 'skip fix')
+        uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          branch: ${{ github.event.pull_request.head.ref || github.head_ref || github.ref }}
+          commit_message: "[MegaLinter] Apply linters fixes"
+          commit_user_name: megalinter-bot
+          commit_user_email: nicolas.vuillamy@ox.security

From fab6b8964f36989b1f9949f9a8633e28fde71beb Mon Sep 17 00:00:00 2001
From: alamin655 <129589283+alamin655@users.noreply.github.com>
Date: Mon, 19 Jun 2023 19:04:13 +0530
Subject: [PATCH 02/35] Update mega-linter.yml

---
 .github/workflows/mega-linter.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml
index da2a1ca..d005c16 100644
--- a/.github/workflows/mega-linter.yml
+++ b/.github/workflows/mega-linter.yml
@@ -4,12 +4,12 @@
 name: MegaLinter
 
 on:
-  # Trigger mega-linter at every push. Action will also be visible from Pull Requests to main
+  # Trigger mega-linter at every push. Action will also be visible from Pull Requests to rolling
   push: # Comment this line to trigger action only on pull-requests (not recommended if you don't pay for GH Actions)
   pull_request:
     branches: [rolling]
 
-env: # Comment env block if you don't want to apply fixes
+env: # Comment env block if you do not want to apply fixes
   # Apply linter fixes configuration
   APPLY_FIXES: all # When active, APPLY_FIXES must also be defined as environment variable (in github/workflows/mega-linter.yml or other CI tool)
   APPLY_FIXES_EVENT: pull_request # Decide which event triggers application of fixes in a commit or a PR (pull_request, push, all)
@@ -35,7 +35,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           token: ${{ secrets.PAT || secrets.GITHUB_TOKEN }}
-          fetch-depth: 0 # If you use VALIDATE_ALL_CODEBASE = true, you can remove this line to improve performances
 
       # MegaLinter
       - name: MegaLinter
@@ -46,10 +45,9 @@ jobs:
         env:
           # All available variables are described in documentation
           # https://megalinter.io/configuration/
-          VALIDATE_ALL_CODEBASE: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} # Validates all source when push on main, else just the git diff with main. Override with true if you always want to lint all sources
+          VALIDATE_ALL_CODEBASE: true # Set ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }} to validate only diff with main branch
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          # ADD YOUR CUSTOM ENV VARIABLES HERE OR DEFINE THEM IN A FILE .mega-linter.yml AT THE ROOT OF YOUR REPOSITORY
-          # DISABLE: COPYPASTE,SPELL # Uncomment to disable copy-paste and spell checks
+          # ADD YOUR CUSTOM ENV VARIABLES HERE TO OVERRIDE VALUES OF .mega-linter.yml AT THE ROOT OF YOUR REPOSITORY
 
       # Upload MegaLinter artifacts
       - name: Archive production artifacts

From 6e843f06c5a3b51105fa4fab6ad954b13ac70fd4 Mon Sep 17 00:00:00 2001
From: alamin655 <129589283+alamin655@users.noreply.github.com>
Date: Mon, 19 Jun 2023 19:08:14 +0530
Subject: [PATCH 03/35] Create .mega-linter.yml

---
 .mega-linter.yml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 .mega-linter.yml

diff --git a/.mega-linter.yml b/.mega-linter.yml
new file mode 100644
index 0000000..ed22343
--- /dev/null
+++ b/.mega-linter.yml
@@ -0,0 +1,25 @@
+# Configuration file for MegaLinter
+# See all available variables at https://megalinter.io/configuration/ and in linters documentation
+
+APPLY_FIXES: all # all, none, or list of linter keys
+# ENABLE: # If you use ENABLE variable, all other languages/formats/tooling-formats will be disabled by default
+ENABLE_LINTERS: # If you use ENABLE_LINTERS variable, all other linters will be disabled by default
+ - LUA_LUACHECK
+ - RUST_CLIPPY
+ - JAVASCRIPT_ES
+ - CSS_STYLELINT
+ - MARKDOWN_MARKDOWNLINT
+ - YAML_YAMLLINT
+ - JSON_ESLINT_PLUGIN_JSONC
+ - HTML_DJLINT
+ - ACTION_ACTIONLINT
+ - DOCKERFILE_HADOLINT
+ - SPELL_CSPELL
+ - COPYPASTE_JSCPD
+ - REPOSITORY_TRIVY
+# DISABLE:
+  # - COPYPASTE # Uncomment to disable checks of excessive copy-pastes
+  # - SPELL # Uncomment to disable checks of spelling mistakes
+SHOW_ELAPSED_TIME: true
+FILEIO_REPORTER: true
+# DISABLE_ERRORS: true # Uncomment if you want MegaLinter to detect errors but not block CI to pass

From 5559b77915bcbcb41a6cdc2dc7fd668809d74058 Mon Sep 17 00:00:00 2001
From: alamin655 <129589283+alamin655@users.noreply.github.com>
Date: Mon, 19 Jun 2023 19:08:58 +0530
Subject: [PATCH 04/35] Create .jscpd.json

---
 .jscpd.json | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 .jscpd.json

diff --git a/.jscpd.json b/.jscpd.json
new file mode 100644
index 0000000..2cee5f5
--- /dev/null
+++ b/.jscpd.json
@@ -0,0 +1,15 @@
+{
+  "threshold": 0,
+  "reporters": ["html", "markdown"],
+  "ignore": [
+    "**/node_modules/**",
+    "**/.git/**",
+    "**/.rbenv/**",
+    "**/.venv/**",
+    "**/*cache*/**",
+    "**/.github/**",
+    "**/.idea/**",
+    "**/report/**",
+    "**/*.svg"
+  ]
+}

From abbe0b2ac81b4135df66e0cd02a4fe7b0381f57e Mon Sep 17 00:00:00 2001
From: alamin655 <129589283+alamin655@users.noreply.github.com>
Date: Mon, 19 Jun 2023 19:10:26 +0530
Subject: [PATCH 05/35] Create .cspell.json

---
 .cspell.json | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 .cspell.json

diff --git a/.cspell.json b/.cspell.json
new file mode 100644
index 0000000..b798d29
--- /dev/null
+++ b/.cspell.json
@@ -0,0 +1,16 @@
+{
+  "ignorePaths": [
+    "**/node_modules/**",
+    "**/vscode-extension/**",
+    "**/.git/**",
+    "**/.pnpm-lock.json",
+    ".vscode",
+    "megalinter",
+    "package-lock.json",
+    "report"
+  ],
+  "language": "en",
+  "noConfigSearch": true,
+  "words": ["megalinter", "oxsecurity"],
+  "version": "0.2"
+}

From 8313fcc7d98e39024c20949ebe835982b977f6c8 Mon Sep 17 00:00:00 2001
From: alamin655 <129589283+alamin655@users.noreply.github.com>
Date: Mon, 19 Jun 2023 19:11:05 +0530
Subject: [PATCH 06/35] Update .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 5e79d6b..c8d5b9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ package.json
 package-lock.json
 dump.rdb
 .vscode
+megalinter-reports/

From 0b48512b6af9e7f27f2624a78bd500a906c58296 Mon Sep 17 00:00:00 2001
From: alamin655 <129589283+alamin655@users.noreply.github.com>
Date: Mon, 19 Jun 2023 21:00:57 +0530
Subject: [PATCH 07/35] Update .mega-linter.yml

---
 .mega-linter.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.mega-linter.yml b/.mega-linter.yml
index ed22343..95f0f42 100644
--- a/.mega-linter.yml
+++ b/.mega-linter.yml
@@ -10,13 +10,10 @@ ENABLE_LINTERS: # If you use ENABLE_LINTERS variable, all other linters will be
  - CSS_STYLELINT
  - MARKDOWN_MARKDOWNLINT
  - YAML_YAMLLINT
- - JSON_ESLINT_PLUGIN_JSONC
  - HTML_DJLINT
  - ACTION_ACTIONLINT
  - DOCKERFILE_HADOLINT
  - SPELL_CSPELL
- - COPYPASTE_JSCPD
- - REPOSITORY_TRIVY
 # DISABLE:
   # - COPYPASTE # Uncomment to disable checks of excessive copy-pastes
   # - SPELL # Uncomment to disable checks of spelling mistakes

From 1f3fd07e406a3e30248975d5c946478f3177a7e4 Mon Sep 17 00:00:00 2001
From: alamin655 <129589283+alamin655@users.noreply.github.com>
Date: Mon, 19 Jun 2023 21:01:15 +0530
Subject: [PATCH 08/35] Delete .jscpd.json

---
 .jscpd.json | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 .jscpd.json

diff --git a/.jscpd.json b/.jscpd.json
deleted file mode 100644
index 2cee5f5..0000000
--- a/.jscpd.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "threshold": 0,
-  "reporters": ["html", "markdown"],
-  "ignore": [
-    "**/node_modules/**",
-    "**/.git/**",
-    "**/.rbenv/**",
-    "**/.venv/**",
-    "**/*cache*/**",
-    "**/.github/**",
-    "**/.idea/**",
-    "**/report/**",
-    "**/*.svg"
-  ]
-}

From 367831e3e07e3aef8435e5768e1306e44c0b08e2 Mon Sep 17 00:00:00 2001
From: alamin655 <129589283+alamin655@users.noreply.github.com>
Date: Tue, 20 Jun 2023 18:32:00 +0530
Subject: [PATCH 09/35] chore: Bump the app version number

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index efd71eb..59409e4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "websurfx"
-version = "0.12.3"
+version = "0.12.4"
 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 e7a0d11a1ebbec8fa5e807d8dcf5b73ca1833ed9 Mon Sep 17 00:00:00 2001
From: alamin655 <129589283+alamin655@users.noreply.github.com>
Date: Tue, 20 Jun 2023 18:35:57 +0530
Subject: [PATCH 10/35] chore: Bump version number

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 59409e4..871854a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "websurfx"
-version = "0.12.4"
+version = "0.13.1"
 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 574b21e5fac603c9b7bae952163dde76a542d10e Mon Sep 17 00:00:00 2001
From: KekmaTime <136650032+KekmaTime@users.noreply.github.com>
Date: Sun, 25 Jun 2023 22:59:15 +0530
Subject: [PATCH 11/35] updated-search.html

added triple brackets in 'this.url' & 'this'
---
 public/templates/search.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/templates/search.html b/public/templates/search.html
index e1f952b..a3048d0 100644
--- a/public/templates/search.html
+++ b/public/templates/search.html
@@ -5,11 +5,11 @@
     {{#each results}}
     <div class="result">
       <h1><a href="{{this.visitingUrl}}">{{{this.title}}}</a></h1>
-      <small>{{this.url}}</small>
+      <small>{{{this.url}}}</small>
       <p>{{{this.description}}}</p>
       <div class="upstream_engines">
         {{#each engine}}
-        <span>{{this}}</span>
+        <span>{{{this}}}</span>
         {{/each}}
       </div>
     </div>

From abed62ba3f2b724067f9fde497dc3eb05a13a31d Mon Sep 17 00:00:00 2001
From: KekmaTime <136650032+KekmaTime@users.noreply.github.com>
Date: Tue, 27 Jun 2023 18:59:05 +0530
Subject: [PATCH 12/35] href-fixed

---
 public/templates/search.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/templates/search.html b/public/templates/search.html
index a3048d0..7aeabe9 100644
--- a/public/templates/search.html
+++ b/public/templates/search.html
@@ -4,7 +4,7 @@
   <div class="results_aggregated">
     {{#each results}}
     <div class="result">
-      <h1><a href="{{this.visitingUrl}}">{{{this.title}}}</a></h1>
+      <h1><a href="{{{this.visitingUrl}}}">{{{this.title}}}</a></h1>
       <small>{{{this.url}}}</small>
       <p>{{{this.description}}}</p>
       <div class="upstream_engines">

From 564662ba08a7fdbde3066762e4bfcf669a6ba893 Mon Sep 17 00:00:00 2001
From: KekmaTime <136650032+KekmaTime@users.noreply.github.com>
Date: Tue, 27 Jun 2023 19:09:28 +0530
Subject: [PATCH 13/35] forwardslash-cwe79

---
 public/templates/search.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/templates/search.html b/public/templates/search.html
index 7aeabe9..0e12c25 100644
--- a/public/templates/search.html
+++ b/public/templates/search.html
@@ -4,7 +4,7 @@
   <div class="results_aggregated">
     {{#each results}}
     <div class="result">
-      <h1><a href="{{{this.visitingUrl}}}">{{{this.title}}}</a></h1>
+      <h1><a href="/{{{this.visitingUrl}}}">{{{this.title}}}</a></h1>
       <small>{{{this.url}}}</small>
       <p>{{{this.description}}}</p>
       <div class="upstream_engines">

From aa43b3f2dc3aef23a47b8312d27b8196fd4560c0 Mon Sep 17 00:00:00 2001
From: neon_arch <mustafadhuleb53@gmail.com>
Date: Fri, 30 Jun 2023 18:27:26 +0300
Subject: [PATCH 14/35] =?UTF-8?q?=F0=9F=A7=B9=20chore:=20replace=20dashes?=
 =?UTF-8?q?=20with=20spaces?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitpod.yml | 68 ++++++++++++++++++++++++++---------------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/.gitpod.yml b/.gitpod.yml
index 2aa70df..d919d82 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -2,44 +2,44 @@
 image: ubuntu:latest 
 # Commands that will run on workspace start 
 tasks: 
-    - name: Setup, Install & Build 
-    - before: apt install cargo redis-server nodejs npm && cargo test
-    - init: cargo install cargo-watch 
-    - command: redis-server --port 8080 & cargo watch -q -w "." -x "run" 
+      name: Setup, Install & Build 
+      before: apt install cargo redis-server nodejs npm && cargo test
+      init: cargo install cargo-watch 
+      command: redis-server --port 8080 & cargo watch -q -w "." -x "run" 
 # Ports to expose on workspace startup 
 ports: 
-    - port: 8080 
-    - onOpen: open-preview 
-    - name: Website 
-    - description: Website Preview
+      port: 8080 
+      onOpen: open-preview 
+      name: Website 
+      description: Website Preview
 # vscode IDE setup
 vscode: 
    extensions: 
-    - vadimcn.vscode-lldb
-    - rust-lang.rust-analyzer
-    - bungcip.better-toml
-    - serayuzgur.crates
-    - usernamehw.errorlens
-    - DavidAnson.vscode-markdownlint
-    - esbenp.prettier-vscode
-    - stylelint.vscode-stylelint
-    - dbaeumer.vscode-eslint
-    - evgeniypeshkov.syntax-highlighter
-    - redhat.vscode-yaml
-    - ms-azuretools.vscode-docker
-    - GitHub.vscode-github-actions
-    - Catppuccin.catppuccin-vsc
-    - PKief.material-icon-theme
-    - tal7aouy.rainbow-bracket
-    - oderwat.indent-rainbow
-    - formulahendry.auto-rename-tag
-    - eamodio.gitlens
+      vadimcn.vscode-lldb
+      rust-lang.rust-analyzer
+      bungcip.better-toml
+      serayuzgur.crates
+      usernamehw.errorlens
+      DavidAnson.vscode-markdownlint
+      esbenp.prettier-vscode
+      stylelint.vscode-stylelint
+      dbaeumer.vscode-eslint
+      evgeniypeshkov.syntax-highlighter
+      redhat.vscode-yaml
+      ms-azuretools.vscode-docker
+      GitHub.vscode-github-actions
+      Catppuccin.catppuccin-vsc
+      PKief.material-icon-theme
+      tal7aouy.rainbow-bracket
+      oderwat.indent-rainbow
+      formulahendry.auto-rename-tag
+      eamodio.gitlens
 github: 
    prebuilds: 
-    - master: true 
-    - branches: true 
-    - pullRequests: true 
-    - pullRequestsFromForks: true 
-    - addCheck: true 
-    - addComment: false 
-    - addBadge: true
+      master: true 
+      branches: true 
+      pullRequests: true 
+      pullRequestsFromForks: true 
+      addCheck: true 
+      addComment: false 
+      addBadge: true

From 957ff6975d247adc4497f9ba32a21573a356b8df Mon Sep 17 00:00:00 2001
From: neon_arch <mustafadhuleb53@gmail.com>
Date: Fri, 30 Jun 2023 18:32:56 +0300
Subject: [PATCH 15/35] =?UTF-8?q?=F0=9F=9A=80=20chore:=20bump=20the=20app?=
 =?UTF-8?q?=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Cargo.lock | 659 ++++++++++++++++++++++++++++++++---------------------
 Cargo.toml |   2 +-
 2 files changed, 406 insertions(+), 255 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 38297d6..89ec79d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,13 +8,13 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "617a8268e3537fe1d8c9ead925fca49ef6400927ee7bc26750e90ecee14ce4b8"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "bytes 1.4.0",
  "futures-core",
  "futures-sink",
  "memchr",
  "pin-project-lite",
- "tokio 1.28.2",
+ "tokio 1.29.1",
  "tokio-util",
  "tracing",
 ]
@@ -30,7 +30,7 @@ dependencies = [
  "actix-utils",
  "actix-web",
  "askama_escape",
- "bitflags",
+ "bitflags 1.3.2",
  "bytes 1.4.0",
  "derive_more",
  "futures-core",
@@ -54,7 +54,7 @@ dependencies = [
  "actix-utils",
  "ahash 0.8.3",
  "base64 0.21.2",
- "bitflags",
+ "bitflags 1.3.2",
  "brotli",
  "bytes 1.4.0",
  "bytestring",
@@ -62,7 +62,7 @@ dependencies = [
  "encoding_rs",
  "flate2",
  "futures-core",
- "h2 0.3.19",
+ "h2 0.3.20",
  "http 0.2.9",
  "httparse",
  "httpdate",
@@ -75,7 +75,7 @@ dependencies = [
  "rand 0.8.5",
  "sha1",
  "smallvec 1.10.0",
- "tokio 1.28.2",
+ "tokio 1.29.1",
  "tokio-util",
  "tracing",
  "zstd",
@@ -87,7 +87,7 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "465a6172cf69b960917811022d8f29bc0b7fa1398bc4f78b3c466673db1213b6"
 dependencies = [
- "quote 1.0.28",
+ "quote 1.0.29",
  "syn 1.0.109",
 ]
 
@@ -111,7 +111,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "15265b6b8e2347670eb363c47fc8c75208b4a4994b27192f345fcbe707804f3e"
 dependencies = [
  "futures-core",
- "tokio 1.28.2",
+ "tokio 1.29.1",
 ]
 
 [[package]]
@@ -128,7 +128,7 @@ dependencies = [
  "mio 0.8.8",
  "num_cpus",
  "socket2",
- "tokio 1.28.2",
+ "tokio 1.29.1",
  "tracing",
 ]
 
@@ -202,15 +202,15 @@ checksum = "2262160a7ae29e3415554a3f1fc04c764b1540c116aa524683208078b7a75bc9"
 dependencies = [
  "actix-router",
  "proc-macro2 1.0.63",
- "quote 1.0.28",
+ "quote 1.0.29",
  "syn 1.0.109",
 ]
 
 [[package]]
 name = "addr2line"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
+checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
 dependencies = [
  "gimli",
 ]
@@ -227,7 +227,7 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
 dependencies = [
- "getrandom 0.2.10",
+ "getrandom",
  "once_cell",
  "version_check",
 ]
@@ -239,7 +239,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
 dependencies = [
  "cfg-if 1.0.0",
- "getrandom 0.2.10",
+ "getrandom",
  "once_cell",
  "version_check",
 ]
@@ -268,6 +268,18 @@ dependencies = [
  "alloc-no-stdlib",
 ]
 
+[[package]]
+name = "anes"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
+
+[[package]]
+name = "anstyle"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
+
 [[package]]
 name = "anyhow"
 version = "1.0.71"
@@ -297,15 +309,15 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "backtrace"
-version = "0.3.67"
+version = "0.3.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
+checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
 dependencies = [
  "addr2line",
  "cc",
  "cfg-if 1.0.0",
  "libc",
- "miniz_oxide 0.6.2",
+ "miniz_oxide",
  "object",
  "rustc-demangle",
 ]
@@ -346,6 +358,12 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bitflags"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
+
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -423,6 +441,12 @@ dependencies = [
  "bytes 1.4.0",
 ]
 
+[[package]]
+name = "cast"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
+
 [[package]]
 name = "cc"
 version = "1.0.79"
@@ -453,13 +477,65 @@ dependencies = [
  "envmnt",
 ]
 
+[[package]]
+name = "ciborium"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926"
+dependencies = [
+ "ciborium-io",
+ "ciborium-ll",
+ "serde",
+]
+
+[[package]]
+name = "ciborium-io"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656"
+
+[[package]]
+name = "ciborium-ll"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b"
+dependencies = [
+ "ciborium-io",
+ "half",
+]
+
+[[package]]
+name = "clap"
+version = "4.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "384e169cc618c613d5e3ca6404dda77a8685a63e08660dcc64abaf7da7cb0c7a"
+dependencies = [
+ "clap_builder",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef137bbe35aab78bdb468ccfba75a5f4d8321ae011d34063770780545176af2d"
+dependencies = [
+ "anstyle",
+ "clap_lex",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
+
 [[package]]
 name = "cloudabi"
 version = "0.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -551,17 +627,74 @@ dependencies = [
  "cfg-if 1.0.0",
 ]
 
+[[package]]
+name = "criterion"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f"
+dependencies = [
+ "anes",
+ "cast",
+ "ciborium",
+ "clap",
+ "criterion-plot",
+ "is-terminal",
+ "itertools",
+ "num-traits",
+ "once_cell",
+ "oorandom",
+ "plotters",
+ "rayon",
+ "regex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "tinytemplate",
+ "walkdir",
+]
+
+[[package]]
+name = "criterion-plot"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
+dependencies = [
+ "cast",
+ "itertools",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-utils 0.8.16",
+]
+
 [[package]]
 name = "crossbeam-deque"
 version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed"
 dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
+ "crossbeam-epoch 0.8.2",
+ "crossbeam-utils 0.7.2",
  "maybe-uninit",
 ]
 
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-epoch 0.9.15",
+ "crossbeam-utils 0.8.16",
+]
+
 [[package]]
 name = "crossbeam-epoch"
 version = "0.8.2"
@@ -570,10 +703,23 @@ checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
 dependencies = [
  "autocfg 1.1.0",
  "cfg-if 0.1.10",
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
  "lazy_static",
  "maybe-uninit",
- "memoffset",
+ "memoffset 0.5.6",
+ "scopeguard",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
+dependencies = [
+ "autocfg 1.1.0",
+ "cfg-if 1.0.0",
+ "crossbeam-utils 0.8.16",
+ "memoffset 0.9.0",
  "scopeguard",
 ]
 
@@ -584,7 +730,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
 dependencies = [
  "cfg-if 0.1.10",
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
  "maybe-uninit",
 ]
 
@@ -599,6 +745,15 @@ dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
+dependencies = [
+ "cfg-if 1.0.0",
+]
+
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -611,19 +766,15 @@ dependencies = [
 
 [[package]]
 name = "cssparser"
-version = "0.29.6"
+version = "0.31.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa"
+checksum = "5b3df4f93e5fbbe73ec01ec8d3f68bba73107993a5b1e7519273c32db9b0d5be"
 dependencies = [
  "cssparser-macros",
  "dtoa-short",
  "itoa 1.0.6",
- "matches",
- "phf 0.10.1",
- "proc-macro2 1.0.63",
- "quote 1.0.28",
+ "phf 0.11.2",
  "smallvec 1.10.0",
- "syn 1.0.109",
 ]
 
 [[package]]
@@ -632,7 +783,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
 dependencies = [
- "quote 1.0.28",
+ "quote 1.0.29",
  "syn 2.0.22",
 ]
 
@@ -644,7 +795,7 @@ checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
 dependencies = [
  "convert_case",
  "proc-macro2 1.0.63",
- "quote 1.0.28",
+ "quote 1.0.29",
  "rustc_version 0.4.0",
  "syn 1.0.109",
 ]
@@ -772,7 +923,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
 dependencies = [
  "proc-macro2 1.0.63",
- "quote 1.0.28",
+ "quote 1.0.29",
  "syn 1.0.109",
  "synstructure",
 ]
@@ -804,7 +955,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.7.1",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -855,7 +1006,7 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "fuchsia-zircon-sys",
 ]
 
@@ -958,17 +1109,6 @@ dependencies = [
  "unicode-width",
 ]
 
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.10"
@@ -1006,9 +1146,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.19"
+version = "0.3.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782"
+checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049"
 dependencies = [
  "bytes 1.4.0",
  "fnv",
@@ -1018,11 +1158,17 @@ dependencies = [
  "http 0.2.9",
  "indexmap",
  "slab",
- "tokio 1.28.2",
+ "tokio 1.29.1",
  "tokio-util",
  "tracing",
 ]
 
+[[package]]
+name = "half"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+
 [[package]]
 name = "handlebars"
 version = "4.3.7"
@@ -1044,15 +1190,6 @@ version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
-[[package]]
-name = "hermit-abi"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "hermit-abi"
 version = "0.3.1"
@@ -1083,7 +1220,7 @@ dependencies = [
  "mac",
  "markup5ever 0.11.0",
  "proc-macro2 1.0.63",
- "quote 1.0.28",
+ "quote 1.0.29",
  "syn 1.0.109",
 ]
 
@@ -1188,15 +1325,15 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "0.14.26"
+version = "0.14.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4"
+checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
 dependencies = [
  "bytes 1.4.0",
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.3.19",
+ "h2 0.3.20",
  "http 0.2.9",
  "http-body 0.4.5",
  "httparse",
@@ -1204,7 +1341,7 @@ dependencies = [
  "itoa 1.0.6",
  "pin-project-lite",
  "socket2",
- "tokio 1.28.2",
+ "tokio 1.29.1",
  "tower-service",
  "tracing",
  "want 0.3.1",
@@ -1230,9 +1367,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes 1.4.0",
- "hyper 0.14.26",
+ "hyper 0.14.27",
  "native-tls",
- "tokio 1.28.2",
+ "tokio 1.29.1",
  "tokio-native-tls",
 ]
 
@@ -1293,7 +1430,7 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
- "hermit-abi 0.3.1",
+ "hermit-abi",
  "libc",
  "windows-sys 0.48.0",
 ]
@@ -1309,22 +1446,30 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.7.2"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f"
+checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
 
 [[package]]
 name = "is-terminal"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
+checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb"
 dependencies = [
- "hermit-abi 0.3.1",
- "io-lifetimes",
- "rustix",
+ "hermit-abi",
+ "rustix 0.38.1",
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "0.4.8"
@@ -1379,9 +1524,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.146"
+version = "0.2.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
 
 [[package]]
 name = "linux-raw-sys"
@@ -1389,6 +1534,12 @@ version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
+
 [[package]]
 name = "local-channel"
 version = "0.1.3"
@@ -1502,6 +1653,15 @@ dependencies = [
  "autocfg 1.1.0",
 ]
 
+[[package]]
+name = "memoffset"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+dependencies = [
+ "autocfg 1.1.0",
+]
+
 [[package]]
 name = "mime"
 version = "0.3.17"
@@ -1518,15 +1678,6 @@ dependencies = [
  "unicase",
 ]
 
-[[package]]
-name = "miniz_oxide"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
-dependencies = [
- "adler",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.7.1"
@@ -1620,12 +1771,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab250442c86f1850815b5d268639dff018c0627022bc1940eb2d642ca1ce12f0"
 
-[[package]]
-name = "nodrop"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
-
 [[package]]
 name = "num-traits"
 version = "0.2.15"
@@ -1637,19 +1782,19 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.2.6",
+ "hermit-abi",
  "libc",
 ]
 
 [[package]]
 name = "object"
-version = "0.30.4"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385"
+checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
 dependencies = [
  "memchr",
 ]
@@ -1660,13 +1805,19 @@ version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
+[[package]]
+name = "oorandom"
+version = "11.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
+
 [[package]]
 name = "openssl"
 version = "0.10.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "cfg-if 1.0.0",
  "foreign-types",
  "libc",
@@ -1682,7 +1833,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2 1.0.63",
- "quote 1.0.28",
+ "quote 1.0.29",
  "syn 2.0.22",
 ]
 
@@ -1800,7 +1951,7 @@ dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2 1.0.63",
- "quote 1.0.28",
+ "quote 1.0.29",
  "syn 2.0.22",
 ]
 
@@ -1824,24 +1975,23 @@ dependencies = [
  "phf_shared 0.7.24",
 ]
 
-[[package]]
-name = "phf"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12"
-dependencies = [
- "phf_shared 0.8.0",
-]
-
 [[package]]
 name = "phf"
 version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
 dependencies = [
- "phf_macros",
  "phf_shared 0.10.0",
- "proc-macro-hack",
+]
+
+[[package]]
+name = "phf"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
+dependencies = [
+ "phf_macros",
+ "phf_shared 0.11.2",
 ]
 
 [[package]]
@@ -1854,16 +2004,6 @@ dependencies = [
  "phf_shared 0.7.24",
 ]
 
-[[package]]
-name = "phf_codegen"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815"
-dependencies = [
- "phf_generator 0.8.0",
- "phf_shared 0.8.0",
-]
-
 [[package]]
 name = "phf_codegen"
 version = "0.10.0"
@@ -1884,16 +2024,6 @@ dependencies = [
  "rand 0.6.5",
 ]
 
-[[package]]
-name = "phf_generator"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526"
-dependencies = [
- "phf_shared 0.8.0",
- "rand 0.7.3",
-]
-
 [[package]]
 name = "phf_generator"
 version = "0.10.0"
@@ -1905,17 +2035,26 @@ dependencies = [
 ]
 
 [[package]]
-name = "phf_macros"
-version = "0.10.0"
+name = "phf_generator"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0"
+checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
 dependencies = [
- "phf_generator 0.10.0",
- "phf_shared 0.10.0",
- "proc-macro-hack",
+ "phf_shared 0.11.2",
+ "rand 0.8.5",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
+dependencies = [
+ "phf_generator 0.11.2",
+ "phf_shared 0.11.2",
  "proc-macro2 1.0.63",
- "quote 1.0.28",
- "syn 1.0.109",
+ "quote 1.0.29",
+ "syn 2.0.22",
 ]
 
 [[package]]
@@ -1929,18 +2068,18 @@ dependencies = [
 
 [[package]]
 name = "phf_shared"
-version = "0.8.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7"
+checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
 dependencies = [
  "siphasher 0.3.10",
 ]
 
 [[package]]
 name = "phf_shared"
-version = "0.10.0"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
 dependencies = [
  "siphasher 0.3.10",
 ]
@@ -1963,6 +2102,34 @@ version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
+[[package]]
+name = "plotters"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45"
+dependencies = [
+ "num-traits",
+ "plotters-backend",
+ "plotters-svg",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "plotters-backend"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609"
+
+[[package]]
+name = "plotters-svg"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab"
+dependencies = [
+ "plotters-backend",
+]
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
@@ -1975,12 +2142,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.20+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
-
 [[package]]
 name = "proc-macro2"
 version = "0.4.30"
@@ -2020,9 +2181,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.28"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
+checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"
 dependencies = [
  "proc-macro2 1.0.63",
 ]
@@ -2037,29 +2198,15 @@ dependencies = [
  "libc",
  "rand_chacha 0.1.1",
  "rand_core 0.4.2",
- "rand_hc 0.1.0",
+ "rand_hc",
  "rand_isaac",
  "rand_jitter",
  "rand_os",
- "rand_pcg 0.1.2",
+ "rand_pcg",
  "rand_xorshift",
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc 0.2.0",
- "rand_pcg 0.2.1",
-]
-
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -2081,16 +2228,6 @@ dependencies = [
  "rand_core 0.3.1",
 ]
 
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
-]
-
 [[package]]
 name = "rand_chacha"
 version = "0.3.1"
@@ -2116,22 +2253,13 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
 
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
-]
-
 [[package]]
 name = "rand_core"
 version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.10",
+ "getrandom",
 ]
 
 [[package]]
@@ -2143,15 +2271,6 @@ dependencies = [
  "rand_core 0.3.1",
 ]
 
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
-]
-
 [[package]]
 name = "rand_isaac"
 version = "0.1.1"
@@ -2196,15 +2315,6 @@ dependencies = [
  "rand_core 0.4.2",
 ]
 
-[[package]]
-name = "rand_pcg"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
-dependencies = [
- "rand_core 0.5.1",
-]
-
 [[package]]
 name = "rand_xorshift"
 version = "0.1.1"
@@ -2214,6 +2324,28 @@ dependencies = [
  "rand_core 0.3.1",
 ]
 
+[[package]]
+name = "rayon"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque 0.8.3",
+ "crossbeam-utils 0.8.16",
+ "num_cpus",
+]
+
 [[package]]
 name = "rdrand"
 version = "0.4.0"
@@ -2249,7 +2381,7 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -2314,10 +2446,10 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.3.19",
+ "h2 0.3.20",
  "http 0.2.9",
  "http-body 0.4.5",
- "hyper 0.14.26",
+ "hyper 0.14.27",
  "hyper-tls 0.5.0",
  "ipnet",
  "js-sys",
@@ -2330,7 +2462,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded 0.7.1",
- "tokio 1.28.2",
+ "tokio 1.29.1",
  "tokio-native-tls",
  "tower-service",
  "url 2.4.0",
@@ -2346,7 +2478,7 @@ version = "0.19.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "753540fb29c9a615ce5dd64be5c957271adc887c8424555fc372e0b88ebde074"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "bstr",
  "libc",
  "num-traits",
@@ -2390,15 +2522,28 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.37.20"
+version = "0.37.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b96e891d04aa506a6d1f318d2771bcb1c7dfda84e126660ace067c9b474bb2c0"
+checksum = "62f25693a73057a1b4cb56179dd3c7ea21a7c6c5ee7d85781f5749b46f34b79c"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "errno",
  "io-lifetimes",
  "libc",
- "linux-raw-sys",
+ "linux-raw-sys 0.3.8",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbc6396159432b5c8490d4e301d8c705f61860b8b6c863bf79942ce5401968f3"
+dependencies = [
+ "bitflags 2.3.3",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.3",
  "windows-sys 0.48.0",
 ]
 
@@ -2446,9 +2591,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "scraper"
-version = "0.16.0"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59e25654b5e9fd557a67dbaab5a5d36b8c448d0561beb4c041b6dbb902eddfa6"
+checksum = "c95a930e03325234c18c7071fd2b60118307e025d6fff3e12745ffbf63a3d29c"
 dependencies = [
  "ahash 0.8.3",
  "cssparser",
@@ -2467,7 +2612,7 @@ version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -2496,17 +2641,18 @@ dependencies = [
 
 [[package]]
 name = "selectors"
-version = "0.24.0"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c37578180969d00692904465fb7f6b3d50b9a2b952b87c23d0e2e5cb5013416"
+checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06"
 dependencies = [
- "bitflags",
+ "bitflags 2.3.3",
  "cssparser",
  "derive_more",
  "fxhash",
  "log",
- "phf 0.8.0",
- "phf_codegen 0.8.0",
+ "new_debug_unreachable",
+ "phf 0.10.1",
+ "phf_codegen 0.10.0",
  "precomputed-hash",
  "servo_arc",
  "smallvec 1.10.0",
@@ -2549,7 +2695,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
 dependencies = [
  "proc-macro2 1.0.63",
- "quote 1.0.28",
+ "quote 1.0.29",
  "syn 2.0.22",
 ]
 
@@ -2590,11 +2736,10 @@ dependencies = [
 
 [[package]]
 name = "servo_arc"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52aa42f8fdf0fed91e5ce7f23d8138441002fa31dca008acf47e6fd4721f741"
+checksum = "d036d71a959e00c77a63538b90a6c2390969f9772b096ea837205c6bd0491a44"
 dependencies = [
- "nodrop",
  "stable_deref_trait",
 ]
 
@@ -2734,7 +2879,7 @@ dependencies = [
  "phf_generator 0.7.24",
  "phf_shared 0.7.24",
  "proc-macro2 1.0.63",
- "quote 1.0.28",
+ "quote 1.0.29",
  "string_cache_shared",
 ]
 
@@ -2747,7 +2892,7 @@ dependencies = [
  "phf_generator 0.10.0",
  "phf_shared 0.10.0",
  "proc-macro2 1.0.63",
- "quote 1.0.28",
+ "quote 1.0.29",
 ]
 
 [[package]]
@@ -2774,7 +2919,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
  "proc-macro2 1.0.63",
- "quote 1.0.28",
+ "quote 1.0.29",
  "unicode-ident",
 ]
 
@@ -2785,7 +2930,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616"
 dependencies = [
  "proc-macro2 1.0.63",
- "quote 1.0.28",
+ "quote 1.0.29",
  "unicode-ident",
 ]
 
@@ -2796,7 +2941,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
 dependencies = [
  "proc-macro2 1.0.63",
- "quote 1.0.28",
+ "quote 1.0.29",
  "syn 1.0.109",
  "unicode-xid 0.2.4",
 ]
@@ -2811,7 +2956,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "fastrand",
  "redox_syscall 0.3.5",
- "rustix",
+ "rustix 0.37.21",
  "windows-sys 0.48.0",
 ]
 
@@ -2851,7 +2996,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
 dependencies = [
  "proc-macro2 1.0.63",
- "quote 1.0.28",
+ "quote 1.0.29",
  "syn 2.0.22",
 ]
 
@@ -2893,6 +3038,16 @@ dependencies = [
  "time-core",
 ]
 
+[[package]]
+name = "tinytemplate"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
+dependencies = [
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "tinyvec"
 version = "1.6.0"
@@ -2929,11 +3084,12 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.28.2"
+version = "1.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
+checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
 dependencies = [
  "autocfg 1.1.0",
+ "backtrace",
  "bytes 1.4.0",
  "libc",
  "mio 0.8.8",
@@ -2973,7 +3129,7 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671"
 dependencies = [
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
  "futures",
 ]
 
@@ -2995,7 +3151,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2 1.0.63",
- "quote 1.0.28",
+ "quote 1.0.29",
  "syn 2.0.22",
 ]
 
@@ -3006,7 +3162,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
 dependencies = [
  "native-tls",
- "tokio 1.28.2",
+ "tokio 1.29.1",
 ]
 
 [[package]]
@@ -3015,7 +3171,7 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351"
 dependencies = [
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
  "futures",
  "lazy_static",
  "log",
@@ -3058,9 +3214,9 @@ version = "0.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89"
 dependencies = [
- "crossbeam-deque",
+ "crossbeam-deque 0.7.4",
  "crossbeam-queue",
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
  "futures",
  "lazy_static",
  "log",
@@ -3075,7 +3231,7 @@ version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296"
 dependencies = [
- "crossbeam-utils",
+ "crossbeam-utils 0.7.2",
  "futures",
  "slab",
  "tokio-executor",
@@ -3091,7 +3247,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "pin-project-lite",
- "tokio 1.28.2",
+ "tokio 1.29.1",
  "tracing",
 ]
 
@@ -3285,12 +3441,6 @@ dependencies = [
  "try-lock",
 ]
 
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
 [[package]]
 name = "wasi"
 version = "0.10.0+wasi-snapshot-preview1"
@@ -3323,7 +3473,7 @@ dependencies = [
  "log",
  "once_cell",
  "proc-macro2 1.0.63",
- "quote 1.0.28",
+ "quote 1.0.29",
  "syn 2.0.22",
  "wasm-bindgen-shared",
 ]
@@ -3346,7 +3496,7 @@ version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
 dependencies = [
- "quote 1.0.28",
+ "quote 1.0.29",
  "wasm-bindgen-macro-support",
 ]
 
@@ -3357,7 +3507,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2 1.0.63",
- "quote 1.0.28",
+ "quote 1.0.29",
  "syn 2.0.22",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
@@ -3381,10 +3531,11 @@ dependencies = [
 
 [[package]]
 name = "websurfx"
-version = "0.13.5"
+version = "0.13.7"
 dependencies = [
  "actix-files",
  "actix-web",
+ "criterion",
  "env_logger",
  "error-stack",
  "fake-useragent",
@@ -3400,7 +3551,7 @@ dependencies = [
  "scraper",
  "serde",
  "serde_json",
- "tokio 1.28.2",
+ "tokio 1.29.1",
 ]
 
 [[package]]
@@ -3472,9 +3623,9 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.48.0"
+version = "0.48.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
 dependencies = [
  "windows_aarch64_gnullvm 0.48.0",
  "windows_aarch64_msvc 0.48.0",
diff --git a/Cargo.toml b/Cargo.toml
index 57792f6..de596e1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "websurfx"
-version = "0.13.5"
+version = "0.13.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 b083f844eb73678c46156c54610dee337620f56d Mon Sep 17 00:00:00 2001
From: alamin655 <129589283+alamin655@users.noreply.github.com>
Date: Sun, 2 Jul 2023 11:29:42 +0530
Subject: [PATCH 16/35] Apply suggestions from code review

---
 .gitpod.yml | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/.gitpod.yml b/.gitpod.yml
index d919d82..9913c27 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -2,38 +2,38 @@
 image: ubuntu:latest 
 # Commands that will run on workspace start 
 tasks: 
-      name: Setup, Install & Build 
-      before: apt install cargo redis-server nodejs npm && cargo test
-      init: cargo install cargo-watch 
-      command: redis-server --port 8080 & cargo watch -q -w "." -x "run" 
+    - name: Setup, Install & Build 
+    - before: apt install cargo redis-server nodejs npm && cargo test
+    - init: cargo install cargo-watch 
+    - command: redis-server --port 8080 & cargo watch -q -w "." -x "run" 
 # Ports to expose on workspace startup 
 ports: 
+    - name: Website 
+      description: Website Preview 
       port: 8080 
-      onOpen: open-preview 
-      name: Website 
-      description: Website Preview
+      onOpen: open-browser 
 # vscode IDE setup
 vscode: 
    extensions: 
-      vadimcn.vscode-lldb
-      rust-lang.rust-analyzer
-      bungcip.better-toml
-      serayuzgur.crates
-      usernamehw.errorlens
-      DavidAnson.vscode-markdownlint
-      esbenp.prettier-vscode
-      stylelint.vscode-stylelint
-      dbaeumer.vscode-eslint
-      evgeniypeshkov.syntax-highlighter
-      redhat.vscode-yaml
-      ms-azuretools.vscode-docker
-      GitHub.vscode-github-actions
-      Catppuccin.catppuccin-vsc
-      PKief.material-icon-theme
-      tal7aouy.rainbow-bracket
-      oderwat.indent-rainbow
-      formulahendry.auto-rename-tag
-      eamodio.gitlens
+    - vadimcn.vscode-lldb
+    - rust-lang.rust-analyzer
+    - bungcip.better-toml
+    - serayuzgur.crates
+    - usernamehw.errorlens
+    - DavidAnson.vscode-markdownlint
+    - esbenp.prettier-vscode
+    - stylelint.vscode-stylelint
+    - dbaeumer.vscode-eslint
+    - evgeniypeshkov.syntax-highlighter
+    - redhat.vscode-yaml
+    - ms-azuretools.vscode-docker
+    - GitHub.vscode-github-actions
+    - Catppuccin.catppuccin-vsc
+    - PKief.material-icon-theme
+    - tal7aouy.rainbow-bracket
+    - oderwat.indent-rainbow
+    - formulahendry.auto-rename-tag
+    - eamodio.gitlens
 github: 
    prebuilds: 
       master: true 

From 55fc65a0318662f94626e24ba06df546525922f2 Mon Sep 17 00:00:00 2001
From: alamin655 <129589283+alamin655@users.noreply.github.com>
Date: Mon, 3 Jul 2023 20:14:36 +0530
Subject: [PATCH 17/35] Update .gitpod.yml

---
 .gitpod.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitpod.yml b/.gitpod.yml
index 9913c27..446268b 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -1,5 +1,5 @@
 ---
-image: ubuntu:latest 
+image: gitpod/workspace-base
 # Commands that will run on workspace start 
 tasks: 
     - name: Setup, Install & Build 

From 6ccef40a82b2aa35680e16d04afa8c4437b5060b Mon Sep 17 00:00:00 2001
From: alamin655 <129589283+alamin655@users.noreply.github.com>
Date: Mon, 3 Jul 2023 21:25:46 +0530
Subject: [PATCH 18/35] Update .gitpod.yml

---
 .gitpod.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitpod.yml b/.gitpod.yml
index 446268b..fd417c0 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -16,7 +16,8 @@ ports:
 vscode: 
    extensions: 
     - vadimcn.vscode-lldb
-    - rust-lang.rust-analyzer
+    - cschleiden.vscode-github-actions
+    - rust-lang.rust
     - bungcip.better-toml
     - serayuzgur.crates
     - usernamehw.errorlens
@@ -27,10 +28,8 @@ vscode:
     - evgeniypeshkov.syntax-highlighter
     - redhat.vscode-yaml
     - ms-azuretools.vscode-docker
-    - GitHub.vscode-github-actions
     - Catppuccin.catppuccin-vsc
     - PKief.material-icon-theme
-    - tal7aouy.rainbow-bracket
     - oderwat.indent-rainbow
     - formulahendry.auto-rename-tag
     - eamodio.gitlens

From bf01f1f18990c70140254b322305eb285c746c45 Mon Sep 17 00:00:00 2001
From: alamin655 <129589283+alamin655@users.noreply.github.com>
Date: Mon, 3 Jul 2023 21:27:11 +0530
Subject: [PATCH 19/35] Update .gitpod.yml

---
 .gitpod.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitpod.yml b/.gitpod.yml
index fd417c0..4eeabff 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -3,15 +3,15 @@ image: gitpod/workspace-base
 # Commands that will run on workspace start 
 tasks: 
     - name: Setup, Install & Build 
-    - before: apt install cargo redis-server nodejs npm && cargo test
-    - init: cargo install cargo-watch 
-    - command: redis-server --port 8080 & cargo watch -q -w "." -x "run" 
+      before: apt install cargo redis-server nodejs npm -y && cargo test
+      init: cargo install cargo-watch 
+      command: redis-server --port 8080 & cargo watch -q -w "." -x "run" 
 # Ports to expose on workspace startup 
 ports: 
     - name: Website 
       description: Website Preview 
       port: 8080 
-      onOpen: open-browser 
+      onOpen: open-preview
 # vscode IDE setup
 vscode: 
    extensions: 

From 440216871de346746494799709886b4b013a326e Mon Sep 17 00:00:00 2001
From: Milim <81323548+MilimTheTrueOne@users.noreply.github.com>
Date: Mon, 3 Jul 2023 19:30:25 +0200
Subject: [PATCH 20/35] Rename Things, refactor some code

BREAKING: renames `binding_ip_addr` to `binding_ip` and `redis_connection_url` to `redis_url`.

Renames a lot of internals as well, but they are to many to mention.
---
 src/bin/websurfx.rs                           |  4 +-
 src/cache/cacher.rs                           |  8 +-
 src/{config_parser => config}/mod.rs          |  0
 src/{config_parser => config}/parser.rs       | 12 +--
 .../parser_models.rs                          |  0
 src/engines/duckduckgo.rs                     |  2 +-
 src/engines/searx.rs                          |  2 +-
 src/handler/mod.rs                            |  2 +-
 ...public_path_handler.rs => public_paths.rs} | 20 +++--
 src/lib.rs                                    | 10 +--
 .../aggregation_models.rs                     |  2 +-
 .../aggregator.rs                             |  0
 .../mod.rs                                    |  0
 .../user_agent.rs                             |  0
 src/server/routes.rs                          | 84 ++++++++++---------
 tests/index.rs                                |  4 +-
 websurfx/config.lua                           |  4 +-
 17 files changed, 80 insertions(+), 74 deletions(-)
 rename src/{config_parser => config}/mod.rs (100%)
 rename src/{config_parser => config}/parser.rs (90%)
 rename src/{config_parser => config}/parser_models.rs (100%)
 rename src/handler/{public_path_handler.rs => public_paths.rs} (68%)
 rename src/{search_results_handler => results}/aggregation_models.rs (99%)
 rename src/{search_results_handler => results}/aggregator.rs (100%)
 rename src/{search_results_handler => results}/mod.rs (100%)
 rename src/{search_results_handler => results}/user_agent.rs (100%)

diff --git a/src/bin/websurfx.rs b/src/bin/websurfx.rs
index 8661725..d8d7f5c 100644
--- a/src/bin/websurfx.rs
+++ b/src/bin/websurfx.rs
@@ -5,7 +5,7 @@
 
 use std::net::TcpListener;
 
-use websurfx::{config_parser::parser::Config, run};
+use websurfx::{config::parser::Config, run};
 
 /// The function that launches the main server and registers all the routes of the website.
 ///
@@ -26,7 +26,7 @@ async fn main() -> std::io::Result<()> {
 
     log::info!("started server on port {}", config.port);
 
-    let listener = TcpListener::bind((config.binding_ip_addr.clone(), config.port))?;
+    let listener = TcpListener::bind((config.binding_ip.clone(), config.port))?;
 
     run(listener, config)?.await
 }
diff --git a/src/cache/cacher.rs b/src/cache/cacher.rs
index 87a6c6d..31494c4 100644
--- a/src/cache/cacher.rs
+++ b/src/cache/cacher.rs
@@ -32,7 +32,7 @@ impl RedisCache {
     /// # Arguments
     ///
     /// * `url` - It takes an url as string.
-    fn compute_url_hash(url: &str) -> String {
+    fn hash_url(url: &str) -> String {
         format!("{:?}", compute(url))
     }
 
@@ -41,8 +41,8 @@ impl RedisCache {
     /// # Arguments
     ///
     /// * `url` - It takes an url as a string.
-    pub fn cached_results_json(&mut self, url: &str) -> Result<String, Box<dyn std::error::Error>> {
-        let hashed_url_string = Self::compute_url_hash(url);
+    pub fn get_cached_json(&mut self, url: &str) -> Result<String, Box<dyn std::error::Error>> {
+        let hashed_url_string = Self::hash_url(url);
         Ok(self.connection.get(hashed_url_string)?)
     }
 
@@ -59,7 +59,7 @@ impl RedisCache {
         json_results: String,
         url: &str,
     ) -> Result<(), Box<dyn std::error::Error>> {
-        let hashed_url_string = Self::compute_url_hash(url);
+        let hashed_url_string = Self::hash_url(url);
 
         // put results_json into cache
         self.connection.set(&hashed_url_string, json_results)?;
diff --git a/src/config_parser/mod.rs b/src/config/mod.rs
similarity index 100%
rename from src/config_parser/mod.rs
rename to src/config/mod.rs
diff --git a/src/config_parser/parser.rs b/src/config/parser.rs
similarity index 90%
rename from src/config_parser/parser.rs
rename to src/config/parser.rs
index 5b4c2d8..f760e7d 100644
--- a/src/config_parser/parser.rs
+++ b/src/config/parser.rs
@@ -14,16 +14,16 @@ static CONFIG_FILE_NAME: &str = "config.lua";
 /// # Fields
 //
 /// * `port` - It stores the parsed port number option on which the server should launch.
-/// * `binding_ip_addr` - It stores the parsed ip address option on which the server should launch
+/// * `binding_ip` - It stores the parsed ip address option on which the server should launch
 /// * `style` - It stores the theming options for the website.
-/// * `redis_connection_url` - It stores the redis connection url address on which the redis
+/// * `redis_url` - It stores the redis connection url address on which the redis
 /// client should connect.
 #[derive(Clone)]
 pub struct Config {
     pub port: u16,
-    pub binding_ip_addr: String,
+    pub binding_ip: String,
     pub style: Style,
-    pub redis_connection_url: String,
+    pub redis_url: String,
     pub aggregator: AggregatorConfig,
     pub logging: bool,
     pub debug: bool,
@@ -55,12 +55,12 @@ impl Config {
 
             Ok(Config {
                 port: globals.get::<_, u16>("port")?,
-                binding_ip_addr: globals.get::<_, String>("binding_ip_addr")?,
+                binding_ip: globals.get::<_, String>("binding_ip")?,
                 style: Style::new(
                     globals.get::<_, String>("theme")?,
                     globals.get::<_, String>("colorscheme")?,
                 ),
-                redis_connection_url: globals.get::<_, String>("redis_connection_url")?,
+                redis_url: globals.get::<_, String>("redis_url")?,
                 aggregator: AggregatorConfig {
                     random_delay: globals.get::<_, bool>("production_use")?,
                 },
diff --git a/src/config_parser/parser_models.rs b/src/config/parser_models.rs
similarity index 100%
rename from src/config_parser/parser_models.rs
rename to src/config/parser_models.rs
diff --git a/src/engines/duckduckgo.rs b/src/engines/duckduckgo.rs
index 44d7b0d..21202de 100644
--- a/src/engines/duckduckgo.rs
+++ b/src/engines/duckduckgo.rs
@@ -7,7 +7,7 @@ use std::{collections::HashMap, time::Duration};
 use reqwest::header::{HeaderMap, CONTENT_TYPE, COOKIE, REFERER, USER_AGENT};
 use scraper::{Html, Selector};
 
-use crate::search_results_handler::aggregation_models::RawSearchResult;
+use crate::results::aggregation_models::RawSearchResult;
 
 use super::engine_models::EngineError;
 
diff --git a/src/engines/searx.rs b/src/engines/searx.rs
index bc68608..2a59901 100644
--- a/src/engines/searx.rs
+++ b/src/engines/searx.rs
@@ -6,7 +6,7 @@ use reqwest::header::{HeaderMap, CONTENT_TYPE, COOKIE, REFERER, USER_AGENT};
 use scraper::{Html, Selector};
 use std::collections::HashMap;
 
-use crate::search_results_handler::aggregation_models::RawSearchResult;
+use crate::results::aggregation_models::RawSearchResult;
 
 use super::engine_models::EngineError;
 use error_stack::{IntoReport, Report, Result, ResultExt};
diff --git a/src/handler/mod.rs b/src/handler/mod.rs
index daa5212..0d07e51 100644
--- a/src/handler/mod.rs
+++ b/src/handler/mod.rs
@@ -1 +1 @@
-pub mod public_path_handler;
+pub mod public_paths;
diff --git a/src/handler/public_path_handler.rs b/src/handler/public_paths.rs
similarity index 68%
rename from src/handler/public_path_handler.rs
rename to src/handler/public_paths.rs
index b99283e..7f0924b 100644
--- a/src/handler/public_path_handler.rs
+++ b/src/handler/public_paths.rs
@@ -17,15 +17,17 @@ static PUBLIC_DIRECTORY_NAME: &str = "public";
 /// 1. `/opt/websurfx` if it not present here then it fallbacks to the next one (2)
 /// 2. Under project folder ( or codebase in other words) if it is not present
 ///    here then it returns an error as mentioned above.
-pub fn handle_different_public_path() -> Result<String, Error> {
+pub fn get_public_path() -> Result<String, Error> {
     if Path::new(format!("/opt/websurfx/{}/", PUBLIC_DIRECTORY_NAME).as_str()).exists() {
-        Ok(format!("/opt/websurfx/{}", PUBLIC_DIRECTORY_NAME))
-    } else if Path::new(format!("./{}/", PUBLIC_DIRECTORY_NAME).as_str()).exists() {
-        Ok(format!("./{}", PUBLIC_DIRECTORY_NAME))
-    } else {
-        Err(Error::new(
-            std::io::ErrorKind::NotFound,
-            "Themes (public) folder not found!!",
-        ))
+        return Ok(format!("/opt/websurfx/{}", PUBLIC_DIRECTORY_NAME));
     }
+
+    if Path::new(format!("./{}/", PUBLIC_DIRECTORY_NAME).as_str()).exists() {
+        return Ok(format!("./{}", PUBLIC_DIRECTORY_NAME));
+    }
+
+    Err(Error::new(
+        std::io::ErrorKind::NotFound,
+        "Themes (public) folder not found!!",
+    ))
 }
diff --git a/src/lib.rs b/src/lib.rs
index 6b6d4fe..2dd7198 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,10 +2,10 @@
 //! and register all the routes for the `websurfx` meta search engine website.
 
 pub mod cache;
-pub mod config_parser;
+pub mod config;
 pub mod engines;
 pub mod handler;
-pub mod search_results_handler;
+pub mod results;
 pub mod server;
 
 use std::net::TcpListener;
@@ -14,9 +14,9 @@ use crate::server::routes;
 
 use actix_files as fs;
 use actix_web::{dev::Server, middleware::Logger, web, App, HttpServer};
-use config_parser::parser::Config;
+use config::parser::Config;
 use handlebars::Handlebars;
-use handler::public_path_handler::handle_different_public_path;
+use handler::public_paths::get_public_path;
 
 /// Runs the web server on the provided TCP listener and returns a `Server` instance.
 ///
@@ -41,7 +41,7 @@ use handler::public_path_handler::handle_different_public_path;
 pub fn run(listener: TcpListener, config: Config) -> std::io::Result<Server> {
     let mut handlebars: Handlebars = Handlebars::new();
 
-    let public_folder_path: String = handle_different_public_path()?;
+    let public_folder_path: String = get_public_path()?;
 
     handlebars
         .register_templates_directory(".html", format!("{}/templates", public_folder_path))
diff --git a/src/search_results_handler/aggregation_models.rs b/src/results/aggregation_models.rs
similarity index 99%
rename from src/search_results_handler/aggregation_models.rs
rename to src/results/aggregation_models.rs
index b6e6b81..86559a7 100644
--- a/src/search_results_handler/aggregation_models.rs
+++ b/src/results/aggregation_models.rs
@@ -3,7 +3,7 @@
 
 use serde::{Deserialize, Serialize};
 
-use crate::config_parser::parser_models::Style;
+use crate::config::parser_models::Style;
 
 /// A named struct to store, serialize and deserializes the individual search result from all the
 /// scraped and aggregated search results from the upstream search engines.
diff --git a/src/search_results_handler/aggregator.rs b/src/results/aggregator.rs
similarity index 100%
rename from src/search_results_handler/aggregator.rs
rename to src/results/aggregator.rs
diff --git a/src/search_results_handler/mod.rs b/src/results/mod.rs
similarity index 100%
rename from src/search_results_handler/mod.rs
rename to src/results/mod.rs
diff --git a/src/search_results_handler/user_agent.rs b/src/results/user_agent.rs
similarity index 100%
rename from src/search_results_handler/user_agent.rs
rename to src/results/user_agent.rs
diff --git a/src/server/routes.rs b/src/server/routes.rs
index 60d3007..cecdcdd 100644
--- a/src/server/routes.rs
+++ b/src/server/routes.rs
@@ -6,9 +6,9 @@ use std::fs::read_to_string;
 
 use crate::{
     cache::cacher::RedisCache,
-    config_parser::parser::Config,
-    handler::public_path_handler::handle_different_public_path,
-    search_results_handler::{aggregation_models::SearchResults, aggregator::aggregate},
+    config::parser::Config,
+    handler::public_paths::get_public_path,
+    results::{aggregation_models::SearchResults, aggregator::aggregate},
 };
 use actix_web::{get, web, HttpRequest, HttpResponse};
 use handlebars::Handlebars;
@@ -73,46 +73,25 @@ pub async fn search(
 ) -> Result<HttpResponse, Box<dyn std::error::Error>> {
     let params = web::Query::<SearchParams>::from_query(req.query_string())?;
 
-    //Initialize redis cache connection struct
-    let mut redis_cache = RedisCache::new(config.redis_connection_url.clone())?;
     match &params.q {
         Some(query) => {
             if query.trim().is_empty() {
-                Ok(HttpResponse::Found()
+                return Ok(HttpResponse::Found()
                     .insert_header(("location", "/"))
-                    .finish())
-            } else {
-                let page = match &params.page {
-                    Some(page) => *page,
-                    None => 0,
-                };
-
-                let page_url = format!(
-                    "http://{}:{}/search?q={}&page={}",
-                    config.binding_ip_addr, config.port, query, page
-                );
-
-                // fetch the cached results json.
-                let cached_results_json = redis_cache.cached_results_json(&page_url);
-                // check if fetched results was indeed fetched or it was an error and if so
-                // handle the data accordingly.
-                match cached_results_json {
-                    Ok(results_json) => {
-                        let new_results_json: SearchResults = serde_json::from_str(&results_json)?;
-                        let page_content: String = hbs.render("search", &new_results_json)?;
-                        Ok(HttpResponse::Ok().body(page_content))
-                    }
-                    Err(_) => {
-                        let mut results_json: crate::search_results_handler::aggregation_models::SearchResults =
-                            aggregate(query, page, config.aggregator.random_delay, config.debug).await?;
-                        results_json.add_style(config.style.clone());
-                        redis_cache
-                            .cache_results(serde_json::to_string(&results_json)?, &page_url)?;
-                        let page_content: String = hbs.render("search", &results_json)?;
-                        Ok(HttpResponse::Ok().body(page_content))
-                    }
-                }
+                    .finish());
             }
+            let page = match &params.page {
+                Some(page) => *page,
+                None => 0,
+            };
+
+            let url = format!(
+                "http://{}:{}/search?q={}&page={}",
+                config.binding_ip, config.port, query, page
+            );
+            let results_json = get_results(url, &config, query, page).await?;
+            let page_content: String = hbs.render("search", &results_json)?;
+            Ok(HttpResponse::Ok().body(page_content))
         }
         None => Ok(HttpResponse::Found()
             .insert_header(("location", "/"))
@@ -120,11 +99,36 @@ pub async fn search(
     }
 }
 
+/// Fetches the results for a query and page.
+/// First checks the redis cache, if that fails it gets proper results
+async fn get_results(
+    url: String,
+    config: &Config,
+    query: &str,
+    page: u32,
+) -> Result<SearchResults, Box<dyn std::error::Error>> {
+    //Initialize redis cache connection struct
+    let mut redis_cache = RedisCache::new(config.redis_url.clone())?;
+    // fetch the cached results json.
+    let cached_results_json = redis_cache.get_cached_json(&url);
+    // check if fetched results was indeed fetched or it was an error and if so
+    // handle the data accordingly.
+    match cached_results_json {
+        Ok(results_json) => Ok(serde_json::from_str::<SearchResults>(&results_json).unwrap()),
+        Err(_) => {
+            let mut results_json: crate::results::aggregation_models::SearchResults =
+                aggregate(query, page, config.aggregator.random_delay, config.debug).await?;
+            results_json.add_style(config.style.clone());
+            redis_cache.cache_results(serde_json::to_string(&results_json)?, &url)?;
+            Ok(results_json)
+        }
+    }
+}
+
 /// Handles the route of robots.txt page of the `websurfx` meta search engine website.
 #[get("/robots.txt")]
 pub async fn robots_data(_req: HttpRequest) -> Result<HttpResponse, Box<dyn std::error::Error>> {
-    let page_content: String =
-        read_to_string(format!("{}/robots.txt", handle_different_public_path()?))?;
+    let page_content: String = read_to_string(format!("{}/robots.txt", get_public_path()?))?;
     Ok(HttpResponse::Ok()
         .content_type("text/plain; charset=ascii")
         .body(page_content))
diff --git a/tests/index.rs b/tests/index.rs
index e3059bf..657a466 100644
--- a/tests/index.rs
+++ b/tests/index.rs
@@ -1,7 +1,7 @@
 use std::net::TcpListener;
 
 use handlebars::Handlebars;
-use websurfx::{config_parser::parser::Config, run};
+use websurfx::{config::parser::Config, run};
 
 // Starts a new instance of the HTTP server, bound to a random available port
 fn spawn_app() -> String {
@@ -41,5 +41,5 @@ async fn test_index() {
     assert_eq!(res.text().await.unwrap(), template);
 }
 
-// TODO: Write tests for tesing parameters for search function that if provided with something
+// TODO: Write tests for testing parameters for search function that if provided with something
 // other than u32 like alphabets and special characters than it should panic
diff --git a/websurfx/config.lua b/websurfx/config.lua
index 3daaa91..3e2167a 100644
--- a/websurfx/config.lua
+++ b/websurfx/config.lua
@@ -4,7 +4,7 @@ debug = false -- an option to enable or disable debug mode.
 
 -- ### Server ###
 port = "8080" -- port on which server should be launched
-binding_ip_addr = "127.0.0.1" --ip address on the which server should be launched.
+binding_ip = "127.0.0.1" --ip address on the which server should be launched.
 production_use = false -- whether to use production mode or not (in other words this option should be used if it is to be used to host it on the server to provide a service to a large number of users)
 -- if production_use is set to true
 -- There will be a random delay before sending the request to the search engines, this is to prevent DDoSing the upstream search engines from a large number of simultaneous requests.
@@ -25,4 +25,4 @@ colorscheme = "catppuccin-mocha" -- the colorscheme name which should be used fo
 theme = "simple" -- the theme name which should be used for the website
 
 -- ### Caching ###
-redis_connection_url = "redis://127.0.0.1:8082" -- redis connection url address on which the client should connect on.
+redis_url = "redis://127.0.0.1:8082" -- redis connection url address on which the client should connect on.

From 4cb38b1b54b8e1b4d7abe07ee3409feb9087ca62 Mon Sep 17 00:00:00 2001
From: Milim <81323548+MilimTheTrueOne@users.noreply.github.com>
Date: Mon, 3 Jul 2023 19:38:17 +0200
Subject: [PATCH 21/35] Fix docs

---
 src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib.rs b/src/lib.rs
index 2dd7198..30ebe797 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -32,7 +32,7 @@ use handler::public_paths::get_public_path;
 ///
 /// ```rust
 /// use std::net::TcpListener;
-/// use websurfx::{config_parser::parser::Config, run};
+/// use websurfx::{config::parser::Config, run};
 ///
 /// let config = Config::parse().unwrap();
 /// let listener = TcpListener::bind("127.0.0.1:8080").expect("Failed to bind address");

From 99936bcb1a2ebac0766ab816258dc691125d0b67 Mon Sep 17 00:00:00 2001
From: Trickshotblaster <107130695+Trickshotblaster@users.noreply.github.com>
Date: Tue, 4 Jul 2023 15:11:30 -0700
Subject: [PATCH 22/35] Rename getter functions

---
 src/cache/cacher.rs         |  2 +-
 src/config/parser.rs        |  4 ++--
 src/handler/public_paths.rs |  2 +-
 src/lib.rs                  |  4 ++--
 src/server/routes.rs        | 10 +++++-----
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/cache/cacher.rs b/src/cache/cacher.rs
index 31494c4..44d0710 100644
--- a/src/cache/cacher.rs
+++ b/src/cache/cacher.rs
@@ -41,7 +41,7 @@ impl RedisCache {
     /// # Arguments
     ///
     /// * `url` - It takes an url as a string.
-    pub fn get_cached_json(&mut self, url: &str) -> Result<String, Box<dyn std::error::Error>> {
+    pub fn cached_json(&mut self, url: &str) -> Result<String, Box<dyn std::error::Error>> {
         let hashed_url_string = Self::hash_url(url);
         Ok(self.connection.get(hashed_url_string)?)
     }
diff --git a/src/config/parser.rs b/src/config/parser.rs
index f760e7d..e411732 100644
--- a/src/config/parser.rs
+++ b/src/config/parser.rs
@@ -50,7 +50,7 @@ impl Config {
             let globals = context.globals();
 
             context
-                .load(&fs::read_to_string(Config::get_config_path()?)?)
+                .load(&fs::read_to_string(Config::config_path()?)?)
                 .exec()?;
 
             Ok(Config {
@@ -81,7 +81,7 @@ impl Config {
     ///    one (3).
     /// 3. `websurfx/` (under project folder ( or codebase in other words)) if it is not present
     ///    here then it returns an error as mentioned above.
-    fn get_config_path() -> Result<String, Box<dyn std::error::Error>> {
+    fn config_path() -> Result<String, Box<dyn std::error::Error>> {
         // check user config
 
         let path = format!(
diff --git a/src/handler/public_paths.rs b/src/handler/public_paths.rs
index 7f0924b..18d51e4 100644
--- a/src/handler/public_paths.rs
+++ b/src/handler/public_paths.rs
@@ -17,7 +17,7 @@ static PUBLIC_DIRECTORY_NAME: &str = "public";
 /// 1. `/opt/websurfx` if it not present here then it fallbacks to the next one (2)
 /// 2. Under project folder ( or codebase in other words) if it is not present
 ///    here then it returns an error as mentioned above.
-pub fn get_public_path() -> Result<String, Error> {
+pub fn public_path() -> Result<String, Error> {
     if Path::new(format!("/opt/websurfx/{}/", PUBLIC_DIRECTORY_NAME).as_str()).exists() {
         return Ok(format!("/opt/websurfx/{}", PUBLIC_DIRECTORY_NAME));
     }
diff --git a/src/lib.rs b/src/lib.rs
index 30ebe797..e226e14 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -16,7 +16,7 @@ use actix_files as fs;
 use actix_web::{dev::Server, middleware::Logger, web, App, HttpServer};
 use config::parser::Config;
 use handlebars::Handlebars;
-use handler::public_paths::get_public_path;
+use handler::public_paths::public_path;
 
 /// Runs the web server on the provided TCP listener and returns a `Server` instance.
 ///
@@ -41,7 +41,7 @@ use handler::public_paths::get_public_path;
 pub fn run(listener: TcpListener, config: Config) -> std::io::Result<Server> {
     let mut handlebars: Handlebars = Handlebars::new();
 
-    let public_folder_path: String = get_public_path()?;
+    let public_folder_path: String = public_path()?;
 
     handlebars
         .register_templates_directory(".html", format!("{}/templates", public_folder_path))
diff --git a/src/server/routes.rs b/src/server/routes.rs
index cecdcdd..e33848d 100644
--- a/src/server/routes.rs
+++ b/src/server/routes.rs
@@ -7,7 +7,7 @@ use std::fs::read_to_string;
 use crate::{
     cache::cacher::RedisCache,
     config::parser::Config,
-    handler::public_paths::get_public_path,
+    handler::public_paths::public_path,
     results::{aggregation_models::SearchResults, aggregator::aggregate},
 };
 use actix_web::{get, web, HttpRequest, HttpResponse};
@@ -89,7 +89,7 @@ pub async fn search(
                 "http://{}:{}/search?q={}&page={}",
                 config.binding_ip, config.port, query, page
             );
-            let results_json = get_results(url, &config, query, page).await?;
+            let results_json = results(url, &config, query, page).await?;
             let page_content: String = hbs.render("search", &results_json)?;
             Ok(HttpResponse::Ok().body(page_content))
         }
@@ -101,7 +101,7 @@ pub async fn search(
 
 /// Fetches the results for a query and page.
 /// First checks the redis cache, if that fails it gets proper results
-async fn get_results(
+async fn results(
     url: String,
     config: &Config,
     query: &str,
@@ -110,7 +110,7 @@ async fn get_results(
     //Initialize redis cache connection struct
     let mut redis_cache = RedisCache::new(config.redis_url.clone())?;
     // fetch the cached results json.
-    let cached_results_json = redis_cache.get_cached_json(&url);
+    let cached_results_json = redis_cache.cached_json(&url);
     // check if fetched results was indeed fetched or it was an error and if so
     // handle the data accordingly.
     match cached_results_json {
@@ -128,7 +128,7 @@ async fn get_results(
 /// Handles the route of robots.txt page of the `websurfx` meta search engine website.
 #[get("/robots.txt")]
 pub async fn robots_data(_req: HttpRequest) -> Result<HttpResponse, Box<dyn std::error::Error>> {
-    let page_content: String = read_to_string(format!("{}/robots.txt", get_public_path()?))?;
+    let page_content: String = read_to_string(format!("{}/robots.txt", public_path()?))?;
     Ok(HttpResponse::Ok()
         .content_type("text/plain; charset=ascii")
         .body(page_content))

From ac49d0c784cbf4de908e78f332da229d4d11b6c9 Mon Sep 17 00:00:00 2001
From: alamin655 <129589283+alamin655@users.noreply.github.com>
Date: Thu, 6 Jul 2023 18:04:17 +0530
Subject: [PATCH 23/35] Update mega-linter.yml

---
 .github/workflows/mega-linter.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/mega-linter.yml b/.github/workflows/mega-linter.yml
index d005c16..c8f6cec 100644
--- a/.github/workflows/mega-linter.yml
+++ b/.github/workflows/mega-linter.yml
@@ -41,7 +41,7 @@ jobs:
         id: ml
         # You can override MegaLinter flavor used to have faster performances
         # More info at https://megalinter.io/flavors/
-        uses: oxsecurity/megalinter@v7
+        uses: oxsecurity/megalinter/flavors/cupcake@v7.1.0
         env:
           # All available variables are described in documentation
           # https://megalinter.io/configuration/

From 1ee7661d965233b01bbd6971385782f13d50be9c Mon Sep 17 00:00:00 2001
From: alamin655 <129589283+alamin655@users.noreply.github.com>
Date: Thu, 6 Jul 2023 18:05:07 +0530
Subject: [PATCH 24/35] Update .mega-linter.yml

---
 .mega-linter.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.mega-linter.yml b/.mega-linter.yml
index 95f0f42..13d76ee 100644
--- a/.mega-linter.yml
+++ b/.mega-linter.yml
@@ -4,7 +4,6 @@
 APPLY_FIXES: all # all, none, or list of linter keys
 # ENABLE: # If you use ENABLE variable, all other languages/formats/tooling-formats will be disabled by default
 ENABLE_LINTERS: # If you use ENABLE_LINTERS variable, all other linters will be disabled by default
- - LUA_LUACHECK
  - RUST_CLIPPY
  - JAVASCRIPT_ES
  - CSS_STYLELINT
@@ -18,5 +17,5 @@ ENABLE_LINTERS: # If you use ENABLE_LINTERS variable, all other linters will be
   # - COPYPASTE # Uncomment to disable checks of excessive copy-pastes
   # - SPELL # Uncomment to disable checks of spelling mistakes
 SHOW_ELAPSED_TIME: true
-FILEIO_REPORTER: true
+FILEIO_REPORTER: false
 # DISABLE_ERRORS: true # Uncomment if you want MegaLinter to detect errors but not block CI to pass

From 7682d9f3b652677cca9cef45a1b32931ad98145e Mon Sep 17 00:00:00 2001
From: abhikumar63 <63abhikumar@gmail.com>
Date: Thu, 6 Jul 2023 18:58:22 +0530
Subject: [PATCH 25/35] Completed the modification of variable names.

---
 .../static/colorschemes/catppuccin-mocha.css  | 18 ++--
 public/static/colorschemes/dark-chocolate.css | 20 ++---
 public/static/colorschemes/dracula.css        | 18 ++--
 public/static/colorschemes/gruvbox-dark.css   | 18 ++--
 public/static/colorschemes/monokai.css        | 18 ++--
 public/static/colorschemes/nord.css           | 18 ++--
 public/static/colorschemes/oceanic-next.css   | 18 ++--
 public/static/colorschemes/one-dark.css       | 18 ++--
 public/static/colorschemes/solarized-dark.css | 18 ++--
 .../static/colorschemes/solarized-light.css   | 18 ++--
 public/static/colorschemes/tokyo-night.css    | 18 ++--
 public/static/colorschemes/tomorrow-night.css | 18 ++--
 public/static/themes/simple.css               | 84 +++++++++----------
 13 files changed, 151 insertions(+), 151 deletions(-)

diff --git a/public/static/colorschemes/catppuccin-mocha.css b/public/static/colorschemes/catppuccin-mocha.css
index d2c1075..95f68b4 100644
--- a/public/static/colorschemes/catppuccin-mocha.css
+++ b/public/static/colorschemes/catppuccin-mocha.css
@@ -1,11 +1,11 @@
 :root {
-  --bg: #1e1e2e;
-  --fg: #cdd6f4;
-  --1: #45475a;
-  --2: #f38ba8;
-  --3: #a6e3a1;
-  --4: #f9e2af;
-  --5: #89b4fa;
-  --6: #f5c2e7;
-  --7: #ffffff;
+  --background-color: #1e1e2e;
+  --foreground-color: #cdd6f4;
+  --color-one: #45475a;
+  --color-two: #f38ba8;
+  --color-three: #a6e3a1;
+  --color-four: #f9e2af;
+  --color-five: #89b4fa;
+  --color-six: #f5c2e7;
+  --color-seven: #ffffff;
 }
diff --git a/public/static/colorschemes/dark-chocolate.css b/public/static/colorschemes/dark-chocolate.css
index f1d6848..f60d5ab 100644
--- a/public/static/colorschemes/dark-chocolate.css
+++ b/public/static/colorschemes/dark-chocolate.css
@@ -1,11 +1,11 @@
 :root {
-    --bg: #000000;
-    --fg: #ffffff;
-    --1: #121212;
-    --2: #808080;
-    --3: #999999;
-    --4: #666666;
-    --5: #bfbfbf;
-    --6: #e0e0e0;
-    --7: #555555;
-  }
+  --background-color: #000000;
+  --foreground-color: #ffffff;
+  --color-one: #121212;
+  --color-two: #808080;
+  --color-three: #999999;
+  --color-four: #666666;
+  --color-five: #bfbfbf;
+  --color-six: #e0e0e0;
+  --color-seven: #555555;
+}
diff --git a/public/static/colorschemes/dracula.css b/public/static/colorschemes/dracula.css
index fb9c26c..71739ab 100644
--- a/public/static/colorschemes/dracula.css
+++ b/public/static/colorschemes/dracula.css
@@ -1,11 +1,11 @@
 :root {
-  --bg: #44475a;
-  --fg: #8be9fd;
-  --1: #ff5555;
-  --2: #50fa7b;
-  --3: #ffb86c;
-  --4: #bd93f9;
-  --5: #ff79c6;
-  --6: #94a3a5;
-  --7: #ffffff;
+  --background-color: #44475a;
+  --foreground-color: #8be9fd;
+  --color-one: #ff5555;
+  --color-two: #50fa7b;
+  --color-three: #ffb86c;
+  --color-four: #bd93f9;
+  --color-five: #ff79c6;
+  --color-six: #94a3a5;
+  --color-seven: #ffffff;
 }
diff --git a/public/static/colorschemes/gruvbox-dark.css b/public/static/colorschemes/gruvbox-dark.css
index 0b022a5..df9bdae 100644
--- a/public/static/colorschemes/gruvbox-dark.css
+++ b/public/static/colorschemes/gruvbox-dark.css
@@ -1,11 +1,11 @@
 :root {
-  --bg: #282828;
-  --fg: #ebdbb2;
-  --1: #cc241d;
-  --2: #98971a;
-  --3: #d79921;
-  --4: #458588;
-  --5: #b16286;
-  --6: #689d6a;
-  --7: #ffffff;
+  --background-color: #282828;
+  --foreground-color: #ebdbb2;
+  --color-one: #cc241d;
+  --color-two: #98971a;
+  --color-three: #d79921;
+  --color-four: #458588;
+  --color-five: #b16286;
+  --color-six: #689d6a;
+  --color-seven: #ffffff;
 }
diff --git a/public/static/colorschemes/monokai.css b/public/static/colorschemes/monokai.css
index 2c7b738..051cbf6 100644
--- a/public/static/colorschemes/monokai.css
+++ b/public/static/colorschemes/monokai.css
@@ -1,11 +1,11 @@
 :root {
-  --bg: #403e41;
-  --fg: #fcfcfa;
-  --1: #ff6188;
-  --2: #a9dc76;
-  --3: #ffd866;
-  --4: #fc9867;
-  --5: #ab9df2;
-  --6: #78dce8;
-  --7: #ffffff;
+  --background-color: #403e41;
+  --foreground-color: #fcfcfa;
+  --color-one: #ff6188;
+  --color-two: #a9dc76;
+  --color-three: #ffd866;
+  --color-four: #fc9867;
+  --color-five: #ab9df2;
+  --color-six: #78dce8;
+  --color-seven: #ffffff;
 }
diff --git a/public/static/colorschemes/nord.css b/public/static/colorschemes/nord.css
index cc0793f..9fae508 100644
--- a/public/static/colorschemes/nord.css
+++ b/public/static/colorschemes/nord.css
@@ -1,11 +1,11 @@
 :root {
-  --bg: #2e3440;
-  --fg: #d8dee9;
-  --1: #3b4252;
-  --2: #bf616a;
-  --3: #a3be8c;
-  --4: #ebcb8b;
-  --5: #81a1c1;
-  --6: #b48ead;
-  --7: #ffffff;
+  --background-color: #2e3440;
+  --foreground-color: #d8dee9;
+  --color-one: #3b4252;
+  --color-two: #bf616a;
+  --color-three: #a3be8c;
+  --color-four: #ebcb8b;
+  --color-five: #81a1c1;
+  --color-six: #b48ead;
+  --color-seven: #ffffff;
 }
diff --git a/public/static/colorschemes/oceanic-next.css b/public/static/colorschemes/oceanic-next.css
index e7e25b7..a768aa8 100644
--- a/public/static/colorschemes/oceanic-next.css
+++ b/public/static/colorschemes/oceanic-next.css
@@ -1,11 +1,11 @@
 :root {
-  --bg: #1b2b34;
-  --fg: #d8dee9;
-  --1: #343d46;
-  --2: #ec5f67;
-  --3: #99c794;
-  --4: #fac863;
-  --5: #6699cc;
-  --6: #c594c5;
-  --7: #ffffff;
+  --background-color: #1b2b34;
+  --foreground-color: #d8dee9;
+  --color-one: #343d46;
+  --color-two: #ec5f67;
+  --color-three: #99c794;
+  --color-four: #fac863;
+  --color-five: #6699cc;
+  --color-six: #c594c5;
+  --color-seven: #ffffff;
 }
diff --git a/public/static/colorschemes/one-dark.css b/public/static/colorschemes/one-dark.css
index 0afb05e..30f858e 100644
--- a/public/static/colorschemes/one-dark.css
+++ b/public/static/colorschemes/one-dark.css
@@ -1,11 +1,11 @@
 :root {
-  --bg: #282c34;
-  --fg: #abb2bf;
-  --1: #3b4048;
-  --2: #a3be8c;
-  --3: #b48ead;
-  --4: #c8ccd4;
-  --5: #e06c75;
-  --6: #61afef;
-  --7: #be5046;
+  --background-color: #282c34;
+  --foreground-color: #abb2bf;
+  --color-one: #3b4048;
+  --color-two: #a3be8c;
+  --color-three: #b48ead;
+  --color-four: #c8ccd4;
+  --color-five: #e06c75;
+  --color-six: #61afef;
+  --color-seven: #be5046;
 }
diff --git a/public/static/colorschemes/solarized-dark.css b/public/static/colorschemes/solarized-dark.css
index 1cad24f..ce9de26 100644
--- a/public/static/colorschemes/solarized-dark.css
+++ b/public/static/colorschemes/solarized-dark.css
@@ -1,11 +1,11 @@
 :root {
-  --bg: #002b36;
-  --fg: #839496;
-  --1: #073642;
-  --2: #dc322f;
-  --3: #859900;
-  --4: #b58900;
-  --5: #268bd2;
-  --6: #d33682;
-  --7: #ffffff;
+  --background-color: #002b36;
+  --foreground-color: #839496;
+  --color-one: #073642;
+  --color-two: #dc322f;
+  --color-three: #859900;
+  --color-four: #b58900;
+  --color-five: #268bd2;
+  --color-six: #d33682;
+  --color-seven: #ffffff;
 }
diff --git a/public/static/colorschemes/solarized-light.css b/public/static/colorschemes/solarized-light.css
index c6de267..c20e695 100644
--- a/public/static/colorschemes/solarized-light.css
+++ b/public/static/colorschemes/solarized-light.css
@@ -1,11 +1,11 @@
 :root {
-  --bg: #fdf6e3;
-  --fg: #657b83;
-  --1: #073642;
-  --2: #dc322f;
-  --3: #859900;
-  --4: #b58900;
-  --5: #268bd2;
-  --6: #d33682;
-  --7: #ffffff;
+  --background-color: #fdf6e3;
+  --foreground-color: #657b83;
+  --color-one: #073642;
+  --color-two: #dc322f;
+  --color-three: #859900;
+  --color-four: #b58900;
+  --color-five: #268bd2;
+  --color-six: #d33682;
+  --color-seven: #ffffff;
 }
diff --git a/public/static/colorschemes/tokyo-night.css b/public/static/colorschemes/tokyo-night.css
index b7a30cf..16c54bd 100644
--- a/public/static/colorschemes/tokyo-night.css
+++ b/public/static/colorschemes/tokyo-night.css
@@ -1,11 +1,11 @@
 :root {
-  --bg: #1a1b26;
-  --fg: #c0caf5;
-  --1: #32364a;
-  --2: #a9b1d6;
-  --3: #5a5bb8;
-  --4: #6b7089;
-  --5: #e2afff;
-  --6: #a9a1e1;
-  --7: #988bc7;
+  --background-color: #1a1b26;
+  --foreground-color: #c0caf5;
+  --color-one: #32364a;
+  --color-two: #a9b1d6;
+  --color-three: #5a5bb8;
+  --color-four: #6b7089;
+  --color-five: #e2afff;
+  --color-six: #a9a1e1;
+  --color-seven: #988bc7;
 }
diff --git a/public/static/colorschemes/tomorrow-night.css b/public/static/colorschemes/tomorrow-night.css
index 05502bc..38eb9f0 100644
--- a/public/static/colorschemes/tomorrow-night.css
+++ b/public/static/colorschemes/tomorrow-night.css
@@ -1,11 +1,11 @@
 :root {
-  --bg: #1d1f21;
-  --fg: #c5c8c6;
-  --1: #cc6666;
-  --2: #b5bd68;
-  --3: #f0c674;
-  --4: #81a2be;
-  --5: #b294bb;
-  --6: #8abeb7;
-  --7: #ffffff;
+  --background-color: #1d1f21;
+  --foreground-color: #c5c8c6;
+  --color-one: #cc6666;
+  --color-two: #b5bd68;
+  --color-three: #f0c674;
+  --color-four: #81a2be;
+  --color-five: #b294bb;
+  --color-six: #8abeb7;
+  --color-seven: #ffffff;
 }
diff --git a/public/static/themes/simple.css b/public/static/themes/simple.css
index d9b01ba..0144e34 100644
--- a/public/static/themes/simple.css
+++ b/public/static/themes/simple.css
@@ -16,7 +16,7 @@ body {
   justify-content: space-between;
   align-items: center;
   height: 100vh;
-  background: var(--1);
+  background: var(--color-one);
 }
 
 /* styles for the index page */
@@ -46,7 +46,7 @@ body {
   outline: none;
   border: none;
   box-shadow: rgba(0, 0, 0, 1);
-  background: var(--fg);
+  background: var(--foreground-color);
 }
 
 .search_bar button {
@@ -59,8 +59,8 @@ body {
   outline: none;
   border: none;
   gap: 0;
-  background: var(--bg);
-  color: var(--3);
+  background: var(--background-color);
+  color: var(--color-three);
   font-weight: 600;
   letter-spacing: 0.1rem;
 }
@@ -73,7 +73,7 @@ body {
 /* styles for the footer and header */
 
 header {
-  background: var(--bg);
+  background: var(--background-color);
   width: 100%;
   display: flex;
   justify-content: right;
@@ -96,7 +96,7 @@ footer ul li a,
 header ul li a:visited,
 footer ul li a:visited {
   text-decoration: none;
-  color: var(--2);
+  color: var(--color-two);
   text-transform: capitalize;
   letter-spacing: 0.1rem;
 }
@@ -107,12 +107,12 @@ header ul li a {
 
 header ul li a:hover,
 footer ul li a:hover {
-  color: var(--5);
+  color: var(--color-five);
 }
 
 footer div span {
   font-size: 1.5rem;
-  color: var(--4);
+  color: var(--color-four);
 }
 
 footer div {
@@ -121,7 +121,7 @@ footer div {
 }
 
 footer {
-  background: var(--bg);
+  background: var(--background-color);
   width: 100%;
   padding: 1rem;
   display: flex;
@@ -158,28 +158,28 @@ footer {
 
 .results_aggregated .result h1 a {
   font-size: 1.5rem;
-  color: var(--2);
+  color: var(--color-two);
   text-decoration: none;
   letter-spacing: 0.1rem;
 }
 
 .results_aggregated .result h1 a:hover {
-  color: var(--5);
+  color: var(--color-five);
 }
 
 .results_aggregated .result h1 a:visited {
-  color: var(--bg);
+  color: var(--background-color);
 }
 
 .results_aggregated .result small {
-  color: var(--3);
+  color: var(--color-three);
   font-size: 1.1rem;
   word-wrap: break-word;
   line-break: anywhere;
 }
 
 .results_aggregated .result p {
-  color: var(--fg);
+  color: var(--foreground-color);
   font-size: 1.2rem;
   margin-top: 0.3rem;
   word-wrap: break-word;
@@ -190,7 +190,7 @@ footer {
   text-align: right;
   font-size: 1.2rem;
   padding: 1rem;
-  color: var(--5);
+  color: var(--color-five);
 }
 
 /* Styles for the 404 page  */
@@ -233,12 +233,12 @@ footer {
 
 .error_content p a,
 .error_content p a:visited {
-  color: var(--2);
+  color: var(--color-two);
   text-decoration: none;
 }
 
 .error_content p a:hover {
-  color: var(--5);
+  color: var(--color-five);
 }
 
 .page_navigation {
@@ -249,8 +249,8 @@ footer {
 }
 
 .page_navigation button {
-  background: var(--bg);
-  color: var(--fg);
+  background: var(--background-color);
+  color: var(--foreground-color);
   padding: 1rem;
   border-radius: 0.5rem;
   outline: none;
@@ -265,12 +265,12 @@ footer {
 
 .about-container article {
   font-size: 1.5rem;
-  color: var(--fg);
+  color: var(--foreground-color);
   padding-bottom: 10px;
 }
 
 .about-container article h1 {
-  color: var(--2);
+  color: var(--color-two);
   font-size: 2.8rem;
 }
 
@@ -279,17 +279,17 @@ footer {
 }
 
 .about-container a {
-  color: var(--3);
+  color: var(--color-three);
 }
 
 .about-container article h2 {
-  color: var(--3);
+  color: var(--color-three);
   font-size: 1.8rem;
   padding-bottom: 10px;
 }
 
 .about-container p {
-  color: var(--fg);
+  color: var(--foreground-color);
   font-size: 1.6rem;
   padding-bottom: 10px;
 }
@@ -310,12 +310,12 @@ footer {
 }
 
 .settings h1 {
-  color: var(--2);
+  color: var(--color-two);
   font-size: 2.5rem;
 }
 
 .settings hr {
-  border-color: var(--3);
+  border-color: var(--color-three);
   margin: 0.3rem 0 1rem 0;
 }
 
@@ -331,7 +331,7 @@ footer {
   border-radius: 5px;
   font-weight: bold;
   margin-bottom: 0.5rem;
-  color: var(--fg);
+  color: var(--foreground-color);
   text-transform: capitalize;
   gap: 1.5rem;
 }
@@ -342,12 +342,12 @@ footer {
 }
 
 .settings_container .sidebar .btn.active {
-  background-color: var(--2);
+  background-color: var(--color-two);
 }
 
 .settings_container .main_container {
   width: 70%;
-  border-left: 1.5px solid var(--3);
+  border-left: 1.5px solid var(--color-three);
   padding-left: 3rem;
 }
 
@@ -365,8 +365,8 @@ footer {
   margin-top: 1rem;
   padding: 1rem 2rem;
   font-size: 1.5rem;
-  background: var(--3);
-  color: var(--bg);
+  background: var(--color-three);
+  color: var(--background-color);
   border-radius: 0.5rem;
   border: 2px solid transparent;
   font-weight: bold;
@@ -383,13 +383,13 @@ footer {
 
 .settings_container .main_container .message {
   font-size: 1.5rem;
-  color: var(--fg);
+  color: var(--foreground-color);
 }
 
 .settings_container .tab h3 {
   font-size: 2rem;
   font-weight: bold;
-  color: var(--4);
+  color: var(--color-four);
   margin-top: 1.5rem;
   text-transform: capitalize;
 }
@@ -397,14 +397,14 @@ footer {
 .settings_container .tab .description {
   font-size: 1.5rem;
   margin-bottom: 0.5rem;
-  color: var(--fg);
+  color: var(--foreground-color);
 }
 
 .settings_container .user_interface select {
   margin: 0.7rem 0;
   width: 20rem;
-  background-color: var(--bg);
-  color: var(--fg);
+  background-color: var(--background-color);
+  color: var(--foreground-color);
   padding: 1rem 2rem;
   border-radius: 0.5rem;
   outline: none;
@@ -413,7 +413,7 @@ footer {
 }
 
 .settings_container .user_interface option:hover {
-  background-color: var(--1);
+  background-color: var(--color-one);
 }
 
 .settings_container .engines .engine_selection {
@@ -425,7 +425,7 @@ footer {
 }
 
 .settings_container .engines .toggle_btn {
-  color: var(--fg);
+  color: var(--foreground-color);
   font-size: 1.5rem;
   display: flex;
   gap: 0.5rem;
@@ -464,7 +464,7 @@ footer {
   left: 0;
   right: 0;
   bottom: 0;
-  background-color: var(--bg);
+  background-color: var(--background-color);
   -webkit-transition: 0.4s;
   transition: 0.4s;
 }
@@ -476,17 +476,17 @@ footer {
   width: 2.6rem;
   left: 0.4rem;
   bottom: 0.4rem;
-  background-color: var(--fg);
+  background-color: var(--foreground-color);
   -webkit-transition: 0.4s;
   transition: 0.4s;
 }
 
 input:checked + .slider {
-  background-color: var(--3);
+  background-color: var(--color-three);
 }
 
 input:focus + .slider {
-  box-shadow: 0 0 1px var(--3);
+  box-shadow: 0 0 1px var(--color-three);
 }
 
 input:checked + .slider:before {

From b11260dedb93f137af9e63a6c3af40827827b88a Mon Sep 17 00:00:00 2001
From: alamin655 <129589283+alamin655@users.noreply.github.com>
Date: Thu, 6 Jul 2023 20:23:26 +0530
Subject: [PATCH 26/35] Bump version

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index de596e1..b6655f7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "websurfx"
-version = "0.13.7"
+version = "0.13.13"
 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 0d9e2ba3acfc11be554fd11e3ad6eb70e06e7525 Mon Sep 17 00:00:00 2001
From: alamin655 <129589283+alamin655@users.noreply.github.com>
Date: Thu, 6 Jul 2023 20:45:32 +0530
Subject: [PATCH 27/35] Update Cargo.lock

---
 Cargo.lock | 257 ++++++++++++++++++++++-------------------------------
 1 file changed, 106 insertions(+), 151 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 89ec79d..43e6eb0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -66,7 +66,7 @@ dependencies = [
  "http 0.2.9",
  "httparse",
  "httpdate",
- "itoa 1.0.6",
+ "itoa 1.0.8",
  "language-tags",
  "local-channel",
  "mime",
@@ -74,7 +74,7 @@ dependencies = [
  "pin-project-lite",
  "rand 0.8.5",
  "sha1",
- "smallvec 1.10.0",
+ "smallvec 1.11.0",
  "tokio 1.29.1",
  "tokio-util",
  "tracing",
@@ -178,7 +178,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "http 0.2.9",
- "itoa 1.0.6",
+ "itoa 1.0.8",
  "language-tags",
  "log",
  "mime",
@@ -188,7 +188,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded 0.7.1",
- "smallvec 1.10.0",
+ "smallvec 1.11.0",
  "socket2",
  "time 0.3.22",
  "url 2.4.0",
@@ -506,18 +506,18 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.3.10"
+version = "4.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "384e169cc618c613d5e3ca6404dda77a8685a63e08660dcc64abaf7da7cb0c7a"
+checksum = "1640e5cc7fb47dbb8338fd471b105e7ed6c3cb2aeb00c2e067127ffd3764a05d"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.3.10"
+version = "4.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef137bbe35aab78bdb468ccfba75a5f4d8321ae011d34063770780545176af2d"
+checksum = "98c59138d527eeaf9b53f35a77fcc1fad9d883116070c63d5de1c7dc7b00c72b"
 dependencies = [
  "anstyle",
  "clap_lex",
@@ -611,9 +611,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c"
+checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
 dependencies = [
  "libc",
 ]
@@ -772,9 +772,9 @@ checksum = "5b3df4f93e5fbbe73ec01ec8d3f68bba73107993a5b1e7519273c32db9b0d5be"
 dependencies = [
  "cssparser-macros",
  "dtoa-short",
- "itoa 1.0.6",
+ "itoa 1.0.8",
  "phf 0.11.2",
- "smallvec 1.10.0",
+ "smallvec 1.11.0",
 ]
 
 [[package]]
@@ -784,7 +784,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
 dependencies = [
  "quote 1.0.29",
- "syn 2.0.22",
+ "syn 2.0.23",
 ]
 
 [[package]]
@@ -818,9 +818,9 @@ checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0"
 
 [[package]]
 name = "dtoa"
-version = "1.0.6"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65d09067bfacaa79114679b279d7f5885b53295b1e2cfb4e79c8e4bd3d633169"
+checksum = "519b83cd10f5f6e969625a409f735182bea5558cd8b64c655806ceaae36f1999"
 
 [[package]]
 name = "dtoa-short"
@@ -828,7 +828,7 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74"
 dependencies = [
- "dtoa 1.0.6",
+ "dtoa 1.0.8",
 ]
 
 [[package]]
@@ -883,7 +883,7 @@ checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
 dependencies = [
  "errno-dragonfly",
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1192,9 +1192,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
 
 [[package]]
 name = "html5ever"
@@ -1243,7 +1243,7 @@ checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
 dependencies = [
  "bytes 1.4.0",
  "fnv",
- "itoa 1.0.6",
+ "itoa 1.0.8",
 ]
 
 [[package]]
@@ -1338,7 +1338,7 @@ dependencies = [
  "http-body 0.4.5",
  "httparse",
  "httpdate",
- "itoa 1.0.6",
+ "itoa 1.0.8",
  "pin-project-lite",
  "socket2",
  "tokio 1.29.1",
@@ -1432,7 +1432,7 @@ checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
  "hermit-abi",
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1452,13 +1452,13 @@ checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
 
 [[package]]
 name = "is-terminal"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb"
+checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
  "hermit-abi",
- "rustix 0.38.1",
- "windows-sys 0.48.0",
+ "rustix 0.38.3",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1478,9 +1478,9 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
 
 [[package]]
 name = "itoa"
-version = "1.0.6"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a"
 
 [[package]]
 name = "jobserver"
@@ -1715,7 +1715,7 @@ dependencies = [
  "libc",
  "log",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1834,7 +1834,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2 1.0.63",
  "quote 1.0.29",
- "syn 2.0.22",
+ "syn 2.0.23",
 ]
 
 [[package]]
@@ -1900,15 +1900,15 @@ dependencies = [
  "cfg-if 1.0.0",
  "libc",
  "redox_syscall 0.3.5",
- "smallvec 1.10.0",
+ "smallvec 1.11.0",
  "windows-targets",
 ]
 
 [[package]]
 name = "paste"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
+checksum = "b4b27ab7be369122c218afc2079489cdcb4b517c0a3fc386ff11e1fedfcc2b35"
 
 [[package]]
 name = "percent-encoding"
@@ -1952,7 +1952,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2 1.0.63",
  "quote 1.0.29",
- "syn 2.0.22",
+ "syn 2.0.23",
 ]
 
 [[package]]
@@ -2054,7 +2054,7 @@ dependencies = [
  "phf_shared 0.11.2",
  "proc-macro2 1.0.63",
  "quote 1.0.29",
- "syn 2.0.22",
+ "syn 2.0.23",
 ]
 
 [[package]]
@@ -2086,9 +2086,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"
 
 [[package]]
 name = "pin-utils"
@@ -2362,7 +2362,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3ea8c51b5dc1d8e5fd3350ec8167f464ec0995e79f2e90a075b63371500d557f"
 dependencies = [
  "combine",
- "itoa 1.0.6",
+ "itoa 1.0.8",
  "percent-encoding 2.3.0",
  "ryu",
  "sha1_smol",
@@ -2386,9 +2386,21 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.8.4"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
+checksum = "89089e897c013b3deb627116ae56a6955a72b8bed395c9526af31c9fe528b484"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa250384981ea14565685dea16a9ccc4d1c541a13f82b9c168572264d1df8c56"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2397,9 +2409,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
+checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846"
 
 [[package]]
 name = "reqwest"
@@ -2474,9 +2486,9 @@ dependencies = [
 
 [[package]]
 name = "rlua"
-version = "0.19.5"
+version = "0.19.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "753540fb29c9a615ce5dd64be5c957271adc887c8424555fc372e0b88ebde074"
+checksum = "5d33e5ba15c3d43178f283ed5863d4531e292fc0e56fb773f3bea45f18e3a42a"
 dependencies = [
  "bitflags 1.3.2",
  "bstr",
@@ -2487,9 +2499,9 @@ dependencies = [
 
 [[package]]
 name = "rlua-lua54-sys"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b1af7df13ef18849005d82d8d16411ebdb7f35f9dcfcb790a4ce49bc1e05aa"
+checksum = "7aafabafe1895cb4a2be81a56d7ff3d46bf4b5d2f9cfdbea2ed404cdabe96474"
 dependencies = [
  "cc",
  "libc",
@@ -2522,29 +2534,29 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.37.21"
+version = "0.37.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f25693a73057a1b4cb56179dd3c7ea21a7c6c5ee7d85781f5749b46f34b79c"
+checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
 dependencies = [
  "bitflags 1.3.2",
  "errno",
  "io-lifetimes",
  "libc",
  "linux-raw-sys 0.3.8",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.38.1"
+version = "0.38.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc6396159432b5c8490d4e301d8c705f61860b8b6c863bf79942ce5401968f3"
+checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4"
 dependencies = [
  "bitflags 2.3.3",
  "errno",
  "libc",
  "linux-raw-sys 0.4.3",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -2561,9 +2573,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.13"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9"
 
 [[package]]
 name = "same-file"
@@ -2576,11 +2588,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.21"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
+checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
 dependencies = [
- "windows-sys 0.42.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -2602,7 +2614,7 @@ dependencies = [
  "html5ever 0.26.0",
  "once_cell",
  "selectors",
- "smallvec 1.10.0",
+ "smallvec 1.11.0",
  "tendril",
 ]
 
@@ -2655,7 +2667,7 @@ dependencies = [
  "phf_codegen 0.10.0",
  "precomputed-hash",
  "servo_arc",
- "smallvec 1.10.0",
+ "smallvec 1.11.0",
 ]
 
 [[package]]
@@ -2681,31 +2693,31 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.164"
+version = "1.0.166"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d"
+checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.164"
+version = "1.0.166"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
+checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6"
 dependencies = [
  "proc-macro2 1.0.63",
  "quote 1.0.29",
- "syn 2.0.22",
+ "syn 2.0.23",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.99"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3"
+checksum = "0f1e14e89be7aa4c4b78bdbdc9eb5bf8517829a600ae8eaa39a6e1d960b5185c"
 dependencies = [
- "itoa 1.0.6",
+ "itoa 1.0.8",
  "ryu",
  "serde",
 ]
@@ -2729,7 +2741,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
 dependencies = [
  "form_urlencoded",
- "itoa 1.0.6",
+ "itoa 1.0.8",
  "ryu",
  "serde",
 ]
@@ -2812,9 +2824,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
 
 [[package]]
 name = "socket2"
@@ -2925,9 +2937,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.22"
+version = "2.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616"
+checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737"
 dependencies = [
  "proc-macro2 1.0.63",
  "quote 1.0.29",
@@ -2956,8 +2968,8 @@ dependencies = [
  "cfg-if 1.0.0",
  "fastrand",
  "redox_syscall 0.3.5",
- "rustix 0.37.21",
- "windows-sys 0.48.0",
+ "rustix 0.37.23",
+ "windows-sys",
 ]
 
 [[package]]
@@ -2982,22 +2994,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.40"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+checksum = "c16a64ba9387ef3fdae4f9c1a7f07a0997fce91985c0336f1ddc1822b3b37802"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.40"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+checksum = "d14928354b01c4d6a4f0e549069adef399a284e7995c7ccca94e8a07a5346c59"
 dependencies = [
  "proc-macro2 1.0.63",
  "quote 1.0.29",
- "syn 2.0.22",
+ "syn 2.0.23",
 ]
 
 [[package]]
@@ -3017,7 +3029,7 @@ version = "0.3.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea9e1b3cf1243ae005d9e74085d4d542f3125458f3a81af210d901dcd7411efd"
 dependencies = [
- "itoa 1.0.6",
+ "itoa 1.0.8",
  "serde",
  "time-core",
  "time-macros",
@@ -3099,7 +3111,7 @@ dependencies = [
  "signal-hook-registry",
  "socket2",
  "tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -3152,7 +3164,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2 1.0.63",
  "quote 1.0.29",
- "syn 2.0.22",
+ "syn 2.0.23",
 ]
 
 [[package]]
@@ -3331,9 +3343,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
+checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73"
 
 [[package]]
 name = "unicode-normalization"
@@ -3474,7 +3486,7 @@ dependencies = [
  "once_cell",
  "proc-macro2 1.0.63",
  "quote 1.0.29",
- "syn 2.0.22",
+ "syn 2.0.23",
  "wasm-bindgen-shared",
 ]
 
@@ -3508,7 +3520,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2 1.0.63",
  "quote 1.0.29",
- "syn 2.0.22",
+ "syn 2.0.23",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -3531,7 +3543,7 @@ dependencies = [
 
 [[package]]
 name = "websurfx"
-version = "0.13.7"
+version = "0.13.13"
 dependencies = [
  "actix-files",
  "actix-web",
@@ -3597,21 +3609,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows-sys"
-version = "0.42.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -3627,93 +3624,51 @@ version = "0.48.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.0",
- "windows_aarch64_msvc 0.48.0",
- "windows_i686_gnu 0.48.0",
- "windows_i686_msvc 0.48.0",
- "windows_x86_64_gnu 0.48.0",
- "windows_x86_64_gnullvm 0.48.0",
- "windows_x86_64_msvc 0.48.0",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.0"

From d45d2e5c63069cf6e4b5d48c5069683a44d82a20 Mon Sep 17 00:00:00 2001
From: Trickshotblaster <107130695+Trickshotblaster@users.noreply.github.com>
Date: Thu, 6 Jul 2023 16:15:36 -0700
Subject: [PATCH 28/35] Update theme colors

---
 public/static/colorschemes/gruvbox-dark.css    |  4 ++--
 public/static/colorschemes/monokai.css         |  8 ++++----
 public/static/colorschemes/nord.css            | 16 ++++++++--------
 public/static/colorschemes/oceanic-next.css    | 10 +++++-----
 public/static/colorschemes/solarized-dark.css  | 10 +++++-----
 public/static/colorschemes/solarized-light.css | 12 ++++++------
 public/static/colorschemes/tomorrow-night.css  | 16 ++++++++--------
 7 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/public/static/colorschemes/gruvbox-dark.css b/public/static/colorschemes/gruvbox-dark.css
index df9bdae..69f81d6 100644
--- a/public/static/colorschemes/gruvbox-dark.css
+++ b/public/static/colorschemes/gruvbox-dark.css
@@ -1,7 +1,7 @@
 :root {
-  --background-color: #282828;
+  --background-color: #1d2021;
   --foreground-color: #ebdbb2;
-  --color-one: #cc241d;
+  --color-one: #282828;
   --color-two: #98971a;
   --color-three: #d79921;
   --color-four: #458588;
diff --git a/public/static/colorschemes/monokai.css b/public/static/colorschemes/monokai.css
index 051cbf6..7c33160 100644
--- a/public/static/colorschemes/monokai.css
+++ b/public/static/colorschemes/monokai.css
@@ -1,8 +1,8 @@
 :root {
-  --background-color: #403e41;
-  --foreground-color: #fcfcfa;
-  --color-one: #ff6188;
-  --color-two: #a9dc76;
+  --background-color: #49483Eff;
+  --foreground-color: #FFB269;
+  --color-one: #272822ff;
+  --color-two: #61AFEF;
   --color-three: #ffd866;
   --color-four: #fc9867;
   --color-five: #ab9df2;
diff --git a/public/static/colorschemes/nord.css b/public/static/colorschemes/nord.css
index 9fae508..234b57b 100644
--- a/public/static/colorschemes/nord.css
+++ b/public/static/colorschemes/nord.css
@@ -1,11 +1,11 @@
 :root {
-  --background-color: #2e3440;
-  --foreground-color: #d8dee9;
-  --color-one: #3b4252;
-  --color-two: #bf616a;
-  --color-three: #a3be8c;
-  --color-four: #ebcb8b;
+  --background-color: #122736ff;
+  --foreground-color: #a2e2a9;
+  --color-one: #121B2Cff;
+  --color-two: #f08282;
+  --color-three: #ABC5AAff;
+  --color-four: #e6d2d2;
   --color-five: #81a1c1;
-  --color-six: #b48ead;
-  --color-seven: #ffffff;
+  --color-six: #e2ecd6;
+  --color-seven: #fff;
 }
diff --git a/public/static/colorschemes/oceanic-next.css b/public/static/colorschemes/oceanic-next.css
index a768aa8..896bae1 100644
--- a/public/static/colorschemes/oceanic-next.css
+++ b/public/static/colorschemes/oceanic-next.css
@@ -2,10 +2,10 @@
   --background-color: #1b2b34;
   --foreground-color: #d8dee9;
   --color-one: #343d46;
-  --color-two: #ec5f67;
-  --color-three: #99c794;
-  --color-four: #fac863;
-  --color-five: #6699cc;
+  --color-two: #5FB3B3ff;
+  --color-three: #69Cf;
+  --color-four: #99c794;
+  --color-five: #69c;
   --color-six: #c594c5;
-  --color-seven: #ffffff;
+  --color-seven: #D8DEE9ff;
 }
diff --git a/public/static/colorschemes/solarized-dark.css b/public/static/colorschemes/solarized-dark.css
index ce9de26..5933b2d 100644
--- a/public/static/colorschemes/solarized-dark.css
+++ b/public/static/colorschemes/solarized-dark.css
@@ -1,11 +1,11 @@
 :root {
   --background-color: #002b36;
-  --foreground-color: #839496;
+  --foreground-color: #667A7Fff;
   --color-one: #073642;
-  --color-two: #dc322f;
-  --color-three: #859900;
-  --color-four: #b58900;
+  --color-two: #2AA198ff;
+  --color-three: #2AA198ff;
+  --color-four: #EEE8D5ff;
   --color-five: #268bd2;
   --color-six: #d33682;
-  --color-seven: #ffffff;
+  --color-seven: #fff;
 }
diff --git a/public/static/colorschemes/solarized-light.css b/public/static/colorschemes/solarized-light.css
index c20e695..d1411ef 100644
--- a/public/static/colorschemes/solarized-light.css
+++ b/public/static/colorschemes/solarized-light.css
@@ -1,11 +1,11 @@
 :root {
-  --background-color: #fdf6e3;
-  --foreground-color: #657b83;
-  --color-one: #073642;
-  --color-two: #dc322f;
-  --color-three: #859900;
+  --background-color: #EEE8D5ff;
+  --foreground-color: #B58900ff;
+  --color-one: #fdf6e3;
+  --color-two: #DC322Fff;
+  --color-three: #586E75ff;
   --color-four: #b58900;
   --color-five: #268bd2;
   --color-six: #d33682;
-  --color-seven: #ffffff;
+  --color-seven: #fff;
 }
diff --git a/public/static/colorschemes/tomorrow-night.css b/public/static/colorschemes/tomorrow-night.css
index 38eb9f0..2f2c29c 100644
--- a/public/static/colorschemes/tomorrow-night.css
+++ b/public/static/colorschemes/tomorrow-night.css
@@ -1,11 +1,11 @@
 :root {
-  --background-color: #1d1f21;
-  --foreground-color: #c5c8c6;
-  --color-one: #cc6666;
-  --color-two: #b5bd68;
+  --background-color: #35383Cff;
+  --foreground-color: #D7DAD8ff;
+  --color-one: #1d1f21;
+  --color-two: #D77C79ff;
   --color-three: #f0c674;
-  --color-four: #81a2be;
-  --color-five: #b294bb;
-  --color-six: #8abeb7;
-  --color-seven: #ffffff;
+  --color-four: #92B2CAff;
+  --color-five: #C0A7C7ff;
+  --color-six: #9AC9C4ff;
+  --color-seven: #fff;
 }

From 6bc06a34f5292d20440ad34eacc83f800a6c10f8 Mon Sep 17 00:00:00 2001
From: alamin655 <129589283+alamin655@users.noreply.github.com>
Date: Fri, 7 Jul 2023 20:05:55 +0530
Subject: [PATCH 29/35] Add comments and docstrings to the code

---
 public/static/cookies.js | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/public/static/cookies.js b/public/static/cookies.js
index 7c27d33..677eff7 100644
--- a/public/static/cookies.js
+++ b/public/static/cookies.js
@@ -1,15 +1,26 @@
-// This function is executed when any page on the website finishes loading and
-// this function retrieves the cookies if it is present on the user's machine.
-// If it is available then the saved cookies is display in the cookies tab
-// otherwise an appropriate message is displayed if it is not available.
+/**
+ * This function is executed when any page on the website finishes loading and
+ * this function retrieves the cookies if it is present on the user's machine.
+ * If it is available then the saved cookies is display in the cookies tab
+ * otherwise an appropriate message is displayed if it is not available.
+ *
+ * @function
+ * @listens DOMContentLoaded
+ * @returns {void}
+ */
 document.addEventListener(
   'DOMContentLoaded',
   () => {
     try {
+      // Decode the cookie value
       let cookie = decodeURIComponent(document.cookie)
+      // Set the value of the input field to the decoded cookie value if it is not empty
+      // Otherwise, display a message indicating that no cookies have been saved on the user's system
       document.querySelector('.cookies input').value =
         cookie !== '' ? cookie : 'No cookies have been saved on your system'
     } catch (error) {
+      // If there is an error decoding the cookie, log the error to the console
+      // and display an error message in the input field
       console.error('Error decoding cookie:', error)
       document.querySelector('.cookies input').value = 'Error decoding cookie'
     }

From f103e4643c66647dfa801005c196a5e4d0469bcd Mon Sep 17 00:00:00 2001
From: alamin655 <129589283+alamin655@users.noreply.github.com>
Date: Fri, 7 Jul 2023 20:08:47 +0530
Subject: [PATCH 30/35] Add comments and docstrings to the code

---
 public/static/pagination.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/static/pagination.js b/public/static/pagination.js
index 92f9272..4f5697c 100644
--- a/public/static/pagination.js
+++ b/public/static/pagination.js
@@ -1,5 +1,5 @@
 /**
- * Navigates to the next page by incrementing the current page number in the URL query parameters.
+ * Navigates to the next page by incrementing the current page number in the URL query string.
  * @returns {void}
  */
 function navigate_forward() {
@@ -19,7 +19,7 @@ function navigate_forward() {
 }
 
 /**
- * Navigates to the previous page by decrementing the current page number in the URL query parameters.
+ * Navigates to the previous page by decrementing the current page number in the URL query string.
  * @returns {void}
  */
 function navigate_backward() {

From a615fffdf333b948712428e0cee1b7b4c2d30053 Mon Sep 17 00:00:00 2001
From: alamin655 <129589283+alamin655@users.noreply.github.com>
Date: Fri, 7 Jul 2023 20:09:43 +0530
Subject: [PATCH 31/35] Add comments and docstrings to the code

---
 public/static/settings.js | 46 ++++++++++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/public/static/settings.js b/public/static/settings.js
index 6b18df4..42b8a4b 100644
--- a/public/static/settings.js
+++ b/public/static/settings.js
@@ -1,5 +1,7 @@
-// This function handles the toggling of selections of all upstream search engines 
-// options in the settings page under the tab engines.
+/**
+ * This function handles the toggling of selections of all upstream search engines 
+ * options in the settings page under the tab engines.
+ */
 function toggleAllSelection() {
   document
     .querySelectorAll('.engine')
@@ -10,25 +12,36 @@ function toggleAllSelection() {
     )
 }
 
-// This function adds the functionality to sidebar buttons to only show settings 
-// related to that tab.
+/**
+ * This function adds the functionality to sidebar buttons to only show settings 
+ * related to that tab.
+ * @param {HTMLElement} current_tab - The current tab that was clicked.
+ */
 function setActiveTab(current_tab) {
+  // Remove the active class from all tabs and buttons
   document
     .querySelectorAll('.tab')
     .forEach((tab) => tab.classList.remove('active'))
   document
     .querySelectorAll('.btn')
     .forEach((tab) => tab.classList.remove('active'))
+
+  // Add the active class to the current tab and its corresponding settings
   current_tab.classList.add('active')
   document
     .querySelector(`.${current_tab.innerText.toLowerCase().replace(' ', '_')}`)
     .classList.add('active')
 }
 
-// This function adds the functionality to save all the user selected preferences
-// to be saved in a cookie on the users machine.
+/**
+ * This function adds the functionality to save all the user selected preferences
+ * to be saved in a cookie on the users machine.
+ */
 function setClientSettings() {
+  // Create an object to store the user's preferences
   let cookie_dictionary = new Object()
+
+  // Loop through all select tags and add their values to the cookie dictionary
   document.querySelectorAll('select').forEach((select_tag) => {
     if (select_tag.name === 'themes') {
       cookie_dictionary['theme'] = select_tag.value
@@ -36,6 +49,8 @@ function setClientSettings() {
       cookie_dictionary['colorscheme'] = select_tag.value
     }
   })
+
+  // Loop through all engine checkboxes and add their values to the cookie dictionary
   let engines = []
   document.querySelectorAll('.engine').forEach((engine_checkbox) => {
     if (engine_checkbox.checked === true) {
@@ -43,33 +58,44 @@ function setClientSettings() {
     }
   })
   cookie_dictionary['engines'] = engines
+
+  // Set the expiration date for the cookie to 1 year from the current date
   let expiration_date = new Date()
   expiration_date.setFullYear(expiration_date.getFullYear() + 1)
+
+  // Save the cookie to the user's machine
   document.cookie = `appCookie=${JSON.stringify(
     cookie_dictionary
   )}; expires=${expiration_date.toUTCString()}`
 
+  // Display a success message to the user
   document.querySelector('.message').innerText =
     '✅ The settings have been saved sucessfully!!'
 
+  // Clear the success message after 10 seconds
   setTimeout(() => {
     document.querySelector('.message').innerText = ''
   }, 10000)
 }
 
-// This functions gets the saved cookies if it is present on the user's machine If it 
-// is available then it is parsed and converted to an object which is then used to 
-// retrieve the preferences that the user had selected previously and is then loaded in the 
-// website otherwise the function does nothing and the default server side settings are loaded.
+/**
+ * This functions gets the saved cookies if it is present on the user's machine If it 
+ * is available then it is parsed and converted to an object which is then used to 
+ * retrieve the preferences that the user had selected previously and is then loaded in the 
+ * website otherwise the function does nothing and the default server side settings are loaded.
+ */
 function getClientSettings() {
+  // Get the appCookie from the user's machine
   let cookie = decodeURIComponent(document.cookie)
 
+  // If the cookie is not empty, parse it and use it to set the user's preferences
   if (cookie !== '') {
     let cookie_value = decodeURIComponent(document.cookie)
       .split(';')
       .map((item) => item.split('='))
       .reduce((acc, [_, v]) => (acc = JSON.parse(v)) && acc, {})
 
+    // Loop through all link tags and update their href values to match the user's preferences
     let links = Array.from(document.querySelectorAll('link')).forEach(
       (item) => {
         if (item.href.includes('static/themes')) {

From cc4fc0a41773220fb364f678cabd8fa959bfa9ed Mon Sep 17 00:00:00 2001
From: Pierre <pierre.git@posteo.de>
Date: Fri, 7 Jul 2023 21:20:36 +0000
Subject: [PATCH 32/35] add dashes to YAML files

---
 .github/workflows/contributors.yml | 3 ++-
 .github/workflows/hello.yml        | 1 +
 .github/workflows/labels.yml       | 1 +
 .github/workflows/rust.yml         | 1 +
 .github/workflows/rust_format.yml  | 1 +
 .github/workflows/stale.yml        | 1 +
 .mega-linter.yml                   | 1 +
 docker-compose.yml                 | 1 +
 8 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/contributors.yml b/.github/workflows/contributors.yml
index fcb0277..d57a508 100644
--- a/.github/workflows/contributors.yml
+++ b/.github/workflows/contributors.yml
@@ -1,3 +1,4 @@
+---
 name: Contributors List
 
 on:
@@ -44,4 +45,4 @@ jobs:
           delete-branch: true
           title: 'chore: update contributors-list'
           body: |
-            Automated update to `images/contributors_list.svg`
\ No newline at end of file
+            Automated update to `images/contributors_list.svg`
diff --git a/.github/workflows/hello.yml b/.github/workflows/hello.yml
index 9d3018e..c10105b 100644
--- a/.github/workflows/hello.yml
+++ b/.github/workflows/hello.yml
@@ -1,3 +1,4 @@
+---
 name: Welcome first time contributors 
 
 on:
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 9dd3ea9..ab9f2fe 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -1,3 +1,4 @@
+---
 name: Import open source standard labels
 
 on:
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index bc62ede..8f25a36 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -1,3 +1,4 @@
+---
 name: Rust
 
 on:
diff --git a/.github/workflows/rust_format.yml b/.github/workflows/rust_format.yml
index c300863..f26392b 100644
--- a/.github/workflows/rust_format.yml
+++ b/.github/workflows/rust_format.yml
@@ -1,3 +1,4 @@
+---
 name: Rust format and clippy checks
 on:
   push:
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 1e1e6f0..5bae815 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,3 +1,4 @@
+---
 # This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
 #
 # You can adjust the behavior by modifying this file.
diff --git a/.mega-linter.yml b/.mega-linter.yml
index 13d76ee..b117b53 100644
--- a/.mega-linter.yml
+++ b/.mega-linter.yml
@@ -1,3 +1,4 @@
+---
 # Configuration file for MegaLinter
 # See all available variables at https://megalinter.io/configuration/ and in linters documentation
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 37ef93d..aed741e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,3 +1,4 @@
+---
 version: "3.9"
 services:
   app:

From 037befaaacfe52d7b2bf6c236b31a4a577295987 Mon Sep 17 00:00:00 2001
From: Trickshotblaster <107130695+Trickshotblaster@users.noreply.github.com>
Date: Fri, 7 Jul 2023 15:12:43 -0700
Subject: [PATCH 33/35] Make searchbar text more readable in solarized themes

---
 public/static/colorschemes/solarized-dark.css  | 2 +-
 public/static/colorschemes/solarized-light.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/static/colorschemes/solarized-dark.css b/public/static/colorschemes/solarized-dark.css
index 5933b2d..44494f9 100644
--- a/public/static/colorschemes/solarized-dark.css
+++ b/public/static/colorschemes/solarized-dark.css
@@ -1,6 +1,6 @@
 :root {
   --background-color: #002b36;
-  --foreground-color: #667A7Fff;
+  --foreground-color: #c9e0e6;
   --color-one: #073642;
   --color-two: #2AA198ff;
   --color-three: #2AA198ff;
diff --git a/public/static/colorschemes/solarized-light.css b/public/static/colorschemes/solarized-light.css
index d1411ef..7434b37 100644
--- a/public/static/colorschemes/solarized-light.css
+++ b/public/static/colorschemes/solarized-light.css
@@ -1,6 +1,6 @@
 :root {
   --background-color: #EEE8D5ff;
-  --foreground-color: #B58900ff;
+  --foreground-color: #b1ab97;
   --color-one: #fdf6e3;
   --color-two: #DC322Fff;
   --color-three: #586E75ff;

From e789abe1b5d19279ca5c6e1ed137bbb20b30b57c Mon Sep 17 00:00:00 2001
From: alamin655 <129589283+alamin655@users.noreply.github.com>
Date: Sun, 9 Jul 2023 08:28:38 +0530
Subject: [PATCH 34/35] Bump version to "0.13.16"

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index b6655f7..02dd1c2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "websurfx"
-version = "0.13.13"
+version = "0.13.16"
 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 d1d1186ca6218f3de9421c0d7e52c22f91b20f77 Mon Sep 17 00:00:00 2001
From: alamin655 <129589283+alamin655@users.noreply.github.com>
Date: Sun, 9 Jul 2023 08:52:19 +0530
Subject: [PATCH 35/35] Update Cargo.lock

---
 Cargo.lock | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 43e6eb0..28fe995 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2386,9 +2386,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.9.0"
+version = "1.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89089e897c013b3deb627116ae56a6955a72b8bed395c9526af31c9fe528b484"
+checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2398,9 +2398,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.3.0"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa250384981ea14565685dea16a9ccc4d1c541a13f82b9c168572264d1df8c56"
+checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2693,18 +2693,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.166"
+version = "1.0.168"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8"
+checksum = "d614f89548720367ded108b3c843be93f3a341e22d5674ca0dd5cd57f34926af"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.166"
+version = "1.0.168"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6"
+checksum = "d4fe589678c688e44177da4f27152ee2d190757271dc7f1d5b6b9f68d869d641"
 dependencies = [
  "proc-macro2 1.0.63",
  "quote 1.0.29",
@@ -2994,18 +2994,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.41"
+version = "1.0.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c16a64ba9387ef3fdae4f9c1a7f07a0997fce91985c0336f1ddc1822b3b37802"
+checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.41"
+version = "1.0.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d14928354b01c4d6a4f0e549069adef399a284e7995c7ccca94e8a07a5346c59"
+checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f"
 dependencies = [
  "proc-macro2 1.0.63",
  "quote 1.0.29",
@@ -3322,9 +3322,9 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e79c4d996edb816c91e4308506774452e55e95c3c9de07b6729e17e15a5ef81"
+checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
 
 [[package]]
 name = "unicase"
@@ -3543,7 +3543,7 @@ dependencies = [
 
 [[package]]
 name = "websurfx"
-version = "0.13.13"
+version = "0.13.16"
 dependencies = [
  "actix-files",
  "actix-web",