From 10b6a19e0a90efdeb5658e5582fb79d9d41a6b76 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 17 Apr 2020 18:25:36 -0500
Subject: [PATCH] Obliterate initial-state nonsense

---
 app/gabsocial/initial_state.js              | 15 +------------
 app/gabsocial/reducers/compose.js           |  2 +-
 app/gabsocial/reducers/media_attachments.js | 25 +++++++++++++++++++--
 public/index.html                           |  1 -
 4 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/app/gabsocial/initial_state.js b/app/gabsocial/initial_state.js
index 90d997c6a..dd47e4e8b 100644
--- a/app/gabsocial/initial_state.js
+++ b/app/gabsocial/initial_state.js
@@ -1,19 +1,6 @@
 'use strict';
 
 const element = document.getElementById('initial-state');
-const initialState = element && JSON.parse(element.textContent);
-
-const getMeta = (prop) => initialState && initialState.meta && initialState.meta[prop];
-
-export const reduceMotion = getMeta('reduce_motion');
-export const displayMedia = getMeta('display_media');
-export const unfollowModal = getMeta('unfollow_modal');
-export const boostModal = getMeta('boost_modal');
-export const deleteModal = getMeta('delete_modal');
-export const searchEnabled = getMeta('search_enabled');
-export const invitesEnabled = getMeta('invites_enabled');
-export const profile_directory = getMeta('profile_directory');
-export const isStaff = getMeta('is_staff');
-export const unreadCount = getMeta('unread_count');
+const initialState = element ? JSON.parse(element.textContent) : {};
 
 export default initialState;
diff --git a/app/gabsocial/reducers/compose.js b/app/gabsocial/reducers/compose.js
index 8b9be5744..4bc327192 100644
--- a/app/gabsocial/reducers/compose.js
+++ b/app/gabsocial/reducers/compose.js
@@ -174,7 +174,7 @@ const privacyPreference = (a, b) => {
   return order[Math.max(order.indexOf(a), order.indexOf(b), 0)];
 };
 
