mastofe

commit: 3ad2ef6ff32cac379709167df1697cb2c55564b4
parent: add3358722795a0574370ca384c7b3e95da80447
Author: Morgan Bazalgette <the@howl.moe>
Date:   Sat, 31 Mar 2018 14:17:43 +0200

remove lists

Diffstat:
M
app/javascript/mastodon/features/getting_started/index.js
2
--
M
app/javascript/mastodon/features/ui/index.js
2
--
M
app/javascript/mastodon/features/ui/util/async-components.js
4
----
M
app/javascript/mastodon/reducers/index.js
2
--
M
app/javascript/mastodon/reducers/settings.js
5
-----

5 files changed, 0 insertions(+), 15 deletions(-)
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js
@@ -25,7 +25,6 @@ const messages = defineMessages({
   favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' },
   blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' },
   info: { id: 'navigation_bar.info', defaultMessage: 'Extended information' },
-  lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' },
   keyboard_shortcuts: { id: 'navigation_bar.keyboard_shortcuts', defaultMessage: 'Keyboard shortcuts' },
 });
 
@@ -97,7 +96,6 @@ export default class GettingStarted extends ImmutablePureComponent {
 
     navItems.push(
       <ColumnLink key='4' icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' />,
-      <ColumnLink key='5' icon='bars' text={intl.formatMessage(messages.lists)} to='/lists' />
     );
 
     if (myAccount.get('locked')) {
diff --git a/app/javascript/mastodon/features/ui/index.js b/app/javascript/mastodon/features/ui/index.js
@@ -37,7 +37,6 @@ import {
   FavouritedStatuses,
   ListTimeline,
   Blocks,
-  Lists,
 } from './util/async-components';
 import { HotKeys } from 'react-hotkeys';
 import { me } from '../../initial_state';
@@ -153,7 +152,6 @@ class SwitchingColumnsArea extends React.PureComponent {
 
           <WrappedRoute path='/follow_requests' component={FollowRequests} content={children} />
           <WrappedRoute path='/blocks' component={Blocks} content={children} />
-          <WrappedRoute path='/lists' component={Lists} content={children} />
 
           <WrappedRoute component={GenericNotFound} content={children} />
         </WrappedSwitch>
diff --git a/app/javascript/mastodon/features/ui/util/async-components.js b/app/javascript/mastodon/features/ui/util/async-components.js
@@ -30,10 +30,6 @@ export function ListTimeline () {
   return import(/* webpackChunkName: "features/list_timeline" */'../../list_timeline');
 }
 
-export function Lists () {
-  return import(/* webpackChunkName: "features/lists" */'../../lists');
-}
-
 export function Status () {
   return import(/* webpackChunkName: "features/status" */'../../status');
 }
diff --git a/app/javascript/mastodon/reducers/index.js b/app/javascript/mastodon/reducers/index.js
@@ -23,7 +23,6 @@ import media_attachments from './media_attachments';
 import notifications from './notifications';
 import height_cache from './height_cache';
 import custom_emojis from './custom_emojis';
-import lists from './lists';
 import listEditor from './list_editor';
 
 const reducers = {
@@ -51,7 +50,6 @@ const reducers = {
   notifications,
   height_cache,
   custom_emojis,
-  lists,
   listEditor,
 };
 
diff --git a/app/javascript/mastodon/reducers/settings.js b/app/javascript/mastodon/reducers/settings.js
@@ -2,7 +2,6 @@ import { SETTING_CHANGE, SETTING_SAVE } from '../actions/settings';
 import { COLUMN_ADD, COLUMN_REMOVE, COLUMN_MOVE } from '../actions/columns';
 import { STORE_HYDRATE } from '../actions/store';
 import { EMOJI_USE } from '../actions/emojis';
-import { LIST_DELETE_SUCCESS, LIST_FETCH_FAIL } from '../actions/lists';
 import { Map as ImmutableMap, fromJS } from 'immutable';
 import uuid from '../uuid';
 
@@ -109,10 +108,6 @@ export default function settings(state = initialState, action) {
     return updateFrequentEmojis(state, action.emoji);
   case SETTING_SAVE:
     return state.set('saved', true);
-  case LIST_FETCH_FAIL:
-    return action.error.response.status === 404 ? filterDeadListColumns(state, action.id) : state;
-  case LIST_DELETE_SUCCESS:
-    return filterDeadListColumns(state, action.id);
   default:
     return state;
   }