Merge pull request #3 from MCDiamondFire/master

.

Author: ProjectDF

.gitignore

@@ -3,3 +3,7 @@
 gradle
 build
 /src/main/resources/swear_filter.json
+
+*.json
+*.png
+*.txt

README.md

@@ -12,6 +12,7 @@ HelpBot is created in **java 16** and there are no current rules in place for co
 something you are able to create a **fork** and submit a **pull request**.
 
 Most pull requests are accepted, do not be afraid to make a change I promise I do not bite.
+Please give me time to review your PR however, as it takes a little bit for me to make sure that your PR is up to standards. Testing will help!
 
 **Config File**
 

build.gradle

@@ -32,6 +32,12 @@ tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }
 
+jar {
+    manifest {
+        attributes("Main-Class": "com.diamondfire.helpbot.HelpBot")
+    }
+}
+
 build {
     dependsOn {
         shadowJar

src/main/java/META-INF/MANIFEST.MF

@@ -49,6 +49,7 @@ public static void initialize() throws LoginException {
                 new SearchCommand(),
                 new TagsCommand(),
                 // others
+                new CowsayCommand(),
                 new MimicCommand(),
                 new FetchDataCommand(),
                 new InfoCommand(),
@@ -77,7 +78,7 @@ public static void initialize() throws LoginException {
                 new PollCommand(),
                 new IdeaCommand(),
                 new StoreCommand(),
-                //new ChannelMuteCommand(),
+                new ChannelMuteCommand(),
                 // statsbot
                 new StatsCommand(),
                 new SupportBadCommand(),
@@ -87,7 +88,7 @@ public static void initialize() throws LoginException {
                 new ActivePlotsCommand(),
                 new TrendingPlotsCommand(),
                 new PlotsCommand(),
-                new CpTopCommand(),
+                //new CpTopCommand(),
                 new RetiredListCommand(),
                 new StaffListCommand(),
                 new SessionTopCommand(),
@@ -105,8 +106,8 @@ public static void initialize() throws LoginException {
                 new HelpedByCommand(),
                 new NamesCommand(),
                 new PlayerJoinGraphCommand(),
-                new CpCommand(),
-                new CpRequirementsCommand(),
+                //new CpCommand(),
+                //new CpRequirementsCommand(),
                 new VoteGivenLeaderboard(),
                 new PlotVoteGraphCommand(),
                 new JoinDataCommand(),
@@ -159,4 +160,4 @@ public static Config getConfig() {
     public static TaskRegistry getScheduler() {
         return loop;
     }
-}
+}

src/main/java/com/diamondfire/helpbot/bot/HelpBotInstance.java

@@ -0,0 +1,15 @@
+package com.diamondfire.helpbot.bot.command.argument.impl.types;
+
+import com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions.ArgumentException;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Deque;
+
+public class EndlessStringArgument implements Argument<String> {
+    
+    @Override
+    public String parseValue(@NotNull Deque<String> args, CommandEvent event) throws ArgumentException {
+        return String.join(" ", args);
+    }
+}

src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/EndlessStringArgument.java

@@ -0,0 +1,54 @@
+package com.diamondfire.helpbot.bot.command.argument.impl.types.Enum;
+
+import com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions.*;
+import com.diamondfire.helpbot.bot.command.argument.impl.types.AbstractSimpleValueArgument;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.EnumSet;
+import java.util.stream.Collectors;
+
+public class EnumArgument<E extends Enum<E> & EnumArgument.InputEnum> extends AbstractSimpleValueArgument<E> {
+    
+    private EnumSet<E> associatedEnum;
+    
+    public EnumArgument<E> setEnum(Class<E> anEnum) {
+        associatedEnum = EnumSet.allOf(anEnum);
+        return this;
+    }
+    
+    @Override
+    protected E parse(@NotNull String argument, CommandEvent event) throws ArgumentException {
+        for (E enumValue : associatedEnum) {
+            if (argument.equals(enumValue.getName())) {
+                return enumValue;
+            }
+        }
+        
+        throw new MalformedArgumentException("This is not a valid option! Choose from: " + getFormattedOptions());
+    }
+    
+    private String getFormattedOptions() {
+        return getFormattedOptions(associatedEnum);
+    }
+    
+    public static <T extends Enum<T> & InputEnum> String getFormattedOptions(@NotNull Class<T> anEnum) {
+        return getFormattedOptions(EnumSet.allOf(anEnum));
+    }
+    
+    public static String getFormattedOptions(@NotNull EnumSet<? extends InputEnum> anEnum) {
+        return "`" +
+                anEnum.stream()
+                        .filter(e -> !e.isHidden())
+                        .map(InputEnum::getName)
+                        .collect(Collectors.joining("` `"))
+                + "`";
+    }
+    
+    protected interface InputEnum {
+        
+        String getName();
+        
+        boolean isHidden();
+    }
+}

src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/Enum/EnumArgument.java

@@ -0,0 +1,60 @@
+package com.diamondfire.helpbot.bot.command.argument.impl.types.Enum;
+
+import com.diamondfire.helpbot.sys.tag.Tag;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.function.BiConsumer;
+
+public enum TagProperty implements EnumArgument.InputEnum {
+    
+    ACTIVATOR("activator", true, Tag::setActivator),
+    TITLE("title", true, Tag::setTitle),
+    RESPONSE("response", true, Tag::setResponse),
+    AUTHOR_ID("authorId", false, (tag, newValue) -> {
+        throw new UnsupportedOperationException();
+    }),
+    IMAGE("image", true, Tag::setImage)
+    ;
+    
+    private final String name;
+    private final boolean modifiable;
+    private final BiConsumer<Tag, String> modifier;
+    
+    TagProperty(String name, boolean modifiable, BiConsumer<Tag, String> modifier) {
+        this.name = name;
+        this.modifiable = modifiable;
+        this.modifier = modifier;
+    }
+    
+    public static @NotNull TagProperty of(String property) {
+        for (TagProperty tagProperty : TagProperty.values()) {
+            if (tagProperty.getName().equals(property)) {
+                return tagProperty;
+            }
+        }
+        
+        throw new IllegalArgumentException();
+    }
+    
+    @Override
+    public String getName() {
+        return name;
+    }
+    
+    @Override
+    public boolean isHidden() {
+        return !isModifiable();
+    }
+    
+    public boolean isModifiable() {
+        return modifiable;
+    }
+    
+    public void set(Tag tag, String newValue) {
+        getModifier().accept(tag, newValue);
+    }
+    
+    public BiConsumer<Tag, String> getModifier() {
+        return modifier;
+    }
+}

src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/Enum/TagProperty.java

@@ -0,0 +1,41 @@
+package com.diamondfire.helpbot.bot.command.argument.impl.types;
+
+import com.diamondfire.helpbot.bot.command.argument.impl.parsing.exceptions.*;
+import com.diamondfire.helpbot.bot.events.CommandEvent;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.*;
+
+public class QuoteStringArgument implements Argument<String> {
+    
+    private static final String ERROR_MESSAGE = "Invalid quote, must start and end with `'` or `\"`.";
+    
+    @Override
+    public String parseValue(@NotNull Deque<String> args, CommandEvent event) throws ArgumentException {
+    
+        // Check if argument starts with quote
+        if (!(args.element().startsWith("'") || args.peek().startsWith("\""))) {
+            throw new MalformedArgumentException(ERROR_MESSAGE);
+        }
+    
+        // Init variables
+        List<String> elements = new ArrayList<>();
+        String argument = args.poll();
+        elements.add(argument);
+    
+        // Repeat arguments until end is reached (exception) or an end quote is found
+        while (!(argument.endsWith("'") || argument.endsWith("\""))) {
+            argument = args.poll();
+            
+            if (argument == null) {
+                throw new MalformedArgumentException(ERROR_MESSAGE);
+            }
+        
+            elements.add(argument);
+        }
+    
+        // Join elements and remove quotes
+        String result = String.join(" ", elements);
+        return result.substring(1, result.length()-1);
+    }
+}

src/main/java/com/diamondfire/helpbot/bot/command/argument/impl/types/QuoteStringArgument.java

@@ -10,6 +10,7 @@
 import com.diamondfire.helpbot.util.WebUtil;
 import com.google.gson.*;
 import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.Message;
 
 import java.util.*;
 
@@ -46,6 +47,9 @@ public Permission getPermission() {
     @Override
     public void run(CommandEvent event) {
         EmbedBuilder builder = new EmbedBuilder();
+        builder.setTitle("<:diamondfire:867472383098486794> DiamondFire Store <:diamondfire:867472383098486794>", "https://store.mcdiamondfire.com/");
+        builder.setDescription("Fetching store..");
+        Message message = event.getChannel().sendMessageEmbeds(builder.build()).complete();
         try{
             JsonObject json = WebUtil.getJson("https://df.vatten.dev/store/").getAsJsonObject();
             builder.setTitle("<:diamondfire:867472383098486794> DiamondFire Store <:diamondfire:867472383098486794>", "https://store.mcdiamondfire.com/");
@@ -73,16 +77,16 @@ public void run(CommandEvent event) {
                 }
                 builder.addField(emotes.get(category.getKey()) + " " + category.getKey(), String.join("\n", fieldval) + "\n\u200b", false);
             }
-    
+            
             ArrayList<String> fieldval = new ArrayList<>();
             for(JsonElement purchase : json.getAsJsonArray("recent-purchases")) {
                 fieldval.add(" **" + purchase.getAsJsonObject().get("player").getAsString() + "** bought **" + purchase.getAsJsonObject().get("item").getAsString() + "**");
             }
             builder.addField(":partying_face: Recent Purchases", String.join("\n", fieldval), false);
 
-            event.getChannel().sendMessageEmbeds(builder.build()).queue();
+            message.editMessageEmbeds(builder.build()).queue();
         }catch(Exception e) {
-            event.reply(new PresetBuilder().withPreset(new InformativeReply(InformativeReplyType.ERROR, "Failed to retrieve store items.")));
+            message.editMessageEmbeds(new PresetBuilder().withPreset(new InformativeReply(InformativeReplyType.ERROR, "Failed to retrieve store items.")).getEmbed().build()).queue();
         }
     }
 }