From 0daaf6f64573167f7773aacd6c40e72ca091f43c Mon Sep 17 00:00:00 2001
From: Titouan Rigoudy <titouan.rigoudy@gmail.com>
Date: Fri, 2 Dec 2022 00:48:38 +0000
Subject: [PATCH] Move set_tickers() from RoomMap to RoomEntry.

---
 client/src/client.rs   | 15 +++++++++------
 client/src/room/map.rs | 21 +++++----------------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/client/src/client.rs b/client/src/client.rs
index b6df70d..419e929 100644
--- a/client/src/client.rs
+++ b/client/src/client.rs
@@ -636,12 +636,15 @@ impl Client {
     &mut self,
     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(
diff --git a/client/src/room/map.rs b/client/src/room/map.rs
index 9e38ae4..fac2ed7 100644
--- a/client/src/room/map.rs
+++ b/client/src/room/map.rs
@@ -135,6 +135,11 @@ impl RoomEntry {
   pub fn remove_member(&mut self, user_name: &str) {
     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
@@ -255,22 +260,6 @@ impl RoomMap {
     }
     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)]