rename readOnly -> !isReader etc

src/views/messages-view.jsx

@@ -112,15 +112,14 @@ class MessagesView extends React.Component {
         ((!prevProps.connected && this.props.connected) || (this.state.topic != prevState.topic))) {
       // Don't request the tags. They are useless unless the user
       // is the owner and is editing the topic.
-      const getQuery = topic.startMetaQuery()
+      let getQuery = topic.startMetaQuery().withLaterDesc().withLaterSub();
-        .withLaterDesc()
+      if (this.state.isReader) {
-        .withLaterSub()
+        getQuery = getQuery.withLaterData(MESSAGES_PAGE).withLaterDel();
-        .withLaterData(MESSAGES_PAGE)
+        // Show "loading" spinner.
-        .withLaterDel();
+        this.setState({ fetchingMessages: true });
+      }
       const setQuery = Tinode.isNewGroupTopicName(this.props.topic) ?
         this.props.newGroupTopicParams : undefined;
-      // Show "loading" spinner.
-      this.setState({ fetchingMessages: true });
       topic.subscribe(getQuery.build(), setQuery)
         .then((ctrl) => {
           if (this.state.topic != ctrl.topic) {
@@ -215,13 +214,13 @@ class MessagesView extends React.Component {
       }
     }
 
-    let val = nextProps.acs ? !nextProps.acs.isWriter() : true;
+    let val = nextProps.acs ? nextProps.acs.isWriter() : true;
-    if (val != prevState.readOnly) {
+    if (val != prevState.isWriter) {
-      nextState.readOnly = val;
+      nextState.isWriter = val;
     }
-    val = nextProps.acs ? !nextProps.acs.isReader() : true;
+    val = nextProps.acs ? nextProps.acs.isReader() : true;
-    if (val != prevState.writeOnly) {
+    if (val != prevState.isReader) {
-      nextState.writeOnly = val;
+      nextState.isReader = val;
     }
     val = isUnconfirmed(nextProps.acs);
     if (val != prevState.unconformed) {
@@ -301,16 +300,14 @@ class MessagesView extends React.Component {
 
     if (desc.acs) {
       this.setState({
-        readOnly: !desc.acs.isWriter(),
+        isWriter: desc.acs.isWriter(),
-        writeOnly: !desc.acs.isReader(),
+        isReader: desc.acs.isReader(),
         unconfirmed: isUnconfirmed(desc.acs),
       });
     }
   }
 
   handleSubsUpdated() {
-    console.log("handleSubsUpdated");
-
     if (this.state.topic) {
       var subs = [];
       var topic = this.props.tinode.getTopic(this.state.topic);
@@ -564,9 +561,8 @@ class MessagesView extends React.Component {
               <ul id="scroller" className={chatBoxClass}>
                 {messageNodes}
               </ul>
-              <div>Typing notifications here.</div>
             </div>
-            {this.state.writeOnly ?
+            {!this.state.isReader ?
             <div id="write-only-background">
               <div id="write-only-note">
                 <FormattedMessage id="messages_not_readable" defaultMessage="no access to messages"
@@ -583,7 +579,7 @@ class MessagesView extends React.Component {
             <SendMessage
               tinode={this.props.tinode}
               topic={this.props.topic}
-              disabled={this.state.readOnly}
+              disabled={!this.state.isWriter}
               sendMessage={this.props.sendMessage}
               onError={this.props.onError} />
           }

src/views/tinode-web.jsx

@@ -738,7 +738,7 @@ class TinodeWeb extends React.Component {
         const mode = topic.getAccessMode().getGiven();
         response = topic.setMeta({sub: {mode: mode}});
         if (topic.getType() == 'p2p') {
-          // For P2P topics chage 'given' permission of the peer too.
+          // For P2P topics change 'given' permission of the peer too.
           // In p2p topics the other user has the same name as the topic.
           response = response.then((ctrl) => {
             topic.setMeta({sub: {user: topicName, mode: mode}});
@@ -752,6 +752,13 @@ class TinodeWeb extends React.Component {
       case 'block':
         // Ban the topic making futher invites impossible.
         response = topic.setMeta({sub: {mode: 'N'}});
+        if (topic.getType() == 'p2p') {
+          // For P2P topics change 'given' permission of the peer too.
+          // In p2p topics the other user has the same name as the topic.
+          response = response.then((ctrl) => {
+            topic.setMeta({sub: {user: topicName, mode: 'N'}});
+          });
+        }
         break;
       default:
         console.log("Unknown invitation action", '"' + action + '""');