From 96ef76f1d76df7bd1e216524d5fe429830146aa6 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sun, 18 Jun 2023 15:44:19 -0400
Subject: [PATCH 1/8] Make emoji picker buttons accessible

---
 src/components/emoji_picker/emoji_picker.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/emoji_picker/emoji_picker.vue b/src/components/emoji_picker/emoji_picker.vue
index 6972164b0..3319dace9 100644
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@@ -22,6 +22,7 @@
               active: activeGroupView === group.id
             }"
             :title="group.text"
+            role="button"
             @click.prevent="highlight(group.id)"
           >
             <span
@@ -108,6 +109,7 @@
                     :key="group.id + emoji.displayText"
                     :title="maybeLocalizedEmojiName(emoji)"
                     class="emoji-item"
+                    role="button"
                     @click.stop.prevent="onEmoji(emoji)"
                   >
                     <span
@@ -118,6 +120,7 @@
                       v-else
                       class="emoji-picker-emoji -custom"
                       loading="lazy"
+                      :alt="maybeLocalizedEmojiName(emoji)"
                       :src="emoji.imageUrl"
                       :data-emoji-name="group.id + emoji.displayText"
                     />

From 16140c278ba68f4ad9817181c943477a8b367858 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sun, 18 Jun 2023 15:46:05 -0400
Subject: [PATCH 2/8] Add changelog

---
 changelog.d/emoji-picker-button-accessible.fix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/emoji-picker-button-accessible.fix

diff --git a/changelog.d/emoji-picker-button-accessible.fix b/changelog.d/emoji-picker-button-accessible.fix
new file mode 100644
index 000000000..12898a1ac
--- /dev/null
+++ b/changelog.d/emoji-picker-button-accessible.fix
@@ -0,0 +1 @@
+Add alt text to emoji picker buttons

From 35d3b8f27dace6efd5aab8915b2025d16bb7e7e7 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Tue, 18 Jul 2023 19:06:00 -0400
Subject: [PATCH 3/8] Fix pinned statuses gone when reloading user timeline

---
 changelog.d/reload-user-pinned.fix  | 1 +
 src/components/timeline/timeline.js | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 changelog.d/reload-user-pinned.fix

