Skip to content

[Backport staging] Support v12 rooms in maySendEvent #4956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 8, 2025
Merged

[Backport staging] Support v12 rooms in maySendEvent #4956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
579efd9
Support v12 rooms in maySendEvent (#4955)
dbkr Aug 8, 2025
82442bb
Merge branch 'staging' into backport-4955-to-staging
dbkr Aug 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 38 additions & 2 deletions spec/unit/room-state.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ describe("RoomState", function () {
const userLazy = "@lazy:bar";

let state = new RoomState(roomId);
let statev12 = new RoomState(roomId);

beforeEach(function () {
state = new RoomState(roomId);
state.setStateEvents([
const commonEvents = [
utils.mkMembership({
// userA joined
event: true,
Expand All @@ -67,6 +67,11 @@ describe("RoomState", function () {
name: "Room name goes here",
},
}),
];

state = new RoomState(roomId);
state.setStateEvents([
...commonEvents,
utils.mkEvent({
// Room creation
type: "m.room.create",
Expand All @@ -76,6 +81,19 @@ describe("RoomState", function () {
content: {},
}),
]);

statev12 = new RoomState(roomId);
statev12.setStateEvents([
...commonEvents,
utils.mkEvent({
// Room creation (v12 version)
type: "m.room.create",
user: userA,
room: roomId,
event: true,
content: { room_version: "12" },
}),
]);
});

describe("getMembers", function () {
Expand Down Expand Up @@ -1002,6 +1020,24 @@ describe("RoomState", function () {
expect(state.maySendEvent("m.room.other_thing", userA)).toEqual(true);
expect(state.maySendEvent("m.room.other_thing", userB)).toEqual(false);
});

it("should recognise power level of room creators in v12 rooms", function () {
const powerLevelEvent = new MatrixEvent({
type: "m.room.power_levels",
room_id: roomId,
sender: userA,
state_key: "",
content: {
users_default: 0,
state_default: 100,
events_default: 100,
users: {},
},
});
statev12.setStateEvents([powerLevelEvent]);

expect(statev12.maySendEvent("m.room.name", userA)).toEqual(true);
});
});

describe("processBeaconEvents", () => {
Expand Down
14 changes: 5 additions & 9 deletions src/models/room-state.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,7 +939,6 @@ export class RoomState extends TypedEventEmitter<EmittedEvents, EventHandlerMap>

let stateDefault = 0;
let eventsDefault = 0;
let powerLevel = 0;
if (powerLevelsEvent) {
powerLevels = powerLevelsEvent.getContent();
eventsLevels = powerLevels.events || {};
Expand All @@ -950,13 +949,6 @@ export class RoomState extends TypedEventEmitter<EmittedEvents, EventHandlerMap>
stateDefault = 50;
}

const userPowerLevel = powerLevels.users && powerLevels.users[userId];
if (Number.isSafeInteger(userPowerLevel)) {
powerLevel = userPowerLevel!;
} else if (Number.isSafeInteger(powerLevels.users_default)) {
powerLevel = powerLevels.users_default!;
}

if (Number.isSafeInteger(powerLevels.events_default)) {
eventsDefault = powerLevels.events_default!;
}
Expand All @@ -966,7 +958,11 @@ export class RoomState extends TypedEventEmitter<EmittedEvents, EventHandlerMap>
if (Number.isSafeInteger(eventsLevels[eventType])) {
requiredLevel = eventsLevels[eventType];
}
return powerLevel >= requiredLevel;

const roomMember = this.getMember(userId);
const userPowerLevel = roomMember?.powerLevel ?? 0;

return userPowerLevel >= requiredLevel;
}

/**
Expand Down