bonkmaykr/ojrc
1
0
Fork 0
mirror of https://git.ngram.ca/OpenJam/rc-servers synced 2026-08-23 23:08:52 +00:00
Code Activity

Clippy improvements

Browse Source
This commit is contained in:
NG (Graham)
2026-08-09 18:12:08 -04:00
parent 52dc0519fb
commit 3963a2b4de
12 changed files with 20 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rc_chat_room/src/state/chat/config.rs
View File

@@ -417,7 +417,7 @@ impl System {
} }
let perm = SystemPermission::from_str(params[1]); let perm = SystemPermission::from_str(params[1]);
if perm.is_none() { if perm.is_none() {
return format!("Unrecognised permission \"{}\" (try dev, admin, or mod)", &params[1]); return format!("Unrecognised permission \"{}\" (try dev, admin, or mod)", params[1]);
} }
let perm = perm.unwrap(); let perm = perm.unwrap();
if let Err(e) = ctx.user.set_permission(params[2].to_owned(), perm.role(), perm.value()).await { if let Err(e) = ctx.user.set_permission(params[2].to_owned(), perm.role(), perm.value()).await {
@@ -427,7 +427,7 @@ impl System {
format!("Failed to grant permission (code {})", e.error_code()) format!("Failed to grant permission (code {})", e.error_code())
} }
} else { } else {
format!("Granted {} to {} (they should re-log)", perm.display(), &params[2]) format!("Granted {} to {} (they should re-log)", perm.display(), params[2])
} }
}, },
Self::ClearGarageFactoryFlag => { Self::ClearGarageFactoryFlag => {

10
rc_core/src/persist/user/intercom.rs
View File

@@ -29,7 +29,7 @@ impl <D: serde::de::DeserializeOwned + 'static> IntercomListener<D> {
stream.filter_map(move |msg_res| { stream.filter_map(move |msg_res| {
let sink = sink.clone(); let sink = sink.clone();
Box::pin(async move { Box::pin(async move {
let res = match msg_res.ok() { match msg_res.ok() {
None => None, None => None,
/*reqwest_websocket::Message::Text(s) => { /*reqwest_websocket::Message::Text(s) => {
(serde_json::from_str(&s).map_err(reqwest_websocket::Error::Json), None) (serde_json::from_str(&s).map_err(reqwest_websocket::Error::Json), None)
@@ -48,8 +48,7 @@ impl <D: serde::de::DeserializeOwned + 'static> IntercomListener<D> {
None None
}, },
Some(msg) => Some(msg.json()) Some(msg) => Some(msg.json())
}; }
res
} }
)}) )})
} }
@@ -87,7 +86,7 @@ impl <D: serde::ser::Serialize + serde::de::DeserializeOwned + 'static> Intercom
let stream_impl = stream.filter_map(move |msg_res| { let stream_impl = stream.filter_map(move |msg_res| {
let sink = sink.clone(); let sink = sink.clone();
Box::pin(async move { Box::pin(async move {
let res = match msg_res.ok() { match msg_res.ok() {
None => None, None => None,
/*reqwest_websocket::Message::Text(s) => { /*reqwest_websocket::Message::Text(s) => {
(serde_json::from_str(&s).map_err(reqwest_websocket::Error::Json), None) (serde_json::from_str(&s).map_err(reqwest_websocket::Error::Json), None)
@@ -106,8 +105,7 @@ impl <D: serde::ser::Serialize + serde::de::DeserializeOwned + 'static> Intercom
None None
}, },
Some(msg) => Some(msg.json()) Some(msg) => Some(msg.json())
}; }
res
} }
)}); )});
(sink_impl, stream_impl) (sink_impl, stream_impl)

4
rc_factory/src/arc/adapter.rs
View File

@@ -37,7 +37,7 @@ impl ArcAdapter {
fn thumbnail_url(&self, meta: String, id: u32) -> String { fn thumbnail_url(&self, meta: String, id: u32) -> String {
if self.override_cdn && id <= 7_946_212 { if self.override_cdn && id <= 7_946_212 {
format!("{}/roboshop/arc/Live/{}", &self.cdn, id) format!("{}/roboshop/arc/Live/{}", self.cdn, id)
} else { } else {
meta meta
} }
@@ -281,7 +281,7 @@ impl crate::VehicleFactoryAdapter for ArcAdapter {
}.insert(&transaction).await?; }.insert(&transaction).await?;
super::entities::robot_metadata::ActiveModel { super::entities::robot_metadata::ActiveModel {
id: Set(cubes.id), id: Set(cubes.id),
thumbnail: Set(format!("{}/roboshop/Live/{}", &self.cdn, cubes.id)), thumbnail: Set(format!("{}/roboshop/Live/{}", self.cdn, cubes.id)),
..Default::default() ..Default::default()
}.update(&transaction).await?; }.update(&transaction).await?;
transaction.commit().await?; transaction.commit().await?;

3
rc_multiplayer/src/matches/modes/battle_arena.rs
View File

@@ -1300,8 +1300,7 @@ impl BattleArenaLogic {
let connections = generic.users.read().await.values().map(|player_info| player_info.connection.clone()).collect(); let connections = generic.users.read().await.values().map(|player_info| player_info.connection.clone()).collect();
let my_connection_latency = generic.users.read().await let my_connection_latency = generic.users.read().await
.iter() .iter()
.filter(|(user_player_id, _)| **user_player_id == player_id) .find(|(user_player_id, _)| **user_player_id == player_id)
.next()
.unwrap() .unwrap()
.1.connection.connection.latency(); .1.connection.connection.latency();
tokio::task::spawn(super::respawn_player_after( tokio::task::spawn(super::respawn_player_after(

3
rc_multiplayer/src/matches/modes/pit.rs
View File

@@ -370,8 +370,7 @@ impl PitLogic {
let connections = generic.users.read().await.values().map(|player_info| player_info.connection.clone()).collect(); let connections = generic.users.read().await.values().map(|player_info| player_info.connection.clone()).collect();
let my_connection_latency = generic.users.read().await let my_connection_latency = generic.users.read().await
.iter() .iter()
.filter(|(user_player_id, _)| **user_player_id == player_id) .find(|(user_player_id, _)| **user_player_id == player_id)
.next()
.unwrap() .unwrap()
.1.connection.connection.latency(); .1.connection.connection.latency();
tokio::task::spawn(super::respawn_player_after( tokio::task::spawn(super::respawn_player_after(

9
rc_multiplayer/src/matches/modes/team_death_match.rs
View File

@@ -308,11 +308,10 @@ impl TeamDeathMatchLogic {
if let Some(player_desc) = generic.user_descriptor(player_id) { if let Some(player_desc) = generic.user_descriptor(player_id) {
let connections = generic.users.read().await.values().map(|player_info| player_info.connection.clone()).collect(); let connections = generic.users.read().await.values().map(|player_info| player_info.connection.clone()).collect();
let my_connection_latency = generic.users.read().await let my_connection_latency = generic.users.read().await
.iter() .iter()
.filter(|(user_player_id, _)| **user_player_id == player_id) .find(|(user_player_id, _)| **user_player_id == player_id)
.next() .unwrap()
.unwrap() .1.connection.connection.latency();
.1.connection.connection.latency();
tokio::task::spawn(super::respawn_player_after( tokio::task::spawn(super::respawn_player_after(
respawn_timestamp, respawn_timestamp,
connections, connections,

2
rc_services_room/src/events/handler.rs
View File

@@ -56,7 +56,7 @@ impl IntercomHandler {
} }
IntercomWebServiceUserMessage::Workaround(IntercomWorkaroundMessage::KeybindLockout { }) => { IntercomWebServiceUserMessage::Workaround(IntercomWorkaroundMessage::KeybindLockout { }) => {
let session = keybind_workaround.add_user(user.account_id(), user.public_id().to_owned()).await; let session = keybind_workaround.add_user(user.account_id(), user.public_id().to_owned()).await;
let non_me = session.users.iter().next().unwrap(); let non_me = session.users.first().unwrap();
let event = super::CustomGameInvite { let event = super::CustomGameInvite {
inviter_public_id: non_me.public_id.clone(), inviter_public_id: non_me.public_id.clone(),
inviter_display_name: non_me.public_id.clone(), inviter_display_name: non_me.public_id.clone(),

4
rc_services_room/src/operations/custom_game_session.rs
View File

@@ -23,10 +23,8 @@ impl <C: Send + 'static> SimpleOperation<C> for CustomGameRetriever {
let game_opt = if let Some(session) = self.keylock_workaround.get_user(user_info.account_id(), my_pub_id).await { let game_opt = if let Some(session) = self.keylock_workaround.get_user(user_info.account_id(), my_pub_id).await {
is_workaround = true; is_workaround = true;
Some(session) Some(session)
} else if let Some(session) = self.games.get_user_game(my_pub_id).await {
Some(session)
} else { } else {
None self.games.get_user_game(my_pub_id).await
}; };
if let Some(game) = game_opt { if let Some(game) = game_opt {
log::debug!("User {} retrieved their custom game session {} info", my_pub_id, game.session_id); log::debug!("User {} retrieved their custom game session {} info", my_pub_id, game.session_id);

4
rc_services_room/src/operations/custom_games_invite.rs
View File

@@ -26,10 +26,8 @@ impl <C: Send + 'static> SimpleOperation<C> for CustomGamePendingInvites {
log::debug!("User {} is in keylock workaround mode ({})", my_pub_id, session.session_id); log::debug!("User {} is in keylock workaround mode ({})", my_pub_id, session.session_id);
is_workaround = true; is_workaround = true;
Some(session) Some(session)
} else if let Some(session) = self.games.get_user_game(my_pub_id).await {
Some(session)
} else { } else {
None self.games.get_user_game(my_pub_id).await
}; };
if let Some(session) = session { if let Some(session) = session {
let myself = session.users.iter().find(|u| u.public_id == my_pub_id).unwrap(); let myself = session.users.iter().find(|u| u.public_id == my_pub_id).unwrap();

2
rc_society/src/web/garage/export.rs
View File

@@ -25,7 +25,7 @@ pub async fn get(id: Path<i32>, query: Query<super::PortQuery>, exporter: Data<I
use actix_web::http::header::{ContentDisposition, TryIntoHeaderPair}; use actix_web::http::header::{ContentDisposition, TryIntoHeaderPair};
let ext = exporter.file_ext(&query.plugin).unwrap(); let ext = exporter.file_ext(&query.plugin).unwrap();
// TODO sanitise vehicle name and include it in the filename // TODO sanitise vehicle name and include it in the filename
let dispo = ContentDisposition::attachment(format!("export-{}-{}.{}", &query.plugin, *id, ext)); let dispo = ContentDisposition::attachment(format!("export-{}-{}.{}", query.plugin, *id, ext));
let (key, val) = dispo.try_into_pair().unwrap(); let (key, val) = dispo.try_into_pair().unwrap();
let mut resp = HttpResponse::with_body(StatusCode::OK, export); let mut resp = HttpResponse::with_body(StatusCode::OK, export);
resp.headers_mut().append(key, val); resp.headers_mut().append(key, val);

2
rc_society/src/web/garage/import.rs
View File

@@ -149,7 +149,7 @@ pub async fn post(form: actix_multipart::form::MultipartForm<ImportForm>, handle
} }
for (i, file) in form.files.iter().enumerate() { for (i, file) in form.files.iter().enumerate() {
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
log::trace!("import {} file {} data: {:?}", &*form.plugin, i, &file.data[..]); log::trace!("import {} file {} data: {:?}", *form.plugin, i, &file.data[..]);
let import_data = match importer.import_by_name(&form.plugin, &file.data) let import_data = match importer.import_by_name(&form.plugin, &file.data)
.map_err(|e| super::PluginPortError { code: e }) { .map_err(|e| super::PluginPortError { code: e }) {
Ok(x) => x, Ok(x) => x,

2
rc_society/src/web/user_federation.rs
View File

@@ -58,7 +58,7 @@ pub async fn post_remove(auth: Data<Box<oj_rc_core::UserImpl>>, user_opt: Option
fedi.defederated.remove(i); fedi.defederated.remove(i);
user.fedi_set(fedi).await; user.fedi_set(fedi).await;
} else { } else {
log::warn!("Failed to find domain {} in defederated list for user {}", &*domain, user.public_id()); log::warn!("Failed to find domain {} in defederated list for user {}", *domain, user.public_id());
} }
let resp = Redirect::to("/federation/list") let resp = Redirect::to("/federation/list")
.respond_to(&req) .respond_to(&req)