Merge remote-tracking branch 'origin/main'

itsmarsss · May 25, 2023 · b1074aa · b1074aa
2 parents 04650a5 + 4e5f636
commit b1074aa
Show file tree

Hide file tree

Showing 13 changed files with 1,621 additions and 35 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,7 +5,7 @@ plugins {
 }
 
 mainClassName = 'com.marsss.snipebot.SnipeChanBot'
-sourceCompatibility = 11
+sourceCompatibility = 15
 
 repositories {
     maven {
@@ -34,7 +34,8 @@ dependencies {
     implementation("net.dv8tion:JDA:5.0.0-beta.5")
     implementation("ch.qos.logback:logback-classic:1.2.3")
     implementation group: 'org.yaml', name: 'snakeyaml', version: '1.8'
+    implementation group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
 }
 
 compileJava.options.encoding = 'UTF-8'
-targetCompatibility = JavaVersion.VERSION_11
+targetCompatibility = JavaVersion.VERSION_15
diff --git a/app/src/main/java/com/marsss/snipebot/Config.java b/app/src/main/java/com/marsss/snipebot/Config.java
@@ -232,33 +232,25 @@ public OnlineStatus getParsedStatus() {
             return OnlineStatus.DO_NOT_DISTURB;
         }
 
-        switch(status.toLowerCase()) {
-            case "online":
-                return OnlineStatus.ONLINE;
-            case "idle":
-                return OnlineStatus.IDLE;
-            default:
-                return OnlineStatus.DO_NOT_DISTURB;
-        }
+        return switch (status.toLowerCase()) {
+            case "online" -> OnlineStatus.ONLINE;
+            case "idle" -> OnlineStatus.IDLE;
+            default -> OnlineStatus.DO_NOT_DISTURB;
+        };
     }
 
     public Activity.ActivityType getParsedActivity() {
         if(activity == null) {
             return Activity.ActivityType.WATCHING;
         }
 
-        switch(activity.toLowerCase()) {
-            case "playing":
-                return Activity.ActivityType.PLAYING;
-            case "competing":
-                return Activity.ActivityType.COMPETING;
-            case "listening":
-                return Activity.ActivityType.LISTENING;
-            case "streaming":
-                return Activity.ActivityType.STREAMING;
-            default:
-                return Activity.ActivityType.WATCHING;
-        }
+        return switch (activity.toLowerCase()) {
+            case "playing" -> Activity.ActivityType.PLAYING;
+            case "competing" -> Activity.ActivityType.COMPETING;
+            case "listening" -> Activity.ActivityType.LISTENING;
+            case "streaming" -> Activity.ActivityType.STREAMING;
+            default -> Activity.ActivityType.WATCHING;
+        };
     }
 
     public String getParsedName() {

diff --git a/.../main/java/com/marsss/snipebot/config.yml → ...onfiguration and Storage files/config.yml b/.../main/java/com/marsss/snipebot/config.yml → ...onfiguration and Storage files/config.yml
diff --git a/app/src/main/java/com/marsss/snipebot/EditedMessage.java b/app/src/main/java/com/marsss/snipebot/EditedMessage.java
@@ -53,11 +53,11 @@ public void onMessageUpdate(MessageUpdateEvent event) {
                                 "\nMessage Edited \u2022 " + date.toInstant().atOffset(ZoneOffset.UTC).format(DateTimeFormatter.RFC_1123_DATE_TIME).substring(5));
         if (SnipeChanBot.config.isSnipeEditedFiles() && SnipeChanBot.config.isSnipeEditedMessages()) {
             if (!event.getMessage().getContentRaw().isBlank()) {
-                String msg1 = originalMessage.getContentRaw();
+                String msg1 = originalMessage.getContentRaw().length() == 0 ? "N/A" : originalMessage.getContentRaw();
                 if (msg1.length() >= 1024)
                     msg1 = msg1.substring(0, 1021) + "...";
 
-                String msg2 = event.getMessage().getContentRaw();
+                String msg2 = event.getMessage().getContentRaw().length() == 0 ? "N/A" : event.getMessage().getContentRaw();
                 if (msg2.length() >= 1024)
                     msg2 = msg2.substring(0, 1021) + "...";
                 emb.addField("**Original Message:**", msg1, true)
@@ -78,11 +78,11 @@ public void onMessageUpdate(MessageUpdateEvent event) {
             }
         } else if (SnipeChanBot.config.isSnipeEditedMessages()) {
             if (!originalMessage.getContentRaw().isBlank()) {
-                String msg1 = originalMessage.getContentRaw();
+                String msg1 = originalMessage.getContentRaw().length() == 0 ? "N/A" : originalMessage.getContentRaw();
                 if (msg1.length() >= 1024)
                     msg1 = msg1.substring(0, 1021) + "...";
 
-                String msg2 = event.getMessage().getContentRaw();
+                String msg2 = event.getMessage().getContentRaw().length() == 0 ? "N/A" : event.getMessage().getContentRaw();
                 if (msg2.length() >= 1024)
                     msg2 = msg2.substring(0, 1021) + "...";
                 emb.addField("**Original Message:**", msg1, true)