withspectrum · brianlovin · Nov 21, 2018 · Nov 21, 2018 · Nov 21, 2018
diff --git a/src/components/composer/index.js b/src/components/composer/index.js
@@ -92,13 +92,17 @@ class ComposerWithData extends Component<Props, State> {
 
     let { storedBody, storedTitle } = this.getTitleAndBody();
 
+    const { activeCommunitySlug, activeChannelSlug } = queryString.parse(
+      props.location.search
+    );
+
     this.state = {
       title: storedTitle || '',
       body: storedBody || fromPlainText(''),
       availableCommunities: [],
       availableChannels: [],
-      activeCommunity: '',
-      activeChannel: '',
+      activeCommunity: activeCommunitySlug || '',
+      activeChannel: activeChannelSlug || '',
       isPublishing: false,
       postWasPublished: false,
     };
@@ -149,7 +153,7 @@ class ComposerWithData extends Component<Props, State> {
   handleIncomingProps = props => {
     const { user } = props.data;
     // if the user doesn't exist, bust outta here
-    if (!user || !user.id) return;
+    if (!user || !user.id || !user.communityConnection) return;
 
     const hasCommunities =
       user.communityConnection.edges &&

diff --git a/src/views/channel/index.js b/src/views/channel/index.js
@@ -355,6 +355,8 @@ class ChannelView extends React.Component<Props, State> {
             provideBack={true}
             backRoute={`/${communitySlug}`}
             noComposer={!isMember}
+            activeCommunitySlug={communitySlug}
+            activeChannelSlug={channel.slug}
           />
           <Grid id="main">
             <CoverPhoto src={community.coverPhoto} />

diff --git a/src/views/community/index.js b/src/views/community/index.js
@@ -180,7 +180,7 @@ class CommunityView extends React.Component<Props, State> {
               title={community.name}
               provideBack={true}
               backRoute={'/'}
-              noComposer={!community.communityPermissions.isMember}
+              noComposer
             />
 
             <Head
@@ -271,6 +271,7 @@ class CommunityView extends React.Component<Props, State> {
             provideBack={true}
             backRoute={'/'}
             noComposer={!community.communityPermissions.isMember}
+            activeCommunitySlug={community.slug}
           />
           <Grid id="main">
             <CoverPhoto src={community.coverPhoto} />

diff --git a/src/views/compose/index.js b/src/views/compose/index.js
diff --git a/src/views/compose/style.js b/src/views/compose/style.js
diff --git a/src/views/titlebar/index.js b/src/views/titlebar/index.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import compose from 'recompose/compose';
 import { withRouter } from 'react-router';
+import queryString from 'query-string';
 import Link from 'src/components/link';
 import ThreadSearch from '../dashboard/components/threadSearch';
 import Icon from '../../components/icons';
@@ -55,7 +56,16 @@ class Titlebar extends Component {
       filter,
       children,
       messageComposer,
+      activeCommunitySlug,
+      activeChannelSlug,
     } = this.props;
+    const query =
+      activeChannelSlug || activeCommunitySlug
+        ? `?${queryString.stringify({
+            activeChannelSlug,
+            activeCommunitySlug,
+          })}`
+        : '';
     return (
       <TitleBar>
         {provideBack ? (
@@ -80,7 +90,7 @@ class Titlebar extends Component {
             <IconButton glyph="message-new" color="text.reverse" />
           </Link>
         ) : (
-          <Link to={`/new/thread`}>
+          <Link to={`/new/thread${query}`}>
             <IconButton glyph="post" color="text.reverse" />
           </Link>
         )}