Merge commit '8099ba04be' into kb_migration

This commit is contained in:
KMY 2023-04-25 17:08:32 +09:00
commit 70ea37a4cc
302 changed files with 4018 additions and 2611 deletions

View file

@ -49,6 +49,7 @@ import {
COMPOSE_CHANGE_MEDIA_FOCUS,
COMPOSE_SET_STATUS,
COMPOSE_SEARCHABILITY_CHANGE,
COMPOSE_FOCUS,
} from '../actions/compose';
import { TIMELINE_DELETE } from '../actions/timelines';
import { STORE_HYDRATE } from '../actions/store';
@ -559,6 +560,8 @@ export default function compose(state = initialState, action) {
return state.update('poll', poll => poll.set('expires_in', action.expiresIn).set('multiple', action.isMultiple));
case COMPOSE_LANGUAGE_CHANGE:
return state.set('language', action.language);
case COMPOSE_FOCUS:
return state.set('focusDate', new Date());
default:
return state;
}