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

Merge pull request #859 from kmycode/kbtopic-fix-emoji-reaction-button

Browse source 
Fix upstream-20241001
This commit is contained in:
KMY（雪あすか） 2024-10-01 12:39:05 +09:00 • committed by GitHub
commit 007ed79b3b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/javascript/mastodon/actions/notification_groups.ts
View file

@ -68,7 +68,11 @@ function dispatchAssociatedRecords(
dispatch(importFetchedStatuses(fetchedStatuses));
}
const supportedGroupedNotificationTypes = ['favourite', 'reblog'];
const supportedGroupedNotificationTypes = [
'favourite',
'reblog',
'emoji_reaction',
];
export const fetchNotifications = createDataLoadingThunk(
'notificationGroups/fetch',

6
app/javascript/mastodon/components/status_action_bar.jsx
View file

@ -484,11 +484,13 @@ class StatusActionBar extends ImmutablePureComponent {
const outside = emojiReactionPolicy !== 'outside_only' || (relationship && (relationship.get('following') || relationship.get('followed_by')));
const denyFromAll = emojiReactionPolicy !== 'block' && emojiReactionPolicy !== 'block';
const emojiPickerDropdown = (enableEmojiReaction && emojiReactionAvailableServer && denyFromAll && (writtenByMe || (following && followed && mutual && outside)) && (
<div className='status__action-bar__button-wrapper'>
<EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} button={(
<IconButton className='status__action-bar__button' icon='smile-o' iconComponent={EmojiReactionIcon} onClick={this.handleEmojiPickInnerButton} />
<IconButton icon='smile-o' iconComponent={EmojiReactionIcon} onClick={this.handleEmojiPickInnerButton} />
)} />
</div>
)) || (enableEmojiReaction && (
<div className='status__action-bar__button__blank' />
<div className='status__action-bar__button-wrapper status__action-bar__button-wrapper__blank' />
)) || null;
const isReply = status.get('in_reply_to_account_id') === status.getIn(['account', 'id']);

8
app/javascript/styles/mastodon/components.scss
View file

@ -1524,6 +1524,10 @@ body > [data-popper-placement] {
&:last-child {
flex-grow: 0;
}
&__blank {
width: 24px;
}
}
&--first-in-thread {
@ -1767,10 +1771,6 @@ body > [data-popper-placement] {
align-items: center;
gap: 18px;
margin-top: 16px;
&__button__blank {
width: 24px;
}
}
.detailed-status__action-bar-dropdown {