Skip to content

Commit 2eb1341

Browse files
Fix issue with addFile in interaction replies
1 parent bef374a commit 2eb1341

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

Diff for: src/main/java/net/dv8tion/jda/internal/requests/restaction/interactions/InteractionCallbackImpl.java

+16-4
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,24 @@ protected RequestBody finalizeData()
5858
return getRequestBody(json);
5959

6060
MultipartBody.Builder body = AttachedFile.createMultipartBody(files, null);
61-
DataArray attachments = DataArray.empty();
61+
62+
// Add the attachments array to the payload, as required since v10
63+
DataObject data;
64+
if (json.isNull("data"))
65+
json.put("data", data = DataObject.empty());
66+
else
67+
data = json.getObject("data");
68+
69+
DataArray attachments;
70+
if (data.isNull("attachments"))
71+
data.put("attachments", attachments = DataArray.empty());
72+
else
73+
attachments = data.getArray("attachments");
74+
6275
for (int i = 0; i < files.size(); i++)
6376
attachments.add(files.get(i).toAttachmentData(i));
64-
if (json.isNull("data"))
65-
json.put("data", DataObject.empty());
66-
json.getObject("data").put("attachments", attachments);
77+
78+
body.addFormDataPart("payload_json", json.toString());
6779
files.clear();
6880
return body.build();
6981
}

0 commit comments

Comments
 (0)