GH-40 crispi feedback (#40)

* fix item name/lore formating
copy backup system from vLucky
add perms to plugin.yml for LuckPerms
add online status of friends
add message to player which invitation was denied
some messages changes

* fix permissions
fix ignored players loading
fix invites loading from database
some small fixes

* Delete run/plugins directory

---------

Co-authored-by: Martin Sulikowski <[email protected]>

Author: Kamicjusz

.gitignore

@@ -6,6 +6,7 @@
 .gradle/
 out/
 build/
+run/
 
 .DS_Store
 [Dd]esktop.ini

build.gradle.kts

@@ -1,4 +1,5 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import net.minecrell.pluginyml.bukkit.BukkitPluginDescription.Permission.Default;
 
 plugins {
     id("java")
@@ -63,6 +64,28 @@ bukkit {
     version = "${project.version}"
     depend = listOf("ProtocolLib")
     description = "EternalFriends is a plugin that allows you to manage your friends list."
+    permissions {
+        register("eternalfriends.access.all") {
+            children = listOf(
+                "eternalfriends.access.gui",
+                "eternalfriends.access.accept",
+                "eternalfriends.access.deny",
+                "eternalfriends.access.help",
+                "eternalfriends.access.ignore",
+                "eternalfriends.access.invite",
+                "eternalfriends.access.kick",
+                "eternalfriends.access.list"
+            )
+            default = Default.OP
+        }
+        register("eternalfriends.admin.all") {
+            children = listOf(
+                "eternalfriends.admin.list",
+                "eternalfriends.admin.reload"
+            )
+            default = Default.OP
+        }
+    }
 }
 
 java {

run/plugins/EternalCore v1.0.0 (MC 1.17-1.19x).jar

@@ -14,6 +14,7 @@
 import com.eternalcode.friends.command.implementation.FriendKickCommand;
 import com.eternalcode.friends.command.implementation.FriendListCommand;
 import com.eternalcode.friends.command.implementation.FriendReloadCommand;
+import com.eternalcode.friends.config.ConfigBackupService;
 import com.eternalcode.friends.config.ConfigManager;
 import com.eternalcode.friends.config.implementation.GuiConfig;
 import com.eternalcode.friends.config.implementation.MessagesConfig;
@@ -44,6 +45,7 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
+import panda.std.stream.PandaStream;
 
 import java.util.stream.Stream;
 
@@ -65,6 +67,7 @@ public class EternalFriends extends JavaPlugin {
     private FriendDatabaseService friendDatabaseService;
     private IgnoredPlayerDatabaseService ignoredPlayerDatabaseService;
     private InviteDatabaseService inviteDatabaseService;
+    private ConfigBackupService configBackupService;
 
     private HikariDataSource databaseDataSource;
 
@@ -73,8 +76,6 @@ public void onLoad() {
         this.protocolManager = ProtocolLibrary.getProtocolManager();
     }
 
-    //TODO sprawdzac czy gracze juz sa znajomymi
-    //akceptowanie zaproszenia z gui nie usuwa glowki
     @Override
     public void onEnable() {
         Server server = this.getServer();
@@ -84,12 +85,16 @@ public void onEnable() {
 
         this.announcer = new NotificationAnnouncer(this.audienceProvider, this.miniMessage);
 
-        this.configManager = new ConfigManager(this.getDataFolder());
+        this.configBackupService = new ConfigBackupService(this.getDataFolder());
+
+        this.configManager = new ConfigManager(this.getDataFolder(), this.configBackupService);
 
         this.config = new PluginConfig();
         this.messages = new MessagesConfig();
         this.guiConfig = new GuiConfig();
 
+        this.configBackupService.createBackup();
+
         this.configManager.load(this.config);
         this.configManager.load(this.messages);
         this.configManager.load(this.guiConfig);
@@ -144,6 +149,8 @@ public void onEnable() {
 
     @Override
     public void onDisable() {
-        this.liteCommands.getPlatform().unregisterAll();
+        if (this.liteCommands != null) {
+            this.liteCommands.getPlatform().unregisterAll();
+        }
     }
 }

run/plugins/ProtocolLib (1).jar

@@ -16,7 +16,7 @@ public FriendCommand(MainGui mainGui) {
     }
 
     @Execute(required = 0)
-    @Permission("eternalfriends.access")
+    @Permission("eternalfriends.access.gui")
     void main(Player player) {
         this.mainGui.openMainGui(player);
     }

src/main/java/com/eternalcode/friends/EternalFriends.java

@@ -41,7 +41,9 @@ public void deny(Player sender, @Arg @Name("player") Player target) {
 
         if (inviteManager.hasReceivedInvite(targetUuid, senderUuid)) {
             this.inviteManager.removeInvite(targetUuid, senderUuid);
+
             this.announcer.announceMessage(senderUuid, friendsConfig.inviteDenied.replace("{player}", target.getName()));
+            this.announcer.announceMessage(targetUuid, friendsConfig.yourInvitationHasBeenDenied.replace("{player}", sender.getName()));
 
             return;
         }

src/main/java/com/eternalcode/friends/command/implementation/FriendCommand.java

@@ -43,6 +43,8 @@ public void invite(Player sender, @Arg @Name("player") Player target) {
         }
 
         if (this.friendManager.isIgnoredByPlayer(senderUuid, targetUuid)) {
+            this.announcer.announceMessage(senderUuid, friendsConfig.youreIgnored);
+
             return;
         }
 

src/main/java/com/eternalcode/friends/command/implementation/FriendDenyCommand.java

@@ -65,7 +65,7 @@ private String listOfFriends(UUID uuid, boolean adminMode) {
         }
 
         if (adminMode) {
-            builder.append(friendsConfig.friendListHeaderAdmin);
+            builder.append(friendsConfig.friendListHeaderAdmin.replace("{player}", server.getOfflinePlayer(uuid).getName()));
         }
         else {
             builder.append(friendsConfig.friendListHeader);

src/main/java/com/eternalcode/friends/command/implementation/FriendInviteCommand.java

@@ -0,0 +1,119 @@
+package com.eternalcode.friends.config;
+
+import panda.utilities.FileUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.time.temporal.ChronoUnit;
+
+public class ConfigBackupService {
+
+    private static final String BACKUP_FOLDER_NAME = "backup";
+    private static final String BACKUP_FILE_EXTENSION = ".bak";
+    private final File dataFolder;
+
+    public ConfigBackupService(File dataFolder) {
+        this.dataFolder = dataFolder;
+    }
+
+    public void createBackup() {
+        File backupFolder = new File(this.dataFolder, BACKUP_FOLDER_NAME);
+
+        if (!backupFolder.exists()) {
+            backupFolder.mkdirs();
+        }
+
+        LocalDateTime currentDateTime = LocalDateTime.now();
+        String backupFolderName = BACKUP_FOLDER_NAME + "_" + currentDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd_HH-mm"));
+        File currentBackupFolder = new File(backupFolder, backupFolderName);
+        if (!currentBackupFolder.exists()) {
+            currentBackupFolder.mkdirs();
+        }
+
+        this.copyFolderContents(this.dataFolder, currentBackupFolder);
+        this.deleteIfOlderDirectory(backupFolder);
+    }
+
+    private void copyFolderContents(File sourceFolder, File targetFolder) {
+        if (!sourceFolder.exists() || !sourceFolder.isDirectory()) {
+            return;
+        }
+
+        if (!targetFolder.exists()) {
+            boolean targetFolderCreated = targetFolder.mkdirs();
+
+            if (!targetFolderCreated) {
+                return;
+            }
+
+        }
+
+        File[] filesToBackup = sourceFolder.listFiles();
+        if (filesToBackup == null) {
+            return;
+        }
+
+        for (File file : filesToBackup) {
+            if (file.isDirectory() && !file.getName().equals(BACKUP_FOLDER_NAME)) {
+                File subFolder = new File(targetFolder, file.getName());
+                this.copyFolderContents(file, subFolder);
+
+                continue;
+            }
+
+            if (file.isFile() && !file.getName().endsWith(BACKUP_FILE_EXTENSION)) {
+                File backupFile = new File(targetFolder, file.getName() + BACKUP_FILE_EXTENSION);
+
+                this.copyToBackupFile(file, backupFile);
+            }
+        }
+    }
+
+    private void copyToBackupFile(File targetFolder, File path) {
+        try {
+            Files.copy(targetFolder.toPath(), path.toPath(), StandardCopyOption.REPLACE_EXISTING);
+        }
+        catch (IOException exception) {
+            exception.printStackTrace();
+        }
+    }
+
+    // delete backup folders older than 72h
+    private void deleteIfOlderDirectory(File backupFolder) {
+        File[] backupFolders = backupFolder.listFiles(File::isDirectory);
+
+        if (backupFolders == null) {
+            return;
+        }
+
+        for (File folder : backupFolders) {
+            String folderName = folder.getName();
+            if (!folderName.startsWith(BACKUP_FOLDER_NAME)) {
+                continue;
+            }
+
+            try {
+                LocalDate folderDate = LocalDate.parse(folderName.substring(BACKUP_FOLDER_NAME.length() + 1, folderName.lastIndexOf("_")));
+                LocalTime folderTime = LocalTime.parse(folderName.substring(folderName.lastIndexOf("_") + 1).replace("-", ":"));
+                LocalDateTime folderDateTime = LocalDateTime.of(folderDate, folderTime);
+                LocalDateTime currentDateTime = LocalDateTime.now();
+
+                long hours = ChronoUnit.HOURS.between(folderDateTime, currentDateTime);
+
+                if (hours > 72) {
+                    FileUtils.delete(folder);
+                }
+            }
+            catch (DateTimeParseException exception) {
+                exception.printStackTrace();
+            }
+        }
+    }
+}