From cb0ebd998544a149077f4cd1e921b322a56af707 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 20 Jul 2026 16:09:59 +0300
Subject: [PATCH 01/16] bump version

---
 CHANGELOG.md | 6 +++++-
 package.json | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3b899d25..06971d72f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## 2.11
+## 2.11.1
+### Fixed
+- User note not working
+
+## 2.11.0
 ### Added
 - Initial MFM rendering support
 - Button to remove all drafts
diff --git a/package.json b/package.json
index 1d94ac22f..ed9a8ab33 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pleroma_fe",
-  "version": "2.11.0",
+  "version": "2.11.1",
   "description": "Pleroma frontend, the default frontend of Pleroma social network server",
   "author": "Pleroma contributors <https://git.pleroma.social/pleroma/pleroma-fe/src/CONTRIBUTORS.md>",
   "private": false,

From 94a284dd9549eb5f9d477c827d0b7e141454df1f Mon Sep 17 00:00:00 2001
From: "Moon.eth" <moon@shipoclu.com>
Date: Fri, 24 Jul 2026 14:14:08 +0900
Subject: [PATCH 02/16] fix mfa regression

---
 src/components/login_form/login_form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/login_form/login_form.js b/src/components/login_form/login_form.js
index a333e6970..5f39b8439 100644
--- a/src/components/login_form/login_form.js
+++ b/src/components/login_form/login_form.js
@@ -63,7 +63,7 @@ const LoginForm = {
             })
           })
           .catch((error) => {
-            if (error.errorData?.error === 'mfa_required') {
+            if (error.errorData === 'mfa_required') {
               this.requireMFA({ settings: error })
             } else if (error.identifier === 'password_reset_required') {
               this.$router.push({

From de680501a5c9f7bfbae4d5b443a29421ce86db28 Mon Sep 17 00:00:00 2001
From: "Moon.eth" <moon@shipoclu.com>
Date: Fri, 24 Jul 2026 14:26:25 +0900
Subject: [PATCH 03/16] fix another mfa regression

---
 src/components/login_form/login_form.js  | 2 +-
 src/components/mfa_form/recovery_form.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/login_form/login_form.js b/src/components/login_form/login_form.js
index 5f39b8439..6c2750677 100644
--- a/src/components/login_form/login_form.js
+++ b/src/components/login_form/login_form.js
@@ -64,7 +64,7 @@ const LoginForm = {
           })
           .catch((error) => {
             if (error.errorData === 'mfa_required') {
-              this.requireMFA({ settings: error })
+              this.requireMFA({ settings: error.error })
             } else if (error.identifier === 'password_reset_required') {
               this.$router.push({
                 name: 'password-reset',
diff --git a/src/components/mfa_form/recovery_form.js b/src/components/mfa_form/recovery_form.js
index e04218bd8..e03a3c84a 100644
--- a/src/components/mfa_form/recovery_form.js
+++ b/src/components/mfa_form/recovery_form.js
@@ -44,7 +44,7 @@ export default {
       }
 
       verifyRecoveryCode(data)
-        .then((result) => {
+        .then(({ data: result }) => {
           this.login(result).then(() => {
             this.$router.push({ name: 'friends' })
           })

From 1def2d7c691bfa6f2711e1122b3c78ea425d1aa1 Mon Sep 17 00:00:00 2001
From: "Moon.eth" <moon@shipoclu.com>
Date: Fri, 24 Jul 2026 14:45:21 +0900
Subject: [PATCH 04/16] Add changelog for MFA fixes

---
 changelog.d/mfa-fixes.fix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/mfa-fixes.fix

diff --git a/changelog.d/mfa-fixes.fix b/changelog.d/mfa-fixes.fix
new file mode 100644
index 000000000..52575990b
--- /dev/null
+++ b/changelog.d/mfa-fixes.fix
@@ -0,0 +1 @@
+Fix MFA login and recovery code authentication.

From ed958736b3e3722a3e4ab60ff6d114e44e9248d2 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Wed, 29 Jul 2026 14:12:56 -0400
Subject: [PATCH 05/16] Do not crash even on css rule insertion failure

---
 changelog.d/no-crash-on-bad-style.fix     | 1 +
 src/services/style_setter/style_setter.js | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/no-crash-on-bad-style.fix

diff --git a/changelog.d/no-crash-on-bad-style.fix b/changelog.d/no-crash-on-bad-style.fix
new file mode 100644
index 000000000..828e94d74
--- /dev/null
+++ b/changelog.d/no-crash-on-bad-style.fix
@@ -0,0 +1 @@
+Do not crash even on css rule insertion failure
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index 0ea0341e2..72ac617cf 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -59,7 +59,13 @@ export const adoptStyleSheets = throttle(() => {
       .sort((a, b) => a.priority - b.priority)
       .map((sheet) => {
         const css = new CSSStyleSheet()
-        sheet.rules.forEach((r) => css.insertRule(r))
+        sheet.rules.forEach((r) => {
+          try {
+            css.insertRule(r)
+          } catch (e) {
+            console.warn('Error inserting rule:', e, r)
+          }
+        })
         return css
       })
   } else {

From 2584e4de4ba58d0de3e84bf998410ff2e5bc1ebe Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Wed, 29 Jul 2026 14:24:58 -0400
Subject: [PATCH 06/16] Fix style of extra notifications

---
 changelog.d/extra-notifications-style.fix                  | 1 +
 src/components/extra_notifications/extra_notifications.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/extra-notifications-style.fix

diff --git a/changelog.d/extra-notifications-style.fix b/changelog.d/extra-notifications-style.fix
new file mode 100644
index 000000000..dc9466358
--- /dev/null
+++ b/changelog.d/extra-notifications-style.fix
@@ -0,0 +1 @@
+Fix style of extra notifications
diff --git a/src/components/extra_notifications/extra_notifications.vue b/src/components/extra_notifications/extra_notifications.vue
index 5728dc98f..6a54bd28e 100644
--- a/src/components/extra_notifications/extra_notifications.vue
+++ b/src/components/extra_notifications/extra_notifications.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="ExtraNotifications">
+  <div class="ExtraNotifications panel-body">
     <div
       v-if="shouldShowChats"
       class="notification unseen"

From aa4f2d5aec904086ada2a08d4456545eb190a65f Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 30 Jul 2026 13:10:06 +0300
Subject: [PATCH 07/16] fix empty extranotifications kaomoji

---
 src/components/extra_notifications/extra_notifications.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/extra_notifications/extra_notifications.vue b/src/components/extra_notifications/extra_notifications.vue
index 6a54bd28e..fa64ce1fa 100644
--- a/src/components/extra_notifications/extra_notifications.vue
+++ b/src/components/extra_notifications/extra_notifications.vue
@@ -87,6 +87,11 @@
   flex-direction: column;
   align-items: stretch;
 
+  &.panel-body::before {
+    content: '';
+    padding: 0;
+  }
+
   .notification {
     width: 100%;
     border-bottom: 1px solid;

From 51161de0e9ba024a45730c49c154dd41c66d3a7c Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 30 Jul 2026 13:10:17 +0300
Subject: [PATCH 08/16] fix firefox again (my bad)

---
 src/services/style_setter/style_setter.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index 72ac617cf..6ed60400b 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -32,16 +32,17 @@ export const createStyleSheet = (id, priority = 1000) => {
         newRule = newRule.replace(/backdrop-filter:[^;]+;/g, '') // Remove backdrop-filter
       }
 
-      // firefox doesn't like invalid selectors
-      if (
-        !CSS.supports?.('selector(::-webkit-scrollbar)') &&
-        !CSS.supports?.('selector(::-webkit-scrollbar-button)') &&
-        !CSS.supports?.('selector(::-webkit-resizer)') &&
-        !CSS.supports?.('selector(::-webkit-scrollbar-thumb)') &&
-        newRule.startsWith('::-webkit')
-      ) {
-        return
+      if (newRule.startsWith('::-webkit')) {
+        if (typeof CSS.supports !== 'function') return
+        // firefox doesn't like invalid selectors
+        const fullWebkitScrollbarSupport =
+              CSS.supports('selector(::-webkit-scrollbar)') &&
+              CSS.supports('selector(::-webkit-scrollbar-button)') &&
+              CSS.supports('selector(::-webkit-resizer)') &&
+              CSS.supports('selector(::-webkit-scrollbar-thumb)')
+        if (!fullWebkitScrollbarSupport) return
       }
+
       this.rules.push(
         newRule.replace(/var\(--shadowFilter\)[^;]*;/g, ''), // Remove shadowFilter references
       )

From 4c288d7095e51009a7560388c0a24e8f24930417 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 30 Jul 2026 13:15:53 +0300
Subject: [PATCH 09/16] fix font component showing objects

---
 src/stores/interface.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stores/interface.js b/src/stores/interface.js
index 951811c62..da0e6d4f5 100644
--- a/src/stores/interface.js
+++ b/src/stores/interface.js
@@ -246,7 +246,7 @@ export const useInterfaceStore = defineStore('interface', {
       }
     },
     setFontsList(value) {
-      this.localFonts = [...new Set(value.map((font) => font)).values()]
+      this.localFonts = [...new Set(value.map(({ family }) => family)).values()]
     },
     queryLocalFonts() {
       if (this.localFonts !== null) return

From e0ff4270b457048cbd14c40e1e0c048d437b453f Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 30 Jul 2026 13:38:53 +0300
Subject: [PATCH 10/16] fix generic fonts not being set

---
 src/stores/interface.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/stores/interface.js b/src/stores/interface.js
index da0e6d4f5..eb129567b 100644
--- a/src/stores/interface.js
+++ b/src/stores/interface.js
@@ -17,6 +17,16 @@ import {
 } from 'src/services/theme_data/theme_data.service.js'
 import { convertTheme2To3 } from 'src/services/theme_data/theme2_to_theme3.js'
 
+const GENERIC_FONT_NAMES = new Set([
+  'serif',
+  'sans-serif',
+  'system-ui',
+  'cursive',
+  'fantasy',
+  'math',
+  'monospace',
+])
+
 export const useInterfaceStore = defineStore('interface', {
   state: () => ({
     localFonts: null,
@@ -706,11 +716,12 @@ export const useInterfaceStore = defineStore('interface', {
         Object.entries(fontMap).forEach(([font, component]) => {
           const family = mergedConfig[`font${font}`]
           const variable = font === 'Monospace' ? '--monoFont' : '--font'
-          if (family) {
+          if (typeof family === 'string') {
+            const familyString = GENERIC_FONT_NAMES.has(family) ? family : `"${family}"`
             hacks.push({
               component,
               directives: {
-                [variable]: `generic | "${family}"`,
+                [variable]: `generic | ${familyString}`,
               },
             })
           }

From a7b1519a3ebff58ba1d9e2c22a822e93d9b57ef9 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 30 Jul 2026 13:39:10 +0300
Subject: [PATCH 11/16] fix toggling font setting using incorrect fallback
 value

---
 src/components/settings_modal/tabs/general_tab.vue | 4 ++--
 src/components/settings_modal/tabs/posts_tab.vue   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 76710bec9..9ccde0b2c 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -68,7 +68,7 @@
             :model-value="mergedConfig.fontInterface"
             name="ui"
             :label="$t('settings.style.fonts.components_inline.interface')"
-            :fallback="{ family: 'sans-serif' }"
+            fallback="sans-serif"
             no-inherit="1"
             @update:model-value="v => updateFont('fontInterface', v)"
           />
@@ -77,7 +77,7 @@
           <FontControl
             :model-value="mergedConfig.fontInput"
             name="input"
-            :fallback="{ family: 'inherit' }"
+            fallback="inherit"
             :label="$t('settings.style.fonts.components_inline.input')"
             @update:model-value="v => updateFont('fontInput', v)"
           />
diff --git a/src/components/settings_modal/tabs/posts_tab.vue b/src/components/settings_modal/tabs/posts_tab.vue
index cbba67f12..1f909d31d 100644
--- a/src/components/settings_modal/tabs/posts_tab.vue
+++ b/src/components/settings_modal/tabs/posts_tab.vue
@@ -58,7 +58,7 @@
           <FontControl
             :model-value="mergedConfig.fontPosts"
             name="post"
-            :fallback="{ family: 'inherit' }"
+            fallback="inherit"
             :label="$t('settings.style.fonts.components.post')"
             @update:model-value="v => updateFont('fontPosts', v)"
           />
@@ -67,7 +67,7 @@
           <FontControl
             :model-value="mergedConfig.fontMonospace"
             name="postCode"
-            :fallback="{ family: 'monospace' }"
+            fallback="monospace"
             :label="$t('settings.style.fonts.components.monospace')"
             @update:model-value="v => updateFont('fontMonospace', v)"
           />

From 0cd604a7b83726dc42d2ccc9664e3c2de8c48ae0 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 30 Jul 2026 14:30:23 +0300
Subject: [PATCH 12/16] lint & changelog

---
 changelog.d/2-11-2.fix                    | 4 ++++
 src/modules/users.js                      | 2 +-
 src/services/style_setter/style_setter.js | 8 ++++----
 src/stores/interface.js                   | 4 +++-
 4 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 changelog.d/2-11-2.fix

diff --git a/changelog.d/2-11-2.fix b/changelog.d/2-11-2.fix
new file mode 100644
index 000000000..2bb1e9869
--- /dev/null
+++ b/changelog.d/2-11-2.fix
@@ -0,0 +1,4 @@
+Fixed crashing on Firefox 153
+Fixed serif-fonts being used by default in some cases
+Fixed font select component showing and using objects instead of strings
+Fixed generic ('sans-serif', 'monospace' etc) fonts not working
diff --git a/src/modules/users.js b/src/modules/users.js
index 05a161c6f..38eb6032c 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -44,10 +44,10 @@ import {
 } from 'src/api/public.js'
 import {
   blockUser as apiBlockUser,
+  editUserNote as apiEditUserNote,
   muteUser as apiMuteUser,
   unblockUser as apiUnblockUser,
   unmuteUser as apiUnmuteUser,
-  editUserNote as apiEditUserNote,
   fetchBlocks,
   fetchDomainMutes,
   fetchMutes,
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index 6ed60400b..974d75ec0 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -36,10 +36,10 @@ export const createStyleSheet = (id, priority = 1000) => {
         if (typeof CSS.supports !== 'function') return
         // firefox doesn't like invalid selectors
         const fullWebkitScrollbarSupport =
-              CSS.supports('selector(::-webkit-scrollbar)') &&
-              CSS.supports('selector(::-webkit-scrollbar-button)') &&
-              CSS.supports('selector(::-webkit-resizer)') &&
-              CSS.supports('selector(::-webkit-scrollbar-thumb)')
+          CSS.supports('selector(::-webkit-scrollbar)') &&
+          CSS.supports('selector(::-webkit-scrollbar-button)') &&
+          CSS.supports('selector(::-webkit-resizer)') &&
+          CSS.supports('selector(::-webkit-scrollbar-thumb)')
         if (!fullWebkitScrollbarSupport) return
       }
 
diff --git a/src/stores/interface.js b/src/stores/interface.js
index eb129567b..48d7cb061 100644
--- a/src/stores/interface.js
+++ b/src/stores/interface.js
@@ -717,7 +717,9 @@ export const useInterfaceStore = defineStore('interface', {
           const family = mergedConfig[`font${font}`]
           const variable = font === 'Monospace' ? '--monoFont' : '--font'
           if (typeof family === 'string') {
-            const familyString = GENERIC_FONT_NAMES.has(family) ? family : `"${family}"`
+            const familyString = GENERIC_FONT_NAMES.has(family)
+              ? family
+              : `"${family}"`
             hacks.push({
               component,
               directives: {

From 15c5f9e4ebda4f7c4376ee8836e13163944be423 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 30 Jul 2026 14:59:25 +0300
Subject: [PATCH 13/16] fix post status form "eating" posts

---
 src/components/post_status_form/post_status_form.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index e996789f1..6b26103ef 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -690,6 +690,7 @@ const PostStatusForm = {
         .then((data) => {
           this.abandonDraft()
           this.clearStatus()
+          this.updateIdempotencyKey()
           this.$emit('posted', data)
         })
         .catch((error) => {
@@ -1007,6 +1008,7 @@ const PostStatusForm = {
               this.saveable = false
               if (!this.shouldAutoSaveDraft) {
                 this.clearStatus()
+                this.updateIdempotencyKey()
                 this.$emit('draft-done')
               }
             })
@@ -1016,6 +1018,7 @@ const PostStatusForm = {
             this.saveable = false
             if (!this.shouldAutoSaveDraft) {
               this.clearStatus()
+              this.updateIdempotencyKey()
               this.$emit('draft-done')
             }
           })

From 70aac04d931471f1f3f54e409d892f54b3489a22 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 30 Jul 2026 15:03:07 +0300
Subject: [PATCH 14/16] fix router warnings

---
 src/boot/routes.js | 126 +++++++++++++--------------------------------
 1 file changed, 36 insertions(+), 90 deletions(-)

diff --git a/src/boot/routes.js b/src/boot/routes.js
index beaa144e8..1371b14da 100644
--- a/src/boot/routes.js
+++ b/src/boot/routes.js
@@ -1,5 +1,3 @@
-import { defineAsyncComponent } from 'vue'
-
 import AuthForm from 'src/components/auth_form/auth_form.js'
 import BookmarkTimeline from 'src/components/bookmark_timeline/bookmark_timeline.vue'
 import BubbleTimeline from 'src/components/bubble_timeline/bubble_timeline.vue'
@@ -68,9 +66,7 @@ export default (store) => {
     {
       name: 'conversation2',
       path: '/conversation/:statusId',
-      component: defineAsyncComponent(
-        () => import('src/components/chat_view/chat_view.vue'),
-      ),
+      component: () => import('src/components/chat_view/chat_view.vue'),
       props: true,
       meta: { dontScroll: true },
       beforeEnter: validateAuthenticatedRoute,
@@ -91,23 +87,18 @@ export default (store) => {
     {
       name: 'external-user-profile',
       path: '/users/$:id',
-      component: defineAsyncComponent(
-        () => import('src/components/user_profile/user_profile.vue'),
-      ),
+      component: () => import('src/components/user_profile/user_profile.vue'),
     },
     {
       name: 'user-profile-admin-view',
       path: '/users/$:id/admin_view',
-      component: defineAsyncComponent(
-        () => import('src/components/user_profile/user_profile_admin_view.vue'),
-      ),
+      component: () =>
+        import('src/components/user_profile/user_profile_admin_view.vue'),
     },
     {
       name: 'interactions',
       path: '/users/:username/interactions',
-      component: defineAsyncComponent(
-        () => import('src/components/interactions/interactions.vue'),
-      ),
+      component: () => import('src/components/interactions/interactions.vue'),
       beforeEnter: validateAuthenticatedRoute,
     },
     {
@@ -119,39 +110,31 @@ export default (store) => {
     {
       name: 'registration',
       path: '/registration',
-      component: defineAsyncComponent(
-        () => import('src/components/registration/registration.vue'),
-      ),
+      component: () => import('src/components/registration/registration.vue'),
     },
     {
       name: 'password-reset',
       path: '/password-reset',
-      component: defineAsyncComponent(
-        () => import('src/components/password_reset/password_reset.vue'),
-      ),
+      component: () =>
+        import('src/components/password_reset/password_reset.vue'),
       props: true,
     },
     {
       name: 'registration-token',
       path: '/registration/:token',
-      component: defineAsyncComponent(
-        () => import('src/components/registration/registration.vue'),
-      ),
+      component: () => import('src/components/registration/registration.vue'),
     },
     {
       name: 'friend-requests',
       path: '/friend-requests',
-      component: defineAsyncComponent(
-        () => import('src/components/follow_requests/follow_requests.vue'),
-      ),
+      component: () =>
+        import('src/components/follow_requests/follow_requests.vue'),
       beforeEnter: validateAuthenticatedRoute,
     },
     {
       name: 'notifications',
       path: '/:username/notifications',
-      component: defineAsyncComponent(
-        () => import('src/components/notifications/notifications.vue'),
-      ),
+      component: () => import('src/components/notifications/notifications.vue'),
       props: () => ({ disableTeleport: true }),
       beforeEnter: validateAuthenticatedRoute,
     },
@@ -163,98 +146,74 @@ export default (store) => {
     {
       name: 'shout-panel',
       path: '/shout-panel',
-      component: defineAsyncComponent(
-        () => import('src/components/shout_panel/shout_panel.vue'),
-      ),
+      component: () => import('src/components/shout_panel/shout_panel.vue'),
       props: () => ({ floating: false }),
     },
     {
       name: 'oauth-callback',
       path: '/oauth-callback',
-      component: defineAsyncComponent(
-        () => import('src/components/oauth_callback/oauth_callback.vue'),
-      ),
+      component: () =>
+        import('src/components/oauth_callback/oauth_callback.vue'),
       props: (route) => ({ code: route.query.code }),
     },
     {
       name: 'search',
       path: '/search',
-      component: defineAsyncComponent(
-        () => import('src/components/search/search.vue'),
-      ),
+      component: () => import('src/components/search/search.vue'),
       props: (route) => ({ query: route.query.query }),
     },
     {
       name: 'who-to-follow',
       path: '/who-to-follow',
-      component: defineAsyncComponent(
-        () => import('src/components/who_to_follow/who_to_follow.vue'),
-      ),
+      component: () => import('src/components/who_to_follow/who_to_follow.vue'),
       beforeEnter: validateAuthenticatedRoute,
     },
     {
       name: 'about',
       path: '/about',
-      component: defineAsyncComponent(
-        () => import('src/components/about/about.vue'),
-      ),
+      component: () => import('src/components/about/about.vue'),
     },
     {
       name: 'announcements',
       path: '/announcements',
-      component: defineAsyncComponent(
-        () =>
-          import('src/components/announcements_page/announcements_page.vue'),
-      ),
+      component: () =>
+        import('src/components/announcements_page/announcements_page.vue'),
     },
     {
       name: 'drafts',
       path: '/drafts',
-      component: defineAsyncComponent(
-        () => import('src/components/drafts/drafts.vue'),
-      ),
+      component: () => import('src/components/drafts/drafts.vue'),
     },
     {
       name: 'user-profile',
       path: '/users/:name',
-      component: defineAsyncComponent(
-        () => import('src/components/user_profile/user_profile.vue'),
-      ),
+      component: () => import('src/components/user_profile/user_profile.vue'),
     },
     {
       name: 'legacy-user-profile',
       path: '/:name',
-      component: defineAsyncComponent(
-        () => import('src/components/user_profile/user_profile.vue'),
-      ),
+      component: () => import('src/components/user_profile/user_profile.vue'),
     },
     {
       name: 'lists',
       path: '/lists',
-      component: defineAsyncComponent(
-        () => import('src/components/lists/lists.vue'),
-      ),
+      component: () => import('src/components/lists/lists.vue'),
     },
     {
       name: 'lists-timeline',
       path: '/lists/:id',
-      component: defineAsyncComponent(
-        () => import('src/components/lists_timeline/lists_timeline.vue'),
-      ),
+      component: () =>
+        import('src/components/lists_timeline/lists_timeline.vue'),
     },
     {
       name: 'lists-edit',
       path: '/lists/:id/edit',
-      component: defineAsyncComponent(
-        () => import('src/components/lists_edit/lists_edit.vue'),
-      ),
+      component: () => import('src/components/lists_edit/lists_edit.vue'),
     },
     {
       name: 'lists-new',
       path: '/lists/new',
-      component: defineAsyncComponent(
-        () => import('src/components/lists_edit/lists_edit.vue'),
-      ),
+      component: () => import('src/components/lists_edit/lists_edit.vue'),
     },
     {
       name: 'edit-navigation',
@@ -266,19 +225,14 @@ export default (store) => {
     {
       name: 'bookmark-folders',
       path: '/bookmark_folders',
-      component: defineAsyncComponent(
-        () => import('src/components/bookmark_folders/bookmark_folders.vue'),
-      ),
+      component: () =>
+        import('src/components/bookmark_folders/bookmark_folders.vue'),
     },
     {
       name: 'bookmark-folder-new',
       path: '/bookmarks/new-folder',
-      component: defineAsyncComponent(
-        () =>
-          import(
-            'src/components/bookmark_folder_edit/bookmark_folder_edit.vue'
-          ),
-      ),
+      component: () =>
+        import('src/components/bookmark_folder_edit/bookmark_folder_edit.vue'),
     },
     {
       name: 'bookmark-folder',
@@ -288,12 +242,8 @@ export default (store) => {
     {
       name: 'bookmark-folder-edit',
       path: '/bookmarks/:id/edit',
-      component: defineAsyncComponent(
-        () =>
-          import(
-            'src/components/bookmark_folder_edit/bookmark_folder_edit.vue'
-          ),
-      ),
+      component: () =>
+        import('src/components/bookmark_folder_edit/bookmark_folder_edit.vue'),
     },
   ]
 
@@ -302,18 +252,14 @@ export default (store) => {
       {
         name: 'chat',
         path: '/users/:username/chats/:recipient_id',
-        component: defineAsyncComponent(
-          () => import('src/components/chat_view/chat_view.vue'),
-        ),
+        component: () => import('src/components/chat_view/chat_view.vue'),
         meta: { dontScroll: false },
         beforeEnter: validateAuthenticatedRoute,
       },
       {
         name: 'chats',
         path: '/users/:username/chats',
-        component: defineAsyncComponent(
-          () => import('src/components/chat_list/chat_list.vue'),
-        ),
+        component: () => import('src/components/chat_list/chat_list.vue'),
         meta: { dontScroll: false },
         beforeEnter: validateAuthenticatedRoute,
       },

From ca4fa0da3e1939288bb5e78d10019b83c95d48f6 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 30 Jul 2026 15:03:16 +0300
Subject: [PATCH 15/16] lint

---
 src/components/chat_message/chat_message.js   |  4 +--
 src/components/chat_view/chat_view.js         | 32 +++++++++++++------
 .../scope_selector/scope_selector.js          |  6 ++--
 .../status_action_buttons/action_button.js    |  4 +--
 4 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/components/chat_message/chat_message.js b/src/components/chat_message/chat_message.js
index 516741a33..8e5df8b1e 100644
--- a/src/components/chat_message/chat_message.js
+++ b/src/components/chat_message/chat_message.js
@@ -76,9 +76,7 @@ const ChatMessage = {
       return !!this.message.user
     },
     authorId() {
-      return this.isStatus
-        ? this.message.user.id
-        : this.message.account_id
+      return this.isStatus ? this.message.user.id : this.message.account_id
     },
     author() {
       return this.$store.getters.findUser(this.authorId)
diff --git a/src/components/chat_view/chat_view.js b/src/components/chat_view/chat_view.js
index 8d45707f3..f2b5618ed 100644
--- a/src/components/chat_view/chat_view.js
+++ b/src/components/chat_view/chat_view.js
@@ -27,8 +27,8 @@ import {
   readChat,
   sendChatMessage,
 } from 'src/api/chats.js'
-import { WSConnectionStatus } from 'src/api/websocket.js'
 import { fetchConversation, fetchStatus } from 'src/api/public.js'
+import { WSConnectionStatus } from 'src/api/websocket.js'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faChevronDown, faChevronLeft } from '@fortawesome/free-solid-svg-icons'
@@ -180,11 +180,20 @@ const Chat = {
     },
     $route: async function (newVal) {
       if (this.messagesIndex[newVal.params.statusId]) {
-        const focused = document.getElementById(`chatmessage-${this.$route.params.statusId}`)
+        const focused = document.getElementById(
+          `chatmessage-${this.$route.params.statusId}`,
+        )
         if (focused?.getBoundingClientRect == null) return
-        const bottomBoundary = window.innerHeight - this.$refs.footer.clientHeight
-        const topBoundary = this.$refs.header.clientHeight + document.getElementById('nav').clientHeight
-        const margin = Number(window.getComputedStyle(this.$refs.messageList.$el).gap.replace('px',''))
+        const bottomBoundary =
+          window.innerHeight - this.$refs.footer.clientHeight
+        const topBoundary =
+          this.$refs.header.clientHeight +
+          document.getElementById('nav').clientHeight
+        const margin = Number(
+          window
+            .getComputedStyle(this.$refs.messageList.$el)
+            .gap.replace('px', ''),
+        )
 
         const rect = focused.getBoundingClientRect()
         const scrollAmount = (() => {
@@ -293,7 +302,9 @@ const Chat = {
       if (this.isConversation) {
         const [
           { data: status },
-          { data: { ancestors, descendants } }
+          {
+            data: { ancestors, descendants },
+          },
         ] = await Promise.all([
           fetchStatus({
             id: this.statusId,
@@ -302,7 +313,7 @@ const Chat = {
           fetchConversation({
             id: this.statusId,
             credentials: useOAuthStore().token,
-          })
+          }),
         ])
         messages = [...ancestors, status, ...descendants]
       } else {
@@ -378,7 +389,7 @@ const Chat = {
         const message = newMessages[i]
 
         // Sanity check
-        if (!this.isConversation && (message.chat_id !== this.chat.id)) {
+        if (!this.isConversation && message.chat_id !== this.chat.id) {
           console.warn(
             `Chat message doesn't belong to current chat (id: ${this.chat.id})!!`,
             message,
@@ -516,7 +527,10 @@ const Chat = {
     // Event handlers
     onPosted(data) {
       this.explicitReplyStatus = null
-      this.$router.push({ name: 'conversation2', params: { statusId: data.id } })
+      this.$router.push({
+        name: 'conversation2',
+        params: { statusId: data.id },
+      })
     },
     handleVisibilityChange() {
       this.$nextTick(() => {
diff --git a/src/components/scope_selector/scope_selector.js b/src/components/scope_selector/scope_selector.js
index 77eb4e791..0df50031d 100644
--- a/src/components/scope_selector/scope_selector.js
+++ b/src/components/scope_selector/scope_selector.js
@@ -82,13 +82,13 @@ const ScopeSelector = {
     changeVis(scope) {
       this.currentScope = scope
       this.$emit('change', scope)
-    }
+    },
   },
   watch: {
     originalScope(newVal) {
       this.currentScope = newVal
-    }
-  }
+    },
+  },
 }
 
 export default ScopeSelector
diff --git a/src/components/status_action_buttons/action_button.js b/src/components/status_action_buttons/action_button.js
index fe3cd3ed6..842944965 100644
--- a/src/components/status_action_buttons/action_button.js
+++ b/src/components/status_action_buttons/action_button.js
@@ -17,21 +17,21 @@ import {
   faCheck,
   faChevronDown,
   faChevronRight,
+  faComments,
   faExternalLinkAlt,
   faEye,
   faEyeSlash,
   faHistory,
   faMinus,
+  faPencil,
   faPlus,
   faReply,
   faRetweet,
   faShareAlt,
   faStar,
   faThumbtack,
-  faPencil,
   faTimes,
   faWrench,
-  faComments,
 } from '@fortawesome/free-solid-svg-icons'
 
 library.add(

From 0482ec2da28339b0f07b6bd9fdd69cc9b0b8105a Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Thu, 30 Jul 2026 15:13:21 +0300
Subject: [PATCH 16/16] fix old chats not working

---
 src/boot/routes.js                     |  3 ++-
 src/components/chat_view/chat_view.js  | 17 ++++++++++++++---
 src/components/chat_view/chat_view.vue |  5 ++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/boot/routes.js b/src/boot/routes.js
index 1371b14da..5897fad92 100644
--- a/src/boot/routes.js
+++ b/src/boot/routes.js
@@ -251,9 +251,10 @@ export default (store) => {
     routes = routes.concat([
       {
         name: 'chat',
-        path: '/users/:username/chats/:recipient_id',
+        path: '/users/:username/chats/:chatUserId',
         component: () => import('src/components/chat_view/chat_view.vue'),
         meta: { dontScroll: false },
+        props: true,
         beforeEnter: validateAuthenticatedRoute,
       },
       {
diff --git a/src/components/chat_view/chat_view.js b/src/components/chat_view/chat_view.js
index f2b5618ed..07866ad2e 100644
--- a/src/components/chat_view/chat_view.js
+++ b/src/components/chat_view/chat_view.js
@@ -53,7 +53,14 @@ const Chat = {
     PostStatusForm,
   },
   props: {
-    statusId: String,
+    statusId: {
+      type: String,
+      default: null,
+    },
+    chatUserId: {
+      type: String,
+      default: null,
+    },
     testMode: Boolean,
   },
   data() {
@@ -348,17 +355,21 @@ const Chat = {
       // full height of the scrollable container.
       // If this is the case, we want to fetch the messages until the scrollable container
       // is fully populated so that the user has the ability to scroll up and load the history.
-      if (!isScrollable() && messages.length > 0) {
+      //
+      // Conversation fetching doesn't support pagination and spews out everything at once
+      // so we both can't and don't need to fetch previous posts
+      if (!this.isConversation && !isScrollable() && messages.length > 0) {
         this.fetchChat({
           maxId: this.minId,
         })
       }
     },
     async startFetching() {
+      console.log(this.statusId, this.chatUserId)
       if (!this.isConversation) {
         try {
           const { data } = await getOrCreateChat({
-            accountId: this.recipientId,
+            accountId: this.chatUserId,
             credentials: useOAuthStore().token,
           })
           this.$store.commit('addNewUsers', [data.account])
diff --git a/src/components/chat_view/chat_view.vue b/src/components/chat_view/chat_view.vue
index 5ea2fd2b5..f0a40ebc6 100644
--- a/src/components/chat_view/chat_view.vue
+++ b/src/components/chat_view/chat_view.vue
@@ -67,7 +67,10 @@
               </div>
             </span>
           </div>
-          <div class="auto-reply-to-section">
+          <div
+            v-if="isConversation"
+            class="auto-reply-to-section"
+          >
             <div class="reply-to-text">
               {{ explicitReplyStatus ? $t('status.reply_to_selected') : $t('status.reply_to_last') }}
               <button