Fix accidentally importing vanilla code in glitch-soc flavor (#1863)

diff --git a/app/javascript/flavours/glitch/main.js b/app/javascript/flavours/glitch/main.js
index 04efcd43fdd5691de2feb89eef0891391f619174..ecb19ef540150330bdc97b387d92543e0e785656 100644 (file)
--- a/app/javascript/flavours/glitch/main.js
+++ b/app/javascript/flavours/glitch/main.js
@@ -30,7 +30,7 @@ function main() {
     if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
       const [{ Workbox }, { me }] = await Promise.all([
         import('workbox-window'),
-        import('mastodon/initial_state'),
+        import('flavours/glitch/initial_state'),
       ]);
 
       const wb = new Workbox('/sw.js');

diff --git a/app/javascript/flavours/glitch/reducers/tags.js b/app/javascript/flavours/glitch/reducers/tags.js
index d24098e3941ae8ab4125413ff3212b39971b3f64..266b21177f157cab5fb2274765a0f92c30f19105 100644 (file)
--- a/app/javascript/flavours/glitch/reducers/tags.js
+++ b/app/javascript/flavours/glitch/reducers/tags.js
@@ -4,7 +4,7 @@ import {
   HASHTAG_FOLLOW_FAIL,
   HASHTAG_UNFOLLOW_REQUEST,
   HASHTAG_UNFOLLOW_FAIL,
-} from 'mastodon/actions/tags';
+} from 'flavours/glitch/actions/tags';
 import { Map as ImmutableMap, fromJS } from 'immutable';
 
 const initialState = ImmutableMap();