Skip to content

Commit b6481c7

Browse files
committed
Add placeholders
- plan_player_lastseen_raw - plan_player_registered_raw - plan_player_lastseen_server Affects issues: - Close #3944
1 parent 60842db commit b6481c7

1 file changed

Lines changed: 17 additions & 2 deletions

File tree

Plan/common/src/main/java/com/djrapitops/plan/placeholder/PlayerPlaceHolders.java

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,26 @@ public void register(
145145
player -> year.apply(player.getValue(PlayerKeys.LAST_SEEN)
146146
.orElse((long) 0))
147147
);
148+
placeholders.register("player_lastseen_server",
149+
player -> SessionsMutator.forContainer(player).latestSession()
150+
.map(FinishedSession::getServerUUID)
151+
.flatMap(serverUUID -> dbSystem.getDatabase().query(ServerQueries.fetchServerMatchingIdentifier(serverUUID)))
152+
.map(Server::getIdentifiableName)
153+
.orElse("-")
154+
);
155+
placeholders.register("player_lastseen_raw",
156+
player -> player.getValue(PlayerKeys.LAST_SEEN)
157+
.orElse((long) 0)
158+
);
148159

149160
placeholders.register("player_registered",
150161
player -> year.apply(player.getValue(PlayerKeys.REGISTERED)
151162
.orElse((long) 0))
152163
);
164+
placeholders.register("player_registered_raw",
165+
player -> player.getValue(PlayerKeys.REGISTERED)
166+
.orElse((long) 0)
167+
);
153168

154169
placeholders.register("player_geolocation",
155170
player -> GeoInfoMutator.forContainer(player)
@@ -167,7 +182,7 @@ public void register(
167182
);
168183

169184
registerPlaytimePlaceholders(placeholders, time);
170-
registerSessionLengethPlaceholders(placeholders, time);
185+
registerSessionLengthPlaceholders(placeholders, time);
171186

172187
placeholders.register("player_favorite_server",
173188
player -> PerServerMutator.forContainer(player).favoriteServer()
@@ -192,7 +207,7 @@ public void register(
192207
registerKillPlaceholders(placeholders);
193208
}
194209

195-
private void registerSessionLengethPlaceholders(PlanPlaceholders placeholders, Formatter<Long> time) {
210+
private void registerSessionLengthPlaceholders(PlanPlaceholders placeholders, Formatter<Long> time) {
196211
placeholders.register("player_current_session_length",
197212
player -> time.apply(getActiveSessionLength(player).orElse(-1L)));
198213
placeholders.register("player_current_session_length_raw",

0 commit comments

Comments
 (0)