Replace @std/html with html-entities package

- Remove @std/html dependency from deno.json
- Add html-entities npm package
- Replace escape() with encode() for HTML entity encoding
- Replace unescape() with decode() for HTML entity decoding
- Update imports across message-impl.ts, pages.tsx, session-impl.ts, and text.ts
- Update test expectations for HTML entity encoding changes

Author: dahlia

deno.json

@@ -25,9 +25,9 @@
     "@logtape/logtape": "jsr:@logtape/logtape@^1.0.0",
     "@phensley/language-tag": "npm:@phensley/language-tag@^1.12.2",
     "@std/assert": "jsr:@std/assert@^1.0.12",
-    "@std/html": "jsr:@std/html@^1.0.3",
     "@std/media-types": "jsr:@std/media-types@^1.1.0",
     "hono": "jsr:@hono/hono@^4.8.2",
+    "html-entities": "npm:html-entities@^2.6.0",
     "markdown-it": "npm:markdown-it@^14.1.0",
     "uuid": "npm:uuid@^11.1.0",
     "xss": "npm:xss@^1.0.15"

src/message-impl.ts

@@ -38,8 +38,8 @@ import {
   Update,
 } from "@fedify/fedify/vocab";
 import type { LanguageTag } from "@phensley/language-tag";
-import { unescape } from "@std/html/entities";
 import { parseMediaType } from "@std/media-types/parse-media-type";
+import { decode } from "html-entities";
 import { v7 as uuidv7 } from "uuid";
 import { FilterXSS, getDefaultWhiteList } from "xss";
 import type { DeferredCustomEmoji, Emoji } from "./emoji.ts";
@@ -425,7 +425,7 @@ export class AuthorizedMessageImpl<T extends MessageClass, TContextData>
         const objects = await Promise.all(promises);
         mentionedActors = objects.filter(isActor);
         this.html = contentHtml;
-        this.text = unescape(textXss.process(contentHtml));
+        this.text = decode(textXss.process(contentHtml));
         existingMentions = this.mentions;
         this.mentions = mentionedActors;
         this.hashtags = hashtags;
