author | alfadur <mail@none> |
Sat, 02 Feb 2019 15:06:39 +0300 | |
changeset 14671 | 455865ccd36c |
parent 14504 | 6cc0fce249f9 |
child 14672 | 6e6632068a33 |
permissions | -rw-r--r-- |
13416 | 1 |
use super::{ |
14457 | 2 |
actions, |
3 |
actions::{Destination, PendingMessage}, |
|
4 |
client::HWClient, |
|
5 |
coretypes::{ClientId, RoomId}, |
|
6 |
handlers, |
|
14392 | 7 |
io::HWServerIO, |
14457 | 8 |
room::HWRoom, |
13416 | 9 |
}; |
13666 | 10 |
use crate::protocol::messages::*; |
14457 | 11 |
use crate::utils; |
12 |
use base64::encode; |
|
13805 | 13 |
use log::*; |
14457 | 14 |
use rand::{thread_rng, RngCore}; |
15 |
use slab; |
|
14504
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
16 |
use std::borrow::BorrowMut; |
12126 | 17 |
|
12852 | 18 |
type Slab<T> = slab::Slab<T>; |
12127 | 19 |
|
12126 | 20 |
pub struct HWServer { |
12143 | 21 |
pub clients: Slab<HWClient>, |
22 |
pub rooms: Slab<HWRoom>, |
|
13119
1e39b8749072
separated the server logic from all the async io mess.
alfadur
parents:
12852
diff
changeset
|
23 |
pub lobby_id: RoomId, |
13419 | 24 |
pub output: Vec<(Vec<ClientId>, HWServerMessage)>, |
13119
1e39b8749072
separated the server logic from all the async io mess.
alfadur
parents:
12852
diff
changeset
|
25 |
pub removed_clients: Vec<ClientId>, |
14457 | 26 |
pub io: Box<dyn HWServerIO>, |
12126 | 27 |
} |
28 |
||
29 |
impl HWServer { |
|
14392 | 30 |
pub fn new(clients_limit: usize, rooms_limit: usize, io: Box<dyn HWServerIO>) -> HWServer { |
13119
1e39b8749072
separated the server logic from all the async io mess.
alfadur
parents:
12852
diff
changeset
|
31 |
let rooms = Slab::with_capacity(rooms_limit); |
1e39b8749072
separated the server logic from all the async io mess.
alfadur
parents:
12852
diff
changeset
|
32 |
let clients = Slab::with_capacity(clients_limit); |
1e39b8749072
separated the server logic from all the async io mess.
alfadur
parents:
12852
diff
changeset
|
33 |
let mut server = HWServer { |
14457 | 34 |
clients, |
35 |
rooms, |
|
13119
1e39b8749072
separated the server logic from all the async io mess.
alfadur
parents:
12852
diff
changeset
|
36 |
lobby_id: 0, |
1e39b8749072
separated the server logic from all the async io mess.
alfadur
parents:
12852
diff
changeset
|
37 |
output: vec![], |
14392 | 38 |
removed_clients: vec![], |
14457 | 39 |
io, |
13119
1e39b8749072
separated the server logic from all the async io mess.
alfadur
parents:
12852
diff
changeset
|
40 |
}; |
14504
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
41 |
server.lobby_id = server.add_room().id; |
13119
1e39b8749072
separated the server logic from all the async io mess.
alfadur
parents:
12852
diff
changeset
|
42 |
server |
12126 | 43 |
} |
44 |
||
13119
1e39b8749072
separated the server logic from all the async io mess.
alfadur
parents:
12852
diff
changeset
|
45 |
pub fn add_client(&mut self) -> ClientId { |
1e39b8749072
separated the server logic from all the async io mess.
alfadur
parents:
12852
diff
changeset
|
46 |
let key: ClientId; |
1e39b8749072
separated the server logic from all the async io mess.
alfadur
parents:
12852
diff
changeset
|
47 |
{ |
1e39b8749072
separated the server logic from all the async io mess.
alfadur
parents:
12852
diff
changeset
|
48 |
let entry = self.clients.vacant_entry(); |
1e39b8749072
separated the server logic from all the async io mess.
alfadur
parents:
12852
diff
changeset
|
49 |
key = entry.key(); |
13798 | 50 |
let mut salt = [0u8; 18]; |
51 |
thread_rng().fill_bytes(&mut salt); |
|
52 |
||
53 |
let client = HWClient::new(entry.key(), encode(&salt)); |
|
13119
1e39b8749072
separated the server logic from all the async io mess.
alfadur
parents:
12852
diff
changeset
|
54 |
entry.insert(client); |
1e39b8749072
separated the server logic from all the async io mess.
alfadur
parents:
12852
diff
changeset
|
55 |
} |
14457 | 56 |
self.send( |
57 |
key, |
|
58 |
&Destination::ToSelf, |
|
59 |
HWServerMessage::Connected(utils::PROTOCOL_VERSION), |
|
60 |
); |
|
13119
1e39b8749072
separated the server logic from all the async io mess.
alfadur
parents:
12852
diff
changeset
|
61 |
key |
12126 | 62 |
} |
12127 | 63 |
|
13119
1e39b8749072
separated the server logic from all the async io mess.
alfadur
parents:
12852
diff
changeset
|
64 |
pub fn client_lost(&mut self, client_id: ClientId) { |
14457 | 65 |
actions::run_action( |
66 |
self, |
|
67 |
client_id, |
|
68 |
actions::Action::ByeClient("Connection reset".to_string()), |
|
69 |
); |
|
12127 | 70 |
} |
71 |
||
14504
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
72 |
pub fn add_room(&mut self) -> &mut HWRoom { |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
73 |
allocate_room(&mut self.rooms) |
12127 | 74 |
} |
12137
193dfdcb0620
- Use logging facilities instead of plain println!
unc0rr
parents:
12136
diff
changeset
|
75 |
|
14504
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
76 |
#[inline] |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
77 |
pub fn create_room( |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
78 |
&mut self, |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
79 |
creator_id: ClientId, |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
80 |
name: String, |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
81 |
password: Option<String>, |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
82 |
) -> RoomId { |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
83 |
create_room( |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
84 |
&mut self.clients[creator_id], |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
85 |
&mut self.rooms, |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
86 |
name, |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
87 |
password, |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
88 |
) |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
89 |
} |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
90 |
|
14671
455865ccd36c
Server action refactoring part 2 of N
alfadur <mail@none>
parents:
14504
diff
changeset
|
91 |
#[inline] |
455865ccd36c
Server action refactoring part 2 of N
alfadur <mail@none>
parents:
14504
diff
changeset
|
92 |
pub fn move_to_room(&mut self, client_id: ClientId, room_id: RoomId) { |
455865ccd36c
Server action refactoring part 2 of N
alfadur <mail@none>
parents:
14504
diff
changeset
|
93 |
move_to_room(&mut self.clients[client_id], &mut self.rooms[room_id]) |
455865ccd36c
Server action refactoring part 2 of N
alfadur <mail@none>
parents:
14504
diff
changeset
|
94 |
} |
455865ccd36c
Server action refactoring part 2 of N
alfadur <mail@none>
parents:
14504
diff
changeset
|
95 |
|
13524 | 96 |
fn get_recipients(&self, client_id: ClientId, destination: &Destination) -> Vec<ClientId> { |
97 |
let mut ids = match *destination { |
|
13419 | 98 |
Destination::ToSelf => vec![client_id], |
13426 | 99 |
Destination::ToId(id) => vec![id], |
14457 | 100 |
Destination::ToAll { |
101 |
room_id: Some(id), .. |
|
102 |
} => self.room_clients(id), |
|
103 |
Destination::ToAll { |
|
104 |
protocol: Some(proto), |
|
105 |
.. |
|
106 |
} => self.protocol_clients(proto), |
|
107 |
Destination::ToAll { .. } => self.clients.iter().map(|(id, _)| id).collect::<Vec<_>>(), |
|
13419 | 108 |
}; |
14457 | 109 |
if let Destination::ToAll { |
110 |
skip_self: true, .. |
|
111 |
} = destination |
|
112 |
{ |
|
13419 | 113 |
if let Some(index) = ids.iter().position(|id| *id == client_id) { |
114 |
ids.remove(index); |
|
115 |
} |
|
116 |
} |
|
117 |
ids |
|
13416 | 118 |
} |
119 |
||
14457 | 120 |
pub fn send( |
121 |
&mut self, |
|
122 |
client_id: ClientId, |
|
123 |
destination: &Destination, |
|
124 |
message: HWServerMessage, |
|
125 |
) { |
|
13524 | 126 |
let ids = self.get_recipients(client_id, &destination); |
13419 | 127 |
self.output.push((ids, message)); |
13416 | 128 |
} |
129 |
||
14671
455865ccd36c
Server action refactoring part 2 of N
alfadur <mail@none>
parents:
14504
diff
changeset
|
130 |
pub fn send_msg(&mut self, client_id: ClientId, message: PendingMessage) { |
455865ccd36c
Server action refactoring part 2 of N
alfadur <mail@none>
parents:
14504
diff
changeset
|
131 |
self.send(client_id, &message.destination, message.message) |
455865ccd36c
Server action refactoring part 2 of N
alfadur <mail@none>
parents:
14504
diff
changeset
|
132 |
} |
455865ccd36c
Server action refactoring part 2 of N
alfadur <mail@none>
parents:
14504
diff
changeset
|
133 |
|
13119
1e39b8749072
separated the server logic from all the async io mess.
alfadur
parents:
12852
diff
changeset
|
134 |
pub fn react(&mut self, client_id: ClientId, actions: Vec<actions::Action>) { |
12139 | 135 |
for action in actions { |
13119
1e39b8749072
separated the server logic from all the async io mess.
alfadur
parents:
12852
diff
changeset
|
136 |
actions::run_action(self, client_id, action); |
12138 | 137 |
} |
138 |
} |
|
13416 | 139 |
|
14457 | 140 |
pub fn lobby(&self) -> &HWRoom { |
141 |
&self.rooms[self.lobby_id] |
|
142 |
} |
|
13521 | 143 |
|
13416 | 144 |
pub fn has_room(&self, name: &str) -> bool { |
145 |
self.rooms.iter().any(|(_, r)| r.name == name) |
|
146 |
} |
|
147 |
||
148 |
pub fn find_room(&self, name: &str) -> Option<&HWRoom> { |
|
14457 | 149 |
self.rooms |
150 |
.iter() |
|
151 |
.find_map(|(_, r)| Some(r).filter(|r| r.name == name)) |
|
13416 | 152 |
} |
153 |
||
154 |
pub fn find_room_mut(&mut self, name: &str) -> Option<&mut HWRoom> { |
|
14457 | 155 |
self.rooms |
156 |
.iter_mut() |
|
157 |
.find_map(|(_, r)| Some(r).filter(|r| r.name == name)) |
|
13416 | 158 |
} |
159 |
||
13478 | 160 |
pub fn find_client(&self, nick: &str) -> Option<&HWClient> { |
14457 | 161 |
self.clients |
162 |
.iter() |
|
163 |
.find_map(|(_, c)| Some(c).filter(|c| c.nick == nick)) |
|
13478 | 164 |
} |
165 |
||
166 |
pub fn find_client_mut(&mut self, nick: &str) -> Option<&mut HWClient> { |
|
14457 | 167 |
self.clients |
168 |
.iter_mut() |
|
169 |
.find_map(|(_, c)| Some(c).filter(|c| c.nick == nick)) |
|
13478 | 170 |
} |
171 |
||
13416 | 172 |
pub fn select_clients<F>(&self, f: F) -> Vec<ClientId> |
14457 | 173 |
where |
174 |
F: Fn(&(usize, &HWClient)) -> bool, |
|
175 |
{ |
|
176 |
self.clients.iter().filter(f).map(|(_, c)| c.id).collect() |
|
13416 | 177 |
} |
178 |
||
179 |
pub fn room_clients(&self, room_id: RoomId) -> Vec<ClientId> { |
|
180 |
self.select_clients(|(_, c)| c.room_id == Some(room_id)) |
|
181 |
} |
|
182 |
||
13520 | 183 |
pub fn protocol_clients(&self, protocol: u16) -> Vec<ClientId> { |
13416 | 184 |
self.select_clients(|(_, c)| c.protocol_number == protocol) |
185 |
} |
|
186 |
||
187 |
pub fn other_clients_in_room(&self, self_id: ClientId) -> Vec<ClientId> { |
|
188 |
let room_id = self.clients[self_id].room_id; |
|
14457 | 189 |
self.select_clients(|(id, c)| *id != self_id && c.room_id == room_id) |
13416 | 190 |
} |
191 |
||
192 |
pub fn client_and_room(&mut self, client_id: ClientId) -> (&mut HWClient, Option<&mut HWRoom>) { |
|
193 |
let c = &mut self.clients[client_id]; |
|
194 |
if let Some(room_id) = c.room_id { |
|
195 |
(c, Some(&mut self.rooms[room_id])) |
|
196 |
} else { |
|
197 |
(c, None) |
|
198 |
} |
|
199 |
} |
|
13445
d3c86ade3d4d
Send the rnd reply to the room only.
Marcin Mielniczuk <marmistrz.dev@zoho.eu>
parents:
13442
diff
changeset
|
200 |
|
d3c86ade3d4d
Send the rnd reply to the room only.
Marcin Mielniczuk <marmistrz.dev@zoho.eu>
parents:
13442
diff
changeset
|
201 |
pub fn room(&mut self, client_id: ClientId) -> Option<&mut HWRoom> { |
d3c86ade3d4d
Send the rnd reply to the room only.
Marcin Mielniczuk <marmistrz.dev@zoho.eu>
parents:
13442
diff
changeset
|
202 |
self.client_and_room(client_id).1 |
d3c86ade3d4d
Send the rnd reply to the room only.
Marcin Mielniczuk <marmistrz.dev@zoho.eu>
parents:
13442
diff
changeset
|
203 |
} |
d3c86ade3d4d
Send the rnd reply to the room only.
Marcin Mielniczuk <marmistrz.dev@zoho.eu>
parents:
13442
diff
changeset
|
204 |
} |
14504
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
205 |
|
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
206 |
fn allocate_room(rooms: &mut Slab<HWRoom>) -> &mut HWRoom { |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
207 |
let entry = rooms.vacant_entry(); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
208 |
let key = entry.key(); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
209 |
let room = HWRoom::new(entry.key()); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
210 |
entry.insert(room) |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
211 |
} |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
212 |
|
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
213 |
fn create_room( |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
214 |
client: &mut HWClient, |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
215 |
rooms: &mut Slab<HWRoom>, |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
216 |
name: String, |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
217 |
password: Option<String>, |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
218 |
) -> RoomId { |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
219 |
let room = allocate_room(rooms); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
220 |
|
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
221 |
room.master_id = Some(client.id); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
222 |
room.name = name; |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
223 |
room.password = password; |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
224 |
room.protocol_number = client.protocol_number; |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
225 |
|
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
226 |
room.players_number = 1; |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
227 |
room.ready_players_number = 1; |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
228 |
|
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
229 |
client.room_id = Some(room.id); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
230 |
client.set_is_master(true); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
231 |
client.set_is_ready(true); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
232 |
client.set_is_joined_mid_game(false); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
233 |
|
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
234 |
room.id |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
235 |
} |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
236 |
|
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
237 |
fn move_to_room(client: &mut HWClient, room: &mut HWRoom) { |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
238 |
debug_assert!(client.room_id != Some(room.id)); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
239 |
|
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
240 |
room.players_number += 1; |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
241 |
|
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
242 |
client.room_id = Some(room.id); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
243 |
client.set_is_joined_mid_game(room.game_info.is_some()); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
244 |
client.set_is_in_game(room.game_info.is_some()); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
245 |
|
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
246 |
if let Some(ref mut info) = room.game_info { |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
247 |
let teams = info.client_teams(client.id); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
248 |
client.teams_in_game = teams.clone().count() as u8; |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
249 |
client.clan = teams.clone().next().map(|t| t.color); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
250 |
let team_names: Vec<_> = teams.map(|t| t.name.clone()).collect(); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
251 |
|
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
252 |
if !team_names.is_empty() { |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
253 |
info.left_teams.retain(|name| !team_names.contains(&name)); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
254 |
info.teams_in_game += team_names.len() as u8; |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
255 |
room.teams = info |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
256 |
.teams_at_start |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
257 |
.iter() |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
258 |
.filter(|(_, t)| !team_names.contains(&t.name)) |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
259 |
.cloned() |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
260 |
.collect(); |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
261 |
} |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
262 |
} |
6cc0fce249f9
Server action refactoring part 1 of N
alfadur <mail@none>
parents:
14457
diff
changeset
|
263 |
} |