Fixed bidding on your own auction

Fixed screenshots not working
This commit is contained in:
Teriuihi 2022-10-21 21:41:33 +02:00
parent d6eb332d83
commit 5d8368d0e5
2 changed files with 9 additions and 2 deletions

View File

@ -98,8 +98,9 @@ public class CommandAuction extends DiscordCommand {
Message.Attachment screenshot = event.getOption("screenshot", OptionMapping::getAsAttachment); Message.Attachment screenshot = event.getOption("screenshot", OptionMapping::getAsAttachment);
if (screenshot != null) { if (screenshot != null) {
String dataFolder = AltitudeBot.getInstance().getDataFolder(); String dataFolder = AltitudeBot.getInstance().getDataFolder();
Path path = Path.of(dataFolder + File.separator + UUID.randomUUID() + "." + screenshot.getFileExtension()); Path parent = Path.of(dataFolder).getParent();
screenshot.getProxy().downloadToFile(path.toFile()).thenAccept(file -> 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 -> { success.editMessageAttachments(AttachedFile.fromData(file)).queue(done -> file.delete(), failed -> {
Util.handleFailure(failed); Util.handleFailure(failed);
file.delete(); file.delete();

View File

@ -73,6 +73,12 @@ public class SelectMenuAuction extends DiscordSelectMenu {
MessageEmbed messageEmbed = getMessageEmbed(event.getMessage().getEmbeds(), event); MessageEmbed messageEmbed = getMessageEmbed(event.getMessage().getEmbeds(), event);
if (messageEmbed == null) if (messageEmbed == null)
return; 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); BidFieldInfo bidFieldInfo = getPreviousBid(messageEmbed, event);
if (bidFieldInfo == null) if (bidFieldInfo == null)
return; return;