Skip to content

fix: scope host previousRoundMachinations to a single round #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Garemat merged 1 commit into from
Jul 14, 2026
Merged

fix: scope host previousRoundMachinations to a single round #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/src/main/java/io/github/garemat/lunachron/CharacterState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,9 @@ data class OnlineMachinationAttack(
data class OnlineMachinationEntry(
val deviceId: String,
val username: String,
// Only sent (as >0) for hosts, whose previousRoundMachinations spans every
// past round rather than just the previous one. Defaults to 0 for member
// responses, which the server already scopes to a single round.
val roundNumber: Int = 0,
val choices: List<OnlineMachinationChoice> = emptyList(),
val attack: OnlineMachinationAttack? = null
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/java/io/github/garemat/lunachron/ui/OnlineCampaignDetailScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1281,10 +1281,13 @@ private fun PreviousRoundMachinationsSection(
val drawCount: Int
)

val results = remember(machinations, members) {
val results = remember(machinations, members, previousRound) {
val supportersOf = mutableMapOf<String, MutableList<String>>()
val sabotageCountOf = mutableMapOf<String, Int>()
// Hosts receive every past round's submissions (tagged with roundNumber > 0);
// members receive only the previous round, where roundNumber defaults to 0.
for (entry in machinations) {
if (entry.roundNumber > 0 && entry.roundNumber != previousRound) continue
for (choice in entry.choices) {
if (choice.type == "SUPPORT") {
supportersOf.getOrPut(choice.targetDeviceId) { mutableListOf() }.add(entry.username)
Expand Down
Loading