Merge pull request #2145 from matrix-org/bwindels/fixllroompermission

bwindels · web-flow · commit 50de22fb51fb · 2018-09-05T13:07:55.000+02:00
Don't rely on room members to query power levels
diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
@@ -309,8 +309,8 @@ export default class MessageComposer extends React.Component {
                 </div>;
         }
 
-        const canSendMessages = !this.state.tombstone && this.props.room.currentState.maySendMessage(
-            MatrixClientPeg.get().credentials.userId);
+        const canSendMessages = !this.state.tombstone &&
+            this.props.room.maySendMessage();
 
         if (canSendMessages) {
             // This also currently includes the call buttons. Really we should

Original file line number	Diff line number	Diff line change
`@@ -309,8 +309,8 @@ export default class MessageComposer extends React.Component {`
`309`	`309`	`</div>;`
`310`	`310`	`}`
`311`	`311`
`312`		`- const canSendMessages = !this.state.tombstone && this.props.room.currentState.maySendMessage(`
`313`		`- MatrixClientPeg.get().credentials.userId);`
	`312`	`+ const canSendMessages = !this.state.tombstone &&`
	`313`	`+ this.props.room.maySendMessage();`
`314`	`314`
`315`	`315`	`if (canSendMessages) {`
`316`	`316`	`// This also currently includes the call buttons. Really we should`