remove explore

app/javascript/mastodon/features/explore/index.jsx

@@ -55,6 +55,8 @@ class Explore extends PureComponent {
     const { signedIn } = this.context.identity;
 
     return (
+
+      signedIn && (
       <Column bindToDocument={!multiColumn} ref={this.setRef} label={intl.formatMessage(messages.title)}>
         <ColumnHeader
           icon={isSearching ? 'search' : 'hashtag'}
@@ -106,7 +108,7 @@ class Explore extends PureComponent {
             </Helmet>
           </>
         )}
-      </Column>
+      </Column> )
     );
   }
 

app/javascript/mastodon/features/firehose/index.jsx

@@ -169,20 +169,6 @@ const Firehose = ({ feedType, multiColumn }) => {
         <ColumnSettings />
       </ColumnHeader>
 
-      <div className='account__section-headline'>
-        <NavLink exact to='/public/local'>
-          <FormattedMessage tagName='div' id='firehose.local' defaultMessage='This server' />
-        </NavLink>
-
-        <NavLink exact to='/public/remote'>
-          <FormattedMessage tagName='div' id='firehose.remote' defaultMessage='Other servers' />
-        </NavLink>
-
-        <NavLink exact to='/public'>
-          <FormattedMessage tagName='div' id='firehose.all' defaultMessage='All' />
-        </NavLink>
-      </div>
-
       <StatusListContainer
         prepend={prependBanner}
         timelineId={`${feedType}${onlyMedia ? ':media' : ''}`}

app/javascript/mastodon/features/ui/components/navigation_panel.jsx

@@ -7,6 +7,7 @@ import { Link } from 'react-router-dom';
 
 import { WordmarkLogo } from 'mastodon/components/logo';
 import NavigationPortal from 'mastodon/components/navigation_portal';
+import { timelinePreview, trendsEnabled } from 'mastodon/initial_state';
 import { transientSingleColumn } from 'mastodon/is_mobile';
 
 import ColumnLink from './column_link';
@@ -18,6 +19,7 @@ import SignInBanner from './sign_in_banner';
 const messages = defineMessages({
   home: { id: 'tabs_bar.home', defaultMessage: 'Home' },
   notifications: { id: 'tabs_bar.notifications', defaultMessage: 'Notifications' },
+  firehose: { id: 'column.firehose', defaultMessage: 'Live feeds' },
   direct: { id: 'navigation_bar.direct', defaultMessage: 'Private mentions' },
   favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favorites' },
   bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' },
@@ -73,6 +75,9 @@ class NavigationPanel extends Component {
             <FollowRequestsColumnLink />
           </>
         )}
+        {(signedIn) && (
+          <ColumnLink transparent to='/public/local' isActive={this.isFirehoseActive} icon='hashtag' text={intl.formatMessage(messages.firehose)} />
+        )}
 
         {!signedIn && (
           <div className='navigation-panel__sign-in-banner'>

config/routes.rb

@@ -10,9 +10,7 @@ Rails.application.routes.draw do
     /getting-started
     /keyboard-shortcuts
     /home
-    /public
     /public/local
-    /public/remote
     /conversations
     /lists/(*any)
     /notifications
@@ -21,7 +19,6 @@ Rails.application.routes.draw do
     /pinned
     /start
     /directory
-    /explore/(*any)
     /search
     /publish
     /follow_requests

config/settings.yml

@@ -2,7 +2,7 @@
 # important settings can be changed from the admin interface.
 
 defaults: &defaults
-  site_title: Mastodon
+  site_title: Mastodon Whippy Edition
   site_short_description: ''
   site_description: ''
   site_extended_description: ''