@@ -738,7 +738,7 @@ export async function createMessage<T extends MessageClass, TContextData>(
     language: raw.content instanceof LanguageString
       ? raw.content.language
       : undefined,
-    text: unescape(text),
+    text: decode(text),
     html,
     replyTarget,
     quoteTarget,

src/pages.tsx

@@ -26,8 +26,8 @@ import {
   type Object,
   PUBLIC_COLLECTION,
 } from "@fedify/fedify/vocab";
-import { unescape } from "@std/html/entities";
 import { Hono } from "hono";
+import { decode } from "html-entities";
 import type { BotImpl } from "./bot-impl.ts";
 import { Layout } from "./components/Layout.tsx";
 import { Message } from "./components/Message.tsx";
@@ -267,7 +267,7 @@ app.get("/message/:id", async (c) => {
   if (title == null) {
     title = message.summary ?? message.content;
     if (title != null) {
-      title = unescape(textXss.process(title.toString()));
+      title = decode(textXss.process(title.toString()));
     }
   }
   return c.html(
@@ -349,7 +349,7 @@ app.get("/feed.xml", async (c) => {
         if (title == null) {
           title = post.summary ?? post.content;
           if (title != null) {
-            title = unescape(textXss.process(title.toString()));
+            title = decode(textXss.process(title.toString()));
           }
         }
         return (

src/session-impl.ts

@@ -26,7 +26,7 @@ import {
 } from "@fedify/fedify";
 import { Follow, Link, Undo } from "@fedify/fedify/vocab";
 import { getLogger } from "@logtape/logtape";
-import { escape } from "@std/html/entities";
+import { encode } from "html-entities";
 import { v7 as uuidv7 } from "uuid";
 import type { BotImpl } from "./bot-impl.ts";
 import { createMessage, isMessageObject } from "./message-impl.ts";
@@ -231,8 +231,8 @@ export class SessionImpl<TContextData> implements Session<TContextData> {
       let url = options.quoteTarget.raw.url ?? options.quoteTarget.id;
       if (url instanceof Link) url = url.href ?? options.quoteTarget.id;
       contentHtml += `\n\n<p class="quote-inline"><br>RE: <a href="${
-        escape(url.href)
-      }">${escape(url.href)}</a></p>`;
+        encode(url.href)
+      }">${encode(url.href)}</a></p>`;
       tags.push(
         new Link({
           mediaType:

src/text.test.ts

@@ -258,7 +258,7 @@ Deno.test({
     )}.`;
     assertEquals(
       (await Array.fromAsync(t7.getHtml(session))).join(""),
-      '<p>Here&#39;s a link: <a href="https://fedify.dev/" target="_blank">' +
+      '<p>Here&apos;s a link: <a href="https://fedify.dev/" target="_blank">' +
         "https://fedify.dev/</a>.</p>",
     );
     assertEquals(await Array.fromAsync(t7.getTags(session)), []);
@@ -269,7 +269,7 @@ Deno.test({
 ${"First line.\nSecond line."}`;
     assertEquals(
       (await Array.fromAsync(t8.getHtml(session))).join(""),
-      "<p>Here&#39;s a multiline text:</p><p>First line.<br>Second line.</p>",
+      "<p>Here&apos;s a multiline text:</p><p>First line.<br>Second line.</p>",
     );
     assertEquals(await Array.fromAsync(t8.getTags(session)), []);
     assertEquals(t8.getCachedObjects(), []);
@@ -742,3 +742,5 @@ Deno.test("customEmoji()", async () => {
   // Test getCachedObjects()
   assertEquals(t.getCachedObjects(), []); // TemplatedText itself doesn't cache, relies on children
 });
+
+// cSpell: ignore apos

src/text.ts

@@ -28,7 +28,7 @@ import {
   mention as mentionPlugin,
   toFullHandle,
 } from "@fedify/markdown-it-mention";
-import { escape } from "@std/html/entities";
+import { encode } from "html-entities";
 import MarkdownIt from "markdown-it";
 import type { DeferredCustomEmoji } from "./emoji.ts";
 import type { Session } from "./session.ts";
@@ -153,7 +153,7 @@ export class TemplatedText<TContextData>
             paraState = "opened";
           }
           if (l > 0) yield "<br>";
-          yield escape(line);
+          yield encode(line);
           l++;
         }
         p++;
@@ -241,7 +241,7 @@ export class PlainText<TContextData> implements Text<"inline", TContextData> {
     let first = true;
     for (const line of this.text.split("\n")) {
       if (!first) yield "<br>";
-      yield escape(line);
+      yield encode(line);
       first = false;
     }
   }
@@ -325,18 +325,18 @@ export class MentionText<TContextData> implements Text<"inline", TContextData> {
       ? actor.url.href
       : actor.url;
     if (url == null) {
-      yield escape(label);
+      yield encode(label);
       return;
     }
     yield '<a href="';
-    yield escape(url.href);
+    yield encode(url.href);
     yield '" translate="no" class="h-card u-url mention" target="_blank">';
     if (label.startsWith("@")) {
       yield "@<span>";
-      yield escape(label.substring(1));
+      yield encode(label.substring(1));
       yield "</span>";
     } else {
-      yield escape(label);
+      yield encode(label);
     }
     yield "</a>";
   }
@@ -472,9 +472,9 @@ export class HashtagText<TContextData> implements Text<"inline", TContextData> {
 
   async *getHtml(session: Session<TContextData>): AsyncIterable<string> {
     yield '<a href="';
-    yield escape(session.context.origin);
+    yield encode(session.context.origin);
     yield "/tags/";
-    yield escape(encodeURIComponent(this.#tag.toLowerCase()));
+    yield encode(encodeURIComponent(this.#tag.toLowerCase()));
     yield '" class="mention hashtag" rel="tag" target="_blank">#<span>';
     yield this.#tag;
     yield "</span></a>";
@@ -620,7 +620,7 @@ export class LinkText<TContextData> implements Text<"inline", TContextData> {
 
   async *getHtml(session: Session<TContextData>): AsyncIterable<string> {
     yield '<a href="';
-    yield escape(this.#href.href);
+    yield encode(this.#href.href);
     yield '" target="_blank">';
     yield* this.#label.getHtml(session);
     yield "</a>";
@@ -749,7 +749,7 @@ export class CustomEmojiText<TContextData>
     const emoji = this.getEmoji(session);
     if (emoji.name == null) return;
     yield "\u200b"; // zero-width space for segmentation
-    yield escape(emoji.name.toString());
+    yield encode(emoji.name.toString());
     yield "\u200b";
   }