hatter/room-rs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: fix clippy

Browse Source
This commit is contained in:
Hatter Jiang
2023-11-05 00:41:55 +08:00
parent 3fd94c7328
commit f24260b1a3
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@@ -571,7 +571,7 @@ dependencies = [
[[package]]
name = "room-rs"
version = "0.1.5"
version = "0.1.6"
dependencies = [
"chrono",
"futures-channel",

2
Cargo.toml
View File

@@ -1,6 +1,6 @@
[package]
name = "room-rs"
version = "0.1.5"
version = "0.1.6"
authors = ["Hatter Jiang@Pixelbook <jht5945@gmail.com>"]
edition = "2018"

18
src/main.rs
View File

@@ -63,7 +63,7 @@ fn handle_text_message(handle_context: &mut HandleContext, tx: &Tx, addr: Socket
Err(e) => {
warning!("Parse message: from: {:?} - {:?}, failed: {}", handle_context.room_id, handle_context.client_id, e);
RoomMessageDown::create_error_reply(
&None, format!("Message parse failed: {}, message: {}", e, msg)).send(&tx);
&None, format!("Message parse failed: {}, message: {}", e, msg)).send(tx);
return Ok(());
}
};
@@ -142,7 +142,7 @@ fn handle_text_message(handle_context: &mut HandleContext, tx: &Tx, addr: Socket
warning!("Not in room: {:?} - {:?}", room_id, client_id);
}
} else {
client_not_in_room(&tx, addr);
client_not_in_room(tx, addr);
}
}
RoomMessageType::Destroy => {
@@ -158,7 +158,7 @@ fn handle_text_message(handle_context: &mut HandleContext, tx: &Tx, addr: Socket
}
}
} else {
client_not_in_room(&tx, addr);
client_not_in_room(tx, addr);
}
}
RoomMessageType::ListPeers => {
@@ -170,9 +170,9 @@ fn handle_text_message(handle_context: &mut HandleContext, tx: &Tx, addr: Socket
.map(|m| m.keys().cloned().collect::<Vec<_>>())
.unwrap_or_else(Vec::new);
let client_ids_data = serde_json::to_string(&client_ids)?;
RoomMessageDown::create_peerlist_message(&room_message.message_id, Some(client_ids_data)).send(&tx);
RoomMessageDown::create_peerlist_message(&room_message.message_id, Some(client_ids_data)).send(tx);
} else {
client_not_in_room(&tx, addr);
client_not_in_room(tx, addr);
}
}
RoomMessageType::Broadcast => {
@@ -195,10 +195,10 @@ fn handle_text_message(handle_context: &mut HandleContext, tx: &Tx, addr: Socket
}
}
RoomMessageDown::create_success_reply(
&room_message.message_id, format!("Send message to {} peers", sent_messages)).send(&tx);
&room_message.message_id, format!("Send message to {} peers", sent_messages)).send(tx);
}
} else {
client_not_in_room(&tx, addr);
client_not_in_room(tx, addr);
}
}
RoomMessageType::Peer => {
@@ -224,7 +224,7 @@ fn handle_text_message(handle_context: &mut HandleContext, tx: &Tx, addr: Socket
}
}
} else {
client_not_in_room(&tx, addr);
client_not_in_room(tx, addr);
}
}
}
@@ -306,7 +306,7 @@ fn client_exit(handle_context: &HandleContext, room_id: &Option<String>, client_
} else {
let m = RoomMessageDown::create_peer_exit(&None, client_id.clone());
if let Ok(mm) = serde_json::to_string(&m) {
for (_client_id, client_addr) in client_map {
for client_addr in client_map.values_mut() {
if let Some(client_tx) = handle_context.peer_map.lock().unwrap().get(client_addr) {
client_tx.send_text(mm.clone());
}