release update v1.6.1.2 and enable silent updates

robinfriedli · Jul 27, 2019 · d7cd269 · d7cd269
1 parent b74ed09
commit d7cd269
Show file tree

Hide file tree

Showing 7 changed files with 89 additions and 42 deletions.
diff --git a/resources/current-version.txt b/resources/current-version.txt
@@ -1 +1 @@
-1.6.1.1
+1.6.1.2
diff --git a/resources/schemas/versionSchema.xsd b/resources/schemas/versionSchema.xsd
@@ -13,6 +13,7 @@
     </xs:sequence>
     <xs:attribute name="version" type="xs:string"/>
     <xs:attribute name="launched" type="xs:boolean"/>
+    <xs:attribute name="silent" type="xs:boolean" default="false"/>
   </xs:complexType>
 
 </xs:schema>
diff --git a/resources/versions.xml b/resources/versions.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <versions xmlns="versionSpace">
-  <version launched="false" version="1.6.1.1">
+  <version launched="false" silent="true" version="1.6.1.2">
+    <feature>enable silent updates</feature>
+    <feature>fix export command</feature>
+    <feature>fix Playable#matches</feature>
+    <feature>improve upload command</feature>
+  </version>
+  <version launched="true" version="1.6.1.1">
     <feature>improve and add new admin tools</feature>
     <feature>fix wrong behavior of the play / pause action when the bot left the channel</feature>
     <feature>minor improvements</feature>

diff --git a/src/main/java/net/robinfriedli/botify/boot/tasks/VersionUpdateAlertTask.java b/src/main/java/net/robinfriedli/botify/boot/tasks/VersionUpdateAlertTask.java
@@ -2,6 +2,7 @@
 
 import java.io.BufferedReader;
 import java.io.FileReader;
+import java.io.IOException;
 import java.util.List;
 
 import org.slf4j.Logger;
