Skip to content

Fixed attachment error + close input stream correctly #530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 25, 2022
Merged

Fixed attachment error + close input stream correctly #530

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97022da
Fixed attachment error + close input stream correctly
SquidXTV Aug 24, 2022
7ef887a
Fixed logging issue
SquidXTV Aug 25, 2022
dac107c
Fixed logging issue
SquidXTV Aug 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions ...src/main/java/org/togetherjava/tjbot/commands/filesharing/FileSharingMessageListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,17 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
.filter(this::isAttachmentRelevant)
.toList();

if (attachments.isEmpty()) {
return;
}

CompletableFuture.runAsync(() -> {
try {
processAttachments(event, attachments);
} catch (Exception e) {
LOGGER.error("Unknown error while processing attachments", e);
LOGGER.error(
"Unknown error while processing attachments. Channel: {}, Author: {}, Message ID: {}.",
event.getChannel().getName(), author.getId(), event.getMessageId(), e);
}
});
}
Expand Down Expand Up @@ -120,7 +126,7 @@ private void processAttachments(@NotNull MessageReceivedEvent event,
}

private @NotNull String readAttachment(@NotNull InputStream stream) {
try {
try (stream) {
return new String(stream.readAllBytes(), StandardCharsets.UTF_8);
} catch (IOException e) {
throw new UncheckedIOException(e);
Expand Down Expand Up @@ -179,7 +185,8 @@ private void processAttachments(@NotNull MessageReceivedEvent event,

if (statusCode < HttpURLConnection.HTTP_OK
|| statusCode >= HttpURLConnection.HTTP_MULT_CHOICE) {
throw new IllegalStateException("Gist API unexpected response: " + apiResponse.body());
throw new IllegalStateException("Gist API unexpected response: %s. Request JSON: %s"
.formatted(apiResponse.body(), body));
}

GistResponse gistResponse;
Expand Down