Browse Source

Move set_tickers() from RoomMap to RoomEntry.

main
Titouan Rigoudy 2 years ago
parent
commit
0daaf6f645
2 changed files with 14 additions and 22 deletions
  1. +9
    -6
      client/src/client.rs
  2. +5
    -16
      client/src/room/map.rs

+ 9
- 6
client/src/client.rs View File

@ -636,12 +636,15 @@ impl Client {
&mut self, &mut self,
response: server::RoomTickersResponse, response: server::RoomTickersResponse,
) { ) {
let result = self
.rooms
.set_tickers(&response.room_name, response.tickers);
if let Err(e) = result {
error!("RoomTickersResponse: {}", e);
}
let room = match self.rooms.get_mut_strict(&response.room_name) {
Ok(room) => room,
Err(err) => {
error!("RoomTickersResponse: {}", err);
return;
}
};
room.set_tickers(response.tickers);
} }
fn handle_room_user_joined_response( fn handle_room_user_joined_response(


+ 5
- 16
client/src/room/map.rs View File

@ -135,6 +135,11 @@ impl RoomEntry {
pub fn remove_member(&mut self, user_name: &str) { pub fn remove_member(&mut self, user_name: &str) {
self.state.members.remove(user_name); self.state.members.remove(user_name);
} }
/// Sets this room's "tickers" to the given list.
pub fn set_tickers(&mut self, tickers: Vec<(String, String)>) {
self.state.tickers = tickers;
}
} }
/// Contains the mapping from room names to room data and provides a clean /// Contains the mapping from room names to room data and provides a clean
@ -255,22 +260,6 @@ impl RoomMap {
} }
rooms rooms
} }
// TODO: Move remaining methods to `RoomEntry`.
/*---------*
* Tickers *
*---------*/
pub fn set_tickers(
&mut self,
room_name: &str,
tickers: Vec<(String, String)>,
) -> Result<(), RoomError> {
let room = self.get_mut_strict(room_name)?;
room.state.tickers = tickers;
Ok(())
}
} }
#[cfg(test)] #[cfg(test)]


Loading…
Cancel
Save