random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed visiblity favorites of a status

Browse Source 
todo: remove account ids from returning in "favourited_by"
This commit is contained in:
mgabdev 2019-07-03 23:47:23 -04:00
parent 99e25130e1
commit e210c70e21
3 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/gabsocial/components/status_action_bar.js
View File

@ -262,7 +262,7 @@ class StatusActionBar extends ImmutablePureComponent {
</div> </div>
<div className='status__action-bar__counter'> <div className='status__action-bar__counter'>
<IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} /> <IconButton className='status__action-bar-button star-icon' animate active={status.get('favourited')} pressed={status.get('favourited')} title={intl.formatMessage(messages.favourite)} icon='star' onClick={this.handleFavouriteClick} />
{favoriteCount !== 0 && <Link to={`/${status.getIn(['account', 'acct'])}/posts/${status.get('id')}/favorites`} className='detailed-status__link'>{favoriteCount}</Link>} {favoriteCount !== 0 && <span className='detailed-status__link'>{favoriteCount}</span>}
</div> </div>
{shareButton} {shareButton}

27
app/javascript/gabsocial/features/status/components/detailed_status.js
View File

@ -168,25 +168,14 @@ export default class DetailedStatus extends ImmutablePureComponent {
); );
} }
if (this.context.router) { favouriteLink = (
favouriteLink = ( <span className='detailed-status__link'>
<Link to={`/${status.getIn(['account', 'acct'])}/posts/${status.get('id')}/favorites`} className='detailed-status__link'> <Icon id='star' />
<Icon id='star' /> <span className='detailed-status__favorites'>
<span className='detailed-status__favorites'> <FormattedNumber value={status.get('favourites_count')} />
<FormattedNumber value={status.get('favourites_count')} /> </span>
</span> </span>
</Link> );
);
} else {
favouriteLink = (
<a href={`/interact/${status.get('id')}?type=favourite`} className='detailed-status__link' onClick={this.handleModalLink}>
<Icon id='star' />
<span className='detailed-status__favorites'>
<FormattedNumber value={status.get('favourites_count')} />
</span>
</a>
);
}
return ( return (
<div style={outerStyle}> <div style={outerStyle}>

3
app/javascript/gabsocial/features/ui/index.js
View File

@ -232,9 +232,6 @@ class SwitchingColumnsArea extends React.PureComponent {
<Redirect from='/@:username/posts/:statusId/reblogs' to='/:username/posts/:statusId/reblogs' /> <Redirect from='/@:username/posts/:statusId/reblogs' to='/:username/posts/:statusId/reblogs' />
<WrappedRoute path='/:username/posts/:statusId/reblogs' layout={LAYOUT.STATUS} component={Reblogs} content={children} /> <WrappedRoute path='/:username/posts/:statusId/reblogs' layout={LAYOUT.STATUS} component={Reblogs} content={children} />
<Redirect from='/@:username/posts/:statusId/favorites' to='/:username/posts/:statusId/favorites' />
<WrappedRoute path='/:username/posts/:statusId/favorites' layout={LAYOUT.STATUS} component={Favourites} content={children} />
<WrappedRoute layout={LAYOUT.EMPTY} component={GenericNotFound} content={children} /> <WrappedRoute layout={LAYOUT.EMPTY} component={GenericNotFound} content={children} />
</Switch> </Switch>
); );