[Glitch] Fix emoji on Wrapstodon

Port 9702cbb41c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
This commit is contained in:
Echo
2025-12-09 11:36:08 +01:00
committed by Claire
parent 315f5e5a31
commit e554e5723d
3 changed files with 16 additions and 7 deletions

View File

@@ -37,7 +37,9 @@ export function hydrateStore(rawState) {
dispatch(hydrateCompose());
dispatch(hydrateSearch());
dispatch(importFetchedAccounts(Object.values(rawState.accounts)));
if (rawState.accounts) {
dispatch(importFetchedAccounts(Object.values(rawState.accounts)));
}
dispatch(saveSettings());
};
}

View File

@@ -2,10 +2,8 @@ import { createRoot } from 'react-dom/client';
import { Provider as ReduxProvider } from 'react-redux';
import {
importFetchedAccounts,
importFetchedStatuses,
} from '@/flavours/glitch/actions/importer';
import { importFetchedStatuses } from '@/flavours/glitch/actions/importer';
import { hydrateStore } from '@/flavours/glitch/actions/store';
import type { ApiAnnualReportResponse } from '@/flavours/glitch/api/annual_report';
import { Router } from '@/flavours/glitch/components/router';
import { WrapstodonShare } from '@/flavours/glitch/features/annual_report/share';
@@ -33,7 +31,14 @@ function loaded() {
if (!report) {
throw new Error('Initial state report not found');
}
store.dispatch(importFetchedAccounts(initialState.accounts));
// Set up store
store.dispatch(
hydrateStore({
meta: { locale: document.documentElement.lang },
accounts: initialState.accounts,
}),
);
store.dispatch(importFetchedStatuses(initialState.statuses));
store.dispatch(setReport(report));

View File

@@ -442,7 +442,9 @@ export const composeReducer = (state = initialState, action) => {
switch(action.type) {
case STORE_HYDRATE:
return hydrate(state, action.state.get('compose'));
if (action.state.get('compose'))
return hydrate(state, action.state.get('compose'));
return state;
case COMPOSE_MOUNT:
return state
.set('mounted', state.get('mounted') + 1)