mirror of
https://github.com/plan-player-analytics/Plan.git
synced 2024-10-22 12:30:08 +02:00
Add plan_server_uptime placeholder
Supports :server parameter Affects issues: - Close #3647
This commit is contained in:
parent
18a154e6b0
commit
41ae9a3a70
@ -19,6 +19,7 @@ package com.djrapitops.plan.placeholder;
|
|||||||
import com.djrapitops.plan.commands.use.Arguments;
|
import com.djrapitops.plan.commands.use.Arguments;
|
||||||
import com.djrapitops.plan.delivery.formatting.Formatter;
|
import com.djrapitops.plan.delivery.formatting.Formatter;
|
||||||
import com.djrapitops.plan.delivery.formatting.Formatters;
|
import com.djrapitops.plan.delivery.formatting.Formatters;
|
||||||
|
import com.djrapitops.plan.gathering.ServerUptimeCalculator;
|
||||||
import com.djrapitops.plan.identification.Server;
|
import com.djrapitops.plan.identification.Server;
|
||||||
import com.djrapitops.plan.identification.ServerInfo;
|
import com.djrapitops.plan.identification.ServerInfo;
|
||||||
import com.djrapitops.plan.identification.ServerUUID;
|
import com.djrapitops.plan.identification.ServerUUID;
|
||||||
@ -58,18 +59,20 @@ public class ServerPlaceHolders implements Placeholders {
|
|||||||
private final DBSystem dbSystem;
|
private final DBSystem dbSystem;
|
||||||
private final ServerInfo serverInfo;
|
private final ServerInfo serverInfo;
|
||||||
private final Formatters formatters;
|
private final Formatters formatters;
|
||||||
|
private final ServerUptimeCalculator serverUptimeCalculator;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
public ServerPlaceHolders(
|
public ServerPlaceHolders(
|
||||||
PlanConfig config,
|
PlanConfig config,
|
||||||
DBSystem dbSystem,
|
DBSystem dbSystem,
|
||||||
ServerInfo serverInfo,
|
ServerInfo serverInfo,
|
||||||
Formatters formatters
|
Formatters formatters, ServerUptimeCalculator serverUptimeCalculator
|
||||||
) {
|
) {
|
||||||
this.config = config;
|
this.config = config;
|
||||||
this.dbSystem = dbSystem;
|
this.dbSystem = dbSystem;
|
||||||
this.serverInfo = serverInfo;
|
this.serverInfo = serverInfo;
|
||||||
this.formatters = formatters;
|
this.formatters = formatters;
|
||||||
|
this.serverUptimeCalculator = serverUptimeCalculator;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -204,6 +207,11 @@ public class ServerPlaceHolders implements Placeholders {
|
|||||||
placeholders.registerStatic("server_name",
|
placeholders.registerStatic("server_name",
|
||||||
() -> serverInfo.getServer().getName());
|
() -> serverInfo.getServer().getName());
|
||||||
|
|
||||||
|
placeholders.registerStatic("server_uptime",
|
||||||
|
parameters -> serverUptimeCalculator.getServerUptimeMillis(getServerUUID(parameters))
|
||||||
|
.map(String::valueOf)
|
||||||
|
.orElse("-"));
|
||||||
|
|
||||||
placeholders.registerStatic("server_uuid",
|
placeholders.registerStatic("server_uuid",
|
||||||
serverInfo::getServerUUID);
|
serverInfo::getServerUUID);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user