Bump version to 0.9.0

Cache busted resources will always have a lowercase name. For some
reason, a user encountered a capitalized css file name in #1142. This
isn't present anywhere in the Whoogle repo, but could be a byproduct of
some self-hosting configuration. Either way, the key used should always
be lowercase.

Fixes #1142

.github/workflows/pypi.yml

@@ -10,59 +10,58 @@ jobs:
     name: Build and publish to TestPyPI
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
-    - name: Set up Python 3.9
+      - name: Set up Python 3.9
-      uses: actions/setup-python@v1
+        uses: actions/setup-python@v5
-      with:
+        with:
-        python-version: 3.9
+          python-version: 3.9
-    - name: Install pypa/build
+      - name: Install pypa/build
-      run: >-
+        run: >-
-        python -m
+          python -m
-        pip install
+          pip install
-        build
+          build
-        setuptools
+          setuptools
-        --user
+          --user
-    - name: Set dev timestamp
+      - name: Set dev timestamp
-      run: echo "DEV_BUILD=$(date +%s)" >> $GITHUB_ENV
+        run: echo "DEV_BUILD=$(date +%s)" >> $GITHUB_ENV
-    - name: Build binary wheel and source tarball
+      - name: Build binary wheel and source tarball
-      run: >-
+        run: >-
-        python -m
+          python -m
-        build
+          build
-        --sdist
+          --sdist
-        --wheel
+          --wheel
-        --outdir dist/
+          --outdir dist/
-        .
+          .
-    - name: Publish distribution to TestPyPI
+      - name: Publish distribution to TestPyPI
-      uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@master
-      with:
+        with:
-        password: ${{ secrets.TEST_PYPI_API_TOKEN }}
+          password: ${{ secrets.TEST_PYPI_API_TOKEN }}
-        repository_url: https://test.pypi.org/legacy/
+          repository_url: https://test.pypi.org/legacy/
   publish:
     name: Build and publish to PyPI
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
-    - name: Set up Python 3.9
+      - name: Set up Python 3.9
-      uses: actions/setup-python@v1
+        uses: actions/setup-python@v5
-      with:
+        with:
-        python-version: 3.9
+          python-version: 3.9
-    - name: Install pypa/build
+      - name: Install pypa/build
-      run: >-
+        run: >-
-        python -m
+          python -m
-        pip install
+          pip install
-        build
+          build
-        --user
+          --user
-    - name: Build binary wheel and source tarball
+      - name: Build binary wheel and source tarball
-      run: >-
+        run: >-
-        python -m
+          python -m
-        build
+          build
-        --sdist
+          --sdist
-        --wheel
+          --wheel
-        --outdir dist/
+          --outdir dist/
-        .
+          .
-    - name: Publish distribution to PyPI
+      - name: Publish distribution to PyPI
-      if: startsWith(github.ref, 'refs/tags')
+        if: startsWith(github.ref, 'refs/tags')
-      uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@master
-      with:
+        with:
-        password: ${{ secrets.PYPI_API_TOKEN }}
+          password: ${{ secrets.PYPI_API_TOKEN }}
-

.github/workflows/tests.yml

@@ -6,12 +6,12 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
-    - name: Set up Python
+      - name: Set up Python
-      uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
-      with:
+        with:
-        python-version: '3.x'
+          python-version: '3.x'
-    - name: Install dependencies
+      - name: Install dependencies
-      run: pip install --upgrade pip && pip install -r requirements.txt
+        run: pip install --upgrade pip && pip install -r requirements.txt
-    - name: Run tests
+      - name: Run tests
-      run: ./run test
+        run: ./run test

app/__init__.py

@@ -176,7 +176,7 @@ for cb_dir in cache_busting_dirs:
 # Templating functions
 app.jinja_env.globals.update(clean_query=clean_query)
 app.jinja_env.globals.update(
-    cb_url=lambda f: app.config['CACHE_BUSTING_MAP'][f])
+    cb_url=lambda f: app.config['CACHE_BUSTING_MAP'][f.lower()])
 
 # Attempt to acquire tor identity, to determine if Tor config is available
 send_tor_signal(Signal.HEARTBEAT)

