about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/containers
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-12-16 11:50:35 +0100
committerGitHub <noreply@github.com>2022-12-16 11:50:35 +0100
commit7ca0a71601f92064db64862c8cab46a77d9c3d3d (patch)
tree342c9a8972757d3706903a40e27a6f8e5a43533e /app/javascript/flavours/glitch/containers
parent3868ba683d56dbbeecc839fdeaeb7b3d0b18bb9a (diff)
parent0912fb736d435b132779828376cd10cf7ad8e56e (diff)
Merge pull request #2014 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/containers')
-rw-r--r--app/javascript/flavours/glitch/containers/mastodon.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/containers/mastodon.js b/app/javascript/flavours/glitch/containers/mastodon.js
index 6c92376d8..dd7623a81 100644
--- a/app/javascript/flavours/glitch/containers/mastodon.js
+++ b/app/javascript/flavours/glitch/containers/mastodon.js
@@ -27,8 +27,9 @@ store.dispatch(hydrateAction);
 // check for deprecated local settings
 store.dispatch(checkDeprecatedLocalSettings());
 
-// load custom emojis
-store.dispatch(fetchCustomEmojis());
+if (initialState.meta.me) {
+  store.dispatch(fetchCustomEmojis());
+}
 
 const createIdentityContext = state => ({
   signedIn: !!state.meta.me,