diff --git a/src/main/java/com/alttd/commandManager/commands/CommandAuction.java b/src/main/java/com/alttd/commandManager/commands/CommandAuction.java index 182add6..464ef11 100644 --- a/src/main/java/com/alttd/commandManager/commands/CommandAuction.java +++ b/src/main/java/com/alttd/commandManager/commands/CommandAuction.java @@ -98,8 +98,9 @@ public class CommandAuction extends DiscordCommand { Message.Attachment screenshot = event.getOption("screenshot", OptionMapping::getAsAttachment); if (screenshot != null) { String dataFolder = AltitudeBot.getInstance().getDataFolder(); - Path path = Path.of(dataFolder + File.separator + UUID.randomUUID() + "." + screenshot.getFileExtension()); - screenshot.getProxy().downloadToFile(path.toFile()).thenAccept(file -> + Path parent = Path.of(dataFolder).getParent(); + Path path = Path.of(parent.toString() + UUID.randomUUID() + "." + screenshot.getFileExtension()); + screenshot.getProxy().downloadToFile(path.toFile()).whenComplete((file, throwable) -> success.editMessageAttachments(AttachedFile.fromData(file)).queue(done -> file.delete(), failed -> { Util.handleFailure(failed); file.delete(); diff --git a/src/main/java/com/alttd/selectMenuManager/selectMenus/SelectMenuAuction.java b/src/main/java/com/alttd/selectMenuManager/selectMenus/SelectMenuAuction.java index 6f0ca02..a440dce 100644 --- a/src/main/java/com/alttd/selectMenuManager/selectMenus/SelectMenuAuction.java +++ b/src/main/java/com/alttd/selectMenuManager/selectMenus/SelectMenuAuction.java @@ -73,6 +73,12 @@ public class SelectMenuAuction extends DiscordSelectMenu { MessageEmbed messageEmbed = getMessageEmbed(event.getMessage().getEmbeds(), event); if (messageEmbed == null) return; + if (messageEmbed.getAuthor() != null && messageEmbed.getAuthor().getName() != null && messageEmbed.getAuthor().getName().equalsIgnoreCase(member.getEffectiveName())) { + event.replyEmbeds(Util.genericErrorEmbed("Error", "You own this auction so you can not bid on it.")) + .setEphemeral(true).queue(); + //TODO store auction owner so this can be done better + return; + } BidFieldInfo bidFieldInfo = getPreviousBid(messageEmbed, event); if (bidFieldInfo == null) return;