-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
13 changed files
with
228 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
137 changes: 137 additions & 0 deletions
137
...-common/src/main/java/de/jvstvshd/necrify/common/punishment/log/NecrifyPunishmentLog.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| /* | ||
| * This file is part of Necrify (formerly Velocity Punishment), a plugin designed to manage player's punishments for the platforms Velocity and partly Paper. | ||
| * Copyright (C) 2022-2024 JvstvsHD | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| */ | ||
|
|
||
| package de.jvstvshd.necrify.common.punishment.log; | ||
|
|
||
| import de.chojo.sadu.queries.api.call.Call; | ||
| import de.chojo.sadu.queries.api.query.Query; | ||
| import de.jvstvshd.necrify.api.duration.PunishmentDuration; | ||
| import de.jvstvshd.necrify.api.punishment.Punishment; | ||
| import de.jvstvshd.necrify.api.punishment.log.PunishmentLog; | ||
| import de.jvstvshd.necrify.api.punishment.log.PunishmentLogAction; | ||
| import de.jvstvshd.necrify.api.punishment.log.PunishmentLogActionRegistry; | ||
| import de.jvstvshd.necrify.api.punishment.log.PunishmentLogEntry; | ||
| import de.jvstvshd.necrify.api.user.NecrifyUser; | ||
| import de.jvstvshd.necrify.api.user.UserManager; | ||
| import de.jvstvshd.necrify.common.AbstractNecrifyPlugin; | ||
| import de.jvstvshd.necrify.common.io.Adapters; | ||
| import de.jvstvshd.necrify.common.util.Util; | ||
| import net.kyori.adventure.text.minimessage.MiniMessage; | ||
| import org.jetbrains.annotations.NotNull; | ||
| import org.jetbrains.annotations.Nullable; | ||
|
|
||
| import java.sql.Timestamp; | ||
| import java.time.Instant; | ||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.UUID; | ||
|
|
||
| public class NecrifyPunishmentLog implements PunishmentLog { | ||
|
|
||
| private final Punishment punishment; | ||
| private final List<PunishmentLogEntry> entries = Collections.synchronizedList(new ArrayList<>()); | ||
| private final AbstractNecrifyPlugin plugin; | ||
| private final UserManager userManager; | ||
|
|
||
| public NecrifyPunishmentLog(Punishment punishment, AbstractNecrifyPlugin plugin) { | ||
| this.punishment = punishment; | ||
| this.plugin = plugin; | ||
| this.userManager = plugin.getUserManager(); | ||
| } | ||
|
|
||
| /** | ||
| * Loads the log from the database. This method should be called right after instantiation of this object, otherwise | ||
| * there will be no data contained in this object. | ||
| * <p>This method is ran synchronously and should not be called on the main thread. Use an asynchronous context yourself. | ||
| * | ||
| * @param loadIfAlreadyLoaded whether to load the log if it is already loaded | ||
| */ | ||
| public synchronized void load(boolean loadIfAlreadyLoaded) { | ||
| if (!loadIfAlreadyLoaded && !entries.isEmpty()) { | ||
| return; | ||
| } | ||
| var entries = Query.query("SELECT * FROM punishment_log WHERE punishment_id = ? ORDER BY id ASC") | ||
| .single(Call.of().bind(punishment.getUuid(), Adapters.UUID_ADAPTER)) | ||
| .map(row -> { | ||
| var id = row.getInt(1); | ||
| var actorUuid = row.getObject(2, UUID.class); | ||
| NecrifyUser actor; | ||
| if (actorUuid == null) { | ||
| actor = null; | ||
| } else { | ||
| actor = userManager.loadUser(actorUuid).join().orElseThrow(() -> new IllegalStateException("Actor not found.")); | ||
| } | ||
| var message = row.getString(3); | ||
| var duration = PunishmentDuration.fromTimestamp(row.getTimestamp(4)); | ||
| var reason = MiniMessage.miniMessage().deserialize(row.getString(5)); | ||
| var predecessor = plugin.getPunishment(row.getObject(6, UUID.class)).join().orElse(null); | ||
| var successor = plugin.getPunishment(row.getObject(7, UUID.class)).join().orElse(null); | ||
| var action = PunishmentLogActionRegistry.getAction(row.getString(8)).orElse(PunishmentLogAction.UNKNOWN); | ||
| var instant = row.getTimestamp(9).toInstant(); | ||
| return new PunishmentLogEntry(actor, message, duration, reason, predecessor, punishment, successor, action, this, instant, id); | ||
| }).all(); | ||
| Collections.sort(entries); | ||
| this.entries.clear(); | ||
| this.entries.addAll(entries); | ||
| } | ||
|
|
||
| @Override | ||
| public @NotNull Punishment getPunishment() { | ||
| return punishment; | ||
| } | ||
|
|
||
| @Override | ||
| public @NotNull List<PunishmentLogEntry> getEntries() { | ||
| return entries; | ||
| } | ||
|
|
||
| @Override | ||
| public @NotNull List<PunishmentLogEntry> getEntries(@NotNull PunishmentLogAction action) { | ||
| return entries.stream().filter(entry -> entry.action().equals(action)).toList(); | ||
| } | ||
|
|
||
| @Override | ||
| public @Nullable PunishmentLogEntry getEntry(@NotNull PunishmentLogAction action) { | ||
| return getEntries(action).getFirst(); | ||
| } | ||
|
|
||
| @Override | ||
| public @NotNull PunishmentLogEntry getEntry(int index) { | ||
| return entries.get(index); | ||
| } | ||
|
|
||
| @Override | ||
| public void log(@NotNull PunishmentLogAction action, @NotNull String message, @NotNull NecrifyUser actor) { | ||
| var entry = new PunishmentLogEntry(actor, message, PunishmentDuration.ofPunishment(punishment), punishment.getReason(), punishment.getPredecessor(), punishment, punishment.getSuccessor(), action, this, Instant.now(), entries.size()); | ||
| //insert at correct position (linked list) | ||
| entries.add(entry); | ||
| Util.executeAsync(() -> Query.query("INSERT INTO punishment_log (punishment_id, player_id, message, expiration, reason, predecessor, successor, action, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)") | ||
| .single(Call.of().bind(punishment.getUuid(), Adapters.UUID_ADAPTER) | ||
| .bind(actor.getUuid(), Adapters.UUID_ADAPTER) | ||
| .bind(message) | ||
| .bind(PunishmentDuration.ofPunishment(punishment).expirationAsTimestamp()) | ||
| .bind(MiniMessage.miniMessage().serialize(punishment.getReason())) | ||
| .bind(punishment.getPredecessor() == null ? null : punishment.getPredecessor().getUuid(), Adapters.UUID_ADAPTER) | ||
| .bind(punishment.getSuccessorOrNull() == null ? null : punishment.getSuccessor().getUuid(), Adapters.UUID_ADAPTER) | ||
| .bind(action.name()) | ||
| .bind(Timestamp.from(Instant.now()))) | ||
| .insert().changed(), plugin.getExecutor()); | ||
|
|
||
| } | ||
| } |
12 changes: 12 additions & 0 deletions
12
necrify-common/src/main/resources/database/postgresql/1/patch_2.sql
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| CREATE TABLE IF NOT EXISTS punishment_log ( | ||
| id SERIAL PRIMARY KEY, | ||
| punishment_id UUID, | ||
| player_id UUID REFERENCES necrify_users (uuid) ON DELETE SET NULL, | ||
| message TEXT, | ||
| expiration TIMESTAMP, | ||
| reason TEXT, | ||
| predecessor UUID DEFAULT NULL, | ||
| successor UUID DEFAULT NULL, | ||
| action VARCHAR(128), | ||
| created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP | ||
| ) |
Oops, something went wrong.