Finish error reporting

Author: Innectic

API/src/main/java/me/innectic/permissify/api/database/ConnectionError.java

@@ -33,7 +33,7 @@
  */
 @AllArgsConstructor
 public enum ConnectionError {
-    REJECTED("Connection rejected"), DATABASE_EXCEPTION("Encountered an exception in a database handler");
+    REJECTED("Connection to database rejected"), DATABASE_EXCEPTION("Exception in a database handler");
 
     @Getter private String display;
 }

Spigot/src/main/java/me/innectic/permissify/spigot/commands/permissify/PlayerCommand.java

@@ -30,6 +30,7 @@
 import me.innectic.permissify.api.permission.Permission;
 import me.innectic.permissify.api.permission.PermissionGroup;
 import me.innectic.permissify.spigot.utils.PermissionUtil;
+import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
@@ -163,7 +164,7 @@ public CommandResponse handleListPermissions(CommandSender sender, String[] args
         if (args.length < 1) return new CommandResponse(PermissifyConstants.NOT_ENOUGH_ARGUMENTS_PLAYER_LIST_PERMISSIONS, false);
         OfflinePlayer targetPlayer = Bukkit.getPlayer(args[0]);
         if (targetPlayer == null) return new CommandResponse(PermissifyConstants.INVALID_PLAYER, false);
-        // This sucks, can probably be cleanup up.
+        // This sucks, can probably be cleaned up.
         List<PermissionGroup> groups = plugin.getPermissifyAPI().getDatabaseHandler().get().getGroups().stream()
                 .filter(permissionGroup -> permissionGroup.hasPlayer(targetPlayer.getUniqueId()))
                 .collect(Collectors.toList());

Spigot/src/main/java/me/innectic/permissify/spigot/utils/DisplayUtil.java

@@ -27,6 +27,7 @@
 import me.innectic.permissify.api.PermissifyConstants;
 import me.innectic.permissify.api.database.ConnectionError;
 import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
 import java.util.List;
@@ -41,8 +42,16 @@ public class DisplayUtil implements me.innectic.permissify.api.util.DisplayUtil
 
     @Override
     public void displayError(ConnectionError error, Optional<Exception> exception) {
-        List<String> messages = PermissifyConstants.PERMISSIFY_ERROR.stream().map(ColorUtil::makeReadable).collect(Collectors.toList());
-        List<Player> players = Bukkit.getOnlinePlayers().stream().filter(player -> player.hasPermission(PermissifyConstants.PERMISSIFY_ADMIN)).collect(Collectors.toList());
+        String reportable = shouldReport(error) ? ChatColor.GREEN + "" + ChatColor.BOLD + "Yes": ChatColor.RED + "" + ChatColor.BOLD + "No";
+        List<String> messages = PermissifyConstants.PERMISSIFY_ERROR.stream()
+                .map(part -> part.replace("<ERROR_TYPE>", error.getDisplay()))
+                .map(part -> part.replace("<SHOULD_REPORT>", reportable))
+                .map(ColorUtil::makeReadable).collect(Collectors.toList());
+        List<Player> players = Bukkit.getOnlinePlayers().stream().filter(player -> PermissionUtil.hasPermissionOrSuperAdmin(player, PermissifyConstants.PERMISSIFY_ADMIN)).collect(Collectors.toList());
         messages.forEach(message -> players.forEach(player -> player.sendMessage(message)));
     }
+
+    private boolean shouldReport(ConnectionError error) {
+        return error != ConnectionError.REJECTED && error == ConnectionError.DATABASE_EXCEPTION;
+    }
 }

Spigot/src/main/resources/config.yml

@@ -6,4 +6,4 @@ connection:
   database: permissify
   username: permissify
   password: magicalpassword
-  file: test.db
+  file: permissify.db

Spigot/src/main/resources/plugin.yml

@@ -1,9 +1,11 @@
 name: Permissify
-version: 1.0
+version: 1.3
 authors: [Innectic]
 description: Permissify is a dead-simple, next-generation permission plugin.
 main: me.innectic.permissify.spigot.PermissifyMain
 
 commands:
     permissify:
-        description: Do things with permissions
+        description: Do things with permissions
+    perm:
+        description: Alias of permissify