refactor

routes/_actions/instances.js

@@ -23,7 +23,7 @@ export function switchToInstance (instanceName) {
     currentInstance: instanceName,
     searchResults: null,
     queryInSearch: '',
-    rawInputTextInCompose: ''
+    rawComposeText: ''
   })
   store.save()
   switchToTheme(instanceThemes[instanceName])
@@ -47,7 +47,7 @@ export async function logOutOfInstance (instanceName) {
     currentInstance: newInstance,
     searchResults: null,
     queryInSearch: '',
-    rawInputTextInCompose: ''
+    rawComposeText: ''
   })
   store.save()
   toast.say(`Logged out of ${instanceName}`)

routes/_components/compose/ComposeButton.html

@@ -16,8 +16,8 @@
   export default {
     store: () => store,
     computed: {
-      disabled: ($rawInputTextInComposeOverLimit, $rawInputTextInComposeLength) => {
+      disabled: ($rawComposeTextOverLimit, $rawComposeTextLength) => {
-        return $rawInputTextInComposeOverLimit || $rawInputTextInComposeLength === 0
+        return $rawComposeTextOverLimit || $rawComposeTextLength === 0
       }
     }
   }

routes/_components/compose/ComposeInput.html

@@ -2,7 +2,7 @@
   class="compose-box-input"
   placeholder="What's on your mind?"
   ref:textarea
-  bind:value=$rawInputTextInCompose
+  bind:value=$rawComposeText
 ></textarea>
 <style>
   .compose-box-input {
@@ -31,7 +31,7 @@
 
   export default {
     oncreate() {
-      this.store.set({rawInputTextInCompose: store.get('currentInputTextInCompose')})
+      this.store.set({rawComposeText: store.get('currentComposeText')})
 
       requestAnimationFrame(() => {
         mark('autosize()')
@@ -40,11 +40,11 @@
       })
 
       const saveText = debounce(() => scheduleIdleTask(() => this.store.save()), 1000)
-      this.observe('rawInputTextInCompose', rawInputTextInCompose => {
+      this.observe('rawComposeText', rawComposeText => {
-        let inputTextInCompose = this.store.get('inputTextInCompose')
+        let composeText = this.store.get('composeText')
         let currentInstance = this.store.get('currentInstance')
-        inputTextInCompose[currentInstance] = rawInputTextInCompose || ''
+        composeText[currentInstance] = rawComposeText || ''
-        this.store.set({inputTextInCompose: inputTextInCompose})
+        this.store.set({composeText: composeText})
         saveText()
       }, {init: false})
     },
@@ -55,8 +55,8 @@
     },
     store: () => store,
     computed: {
-      rawInputTextInCompose: ($rawInputTextInCompose) => $rawInputTextInCompose,
+      rawComposeText: ($rawComposeText) => $rawComposeText,
-      currentInputTextInCompose: ($currentInputTextInCompose) => $currentInputTextInCompose,
+      currentComposeText: ($currentComposeText) => $currentComposeText,
     }
   }
 </script>

routes/_components/compose/ComposeLengthGauge.html

@@ -1,4 +1,4 @@
-<div class="compose-box-length-gauge {{shouldAnimate ? 'should-animate' : ''}}  {{$rawInputTextInComposeOverLimit ? 'over-char-limit' : ''}}"
+<div class="compose-box-length-gauge {{shouldAnimate ? 'should-animate' : ''}}  {{$rawComposeTextOverLimit ? 'over-char-limit' : ''}}"
      style="transform: scaleX({{inputLengthAsFractionRoundedAfterRaf || 0}});"
      aria-hidden="true"
 ></div>
@@ -36,8 +36,8 @@
     },
     store: () => store,
     computed: {
-      inputLengthAsFraction: ($rawInputTextInComposeLength) => {
+      inputLengthAsFraction: ($rawComposeTextLength) => {
-        return Math.min(CHAR_LIMIT, $rawInputTextInComposeLength) / CHAR_LIMIT
+        return Math.min(CHAR_LIMIT, $rawComposeTextLength) / CHAR_LIMIT
       },
       inputLengthAsFractionRounded: (inputLengthAsFraction) => {
         // We don't need to update the gauge for every decimal point, so round it to the nearest 0.02

routes/_components/compose/ComposeLengthIndicator.html

@@ -1,4 +1,4 @@
-<span class="compose-box-length {{$rawInputTextInComposeOverLimit ? 'over-char-limit' : ''}}"
+<span class="compose-box-length {{$rawComposeTextOverLimit ? 'over-char-limit' : ''}}"
       aria-label="{{inputLengthLabel}}">
       {{inputLengthToDisplayAfterRaf || '0'}}
     </span>
@@ -33,13 +33,13 @@
     },
     store: () => store,
     computed: {
-      inputLengthToDisplay: ($rawInputTextInComposeLength) => {
+      inputLengthToDisplay: ($rawComposeTextLength) => {
-        return ($rawInputTextInComposeLength <= CHAR_LIMIT
+        return ($rawComposeTextLength <= CHAR_LIMIT
-          ? $rawInputTextInComposeLength
+          ? $rawComposeTextLength
-          : CHAR_LIMIT - $rawInputTextInComposeLength)
+          : CHAR_LIMIT - $rawComposeTextLength)
       },
-      inputLengthLabel: ($rawInputTextInComposeOverLimit, inputLengthToDisplay) => {
+      inputLengthLabel: ($rawComposeTextOverLimit, inputLengthToDisplay) => {
-        if ($rawInputTextInComposeOverLimit) {
+        if ($rawComposeTextOverLimit) {
           return `${inputLengthToDisplay} characters over limit`
         } else {
           return `${inputLengthToDisplay} characters`

routes/_store/instanceComputations.js

@@ -102,8 +102,8 @@ export function instanceComputations (store) {
       return statusModifications[currentInstance]
     })
 
-  store.compute('currentInputTextInCompose',
+  store.compute('currentComposeText',
-    ['inputTextInCompose', 'currentInstance'],
+    ['composeText', 'currentInstance'],
-    (inputTextInCompose, currentInstance) => (inputTextInCompose[currentInstance] || '')
+    (composeText, currentInstance) => (composeText[currentInstance] || '')
   )
 }

routes/_store/statusComputations.js

@@ -1,13 +1,13 @@
 import { CHAR_LIMIT } from '../_static/statuses'
 
 export function statusComputations (store) {
-  store.compute('rawInputTextInComposeLength',
+  store.compute('rawComposeTextLength',
-    ['rawInputTextInCompose'],
+    ['rawComposeText'],
-    (rawInputTextInCompose) => rawInputTextInCompose.length
+    (rawComposeText) => rawComposeText.length
   )
 
-  store.compute('rawInputTextInComposeOverLimit',
+  store.compute('rawComposeTextOverLimit',
-    ['rawInputTextInComposeLength'],
+    ['rawComposeTextLength'],
-    (rawInputTextInComposeLength) => rawInputTextInComposeLength > CHAR_LIMIT
+    (rawComposeTextLength) => rawComposeTextLength > CHAR_LIMIT
   )
 }

routes/_store/store.js

@@ -14,7 +14,7 @@ const KEYS_TO_STORE_IN_LOCAL_STORAGE = new Set([
   'autoplayGifs',
   'markMediaAsSensitive',
   'pinnedPages',
-  'inputTextInCompose'
+  'composeText'
 ])
 
 class PinaforeStore extends LocalStorageStore {
@@ -39,8 +39,8 @@ export const store = new PinaforeStore({
   pinnedStatuses: {},
   instanceInfos: {},
   statusModifications: {},
-  inputTextInCompose: {},
+  composeText: {},
-  rawInputTextInCompose: ''
+  rawComposeText: ''
 })
 
 mixins(PinaforeStore)