moony/Gab-Social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated StatusPrepend to include note for if reposted comment

Browse Source 
• Updated:
- StatusPrepend to include note for if reposted comment
This commit is contained in:
mgabdev 2020-11-06 23:20:48 -06:00
parent f220b67c74
commit 8cf80be6ca
1 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
app/javascript/gabsocial/components/status_prepend.js
View File

@ -23,7 +23,9 @@ class StatusPrepend extends ImmutablePureComponent {
if (!status) return null
const isRepost = (status.get('reblog', null) !== null && typeof status.get('reblog') === 'object')
const showRepostedComment = !!status.getIn(['reblog', 'in_reply_to_account_id'], null) && isRepost
const reblogUrl = status.getIn(['reblog', 'url'], null)
if (!isFeatured && !isPinnedInGroup && !isPromoted && !isRepost && !isComment) return null
let iconId
@ -37,7 +39,7 @@ class StatusPrepend extends ImmutablePureComponent {
<div className={[_s.d, _s.flexNormal, _s.flexRow, _s.aiCenter, _s.py5, _s.px15, _s.overflowHidden].join(' ')}>
<Icon id={iconId} size='12px' className={[_s.cSecondary, _s.mr5].join(' ')} />
{
isRepost && !isComment &&
isRepost && !isComment && !showRepostedComment &&
<div className={[_s.d, _s.flexRow].join(' ')}>
<Text size='small' color='secondary'>
<FormattedMessage
@ -61,6 +63,51 @@ class StatusPrepend extends ImmutablePureComponent {
</Text>
</div>
}
{
isRepost && !isComment && showRepostedComment &&
<div className={[_s.d, _s.flexRow].join(' ')}>
<Text size='small' color='secondary'>
<FormattedMessage
id='status.reposted_comment_by'
defaultMessage='{name} reposted a {comment} on {this_post}'
values={{
name: (
<NavLink
className={[_s.noUnderline, _s.underline_onHover].join(' ')}
to={`/${status.getIn(['account', 'acct'])}`}
>
<Text size='small' color='secondary' weight='medium'>
<bdi>
<span dangerouslySetInnerHTML={{ __html: status.getIn(['account', 'display_name_html']) }} />
</bdi>
</Text>
</NavLink>
),
comment: (
<a
className={[_s.noUnderline, _s.underline_onHover].join(' ')}
href={reblogUrl}
>
<Text size='small' color='secondary' weight='medium'>
comment
</Text>
</a>
),
this_post: (
<a
className={[_s.noUnderline, _s.underline_onHover].join(' ')}
href={reblogUrl}
>
<Text size='small' color='secondary' weight='medium'>
a post
</Text>
</a>
)
}}
/>
</Text>
</div>
}
{
!isRepost && !isComment &&
<Text color='secondary' size='small'>
@ -79,7 +126,7 @@ class StatusPrepend extends ImmutablePureComponent {
className={[_s.noUnderline, _s.underline_onHover].join(' ')}
to={`/${status.getIn(['account', 'acct'])}`}
>
<Text size='small' color='secondary'>
<Text size='small' color='secondary' weight='medium'>
<bdi>
<span dangerouslySetInnerHTML={{ __html: status.getIn(['account', 'display_name_html']) }} />
</bdi>