Fix favicon usesNewlines()

Tisawesomeness · Sep 15, 2023 · d810ba5 · d810ba5
1 parent 0131c08
commit d810ba5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/minecord-bot/src/main/java/com/tisawesomeness/minecord/mc/Favicon.java b/minecord-bot/src/main/java/com/tisawesomeness/minecord/mc/Favicon.java
@@ -50,7 +50,7 @@ public static Optional<Favicon> parse(@NonNull String str) {
         }
         String imageData = str.substring(PREAMBLE.length());
         boolean usesNewlines = false;
-        if (imageData.indexOf('\r') == -1 || imageData.indexOf('\n') == -1) {
+        if (imageData.indexOf('\r') != -1 || imageData.indexOf('\n') != -1) {
             imageData = NEWLINES_PATTERN.matcher(imageData).replaceAll("");
             usesNewlines = true;
         }

diff --git a/minecord-bot/src/test/java/com/tisawesomeness/minecord/mc/FaviconTest.java b/minecord-bot/src/test/java/com/tisawesomeness/minecord/mc/FaviconTest.java
@@ -28,6 +28,18 @@ public void testParse() {
         Optional<Favicon> iconOpt = Favicon.parse(HYPIXEL_FAVICON);
         assertThat(iconOpt).isNotEmpty();
         Favicon icon = iconOpt.get();
+        assertThat(icon.usesNewlines()).isFalse();
+        assertThat(icon.validate())
+                .asRight(InstanceOfAssertFactories.type(Dimensions.class))
+                .extracting(Dimensions::getWidth, Dimensions::getHeight)
+                .containsExactly(Favicon.EXPECTED_SIZE, Favicon.EXPECTED_SIZE);
+    }
+    @Test
+    public void testParseNewline() {
+        Optional<Favicon> iconOpt = Favicon.parse(HYPIXEL_FAVICON + "\n");
+        assertThat(iconOpt).isNotEmpty();
+        Favicon icon = iconOpt.get();
+        assertThat(icon.usesNewlines()).isTrue();
         assertThat(icon.validate())
                 .asRight(InstanceOfAssertFactories.type(Dimensions.class))
                 .extracting(Dimensions::getWidth, Dimensions::getHeight)