Merge branch 'fix-fix-broken-convos' into 'develop'

Fix fix broken convos

See merge request pleroma/pleroma-fe!2178
This commit is contained in:
HJ 2025-10-15 14:01:29 +00:00
commit 848f2c7ddb

View file

@ -139,33 +139,34 @@
class="status-heading" class="status-heading"
> >
<div class="heading-name-row"> <div class="heading-name-row">
<div class="heading-left"> <div
<h4 v-if="status.user"
class="status-username" class="heading-left"
:title="status.user?.name ?? $t('status.unknown_user_info')"
> >
<user-link <h4
v-if="status.user?.name" v-if="status.user.name_html"
class="account-name" class="status-username"
:title="status.user?.screen_name_ui" :title="status.user.name"
:user="status?.user"
:at="false"
> >
<RichContent <RichContent
v-if="status.user.name_html"
:html="status.user.name" :html="status.user.name"
:emoji="status.user.emoji" :emoji="status.user.emoji"
:is-local="status.user.is_local" :is-local="status.user.is_local"
/> />
<span v-else>{{ status.user.name }}</span>
</user-link>
<span
v-else
class="account-name unknown"
>
{{ $t('status.unknown_user') }}
</span>
</h4> </h4>
<h4
v-else
class="status-username"
:title="status.user.name"
>
{{ status.user.name }}
</h4>
<user-link
class="account-name"
:title="status.user.screen_name_ui"
:user="status.user"
:at="false"
/>
<img <img
v-if="!!(status.user && status.user.favicon)" v-if="!!(status.user && status.user.favicon)"
class="status-favicon" class="status-favicon"