Merge pull request #494 from Mindgamesnl/feature/new-media-engine

Feature/new media engine

Author: Mindgamesnl

.tool-versions

@@ -1 +1 @@
-java adoptopenjdk-8.0.332+9
+java openjdk-21

OpenAudioMc/API/src/main/java/com/craftmend/openaudiomc/api/basic/Actor.java

@@ -39,4 +39,10 @@ public interface Actor {
      */
     void sendMessage(String message);
 
+    /**
+     * Get the "type" of actor. This is usually determined by the platform, and can be used to differentiate between players, console, etc.
+     * @return the category of the actor
+     */
+    ActorCategory getCategory();
+
 }

OpenAudioMc/API/src/main/java/com/craftmend/openaudiomc/api/basic/ActorCategory.java

@@ -0,0 +1,9 @@
+package com.craftmend.openaudiomc.api.basic;
+
+public enum ActorCategory {
+
+    PLAYER,
+    CONSOLE,
+    UNKNOWN
+
+}

OpenAudioMc/OA-PaperUserAdapter/src/main/java/com/craftmend/openaudiomc/integrations/user/ModernPaperUserAdapter.java

@@ -1,5 +1,6 @@
 package com.craftmend.openaudiomc.integrations.user;
 
+import com.craftmend.openaudiomc.api.basic.ActorCategory;
 import com.craftmend.openaudiomc.api.user.User;
 import net.md_5.bungee.api.ChatMessageType;
 import net.md_5.bungee.api.chat.TextComponent;
@@ -26,6 +27,17 @@ public void sendMessage(String string) {
         }
     }
 
