bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Conditionally link to emoji reaction list

Browse source 
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak 2021-09-09 20:44:12 +02:00
parent c80f87efaa
commit 660661451c
2 changed files with 31 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
app/soapbox/features/status/components/status_interaction_bar.js
View file

@ -1,18 +1,26 @@
import React from 'react'; import React from 'react';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePureComponent from 'react-immutable-pure-component';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { FormattedNumber } from 'react-intl'; import { FormattedNumber } from 'react-intl';
import emojify from 'soapbox/features/emoji/emoji'; import emojify from 'soapbox/features/emoji/emoji';
import { reduceEmoji } from 'soapbox/utils/emoji_reacts'; import { reduceEmoji } from 'soapbox/utils/emoji_reacts';
import SoapboxPropTypes from 'soapbox/utils/soapbox_prop_types'; import SoapboxPropTypes from 'soapbox/utils/soapbox_prop_types';
import { getFeatures } from 'soapbox/utils/features';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import Icon from 'soapbox/components/icon'; import Icon from 'soapbox/components/icon';
import { getSoapboxConfig } from 'soapbox/actions/soapbox'; import { getSoapboxConfig } from 'soapbox/actions/soapbox';
const mapStateToProps = state => ({ const mapStateToProps = state => {
allowedEmoji: getSoapboxConfig(state).get('allowedEmoji'), const instance = state.get('instance');
}); const features = getFeatures(instance);
return {
allowedEmoji: getSoapboxConfig(state).get('allowedEmoji'),
reactionList: features.exposableReactions,
};
};
export default @connect(mapStateToProps) export default @connect(mapStateToProps)
class StatusInteractionBar extends ImmutablePureComponent { class StatusInteractionBar extends ImmutablePureComponent {
@ -21,6 +29,7 @@ class StatusInteractionBar extends ImmutablePureComponent {
status: ImmutablePropTypes.map, status: ImmutablePropTypes.map,
me: SoapboxPropTypes.me, me: SoapboxPropTypes.me,
allowedEmoji: ImmutablePropTypes.list, allowedEmoji: ImmutablePropTypes.list,
reactionList: PropTypes.bool,
} }
getNormalizedReacts = () => { getNormalizedReacts = () => {
@ -50,7 +59,7 @@ class StatusInteractionBar extends ImmutablePureComponent {
} }
getEmojiReacts = () => { getEmojiReacts = () => {
const { status } = this.props; const { status, reactionList } = this.props;
const emojiReacts = this.getNormalizedReacts(); const emojiReacts = this.getNormalizedReacts();
const count = emojiReacts.reduce((acc, cur) => ( const count = emojiReacts.reduce((acc, cur) => (
@ -61,15 +70,23 @@ class StatusInteractionBar extends ImmutablePureComponent {
return ( return (
<div className='emoji-reacts-container'> <div className='emoji-reacts-container'>
<div className='emoji-reacts'> <div className='emoji-reacts'>
{emojiReacts.map((e, i) => ( {emojiReacts.map((e, i) => {
<Link to={`/@${status.getIn(['account', 'acct'])}/posts/${status.get('id')}/reactions/${e.get('name')}`} className='emoji-react' key={i}> const emojiReact = (
<span <>
className='emoji-react__emoji' <span
dangerouslySetInnerHTML={{ __html: emojify(e.get('name')) }} className='emoji-react__emoji'
/> dangerouslySetInnerHTML={{ __html: emojify(e.get('name')) }}
<span className='emoji-react__count'>{e.get('count')}</span> />
</Link> <span className='emoji-react__count'>{e.get('count')}</span>
))} </>
);
if (reactionList) {
return <Link to={`/@${status.getIn(['account', 'acct'])}/posts/${status.get('id')}/reactions/${e.get('name')}`} className='emoji-react' key={i}>{emojiReact}</Link>;
}
return <span className='emoji-react' key={i}>{emojiReact}</span>;
})}
</div> </div>
<div className='emoji-reacts__count'> <div className='emoji-reacts__count'>
{count} {count}

1
app/soapbox/utils/features.js
View file

@ -24,6 +24,7 @@ export const getFeatures = createSelector([
securityAPI: v.software === 'Pleroma', securityAPI: v.software === 'Pleroma',
settingsStore: v.software === 'Pleroma', settingsStore: v.software === 'Pleroma',
accountAliasesAPI: v.software === 'Pleroma', accountAliasesAPI: v.software === 'Pleroma',
exposableReactions: features.includes('exposable_reactions'),
}; };
}); });