diff --git a/changelog.d/reload-user-pinned.fix b/changelog.d/reload-user-pinned.fix
new file mode 100644
index 000000000..db241c205
--- /dev/null
+++ b/changelog.d/reload-user-pinned.fix
@@ -0,0 +1 @@
+Fix pinned statuses gone when reloading user timeline
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index b74146109..1050b87a6 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -160,6 +160,9 @@ const Timeline = {
       if (this.timeline.flushMarker !== 0) {
         this.$store.commit('clearTimeline', { timeline: this.timelineName, excludeUserId: true })
         this.$store.commit('queueFlush', { timeline: this.timelineName, id: 0 })
+        if (this.timelineName === 'user') {
+          this.$store.dispatch('fetchPinnedStatuses', this.userId)
+        }
         this.fetchOlderStatuses()
       } else {
         this.blockClicksTemporarily()

From 1b081a927288ff2f43025d688e2fa15cf6ce6be1 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Wed, 19 Jul 2023 17:00:46 -0400
Subject: [PATCH 4/8] Make reply-or-quote selection display as horizontal
 button group

---
 .../post_status_form/post_status_form.vue     | 50 ++++++-------------
 1 file changed, 14 insertions(+), 36 deletions(-)

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 0d7938854..9b108a5aa 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -129,44 +129,32 @@
         <div
           v-if="quotable"
           role="radiogroup"
-          class="reply-or-quote-selector"
+          class="btn-group reply-or-quote-selector"
         >
-          <div
-            class="reply-or-quote-option"
+          <button
+            :id="`reply-or-quote-option-${randomSeed}-reply`"
+            class="btn button-default reply-or-quote-option"
+            :class="{ toggled: !newStatus.quoting }"
             tabindex="0"
             role="radio"
             :aria-labelledby="`reply-or-quote-option-${randomSeed}-reply`"
             :aria-checked="!newStatus.quoting"
             @click="newStatus.quoting = false"
           >
-            <input
-              type="radio"
-              :checked="!newStatus.quoting"
-            >
-            <label class="reply-or-quote-option-text">
-              <span :id="`reply-or-quote-option-${randomSeed}-reply`">
-                {{ $t('post_status.reply_option') }}
-              </span>
-            </label>
-          </div>
-          <div
-            class="reply-or-quote-option"
+            {{ $t('post_status.reply_option') }}
+          </button>
+          <button
+            :id="`reply-or-quote-option-${randomSeed}-quote`"
+            class="btn button-default reply-or-quote-option"
+            :class="{ toggled: newStatus.quoting }"
             tabindex="0"
             role="radio"
             :aria-labelledby="`reply-or-quote-option-${randomSeed}-quote`"
             :aria-checked="newStatus.quoting"
             @click="newStatus.quoting = true"
           >
-            <input
-              type="radio"
-              :checked="newStatus.quoting"
-            >
-            <label class="reply-or-quote-option-text">
-              <span :id="`reply-or-quote-option-${randomSeed}-quote`">
-                {{ $t('post_status.quote_option') }}
-              </span>
-            </label>
-          </div>
+            {{ $t('post_status.quote_option') }}
+          </button>
         </div>
         <EmojiInput
           v-if="!disableSubject && (newStatus.spoilerText || alwaysShowSubject)"
@@ -463,17 +451,7 @@
   }
 
   .reply-or-quote-selector {
-    display: flex;
-    flex-direction: column;
-
-    .reply-or-quote-option {
-      display: flex;
-      align-items: center;
-
-      .reply-or-quote-option-text::before {
-        vertical-align: middle;
-      }
-    }
+    margin-bottom: 0.5em;
   }
 
   .text-format {

From 0b0b1dabdfa2051d0b1d1ad846892da4801ca588 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Fri, 21 Jul 2023 13:54:10 -0400
Subject: [PATCH 5/8] Fix parsing non-ascii tags

---
 changelog.d/nonascii-tags.fix                    | 1 +
 src/services/matcher/matcher.service.js          | 7 +++++--
 test/unit/specs/services/matcher/matcher.spec.js | 6 ++++++
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/nonascii-tags.fix

diff --git a/changelog.d/nonascii-tags.fix b/changelog.d/nonascii-tags.fix
new file mode 100644
index 000000000..e4c6dc82d
--- /dev/null
+++ b/changelog.d/nonascii-tags.fix
@@ -0,0 +1 @@
+Fix parsing non-ascii tags
diff --git a/src/services/matcher/matcher.service.js b/src/services/matcher/matcher.service.js
index b6c4e9099..54f02d312 100644
--- a/src/services/matcher/matcher.service.js
+++ b/src/services/matcher/matcher.service.js
@@ -14,8 +14,11 @@ export const mentionMatchesUrl = (attention, url) => {
  * @param {string} url
  */
 export const extractTagFromUrl = (url) => {
-  const regex = /tag[s]*\/(\w+)$/g
-  const result = regex.exec(url)
+  const decoded = decodeURI(url)
+  // https://git.pleroma.social/pleroma/elixir-libraries/linkify/-/blob/master/lib/linkify/parser.ex
+  // https://www.pcre.org/original/doc/html/pcrepattern.html
+  const regex = /tag[s]*\/([\p{L}\p{N}_]*[\p{Alphabetic}_·\u{200c}][\p{L}\p{N}_·\p{M}\u{200c}]*)$/ug
+  const result = regex.exec(decoded)
   if (!result) {
     return false
   }
diff --git a/test/unit/specs/services/matcher/matcher.spec.js b/test/unit/specs/services/matcher/matcher.spec.js
index 7a2494f07..c6e9719d3 100644
--- a/test/unit/specs/services/matcher/matcher.spec.js
+++ b/test/unit/specs/services/matcher/matcher.spec.js
@@ -78,5 +78,11 @@ describe('MatcherService', () => {
 
       expect(MatcherService.extractTagFromUrl(url)).to.eql(false)
     })
+
+    it('should return tag name from non-ascii tags', () => {
+      const url = encodeURI('https://website.com/tag/喵喵喵')
+
+      expect(MatcherService.extractTagFromUrl(url)).to.eql('喵喵喵')
+    })
   })
 })

