From: David Yip Date: Mon, 8 Jan 2018 15:43:57 +0000 (-0600) Subject: When pulling out max_toot_chars, handle nulls X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=2dc4fbbd1a13adbdca26a0b42ee6e289e736bba1;p=mastodon.git When pulling out max_toot_chars, handle nulls flavours/glitch/util/initial_state is used in places where we want to exhibit different behavior based on user preferences. This means that it's used in places where no preference is defined, i.e. on an unauthenticated access. All values exported from that module must therefore expect that case; previously, the max chars value didn't. Addresses #306. --- diff --git a/app/javascript/flavours/glitch/util/initial_state.js b/app/javascript/flavours/glitch/util/initial_state.js index a22b68f6f..ab502f9d4 100644 --- a/app/javascript/flavours/glitch/util/initial_state.js +++ b/app/javascript/flavours/glitch/util/initial_state.js @@ -18,6 +18,6 @@ export const boostModal = getMeta('boost_modal'); export const favouriteModal = getMeta('favourite_modal'); export const deleteModal = getMeta('delete_modal'); export const me = getMeta('me'); -export const maxChars = initialState.max_toot_chars || 500; +export const maxChars = (initialState && initialState.max_toot_chars) || 500; export default initialState;