Skip to content
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

Jump to bottom

Feature/#125 enhance parse moderator event to include player names #134

Merged
merged 4 commits into from May 2, 2024
Merged

Feature/#125 enhance parse moderator event to include player names #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a39e372
Add player name to parseModeratorEvent
magge-faf Apr 13, 2024
914e085
Set string variables to default null
magge-faf Apr 18, 2024
e07e45c
Change default value from -1 to -2 for activeCommandSource and fromArmy
magge-faf Apr 19, 2024
c80cd48
Change default values from int magic number to Integer null, added nu…
magge-faf Apr 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions faf-commons-data/src/main/java/com/faforever/commons/replay/ModeratorEvent.java
View file
Open in desktop
Expand Up @@ -2,6 +2,10 @@

import java.time.Duration;

public record ModeratorEvent(Duration time, String sender, String message, int activeCommandSource) {

public record ModeratorEvent(Duration time,
int activeCommandSource,
int fromArmy,
String message,
String playerNameFromArmy,
String playerNameFromCommandSource) {
}
28 changes: 23 additions & 5 deletions faf-commons-data/src/main/java/com/faforever/commons/replay/ReplayDataParser.java
View file
Open in desktop
Expand Up @@ -379,21 +379,39 @@ private void parseGiveResourcesToPlayer(Map<String, Object> lua) {


void parseModeratorEvent(Map<String, Object> lua, Integer player) {
String messageContent = "Content of Message Missing";
int fromInt = -1; // Default Value
int activeCommandSource = -1; // Default Value
String messageContent = null;
String playerNameFromArmy = null;
String playerNameFromCommandSource = null;
Integer activeCommandSource = null;
Integer fromArmy = null;

if (lua.containsKey("Message") && lua.get("Message") instanceof String value) {
messageContent = value;
}

if (lua.containsKey("From") && lua.get("From") instanceof Number value) {
fromInt = value.intValue();
fromArmy = value.intValue() - 1;

if (fromArmy != -2) {
Map<String, Object> army = armies.get(fromArmy);

if (army != null){
playerNameFromArmy = (String) army.get("PlayerName");
}
}
}

if (player != null) {
activeCommandSource = player;
Map<String, Object> army = armies.get(activeCommandSource);

if (army != null) {
playerNameFromCommandSource = (String) army.get("PlayerName");
}
}

moderatorEvents.add(new ModeratorEvent(tickToTime(ticks), Integer.toString(fromInt), messageContent, activeCommandSource));
moderatorEvents.add(new ModeratorEvent(tickToTime(ticks), activeCommandSource, fromArmy,
messageContent, playerNameFromArmy, playerNameFromCommandSource));
}

private Duration tickToTime(int tick) {
Expand Down