Fixed an issue with !list pageNum not returning with large sound file…

… lists. Also, fixing a test. Removing old webui files. Fixing the category display to ensure it's always in alphabetic order. Changed the Docker file to now overwrite the application.properties file if it's already there. Fixed a unit test.

Dockerfile

@@ -25,4 +25,5 @@ EXPOSE 8080
 
 COPY docker-entrypoint.sh /
 RUN chmod +x /docker-entrypoint.sh
+
 ENTRYPOINT [ "/docker-entrypoint.sh" ]

docker-entrypoint.sh

@@ -1,17 +1,24 @@
 #!/bin/sh
 set -e
 
+#Make config directory if it doesn't already exist
 mkdir -p /etc/DiscordSoundboard/config
-[ -f /etc/DiscordSoundboard/bin/application.properties ] && mv /etc/DiscordSoundboard/bin/application.properties /etc/DiscordSoundboard/config/application.properties
+#If the file is still in /bin move it to ../config so that we can expose that as a persistent directory
+# on something like unraid. Only moves the file if it's not already there.
+[ -f /etc/DiscordSoundboard/bin/application.properties ] && mv -n /etc/DiscordSoundboard/bin/application.properties /etc/DiscordSoundboard/config/application.properties
 
 cd /etc/DiscordSoundboard/config
 
+#Overwrite the bottoken and username to join channel config entries from environment variables passed into docker run
 sed -i 's/bot_token=SOME_TOKEN_YOU_GOT_FROM_DISCORD/bot_token='$bottoken'/g' application.properties
 sed -i 's/username_to_join_channel=YourUserName/username_to_join_channel='$username'/g' application.properties
 
 cd /etc/DiscordSoundboard/bin
 
+#Copy the jar file into the bin dir. This wouldn't be necessary if we setup the class path to look in the lib dir. Should probably update this later
 cp /etc/DiscordSoundboard/lib/DiscordSoundboard* /etc/DiscordSoundboard/bin/DiscordSoundboard.jar
+
+#Run the bot. Pass the /config/application.properties as part of the classpath, other wise the bot will not work
 exec java -Dserver.port=8080 -jar /etc/DiscordSoundboard/bin/DiscordSoundboard.jar --spring.config.location=classpath:file:///etc/DiscordSoundboard/config/application.properties
 
 exec "$@"

gradle.properties

@@ -1 +1 @@
-projectVersion = 3.2.2
+projectVersion = 3.2.3

src/main/java/net/dirtydeeds/discordsoundboard/commands/ListCommand.java

@@ -55,7 +55,7 @@ protected void execute(CommandEvent event) {
     }
 
     private List<String> getCommandList(StringBuilder commandString) {
-        final int maxLineLength = botConfig.getMessageSizeLimit();
+        final int maxLineLength = botConfig.getMessageSizeLimit() - 10;
         List<String> soundFiles = new ArrayList<>();
 
         //if text has \n, \r or \t symbols it's better to split by \s+
@@ -68,7 +68,7 @@ private List<String> getCommandList(StringBuilder commandString) {
         for (int i = 0; i < tokens.length; i++) {
             String word = tokens[i];
 
-            if (lineLen + (word).length() > maxLineLength) {
+            if (lineLen + (word).length() > maxLineLength + 2) {
                 if (i > 0) {
                     output.append("```\n");
                     soundFiles.add(output.toString());

src/main/webapp/index.html

@@ -138,13 +138,19 @@
         function determineShownNavigation(){
             // Get available width for shown categories.
             // 275px extra for spacing, more-dropdown and buttons
-            var availableWidth = window.innerWidth - $('.navbar-brand').width() - 275;
+            var availableWidth = window.innerWidth - $('.navbar-brand').width() - 230;
             console.log(availableWidth);
+            var shouldSkip = false;
             $.each($('#categories li'), function(i, obj){
                 var willFit = availableWidth - $(obj).width() > 0;
+                if (shouldSkip) willFit=false;
                 $(obj).toggle(willFit);
                 $('#more a[data-category="' + $(obj).find('a').data('category') + '"]').toggle(!willFit);
-                if(willFit) availableWidth -= $(obj).width();
+                if (willFit) {
+                    availableWidth -= $(obj).width();
+                } else {
+                    shouldSkip = true;
+                }
             });
             $('#more').toggle($('#categories li:hidden').length > 0);
         }