mirror of
https://github.com/cheeaun/phanpy.git
synced 2025-03-31 11:01:35 +02:00
The mention is hidden *inside* spoiler text
This commit is contained in:
parent
8e19d098eb
commit
fea7145ac9
1 changed files with 24 additions and 19 deletions
|
@ -94,6 +94,7 @@ function Status({
|
||||||
filtered,
|
filtered,
|
||||||
card,
|
card,
|
||||||
createdAt,
|
createdAt,
|
||||||
|
inReplyToId,
|
||||||
inReplyToAccountId,
|
inReplyToAccountId,
|
||||||
content,
|
content,
|
||||||
mentions,
|
mentions,
|
||||||
|
@ -279,26 +280,30 @@ function Status({
|
||||||
</span>
|
</span>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
{inReplyToAccountId && !withinContext && size !== 's' && (
|
{!!inReplyToId &&
|
||||||
<>
|
!!inReplyToAccountId &&
|
||||||
{inReplyToAccountId === status.account.id ? (
|
!withinContext &&
|
||||||
<div class="status-thread-badge">
|
size !== 's' && (
|
||||||
<Icon icon="thread" size="s" />
|
<>
|
||||||
Thread
|
{inReplyToAccountId === status.account.id ? (
|
||||||
</div>
|
<div class="status-thread-badge">
|
||||||
) : (
|
<Icon icon="thread" size="s" />
|
||||||
!!inReplyToAccount &&
|
Thread
|
||||||
!mentions.find((mention) => {
|
|
||||||
return mention.id === inReplyToAccountId;
|
|
||||||
}) && (
|
|
||||||
<div class="status-reply-badge">
|
|
||||||
<Icon icon="reply" />{' '}
|
|
||||||
<NameText account={inReplyToAccount} short />
|
|
||||||
</div>
|
</div>
|
||||||
)
|
) : (
|
||||||
)}
|
!!inReplyToAccount &&
|
||||||
</>
|
(!!spoilerText ||
|
||||||
)}
|
!mentions.find((mention) => {
|
||||||
|
return mention.id === inReplyToAccountId;
|
||||||
|
})) && (
|
||||||
|
<div class="status-reply-badge">
|
||||||
|
<Icon icon="reply" />{' '}
|
||||||
|
<NameText account={inReplyToAccount} short />
|
||||||
|
</div>
|
||||||
|
)
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
<div
|
<div
|
||||||
class={`content-container ${
|
class={`content-container ${
|
||||||
sensitive || spoilerText ? 'has-spoiler' : ''
|
sensitive || spoilerText ? 'has-spoiler' : ''
|
||||||
|
|
Loading…
Add table
Reference in a new issue