Skip to content

Commit b89c512

Browse files
authored
Fix CreateMessageRequest not being able to send text messages to channel (#120)
1 parent d680ca5 commit b89c512

File tree

1 file changed

+9
-13
lines changed

1 file changed

+9
-13
lines changed

api/src/main/java/com/javadiscord/jdi/internal/api/channel/CreateMessageRequest.java

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import com.javadiscord.jdi.internal.api.DiscordRequest;
99
import com.javadiscord.jdi.internal.api.DiscordRequestBuilder;
1010

11-
import java.io.FileNotFoundException;
1211
import java.nio.file.Path;
1312
import java.util.HashMap;
1413
import java.util.List;
@@ -46,25 +45,22 @@ public DiscordRequestBuilder create() {
4645
messageReferences.ifPresent(val -> body.put("message_reference", val));
4746
components.ifPresent(val -> body.put("components", val));
4847
stickerIds.ifPresent(val -> body.put("sticker_ids", val));
49-
payloadJson.ifPresent(val -> body.put("payload_json", val));
5048
flags.ifPresent(val -> body.put("flags", val));
5149
enforceNonce.ifPresent(val -> body.put("enforce_nonce", val));
5250

53-
bodyBuilder.textPart("payload_json", body);
51+
if (payloadJson.isPresent()) {
5452

55-
files.ifPresent(
56-
paths -> {
57-
for (int i = 0; i < paths.size(); i++) {
58-
try {
59-
bodyBuilder.filePart("file[%d]".formatted(i), paths.get(i));
60-
} catch (FileNotFoundException ignored) {
61-
}
62-
}
63-
});
53+
bodyBuilder.textPart("payload_json", body);
54+
55+
return new DiscordRequestBuilder()
56+
.post()
57+
.path("/channels/%s/messages".formatted(channelId))
58+
.multipartBody(bodyBuilder.build());
59+
}
6460

6561
return new DiscordRequestBuilder()
6662
.post()
6763
.path("/channels/%s/messages".formatted(channelId))
68-
.multipartBody(bodyBuilder.build());
64+
.body(body);
6965
}
7066
}

0 commit comments

Comments
 (0)