+    @Override
+    public ActorCategory getCategory() {
+        if (player instanceof Player) {
+            return ActorCategory.PLAYER;
+        }
+        if (player instanceof org.bukkit.command.ConsoleCommandSender) {
+            return ActorCategory.CONSOLE;
+        }
+        return ActorCategory.UNKNOWN;
+    }
+
     @Override
     public void sendClickableCommandMessage(String msgText, String hoverMessage, String command) {
         String[] lines = msgText.split("\\\\n");

OpenAudioMc/Plugin/build.gradle

@@ -157,8 +157,8 @@ import dev.s7a.gradle.minecraft.server.tasks.LaunchMinecraftServerTask
         ["8", "1.8.8"],
         ["12", "1.12.2"],
         ["20", "1.20.4"],
-        ["21", "1.21.4"],
-        ["217", "1.21.7"]
+//        ["21", "1.21.4"],
+        ["21", "1.21.7"]
 ].each { name, version ->
     task("testPlugin$name", type: LaunchMinecraftServerTask) {
         dependsOn 'shadowJar' // Changed from 'build' to use the shaded jar

OpenAudioMc/Plugin/src/main/java/com/craftmend/openaudiomc/generic/commands/CommandService.java

@@ -147,7 +147,7 @@ public void invokeCommand(User<?> sender, CommandContext context, String[] args,
                     }
                 }
             } else {
-                sender.sendMessage(MagicValue.COMMAND_PREFIX.get(String.class) + "You dont have the permissions to do this, sorry! (" + OpenAudioMc.getInstance().getPlatform() + ")");
+                sender.sendMessage(MagicValue.COMMAND_PREFIX.get(String.class) + "You dont have the permissions to do this, sorry! (must be configured on your " + OpenAudioMc.getInstance().getPlatform().getReadableName() + ")");
             }
         } else {
             sender.sendMessage(MagicValue.COMMAND_PREFIX.get(String.class) + "Unknown sub command: " + args[0].toLowerCase());

OpenAudioMc/Plugin/src/main/java/com/craftmend/openaudiomc/generic/commands/interfaces/SubCommand.java

@@ -71,7 +71,10 @@ protected void message(User<?> sender, String message) {
      */
     public boolean isAllowed(User<?> commandSender) {
         if (ignorePermissions) return true;
+        return hasRequiredPermissions(commandSender);
+    }
 
+    public boolean hasRequiredPermissions(User<?> commandSender) {
         return commandSender.hasPermission(permissionScope + command)
                 || commandSender.hasPermission(permissionScope + "*")
                 || commandSender.hasPermission("openaudiomc.*")

OpenAudioMc/Plugin/src/main/java/com/craftmend/openaudiomc/generic/commands/subcommands/AcceptSubCommand.java

@@ -15,6 +15,7 @@ public class AcceptSubCommand extends SubCommand {
 
     public AcceptSubCommand() {
         super("accept");
+        this.ignorePermissions = true;
     }
 
     @Override
@@ -28,10 +29,12 @@ public void onExecute(User sender, String[] args) {
 
         sender.sendMessage(MagicValue.COMMAND_PREFIX.get(String.class) + "Welcome to OpenAudioMc! you accepted the terms, enjoy the service!");
 
-        OpenAudioMc.resolveDependency(TaskService.class).runAsync(() -> service.connectIfDown());
+        if (this.hasRequiredPermissions(sender)) {
+            OpenAudioMc.resolveDependency(TaskService.class).runAsync(() -> service.connectIfDown());
 
-        for (ClientConnection client : service.getClients()) {
-            client.getAuth().publishSessionUrl();
+            for (ClientConnection client : service.getClients()) {
+                client.getAuth().publishSessionUrl();
+            }
         }
     }
 }

OpenAudioMc/Plugin/src/main/java/com/craftmend/openaudiomc/generic/commands/subcommands/LinkSubCommand.java

@@ -1,9 +1,11 @@
 package com.craftmend.openaudiomc.generic.commands.subcommands;
 
 import com.craftmend.openaudiomc.OpenAudioMc;
+import com.craftmend.openaudiomc.api.basic.ActorCategory;
 import com.craftmend.openaudiomc.generic.commands.helpers.PromptProxyError;
 import com.craftmend.openaudiomc.generic.commands.interfaces.SubCommand;
 import com.craftmend.openaudiomc.generic.commands.objects.Argument;
+import com.craftmend.openaudiomc.generic.logging.OpenAudioLogger;
 import com.craftmend.openaudiomc.generic.networking.interfaces.NetworkingService;
 import com.craftmend.openaudiomc.generic.platform.OaColor;
 import com.craftmend.openaudiomc.generic.platform.interfaces.TaskService;
@@ -12,13 +14,19 @@
 import com.craftmend.openaudiomc.generic.rest.types.ClaimCodeResponse;
 import com.craftmend.openaudiomc.api.user.User;
 
+import java.time.Duration;
+import java.time.Instant;
+
 public class LinkSubCommand extends SubCommand {
 
+    private Instant lastLinkGeneration = Instant.MIN;
+
     public LinkSubCommand() {
         super("link", "login", "account", "claim");
         registerArguments(
                 new Argument("", "Generates a link for you to claim your account")
         );
+        ignorePermissions = true;
     }
 
     @Override
@@ -28,13 +36,56 @@ public void onExecute(User sender, String[] args) {
             return;
         }
 
-        // init connection so we receive the event
-        OpenAudioMc.resolveDependency(TaskService.class).runAsync(() -> OpenAudioMc.getService(NetworkingService.class).connectIfDown());
+        boolean isPlayer = sender.getCategory() == ActorCategory.PLAYER;
+        boolean isPrivileged = hasRequiredPermissions(sender);
 
-        message(sender, OaColor.GRAY + "Generating link...");
+        // if the sender is allowed, we can just enter normal behavior
+        if (isPrivileged) {
+            onExecutePrivileged(sender);
+            return;
+        }
 
-        RestRequest<ClaimCodeResponse> request = new RestRequest<>(ClaimCodeResponse.class, Endpoint.CLAIM_CODE);
+        // if the sender is a player, but they likely do not understand how permissions work, we can give them a more friendly message
+        if (isPlayer) {
+            long minutesSinceLastGeneration = Duration.between(lastLinkGeneration, Instant.now()).toMinutes();
+
+            if (minutesSinceLastGeneration < 5) {
+                message(sender, OaColor.RED + "You have to wait " + (5 - minutesSinceLastGeneration) + " more minute(s) before you can generate a new link.");
+                return;
+            }
+
+            lastLinkGeneration = Instant.now();
+            message(sender, OaColor.GREEN + "Welcome to OpenAudioMc!");
+            message(sender, OaColor.GRAY + "To get started, please go to the logs of your " + OpenAudioMc.getInstance().getPlatform().getReadableName() + " server");
+            message(sender, OaColor.GRAY + "There, you will find a link to claim your account and get started.");
+
+            RestRequest<ClaimCodeResponse> request = new RestRequest<>(ClaimCodeResponse.class, Endpoint.CLAIM_CODE);
+            request.runAsync()
+                    .thenAccept(state -> {
+                        if (state.hasError()) {
+                            message(sender, OaColor.RED + state.getError().getMessage());
+                            return;
+                        }
+
+                        ClaimCodeResponse response = state.getResponse();
+                        String url = response.getClaimUrl();
 
+                        OpenAudioLogger.info("============== [ OpenAudioMc ] ==============");
+                        OpenAudioLogger.info("To get started with OpenAudioMc, please visit the following link:");
+                        OpenAudioLogger.info(url);
+                        OpenAudioLogger.info("This link will allow you to claim your account and get started.");
+                        OpenAudioLogger.info("=============================================");
+                    });
+            return;
+        }
+
+        message(sender, OaColor.RED + "You do not have permission to execute this command. Please make sure you have admin permission on your " + OpenAudioMc.getInstance().getPlatform().getReadableName());
+    }
+
+    private void onExecutePrivileged(User sender) {
+        OpenAudioMc.resolveDependency(TaskService.class).runAsync(() -> OpenAudioMc.getService(NetworkingService.class).connectIfDown());
+        message(sender, OaColor.GRAY + "Generating link...");
+        RestRequest<ClaimCodeResponse> request = new RestRequest<>(ClaimCodeResponse.class, Endpoint.CLAIM_CODE);
         request.runAsync()
                 .thenAccept(state -> {
                     if (state.hasError()) {
@@ -53,7 +104,5 @@ public void onExecute(User sender, String[] args) {
                     );
                     sender.sendMessage(OaColor.GRAY + " >> or visit " + url);
                 });
-
     }
-
 }

OpenAudioMc/Plugin/src/main/java/com/craftmend/openaudiomc/generic/platform/Platform.java

@@ -6,16 +6,23 @@
 import com.craftmend.openaudiomc.spigot.modules.players.objects.SpigotPlayerSelector;
 import com.craftmend.openaudiomc.velocity.modules.player.objects.VelocityPlayerSelector;
 import com.craftmend.openaudiomc.velocity.utils.VelocityChatColor;
+import lombok.Getter;
 
 public enum Platform {
 
-    UNKNOWN,
-    SPIGOT,
-    BUNGEE,
-    VELOCITY,
-    STANDALONE,
+    UNKNOWN("Unknown"),
+    SPIGOT("Minecraft Server"),
+    BUNGEE("BuneeCord (proxy)"),
+    VELOCITY("Velocity (proxy)"),
+    STANDALONE("Standalone"),
     ;
 
+    @Getter private final String readableName;
+
+    Platform(String readableName) {
+        this.readableName = readableName;
+    }
+
     public static String translateColors(String input) {
         switch (OpenAudioMc.getInstance().getPlatform()) {
             case SPIGOT: