bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'decrement-comment-count' into 'develop'

Browse source 
Decrement reply count

See merge request soapbox-pub/soapbox-fe!1481
This commit is contained in:
Justin 2022-06-01 17:46:52 +00:00
commit 46484bd940
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/soapbox/actions/__tests__/statuses-test.js
View file

Binary file not shown.

BIN
app/soapbox/actions/statuses.js
View file

Binary file not shown.

BIN
app/soapbox/reducers/__tests__/statuses-test.js
View file

Binary file not shown.

14
app/soapbox/reducers/statuses.ts
View file

@ -28,6 +28,8 @@ import {
STATUS_UNMUTE_SUCCESS,
STATUS_REVEAL,
STATUS_HIDE,
STATUS_DELETE_REQUEST,
STATUS_DELETE_FAIL,
} from '../actions/statuses';
import { TIMELINE_DELETE } from '../actions/timelines';
@ -152,7 +154,7 @@ const deleteStatus = (state: State, id: string, references: Array<string>) => {
return state.delete(id);
};
const importPendingStatus = (state: State, { in_reply_to_id }: APIEntity) => {
const incrementReplyCount = (state: State, { in_reply_to_id }: APIEntity) => {
if (in_reply_to_id) {
return state.updateIn([in_reply_to_id, 'replies_count'], 0, count => {
return typeof count === 'number' ? count + 1 : 0;
@ -162,7 +164,7 @@ const importPendingStatus = (state: State, { in_reply_to_id }: APIEntity) => {
}
};
const deletePendingStatus = (state: State, { in_reply_to_id }: APIEntity) => {
const decrementReplyCount = (state: State, { in_reply_to_id }: APIEntity) => {
if (in_reply_to_id) {
return state.updateIn([in_reply_to_id, 'replies_count'], 0, count => {
return typeof count === 'number' ? Math.max(0, count - 1) : 0;
@ -200,9 +202,9 @@ export default function statuses(state = initialState, action: AnyAction): State
case STATUSES_IMPORT:
return importStatuses(state, action.statuses, action.expandSpoilers);
case STATUS_CREATE_REQUEST:
return importPendingStatus(state, action.params);
return incrementReplyCount(state, action.params);
case STATUS_CREATE_FAIL:
return deletePendingStatus(state, action.params);
return decrementReplyCount(state, action.params);
case FAVOURITE_REQUEST:
return simulateFavourite(state, action.status.id, true);
case UNFAVOURITE_REQUEST:
@ -249,6 +251,10 @@ export default function statuses(state = initialState, action: AnyAction): State
}
});
});
case STATUS_DELETE_REQUEST:
return decrementReplyCount(state, action.params);
case STATUS_DELETE_FAIL:
return incrementReplyCount(state, action.params);
case TIMELINE_DELETE:
return deleteStatus(state, action.id, action.references);
default: