From 5d480be29e1313309a6e2947b8c8dbc8c48a5811 Mon Sep 17 00:00:00 2001 From: aNNiMON Date: Tue, 10 Jan 2023 23:05:48 +0200 Subject: [PATCH] Fix optional argument of /dl command --- .../ffmpegbot/commands/ytdlp/YtDlpCommandBundle.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/annimon/ffmpegbot/commands/ytdlp/YtDlpCommandBundle.java b/src/main/java/com/annimon/ffmpegbot/commands/ytdlp/YtDlpCommandBundle.java index ae8c322..0514d41 100644 --- a/src/main/java/com/annimon/ffmpegbot/commands/ytdlp/YtDlpCommandBundle.java +++ b/src/main/java/com/annimon/ffmpegbot/commands/ytdlp/YtDlpCommandBundle.java @@ -9,7 +9,9 @@ import com.annimon.tgbotsmodule.commands.context.RegexMessageContext; import org.jetbrains.annotations.NotNull; import java.io.File; +import java.util.Optional; import java.util.concurrent.CompletableFuture; +import java.util.function.Predicate; import java.util.regex.Pattern; public class YtDlpCommandBundle implements CommandBundle { @@ -23,7 +25,9 @@ public class YtDlpCommandBundle implements CommandBundle { private void download(@NotNull RegexMessageContext ctx) { final String url = ctx.group(1); - final String downloadOption = ctx.group(2).isEmpty() ? "720": ctx.group(2); + final String downloadOption = Optional.ofNullable(ctx.group(2)) + .filter(Predicate.not(String::isBlank)) + .orElse("720"); final var fileType = downloadOption.equals("audio") ? FileType.AUDIO : FileType.VIDEO; final var ytDlpSession = new YtDlpSession(url, downloadOption, fileType); final var filename = FilePath.generateFilename(url, Resolver.resolveDefaultFilename(fileType));