.build.yml

@@ -11,8 +11,7 @@ packages:
 sources:
   - https://git.sr.ht/~seirdy/seirdy.one
 secrets:
-  - cc1eb90c-b07b-4c46-86d4-58fec41cf0e4 # ssh key
+  - cc1eb90c-b07b-4c46-86d4-58fec41cf0e4
-  - b0bfa66e-3cf2-468f-9ea4-085819eccd18 # webmentiond key
 triggers:
   - action: email
     condition: always

.gitignore

@@ -18,4 +18,3 @@ public.eac
 # when i feel like it
 styles/
 .vale.ini
-.webmentiond-token

Makefile

@@ -24,9 +24,7 @@ csv/webrings.csv:
 
 .PHONY: hugo
 hugo: csv/webrings.csv $(SRCFILES)
-	sh scripts/get-token.sh
 	hugo -b $(HUGO_BASEURL) $(HUGO_FLAGS) -d $(OUTPUT_DIR)
-	rm .webmentiond-token
 	mv $(OUTPUT_DIR)/about/_index.gmi $(OUTPUT_DIR)/about/index.gmi
 
 # .hintrc-local for linting local files

content/about/_index.gmi

@@ -6,14 +6,6 @@ Online Handle: Seirdy
 
 I'm known as Rohan and as Seirdy. There are some differences between these personas, but the line between the two is blurry. It's fine to mix them up.
 
-This page lists my most relevant accounts. A more comprehensive list of my online accounts is available via WebFinger:
-
-=> https://seirdy.one/.well-known/webfinger?resource=acct%3Aseirdy%40seirdy.one WebFinger for acct:seirdy@seirdy.one
-
-Any currently-active public account not listed via WebFinger isn't actually me; please let me know if you find one.
-
-I've published a version of my OpenPGP key via Web Key Directory; this version has notations containing Ariadne identity proofs for a few more accounts of mine. You can verify those accounts on any Keyoxide instance using Web Key Directory. I hope to migrate identity proofs to something besides OpenPGP in the future.
-
 ## About this capsule
 
 This page's canonical location is on seirdy.one:
@@ -66,7 +58,7 @@ My handle is "Seirdy" on all the platforms I use:
 
 If you send me marketing emails or solicit guest posts, I will block you and submit you to third-party blocklists without warning.
 
-My username is Seirdy on Reddit, Hacker News, Lobsters, Tildes.net, Linux Weekly News, Codeberg, and a few other places. For IRC, my nick is Seirdy on Libera.chat, Snoonet, OFTC, Tilde.Chat, apionet, and a few smaller networks.
+My username is Seirdy on Reddit, Hacker News, Lobsters, Tildes.net, Linux Weekly News, Codeberg, and a few other places. For IRC, my nick is Seirdy on Libera.chat, Snoonet, OFTC, Tilde.Chat, apionet, and a few smaller networks. Some more profiles are available via Ariadne identity proofs; you can look me up on Keyoxide using Web Key Directory.
 
 My secondary Matrix account for Synapse-only rooms is @seirdy:fairydust.space. My Matrix account used to be @seirdy:envs.net but I've since migrated to my own Conduit server.
 

content/about/_index.md

@@ -11,10 +11,6 @@ stype: "https://schema.org/AboutPage https://schema.org/ProfilePage"
 
 I'm known as Rohan and as Seirdy. There are some differences between these personas, but the line between the two is blurry. It's fine to mix them up.
 
