From 030586275ffea1a67e909765bf8f6d5f74e160b9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 14 Jul 2020 10:59:06 +0100
Subject: [PATCH] Fix /op command to accept only joined/invited users

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/SlashCommands.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/SlashCommands.tsx b/src/SlashCommands.tsx
index c593d3786f..ed69dd2204 100644
--- a/src/SlashCommands.tsx
+++ b/src/SlashCommands.tsx
@@ -43,6 +43,7 @@ import SdkConfig from "./SdkConfig";
 import { ensureDMExists } from "./createRoom";
 import { ViewUserPayload } from "./dispatcher/payloads/ViewUserPayload";
 import { Action } from "./dispatcher/actions";
+import { EffectiveMembership, getEffectiveMembership } from "./utils/membership";
 
 // XXX: workaround for https://github.com/microsoft/TypeScript/issues/31816
 interface HTMLInputEvent extends Event {
@@ -731,7 +732,9 @@ export const Commands = [
                         const room = cli.getRoom(roomId);
                         if (!room) return reject(_t("Command failed"));
                         const member = room.getMember(args);
-                        if (!member || member.membership !== "join") return reject(_t("Could not find user in room"));
+                        if (!member || getEffectiveMembership(member.membership) === EffectiveMembership.Leave) {
+                            return reject(_t("Could not find user in room"));
+                        }
                         const powerLevelEvent = room.currentState.getStateEvents('m.room.power_levels', '');
                         return success(cli.setPowerLevel(roomId, userId, powerLevel, powerLevelEvent));
                     }