gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix: #666 絵文字リアクション機能に対応していないと思われるサーバーの投稿を詳細画面で開いた時、「n reactions」の表示を隠す (#692)

Browse source
This commit is contained in:
KMY（雪あすか） 2024-04-04 12:01:44 +09:00 • committed by GitHub
parent 07c6d896e0
commit 8007c5d697
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/javascript/mastodon/features/status/components/detailed_status.jsx
View file

@ -222,9 +222,9 @@ class DetailedStatus extends ImmutablePureComponent {
} }
let emojiReactionsBar = null; let emojiReactionsBar = null;
const emojiReactionAvailableServer = !isHideItem('emoji_reaction_unavailable_server') || status.getIn(['account', 'emoji_reaction_available_server']);
if (status.get('emoji_reactions')) { if (status.get('emoji_reactions')) {
const emojiReactions = status.get('emoji_reactions'); const emojiReactions = status.get('emoji_reactions');
const emojiReactionAvailableServer = !isHideItem('emoji_reaction_unavailable_server') || status.getIn(['account', 'emoji_reaction_available_server']);
if (emojiReactions.size > 0 && enableEmojiReaction && emojiReactionAvailableServer) { if (emojiReactions.size > 0 && enableEmojiReaction && emojiReactionAvailableServer) {
emojiReactionsBar = <StatusEmojiReactionsBar emojiReactions={emojiReactions} status={status} onEmojiReact={this.props.onEmojiReact} onUnEmojiReact={this.props.onUnEmojiReact} />; emojiReactionsBar = <StatusEmojiReactionsBar emojiReactions={emojiReactions} status={status} onEmojiReact={this.props.onEmojiReact} onUnEmojiReact={this.props.onUnEmojiReact} />;
} }
@ -279,7 +279,9 @@ class DetailedStatus extends ImmutablePureComponent {
); );
} }
if (this.props.history) { if (!enableEmojiReaction || !emojiReactionAvailableServer) {
emojiReactionsLink = null;
} else if (this.props.history) {
emojiReactionsLink = ( emojiReactionsLink = (
<Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/emoji_reactions`} className='detailed-status__link'> <Link to={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}/emoji_reactions`} className='detailed-status__link'>
<span className='detailed-status__favorites'> <span className='detailed-status__favorites'>