Merge branch 'main' into 61-search-for-pronounspage-link-in-all-fields

src/content_scripts/protoots.js

@@ -215,7 +215,7 @@ async function addProplate(element) {
 			return;
 		}
 		proplate.innerText = pronouns;
-		//TODO?: alt text
+		proplate.title = pronouns;
 		proplate.classList.add("protoots-proplate");
 		if (contributorList.includes(accountName)) {
 			//i think you can figure out what this does on your own

src/libs/domhelpers.js

@@ -85,3 +85,26 @@ export function insertAfter(insertion, target) {
 	//docs: https://developer.mozilla.org/en-US/docs/Web/API/Node/insertBefore#example_2
 	target.parentElement.insertBefore(insertion, target.nextSibling);
 }
+
+/**
+ * Turns HTML text into human-readable text
+ * @param {string} input HTML Text
+ * @returns {string}
+ */
+export function htmlDecode(input) {
+	if (typeof window === "undefined" || !window.DOMParser) {
+		const replacements = {
+			"&": "&",
+			""": '"',
+			"&lt;": "<",
+			"&gt;": ">",
+			"&nbsp;": "",
+		};
+		for (const [html, text] of Object.entries(replacements)) input = input.replaceAll(html, text);
+
+		return input;
+	}
+
+	const doc = new DOMParser().parseFromString(input, "text/html");
+	return doc.documentElement.textContent;
+}

src/libs/pronouns.js

@@ -1,5 +1,6 @@
 import sanitizeHtml from "sanitize-html";
 import { allKnownPronouns } from "./generated/pronouns/index.js";
+import { htmlDecode } from "./domhelpers.js";
 
 const fieldMatchers = [/\bpro.*nouns?\b/i, /\bpronomen\b/i, /(i )?go(es)? by/i];
 const knownPronounUrls = [
@@ -211,9 +212,12 @@ function sanitizePronouns(str) {
 	// Remove trailing characters that are used as separators.
 	str = str.replace(/[-| :/]+$/, "");
 
-	// Finally, remove leading and trailing whitespace.
+	// Remove leading and trailing whitespace.
 	str = str.trim();
 
+	//Finally, turn escaped characters (e.g. &,>) back into their original form
+	str = htmlDecode(str);
+
 	// If the result is empty, return null, otherwise the empty string.
 	return str === "" ? null : str;
 }

src/styles/proplate.css

@@ -4,7 +4,6 @@
 	border-radius: 0.25rem;
 	margin-left: 0.5rem;
 	display: inline-flex;
-	text-transform: lowercase;
 	animation: proplate-fadein 0.15s linear;
 	font-weight: 500;