Fix max file size limit in MessageAction (#2017)

* override MessageAction#addFile(byte[], String, AttachmentOption...) overload in MessageActionImpl * Don't use jetbrains annotation * Removed unnecessary import * Removed another import
discord-jda · Feb 11, 2022 · a77218c · a77218c
1 parent 8988960
commit a77218c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/main/java/net/dv8tion/jda/api/requests/restaction/MessageAction.java b/src/main/java/net/dv8tion/jda/api/requests/restaction/MessageAction.java
@@ -33,7 +33,6 @@
 import javax.annotation.CheckReturnValue;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.InputStream;
 import java.util.Arrays;
@@ -597,13 +596,7 @@ default MessageAction appendFormat(@Nonnull final String format, final Object...
      */
     @Nonnull
     @CheckReturnValue
-    default MessageAction addFile(@Nonnull final byte[] data, @Nonnull final String name, @Nonnull AttachmentOption... options)
-    {
-        Checks.notNull(data, "Data");
-        final long maxSize = getJDA().getSelfUser().getAllowedFileSize();
-        Checks.check(data.length <= maxSize, "File may not exceed the maximum file length of %d bytes!", maxSize);
-        return addFile(new ByteArrayInputStream(data), name, options);
-    }
+    MessageAction addFile(@Nonnull final byte[] data, @Nonnull final String name, @Nonnull AttachmentOption... options);
 
     /**
      * Adds the provided {@link java.io.File File} as file data.

diff --git a/src/main/java/net/dv8tion/jda/internal/requests/restaction/MessageActionImpl.java b/src/main/java/net/dv8tion/jda/internal/requests/restaction/MessageActionImpl.java
@@ -316,6 +316,16 @@ public MessageActionImpl addFile(@Nonnull final File file, @Nonnull String name,
         }
     }
 
+    @Nonnull
+    @Override
+    public MessageAction addFile(@Nonnull byte[] data, @Nonnull String name, @Nonnull AttachmentOption... options)
+    {
+        Checks.notNull(data, "Data");
+        final long maxSize = getMaxFileSize();
+        Checks.check(data.length <= maxSize, "File may not exceed the maximum file length of %d bytes!", maxSize);
+        return addFile(new ByteArrayInputStream(data), name, options);
+    }
+
     @Nonnull
     @Override
     @CheckReturnValue