From 41ae9a3a7048077cdafc54ffe3fb45bd938b0829 Mon Sep 17 00:00:00 2001 From: Aurora Lahtela <24460436+AuroraLS3@users.noreply.github.com> Date: Sat, 25 May 2024 09:43:54 +0300 Subject: [PATCH] Add plan_server_uptime placeholder Supports :server parameter Affects issues: - Close #3647 --- .../plan/placeholder/ServerPlaceHolders.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/placeholder/ServerPlaceHolders.java b/Plan/common/src/main/java/com/djrapitops/plan/placeholder/ServerPlaceHolders.java index 0ad1e0533..7affdb889 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/placeholder/ServerPlaceHolders.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/placeholder/ServerPlaceHolders.java @@ -19,6 +19,7 @@ package com.djrapitops.plan.placeholder; import com.djrapitops.plan.commands.use.Arguments; import com.djrapitops.plan.delivery.formatting.Formatter; import com.djrapitops.plan.delivery.formatting.Formatters; +import com.djrapitops.plan.gathering.ServerUptimeCalculator; import com.djrapitops.plan.identification.Server; import com.djrapitops.plan.identification.ServerInfo; import com.djrapitops.plan.identification.ServerUUID; @@ -58,18 +59,20 @@ public class ServerPlaceHolders implements Placeholders { private final DBSystem dbSystem; private final ServerInfo serverInfo; private final Formatters formatters; + private final ServerUptimeCalculator serverUptimeCalculator; @Inject public ServerPlaceHolders( PlanConfig config, DBSystem dbSystem, ServerInfo serverInfo, - Formatters formatters + Formatters formatters, ServerUptimeCalculator serverUptimeCalculator ) { this.config = config; this.dbSystem = dbSystem; this.serverInfo = serverInfo; this.formatters = formatters; + this.serverUptimeCalculator = serverUptimeCalculator; } @Override @@ -204,6 +207,11 @@ public class ServerPlaceHolders implements Placeholders { placeholders.registerStatic("server_name", () -> serverInfo.getServer().getName()); + placeholders.registerStatic("server_uptime", + parameters -> serverUptimeCalculator.getServerUptimeMillis(getServerUUID(parameters)) + .map(String::valueOf) + .orElse("-")); + placeholders.registerStatic("server_uuid", serverInfo::getServerUUID);