Fix message history and new message reception

Author: clbond

components/ChatHistory.js

@@ -18,6 +18,7 @@ const renderMessage = (data) => {
   const msgDate = new Date(data.When);
   const msgDateTime = msgDate.toLocaleDateString() + ' at ' + msgDate.toLocaleTimeString();
 
+  debugger;
   return (
     <View style={[ styles.flx1, styles.flxRow, styles.p1, styles.borderBHl, { borderColor: '#aaa' }]} key={data.When}>
       <View style={[styles.rounded6, styles.w2, styles.h2, styles.mt1,{ overflow: 'hidden' }]}>
@@ -68,9 +69,9 @@ export class ChatHistory extends Component {
   render() {
     const { props, state, onScroll, onContentSizeChange } = this;
 
-    const isValid = h => h.entry != null && h.entry.Who != null;
+    const rows = props.history.filter(h => h.Who != null);
 
-    const source = this.historySource.cloneWithRows(props.history.filter(isValid));
+    const source = this.historySource.cloneWithRows(rows);
 
     return (
       <View style={[styles.flx1, styles.flxRow, styles.selfStretch]}>

components/Conversation.js

@@ -80,7 +80,7 @@ class BareConversation extends Component {
   }
 
   onMessageReceived(m) {
-    this.props.addMessage([m.message]);
+    this.props.addMessage(m.message);
   }
 
   onPresenceChange(presenceData) {
@@ -108,12 +108,13 @@ class BareConversation extends Component {
   }
 
   fetchHistory() {
-    const { props } = this;
-    history(channel, props.lastMessageTimestamp).then(response => {
+    const {lastMessageTimestamp, addHistory} = this.props;
+
+    history(lastMessageTimestamp).then(response => {
       // make sure we're not duplicating our existing history
       if (response.messages.length > 0 &&
-          props.lastMessageTimeStamp !== response.startTimeToken) {
-        props.addHistory(response.messages, response.startTimeToken)
+          lastMessageTimestamp !== response.startTimeToken) {
+        addHistory(response.messages, response.startTimeToken)
       }
     })
   }

reducers/conversation.js

@@ -40,13 +40,11 @@ export const conversationReducer = (state = initialState, action) => {
 
     case ADD_HISTORY:
       return state
-        .update('history', (messages) => messages.unshift(
-            ...action.payload.messages.map(msg => msg.entry)
-        ))
+        .update('history', (messages) => messages.unshift(...action.payload.messages.map(msg => msg.entry)))
         .set('lastMessageTimestamp', action.payload.timestamp);
 
     case ADD_MESSAGE:
-      return state.update('history', message => messages.push(action.payload));
+      return state.update('history', messages => messages.push(action.payload));
 
     default:
       return state;

services/pubnub.js

@@ -125,7 +125,14 @@ export const history = (startTime) =>
         start: startTime,
         count: messageCount,
       },
-      (status, response) => resolve(response))
+      (status, response) => {
+        if (status.error) {
+          reject(status.category);
+        }
+        else {
+          resolve(response);
+        }
+      });
     })
     .catch(reject);
   });