From a4f5f797b690c40029c196be4ea22e61da34b4c6 Mon Sep 17 00:00:00 2001
From: Rohan Kumar <seirdy@seirdy.one>
Date: Thu, 30 Jun 2022 08:35:05 -0700
Subject: [PATCH] Fix authorship metadata

---
 layouts/partials/reply-context.html | 10 +++++++++-
 layouts/partials/webmentions.html   |  5 +++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/layouts/partials/reply-context.html b/layouts/partials/reply-context.html
index 8e24bf0..58c8e53 100644
--- a/layouts/partials/reply-context.html
+++ b/layouts/partials/reply-context.html
@@ -2,12 +2,20 @@
 {{- with .replyType -}}
 	{{- $schemaType = . -}}
 {{- end -}}
+{{- $replyAuthorType := "Person" -}}
+{{- with .replyAuthorType -}}
+	{{- $replyAuthorType = . -}}
+{{- end -}}
+{{- $replyAuthorRel := "author" -}}
+{{- if eq $replyAuthorType "Organization" -}}
+	{{- $replyAuthorRel = "publisher" -}}
+{{- end -}}
 <aside role="note">
 	Reply to <span class="h-cite in-reply-to" itemprop="about" itemscope="" itemtype="https://schema.org/{{ $schemaType }}">
 		<cite itemprop="name" class="p-name">
 			<a class="u-url" itemprop="url" href="{{ .replyURI }}">{{ .replyTitle | safeHTML}}</a>
 		</cite> by
-		<span itemprop="author" itemscope="" itemtype="https://schema.org/Person" class="h-card vcard p-author">
+		<span itemprop="{{ $replyAuthorRel }}" itemscope="" itemtype="https://schema.org/{{ $replyAuthorType }}" class="h-card vcard p-author">
 			<a itemprop="url" href="{{ .replyAuthorURI }}" class="u-url url">
 				<span itemprop="name" class="p-name fn n">{{ .replyAuthor }}</span></a>
 		</span>
diff --git a/layouts/partials/webmentions.html b/layouts/partials/webmentions.html
index 945b9d6..4787e19 100644
--- a/layouts/partials/webmentions.html
+++ b/layouts/partials/webmentions.html
@@ -19,8 +19,9 @@
 					{{- $hasContent := and (isset $webmention "content") (gt (countrunes $webmention.content) 50) -}}
 					{{- $title := $webmention.title -}}
 					{{- /* Remove extraneous crap from Fediverse webmentions */ -}}
-					{{- if findRE "@Seirdy@pleroma.envs.net" $webmention.title -}}
-						{{- $title = $title | replaceRE `@Seirdy@pleroma.envs.net(\n| )?` "" -}}
+					{{- if findRE "@Seirdy" $webmention.title -}}
+						{{- $title = $title | replaceRE `^@Seirdy@pleroma.envs.net(\n| )?` "" -}}
+						{{- /* Mastodon webmentions may include the author in the title followed by a colon; this is redundant. */ -}}
 						{{- if and (isset $webmention "author_name") (findRE `@` $webmention.source) (not (findRE "^https://bridg.gy" $webmention.source)) -}}
 							{{ $title = $title | replaceRE `^[^:]{0,20}: ?` "" }}
 						{{- end -}}