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 tweaks for latest PR and multiplayer fixes

Browse Source
This commit is contained in:
NG (Graham)
2026-01-15 18:56:30 -05:00
parent a48f9dcfe9
commit f2896509ba
6 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rc_factory_api/src/main.rs
View File

@@ -16,7 +16,7 @@ async fn index() -> impl Responder {
}
fn io_error(e: impl ToString) -> std::io::Error {
std::io::Error::new(std::io::ErrorKind::Other, e.to_string())
std::io::Error::other(e.to_string())
}
#[actix_web::main]

23
rc_factory_api/src/robocraft/factory/crf_api.rs
View File

@@ -19,7 +19,7 @@ fn parse_filter(filter: &str) -> Vec<u32> {
fn payload_to_query(payload: &ListPayload) -> ListQuery {
ListQuery {
page: (payload.page.max(1)) as usize,
page_size: (payload.page_size.max(1).min(100)) as usize,
page_size: (payload.page_size.clamp(1, 100)) as usize,
order: FactoryOrderType::try_from(payload.order.clamp(0, u8::MAX.into()) as u8).unwrap_or(FactoryOrderType::Suggested),
player_filter: payload.player_filter,
movement_filter: parse_filter(&payload.movement_filter),
@@ -91,11 +91,8 @@ fn get_info(qi: VehicleQueryInfo, vi: VehicleInfo) -> FactoryRobotGetInfo {
#[post("/api/roboShopItems/list")]
pub async fn list(factory: Data<oj_rc_core::factory::Factory>, body: Json<ListPayload>) -> HttpResponse {
match factory.get_ref() {
oj_rc_core::factory::Factory::None => {
return HttpResponse::ServiceUnavailable().body("factory adapter disabled");
}
_ => {}
if let oj_rc_core::factory::Factory::None = factory.get_ref() {
return HttpResponse::ServiceUnavailable().body("factory adapter disabled");
}
let query = payload_to_query(&body.into_inner());
@@ -114,11 +111,8 @@ pub async fn list(factory: Data<oj_rc_core::factory::Factory>, body: Json<ListPa
#[get("/api/roboShopItems/list")]
pub async fn list_default(factory: Data<oj_rc_core::factory::Factory>) -> HttpResponse {
match factory.get_ref() {
oj_rc_core::factory::Factory::None => {
return HttpResponse::ServiceUnavailable().body("factory adapter disabled");
}
_ => {}
if let oj_rc_core::factory::Factory::None = factory.get_ref() {
return HttpResponse::ServiceUnavailable().body("factory adapter disabled");
}
let query = payload_to_query(&ListPayload::default());
@@ -137,11 +131,8 @@ pub async fn list_default(factory: Data<oj_rc_core::factory::Factory>) -> HttpRe
#[get("/api/roboShopItems/get/{id}")]
pub async fn get(factory: Data<oj_rc_core::factory::Factory>, id: Path<i32>) -> HttpResponse {
match factory.get_ref() {
oj_rc_core::factory::Factory::None => {
return HttpResponse::ServiceUnavailable().body("factory adapter disabled");
}
_ => {}
if let oj_rc_core::factory::Factory::None = factory.get_ref() {
return HttpResponse::ServiceUnavailable().body("factory adapter disabled");
}
match factory.vehicle(*id).await {
Ok(Some((vehicle_info, query_info))) => HttpResponse::Ok().json(FactoryInfo {