ad.html: make manipulation a link as it not being a link bothers me

_includes/ad.html: improve formatting a bit more again
ad.html: attempt to improve formatting
2025-08-19 11:27:24 +02:00 · 2024-05-20 21:41:34 +03:00 · 2024-05-20 21:36:45 +03:00 · 2024-05-20 21:32:15 +03:00 · 2024-05-20 21:30:37 +03:00 · 2024-05-20 21:23:10 +03:00
14 changed files with 133 additions and 10 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -12,12 +12,15 @@
 *.{md,markdown} diff=markdown

 # These don't feel like mine
-.github/** text=auto -linguist-detectable
-css/** text=auto -linguist-detectable
-_data/** text=auto -linguist-detectable
-_includes/** text=auto -linguist-detectable
-_layouts/** text=auto -linguist-detectable
-_sass/** text=auto -linguist-detectable
+.github/** text=auto -linguist-detectable linguist-vendored
+css/** text=auto -linguist-detectable linguist-vendored
+_data/** text=auto -linguist-detectable linguist-vendored
+_includes/** text=auto -linguist-detectable linguist-vendored
+_layouts/** text=auto -linguist-detectable linguist-vendored
+_sass/** text=auto -linguist-detectable linguist-vendored
+# automagic
+package.json text -linguist-detectable linguist-vendored
+pnpm-lock.yaml -linguist-detectable linguist-vendored

 # Unnecessary for statistics
 Gemfile text linguist-vendored
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -26,6 +26,15 @@ updates:
      interval: "daily"
      timezone: "Europe/Helsinki"
    groups:
-      github-actions:
+      gitsubmodule:
+        patterns:
+          - "*"
+
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    groups:
+      npm:
        patterns:
          - "*"
--- a/.gitignore
+++ b/.gitignore
@ -9,3 +9,4 @@ keys.txt.asc
 .jekyll-cache
 .jekyll-metadata
 vendor/
+node_modules/
--- a/.prettierrc
+++ b/.prettierrc
--- a/_includes/ad.html
+++ b/_includes/ad.html
@ -0,0 +1,23 @@
+<detect-missing-adblocker>
+<hr/>
+<span slot="title"><p>Dear reader, you may be missing a content blocker!
+        🙀</p></span>
+  <span slot="message">
+          <p>Please consider installing one to protect yourself, and your close ones,
+  from <a
+                       href="https://www.wired.com/story/why-dont-we-just-ban-targeted-advertising/">manipulation</a> and <a
+          href="https://en.m.wikipedia.org/wiki/Malvertising">targeted
+          malvertising</a>!</p>
+          <p>Personally I love <a href="https://privacybadger.org">Privacy Badger</a> and
+  <a href="https://github.com/gorhill/uBlock/blob/master/README.md">uBlock Origin</a>
+  with
+  (<a href="https://www.eff.org/files/effdntlist.txt">EFF DNT Policy Allowlist</a>)
+  although Android users may be better served by <a href="https://f-droid.org/packages/com.celzero.bravedns">Rethink</a> while
+  for iOS there is <a
+                                   href="https://adguard.com/adguard-ios/overview.html">AdGuard</a>.</p>
+  <p><a
+          href="https://en.m.wikipedia.org/wiki/Targeted_advertising#Disadvantages">Learn
+          more about targeted advertising!</a>
+  </span>
+<hr/>
+</detect-missing-adblocker>
--- a/_includes/head.html
+++ b/_includes/head.html
@ -30,4 +30,8 @@
 <!-- https://indieweb.org/How_to_set_up_web_sign-in_on_your_own_domain#How_to_setup_RelMeAuth - regardless of antipattern, the things I do for verified checkboxes at Mastodon... -->
 <link rel="me" type="application/activity+json" href="https://sauna.social/users/aminda" />
 <link rel="me" type="application/activity+json" href="https://mastodon.pirateparty.be/users/MikaelaPPFI" />
+
+ <!-- https://github.com/macdonst/detect-missing-adblocker -->
+ <script type="module" src="https://unpkg.com/detect-missing-adblocker@latest/dist/detect-missing-adblocker.js?module=true"></script>
+ <link rel="stylesheet" href="https://unpkg.com/detect-missing-adblocker@latest/nativeads.js.css">
 </head>
--- a/_layouts/default.html
+++ b/_layouts/default.html
@ -9,6 +9,6 @@
      <div class="wrapper">{{ content }}</div>
    </div>

-    {% include footer.html %}
+    {% include footer.html %} {% include ad.html %}
  </body>
 </html>
--- a/_layouts/index.html
+++ b/_layouts/index.html
@ -8,5 +8,6 @@
    <div class="page-content">
      <div class="wrapper">{{ content }}</div>
    </div>
+    {% include ad.html %}
  </body>
 </html>
--- a/_layouts/mini.html
+++ b/_layouts/mini.html
@ -4,4 +4,5 @@
  <body>
    {{ content }}
  </body>
+  {% include ad.html %}
 </html>
--- a/_layouts/page.html
+++ b/_layouts/page.html
@ -6,6 +6,7 @@ layout: default
  <header class="post-header">
    <h1 class="post-title">{{ page.title }}</h1>
  </header>
-
  <article class="post-content">{{ content }}</article>
 </div>
+
+{% include ad.html %}
--- a/_layouts/post.html
+++ b/_layouts/post.html
@ -21,9 +21,10 @@ tags_content_temp %} {% endif %} {% endfor %} {% else %} {% assign tags_content
      }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}
    </p>
  </header>
-
  <article class="post-content">
    {{ content }}
    <p id="post-meta">{{ tags_content }}</p>
  </article>
 </div>
+
+{% include ad.html %}
--- a/package.json
+++ b/package.json
@ -0,0 +1,6 @@
+{
+  "devDependencies": {
+    "@prettier/plugin-xml": "3.4.1",
+    "prettier": "3.2.5"
+  }
+}
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -0,0 +1,68 @@
+lockfileVersion: "9.0"
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
+importers:
+  .:
+    devDependencies:
+      "@prettier/plugin-xml":
+        specifier: 3.4.1
+        version: 3.4.1(prettier@3.2.5)
+      prettier:
+        specifier: 3.2.5
+        version: 3.2.5
+
+packages:
+  "@prettier/plugin-xml@3.4.1":
+    resolution:
+      {
+        integrity: sha512-Uf/6/+9ez6z/IvZErgobZ2G9n1ybxF5BhCd7eMcKqfoWuOzzNUxBipNo3QAP8kRC1VD18TIo84no7LhqtyDcTg==,
+      }
+    peerDependencies:
+      prettier: ^3.0.0
+
+  "@xml-tools/parser@1.0.11":
+    resolution:
+      {
+        integrity: sha512-aKqQ077XnR+oQtHJlrAflaZaL7qZsulWc/i/ZEooar5JiWj1eLt0+Wg28cpa+XLney107wXqneC+oG1IZvxkTA==,
+      }
+
+  chevrotain@7.1.1:
+    resolution:
+      {
+        integrity: sha512-wy3mC1x4ye+O+QkEinVJkPf5u2vsrDIYW9G7ZuwFl6v/Yu0LwUuT2POsb+NUWApebyxfkQq6+yDfRExbnI5rcw==,
+      }
+
+  prettier@3.2.5:
+    resolution:
+      {
+        integrity: sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==,
+      }
+    engines: { node: ">=14" }
+    hasBin: true
+
+  regexp-to-ast@0.5.0:
+    resolution:
+      {
+        integrity: sha512-tlbJqcMHnPKI9zSrystikWKwHkBqu2a/Sgw01h3zFjvYrMxEDYHzzoMZnUrbIfpTFEsoRnnviOXNCzFiSc54Qw==,
+      }
+
+snapshots:
+  "@prettier/plugin-xml@3.4.1(prettier@3.2.5)":
+    dependencies:
+      "@xml-tools/parser": 1.0.11
+      prettier: 3.2.5
+
+  "@xml-tools/parser@1.0.11":
+    dependencies:
+      chevrotain: 7.1.1
+
+  chevrotain@7.1.1:
+    dependencies:
+      regexp-to-ast: 0.5.0
+
+  prettier@3.2.5: {}
+
+  regexp-to-ast@0.5.0: {}
--- a/r/dnt.md
+++ b/r/dnt.md
@ -0,0 +1,5 @@
+---
+redirect_to: https://www.eff.org/files/effdntlist.txt
+permalink: /r/dnt.html
+sitemap: false
+---
Author	SHA1	Message	Date
Aminda Suomalainen	730d011930	ad.html: make manipulation a link as it not being a link bothers me	2024-05-20 21:41:34 +03:00
Aminda Suomalainen	76a141af0d	_includes/ad.html: improve formatting a bit more again	2024-05-20 21:36:45 +03:00
Aminda Suomalainen	3aab8fd21e	ad.html: attempt to improve formatting	2024-05-20 21:32:15 +03:00
Aminda Suomalainen	de5140a96e	Let's have the footer come before the adblocker notice	2024-05-20 21:30:37 +03:00
Aminda Suomalainen	68f0c2d5a8	try having the ad.html in the bottom after the actual content	2024-05-20 21:23:10 +03:00
Aminda Suomalainen	c8c0e23fdb	r/dnt.md: link to EFF dnt allowlist	2024-05-20 18:57:47 +03:00
Aminda Suomalainen	68afd67709	So much to do, so little time	2024-05-20 18:57:09 +03:00
Aminda Suomalainen	25d815f657	_layouts: remove broken ad includes for now	2024-05-20 18:50:53 +03:00
Aminda Suomalainen	f7c7da28a8	it's supposed to be within content	2024-05-20 18:47:49 +03:00
Aminda Suomalainen	efe6992054	attempt to fix adblock detection	2024-05-20 18:42:08 +03:00
Aminda Suomalainen	fbb37bdf4d	fix prettier adding	2024-05-20 18:31:15 +03:00
Aminda Suomalainen	ee5d6e3749	attempt to add detect-missing-adblocker	2024-05-20 18:12:38 +03:00
Aminda Suomalainen	79af07c282	explicitly add prettier	2024-05-20 17:58:09 +03:00