duckietm/Arcturus-Morningstar-Extended
1
0
Fork 0
mirror of https://github.com/duckietm/Arcturus-Morningstar-Extended.git synced 2026-06-20 07:26:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(rcon): cap subscription duration changes

Browse Source
This commit is contained in:
simoleo89
2026-06-14 17:41:42 +02:00
parent 81c8dfc605
commit 5d8dc670bd
2 changed files with 62 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Emulator/src/main/java/com/eu/habbo/messages/rcon/ModifyUserSubscription.java
+24 -6
View File
@@ -9,6 +9,7 @@ import org.slf4j.LoggerFactory;
public class ModifyUserSubscription extends RCONMessage<ModifyUserSubscription.JSON> {
private static final Logger LOGGER = LoggerFactory.getLogger(ModifyUserSubscription.class);
static final int DEFAULT_MAX_DURATION_SECONDS = 31_536_000;
public ModifyUserSubscription() {
super(ModifyUserSubscription.JSON.class);
@@ -38,10 +39,11 @@ public class ModifyUserSubscription extends RCONMessage<ModifyUserSubscription.J
return;
}
int maxDuration = parseMaxDuration(Emulator.getConfig().getValue("rcon.subscription.max_duration_seconds", String.valueOf(DEFAULT_MAX_DURATION_SECONDS)));
if (json.action.equalsIgnoreCase("add") || json.action.equalsIgnoreCase("+") || json.action.equalsIgnoreCase("a")) {
if (json.duration < 1) {
if (!isValidDuration(json.duration, maxDuration)) {
this.status = RCONMessage.STATUS_ERROR;
this.message = "duration must be > 0";
this.message = "duration must be between 1 and " + maxDuration + " seconds";
return;
}
@@ -58,13 +60,13 @@ public class ModifyUserSubscription extends RCONMessage<ModifyUserSubscription.J
}
if (json.duration != -1) {
if (json.duration < 1) {
if (!isValidDuration(json.duration, maxDuration)) {
this.status = RCONMessage.STATUS_ERROR;
this.message = "duration must be > 0 or -1 to remove all time";
this.message = "duration must be between 1 and " + maxDuration + " seconds, or -1 to remove all time";
return;
}
s.addDuration(-json.duration);
s.addDuration(-Math.min(json.duration, s.getRemaining()));
this.status = RCONMessage.STATUS_OK;
this.message = "Successfully removed %time% seconds from %subscription% on %user%".replace("%time%", json.duration + "").replace("%user%", habbo.getUsername()).replace("%subscription%", json.type);
} else {
@@ -85,6 +87,22 @@ public class ModifyUserSubscription extends RCONMessage<ModifyUserSubscription.J
}
}
static boolean isValidDuration(int duration, int maxDuration) {
return duration >= 1 && duration <= maxDuration;
}
static int parseMaxDuration(String configured) {
try {
int parsed = Integer.parseInt(configured);
if (parsed > 0) {
return parsed;
}
} catch (NumberFormatException ignored) {
}
return DEFAULT_MAX_DURATION_SECONDS;
}
static class JSON {
public int user_id;
@@ -96,4 +114,4 @@ public class ModifyUserSubscription extends RCONMessage<ModifyUserSubscription.J
public int duration = -1; // Time to add/remove in seconds. -1 means remove subscription entirely
}
}
}