feat: simplify replying to badge when it's the same as reblogger

elk-zone · Dec 29, 2022 · 28af2f2 · 28af2f2
1 parent 2a4e1bf
commit 28af2f2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/components/status/StatusCard.vue b/components/status/StatusCard.vue
@@ -70,8 +70,13 @@ const isFiltered = $computed(() => filterPhrase && (props.context ? filter?.cont
 const avatarOnAvatar = $(computedEager(() => useFeatureFlags().experimentalAvatarOnAvatar))
 const collapseRebloggedBy = $computed(() => rebloggedBy?.id === status.account.id)
 const showRebloggedByAvatarOnAvatar = $computed(() => rebloggedBy && avatarOnAvatar && rebloggedBy.id !== status.account.id)
+
+// Collapse ReplyingTo badge if it is a self-reply (thread)
 const collapseReplyingTo = $computed(() => (!rebloggedBy || collapseRebloggedBy) && status.inReplyToAccountId === status.account.id)
 
+// Only show avatar in ReplyingTo badge if it was reblogged by the same account
+const simplifyReplyingTo = $computed(() => rebloggedBy && rebloggedBy.id === status.inReplyToAccountId)
+
 const isDM = $computed(() => status.visibility === 'direct')
 </script>
 
@@ -99,7 +104,7 @@ const isDM = $computed(() => status.visibility === 'direct')
         </div>
         <div v-else />
       </slot>
-      <StatusReplyingTo v-if="!directReply && !collapseReplyingTo" :status="status" :class="faded ? 'text-secondary-light' : ''" py1 />
+      <StatusReplyingTo v-if="!directReply && !collapseReplyingTo" :status="status" :simplified="simplifyReplyingTo" :class="faded ? 'text-secondary-light' : ''" py1 />
     </div>
     <div flex gap-3 :class="{ 'text-secondary': faded }">
       <div relative>

diff --git a/components/status/StatusReplyingTo.vue b/components/status/StatusReplyingTo.vue
@@ -1,9 +1,10 @@
 <script setup lang="ts">
 import type { Status } from 'masto'
 
-const { status, collapsed = false } = defineProps<{
+const { status, collapsed = false, simplified = false } = defineProps<{
   status: Status
   collapsed: boolean
+  simplified: boolean
 }>()
 
 const isSelf = $computed(() => status.inReplyToAccountId === status.account.id)
@@ -21,8 +22,8 @@ const account = isSelf ? computed(() => status.account) : useAccountById(status.
       <template v-if="account">
         <div i-ri:reply-fill :class="collapsed ? '' : 'scale-x-[-1]'" text-secondary-light />
         <template v-if="!isSelf">
-          <AccountInlineInfo v-if="account" :account="account" :link="false" />
-          <span v-else ws-nowrap>{{ $t('status.someone') }}</span>
+          <AccountAvatar v-if="simplified" :account="account" :link="false" w-5 h-5 />
+          <AccountInlineInfo v-else :account="account" :link="false" />
         </template>
         <span v-else-if="!collapsed" ws-nowrap>{{ $t('status.thread') }}</span>
       </template>