diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b9f0555..24214259 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: denoland/deno:2.2.2 +image: denoland/deno:2.3.1 default: interruptible: true diff --git a/.tool-versions b/.tool-versions index 9cafcaae..1ba63f17 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -deno 2.2.2 \ No newline at end of file +deno 2.3.1 diff --git a/packages/ditto/utils/note.ts b/packages/ditto/utils/note.ts index 7b1405ff..e56f271d 100644 --- a/packages/ditto/utils/note.ts +++ b/packages/ditto/utils/note.ts @@ -28,7 +28,9 @@ export function contentToHtml(content: string, mentions: MastodonMention[], opts hashtag: ({ content }) => { const tag = content.replace(/^#/, ''); const href = conf.local(`/tags/${tag}`); - return html`#${tag}`; + return html` + #${tag} + `; }, url: ({ attributes, content }) => { try { @@ -47,7 +49,10 @@ export function contentToHtml(content: string, mentions: MastodonMention[], opts const acct = mention?.acct ?? npub; const name = mention?.acct ?? npub.substring(0, 8); const href = mention?.url ?? conf.local(`/@${acct}`); - return html`@${name}${extra}`; + return html` + @${name}${extra} + `; } else { return ''; } diff --git a/packages/ditto/views/meta.ts b/packages/ditto/views/meta.ts index 3205237b..1f1707ff 100644 --- a/packages/ditto/views/meta.ts +++ b/packages/ditto/views/meta.ts @@ -21,34 +21,58 @@ export function renderMetadata(url: string, { account, status, instance }: Metad const height = attachment?.meta?.original?.height; if (title) { - tags.push(html`