From 4b18e0f36e260f0571bc3d11ca4061d653e145ee Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 25 Apr 2021 13:33:02 +0300
Subject: fix status error

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

(limited to 'src/components/status/status.js')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 470c01f1..0befc72e 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -308,7 +308,7 @@ const Status = {
   watch: {
     'highlight': function (id) {
       if (this.status.id === id) {
-        let rect = this.$el.getBoundingClientRect()
+        let rect = this.$refs.root.getBoundingClientRect()
         if (rect.top < 100) {
           // Post is above screen, match its top to screen top
           window.scrollBy(0, rect.top - 100)
-- 
cgit v1.2.3-70-g09d2


From 95e74319e11e673ce0a6a53546eae98a0b9c3eb5 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 25 Apr 2021 13:48:23 +0300
Subject: clean warnings from status

---
 src/components/status/status.js                 | 8 ++------
 src/components/status/status.vue                | 2 +-
 src/components/status_content/status_content.js | 3 ++-
 3 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'src/components/status/status.js')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 0befc72e..906413ae 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -83,7 +83,8 @@ const Status = {
     'inlineExpanded',
     'showPinned',
     'inProfile',
-    'profileUserId'
+    'profileUserId',
+    'virtualHidden'
   ],
   data () {
     return {
@@ -336,11 +337,6 @@ const Status = {
     'isSuspendable': function (val) {
       this.suspendable = val
     }
-  },
-  filters: {
-    capitalize: function (str) {
-      return str.charAt(0).toUpperCase() + str.slice(1)
-    }
   }
 }
 
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 60ab4601..6e3ce0ff 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -182,7 +182,7 @@
                 <span
                   v-if="status.visibility"
                   class="visibility-icon"
-                  :title="status.visibility | capitalize"
+                  :title="status.visibility"
                 >
                   <FAIcon
                     fixed-width
diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index a6f79d76..a755518c 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -33,7 +33,8 @@ const StatusContent = {
     'focused',
     'noHeading',
     'fullContent',
-    'singleLine'
+    'singleLine',
+    'compact'
   ],
   data () {
     return {
-- 
cgit v1.2.3-70-g09d2


From d524e983487edd45c2a6558878c21e78b9d1ff38 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 22 Mar 2022 20:42:29 +0200
Subject: fix capitalization (and localization of tooltips for scope icon)

---
 src/components/status/status.js  | 8 +++-----
 src/components/status/status.vue | 2 +-
 src/i18n/en.json                 | 8 +++++++-
 3 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'src/components/status/status.js')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index e54be241..088ddcc5 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -389,6 +389,9 @@ const Status = {
     },
     threadShowing () {
       return this.controlledThreadDisplayStatus === 'showing'
+    },
+    visibilityLocalized () {
+      return this.$i18n.t('general.scope_in_timeline.' + this.status.visibility)
     }
   },
   methods: {
@@ -478,11 +481,6 @@ const Status = {
     'isSuspendable': function (val) {
       this.suspendable = val
     }
-  },
-  filters: {
-    capitalize: function (str) {
-      return str.charAt(0).toUpperCase() + str.slice(1)
-    }
   }
 }
 
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 3f352f03..ceb5a95a 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -192,7 +192,7 @@
                 <span
                   v-if="status.visibility"
                   class="visibility-icon"
-                  :title="status.visibility"
+                  :title="visibilityLocalized"
                 >
                   <FAIcon
                     fixed-width
diff --git a/src/i18n/en.json b/src/i18n/en.json
index f3401e61..d0af7268 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -85,7 +85,13 @@
     },
     "flash_content": "Click to show Flash content using Ruffle (Experimental, may not work).",
     "flash_security": "Note that this can be potentially dangerous since Flash content is still arbitrary code.",
-    "flash_fail": "Failed to load flash content, see console for details."
+    "flash_fail": "Failed to load flash content, see console for details.",
+    "scope_in_timeline": {
+      "direct": "Direct",
+      "private": "Followers-only",
+      "public": "Public",
+      "unlisted": "Unlisted"
+    }
   },
   "image_cropper": {
     "crop_picture": "Crop picture",
-- 
cgit v1.2.3-70-g09d2


From 4b630c3c36518853489009c27602bdae392b4c94 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 28 Mar 2022 17:37:26 +0300
Subject: fix warnings

---
 src/components/status/status.js                 | 4 ++--
 src/components/status_content/status_content.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/components/status/status.js')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index 088ddcc5..ee0da4dc 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -69,7 +69,7 @@ const controlledOrUncontrolledGetters = list => list.reduce((res, name) => {
   const controlledName = `controlled${camelized}`
   const uncontrolledName = `uncontrolled${camelized}`
   res[name] = function () {
-    return this[toggle] ? this[controlledName] : this[uncontrolledName]
+    return (Object.getOwnPropertyDescriptor(this, toggle) && this[toggle]) ? this[controlledName] : this[uncontrolledName]
   }
   return res
 }, {})
@@ -311,7 +311,7 @@ const Status = {
       return this.mergedConfig.hideWordFilteredPosts
     },
     hideStatus () {
-      return (this.virtualHidden || !this.shouldNotMute) && (
+      return (!this.shouldNotMute) && (
         (this.muted && this.hideFilteredStatuses) ||
         (this.userIsMuted && this.hideMutedUsers) ||
         (this.status.thread_muted && this.hideMutedThreads) ||
diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index cf72ccb8..0200382b 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -31,7 +31,7 @@ const controlledOrUncontrolledGetters = list => list.reduce((res, name) => {
   const controlledName = `controlled${camelized}`
   const uncontrolledName = `uncontrolled${camelized}`
   res[name] = function () {
-    return this[toggle] ? this[controlledName] : this[uncontrolledName]
+    return (Object.getOwnPropertyDescriptor(this, toggle) && this[toggle]) ? this[controlledName] : this[uncontrolledName]
   }
   return res
 }, {})
-- 
cgit v1.2.3-70-g09d2


From 3799983d4f89cad4dbf4595f49a768a66b72b07e Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 29 Mar 2022 12:41:34 +0300
Subject: fix production build's reply not working in tree mode

---
 src/components/status/status.js                 | 2 +-
 src/components/status_content/status_content.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/components/status/status.js')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index ee0da4dc..c6b24c72 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -69,7 +69,7 @@ const controlledOrUncontrolledGetters = list => list.reduce((res, name) => {
   const controlledName = `controlled${camelized}`
   const uncontrolledName = `uncontrolled${camelized}`
   res[name] = function () {
-    return (Object.getOwnPropertyDescriptor(this, toggle) && this[toggle]) ? this[controlledName] : this[uncontrolledName]
+    return (this.$props[toggle] && this[toggle]) ? this[controlledName] : this[uncontrolledName]
   }
   return res
 }, {})
diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index 0200382b..f47d036a 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -31,7 +31,7 @@ const controlledOrUncontrolledGetters = list => list.reduce((res, name) => {
   const controlledName = `controlled${camelized}`
   const uncontrolledName = `uncontrolled${camelized}`
   res[name] = function () {
-    return (Object.getOwnPropertyDescriptor(this, toggle) && this[toggle]) ? this[controlledName] : this[uncontrolledName]
+    return (this.$props[toggle] && this[toggle]) ? this[controlledName] : this[uncontrolledName]
   }
   return res
 }, {})
-- 
cgit v1.2.3-70-g09d2


From e1483488c7982daa9272c570f0a5a9296519ef31 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 29 Mar 2022 19:23:30 +0300
Subject: fix some issues with trees

---
 src/components/status/status.js                 | 2 +-
 src/components/status_content/status_content.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/components/status/status.js')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index c6b24c72..ec0bd25a 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -69,7 +69,7 @@ const controlledOrUncontrolledGetters = list => list.reduce((res, name) => {
   const controlledName = `controlled${camelized}`
   const uncontrolledName = `uncontrolled${camelized}`
   res[name] = function () {
-    return (this.$props[toggle] && this[toggle]) ? this[controlledName] : this[uncontrolledName]
+    return (this.$props[toggle] !== undefined && this[toggle]) ? this[controlledName] : this[uncontrolledName]
   }
   return res
 }, {})
diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index f47d036a..68e75d9e 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -31,7 +31,7 @@ const controlledOrUncontrolledGetters = list => list.reduce((res, name) => {
   const controlledName = `controlled${camelized}`
   const uncontrolledName = `uncontrolled${camelized}`
   res[name] = function () {
-    return (this.$props[toggle] && this[toggle]) ? this[controlledName] : this[uncontrolledName]
+    return (this.$props[toggle] !== undefined && this[toggle]) ? this[controlledName] : this[uncontrolledName]
   }
   return res
 }, {})
-- 
cgit v1.2.3-70-g09d2


From de2f9686452b2bcb6cfe08fe9a5b648ec6bd5ed2 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 29 Mar 2022 19:44:07 +0300
Subject: fix?

---
 src/components/status/status.js                 | 2 +-
 src/components/status_content/status_content.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/components/status/status.js')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index ec0bd25a..a925f30b 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -69,7 +69,7 @@ const controlledOrUncontrolledGetters = list => list.reduce((res, name) => {
   const controlledName = `controlled${camelized}`
   const uncontrolledName = `uncontrolled${camelized}`
   res[name] = function () {
-    return (this.$props[toggle] !== undefined && this[toggle]) ? this[controlledName] : this[uncontrolledName]
+    return ((this.$data[toggle] !== undefined || this.$props[toggle] !== undefined) && this[toggle]) ? this[controlledName] : this[uncontrolledName]
   }
   return res
 }, {})
diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index 68e75d9e..e69c3afd 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -31,7 +31,7 @@ const controlledOrUncontrolledGetters = list => list.reduce((res, name) => {
   const controlledName = `controlled${camelized}`
   const uncontrolledName = `uncontrolled${camelized}`
   res[name] = function () {
-    return (this.$props[toggle] !== undefined && this[toggle]) ? this[controlledName] : this[uncontrolledName]
+    return ((this.$data[toggle] !== undefined || this.$props[toggle] !== undefined) && this[toggle]) ? this[controlledName] : this[uncontrolledName]
   }
   return res
 }, {})
-- 
cgit v1.2.3-70-g09d2