Skip to content

Commit 384892b

Browse files
ferreira-tbferreira-tb
authored
fix: remove response tuples (#552)
1 parent b261769 commit 384892b

33 files changed

Lines changed: 240 additions & 67 deletions

‎Cargo.lock‎

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ members = [
2323

2424
[workspace.package]
2525
description = "Multiplayer strategy game"
26-
version = "0.7.18"
26+
version = "0.7.19"
2727
edition = "2024"
2828
rust-version = "1.99"
2929
license = "AGPL-3.0-only"

‎app/src-tauri/tauri.conf.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://schema.tauri.app/config/2.0.0",
33
"productName": "Call of Nil",
4-
"version": "0.7.18",
4+
"version": "0.7.19",
55
"identifier": "tsukilabs.nil",
66
"build": {
77
"beforeDevCommand": "pnpm run -F app dev",

‎app/src/core/model/continent/public-field.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ export class PublicFieldImpl {
133133
let counter = 0;
134134
if (coords.length > 0) {
135135
const publicFields = await getPublicFields(coords, world);
136-
for (const [coord, field] of publicFields) {
136+
for (const { coord, field } of publicFields) {
137137
const impl = fields.find((it) => it.coord.is(coord));
138138
if (impl) {
139139
impl.init(field.kind);

‎app/src/scenes/game/continent/root/Menu.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- Copyright (C) Call of Nil contributors -->
22
<!-- SPDX-License-Identifier: AGPL-3.0-only -->
33

4-
<script vapor lang="ts">
4+
<script setup lang="ts">
55
import { Button } from "@ui/button";
66
import { MenuIcon } from "@lucide/vue";
77
import { useBreakpoints } from "@tb-dev/vue";

‎crates/nil-payload/src/response/cheat/infrastructure.rs‎

Lines changed: 68 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,67 @@ pub struct CheatGetAcademyRecruitQueueResponse(pub AcademyRecruitQueue);
2323
#[cfg_attr(feature = "axum", derive(IntoJsonResponse))]
2424
#[cfg_attr(feature = "typescript", derive(ts_rs::TS))]
2525
#[cfg_attr(feature = "typescript", ts(export))]
26-
pub struct CheatGetAcademyRecruitQueuesResponse(pub Vec<(Coord, AcademyRecruitQueue)>);
26+
pub struct CheatGetAcademyRecruitQueuesResponse(pub Vec<CheatGetAcademyRecruitQueuesResponseItem>);
27+
28+
#[derive(Clone, Debug, Deserialize, Serialize)]
29+
#[cfg_attr(feature = "axum", derive(IntoJsonResponse))]
30+
#[cfg_attr(feature = "typescript", derive(ts_rs::TS))]
31+
#[cfg_attr(feature = "typescript", ts(export))]
32+
pub struct CheatGetAcademyRecruitQueuesResponseItem {
33+
pub coord: Coord,
34+
pub queue: AcademyRecruitQueue,
35+
}
2736

2837
#[derive(Clone, Debug, Deref, DerefMut, From, Into, Deserialize, Serialize)]
2938
#[cfg_attr(feature = "axum", derive(IntoJsonResponse))]
3039
#[cfg_attr(feature = "typescript", derive(ts_rs::TS))]
3140
#[cfg_attr(feature = "typescript", ts(export))]
32-
pub struct CheatGetAllAcademyRecruitQueuesResponse(pub Vec<(Coord, AcademyRecruitQueue)>);
41+
pub struct CheatGetAllAcademyRecruitQueuesResponse(
42+
pub Vec<CheatGetAllAcademyRecruitQueuesResponseItem>,
43+
);
44+
45+
#[derive(Clone, Debug, Deserialize, Serialize)]
46+
#[cfg_attr(feature = "axum", derive(IntoJsonResponse))]
47+
#[cfg_attr(feature = "typescript", derive(ts_rs::TS))]
48+
#[cfg_attr(feature = "typescript", ts(export))]
49+
pub struct CheatGetAllAcademyRecruitQueuesResponseItem {
50+
pub coord: Coord,
51+
pub queue: AcademyRecruitQueue,
52+
}
3353

3454
#[derive(Clone, Debug, Deref, DerefMut, From, Into, Deserialize, Serialize)]
3555
#[cfg_attr(feature = "axum", derive(IntoJsonResponse))]
3656
#[cfg_attr(feature = "typescript", derive(ts_rs::TS))]
3757
#[cfg_attr(feature = "typescript", ts(export))]
38-
pub struct CheatGetAllPrefectureBuildQueuesResponse(pub Vec<(Coord, PrefectureBuildQueue)>);
58+
pub struct CheatGetAllPrefectureBuildQueuesResponse(
59+
pub Vec<CheatGetAllPrefectureBuildQueuesResponseItem>,
60+
);
61+
62+
#[derive(Clone, Debug, Deserialize, Serialize)]
63+
#[cfg_attr(feature = "axum", derive(IntoJsonResponse))]
64+
#[cfg_attr(feature = "typescript", derive(ts_rs::TS))]
65+
#[cfg_attr(feature = "typescript", ts(export))]
66+
pub struct CheatGetAllPrefectureBuildQueuesResponseItem {
67+
pub coord: Coord,
68+
pub queue: PrefectureBuildQueue,
69+
}
3970

4071
#[derive(Clone, Debug, Deref, DerefMut, From, Into, Deserialize, Serialize)]
4172
#[cfg_attr(feature = "axum", derive(IntoJsonResponse))]
4273
#[cfg_attr(feature = "typescript", derive(ts_rs::TS))]
4374
#[cfg_attr(feature = "typescript", ts(export))]
44-
pub struct CheatGetAllStableRecruitQueuesResponse(pub Vec<(Coord, StableRecruitQueue)>);
75+
pub struct CheatGetAllStableRecruitQueuesResponse(
76+
pub Vec<CheatGetAllStableRecruitQueuesResponseItem>,
77+
);
78+
79+
#[derive(Clone, Debug, Deserialize, Serialize)]
80+
#[cfg_attr(feature = "axum", derive(IntoJsonResponse))]
81+
#[cfg_attr(feature = "typescript", derive(ts_rs::TS))]
82+
#[cfg_attr(feature = "typescript", ts(export))]
83+
pub struct CheatGetAllStableRecruitQueuesResponseItem {
84+
pub coord: Coord,
85+
pub queue: StableRecruitQueue,
86+
}
4587

4688
#[derive(Clone, Debug, Deref, DerefMut, From, Into, Deserialize, Serialize)]
4789
#[cfg_attr(feature = "axum", derive(IntoJsonResponse))]
@@ -59,7 +101,18 @@ pub struct CheatGetPrefectureBuildQueueResponse(pub PrefectureBuildQueue);
59101
#[cfg_attr(feature = "axum", derive(IntoJsonResponse))]
60102
#[cfg_attr(feature = "typescript", derive(ts_rs::TS))]
61103
#[cfg_attr(feature = "typescript", ts(export))]
62-
pub struct CheatGetPrefectureBuildQueuesResponse(pub Vec<(Coord, PrefectureBuildQueue)>);
104+
pub struct CheatGetPrefectureBuildQueuesResponse(
105+
pub Vec<CheatGetPrefectureBuildQueuesResponseItem>,
106+
);
107+
108+
#[derive(Clone, Debug, Deserialize, Serialize)]
109+
#[cfg_attr(feature = "axum", derive(IntoJsonResponse))]
110+
#[cfg_attr(feature = "typescript", derive(ts_rs::TS))]
111+
#[cfg_attr(feature = "typescript", ts(export))]
112+
pub struct CheatGetPrefectureBuildQueuesResponseItem {
113+
pub coord: Coord,
114+
pub queue: PrefectureBuildQueue,
115+
}
63116

64117
#[derive(Clone, Debug, Deref, DerefMut, From, Into, Deserialize, Serialize)]
65118
#[cfg_attr(feature = "axum", derive(IntoJsonResponse))]
@@ -71,7 +124,16 @@ pub struct CheatGetStableRecruitQueueResponse(pub StableRecruitQueue);
71124
#[cfg_attr(feature = "axum", derive(IntoJsonResponse))]
72125
#[cfg_attr(feature = "typescript", derive(ts_rs::TS))]
73126
#[cfg_attr(feature = "typescript", ts(export))]
74-
pub struct CheatGetStableRecruitQueuesResponse(pub Vec<(Coord, StableRecruitQueue)>);
127+
pub struct CheatGetStableRecruitQueuesResponse(pub Vec<CheatGetStableRecruitQueuesResponseItem>);
128+
129+
#[derive(Clone, Debug, Deserialize, Serialize)]
130+
#[cfg_attr(feature = "axum", derive(IntoJsonResponse))]
131+
#[cfg_attr(feature = "typescript", derive(ts_rs::TS))]
132+
#[cfg_attr(feature = "typescript", ts(export))]
133+
pub struct CheatGetStableRecruitQueuesResponseItem {
134+
pub coord: Coord,
135+
pub queue: StableRecruitQueue,
136+
}
75137

76138
#[derive(Clone, Debug, Deref, DerefMut, From, Into, Deserialize, Serialize)]
77139
#[cfg_attr(feature = "axum", derive(IntoJsonResponse))]

‎crates/nil-payload/src/response/continent.rs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,13 @@ pub struct GetPublicFieldResponse(pub PublicField);
2626
#[cfg_attr(feature = "axum", derive(IntoJsonResponse))]
2727
#[cfg_attr(feature = "typescript", derive(ts_rs::TS))]
2828
#[cfg_attr(feature = "typescript", ts(export))]
29-
pub struct GetPublicFieldsResponse(pub Vec<(Coord, PublicField)>);
29+
pub struct GetPublicFieldsResponse(pub Vec<GetPublicFieldsResponseItem>);
30+
31+
#[derive(Clone, Debug, Deserialize, Serialize)]
32+
#[cfg_attr(feature = "axum", derive(IntoJsonResponse))]
33+
#[cfg_attr(feature = "typescript", derive(ts_rs::TS))]
34+
#[cfg_attr(feature = "typescript", ts(export))]
35+
pub struct GetPublicFieldsResponseItem {
36+
pub coord: Coord,
37+
pub field: PublicField,
38+
}

‎crates/nil-payload/src/response/military.rs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,16 @@ use nil_payload_macros::IntoJsonResponse;
1616
#[cfg_attr(feature = "axum", derive(IntoJsonResponse))]
1717
#[cfg_attr(feature = "typescript", derive(ts_rs::TS))]
1818
#[cfg_attr(feature = "typescript", ts(export))]
19-
pub struct GetArmiesResponse(pub Vec<(Coord, Army)>);
19+
pub struct GetArmiesResponse(pub Vec<GetArmiesResponseItem>);
20+
21+
#[derive(Clone, Debug, Deserialize, Serialize)]
22+
#[cfg_attr(feature = "axum", derive(IntoJsonResponse))]
23+
#[cfg_attr(feature = "typescript", derive(ts_rs::TS))]
24+
#[cfg_attr(feature = "typescript", ts(export))]
25+
pub struct GetArmiesResponseItem {
26+
pub coord: Coord,
27+
pub army: Army,
28+
}
2029

2130
#[derive(Clone, Debug, Deref, DerefMut, From, Into, Deserialize, Serialize)]
2231
#[cfg_attr(feature = "axum", derive(IntoJsonResponse))]

0 commit comments

Comments
 (0)