-This page lists my most relevant accounts. A more comprehensive list of my online accounts is available via WebFinger: [acct:seirdy@seirdy.one](https://seirdy.one/.well-known/webfinger?resource=acct%3Aseirdy%40seirdy.one). Any currently-active public account not listed via WebFinger isn't actually me; please let me know if you find one.
-
-I've published a version of my OpenPGP key via Web Key Directory; this version has notations containing Ariadne identity proofs for a few more accounts of mine. You can [verify those accounts on any Keyoxide instance](https://keyoxide.org/wkd/seirdy%40seirdy.one) (requires JavaScript). I hope to migrate identity proofs to something besides OpenPGP in the future.
-
 Rohan: meat­space persona {#Rohan}
 -----------------------------
 
@@ -108,6 +104,8 @@ I go by <span class="p-nickname nickname" itemprop="alternateName">Seirdy</span>
 
 If you send me marketing emails or solicit guest posts, I will block you and submit you to third-party blocklists without warning.
 
+I've published a version of my OpenPGP key via Web Key Directory; this version has notations containing Ariadne identity proofs for a few more accounts of mine. You can [verify those accounts on any Keyoxide instance](https://keyoxide.org/wkd/seirdy%40seirdy.one) (requires JavaScript).
+
 At least two platforms listed in the "Social (centralized)" category are not endorsed, and I'm trying to wind down my use of them. If you find a "Seirdy" somewhere else and don't know whether or not it's me, please contact me and ask instead of assuming that it must be me.
 
 I used to have the Matrix ID `@seirdy:envs.net`. I sometimes use `@seirdy:fairydust.space` for technical reasons (seirdy.one runs a Conduit server but certain features only work in Synapse rooms).

layouts/partials/webmentions.html

@@ -1,4 +1,5 @@
 {{- $wbmLinks := (slice "https://si3t.ch/log/2021-04-18-entetes-floc.html" "https://xmpp.org/2021/02/newsletter-02-feburary/" "https://gurlic.com/technology/post/393626430212145157" "https://gurlic.com/technology/post/343249858599059461" "https://www.librepunk.club/@penryn/108411423190214816" "https://benign.town/@josias/108457015755310198" "http://www.tuxmachines.org/node/148146" "https://i.reddit.com/r/web_design/comments/k0dmpj/an_opinionated_list_of_best_practices_for_textual/gdmxy4u/" "https://bbbhltz.space/posts/thoughts-on-tech-feb2021/" "https://jorts.horse/@alice/108477866954580532" "https://brid.gy/comment/mastodon/@Seirdy@pleroma.envs.net/AK7FeQ4h2tUCKNwlXc/AK7GtGkE7JOVgm1Cgi" "https://fosstodon.org/@werwolf/108529382741681838" "https://mastodon.social/@WahbAllat/108986614624476982" "https://linuxrocks.online/@friend/109029028283860044" "https://fosstodon.org/@fullstackthaumaturge/108765040526523487" "https://inhji.de/notes/an-opinionated-list-of-best-practices-for-textual-websites" "https://ravidwivedi.in/whatsapp/" "https://hackers.town/@theruran/108440680870400884" "https://hackers.town/@theruran/108440475936938471" "https://mckinley.cc/twtxt/2022-may-aug.html#2022-06-25T16:06:07-07:00" "https://tarnkappe.info/lesetipps-bayern-it-sicherheit-db-app-trackt-neue-eu-datenbank/" "https://catcatnya.com/@kescher/109221687024062842" "https://catcatnya.com/@kescher/109221707054861018" "https://catcatnya.com/@kescher/109221721385520640" "https://catcatnya.com/@kescher/109221750082044200" "https://brid.gy/post/twitter/seirdy/1536747178877673475" "https://markesler.com/blog/website-design/" "https://catcatnya.com/@kescher/108601418196537980" "https://chaos.social/@n0toose/109035270210401105" "https://nicfab.it/en/posts/aware-digital-communication-respecting-privacy-and-the-apps-or-services-you-choose/" "https://haxf4rall.com/2022/09/23/a-collection-of-articles-about-hardening-linux/" "https://mastodon.randomroad.social/@dctrud/108680634691924661" "https://brid.gy/post/twitter/seirdy/1535891978969174016" "https://mastodon.technology/@codeberg/108403449317373462" "https://harveyr.net/posts/14kb/" "https://brid.gy/comment/mastodon/@Seirdy@pleroma.envs.net/ANUjukccjwEmivz3ia/ANUmmjSDUviUeCz42S") -}}
+{{- $archivetodayLinks := (slice "https://example.com") -}}
 {{- $rewritesDict := dict "" "" -}}
 {{- range $i, $r := (getCSV "," "/csv/rewrites.csv") -}}
 	{{- $rewritesDict = merge $rewritesDict (dict (index $r 0) (index $r 1)) -}}
@@ -6,33 +7,21 @@
 <h3 id="webmentions" tabindex="-1">Web&#173;mentions</h3>
 <p>This site supports <a href="https://indieweb.org/webmention">Webmentions</a>, a backlink-based alternative to traditional comment forms.</p>
 {{ partial "webmention-form.html" . }}
-{{- /* Fetch all webmentions with bearer token */ -}}
+{{- $target := .RelPermalink | replaceRE "^/~seirdy/" "/" }}
-	{{ $bearer_token := "" }}
+{{ $url1 := printf "https://seirdy.one/webmentions/get?status=approved&target=https://seirdy.one%s" $target -}}
-	{{- with readFile ".webmentiond-token" -}}
+{{ $webmentions := (getJSON $url1) -}}
-		{{- $auth := printf "Bearer %s" . -}}
+{{- if lt .Date.Unix 1653616670 -}}{{- /* commit c84c8d4 changed my URL schemes, so fetch menchies for the legacy scheme on old posts. */ -}}
-		{{- $bearer_token = dict "Authorization" $auth -}}
+	{{- $oldTarget := $target | replaceRE "/posts" "" | replaceRE "/$" ".html" -}}
-	{{- end -}}
+	{{- $url2 := printf "https://seirdy.one/webmentions/get?status=approved&target=https://seirdy.one%s" $oldTarget -}}
-	{{- $mentionsURL := "https://seirdy.one/webmentions/manage/mentions?limit=9999&status=approved" -}}
+	{{- $webmentions = $webmentions | append (getJSON $url2) -}}
-	{{- $allMentions := (getJSON $mentionsURL $bearer_token).items -}}
+{{- end -}}
-{{- /* Filter webmentions to just the ones for the current targets */ -}}
+{{- if gt (len $webmentions) 0 -}}
-	{{- $canonicalRelPermalink := .RelPermalink | replaceRE "^/~seirdy/" "/" -}}
-	{{- $target := printf "%s%s" .Site.Params.CanonicalBaseURL $canonicalRelPermalink -}}
-	{{- $targets := (slice $target) -}}
-	{{- /* commit c84c8d4 changed my URL schemes, so fetch menchies for the legacy scheme on old posts. */ -}}
-	{{- if lt .Date.Unix 1653616670 -}}
-		{{- $oldTarget := $target | replaceRE "/posts" "" | replaceRE "/$" ".html" -}}
-		{{ $targets = (slice $target $oldTarget) }}
-	{{- end -}}
-	{{- $webmentions := where $allMentions "target" "in" $targets -}}
-{{- /* Render webmentions if they exist */ -}}
-{{- $count := (len $webmentions) -}}
-{{- if gt $count 0 -}}
 <p>Webmentions received for this post appear in the following list after I approve them. I sometimes send Webmentions to myself on behalf of linking sites that don’t support them. I auto-replace broken links with <a href="https://web.archive.org/">Wayback Machine</a> snapshots, if they exist.</p>
 <details>
-	<summary>Toggle {{ $count }} Webmentions</summary>
+	<summary>Toggle Webmentions</summary>
 	<dl>
 		{{ range sort $webmentions "created_at" -}}
-			{{ $webmention := . -}}
+		{{ $webmention := . -}}
 			{{- /* Boolean: should we should handle this webmention like a comment or a linkback? */ -}}
 			{{- $hasContent := and (isset $webmention "content") (gt (countrunes $webmention.content) 50) -}}
 			{{- $title := $webmention.title -}}
@@ -53,6 +42,8 @@
 			{{- end -}}
 			{{- if in $wbmLinks $src -}}
 				{{- $src = printf "https://web.archive.org/web/0/%s" $src -}}
+			{{- else if in $archivetodayLinks $src -}}
+				{{- $src = printf "https://archive.today/oldest/%s" $src -}}
 			{{- end -}}
 			{{ if (eq $webmention.type "like") -}}
 			<div itemprop="potentialAction" itemscope="" itemtype="https://schema.org/LikeAction" class="u-like h-cite">

scripts/get-token.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# Script to authenticate with webmentiond and grab a temporary generated
-# bearer token, writing it to .webmentiond-token for Hugo to then read.
-
-set -e
-
-_key() {
-	if [ -n "$BUILD_SUBMITTER" ]; then
-		cat ~/.webmentiond-key
-	else
-		pash show webmentiond-ci-key
-	fi
-}
-
-key="$(_key)"
-
-set -u 
-
-# just a lil curl wrapper I use on seirdy.one
-ccurl() {
-	curl --proto "=https" --proto-default https --tlsv1.3 --cert-status --compressed $*
-}
-
-_token() {
-	ccurl -sX POST https://seirdy.one/webmentions/authenticate/access-key -d "key=$key"
-}
-
-token="$(_token)"
-
-set +u
-printf '%s' "$token" >.webmentiond-token

static/webfinger.json

@@ -141,16 +141,6 @@
 			"href": "https://gitlab.gnome.org/Seirdy",
 			"type": "text/html"
 		},
-		{
-			"rel": "http://webfinger.net/rel/profile-page",
-			"href": "https://launchpad.net/~seirdy",
-			"type": "text/html"
-		},
-		{
-			"rel": "http://webfinger.net/rel/profile-page",
-			"href": "https://pypi.org/user/Seirdy",
-			"type": "text/html"
-		},
 		{
 			"rel": "http://webfinger.net/rel/profile-page",
 			"href": "https://bugzilla.mozilla.org/user_profile?user_id=683392",
@@ -161,21 +151,11 @@
 			"href": "https://en.wikipedia.org/wiki/User:Seirdy",
 			"type": "text/html"
 		},
-		{
-			"rel": "http://webfinger.net/rel/profile-page",
-			"href": "https://linuxreviews.org/User:Seirdy",
-			"type": "text/html"
-		},
 		{
 			"rel": "http://webfinger.net/rel/profile-page",
 			"href": "https://tinygem.org/Seirdy/",
 			"type": "text/html"
 		},
-		{
-			"rel": "http://webfinger.net/rel/profile-page",
-			"href": "https://getpocket.com/@2bzd3p90T15aMg2cU9A11cqAn9g8T9aK1aNTX0m75fuVH5W901d76Zh9S2eKH41c",
-			"type": "text/html"
-		},
 		{
 			"rel": "http://webfinger.net/rel/profile-page",
 			"href": "https://archive.org/details/@seirdy",