revert single channel click (#7738)

- Revert "collab tweaks (#7706)"
- Revert "2112 (#7640)"
- Revert "single click channel (#7596)"
- Reserve protobufs
- Don't revert migrations

Release Notes:

- N/A

**or**

- N/A
This commit is contained in:
Conrad Irwin 2024-02-13 12:53:49 -07:00 committed by GitHub
parent ecd9b93cb1
commit 2294d99046
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
26 changed files with 525 additions and 709 deletions

View file

@ -54,7 +54,7 @@ impl TestServer {
Ok(SERVERS
.lock()
.get(url)
.ok_or_else(|| anyhow!("no server found for url: {}", url))?
.ok_or_else(|| anyhow!("no server found for url"))?
.clone())
}
@ -160,6 +160,7 @@ impl TestServer {
async fn remove_participant(&self, room_name: String, identity: String) -> Result<()> {
// TODO: clear state associated with the `Room`.
self.executor.simulate_random_delay().await;
let mut server_rooms = self.rooms.lock();
let room = server_rooms
@ -413,15 +414,6 @@ struct TestServerRoom {
participant_permissions: HashMap<Sid, proto::ParticipantPermission>,
}
impl Drop for TestServerRoom {
fn drop(&mut self) {
for room in self.client_rooms.values() {
let mut state = room.0.lock();
*state.connection.0.borrow_mut() = ConnectionState::Disconnected;
}
}
}
#[derive(Debug)]
struct TestServerVideoTrack {
sid: Sid,
@ -702,15 +694,11 @@ impl LocalTrackPublication {
pub fn is_muted(&self) -> bool {
if let Some(room) = self.room.upgrade() {
if room.is_connected() {
room.test_server()
.is_track_muted(&room.token(), &self.sid)
.unwrap_or(true)
} else {
true
}
room.test_server()
.is_track_muted(&room.token(), &self.sid)
.unwrap_or(false)
} else {
true
false
}
}