From d1ab424ebcd0a41fca9b848de02d03a2015ed9c7 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 2 Mar 2021 09:53:17 +0200
Subject: [PATCH 1/5] update changelog with 2.3.0

---
 CHANGELOG.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d2b48b9..eb6a4599 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,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/).
 
 ## [Unreleased]
+### Added
+- Added a quick settings to timeline header for easier access
+- Added option to mark posts as sensitive by default
+
+## [2.3.0] - 2021-03-01
 ### Fixed
 - Button to remove uploaded media in post status form is now properly placed and sized.
 - Fixed shoutbox not working in mobile layout
@@ -17,11 +22,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Display 'people voted' instead of 'votes' for multi-choice polls
 - Optimized chat to not get horrible performance after keeping the same chat open for a long time
 - When opening emoji picker or react picker, it automatically focuses the search field
+- Language picker now uses native language names
 
 ### Added
 - Added reason field for registration when approval is required
-- Added a quick settings to timeline header for easier access
-- Added option to mark posts as sensitive by default
+- Group staff members by role in the About page
 
 ## [2.2.3] - 2021-01-18
 ### Added
@@ -33,7 +38,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Changed
 - Don't filter own posts when they hit your wordfilter
-- Language picker now uses native language names
 
 
 ## [2.2.2] - 2020-12-22
@@ -43,7 +47,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Added some missing unicode emoji
 - Added the upload limit to the Features panel in the About page
 - Support for solid color wallpaper, instance doesn't have to define a wallpaper anymore
-- Group staff members by role in the About page
 
 ### Fixed
 - Fixed the occasional bug where screen would scroll 1px when typing into a reply form

From 0673511fc246d67356dd656ad81ba401e3179108 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 3 Mar 2021 16:46:53 +0200
Subject: [PATCH 2/5] fix shoutbox header, use custom scroll-to-bottom system,
 remove vue-chat-scroll, temporarily add chat test hack

---
 package.json                             |  1 -
 src/App.vue                              |  2 +-
 src/components/chat_panel/chat_panel.js  | 12 ++++++++++++
 src/components/chat_panel/chat_panel.vue | 15 ++++++++++-----
 src/main.js                              |  2 --
 src/modules/chat.js                      | 19 +++++++++++++++++++
 yarn.lock                                |  4 ----
 7 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 372155df..8dbf2503 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,6 @@
     "punycode.js": "^2.1.0",
     "v-click-outside": "^2.1.1",
     "vue": "^2.6.11",
-    "vue-chat-scroll": "^1.2.1",
     "vue-i18n": "^7.3.2",
     "vue-router": "^3.0.1",
     "vue-template-compiler": "^2.6.11",
diff --git a/src/App.vue b/src/App.vue
index 1a166778..e09ce4c8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -50,7 +50,7 @@
       <media-modal />
     </div>
     <chat-panel
-      v-if="currentUser && chat"
+      v-if="currentUser"
       :floating="true"
       class="floating-chat mobile-hidden"
     />
diff --git a/src/components/chat_panel/chat_panel.js b/src/components/chat_panel/chat_panel.js
index c3887098..556694ae 100644
--- a/src/components/chat_panel/chat_panel.js
+++ b/src/components/chat_panel/chat_panel.js
@@ -35,6 +35,18 @@ const chatPanel = {
     userProfileLink (user) {
       return generateProfileLink(user.id, user.username, this.$store.state.instance.restrictedNicknames)
     }
+  },
+  watch: {
+    messages (newVal) {
+      const scrollEl = this.$el.querySelector('.chat-window')
+      if (!scrollEl) return
+      if (scrollEl.scrollTop + scrollEl.offsetHeight + 20 > scrollEl.scrollHeight) {
+        this.$nextTick(() => {
+          if (!scrollEl) return
+          scrollEl.scrollTop = scrollEl.scrollHeight - scrollEl.offsetHeight
+        })
+      }
+    }
   }
 }
 
diff --git a/src/components/chat_panel/chat_panel.vue b/src/components/chat_panel/chat_panel.vue
index 7993c94d..8a829115 100644
--- a/src/components/chat_panel/chat_panel.vue
+++ b/src/components/chat_panel/chat_panel.vue
@@ -10,17 +10,15 @@
         @click.stop.prevent="togglePanel"
       >
         <div class="title">
-          <span>{{ $t('shoutbox.title') }}</span>
+          {{ $t('shoutbox.title') }}
           <FAIcon
             v-if="floating"
             icon="times"
+            class="close-icon"
           />
         </div>
       </div>
-      <div
-        v-chat-scroll
-        class="chat-window"
-      >
+      <div class="chat-window">
         <div
           v-for="message in messages"
           :key="message.id"
@@ -94,6 +92,13 @@
     .icon {
       color: $fallback--text;
       color: var(--text, $fallback--text);
+      margin-right: 0.5em;
+    }
+
+    .title {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
     }
   }
 
diff --git a/src/main.js b/src/main.js
index 90ee2887..e1cac748 100644
--- a/src/main.js
+++ b/src/main.js
@@ -28,7 +28,6 @@ import pushNotifications from './lib/push_notifications_plugin.js'
 
 import messages from './i18n/messages.js'
 
-import VueChatScroll from 'vue-chat-scroll'
 import VueClickOutside from 'v-click-outside'
 import PortalVue from 'portal-vue'
 import VBodyScrollLock from './directives/body_scroll_lock'
@@ -42,7 +41,6 @@ const currentLocale = (window.navigator.language || 'en').split('-')[0]
 Vue.use(Vuex)
 Vue.use(VueRouter)
 Vue.use(VueI18n)
