Merge pull request #4099 from h3poteto/fix/char-limit

Show character limit in compose
h3poteto · Feb 8, 2023 · 66b672e · 66b672e
2 parents e42ad4d + 4894ded
commit 66b672e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/renderer/components/TimelineSpace/Compose.vue b/src/renderer/components/TimelineSpace/Compose.vue
@@ -92,7 +92,7 @@
           <el-button link size="default" @click="cw = !cw"> CW </el-button>
         </el-button-group>
         <div class="actions-group">
-          <span>500</span>
+          <span>{{ statusChars }}</span>
           <el-button type="primary" @click="post" :loading="loading"> {{ $t('modals.new_toot.toot') }} </el-button>
         </div>
       </div>
@@ -204,6 +204,9 @@ export default defineComponent({
     const dropTarget = ref<any>(null)
     const droppableVisible = ref<boolean>(false)
 
+    const maxStatusChars = ref<number>(500)
+    const statusChars = computed(() => maxStatusChars.value - (form.status.length + form.spoiler.length))
+
     onMounted(async () => {
       const [a, s]: [LocalAccount, LocalServer] = await win.ipcRenderer.invoke('get-local-account', id.value)
       const c = generator(s.sns, s.baseURL, a.accessToken, userAgent.value)
@@ -215,6 +218,11 @@ export default defineComponent({
         nsfw.value = credentials.data.source.sensitive
       }
 
+      const instance = await c.getInstance()
+      if (instance.data.max_toot_chars) {
+        maxStatusChars.value = instance.data.max_toot_chars
+      }
+
       const emojis = await c.getInstanceCustomEmojis()
       const customEmojis = emojis.data
         .map(emoji => {
@@ -442,7 +450,8 @@ export default defineComponent({
       removePollOption,
       droppableVisible,
       inReplyTo,
-      clearReply
+      clearReply,
+      statusChars
     }
   }
 })

diff --git a/src/renderer/components/event.ts b/src/renderer/components/event.ts