fef/nyastodon
1
1
Fork 0
forked from mirrors/catstodon
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix image for new custom emoji reactions

Browse source
This commit is contained in:
anna 2022-12-03 16:20:29 +00:00
parent e98f0f267c
commit fb0f9c2174
Signed by: fef
GPG key ID: EC22E476DC2D3D84
10 changed files with 36 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/javascript/flavours/glitch/actions/interactions.js
View file

@ -403,7 +403,7 @@ export function unpinFail(status, error) {
};
};
export const addReaction = (statusId, name) => (dispatch, getState) => {
export const addReaction = (statusId, name, url) => (dispatch, getState) => {
const status = getState().get('statuses').get(statusId);
let alreadyAdded = false;
if (status) {
@ -413,7 +413,7 @@ export const addReaction = (statusId, name) => (dispatch, getState) => {
}
}
if (!alreadyAdded) {
dispatch(addReactionRequest(statusId, name));
dispatch(addReactionRequest(statusId, name, url));
}
api(getState).post(`/api/v1/statuses/${statusId}/react/${name}`).then(() => {
@ -425,10 +425,11 @@ export const addReaction = (statusId, name) => (dispatch, getState) => {
});
};
export const addReactionRequest = (statusId, name) => ({
export const addReactionRequest = (statusId, name, url) => ({
type: REACTION_ADD_REQUEST,
id: statusId,
name,
url,
});
export const addReactionSuccess = (statusId, name) => ({

2
app/javascript/flavours/glitch/components/status_action_bar.js
View file

@ -118,7 +118,7 @@ class StatusActionBar extends ImmutablePureComponent {
}
handleEmojiPick = data => {
this.props.onReactionAdd(this.props.status.get('id'), data.native.replace(/:/g, ''));
this.props.onReactionAdd(this.props.status.get('id'), data.native.replace(/:/g, ''), data.imageUrl);
}
handleReblogClick = e => {

4
app/javascript/flavours/glitch/containers/status_container.js
View file

@ -167,8 +167,8 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
}
},
onReactionAdd (statusId, name) {
dispatch(addReaction(statusId, name));
onReactionAdd (statusId, name, url) {
dispatch(addReaction(statusId, name, url));
},
onReactionRemove (statusId, name) {

2
app/javascript/flavours/glitch/features/status/components/action_bar.js
View file

@ -81,7 +81,7 @@ class ActionBar extends React.PureComponent {
}
handleEmojiPick = data => {
this.props.onReactionAdd(this.props.status.get('id'), data.native.replace(/:/g, ''));
this.props.onReactionAdd(this.props.status.get('id'), data.native.replace(/:/g, ''), data.imageUrl);
}
handleBookmarkClick = (e) => {

4
app/javascript/flavours/glitch/features/status/index.js
View file

@ -293,12 +293,12 @@ class Status extends ImmutablePureComponent {
}
}
handleReactionAdd = (statusId, name) => {
handleReactionAdd = (statusId, name, url) => {
const { dispatch } = this.props;
const { signedIn } = this.context.identity;
if (signedIn) {
dispatch(addReaction(statusId, name));
dispatch(addReaction(statusId, name, url));
} else {
dispatch(openModal('INTERACTION', {
type: 'reaction_add',

12
app/javascript/flavours/glitch/reducers/statuses.js
View file

@ -59,11 +59,17 @@ const updateReaction = (state, id, name, updater) => state.update(
const updateReactionCount = (state, reaction) => updateReaction(state, reaction.status_id, reaction.name, x => x.set('count', reaction.count));
const addReaction = (state, id, name) => updateReaction(
// The url parameter is only used when adding a new custom emoji reaction
// (one that wasn't in the reactions list before) because we don't have its
// URL yet. In all other cases, it's undefined.
const addReaction = (state, id, name, url) => updateReaction(
state,
id,
name,
x => x.set('me', true).update('count', n => n + 1),
x => x.set('me', true)
.update('count', n => n + 1)
.update('url', old => old ? old : url)
.update('static_url', old => old ? old : url),
);
const removeReaction = (state, id, name) => updateReaction(
@ -103,7 +109,7 @@ export default function statuses(state = initialState, action) {
return updateReactionCount(state, action.reaction);
case REACTION_ADD_REQUEST:
case REACTION_REMOVE_FAIL:
return addReaction(state, action.id, action.name);
return addReaction(state, action.id, action.name, action.url);
case REACTION_REMOVE_REQUEST:
case REACTION_ADD_FAIL:
return removeReaction(state, action.id, action.name);

7
app/javascript/mastodon/actions/interactions.js
View file

@ -423,7 +423,7 @@ export function unpinFail(status, error) {
};
};
export const addReaction = (statusId, name) => (dispatch, getState) => {
export const addReaction = (statusId, name, url) => (dispatch, getState) => {
const status = getState().get('statuses').get(statusId);
let alreadyAdded = false;
if (status) {
@ -433,7 +433,7 @@ export const addReaction = (statusId, name) => (dispatch, getState) => {
}
}
if (!alreadyAdded) {
dispatch(addReactionRequest(statusId, name));
dispatch(addReactionRequest(statusId, name, url));
}
api(getState).post(`/api/v1/statuses/${statusId}/react/${name}`).then(() => {
@ -445,10 +445,11 @@ export const addReaction = (statusId, name) => (dispatch, getState) => {
});
};
export const addReactionRequest = (statusId, name) => ({
export const addReactionRequest = (statusId, name, url) => ({
type: REACTION_ADD_REQUEST,
id: statusId,
name,
url,
});
export const addReactionSuccess = (statusId, name) => ({

4
app/javascript/mastodon/containers/status_container.js
View file

@ -132,8 +132,8 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
}
},
onReactionAdd (statusId, name) {
dispatch(addReaction(statusId, name));
onReactionAdd (statusId, name, url) {
dispatch(addReaction(statusId, name, url));
},
onReactionRemove (statusId, name) {

4
app/javascript/mastodon/features/status/index.js
View file

@ -257,12 +257,12 @@ class Status extends ImmutablePureComponent {
}
}
handleReactionAdd = (statusId, name) => {
handleReactionAdd = (statusId, name, url) => {
const { dispatch } = this.props;
const { signedIn } = this.context.identity;
if (signedIn) {
dispatch(addReaction(statusId, name));
dispatch(addReaction(statusId, name, url));
} else {
dispatch(openModal('INTERACTION', {
type: 'reaction_add',

12
app/javascript/mastodon/reducers/statuses.js
View file

@ -57,11 +57,17 @@ const updateReaction = (state, id, name, updater) => state.update(
const updateReactionCount = (state, reaction) => updateReaction(state, reaction.status_id, reaction.name, x => x.set('count', reaction.count));
const addReaction = (state, id, name) => updateReaction(
// The url parameter is only used when adding a new custom emoji reaction
// (one that wasn't in the reactions list before) because we don't have its
// URL yet. In all other cases, it's undefined.
const addReaction = (state, id, name, url) => updateReaction(
state,
id,
name,
x => x.set('me', true).update('count', n => n + 1),
x => x.set('me', true)
.update('count', n => n + 1)
.update('url', old => old ? old : url)
.update('static_url', old => old ? old : url),
);
const removeReaction = (state, id, name) => updateReaction(
@ -101,7 +107,7 @@ export default function statuses(state = initialState, action) {
return updateReactionCount(state, action.reaction);
case REACTION_ADD_REQUEST:
case REACTION_REMOVE_FAIL:
return addReaction(state, action.id, action.name);
return addReaction(state, action.id, action.name, action.url);
case REACTION_REMOVE_REQUEST:
case REACTION_ADD_FAIL:
return removeReaction(state, action.id, action.name);