Skip to content

Commit 4f27fc6

Browse files
Fixed possible NPE
1 parent dc0c5eb commit 4f27fc6

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

src/main/java/net/javadiscord/javabot/listener/GitHubLinkListener.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import net.javadiscord.javabot.util.ExceptionLogger;
88
import net.javadiscord.javabot.util.InteractionUtils;
99
import net.javadiscord.javabot.util.StringUtils;
10+
import org.jetbrains.annotations.Contract;
1011
import org.jetbrains.annotations.NotNull;
1112

1213
import java.io.BufferedReader;
@@ -47,7 +48,8 @@ public void onMessageReceived(@NotNull MessageReceivedEvent event) {
4748
* @param link The initial input url.
4849
* @return A {@link Pair} containing the files content & extension.
4950
*/
50-
private Pair<String, String> parseGithubUrl(String link) {
51+
@Contract("_ -> new")
52+
private @NotNull Pair<String, String> parseGithubUrl(@NotNull String link) {
5153
String[] arr = link.split("/");
5254
// Removes all unnecessary elements
5355
String[] segments = Arrays.copyOfRange(arr, 3, arr.length);
@@ -57,7 +59,9 @@ private Pair<String, String> parseGithubUrl(String link) {
5759
.map(line -> line.replace("-", ""))
5860
.filter(line -> line.matches("-?\\d+")) // check if the given link is a number
5961
.map(Integer::valueOf).sorted().toArray(Integer[]::new);
60-
// TODO: Fix possible NPE?
62+
if (lines.length == 0) {
63+
return new Pair<>("", "");
64+
}
6165
int to = lines.length != 2 ? lines[0] : lines[1];
6266
String reqUrl = String.format("https://raw.githubusercontent.com/%s/%s/%s/%s",
6367
segments[0], segments[1],

src/main/java/net/javadiscord/javabot/systems/user_commands/format_code/FormatCodeCommand.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import net.javadiscord.javabot.util.InteractionUtils;
1313
import net.javadiscord.javabot.util.Responses;
1414
import net.javadiscord.javabot.util.StringUtils;
15+
import org.jetbrains.annotations.Contract;
1516
import org.jetbrains.annotations.NotNull;
1617

1718
import java.util.Collections;
@@ -52,7 +53,8 @@ public FormatCodeCommand() {
5253
);
5354
}
5455

55-
protected static ActionRow buildActionRow(Message target) {
56+
@Contract("_ -> new")
57+
protected static @NotNull ActionRow buildActionRow(@NotNull Message target) {
5658
return ActionRow.of(Button.secondary(InteractionUtils.DELETE_ORIGINAL_TEMPLATE, "\uD83D\uDDD1️"),
5759
Button.link(target.getJumpUrl(), "View Original"));
5860
}

0 commit comments

Comments
 (0)