Browse Source

Remove dependency on control module in user module.

wip
Titouan Rigoudy 9 years ago
parent
commit
8617a4a919
2 changed files with 4 additions and 6 deletions
  1. +1
    -1
      src/client.rs
  2. +3
    -5
      src/user.rs

+ 1
- 1
src/client.rs View File

@ -311,7 +311,7 @@ impl Client {
fn handle_privileged_users_response( fn handle_privileged_users_response(
&mut self, response: PrivilegedUsersResponse) &mut self, response: PrivilegedUsersResponse)
{ {
self.users.update_privileges(response);
self.users.set_all_privileged(response.users);
} }
fn handle_room_list_response(&mut self, response: RoomListResponse) { fn handle_room_list_response(&mut self, response: RoomListResponse) {


+ 3
- 5
src/user.rs View File

@ -1,6 +1,5 @@
use std::collections; use std::collections;
use proto::server;
use result; use result;
const STATUS_OFFLINE: u32 = 1; const STATUS_OFFLINE: u32 = 1;
@ -91,12 +90,11 @@ impl UserMap {
self.map.insert(name, user); self.map.insert(name, user);
} }
/// Update the set of privileged users based on the last server response.
pub fn update_privileges(
&mut self, mut response: server::PrivilegedUsersResponse)
/// Sets the set of privileged users to the given list.
pub fn set_all_privileged(&mut self, mut users: Vec<String>)
{ {
self.privileged.clear(); self.privileged.clear();
for name in response.users.drain(..) {
for name in users.drain(..) {
self.privileged.insert(name); self.privileged.insert(name);
} }
} }


Loading…
Cancel
Save