Merge branch 'develop' into sort-imports

Signed-off-by: Aaron Raimist <aaron@raim.ist>
This commit is contained in:
Aaron Raimist 2021-12-09 08:34:20 +00:00
commit 7b94e13a84
642 changed files with 30052 additions and 8035 deletions

View file

@ -183,7 +183,7 @@ Response:
name: "dashboard",
data: {key: "val"}
}
room_id: !foo:bar,
room_id: "!foo:bar",
sender: "@alice:localhost"
}
]
@ -202,7 +202,7 @@ Example:
name: "dashboard",
data: {key: "val"}
}
room_id: !foo:bar,
room_id: "!foo:bar",
sender: "@alice:localhost"
}
]
@ -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,