@@ -38,29 +39,8 @@ public void perform() throws Exception {
             XmlElement versionElem = context.query(Conditions.attribute("version").is(currentVersion)).getOnlyResult();
             if (versionElem != null) {
                 if (!versionElem.getAttribute("launched").getBool()) {
-                    List<XmlElement> lowerLaunchedVersions = context.query(xmlElement -> xmlElement.getTagName().equals("version")
-                        && versionCompare(currentVersion, xmlElement.getAttribute("version").getValue()) == 1
-                        && xmlElement.getAttribute("launched").getBool()).collect();
-                    if (!lowerLaunchedVersions.isEmpty()) {
-                        MessageService messageService = new MessageService();
-                        String message = "Botify has been updated to " + currentVersion + ". [Check the releases here]("
-                            + "https://github.com/robinfriedli/botify/releases)";
-                        EmbedBuilder embedBuilder = new EmbedBuilder();
-                        embedBuilder.setTitle("Update");
-                        embedBuilder.setDescription(message);
-
-                        List<XmlElement> features = versionElem.query(tagName("feature")).collect();
-                        if (!features.isEmpty()) {
-                            StringBuilder featuresBuilder = new StringBuilder();
-                            for (XmlElement feature : features) {
-                                featuresBuilder.append("-\t").append(feature.getTextContent()).append(System.lineSeparator());
-                            }
-                            embedBuilder.addField("Features", featuresBuilder.toString(), false);
-                        }
-
-                        for (Guild guild : jda.getGuilds()) {
-                            messageService.sendWithLogo(embedBuilder, guild);
-                        }
+                    if (!(versionElem.hasAttribute("silent") && versionElem.getAttribute("silent").getBool())) {
+                        sendUpdateAlert(context, currentVersion, versionElem);
                     }
 
                     context.invoke(() -> versionElem.setAttribute("launched", true));
@@ -71,6 +51,33 @@ && versionCompare(currentVersion, xmlElement.getAttribute("version").getValue())
         }
     }
 
+    private void sendUpdateAlert(Context context, String currentVersion, XmlElement versionElem) throws IOException {
+        List<XmlElement> lowerLaunchedVersions = context.query(xmlElement -> xmlElement.getTagName().equals("version")
+            && versionCompare(currentVersion, xmlElement.getAttribute("version").getValue()) == 1
+            && xmlElement.getAttribute("launched").getBool()).collect();
+        if (!lowerLaunchedVersions.isEmpty()) {
+            MessageService messageService = new MessageService();
+            String message = "Botify has been updated to " + currentVersion + ". [Check the releases here]("
+                + "https://github.com/robinfriedli/botify/releases)";
+            EmbedBuilder embedBuilder = new EmbedBuilder();
+            embedBuilder.setTitle("Update");
+            embedBuilder.setDescription(message);
+
+            List<XmlElement> features = versionElem.query(tagName("feature")).collect();
+            if (!features.isEmpty()) {
+                StringBuilder featuresBuilder = new StringBuilder();
+                for (XmlElement feature : features) {
+                    featuresBuilder.append("-\t").append(feature.getTextContent()).append(System.lineSeparator());
+                }
+                embedBuilder.addField("Features", featuresBuilder.toString(), false);
+            }
+
+            for (Guild guild : jda.getGuilds()) {
+                messageService.sendWithLogo(embedBuilder, guild);
+            }
+        }
+    }
+
     private int versionCompare(String s1, String s2) {
         String[] split1 = s1.split("\\.");
         String[] split2 = s2.split("\\.");

diff --git a/src/main/java/net/robinfriedli/botify/command/commands/admin/CleanDbCommand.java b/src/main/java/net/robinfriedli/botify/command/commands/admin/CleanDbCommand.java
@@ -13,6 +13,7 @@
 import net.dv8tion.jda.core.entities.ISnowflake;
 import net.robinfriedli.botify.Botify;
 import net.robinfriedli.botify.command.AbstractAdminCommand;
+import net.robinfriedli.botify.command.ArgumentContribution;
 import net.robinfriedli.botify.command.CommandContext;
 import net.robinfriedli.botify.command.CommandManager;
 import net.robinfriedli.botify.discord.CommandExecutionQueueManager;
@@ -38,12 +39,14 @@ public CleanDbCommand(CommandContribution commandContribution, CommandContext co
     public void runAdmin() {
         Botify.shutdownListeners();
         try {
-            EmbedBuilder embedBuilder = new EmbedBuilder();
-            embedBuilder.setTitle("Scheduled cleanup");
-            embedBuilder.setDescription("Botify is suspending for a few seconds to clean the database.");
-            sendToActiveGuilds(embedBuilder.build());
-            CommandExecutionQueueManager executionQueueManager = Botify.get().getExecutionQueueManager();
+            if (!argumentSet("silent")) {
+                EmbedBuilder embedBuilder = new EmbedBuilder();
+                embedBuilder.setTitle("Scheduled cleanup");
+                embedBuilder.setDescription("Botify is suspending for a few seconds to clean the database.");
+                sendToActiveGuilds(embedBuilder.build());
+            }
 
+            CommandExecutionQueueManager executionQueueManager = Botify.get().getExecutionQueueManager();
             CommandContext context = getContext();
             Thread cleanupThread = new Thread(() -> {
                 CommandContext.Current.set(context);
@@ -196,4 +199,13 @@ private int deleteStalePresets(CriteriaBuilder cb, Set<String> activeGuildIds, S
     @Override
     public void onSuccess() {
     }
+
+    @Override
+    public ArgumentContribution setupArguments() {
+        ArgumentContribution argumentContribution = new ArgumentContribution(this);
+        argumentContribution.map("silent")
+            .setDescription("Disables alerting active guilds about the restart.");
+        return argumentContribution;
+    }
+
 }
diff --git a/src/main/java/net/robinfriedli/botify/command/commands/admin/QuitCommand.java b/src/main/java/net/robinfriedli/botify/command/commands/admin/QuitCommand.java
@@ -3,6 +3,7 @@
 import net.dv8tion.jda.core.EmbedBuilder;
 import net.robinfriedli.botify.Botify;
 import net.robinfriedli.botify.command.AbstractAdminCommand;
+import net.robinfriedli.botify.command.ArgumentContribution;
 import net.robinfriedli.botify.command.CommandContext;
 import net.robinfriedli.botify.command.CommandManager;
 import net.robinfriedli.botify.entities.xml.CommandContribution;
@@ -37,13 +38,15 @@ private void doQuit() {
         Botify.shutdownListeners();
 
         try {
-            EmbedBuilder embedBuilder = new EmbedBuilder();
-            embedBuilder.setTitle("Scheduled shutdown");
-            embedBuilder.setDescription("The bot is scheduled to shut down after completing queued actions. No commands will be accepted until then.");
-            if (!getCommandBody().isBlank()) {
-                embedBuilder.addField("Reason", getCommandBody(), false);
+            if (!argumentSet("silent")) {
+                EmbedBuilder embedBuilder = new EmbedBuilder();
+                embedBuilder.setTitle("Scheduled shutdown");
+                embedBuilder.setDescription("The bot is scheduled to shut down after completing queued actions. No commands will be accepted until then.");
+                if (!getCommandBody().isBlank()) {
+                    embedBuilder.addField("Reason", getCommandBody(), false);
+                }
+                sendToActiveGuilds(embedBuilder.build());
             }
-            sendToActiveGuilds(embedBuilder.build());
 
             // runs in separate thread to avoid deadlock when waiting for commands to finish
             Thread shutdownThread = new Thread(() -> Botify.shutdown(60000));
@@ -55,4 +58,12 @@ private void doQuit() {
         }
     }
 
+    @Override
+    public ArgumentContribution setupArguments() {
+        ArgumentContribution argumentContribution = new ArgumentContribution(this);
+        argumentContribution.map("silent")
+            .setDescription("Disables alerting active guilds about the shutdown.");
+        return argumentContribution;
+    }
+
 }
diff --git a/src/main/java/net/robinfriedli/botify/command/commands/admin/RebootCommand.java b/src/main/java/net/robinfriedli/botify/command/commands/admin/RebootCommand.java
@@ -9,6 +9,7 @@
 import net.dv8tion.jda.core.EmbedBuilder;
 import net.robinfriedli.botify.Botify;
 import net.robinfriedli.botify.command.AbstractAdminCommand;
+import net.robinfriedli.botify.command.ArgumentContribution;
 import net.robinfriedli.botify.command.CommandContext;
 import net.robinfriedli.botify.command.CommandManager;
 import net.robinfriedli.botify.entities.xml.CommandContribution;
@@ -43,13 +44,15 @@ private void doRestart() {
         Botify.shutdownListeners();
 
         try {
-            EmbedBuilder embedBuilder = new EmbedBuilder();
-            embedBuilder.setTitle("Scheduled restart");
-            embedBuilder.setDescription("The bot is scheduled to restart after completing pending actions. No commands will be accepted until then.");
-            if (!getCommandBody().isBlank()) {
-                embedBuilder.addField("Reason", getCommandBody(), false);
+            if (!argumentSet("silent")) {
+                EmbedBuilder embedBuilder = new EmbedBuilder();
+                embedBuilder.setTitle("Scheduled restart");
+                embedBuilder.setDescription("The bot is scheduled to restart after completing pending actions. No commands will be accepted until then.");
+                if (!getCommandBody().isBlank()) {
+                    embedBuilder.addField("Reason", getCommandBody(), false);
+                }
+                sendToActiveGuilds(embedBuilder.build());
             }
-            sendToActiveGuilds(embedBuilder.build());
 
             Runtime runtime = Runtime.getRuntime();
             runtime.addShutdownHook(new Thread(() -> {
@@ -74,4 +77,11 @@ private void doRestart() {
         }
     }
 
+    @Override
+    public ArgumentContribution setupArguments() {
+        ArgumentContribution argumentContribution = new ArgumentContribution(this);
+        argumentContribution.map("silent")
+            .setDescription("Disables alerting active guilds about the restart.");
+        return argumentContribution;
+    }
 }