CloudToys/puyopuyotetr.is
1
0
Fork 0
Code

fix image for new custom emoji reactions

Browse Source
This commit is contained in:
fef 2022-12-03 16:20:29 +00:00 committed by Jeremy Kescher
parent bad5b2d485
commit 53e8307a6b
No known key found for this signature in database
GPG Key ID: 80A419A7A613DFA4
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

@ -404,7 +404,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); const status = getState().get('statuses').get(statusId);
let alreadyAdded = false; let alreadyAdded = false;
if (status) { if (status) {
@ -414,7 +414,7 @@ export const addReaction = (statusId, name) => (dispatch, getState) => {
} }
} }
if (!alreadyAdded) { if (!alreadyAdded) {
dispatch(addReactionRequest(statusId, name)); dispatch(addReactionRequest(statusId, name, url));
} }
api(getState).post(`/api/v1/statuses/${statusId}/react/${name}`).then(() => { api(getState).post(`/api/v1/statuses/${statusId}/react/${name}`).then(() => {
@ -426,10 +426,11 @@ export const addReaction = (statusId, name) => (dispatch, getState) => {
}); });
}; };
export const addReactionRequest = (statusId, name) => ({ export const addReactionRequest = (statusId, name, url) => ({
type: REACTION_ADD_REQUEST, type: REACTION_ADD_REQUEST,
id: statusId, id: statusId,
name, name,
url,
}); });
export const addReactionSuccess = (statusId, name) => ({ export const addReactionSuccess = (statusId, name) => ({

2
app/javascript/flavours/glitch/components/status_action_bar.jsx
View File

@ -122,7 +122,7 @@ class StatusActionBar extends ImmutablePureComponent {
}; };
handleEmojiPick = data => { 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 => { handleReblogClick = e => {

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

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

2
app/javascript/flavours/glitch/features/status/components/action_bar.jsx
View File

@ -85,7 +85,7 @@ class ActionBar extends PureComponent {
}; };
handleEmojiPick = data => { 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) => { handleBookmarkClick = (e) => {

4
app/javascript/flavours/glitch/features/status/index.jsx
View File

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

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

@ -83,11 +83,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 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, state,
id, id,
name, 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( const removeReaction = (state, id, name) => updateReaction(
@ -127,7 +133,7 @@ export default function statuses(state = initialState, action) {
return updateReactionCount(state, action.reaction); return updateReactionCount(state, action.reaction);
case REACTION_ADD_REQUEST: case REACTION_ADD_REQUEST:
case REACTION_REMOVE_FAIL: 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_REMOVE_REQUEST:
case REACTION_ADD_FAIL: case REACTION_ADD_FAIL:
return removeReaction(state, action.id, action.name); return removeReaction(state, action.id, action.name);

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

@ -424,7 +424,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); const status = getState().get('statuses').get(statusId);
let alreadyAdded = false; let alreadyAdded = false;
if (status) { if (status) {
@ -434,7 +434,7 @@ export const addReaction = (statusId, name) => (dispatch, getState) => {
} }
} }
if (!alreadyAdded) { if (!alreadyAdded) {
dispatch(addReactionRequest(statusId, name)); dispatch(addReactionRequest(statusId, name, url));
} }
api(getState).post(`/api/v1/statuses/${statusId}/react/${name}`).then(() => { api(getState).post(`/api/v1/statuses/${statusId}/react/${name}`).then(() => {
@ -446,10 +446,11 @@ export const addReaction = (statusId, name) => (dispatch, getState) => {
}); });
}; };
export const addReactionRequest = (statusId, name) => ({ export const addReactionRequest = (statusId, name, url) => ({
type: REACTION_ADD_REQUEST, type: REACTION_ADD_REQUEST,
id: statusId, id: statusId,
name, name,
url,
}); });
export const addReactionSuccess = (statusId, name) => ({ export const addReactionSuccess = (statusId, name) => ({

4
app/javascript/mastodon/containers/status_container.jsx
View File

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

4
app/javascript/mastodon/features/status/index.jsx
View File

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

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

@ -80,11 +80,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 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, state,
id, id,
name, 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( const removeReaction = (state, id, name) => updateReaction(
@ -124,7 +130,7 @@ export default function statuses(state = initialState, action) {
return updateReactionCount(state, action.reaction); return updateReactionCount(state, action.reaction);
case REACTION_ADD_REQUEST: case REACTION_ADD_REQUEST:
case REACTION_REMOVE_FAIL: 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_REMOVE_REQUEST:
case REACTION_ADD_FAIL: case REACTION_ADD_FAIL:
return removeReaction(state, action.id, action.name); return removeReaction(state, action.id, action.name);