From 31364c1b63253d114ccdfdac54ac447c1332f632 Mon Sep 17 00:00:00 2001
From: Ayo Ayco <ramon.aycojr@gmail.com>
Date: Mon, 28 Jul 2025 12:35:11 +0200
Subject: [PATCH 1/3] fix: error accessing thumbnail when instance is not
 defined (#3342)

---
 app/pages/[[server]]/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/pages/[[server]]/index.vue b/app/pages/[[server]]/index.vue
index 3f16bbdd..35ff0e3a 100644
--- a/app/pages/[[server]]/index.vue
+++ b/app/pages/[[server]]/index.vue
@@ -10,6 +10,6 @@ catch (err) {
 
 <template>
   <MainContent text-base grid gap-3 m3>
-    <img rounded-3 :src="instance.thumbnail.url">
+    <img v-if="instance !== undefined" rounded-3 :src="instance.thumbnail.url">
   </MainContent>
 </template>

From e8e2192e751ab13a6f8692f4589b47444919c8ef Mon Sep 17 00:00:00 2001
From: Simon Ramsay <nexus-uw@users.noreply.github.com>
Date: Mon, 28 Jul 2025 17:02:18 -0700
Subject: [PATCH 2/3] feat: pass origin as website when loging into server
 (#3299)

---
 server/utils/shared.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/utils/shared.ts b/server/utils/shared.ts
index 81e0f331..35ef064b 100644
--- a/server/utils/shared.ts
+++ b/server/utils/shared.ts
@@ -60,7 +60,7 @@ async function fetchAppInfo(origin: string, server: string) {
       },
       body: {
         client_name: APP_NAME + (env !== 'release' ? ` (${env})` : ''),
-        website: 'https://elk.zone',
+        website: origin,
         redirect_uris: getRedirectURI(origin, server),
         scopes: 'read write follow push',
       },

From da26c38e59cf665c3d64ec6430a7e9f8882692bd Mon Sep 17 00:00:00 2001
From: nove-b <nove.b.web@gmail.com>
Date: Tue, 29 Jul 2025 17:20:09 +0900
Subject: [PATCH 3/3] fix(ui): Asterisk pairs are removed in code block (#3326)

Co-authored-by: TAKAHASHI Shuuji <shuuji3@gmail.com>
---
 app/composables/content-parse.ts                   |  3 ++-
 tests/nuxt/__snapshots__/content-rich.test.ts.snap |  7 +++++++
 tests/nuxt/content-rich.test.ts                    | 10 ++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/composables/content-parse.ts b/app/composables/content-parse.ts
index 3f749e74..f73be5ba 100644
--- a/app/composables/content-parse.ts
+++ b/app/composables/content-parse.ts
@@ -104,11 +104,12 @@ export function parseMastodonHTML(
           .replace(/</g, '&lt;')
           .replace(/>/g, '&gt;')
           .replace(/`/g, '&#96;')
+          .replace(/\*/g, '&ast;')
         const classes = lang ? ` class="language-${lang}"` : ''
         return `><pre><code${classes}>${code}</code></pre>`
       })
       .replace(/`([^`\n]*)`/g, (_1, raw) => {
-        return raw ? `<code>${htmlToText(raw).replace(/</g, '&lt;').replace(/>/g, '&gt;')}</code>` : ''
+        return raw ? `<code>${htmlToText(raw).replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/\*/g, '&ast;')}</code>` : ''
       })
   }
 
diff --git a/tests/nuxt/__snapshots__/content-rich.test.ts.snap b/tests/nuxt/__snapshots__/content-rich.test.ts.snap
index 4e99489c..645c08ba 100644
--- a/tests/nuxt/__snapshots__/content-rich.test.ts.snap
+++ b/tests/nuxt/__snapshots__/content-rich.test.ts.snap
@@ -1,5 +1,12 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
+exports[`content-rich > asterisk paris in code block 1`] = `"<p><pre class="code-block">1 * 2 * 3</pre></p>"`;
+
+exports[`content-rich > asterisk paris in inline code 1`] = `
+"<p><code>1 * 2 * 3</code></p>
+"
+`;
+
 exports[`content-rich > block with backticks 1`] = `"<p><pre class="code-block">[(\`number string) (\`tag string)]</pre></p>"`;
 
 exports[`content-rich > block with injected html, with a known language 1`] = `
diff --git a/tests/nuxt/content-rich.test.ts b/tests/nuxt/content-rich.test.ts
index e1eb2d9b..3eb7982f 100644
--- a/tests/nuxt/content-rich.test.ts
+++ b/tests/nuxt/content-rich.test.ts
@@ -186,6 +186,16 @@ describe('content-rich', () => {
     `)
     expect(formatted).toMatchSnapshot()
   })
+
+  it ('asterisk paris in inline code', async () => {
+    const { formatted } = await render('<p>`1 * 2 * 3`</p>')
+    expect(formatted).toMatchSnapshot()
+  })
+
+  it ('asterisk paris in code block', async () => {
+    const { formatted } = await render('<p>```<br />1 * 2 * 3<br />```</p>')
+    expect(formatted).toMatchSnapshot()
+  })
 })
 
 describe('editor', () => {