From 56a74aa3926fb8bfd7241936bef0a13902fb886e Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 24 Jul 2023 18:28:02 -0400
Subject: [PATCH 6/8] Make MentionsLine aware of line breaking by non-br
 elements

---
 changelog.d/mentionsline-shouldbreak.fix     |  1 +
 src/components/rich_content/rich_content.jsx | 54 +++++++++++++-------
 2 files changed, 37 insertions(+), 18 deletions(-)
 create mode 100644 changelog.d/mentionsline-shouldbreak.fix

diff --git a/changelog.d/mentionsline-shouldbreak.fix b/changelog.d/mentionsline-shouldbreak.fix
new file mode 100644
index 000000000..33ee8d2c9
--- /dev/null
+++ b/changelog.d/mentionsline-shouldbreak.fix
@@ -0,0 +1 @@
+Make MentionsLine aware of line breaking by non-br elements
diff --git a/src/components/rich_content/rich_content.jsx b/src/components/rich_content/rich_content.jsx
index b16ab242e..ff14a58ac 100644
--- a/src/components/rich_content/rich_content.jsx
+++ b/src/components/rich_content/rich_content.jsx
@@ -8,6 +8,27 @@ import HashtagLink from 'src/components/hashtag_link/hashtag_link.vue'
 
 import './rich_content.scss'
 
