Account for encryption in maySendMessage() (#2159)

matrix-org · Feb 7, 2022 · 12afcd3 · 12afcd3
1 parent 2d23330
commit 12afcd3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/spec/unit/room.spec.js b/spec/unit/room.spec.js
@@ -1461,7 +1461,7 @@ describe("Room", function() {
     describe("maySendMessage", function() {
         it("should return false if synced membership not join",
         function() {
-            const room = new Room(roomId, null, userA);
+            const room = new Room(roomId, { isRoomEncrypted: () => false }, userA);
             room.updateMyMembership("invite");
             expect(room.maySendMessage()).toEqual(false);
             room.updateMyMembership("leave");

diff --git a/src/models/room.ts b/src/models/room.ts
@@ -2199,8 +2199,9 @@ export class Room extends EventEmitter {
      *                   message events into the room.
      */
     public maySendMessage(): boolean {
-        return this.getMyMembership() === 'join' &&
-            this.currentState.maySendEvent(EventType.RoomMessage, this.myUserId);
+        return this.getMyMembership() === 'join' && (this.client.isRoomEncrypted(this.roomId)
+            ? this.currentState.maySendEvent(EventType.RoomMessageEncrypted, this.myUserId)
+            : this.currentState.maySendEvent(EventType.RoomMessage, this.myUserId));
     }
 
     /**