app/models/g_classes.py

@@ -15,6 +15,7 @@ class GClasses:
     result_class_a = 'ZINbbc'
     result_class_b = 'luh4td'
     scroller_class = 'idg8be'
+    line_tag = 'BsXmcf'
 
     result_classes = {
         result_class_a: ['Gx5Zad'],

app/static/css/dark-theme.css

@@ -70,6 +70,10 @@ select {
     border-radius: 8px !important;
 }
 
+.BsXmcf {
+    background-color: unset !important;
+}
+
 .KP7LCb {
     box-shadow: 0 0 0 0 !important;
 }

app/static/css/light-theme.css

@@ -45,6 +45,10 @@ select {
     box-shadow: 0 1px 6px rgba(32,33,36,0.28) !important;
 }
 
+.BsXmcf {
+    background-color: unset !important;
+}
+
 .BVG0Nb {
     background-color: var(--whoogle-result-bg) !important;
 }

app/utils/results.py

@@ -27,7 +27,8 @@ BLACKLIST = [
     'Reklama', 'Реклама', 'Anunț', '광고', 'annons', 'Annonse', 'Iklan',
     '広告', 'Augl.', 'Mainos', 'Advertentie', 'إعلان', 'Գովազդ', 'विज्ञापन',
     'Reklam', 'آگهی', 'Reklāma', 'Reklaam', 'Διαφήμιση', 'מודעה', 'Hirdetés',
-    'Anúncio', 'Quảng cáo','โฆษณา', 'sponsored', 'patrocinado', 'gesponsert'
+    'Anúncio', 'Quảng cáo', 'โฆษณา', 'sponsored', 'patrocinado', 'gesponsert',
+    'Sponzorováno', '스폰서', 'Gesponsord'
 ]
 
 SITE_ALTS = {
@@ -98,7 +99,7 @@ def bold_search_terms(response: str, query: str) -> BeautifulSoup:
         else:
             reg_pattern = fr'\b((?![{{}}<>-]){target_word}(?![{{}}<>-]))\b'
 
-        if re.match('.*[@_!#$%^&*()<>?/\|}{~:].*', target_word) or (
+        if re.match(r'.*[@_!#$%^&*()<>?/\|}{~:].*', target_word) or (
                 element.parent and element.parent.name == 'style'):
             return
 

app/version.py

@@ -4,4 +4,4 @@ optional_dev_tag = ''
 if os.getenv('DEV_BUILD'):
     optional_dev_tag = '.dev' + os.getenv('DEV_BUILD')
 
-__version__ = '0.8.4' + optional_dev_tag
+__version__ = '0.9.0' + optional_dev_tag

charts/whoogle/Chart.yaml

@@ -3,7 +3,7 @@ name: whoogle
 description: A self hosted search engine on Kubernetes
 type: application
 version: 0.1.0
-appVersion: 0.8.4
+appVersion: 0.9.0
 
 icon: https://github.com/benbusby/whoogle-search/raw/main/app/static/img/favicon/favicon-96x96.png
 

requirements.txt

@@ -11,7 +11,7 @@ cryptography==43.0.1; platform_machine != 'armv7l'
 cssutils==2.6.0
 defusedxml==0.7.1
 Flask==2.3.2
-idna==3.4
+idna==3.7
 itsdangerous==2.1.2
 Jinja2==3.1.4
 MarkupSafe==2.1.2
@@ -33,5 +33,5 @@ urllib3==1.26.19
 validators==0.22.0
 waitress==2.1.2
 wcwidth==0.2.6
-Werkzeug==3.0.1
+Werkzeug==3.0.3
 python-dotenv==0.21.1