Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Fix setBotPower to not use .content #7179

Merged
merged 3 commits into from
Dec 1, 2021
Merged

Fix setBotPower to not use .content #7179

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad401c9
Fix setBotPower to not use `.content`
Half-Shot Nov 22, 2021
5fd6bbb
Simplify currentPl
Half-Shot Nov 22, 2021
49f2cde
Merge remote-tracking branch 'origin/develop' into hs/fix-setBotPower…
Half-Shot Dec 1, 2021
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/ScalarMessaging.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,10 +473,7 @@ async function setBotPower(
// If the PL is equal to or greater than the requested PL, ignore.
if (ignoreIfGreater === true) {
// As per https://matrix.org/docs/spec/client_server/r0.6.0#m-room-power-levels
const currentPl = (
powerLevels.content.users && powerLevels.content.users[userId]
) || powerLevels.content.users_default || 0;

const currentPl = powerLevels.users?.[userId] ?? powerLevels.users_default ?? 0;
if (currentPl >= level) {
return sendResponse(event, {
success: true,
Expand Down