+const MAYBE_LINE_BREAKING_ELEMENTS = [
+  'blockquote',
+  'br',
+  'hr',
+  'ul',
+  'ol',
+  'li',
+  'p',
+  'table',
+  'tbody',
+  'td',
+  'th',
+  'thead',
+  'tr',
+  'h1',
+  'h2',
+  'h3',
+  'h4',
+  'h5'
+]
+
 /**
  * RichContent, The Über-powered component for rendering Post HTML.
  *
@@ -166,25 +187,22 @@ export default {
               !(children && typeof children[0] === 'string' && children[0].match(/^\s/))
                 ? lastSpacing
                 : ''
-        switch (Tag) {
-          case 'br':
+        if (MAYBE_LINE_BREAKING_ELEMENTS.includes(Tag)) {
+          // all the elements that can cause a line change
+          currentMentions = null
+        } else if (Tag === 'img') { // replace images with StillImage
+          return ['', [mentionsLinePadding, renderImage(opener)], '']
+        } else if (Tag === 'a' && this.handleLinks) { // replace mentions with MentionLink
+          if (fullAttrs.class && fullAttrs.class.includes('mention')) {
+            // Handling mentions here
+            return renderMention(attrs, children)
+          } else {
             currentMentions = null
-            break
-          case 'img': // replace images with StillImage
-            return ['', [mentionsLinePadding, renderImage(opener)], '']
-          case 'a': // replace mentions with MentionLink
-            if (!this.handleLinks) break
-            if (fullAttrs.class && fullAttrs.class.includes('mention')) {
-              // Handling mentions here
-              return renderMention(attrs, children)
-            } else {
-              currentMentions = null
-              break
-            }
-          case 'span':
-            if (this.handleLinks && fullAttrs.class && fullAttrs.class.includes('h-card')) {
-              return ['', children.map(processItem), '']
-            }
+          }
+        } else if (Tag === 'span') {
+          if (this.handleLinks && fullAttrs.class && fullAttrs.class.includes('h-card')) {
+            return ['', children.map(processItem), '']
+          }
         }
 
         if (children !== undefined) {

From 0dc2afb8261fc474bd46bcb1b57ab845fc1baf32 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 24 Jul 2023 19:13:37 -0400
Subject: [PATCH 7/8] Fix a bug where mentioning a user twice will not fill the
 mention into the textarea

---
 changelog.d/mention-twice.fix                          | 1 +
 src/components/post_status_modal/post_status_modal.js  | 4 ++++
 src/components/post_status_modal/post_status_modal.vue | 2 +-
 src/modules/postStatus.js                              | 6 ++++++
 4 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/mention-twice.fix

diff --git a/changelog.d/mention-twice.fix b/changelog.d/mention-twice.fix
new file mode 100644
index 000000000..0e4b71dfd
--- /dev/null
+++ b/changelog.d/mention-twice.fix
@@ -0,0 +1 @@
+Fix a bug where mentioning a user twice will not fill the mention into the textarea
diff --git a/src/components/post_status_modal/post_status_modal.js b/src/components/post_status_modal/post_status_modal.js
index b44354db1..8970dd9bc 100644
--- a/src/components/post_status_modal/post_status_modal.js
+++ b/src/components/post_status_modal/post_status_modal.js
@@ -44,6 +44,10 @@ const PostStatusModal = {
   methods: {
     closeModal () {
       this.$store.dispatch('closePostStatusModal')
+    },
+    resetAndClose () {
+      this.$store.dispatch('resetPostStatusModal')
+      this.$store.dispatch('closePostStatusModal')
     }
   }
 }
diff --git a/src/components/post_status_modal/post_status_modal.vue b/src/components/post_status_modal/post_status_modal.vue
index dbcd321eb..bc2cad4a1 100644
--- a/src/components/post_status_modal/post_status_modal.vue
+++ b/src/components/post_status_modal/post_status_modal.vue
@@ -12,7 +12,7 @@
       <PostStatusForm
         class="panel-body"
         v-bind="params"
-        @posted="closeModal"
+        @posted="resetAndClose"
       />
     </div>
   </Modal>
diff --git a/src/modules/postStatus.js b/src/modules/postStatus.js
index 638c1fb20..d3bea1378 100644
--- a/src/modules/postStatus.js
+++ b/src/modules/postStatus.js
@@ -10,6 +10,9 @@ const postStatus = {
     },
     closePostStatusModal (state) {
       state.modalActivated = false
+    },
+    resetPostStatusModal (state) {
+      state.params = null
     }
   },
   actions: {
@@ -18,6 +21,9 @@ const postStatus = {
     },
     closePostStatusModal ({ commit }) {
       commit('closePostStatusModal')
+    },
+    resetPostStatusModal ({ commit }) {
+      commit('resetPostStatusModal')
     }
   }
 }

From ac78f801943f22c27cc6e7e9eac7ececb9fa2a5a Mon Sep 17 00:00:00 2001
From: Alexander Tumin <iamtakingiteasy@eientei.org>
Date: Mon, 14 Aug 2023 16:21:43 +0300
Subject: [PATCH 8/8] Fix OAuth2 token lingering after revocation

---
 changelog.d/oauth2-token-linger.fix | 1 +
 src/modules/users.js                | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 changelog.d/oauth2-token-linger.fix

diff --git a/changelog.d/oauth2-token-linger.fix b/changelog.d/oauth2-token-linger.fix
new file mode 100644
index 000000000..da4e46316
--- /dev/null
+++ b/changelog.d/oauth2-token-linger.fix
@@ -0,0 +1 @@
+Fix OAuth2 token lingering after revocation
diff --git a/src/modules/users.js b/src/modules/users.js
index e976d8753..50b4cb84d 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -651,6 +651,12 @@ const users = {
               const response = data.error
               // Authentication failed
               commit('endLogin')
+
+              // remove authentication token on client/authentication errors
+              if ([400, 401, 403, 422].includes(response.status)) {
+                commit('clearToken')
+              }
+
               if (response.status === 401) {
                 reject(new Error('Wrong username or password'))
               } else {