Progress on little important things

removing .mov for now until we can figure out solution with videojs, added model to track username changes, got chat creation flow down, progress on bookmark collections, albums, filtering blocks/mutes from group, explore, collection timelines

app/javascript/gabsocial/features/chat_conversation_create.js

@@ -14,6 +14,10 @@ import Text from '../components/text'
 
 class ChatConversationCreate extends React.PureComponent {
 
+  static contextTypes = {
+		router: PropTypes.object
+  }
+  
   state = {
     query: '',
   }
@@ -24,7 +28,7 @@ class ChatConversationCreate extends React.PureComponent {
   }
 
   handleOnCreateChatConversation = (accountId) => {
-    this.props.onCreateChatConversation(accountId)
+    this.props.onCreateChatConversation(accountId, this.context.router.history)
     this.props.onClearChatConversationAccountSuggestions()
 
     if (this.props.isModal && !!this.props.onCloseModal) {
@@ -81,8 +85,8 @@ const mapDispatchToProps = (dispatch) => ({
   onChange(value) {
     dispatch(fetchChatConversationAccountSuggestions(value))
   },
-  onCreateChatConversation(accountId) {
-    dispatch(createChatConversation(accountId))
+  onCreateChatConversation(accountId, routerHistory) {
+    dispatch(createChatConversation(accountId, routerHistory))
   },
   onClearChatConversationAccountSuggestions() {
     dispatch(clearChatConversationAccountSuggestions())

app/javascript/gabsocial/features/deck.js

@@ -215,7 +215,7 @@ class Deck extends React.PureComponent {
               <DeckColumn title={title} icon='pro' noButtons>
                 <div className={[_s.d, _s.px15, _s.py15].join(' ')}>
                   <Text>
-                    GabDeck is a unique way to customize your Gab experience. Upgrade to GabPRO to unlock the GabDeck.                  
+                    GabDeck is a unique way to customize your Gab experience. Upgrade to GabPRO to unlock the GabDeck.
                   </Text>
                   <div className={[_s.mt15, _s.d, _s.flexRow].join(' ')}>
                     <Button href={URL_GAB_PRO}>

app/javascript/gabsocial/features/hashtag_timeline.js

@@ -6,7 +6,6 @@ import isEqual from 'lodash.isequal'
 import { expandHashtagTimeline, clearTimeline } from '../actions/timelines'
 import { fetchHashtag } from '../actions/hashtags'
 import StatusList from '../components/status_list'
-import HashtagItem from '../components/hashtag_item'
 
 class HashtagTimeline extends React.PureComponent {
 
@@ -70,7 +69,7 @@ class HashtagTimeline extends React.PureComponent {
     const { id, tags } = this.props.params
 
     dispatch(expandHashtagTimeline(id, { tags }))
-    dispatch(fetchHashtag(tagName))
+    // dispatch(fetchHashtag(tagName))
   }
 
   componentWillReceiveProps (nextProps) {
@@ -94,15 +93,12 @@ class HashtagTimeline extends React.PureComponent {
     console.log("tagName:", tag)
 
     return (
-      <React.Fragment>
-        { tag && <HashtagItem hashtag={tag} /> }
-        <StatusList
-          scrollKey='hashtag_timeline'
-          timelineId={`hashtag:${tagName}`}
-          onLoadMore={this.handleLoadMore}
-          emptyMessage={<FormattedMessage id='empty_column.hashtag' defaultMessage='There is nothing in this hashtag yet.' />}
-        />
-      </React.Fragment>
+      <StatusList
+        scrollKey='hashtag_timeline'
+        timelineId={`hashtag:${tagName}`}
+        onLoadMore={this.handleLoadMore}
+        emptyMessage={<FormattedMessage id='empty_column.hashtag' defaultMessage='There is nothing in this hashtag yet.' />}
+      />
     )
   }
 
@@ -110,7 +106,7 @@ class HashtagTimeline extends React.PureComponent {
 
 const mapStateToProps = (state, props) => ({
   tagName: props.params.id,
-  tag: state.getIn(['hashtags', `${props.params.id}`]),
+  // tag: state.getIn(['hashtags', `${props.params.id}`]),
   hasUnread: state.getIn(['timelines', `hashtag:${props.params.id}`, 'unread']) > 0,
 })
 

app/javascript/gabsocial/features/messages/components/chat_message_compose_form.js

@@ -27,8 +27,8 @@ class ChatMessagesComposeForm extends React.PureComponent {
 
   handleOnSendChatMessage = () => {
     this.props.onSendChatMessage(this.state.value, this.props.chatConversationId)
-    document.querySelector('#gabsocial').focus()
-    this.onBlur()
+    // document.querySelector('#gabsocial').focus()
+    // this.onBlur()
     this.setState({ value: '' })
   }
 

app/javascript/gabsocial/features/messages/components/chat_message_scrolling_list.js

@@ -120,7 +120,9 @@ class ChatMessageScrollingList extends ImmutablePureComponent {
   }
 
   scrollToBottom = () => {
-    this.messagesEnd.scrollIntoView({ behavior: 'smooth' });
+    if (this.messagesEnd) {
+      this.messagesEnd.scrollIntoView({ behavior: 'smooth' });
+    }
   }
   
   _selectChild(index, align_top) {

app/javascript/gabsocial/features/messages_settings.js

@@ -30,7 +30,7 @@ class MessagesSettings extends ImmutablePureComponent {
         <div className={[_s.d, _s.px15, _s.py15, _s.overflowHidden].join(' ')}>
           <Form>
             <SettingSwitch
-              label='Restrict messages from people you dont follow'
+              label="Hide chats from users you don't follow"
               settings={chatSettings}
               settingPath='restrict_non_followers'
               onChange={this.handleOnChange}