This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 832
Add voice broadcast permissions #9284
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
d9e0c24
Add Voice Broadcast labs setting and composer button
weeman1337 a187760
Implement strict typing
weeman1337 a783f43
Extend MessageComposer-test
weeman1337 09bbee2
Extend tests
weeman1337 5b8a1db
Revert some strict type fixex
weeman1337 1a7a5b0
Merge branch 'develop' into weeman1337/voice-broadcast-button
weeman1337 16decd6
Implement voice broadcast permissions
weeman1337 5e404d5
Merge branch 'develop' into weeman1337/voice-broadcast-perm
weeman1337 6f50066
Update variable casing
weeman1337 148c874
Merge branch 'develop' into weeman1337/voice-broadcast-perm
weeman1337 217f41f
Merge branch 'develop' into weeman1337/voice-broadcast-perm
weeman1337 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
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
/* | ||
Copyright 2022 The Matrix.org Foundation C.I.C. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
export const VoiceBroadcastInfoEventType = "io.element.voice_broadcast_info"; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
test/components/views/settings/tabs/room/RolesRoomSettingsTab-test.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
/* | ||
Copyright 2022 The Matrix.org Foundation C.I.C. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
import React from "react"; | ||
import { fireEvent, render, RenderResult } from "@testing-library/react"; | ||
import { EventType, MatrixClient } from "matrix-js-sdk/src/matrix"; | ||
|
||
import RolesRoomSettingsTab from "../../../../../../src/components/views/settings/tabs/room/RolesRoomSettingsTab"; | ||
import { mkStubRoom, stubClient } from "../../../../../test-utils"; | ||
import { MatrixClientPeg } from "../../../../../../src/MatrixClientPeg"; | ||
import { VoiceBroadcastInfoEventType } from "../../../../../../src/voice-broadcast"; | ||
|
||
describe("RolesRoomSettingsTab", () => { | ||
const roomId = "!room:example.com"; | ||
let rolesRoomSettingsTab: RenderResult; | ||
let cli: MatrixClient; | ||
|
||
const getVoiceBroadcastsSelect = () => { | ||
return rolesRoomSettingsTab.container.querySelector("select[label='Voice broadcasts']"); | ||
}; | ||
|
||
const getVoiceBroadcastsSelectedOption = () => { | ||
return rolesRoomSettingsTab.container.querySelector("select[label='Voice broadcasts'] option:checked"); | ||
}; | ||
|
||
beforeEach(() => { | ||
stubClient(); | ||
cli = MatrixClientPeg.get(); | ||
rolesRoomSettingsTab = render(<RolesRoomSettingsTab roomId={roomId} />); | ||
mkStubRoom(roomId, "test room", cli); | ||
}); | ||
|
||
it("should initially show »Moderator« permission for »Voice broadcasts«", () => { | ||
expect(getVoiceBroadcastsSelectedOption().textContent).toBe("Moderator"); | ||
}); | ||
|
||
describe("when setting »Default« permission for »Voice broadcasts«", () => { | ||
beforeEach(() => { | ||
fireEvent.change(getVoiceBroadcastsSelect(), { | ||
target: { value: 0 }, | ||
}); | ||
}); | ||
|
||
it("should update the power levels", () => { | ||
expect(cli.sendStateEvent).toHaveBeenCalledWith( | ||
roomId, | ||
EventType.RoomPowerLevels, | ||
{ | ||
events: { | ||
[VoiceBroadcastInfoEventType]: 0, | ||
}, | ||
}, | ||
); | ||
}); | ||
}); | ||
}); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Start of the
voice-broadcast
module. More to come.