From 41d156806e1931b8a274888222a6840602a79a71 Mon Sep 17 00:00:00 2001
From: Pleroma Renovate Bot <contact+pleroma-renovator@hacktivis.me>
Date: Fri, 21 Feb 2025 09:04:57 +0000
Subject: [PATCH 1/9] Update dependency node to v18.20.7

---
 .node-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.node-version b/.node-version
index 1fc51668f..9be0c7058 100644
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-18.20.6
+18.20.7

From dd927227d93c2bcc9f9f6b1085cfc229482611fe Mon Sep 17 00:00:00 2001
From: Pleroma Renovate Bot <contact+pleroma-renovator@hacktivis.me>
Date: Sun, 23 Feb 2025 09:05:29 +0000
Subject: [PATCH 2/9] Update dependency globals to v16

---
 package.json | 2 +-
 yarn.lock    | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 87f7317fb..53ca264d3 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "click-outside-vue3": "4.0.1",
     "cropperjs": "1.6.2",
     "escape-html": "1.0.3",
-    "globals": "^15.14.0",
+    "globals": "^16.0.0",
     "hash-sum": "^2.0.0",
     "js-cookie": "3.0.5",
     "localforage": "1.10.0",
diff --git a/yarn.lock b/yarn.lock
index 0133ddb73..08046ae80 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4490,11 +4490,16 @@ globals@^14.0.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e"
   integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==
 
-globals@^15.11.0, globals@^15.14.0:
+globals@^15.11.0:
   version "15.15.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-15.15.0.tgz#7c4761299d41c32b075715a4ce1ede7897ff72a8"
   integrity sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==
 
+globals@^16.0.0:
+  version "16.0.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-16.0.0.tgz#3d7684652c5c4fbd086ec82f9448214da49382d8"
+  integrity sha512-iInW14XItCXET01CQFqudPOWP2jYMl7T+QRQT+UNcR/iQncN/F0UNpgd76iFkBPgNQb4+X3LV9tLJYzwh+Gl3A==
+
 globalthis@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236"

From fe436e33f249d5b3e2cbbb22dcfe7a2e7edf2c1c Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 5 Mar 2025 01:42:52 +0200
Subject: [PATCH 3/9] fix error on pinned action buttons

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

diff --git a/src/components/status_action_buttons/action_button.js b/src/components/status_action_buttons/action_button.js
index 87c5bb1e5..e722bc31c 100644
--- a/src/components/status_action_buttons/action_button.js
+++ b/src/components/status_action_buttons/action_button.js
@@ -120,7 +120,7 @@ export default {
         this.$store.dispatch('reactWithEmoji', { id: this.status.id, emoji })
       }
     },
