Aktualizacja strony internetowej

.github/workflows/hugo.yml

@@ -11,6 +11,8 @@ on:
 jobs:
   deploy:
     runs-on: ubuntu-latest
+    env:
+      HUGO_CACHEDIR: /tmp/hugo_cache
     steps:
       - uses: actions/checkout@v4
         with:
@@ -20,18 +22,24 @@ jobs:
       - name: Setup Hugo
         uses: peaceiris/actions-hugo@v3
         with:
-          hugo-version: '0.123.7'
+          hugo-version: '0.134.3'
           extended: true
 
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'
 
+      - uses: actions/cache@v4
+        with:
+          path: ${{ env.HUGO_CACHEDIR }}
+          key: ${{ runner.os }}-hugomod-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-hugomod-
+
       - name: Build
         run: |
           git rm -rf ./docs
-          cd ./website/themes/docsy && npm install
           cd "$GITHUB_WORKSPACE"/website
           npm i -D --save autoprefixer postcss-cli postcss
           hugo --minify

website/assets/scss/dark-theme.scss

@@ -1,7 +1,5 @@
 // @media (prefers-color-scheme: dark) {
     html[data-bs-theme="dark"] body {
-        background-color: #010101 !important;
-
         .vscomp-dropbox, .popover-body {
             color: #fff !important;
             background-color: #222 !important;
@@ -19,10 +17,6 @@
         //     background-color: rgba(255, 255, 255, 0.05) !important;
         // }
 
-        .pageinfo {
-            background: rgba(255, 255, 255, 0.05) !important;
-        }
-
         .vscomp-option.focused {
             background: #333333;
         }
@@ -31,18 +25,6 @@
             background: #111111;
         }
 
-        .td-sidebar-nav__section-title a {
-            color: #dddddd;
-        }
-
-        .td-sidebar-nav .td-sidebar-link__page {
-            color: #b6afa8;
-        }
-
-        .alert {
-            background: black !important;
-        }
-
         .bootstrap-select .notify, .bootstrap-select .no-results {
             background: black !important;
             border-color: black !important;
@@ -66,19 +48,6 @@
             filter: invert(1);
         }
 
-        .taxonomy-term:not(:hover):not(:focus)  {
-            color: #e9ecef;
-            background: #403f4c;
-        }
-
-        .taxonomy-count {
-            background-color: #000;
-        }
-
-        .taxonomy-term:hover .taxonomy-count {
-            color: #bfc0b3 !important;
-        }
-
         .vscomp-wrapper.multiple .vscomp-option.selected .checkbox-icon::after, .vscomp-wrapper .checkbox-icon.checked::after {
             border-color: deepskyblue;
             border-left-color: rgba(0, 0, 0, 0);
@@ -92,23 +61,6 @@
         .vscomp-dropbox-close-button {
             background-color: #333;
         }
-
-        pre {
-            background-color: rgba(255, 255, 255, 0.1) !important;
-            color: inherit !important;
-        }
-
-        .td-sidebar__toggle {
-            color: var(--bs-body-color);
-        }
-
-        .td-sidebar-nav .dropdown a {
-            color: #b6afa8;
-        }
-
-        nav.foldable-nav .ul-1 .with-child > label:before {
-            color: #b6afa8;
-        }
     }
     // }
 

website/data/FilterLists.toml

@@ -198,11 +198,10 @@ category = "prywatność"
 [[items]]
 title = "Web Annoyances Ultralist "
 desc = "Ikony społecznościowe, paski udostępniania, banery z aplikacjami mobilnymi, prośby o pobranie aplikacji, komunikaty dot. ciasteczek/polityki prywatności/RODO, strzałki, wyskakujące okienka, ponaglania o subskrypcję/rejestrację i inne rozpraszające elementy. Pływające nagłówki i inne ruchome elementy będą przypinane."
-subscribe = "https://raw.githubusercontent.com/yourduskquibbles/webannoyances/master/ultralist.txt"
-issues = "https://github.com/yourduskquibbles/webannoyances/issues"
-chat = "https://discord.me/yourduskquibbles"
-home = "https://github.com/yourduskquibbles/webannoyances"
-modules = "https://github.com/yourduskquibbles/webannoyances/tree/master/filters"
+subscribe = "https://raw.githubusercontent.com/LanikSJ/webannoyances/master/ultralist.txt"
+issues = "https://github.com/LanikSJ/webannoyances/issues"
+home = "https://github.com/LanikSJ/webannoyances"
+modules = "https://github.com/LanikSJ/webannoyances/tree/master/filters"
 adblocker = "uBO, AG"
 category = "irytujące, ciasteczka, społecznościowe"
 
@@ -259,8 +258,8 @@ form = "https://urlhaus.abuse.ch/api/#submit"
 home = "https://gitlab.com/malware-filter/urlhaus-filter"
 category = "bezpieczeństwo"
 adblocker = "uBO"
-mirror = "jsDelivr, GitHub, Cloudflare 1, Cloudflare 2, Gitloaf"
-mirrorURL = "https://cdn.jsdelivr.net/gh/curbengh/urlhaus-filter@gh-pages/urlhaus-filter-online.txt, https://curbengh.github.io/malware-filter/urlhaus-filter-online.txt, https://malware-filter.pages.dev/urlhaus-filter-online.txt, https://urlhaus-filter.pages.dev/urlhaus-filter-online.txt, https://gitloaf.com/cdn/curbengh/urlhaus-filter/gh-pages/urlhaus-filter-online.txt"
+mirror = "jsDelivr, GitHub, Cloudflare 1, Cloudflare 2"
+mirrorURL = "https://cdn.jsdelivr.net/gh/curbengh/urlhaus-filter@gh-pages/urlhaus-filter-online.txt, https://curbengh.github.io/malware-filter/urlhaus-filter-online.txt, https://malware-filter.pages.dev/urlhaus-filter-online.txt, https://urlhaus-filter.pages.dev/urlhaus-filter-online.txt"
 
 [[items]]
 title = "KADhosts"
@@ -359,8 +358,8 @@ form = "https://urlhaus.abuse.ch/api/#submit"
 home = "https://gitlab.com/malware-filter/urlhaus-filter"
 category = "bezpieczeństwo"
 adblocker = "hosts"
-mirror = "jsDelivr, GitHub, Cloudflare 1, Cloudflare 2, Gitloaf"
-mirrorURL = "https://cdn.jsdelivr.net/gh/curbengh/urlhaus-filter@gh-pages/urlhaus-filter-hosts-online.txt, https://curbengh.github.io/malware-filter/urlhaus-filter-hosts-online.txt, https://malware-filter.pages.dev/urlhaus-filter-hosts-online.txt, https://urlhaus-filter.pages.dev/urlhaus-filter-hosts-online.txt, https://gitloaf.com/cdn/curbengh/urlhaus-filter/gh-pages/urlhaus-filter-hosts-online.txt"
+mirror = "jsDelivr, GitHub, Cloudflare 1, Cloudflare 2"
+mirrorURL = "https://cdn.jsdelivr.net/gh/curbengh/urlhaus-filter@gh-pages/urlhaus-filter-hosts-online.txt, https://curbengh.github.io/malware-filter/urlhaus-filter-hosts-online.txt, https://malware-filter.pages.dev/urlhaus-filter-hosts-online.txt, https://urlhaus-filter.pages.dev/urlhaus-filter-hosts-online.txt"
 
 [[items]]
 title = "NoCoin Hosts"
@@ -410,8 +409,8 @@ issues = "https://gitlab.com/malware-filter/phishing-filter/-/issues"
 home = "https://gitlab.com/malware-filter/phishing-filter"
 adblocker = "hosts"
 category = "bezpieczeństwo"
-mirror = "jsDelivr, GitHub, Cloudflare 1, Cloudflare 2, Gitloaf"
-mirrorURL = "https://cdn.jsdelivr.net/gh/curbengh/phishing-filter@gh-pages/phishing-filter-hosts.txt, https://curbengh.github.io/phishing-filter/phishing-filter-hosts.txt, https://phishing-filter.pages.dev/phishing-filter-hosts.txt, https://malware-filter.pages.dev/phishing-filter-hosts.txt, https://gitloaf.com/cdn/curbengh/phishing-filter/gh-pages/phishing-filter-hosts.txt"
+mirror = "jsDelivr, GitHub, Cloudflare 1, Cloudflare 2"
+mirrorURL = "https://cdn.jsdelivr.net/gh/curbengh/phishing-filter@gh-pages/phishing-filter-hosts.txt, https://curbengh.github.io/phishing-filter/phishing-filter-hosts.txt, https://phishing-filter.pages.dev/phishing-filter-hosts.txt, https://malware-filter.pages.dev/phishing-filter-hosts.txt"
 
 [[items]]
 title = "Dandelion Sprout's Anti-Malware Hosts"

website/go.mod

@@ -0,0 +1,9 @@
+module github.com/MajkiIT/polish-ads-filter
+
+go 1.23.1
+
+require (
+	github.com/FortAwesome/Font-Awesome v0.0.0-20240402185447-c0f460dca7f7 // indirect
+	github.com/google/docsy v0.10.0 // indirect
+	github.com/twbs/bootstrap v5.3.3+incompatible // indirect
+)

website/go.sum

@@ -0,0 +1,6 @@
+github.com/FortAwesome/Font-Awesome v0.0.0-20240402185447-c0f460dca7f7 h1:2aWEKCRLqQ9nPyXaz4/IYtRrDr3PzEiX0DUSUr2/EDs=
+github.com/FortAwesome/Font-Awesome v0.0.0-20240402185447-c0f460dca7f7/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
+github.com/google/docsy v0.10.0 h1:6tMDacPwAyRWNCfvsn/9qGOZDQ8b0aRzjRZvnZPY5dg=
+github.com/google/docsy v0.10.0/go.mod h1:c0nIAqmRTOuJ01F85U/wJPQtc3Zj9N58Kea9bOT2AJc=
+github.com/twbs/bootstrap v5.3.3+incompatible h1:goFoqinzdHfkeegpFP7pvhbd0g+A3O2hbU3XCjuNrEQ=
+github.com/twbs/bootstrap v5.3.3+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=

website/hugo.toml

@@ -3,8 +3,6 @@ title = "Polish filters for AdBlock, uBlock Origin & AdGuard"
 ignoreFiles = [ "table_notes.md" ]
 enableRobotsTXT = true
 publishDir = "../docs"
-# Hugo allows theme composition (and inheritance). The precedence is from left to right.
-theme = ["docsy"]
 
 # Will give values to .Lastmod etc.
 enableGitInfo = true
@@ -135,6 +133,7 @@ sidebar_search_disable = false
 navbar_logo = false
 # Set to true to enablethe About link in the site footer
 footer_about_enable = true
+showLightDarkModeMenu = true
 
 # Adds a H2 section titled "Feedback" to the bottom of each doc. The responses are sent to Google Analytics as events.
 # This feature depends on [services.googleAnalytics] and will be disabled if "services.googleAnalytics.id" is not set.
@@ -196,6 +195,9 @@ no = 'Sorry to hear that. Please <a href="https://github.com/USERNAME/REPOSITORY
 [outputs]
 section = [ "HTML", "RSS", "print" ]
 [module]
+	[[module.imports]]
+	path = "github.com/google/docsy"
+
 #[[module.mounts]]
 #    source = 'data'
 #    target = 'data'

website/layouts/partials/FilterListsTable.html

@@ -137,9 +137,6 @@ <h1 class="modal-title fs-5" id="filtersSettingsModalLabel">{{ T "saveSettings"
                                     <a class="btn btn-primary mb-2r" href="{{ if findRE "AB|ABP|AG" .adblocker }}abp{{ else if findRE "uBO|NA" .adblocker }}ubo{{end}}:subscribe?location={{ .subscribe | replaceRE  "^https?://raw.githubusercontent.com" "https://cdn.statically.io/gh" }}&amp;title={{ trim .title "* " }}">
 										<i class="fas fa-file-import fa-fw"></i>Statically
 									</a>
-                                    <a class="btn btn-primary mb-2r" href="{{ if findRE "AB|ABP|AG" .adblocker }}abp{{ else if findRE "uBO|NA" .adblocker }}ubo{{end}}:subscribe?location={{ .subscribe | replaceRE  "^https?://raw.githubusercontent.com" "https://gitloaf.com/cdn" }}&amp;title={{ trim .title "* " }}">
-										<i class="fas fa-file-import fa-fw"></i>Gitloaf
-									</a>
 									{{ end }}
 									{{ if .mirror }}
 									{{ range $index, $mirrorURL := split $filterlist.mirrorURL ", " }}
@@ -171,9 +168,6 @@ <h1 class="modal-title fs-5" id="filtersSettingsModalLabel">{{ T "saveSettings"
                                     <a class="btn btn-outline-info mb-2r" href="{{ .subscribe | replaceRE  "^https?://raw.githubusercontent.com" "https://cdn.statically.io/gh" }}" target="_blank" rel="noopener">
 										<i class="fas fa-eye fa-fw"></i>Statically
 									</a>
-                                    <a class="btn btn-outline-info mb-2r" href="{{ .subscribe | replaceRE  "^https?://raw.githubusercontent.com" "https://gitloaf.com/cdn" }}" target="_blank" rel="noopener">
-										<i class="fas fa-eye fa-fw"></i>Gitloaf
-									</a>
 									{{ end }}
 									{{ if .mirror }}
 									{{ range $index, $mirrorURL := split $filterlist.mirrorURL ", " }}
@@ -205,9 +199,6 @@ <h1 class="modal-title fs-5" id="filtersSettingsModalLabel">{{ T "saveSettings"
                                     <a class="btn btn-outline-info mb-2r" href="{{. | replaceRE  "^https?://raw.githubusercontent.com" "https://cdn.statically.io/gh"}}" target="_blank" rel="noopener" title='{{ i18n "uBOPreviewTitle" }}'>
 										<i class="fas fa-eye fa-fw"></i>Statically
 									</a>
-                                    <a class="btn btn-outline-info mb-2r" href="{{. | replaceRE  "^https?://raw.githubusercontent.com" "https://gitloaf.com/cdn"}}" target="_blank" rel="noopener" title='{{ i18n "uBOPreviewTitle" }}'>
-										<i class="fas fa-eye fa-fw"></i>Gitloaf
-									</a>
 								</div>
 							</div>
 						</div>
@@ -229,9 +220,6 @@ <h1 class="modal-title fs-5" id="filtersSettingsModalLabel">{{ T "saveSettings"
                                     <a class="btn btn-outline-info mb-2r" href="{{. | replaceRE  "^https?://raw.githubusercontent.com" "https://cdn.statically.io"}}" target="_blank" rel="noopener" title='{{ i18n "AGPreviewTitle" }}'>
 										<i class="fas fa-eye fa-fw"></i>Statically
 									</a>
-                                    <a class="btn btn-outline-info mb-2r" href="{{. | replaceRE  "^https?://raw.githubusercontent.com" "https://gitloaf.com/cdn"}}" target="_blank" rel="noopener" title='{{ i18n "AGPreviewTitle" }}'>
-										<i class="fas fa-eye fa-fw"></i>Gitloaf
-									</a>
 								</div>
 							</div>
 						</div>
@@ -253,9 +241,6 @@ <h1 class="modal-title fs-5" id="filtersSettingsModalLabel">{{ T "saveSettings"
                                     <a class="btn btn-outline-info mb-2r" href="{{. | replaceRE  "^https?://raw.githubusercontent.com" "https://cdn.statically.io"}}" target="_blank" rel="noopener" title='{{ i18n "supplementPreviewTitle" }}'>
 										<i class="fas fa-eye fa-fw"></i>Statically
 									</a>
-                                    <a class="btn btn-outline-info mb-2r" href="{{. | replaceRE  "^https?://raw.githubusercontent.com" "https://gitloaf.com/cdn"}}" target="_blank" rel="noopener" title='{{ i18n "supplementPreviewTitle" }}'>
-										<i class="fas fa-eye fa-fw"></i>Gitloaf
-									</a>
 								</div>
 							</div>
 						</div>

website/layouts/partials/head.html

@@ -24,6 +24,6 @@
 {{ template "_internal/opengraph.html" . -}}
 {{ template "_internal/schema.html" . -}}
 {{ template "_internal/twitter_cards.html" . -}}
-{{ partialCached "head-css.html" . "asdf" -}}
+{{ partialCached "head-css.html" . "head-css-cache-key" -}}
 
 {{ partial "hooks/head-end.html" . -}}

website/layouts/partials/navbar.html

@@ -7,8 +7,8 @@
 -}}
 {{ $baseURL := urls.Parse $.Site.Params.Baseurl -}}
 
-<nav class="td-navbar navbar-dark js-navbar-scroll
-            {{- if $cover }} td-navbar-cover {{- end }}">
+<nav class="td-navbar js-navbar-scroll
+            {{- if $cover }} td-navbar-cover {{- end }}" data-bs-theme="dark">
 <div class="container-fluid flex-column flex-md-row">
   <div>
     <a class="navbar-brand" href="{{ .Site.Home.RelPermalink }}">
@@ -72,10 +72,10 @@
       <li class="nav-item">
         {{ partial "navbar-lang-selector.html" . -}}
       </li>
+      {{ end -}}
       <li class="nav-item">
         {{ partial "navbar-mode-switcher.html" . -}}
       </li>
-      {{ end -}}
     </ul>
   </div>
   <div class="d-none d-lg-block">

website/layouts/partials/sidebar-tree.html

@@ -33,7 +33,7 @@
     {{ $navRoot := cond (and (ne .Params.toc_root true) (eq .Site.Home.Type "docs")) .Site.Home .FirstSection -}}
     {{ $ulNr := 0 -}}
     {{ $ulShow := .Site.Params.ui.ul_show | default 1 -}}
-    {{ $sidebarMenuTruncate := .Site.Params.ui.sidebar_menu_truncate | default 50 -}}
+    {{ $sidebarMenuTruncate := .Site.Params.ui.sidebar_menu_truncate | default 100 -}}
     <ul class="td-sidebar-nav__section pe-md-3 ul-{{ $ulNr }}">
       {{ template "section-tree-nav-section" (dict "page" . "section" $navRoot "shouldDelayActive" $shouldDelayActive "sidebarMenuTruncate" $sidebarMenuTruncate "ulNr" $ulNr "ulShow" (add $ulShow 1)) }}
     </ul>
@@ -53,6 +53,11 @@
 {{ $mid := printf "m-%s" ($s.RelPermalink | anchorize) -}}
 {{ $pages_tmp := where (union $s.Pages $s.Sections).ByWeight ".Params.toc_hide" "!=" true -}}
 {{ $pages := $pages_tmp | first $sidebarMenuTruncate -}}
+{{ $truncatedEntryCount := sub (len $pages_tmp) $sidebarMenuTruncate -}}
+{{ if gt $truncatedEntryCount 0 -}}
+  {{ warnf "WARNING: %d sidebar entries have been truncated. To avoid this, increase `params.ui.sidebar_menu_truncate` to at least %d (from %d) in your config file. Section: %s"
+      $truncatedEntryCount (len $pages_tmp) $sidebarMenuTruncate  $s.Path -}}
+{{ end -}}
 {{ $withChild := gt (len $pages) 0 -}}
 {{ $manualLink := cond (isset $s.Params "manuallink") $s.Params.manualLink ( cond (isset $s.Params "manuallinkrelref") (relref $s $s.Params.manualLinkRelref) $s.RelPermalink) -}}
 {{ $manualLinkTitle := cond (isset $s.Params "manuallinktitle") $s.Params.manualLinkTitle $s.Title -}}
@@ -74,4 +79,4 @@
   </ul>
   {{- end }}
 </li>
-{{- end }}
+{{- end -}}