Merge branch 'immutable-consistency' into 'develop'

Use immutable.js consistently

See merge request soapbox-pub/soapbox-fe!747

app/soapbox/features/status/components/card.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import Immutable from 'immutable';
+import { is, fromJS } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import punycode from 'punycode';
 import classnames from 'classnames';
@@ -77,7 +77,7 @@ export default class Card extends React.PureComponent {
   };
 
   componentDidUpdate(prevProps) {
-    if (!Immutable.is(prevProps.card, this.props.card)) {
+    if (!is(prevProps.card, this.props.card)) {
       this.setState({ embedded: false });
     }
   }
@@ -86,7 +86,7 @@ export default class Card extends React.PureComponent {
     const { card, onOpenMedia } = this.props;
 
     onOpenMedia(
-      Immutable.fromJS([
+      fromJS([
         {
           type: 'image',
           url: card.get('embed_url'),

app/soapbox/features/status/index.js

@@ -1,4 +1,4 @@
-import Immutable from 'immutable';
+import { OrderedSet as ImmutableOrderedSet } from 'immutable';
 import React from 'react';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
@@ -71,11 +71,11 @@ const makeMapStateToProps = () => {
     (_, { id }) => id,
     state => state.getIn(['contexts', 'inReplyTos']),
   ], (statusId, inReplyTos) => {
-    let ancestorsIds = Immutable.OrderedSet();
+    let ancestorsIds = ImmutableOrderedSet();
     let id = statusId;
 
     while (id) {
-      ancestorsIds = Immutable.OrderedSet([id]).union(ancestorsIds);
+      ancestorsIds = ImmutableOrderedSet([id]).union(ancestorsIds);
       id = inReplyTos.get(id);
     }
 
@@ -86,7 +86,7 @@ const makeMapStateToProps = () => {
     (_, { id }) => id,
     state => state.getIn(['contexts', 'replies']),
   ], (statusId, contextReplies) => {
-    let descendantsIds = Immutable.OrderedSet();
+    let descendantsIds = ImmutableOrderedSet();
     const ids = [statusId];
 
     while (ids.length > 0) {
@@ -109,8 +109,8 @@ const makeMapStateToProps = () => {
 
   const mapStateToProps = (state, props) => {
     const status = getStatus(state, { id: props.params.statusId });
-    let ancestorsIds = Immutable.OrderedSet();
-    let descendantsIds = Immutable.OrderedSet();
+    let ancestorsIds = ImmutableOrderedSet();
+    let descendantsIds = ImmutableOrderedSet();
 
     if (status) {
       ancestorsIds = getAncestorsIds(state, { id: state.getIn(['contexts', 'inReplyTos', status.get('id')]) });

app/soapbox/reducers/dropdown_menu.js

@@ -1,10 +1,10 @@
-import Immutable from 'immutable';
+import { Map as ImmutableMap } from 'immutable';
 import {
   DROPDOWN_MENU_OPEN,
   DROPDOWN_MENU_CLOSE,
 } from '../actions/dropdown_menu';
 
-const initialState = Immutable.Map({ openId: null, placement: null, keyboard: false });
+const initialState = ImmutableMap({ openId: null, placement: null, keyboard: false });
 
 export default function dropdownMenu(state = initialState, action) {
   switch (action.type) {

app/soapbox/reducers/mutes.js

@@ -1,12 +1,12 @@
-import Immutable from 'immutable';
+import { Map as ImmutableMap } from 'immutable';
 
 import {
   MUTES_INIT_MODAL,
   MUTES_TOGGLE_HIDE_NOTIFICATIONS,
 } from '../actions/mutes';
 
-const initialState = Immutable.Map({
-  new: Immutable.Map({
+const initialState = ImmutableMap({
+  new: ImmutableMap({
     isSubmitting: false,
     account: null,
     notifications: true,

app/soapbox/reducers/push_notifications.js

@@ -1,9 +1,9 @@
 import { SET_BROWSER_SUPPORT, SET_SUBSCRIPTION, CLEAR_SUBSCRIPTION, SET_ALERTS } from '../actions/push_notifications';
-import Immutable from 'immutable';
+import { Map as ImmutableMap } from 'immutable';
 
-const initialState = Immutable.Map({
+const initialState = ImmutableMap({
   subscription: null,
-  alerts: new Immutable.Map({
+  alerts: new ImmutableMap({
     follow: false,
     follow_request: false,
     favourite: false,
@@ -19,11 +19,11 @@ export default function push_subscriptions(state = initialState, action) {
   switch(action.type) {
   case SET_SUBSCRIPTION:
     return state
-      .set('subscription', new Immutable.Map({
+      .set('subscription', new ImmutableMap({
         id: action.subscription.id,
         endpoint: action.subscription.endpoint,
       }))
-      .set('alerts', new Immutable.Map(action.subscription.alerts))
+      .set('alerts', new ImmutableMap(action.subscription.alerts))
       .set('isSubscribed', true);
   case SET_BROWSER_SUPPORT:
     return state.set('browserSupport', action.value);