-const hydrate = (state, hydratedState) => {
+const hydrate = (state, hydratedState = ImmutableMap()) => {
   state = clearAll(state.merge(hydratedState));
 
   if (hydratedState.has('text')) {
diff --git a/app/gabsocial/reducers/media_attachments.js b/app/gabsocial/reducers/media_attachments.js
index 24119f628..4cc6cf1a2 100644
--- a/app/gabsocial/reducers/media_attachments.js
+++ b/app/gabsocial/reducers/media_attachments.js
@@ -1,8 +1,29 @@
 import { STORE_HYDRATE } from '../actions/store';
-import { Map as ImmutableMap } from 'immutable';
+import {
+  Map as ImmutableMap,
+  List as ImmutableList,
+} from 'immutable';
 
 const initialState = ImmutableMap({
-  accept_content_types: [],
+  // FIXME: Leave this empty and pull from backend
+  accept_content_types: ImmutableList([
+    '.jpg',
+    '.jpeg',
+    '.png',
+    '.gif',
+    '.webp',
+    '.webm',
+    '.mp4',
+    '.m4v',
+    '.mov',
+    'image/jpeg',
+    'image/png',
+    'image/gif',
+    'image/webp',
+    'video/webm',
+    'video/mp4',
+    'video/quicktime',
+  ]),
 });
 
 export default function meta(state = initialState, action) {
diff --git a/public/index.html b/public/index.html
index a9a2f73a1..0d941aec3 100644
--- a/public/index.html
+++ b/public/index.html
@@ -9,7 +9,6 @@
     <link rel="stylesheet" href="/packs/css/common.css">
     <script src="/packs/js/common.js"></script>
     <script src="/packs/js/locale_en.chunk.js"></script>
-    <script id="initial-state" type="application/json">{"meta":{"streaming_api_base_url":"wss://gleasonator.com","access_token":"XXXX","locale":"en","domain":"localhost:3035","admin":"1","search_enabled":false,"repository":"soapbox-pub/soapbox","source_url":"https://gitlab.com/soapbox-pub/soapbox","version":"1.0.0rc1","invites_enabled":false,"logo":"","mask_icon":"","profile_directory":false,"funding":{"amount":2500,"patrons":2,"currency":"usd","interval":"month","goal":{"amount":"4500","text":"Operating expenses including monthly server costs, media storage, and email notifications."}},"promo_items":[{"icon":"area-chart","text":"Gleasonator stats","url":"https://fediverse.network/gleasonator.com"},{"icon":"music","text":"Gleasonator theme song","url":"https://media.gleasonator.com/custom/261905_gleasonator_song.mp3"}],"site_title":"Gleasonator","username":"alex","me":"1","unfollow_modal":false,"boost_modal":false,"delete_modal":true,"auto_play_gif":false,"display_media":"default","expand_spoilers":false,"reduce_motion":false,"advanced_layout":false,"group_in_home_feed":null,"is_staff":true,"unread_count":0},"compose":{"me":"1","default_privacy":"public","default_sensitive":false},"accounts":{"1":{"id":"1","username":"alex","acct":"alex","display_name":"Alex Gleason","locked":false,"bot":false,"created_at":"2020-01-08T01:25:43.943Z","is_moderator":false,"is_admin":true,"note":"\u003cp\u003eFediverse developer. I believe in nonviolence. \u003ca href=\"https://gleasonator.com/tags/vegan\" class=\"mention hashtag\" rel=\"tag\"\u003e#\u003cspan\u003evegan\u003c/span\u003e\u003c/a\u003e \u003ca href=\"https://gleasonator.com/tags/freeculture\" class=\"mention hashtag\" rel=\"tag\"\u003e#\u003cspan\u003efreeculture\u003c/span\u003e\u003c/a\u003e \u003ca href=\"https://gleasonator.com/tags/atheist\" class=\"mention hashtag\" rel=\"tag\"\u003e#\u003cspan\u003eatheist\u003c/span\u003e\u003c/a\u003e \u003ca href=\"https://gleasonator.com/tags/antiporn\" class=\"mention hashtag\" rel=\"tag\"\u003e#\u003cspan\u003eantiporn\u003c/span\u003e\u003c/a\u003e \u003ca href=\"https://gleasonator.com/tags/gendercritical\" class=\"mention hashtag\" rel=\"tag\"\u003e#\u003cspan\u003egendercritical\u003c/span\u003e\u003c/a\u003e. Avatar by Nina Paley (\u003cspan class=\"h-card\"\u003e\u003ca href=\"https://neenster.org/@nina\" class=\"u-url mention\"\u003e@\u003cspan\u003enina\u003c/span\u003e\u003c/a\u003e\u003c/span\u003e). Boosts ≠ endorsements.\u003c/p\u003e","url":"https://gleasonator.com/@alex","avatar":"https://media.gleasonator.com/accounts/avatars/000/000/001/original/b21db23d54442878.png","avatar_static":"https://media.gleasonator.com/accounts/avatars/000/000/001/original/b21db23d54442878.png","header":"https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png","header_static":"https://media.gleasonator.com/accounts/headers/000/000/001/original/9d0e4dbf1c9dbc8f.png","followers_count":325,"following_count":781,"statuses_count":2266,"is_pro":false,"is_verified":false,"is_donor":false,"is_investor":false,"customizations":{"background":null},"emojis":[],"fields":[{"name":"Website","value":"\u003ca href=\"https://alexgleason.me\" rel=\"me nofollow noopener\" target=\"_blank\"\u003e\u003cspan class=\"invisible\"\u003ehttps://\u003c/span\u003e\u003cspan class=\"\"\u003ealexgleason.me\u003c/span\u003e\u003cspan class=\"invisible\"\u003e\u003c/span\u003e\u003c/a\u003e","verified_at":"2020-01-09T03:26:54.760+00:00"},{"name":"Mastodon+Soapbox","value":"\u003ca href=\"https://soapbox.pub\" rel=\"me nofollow noopener\" target=\"_blank\"\u003e\u003cspan class=\"invisible\"\u003ehttps://\u003c/span\u003e\u003cspan class=\"\"\u003esoapbox.pub\u003c/span\u003e\u003cspan class=\"invisible\"\u003e\u003c/span\u003e\u003c/a\u003e","verified_at":null},{"name":"Email","value":"alex@alexgleason.me","verified_at":null},{"name":"Gender identity","value":"\u003ca href=\"https://4w.pub/im-not-trans-but-im-definitely-not-cis/\" rel=\"me nofollow noopener\" target=\"_blank\"\u003e\u003cspan class=\"invisible\"\u003ehttps://\u003c/span\u003e\u003cspan class=\"ellipsis\"\u003e4w.pub/im-not-trans-but-im-def\u003c/span\u003e\u003cspan class=\"invisible\"\u003einitely-not-cis/\u003c/span\u003e\u003c/a\u003e","verified_at":null}]}},"media_attachments":{"accept_content_types":[".jpg",".jpeg",".png",".gif",".webp",".webm",".mp4",".m4v",".mov","image/jpeg","image/png","image/gif","image/webp","video/webm","video/mp4","video/quicktime"]},"settings":{"frequentlyUsedEmojis":{"laughing":2,"flushed":1,"grinning":3,"slightly_frowning_face":1,"+1":2,"slightly_smiling_face":6,"dark_sunglasses":1,"smile":3,"tada":1,"thinking_face":4,"grin":1,"smiley":38,"joy":2,"man-shrugging":1,"clap":3,"stuck_out_tongue":2,"popcorn":2,"tm":4,"wave":5,"radioactive_sign":1,"warning":1,"sweat_smile":2,"smile_cat":1},"onboarded":false,"notifications":{"alerts":{"follow":true,"favourite":true,"reblog":true,"mention":true,"poll":true},"quickFilter":{"active":"all","show":true,"advanced":false},"shows":{"follow":true,"favourite":true,"reblog":true,"mention":true,"poll":true},"sounds":{"follow":true,"favourite":true,"reblog":true,"mention":true,"poll":true}},"public":{"other":{"onlyMedia":false},"regex":{"body":""}},"direct":{"regex":{"body":""}},"community":{"other":{"onlyMedia":false},"regex":{"body":""}},"skinTone":1,"trends":{"show":true},"columns":[{"id":"COMPOSE","uuid":"dee15b64-895c-4f7d-a46e-dfc7bbe72c13","params":{}},{"id":"HOME","uuid":"d502a858-a691-4afd-886e-04d0c8220e0b","params":{}},{"id":"NOTIFICATIONS","uuid":"01d1782d-b398-41c7-9959-6de84867b53a","params":{}}],"home":{"shows":{"reblog":true,"reply":true},"regex":{"body":""}}},"max_toot_chars":3000,"push_subscription":null}</script>
     <script src="/packs/js/application.chunk.js"></script>
   </head>
   <body class="app-body">