Re-interrupt the thread on attachment failure and remove attachedImage variable

Author: Defective4

src/main/java/net/javadiscord/javabot/systems/starboard/StarboardManager.java

@@ -149,6 +149,10 @@ private void addMessageToStarboard(Message message, int stars, @NotNull Starboar
 					action.addFiles(FileUpload.fromData(a.getProxy().download().get(), a.getFileName()));
 				} catch (InterruptedException | ExecutionException e) {
 					action.addContent("Could not add Attachment: " + a.getFileName());
+					ExceptionLogger.capture(e);
+					if(e instanceof InterruptedException) {
+						Thread.currentThread().interrupt();
+					}
 				}
 			}
 		}
@@ -231,8 +235,6 @@ private boolean removeMessageFromStarboard(long messageId, MessageChannel channe
 				.setDescription(message.getContentRaw())
 				.setFooter("#" + message.getChannel().getName());
 
-		boolean attachedImage = false;
-		
 		List<MessageEmbed> embeds = message.getEmbeds();
 		if(embeds.size() > 0) {
 			MessageEmbed firstEmbed = embeds.get(0);
@@ -242,15 +244,12 @@ private boolean removeMessageFromStarboard(long messageId, MessageChannel channe
 			ImageInfo image = firstEmbed.getImage();
 			if(image != null && image.getUrl() != null) {
 				builder.setImage(image.getUrl());
-				attachedImage = true;
 			}
 		}
 
-		if(!attachedImage) {
-			List<Attachment> attachments = message.getAttachments();
-			if(attachments.size() == 1) {
-				builder.setImage(attachments.get(0).getUrl());
-			}
+		List<Attachment> attachments = message.getAttachments();
+		if(attachments.size() == 1) {
+			builder.setImage(attachments.get(0).getUrl());
 		}
 
 		return builder.build();