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

Add emoji reaction deletion api

Browse source
This commit is contained in:
KMY 2023-02-25 10:42:19 +09:00
parent 5f7da7bff1
commit 15bc0df759
14 changed files with 142 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/javascript/mastodon/features/notifications/containers/notification_container.js
View file

@ -8,6 +8,7 @@ import {
favourite,
unreblog,
unfavourite,
emojiReact,
} from '../../../actions/interactions';
import {
hideStatus,
@ -62,7 +63,7 @@ const mapDispatchToProps = dispatch => ({
},
onEmojiReact (status, emoji) {
dispatch(emojiReact(status, emoji));
},
onToggleHidden (status) {

9
app/javascript/mastodon/features/status/components/action_bar.jsx
View file

@ -63,6 +63,7 @@ class ActionBar extends React.PureComponent {
onReply: PropTypes.func.isRequired,
onReblog: PropTypes.func.isRequired,
onFavourite: PropTypes.func.isRequired,
onEmojiReact: PropTypes.func.isRequired,
onBookmark: PropTypes.func.isRequired,
onDelete: PropTypes.func.isRequired,
onEdit: PropTypes.func.isRequired,
@ -182,13 +183,7 @@ class ActionBar extends React.PureComponent {
};
handleEmojiPick = (data) => {
/*
const { text } = this.props;
const position = this.autosuggestTextarea.textarea.selectionStart;
const needsSpace = data.custom && position > 0 && !allowedAroundShortCode.includes(text[position - 1]);
this.props.onPickEmoji(position, data, needsSpace);
*/
this.props.onEmojiReact(this.props.status, data);
};
render () {

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

@ -191,7 +191,7 @@ class DetailedStatus extends ImmutablePureComponent {
let emojiReactionsBar = null;
if (status.get('emoji_reactions')) {
const emojiReactions = status.get('emoji_reactions');
emojiReactionsBar = <StatusEmojiReactionsBar emojiReactions={emojiReactions} statusId={status.get('id')} />;
emojiReactionsBar = <StatusEmojiReactionsBar emojiReactions={emojiReactions} status={status} onEmojiReaction={this.props.onEmojiReaction} OnUnEmojiReaction={this.props.OnUnEmojiReaction} />;
}
if (status.get('application')) {

3
app/javascript/mastodon/features/status/containers/detailed_status_container.js
View file

@ -13,6 +13,7 @@ import {
unfavourite,
pin,
unpin,
emojiReact,
} from '../../../actions/interactions';
import {
muteStatus,
@ -94,7 +95,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
},
onEmojiReact (status, emoji) {
dispatch(emojiReact(status, emoji));
},
onPin (status) {