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

Merge branch 'editing-timeline-insert' into 'develop'

Browse source 
don't insert posts to timelines when editing a post

Closes #1300

See merge request soapbox-pub/soapbox!2128
This commit is contained in:
marcin mikołajczak 2023-01-07 16:07:20 +00:00
commit c2e2c59d96
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Search: fixes an abort error when using the navbar search component. - Search: fixes an abort error when using the navbar search component.
- Posts: fix monospace font in Markdown code blocks. - Posts: fix monospace font in Markdown code blocks.
- Modals: fix action buttons overflow - Modals: fix action buttons overflow
- Editing: don't insert edited posts to the top of the feed.
## [3.0.0] - 2022-12-25 ## [3.0.0] - 2022-12-25

2
app/soapbox/actions/statuses.ts
View file

@ -68,7 +68,7 @@ const createStatus = (params: Record<string, any>, idempotencyKey: string, statu
} }
dispatch(importFetchedStatus(status, idempotencyKey)); dispatch(importFetchedStatus(status, idempotencyKey));
dispatch({ type: STATUS_CREATE_SUCCESS, status, params, idempotencyKey }); dispatch({ type: STATUS_CREATE_SUCCESS, status, params, idempotencyKey, editing: !!statusId });
// Poll the backend for the updated card // Poll the backend for the updated card
if (status.expectsCard) { if (status.expectsCard) {

2
app/soapbox/reducers/timelines.ts
View file

@ -314,7 +314,7 @@ export default function timelines(state: State = initialState, action: AnyAction
if (action.params.scheduled_at) return state; if (action.params.scheduled_at) return state;
return importPendingStatus(state, action.params, action.idempotencyKey); return importPendingStatus(state, action.params, action.idempotencyKey);
case STATUS_CREATE_SUCCESS: case STATUS_CREATE_SUCCESS:
if (action.status.scheduled_at) return state; if (action.status.scheduled_at || action.editing) return state;
return importStatus(state, action.status, action.idempotencyKey); return importStatus(state, action.status, action.idempotencyKey);
case TIMELINE_EXPAND_REQUEST: case TIMELINE_EXPAND_REQUEST:
return setLoading(state, action.timeline, true); return setLoading(state, action.timeline, true);