Refactor attachment upload

AsamK · AsamK · commit 91eacc18c20b · 2024-09-29T09:43:26.000+02:00
diff --git a/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/internal/ManagerImpl.java
@@ -764,11 +764,12 @@ private void applyMessage(
             messageBuilder.withBody(message.messageText());
         }
         if (!message.attachments().isEmpty()) {
+            final var uploadedAttachments = context.getAttachmentHelper().uploadAttachments(message.attachments());
             if (!additionalAttachments.isEmpty()) {
-                additionalAttachments.addAll(context.getAttachmentHelper().uploadAttachments(message.attachments()));
+                additionalAttachments.addAll(uploadedAttachments);
                 messageBuilder.withAttachments(additionalAttachments);
             } else {
-                messageBuilder.withAttachments(context.getAttachmentHelper().uploadAttachments(message.attachments()));
+                messageBuilder.withAttachments(uploadedAttachments);
             }
         }
         if (!message.mentions().isEmpty()) {

Original file line number	Diff line number	Diff line change
`@@ -764,11 +764,12 @@ private void applyMessage(`
`764`	`764`	`messageBuilder.withBody(message.messageText());`
`765`	`765`	`}`
`766`	`766`	`if (!message.attachments().isEmpty()) {`
	`767`	`+ final var uploadedAttachments = context.getAttachmentHelper().uploadAttachments(message.attachments());`
`767`	`768`	`if (!additionalAttachments.isEmpty()) {`
`768`		`- additionalAttachments.addAll(context.getAttachmentHelper().uploadAttachments(message.attachments()));`
	`769`	`+ additionalAttachments.addAll(uploadedAttachments);`
`769`	`770`	`messageBuilder.withAttachments(additionalAttachments);`
`770`	`771`	`} else {`
`771`		`- messageBuilder.withAttachments(context.getAttachmentHelper().uploadAttachments(message.attachments()));`
	`772`	`+ messageBuilder.withAttachments(uploadedAttachments);`
`772`	`773`	`}`
`773`	`774`	`}`
`774`	`775`	`if (!message.mentions().isEmpty()) {`