-Vue.use(VueChatScroll)
 Vue.use(VueClickOutside)
 Vue.use(PortalVue)
 Vue.use(VBodyScrollLock)
diff --git a/src/modules/chat.js b/src/modules/chat.js
index c798549d..264ba00b 100644
--- a/src/modules/chat.js
+++ b/src/modules/chat.js
@@ -18,6 +18,25 @@ const chat = {
   actions: {
     initializeChat (store, socket) {
       const channel = socket.channel('chat:public')
+      let id = 0
+      const createmsg = () => {
+        id += 1
+        return {
+          text: 'test' + id,
+          author: {
+            username: 'test',
+            avatar: '',
+            id
+          }
+        }
+      }
+
+      const loop = () => {
+        store.commit('addMessage', createmsg())
+        setTimeout(loop, 3000)
+      }
+      loop()
+
       channel.on('new_msg', (msg) => {
         store.commit('addMessage', msg)
       })
diff --git a/yarn.lock b/yarn.lock
index 6d0095db..80c09312 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8923,10 +8923,6 @@ void-elements@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
 
-vue-chat-scroll@^1.2.1:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/vue-chat-scroll/-/vue-chat-scroll-1.3.5.tgz#a5ee5bae5058f614818a96eac5ee3be4394a2f68"
-
 vue-eslint-parser@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-5.0.0.tgz#00f4e4da94ec974b821a26ff0ed0f7a78402b8a1"

From becacf064303f0fceca8def3f1c49248b9d3e5f8 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 3 Mar 2021 16:47:59 +0200
Subject: [PATCH 3/5] remove shoutbox test hacks

---
 src/App.vue         |  2 +-
 src/modules/chat.js | 18 ------------------
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index e09ce4c8..1a166778 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -50,7 +50,7 @@
       <media-modal />
     </div>
     <chat-panel
-      v-if="currentUser"
+      v-if="currentUser && chat"
       :floating="true"
       class="floating-chat mobile-hidden"
     />
diff --git a/src/modules/chat.js b/src/modules/chat.js
index 264ba00b..ffeb272b 100644
--- a/src/modules/chat.js
+++ b/src/modules/chat.js
@@ -18,24 +18,6 @@ const chat = {
   actions: {
     initializeChat (store, socket) {
       const channel = socket.channel('chat:public')
-      let id = 0
-      const createmsg = () => {
-        id += 1
-        return {
-          text: 'test' + id,
-          author: {
-            username: 'test',
-            avatar: '',
-            id
-          }
-        }
-      }
-
-      const loop = () => {
-        store.commit('addMessage', createmsg())
-        setTimeout(loop, 3000)
-      }
-      loop()
 
       channel.on('new_msg', (msg) => {
         store.commit('addMessage', msg)

From b4f5df9ce502efbf35eccf5c62066200b04428f8 Mon Sep 17 00:00:00 2001
From: rinpatch <rin@patch.cx>
Date: Thu, 4 Mar 2021 22:24:17 +0300
Subject: [PATCH 4/5] Make it possible to localize user highlight options

---
 src/components/user_card/user_card.vue | 8 ++++----
 src/i18n/en.json                       | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 60776ebb..c59faaa6 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -141,10 +141,10 @@
                 v-model="userHighlightType"
                 class="userHighlightSel"
               >
-                <option value="disabled">No highlight</option>
-                <option value="solid">Solid bg</option>
-                <option value="striped">Striped bg</option>
-                <option value="side">Side stripe</option>
+                <option value="disabled">{{$t('user_card.highlight.disabled')}}</option>
+                <option value="solid">{{$t('user_card.highlight.solid')}}</option>
+                <option value="striped">{{$t('user_card.highlight.striped')}}</option>
+                <option value="side">{{$t('user_card.highlight.side')}}</option>
               </select>
               <FAIcon
                 class="select-down-icon"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index bf775363..2aefebc9 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -746,6 +746,12 @@
       "quarantine": "Disallow user posts from federating",
       "delete_user": "Delete user",
       "delete_user_confirmation": "Are you absolutely sure? This action cannot be undone."
+    },
+    "highlight": {
+      "disabled": "No highlight",
+      "solid": "Solid bg",
+      "striped": "Striped bg",
+      "side": "Side stripe"
     }
   },
   "user_profile": {

From c14c144cc8774fe03bb6dc981fad0470ac1bcebb Mon Sep 17 00:00:00 2001
From: rinpatch <rin@patch.cx>
Date: Thu, 4 Mar 2021 19:46:03 +0000
Subject: [PATCH 5/5] Apply 1 suggestion(s) to 1 file(s)

---
 src/components/user_card/user_card.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index c59faaa6..4b7ee7d5 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -141,10 +141,10 @@
                 v-model="userHighlightType"
                 class="userHighlightSel"
               >
-                <option value="disabled">{{$t('user_card.highlight.disabled')}}</option>
-                <option value="solid">{{$t('user_card.highlight.solid')}}</option>
-                <option value="striped">{{$t('user_card.highlight.striped')}}</option>
-                <option value="side">{{$t('user_card.highlight.side')}}</option>
+                <option value="disabled">{{ $t('user_card.highlight.disabled') }}</option>
+                <option value="solid">{{ $t('user_card.highlight.solid') }}</option>
+                <option value="striped">{{ $t('user_card.highlight.striped') }}</option>
+                <option value="side">{{ $t('user_card.highlight.side') }}</option>
               </select>
               <FAIcon
                 class="select-down-icon"