-    doActionWrap (button, close) {
+    doActionWrap (button, close = () => {}) {
       if (button.name === 'emoji') {
         this.$refs.picker.showPicker()
       } else {

From 6fc42b123aed11e176f29b65008e5d39bd26bab0 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 5 Mar 2025 02:08:57 +0200
Subject: [PATCH 4/9] fixed status actions not clearing notification read
 status

---
 src/components/status/status.vue                              | 1 +
 src/components/status_action_buttons/action_button.js         | 4 ++++
 .../status_action_buttons/action_button_container.js          | 1 +
 .../status_action_buttons/action_button_container.vue         | 1 +
 src/components/status_action_buttons/status_action_buttons.js | 2 +-
 .../status_action_buttons/status_action_buttons.vue           | 2 ++
 6 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index e78b0931a..d0af91aef 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -540,6 +540,7 @@
             :status="status"
             :replying="replying"
             @toggle-replying="toggleReplying"
+            @interacted="e => $emit('interacted')"
           />
         </div>
       </div>
diff --git a/src/components/status_action_buttons/action_button.js b/src/components/status_action_buttons/action_button.js
index e722bc31c..07affaafe 100644
--- a/src/components/status_action_buttons/action_button.js
+++ b/src/components/status_action_buttons/action_button.js
@@ -67,6 +67,9 @@ export default {
     'doAction',
     'outerClose'
   ],
+  emits: [
+    'interacted'
+  ],
   components: {
     StatusBookmarkFolderMenu,
     EmojiPicker,
@@ -121,6 +124,7 @@ export default {
       }
     },
     doActionWrap (button, close = () => {}) {
+      this.$emit('interacted')
       if (button.name === 'emoji') {
         this.$refs.picker.showPicker()
       } else {
diff --git a/src/components/status_action_buttons/action_button_container.js b/src/components/status_action_buttons/action_button_container.js
index bd91b9404..313e3022f 100644
--- a/src/components/status_action_buttons/action_button_container.js
+++ b/src/components/status_action_buttons/action_button_container.js
@@ -22,6 +22,7 @@ export default {
     MuteConfirm
   },
   props: ['button', 'status'],
+  emits: ['interacted'],
   mounted () {
     if (this.button.name === 'mute') {
       this.$store.dispatch('fetchDomainMutes')
diff --git a/src/components/status_action_buttons/action_button_container.vue b/src/components/status_action_buttons/action_button_container.vue
index deada02ae..931a40349 100644
--- a/src/components/status_action_buttons/action_button_container.vue
+++ b/src/components/status_action_buttons/action_button_container.vue
@@ -79,6 +79,7 @@
       :button="button"
       :status="status"
       v-bind="$attrs"
+      @interacted="e => $emit('interacted')"
     />
     <teleport to="#modal">
       <MuteConfirm
diff --git a/src/components/status_action_buttons/status_action_buttons.js b/src/components/status_action_buttons/status_action_buttons.js
index 622f21ca5..6d4e4fbc0 100644
--- a/src/components/status_action_buttons/status_action_buttons.js
+++ b/src/components/status_action_buttons/status_action_buttons.js
@@ -18,7 +18,7 @@ library.add(
 
 const StatusActionButtons = {
   props: ['status', 'replying'],
-  emits: ['toggleReplying'],
+  emits: ['toggleReplying', 'interacted'],
   data () {
     return {
       showPin: false,
diff --git a/src/components/status_action_buttons/status_action_buttons.vue b/src/components/status_action_buttons/status_action_buttons.vue
index 6d5cd190c..8df6369b5 100644
--- a/src/components/status_action_buttons/status_action_buttons.vue
+++ b/src/components/status_action_buttons/status_action_buttons.vue
@@ -17,6 +17,7 @@
           :get-component="getComponent"
           :close="() => {}"
           :do-action="doAction"
+          @interacted="e => $emit('interacted')"
         />
         <button
           v-if="showPin && currentUser"
@@ -88,6 +89,7 @@
                 :get-component="getComponent"
                 :outerClose="close"
                 :do-action="doAction"
+                @interacted="e => $emit('interacted')"
               />
               <button
                 v-if="showPin && currentUser"

From 49ed5d7da0d330ed040830f9cc3179ccdd36c50a Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 5 Mar 2025 02:10:55 +0200
Subject: [PATCH 5/9] fix path for emoji merger

---
 tools/emoji_merger.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/emoji_merger.js b/tools/emoji_merger.js
index 78a798dfe..4d3039612 100644
--- a/tools/emoji_merger.js
+++ b/tools/emoji_merger.js
@@ -9,7 +9,7 @@
 */
 
 // Existing emojis we have
-const oldEmojiFilename = '../static/emoji.json'
+const oldEmojiFilename = '../src/assets/emoji.json'
 
 // The file downloaded from https://gist.github.com/oliveratgithub/0bf11a9aff0d6da7b46f1490f86a71eb
 const newEmojiFilename = 'emojis.json'

From 927f68418e90b7d7f56d896efa8041750a9450b4 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 5 Mar 2025 02:18:00 +0200
Subject: [PATCH 6/9] better readability of panel header icons

---
 public/static/styles/Redmond DX.iss | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/public/static/styles/Redmond DX.iss b/public/static/styles/Redmond DX.iss
index 08d9103ff..919be056b 100644
--- a/public/static/styles/Redmond DX.iss	
+++ b/public/static/styles/Redmond DX.iss	
@@ -129,6 +129,21 @@ PanelHeader {
   background: --fg
 }
 
+PanelHeader ButtonUnstyled Icon {
+  textColor: --text;
+  textAuto: 'no-preserve'
+}
+
+PanelHeader Button Icon {
+  textColor: --text;
+  textAuto: 'no-preserve'
+}
+
+PanelHeader Button Text {
+  textColor: --text;
+  textAuto: 'no-preserve'
+}
+
 Tab:hover {
   background: --bg;
   shadow: --buttonDefaultBevel
@@ -172,6 +187,14 @@ MenuItem:hover {
   background: --fg
 }
 
+MenuItem:active {
+  background: --fg
+}
+
+MenuItem:active:hover {
+  background: --fg
+}
+
 Popover {
   shadow: --buttonDefaultBevel, 5 5 0 0 #000000 / 0.2;
   roundness: 0

From aa6b390a6faa316d0437501c6d95a9b87500b2d9 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 5 Mar 2025 02:25:52 +0200
Subject: [PATCH 7/9] fix opening reports

---
 src/components/status_action_buttons/buttons_definitions.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/status_action_buttons/buttons_definitions.js b/src/components/status_action_buttons/buttons_definitions.js
index ff7944268..d2a70708f 100644
--- a/src/components/status_action_buttons/buttons_definitions.js
+++ b/src/components/status_action_buttons/buttons_definitions.js
@@ -1,4 +1,5 @@
 import { useEditStatusStore } from 'src/stores/editStatus.js'
+import { useReportsStore } from 'src/stores/reports.js'
 const PRIVATE_SCOPES = new Set(['private', 'direct'])
 const PUBLIC_SCOPES = new Set(['public', 'unlisted'])
 export const BUTTONS = [{
@@ -216,8 +217,8 @@ export const BUTTONS = [{
   icon: 'flag',
   label: 'user_card.report',
   if: ({ loggedIn }) => loggedIn,
-  action ({ dispatch, status }) {
-    dispatch('openUserReportingModal', { userId: status.user.id, statusIds: [status.id] })
+  action ({ status }) {
+    return useReportsStore().openUserReportingModal({ userId: status.user.id, statusIds: [status.id] })
   }
 }].map(button => {
   return Object.fromEntries(

From 0190a698dbdac89f32074e696b9693741611e219 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 5 Mar 2025 02:32:25 +0200
Subject: [PATCH 8/9] fix reports not changing states

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

diff --git a/src/stores/reports.js b/src/stores/reports.js
index a84442eca..18080d4e7 100644
--- a/src/stores/reports.js
+++ b/src/stores/reports.js
@@ -32,7 +32,7 @@ export const useReportsStore = defineStore('reports', {
       this.reportModal.activated = false
     },
     setReportState ({ id, state }) {
-      const oldState = window.vuex.state.reports.reports[id].state
+      const oldState = this.reports[id].state
       this.reports[id].state = state
       window.vuex.state.api.backendInteractor.setReportState({ id, state }).catch(e => {
         console.error('Failed to set report state', e)

From 32839357f57c735a9c5e52dfe3d368dab9d8b3fc Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 5 Mar 2025 02:50:44 +0200
Subject: [PATCH 9/9] restore the status history item

---
 .../buttons_definitions.js                    | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/components/status_action_buttons/buttons_definitions.js b/src/components/status_action_buttons/buttons_definitions.js
index d2a70708f..ecd4def70 100644
--- a/src/components/status_action_buttons/buttons_definitions.js
+++ b/src/components/status_action_buttons/buttons_definitions.js
@@ -1,5 +1,7 @@
 import { useEditStatusStore } from 'src/stores/editStatus.js'
 import { useReportsStore } from 'src/stores/reports.js'
+import { useStatusHistoryStore } from 'src/stores/statusHistory.js'
+
 const PRIVATE_SCOPES = new Set(['private', 'direct'])
 const PUBLIC_SCOPES = new Set(['public', 'unlisted'])
 export const BUTTONS = [{
@@ -139,6 +141,34 @@ export const BUTTONS = [{
       return dispatch('bookmark', { id: status.id })
     }
   }
+}, {
+  // =========
+  // EDIT HISTORY
+  // =========
+  name: 'editHistory',
+  icon: 'history',
+  label: 'status.status_history',
+  if ({ status, state }) {
+    return state.instance.editingAvailable &&
+      status.edited_at !== null
+  },
+  action ({ status }) {
+    const originalStatus = { ...status }
+    const stripFieldsList = [
+      'attachments',
+      'created_at',
+      'emojis',
+      'text',
+      'raw_html',
+      'nsfw',
+      'poll',
+      'summary',
+      'summary_raw_html'
+    ]
+    stripFieldsList.forEach(p => delete originalStatus[p])
+    useStatusHistoryStore().openStatusHistoryModal(originalStatus)
+    return Promise.resolve()
+  }
 }, {
   // =========
   // EDIT