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

Re-apply "Don't rely on room members to query power levels"
2018-09-06 17:23:02 +02:00
parent 8bd93a7c4f 26df485607
commit 6f706641a3
1 changed files with 2 additions and 2 deletions
--- 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