Merge pull request #202 from cybooo/develop

Develop
cybooo · Oct 26, 2022 · 8179386 · 8179386
2 parents a04e257 + 0991dba
commit 8179386
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 12 deletions.
diff --git a/langs/lang_cz.json b/langs/lang_cz.json
@@ -223,7 +223,7 @@
       "times-up": "Čas vypršel!"
     },
     "invite": {
-      "click": "Jestli mě chceš pozvat, [**klikni sem!]",
+      "click": "Jestli mě chceš pozvat, [**klikni sem!**]",
       "description": "Pozvi Corgiho na svůj server!",
       "help": "%invite - Vygeneruje pozvánku pro pozvání Corgiho na tvůj server.",
       "title": "Pozvi mě na svůj server!"

diff --git a/langs/lang_en.json b/langs/lang_en.json
@@ -223,7 +223,7 @@
       "times-up": "Time ran out!"
     },
     "invite": {
-      "click": "[**Click here] if you want to invite me!",
+      "click": "If you want to invite me, [**click here!**]",
       "description": "Invite Corgi to your server!",
       "help": "%invite - Generates an invite link to invite Corgi to your server.",
       "title": "Invite me to your server!"

diff --git a/src/main/java/cz/wake/corgibot/CorgiBot.java b/src/main/java/cz/wake/corgibot/CorgiBot.java
@@ -5,6 +5,7 @@
 import cz.wake.corgibot.feeds.TwitterEventListener;
 import cz.wake.corgibot.listener.*;
 import cz.wake.corgibot.music.AudioEngine;
+import cz.wake.corgibot.runnable.PresenceTask;
 import cz.wake.corgibot.runnable.ReminderTask;
 import cz.wake.corgibot.runnable.SpamHandler;
 import cz.wake.corgibot.sql.SQLManager;
@@ -185,6 +186,7 @@ public void start(String[] args) throws LoginException, InterruptedException {
 
         // Startup timer
         scheduledExecutorService.scheduleAtFixedRate(new SpamHandler(), 10, 1500, TimeUnit.MILLISECONDS); // 1.5s clear, higher = disaster
+        scheduledExecutorService.scheduleAtFixedRate(new PresenceTask(), 10, 10, TimeUnit.MINUTES);
 
         // Languages
         CorgiLogger.infoMessage("Loading language files...");

diff --git a/src/main/java/cz/wake/corgibot/commands/user/Help.java b/src/main/java/cz/wake/corgibot/commands/user/Help.java
@@ -11,7 +11,6 @@
 import cz.wake.corgibot.managers.BotManager;
 import cz.wake.corgibot.objects.guild.GuildWrapper;
 import cz.wake.corgibot.utils.Constants;
-import cz.wake.corgibot.utils.EmoteList;
 import cz.wake.corgibot.utils.MessageUtils;
 import cz.wake.corgibot.utils.lang.I18n;
 import net.dv8tion.jda.api.entities.*;
@@ -30,13 +29,11 @@ public class Help implements CommandBase {
     public void onCommand(MessageChannel channel, Message message, String[] args, Member member, EventWaiter w, GuildWrapper gw) {
         if (args.length < 1) {
             if (channel.getType() == ChannelType.TEXT) {
-                channel.sendMessageEmbeds(MessageUtils.getEmbed(Constants.BLUE).setTitle(I18n.getLoc(gw, "commands.help.check-your-messages"))
-                        .setDescription(EmoteList.MAILBOX + " | " + I18n.getLoc(gw, "commands.help.sent-help")).build()).queue();
+                channel.sendMessageEmbeds(MessageUtils.getEmbed(Constants.BLUE)
+                        .setAuthor(I18n.getLoc(gw, "commands.help.commands"), null, channel.getJDA().getSelfUser().getAvatarUrl())
+                        .setDescription(getContext(member, message.getGuild())).setFooter(I18n.getLoc(gw, "commands.help.find-all"), null)
+                        .build()).queue();
             }
-            member.getUser().openPrivateChannel().queue(msg -> msg.sendMessageEmbeds(MessageUtils.getEmbed(Constants.BLUE)
-                    .setAuthor(I18n.getLoc(gw, "commands.help.commands"), null, channel.getJDA().getSelfUser().getAvatarUrl())
-                    .setDescription(getContext(member, message.getGuild())).setFooter(I18n.getLoc(gw, "commands.help.find-all"), null)
-                    .build()).queue());
         } else {
             String commandName = args[0];
             CommandManager cm = CorgiBot.getInstance().getCommandManager();

diff --git a/src/main/java/cz/wake/corgibot/listener/ChatListener.java b/src/main/java/cz/wake/corgibot/listener/ChatListener.java
@@ -84,7 +84,9 @@ public void onMessageReceived(MessageReceivedEvent event) {
             guildWrapper = BotManager.getCustomGuild(event.getMember().getGuild().getId());
 
             if (guildWrapper == null) {
+                BotManager.registerOrLoadGuild(event.getGuild());
                 CorgiLogger.warnMessage("Guild " + event.getGuild().getId() + " is still not loaded!");
+                MessageUtils.sendAutoDeletedMessage("This guild is still not loaded, wait a few seconds!", 10, event.getChannel());
                 return;
             }
         } else {

diff --git a/src/main/java/cz/wake/corgibot/listener/JoinEvent.java b/src/main/java/cz/wake/corgibot/listener/JoinEvent.java
@@ -46,7 +46,7 @@ public void onGuildJoin(GuildJoinEvent event) {
                         .setDescription(
                                 "Guild name: `" + event.getGuild().getName() + "` :smile: :heart:\n" +
                                         "Owner: " + (owner == null ? "Does not exist, or unable to find!" : owner.getUser().getName()) + "\n" +
-                                        "Members: " + event.getGuild().getMembers().size())
+                                        "Members: " + event.getGuild().getMemberCount())
                         .build()).queue();
             });
         }

diff --git a/src/main/java/cz/wake/corgibot/managers/BotManager.java b/src/main/java/cz/wake/corgibot/managers/BotManager.java
@@ -17,6 +17,12 @@ public class BotManager {
     public static final List<String> DISABLED_SLASH_NOTICES = new ArrayList<>();
 
     public static void registerOrLoadGuild(Guild guild) {
+
+        if (guild == null) {
+            CorgiLogger.warnMessage("Guild is null!");
+            return;
+        }
+
         if (CorgiBot.getInstance().getSql().existsGuildData(guild.getId())) {
             if (getCustomGuild(guild.getId()) == null) {
                 // Load dat from SQL + load into BotManager
@@ -38,6 +44,10 @@ public static void registerOrLoadGuild(Guild guild) {
     public static void loadGuilds(int shardId) {
         List<Guild> guildList = CorgiBot.getShardManager().getShardById(shardId).getGuilds();
         for (Guild guild : guildList) {
+            if (getCustomGuild(guild.getId()) != null) {
+                CorgiLogger.infoMessage("Guild " + guild.getId() + " is already loaded!");
+                continue;
+            }
             try {
                 // Setup ignored channels
                 Set<MessageChannel> ignoredChannels = CorgiBot.getInstance().getSql().getIgnoredChannels(guild.getId());

diff --git a/src/main/java/cz/wake/corgibot/runnable/PresenceTask.java b/src/main/java/cz/wake/corgibot/runnable/PresenceTask.java
@@ -0,0 +1,12 @@
+package cz.wake.corgibot.runnable;
+
+import cz.wake.corgibot.CorgiBot;
+import net.dv8tion.jda.api.entities.Activity;
+
+public record PresenceTask() implements Runnable {
+
+    @Override
+    public void run() {
+        CorgiBot.getShardManager().setActivity(Activity.watching("c!help | " + CorgiBot.getShardManager().getGuildCache().size() + " servers"));
+    }
+}
diff --git a/src/main/java/cz/wake/corgibot/runnable/ReminderTask.java b/src/main/java/cz/wake/corgibot/runnable/ReminderTask.java
@@ -7,13 +7,13 @@
 
 import java.util.HashSet;
 
-public record ReminderTask(CorgiBot plugin) implements Runnable {
+public record ReminderTask(CorgiBot corgiBot) implements Runnable {
 
     @Override
     public void run() {
 
         long now = System.currentTimeMillis();
-        HashSet<TemporaryReminder> reminders = plugin.getSql().getAllReminders();
+        HashSet<TemporaryReminder> reminders = corgiBot.getSql().getAllReminders();
         try {
             reminders.forEach(reminder -> {
                 if (reminder.getDate() < now) {