cleanup

src/views/messages-view.jsx

@@ -391,9 +391,12 @@ class MessagesView extends React.Component {
 
       if (nextProps.forwardMessage) {
         if (nextProps.forwardMessage.content) {
+          const content = nextProps.forwardMessage.content;
+          const size = content?.length || (content?.size || 0);
           nextState.docPreview = {
-            object: nextProps.forwardMessage.content,
-            type: nextProps.forwardMessage.type
+            object: content,
+            type: nextProps.forwardMessage.type,
+            size: size
           };
         } else {
           // We are forwarding a message. Show preview.
@@ -1022,7 +1025,7 @@ class MessagesView extends React.Component {
   // sendMessage sends the message with an optional subscription to topic first.
   sendMessage(msg, uploadCompletionPromise, uploader) {
     let head;
-    if (this.props.forwardMessage) {
+    if (!msg && this.props.forwardMessage) {
       // We are forwarding a message.
       msg = this.props.forwardMessage.msg;
       head = this.props.forwardMessage.head;
@@ -1068,7 +1071,7 @@ class MessagesView extends React.Component {
     const maxInbandAttachmentSize = (this.props.tinode.getServerParam('maxMessageSize',
       MAX_INBAND_ATTACHMENT_SIZE) * 0.75 - 1024) | 0;
 
-    if (TheCard.isFileSupported(file.type, file.name)) {
+    if (TheCard.isFileSupported(file.type, file.name) || file.type == TheCard.contentType) {
       // This is a vCard file, try to convert and send as TheCard.
       if (this.sendTheCardAttachment(file, maxInbandAttachmentSize)) {
         // Successfully sent as TheCard.
@@ -1118,6 +1121,12 @@ class MessagesView extends React.Component {
       return false;
     }
 
+    if (file.type == TheCard.contentType) {
+      // Already TheCard, no need to convert.
+      this.sendMessage(Drafty.appendTheCard(null, file.object));
+      return true;
+    }
+
     importVCard(file)
       .then(card => {
         this.sendMessage(Drafty.appendTheCard(null, card));

src/views/new-topic-view.jsx

@@ -34,9 +34,13 @@ class NewTopicView extends React.Component {
   constructor(props) {
     super(props);
 
+    const urlParams = HashNavigation.parseUrlHash(window.location.hash).params;
+    const initialTab = urlParams['tab'] || 'find';
+    const initialQuery = initialTab == 'find' ? (urlParams['q'] || null) : null;
+
     this.state = {
-      tabSelected: 'find',
-      searchQuery: null
+      tabSelected: initialTab,
+      searchQuery: initialQuery
     };
 
     this.handleTabClick = this.handleTabClick.bind(this);
@@ -83,19 +87,19 @@ class NewTopicView extends React.Component {
 
   handleSearchResultSelected(topicName) {
     if (this.state.tabSelected == 'find') {
-      HashNavigation.navigateTo(HashNavigation.removeUrlParam(window.location.hash, 'tab'));
+      HashNavigation.navigateTo(HashNavigation.removeUrlParams(window.location.hash, ['tab', 'q']));
       this.props.onCreateTopic(topicName);
     }
   }
 
   handleNewGroupSubmit(name, description, dataUrl, priv, tags, isChannel) {
-    HashNavigation.navigateTo(HashNavigation.removeUrlParam(window.location.hash, 'tab'));
+    HashNavigation.navigateTo(HashNavigation.removeUrlParams(window.location.hash, ['tab', 'q']));
     this.props.onCreateTopic(undefined,
       {public: theCard(name, dataUrl, null, description), private: priv, tags: tags}, isChannel);
   }
 
   handleGroupByID(topicName) {
-    HashNavigation.navigateTo(HashNavigation.removeUrlParam(window.location.hash, 'tab'));
+    HashNavigation.navigateTo(HashNavigation.removeUrlParams(window.location.hash, ['tab', 'q']));
     this.props.onCreateTopic(topicName);
   }
 
@@ -131,26 +135,29 @@ class NewTopicView extends React.Component {
             tinode={this.props.tinode}
             onSubmit={this.handleNewGroupSubmit}
             onError={this.props.onError} /> :
-          this.state.tabSelected === 'byid' ?
-            <NewTopicById
-              myURI={Tinode.URI_TOPIC_ID_PREFIX + this.props.tinode.getCurrentUserID()}
-              onSubmit={this.handleGroupByID}
-              onError={this.props.onError} /> :
-            <div className="flex-column">
-              <SearchContacts
-                placeholder={search_placeholder}
-                onSearchContacts={this.handleSearchContacts} />
-              <ContactList
-                tinode={this.props.tinode}
-                contacts={this.props.searchResults}
-                myUserId={this.props.myUserId}
-                emptyListMessage={no_contacts_placeholder}
-                showSelfTopic={!this.state.searchQuery}
-                showOnline={false}
-                showUnread={false}
-                showContextMenu={false}
-                onTopicSelected={this.handleSearchResultSelected} />
-            </div>}
+
+        this.state.tabSelected === 'byid' ?
+          <NewTopicById
+            myURI={Tinode.URI_TOPIC_ID_PREFIX + this.props.tinode.getCurrentUserID()}
+            onSubmit={this.handleGroupByID}
+            onError={this.props.onError} /> :
+
+          <div className="flex-column">
+            <SearchContacts
+              placeholder={search_placeholder}
+              initialQuery={this.state.searchQuery || ''}
+              onSearchContacts={this.handleSearchContacts} />
+            <ContactList
+              tinode={this.props.tinode}
+              contacts={this.props.searchResults}
+              myUserId={this.props.myUserId}
+              emptyListMessage={no_contacts_placeholder}
+              showSelfTopic={!this.state.searchQuery}
+              showOnline={false}
+              showUnread={false}
+              showContextMenu={false}
+              onTopicSelected={this.handleSearchResultSelected} />
+          </div>}
       </div>
     );
   }

src/views/tinode-web.jsx

@@ -320,7 +320,7 @@ class TinodeWeb extends React.Component {
 
     // Window/tab visible or invisible for pausing timers.
     document.addEventListener('visibilitychange', this.handleVisibilityEvent);
-    
+
     // Listen for Escape key to clear selections.
     document.addEventListener('keydown', this.handleEscapeKey);
 
@@ -1150,7 +1150,6 @@ class TinodeWeb extends React.Component {
   //  - head - head dictionary to be attached to the message
   handleSendMessage(msg, uploadCompletionPromise, uploader, head) {
     const topic = this.tinode.getTopic(this.state.topicSelected);
-    /* TODO: check if return is required */
     return this.sendMessageToTopic(topic, msg, uploadCompletionPromise, uploader, head);
   }