strawberries/frangipane-backend
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed clippy errors
Rust lint and build / Rust CI (push) Failing after 49s
Details

Browse Source
This commit is contained in:
strawberries
2026-06-03 15:41:50 +02:00
parent 39a9247f99
commit 3475f7cc1f
7 changed files with 65 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/routes/messages.rs
+24 -20
View File
@@ -171,14 +171,14 @@ async fn create_message(
.bind(room_id)
.bind(&payload.message_type)
.bind(&payload.content)
.bind(&uuid)
.bind(uuid)
.fetch_one(&db)
.await?;
let sender_name = username_from_uuid(&db, claims.sub).await?;
let message = Message {
uuid: uuid,
uuid,
room_uuid,
sender: sender_name,
sender_uuid: claims.sub,
@@ -263,11 +263,11 @@ async fn handle_message_socket(
// Receive broadcast messages and send to client (any room)
msg = receiver.recv() => {
if let Ok(msg) = msg {
if let Ok(json) = serde_json::to_string(&msg) {
if socket.send(WsMessage::Text(json.into())).await.is_err() {
tracing::error!("Failed to send message to {who}, closing connection");
break;
}
if let Ok(json) = serde_json::to_string(&msg)
&& socket.send(WsMessage::Text(json.into())).await.is_err()
{
tracing::error!("Failed to send message to {who}, closing connection");
break;
}
} else {
break;
@@ -287,19 +287,23 @@ async fn handle_message_socket(
// Get incoming messages from client
client_msg = socket.recv() => {
if let Some(Ok(msg)) = client_msg {
match msg {
// WsMessage::Pong(_) => {
// tracing::debug!("Received Pong from {who}");
// }
// WsMessage::Ping(_) => {
// tracing::info!("Received Ping from client");
// }
// WsMessage::Text(_) => {}
WsMessage::Close(_) => {
tracing::debug!("Client disconnected");
break;
}
_ => {}
// match msg {
// // WsMessage::Pong(_) => {
// // tracing::debug!("Received Pong from {who}");
// // }
// // WsMessage::Ping(_) => {
// // tracing::info!("Received Ping from client");
// // }
// // WsMessage::Text(_) => {}
// WsMessage::Close(_) => {
// tracing::debug!("Client disconnected");
// break;
// }
// _ => {}
// }
if let WsMessage::Close(_) = msg {
tracing::debug!("Client disconnected");
break;
}
} else {
tracing::debug!("Client {who} abruptly disconnected");
src/routes/rooms.rs
+2 -4
View File
@@ -95,9 +95,6 @@ async fn list_rooms(
Extension(db): Extension<PgPool>,
) -> Result<Json<Vec<Room>>, APIError> {
let claims = verify_jwt(headers)?;
if claims.sub != claims.sub {
return Err(APIError::InvalidToken);
}
let user_id = user_id_from_uuid(&db, claims.sub).await?;
@@ -142,7 +139,8 @@ async fn create_room(
{
let room_name_length = payload.name.len();
if room_name_length > MAX_ROOM_NAME_LENGTH || room_name_length < 1 {
// if room_name_length > MAX_ROOM_NAME_LENGTH || room_name_length < 1 {
if !(1..=MAX_ROOM_NAME_LENGTH).contains(&room_name_length) {
return Err(APIError::RoomNameLength);
}
}
src/routes/users.rs
+14 -14
View File
@@ -161,13 +161,13 @@ pub async fn register_user(
.execute(&db)
.await
.map_err(|e| {
if let Some(db_err) = e.as_database_error() {
if db_err.code().map(|c| c == "23505").unwrap_or(false) {
match db_err.constraint() {
Some("user__username_key") => return APIError::UsernameTaken,
Some("user__email_key") => return APIError::EmailTaken,
_ => return APIError::Internal("".to_string()), // TODO: handle this case
}
if let Some(db_err) = e.as_database_error()
&& db_err.code().map(|c| c == "23505").unwrap_or(false)
{
match db_err.constraint() {
Some("user__username_key") => return APIError::UsernameTaken,
Some("user__email_key") => return APIError::EmailTaken,
_ => return APIError::Internal("".to_string()), // TODO: handle this case
}
}
APIError::DatabaseError(e)
@@ -226,13 +226,13 @@ pub async fn update_user(
.execute(&mut *tx)
.await
.map_err(|e| {
if let Some(db_err) = e.as_database_error() {
if db_err.code().map(|c| c == "23505").unwrap_or(false) {
match db_err.constraint() {
Some("user__username_key") => return APIError::UsernameTaken,
Some("user__email_key") => return APIError::EmailTaken,
_ => return APIError::Internal("".to_string()), // TODO: handle this case
}
if let Some(db_err) = e.as_database_error()
&& db_err.code().map(|c| c == "23505").unwrap_or(false)
{
match db_err.constraint() {
Some("user__username_key") => return APIError::UsernameTaken,
Some("user__email_key") => return APIError::EmailTaken,
_ => return APIError::Internal("".to_string()), // TODO: handle this case
}
}
APIError::DatabaseError(e)
src/routes/voice.rs
+9 -9
View File
@@ -81,15 +81,15 @@ async fn handle_voice_socket(
select! {
// Receive audio from other users and send to client
voice_packet = rx.recv() => {
if let Ok((speaker_uuid, audio_data)) = voice_packet {
if speaker_uuid != my_uuid {
let mut msg = BytesMut::with_capacity(16 + audio_data.len());
msg.put(speaker_uuid.as_bytes().as_slice());
msg.put(audio_data);
if let Ok((speaker_uuid, audio_data)) = voice_packet
&& speaker_uuid != my_uuid
{
let mut msg = BytesMut::with_capacity(16 + audio_data.len());
msg.put(speaker_uuid.as_bytes().as_slice());
msg.put(audio_data);
if socket.send(Message::Binary(msg.freeze().into())).await.is_err() {
break;
}
if socket.send(Message::Binary(msg.freeze())).await.is_err() {
break;
}
}
}
@@ -99,7 +99,7 @@ async fn handle_voice_socket(
if let Some(Ok(msg)) = client_msg {
match msg {
Message::Binary(data) => {
let _ = tx.send((my_uuid, Bytes::from(data)));
let _ = tx.send((my_uuid, data));
}
Message::Close(_) => {
tracing::debug!("Voice client {} disconnected", who);