Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix entire plugin halting when alerts.yml has incorrect structure #1819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix entire plugin halting when alerts.yml has incorrect structure #1819

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions src/main/java/github/scarsz/discordsrv/modules/alerts/AlertListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,20 +177,30 @@ public void reloadAlerts() {
validClassNameCache.clear();
activeTriggers.clear();
alerts.clear();
Optional<List<Map<?, ?>>> optionalAlerts = DiscordSRV.config().getOptional("Alerts");
boolean any = optionalAlerts.isPresent() && !optionalAlerts.get().isEmpty();
if (registered) unregister();
if (any) {
register();
long count = optionalAlerts.get().size();
DiscordSRV.info(optionalAlerts.get().size() + " alert" + (count > 1 ? "s" : "") + " registered");

for (Map<?, ?> map : optionalAlerts.get()) {
Dynamic alert = Dynamic.from(map);
alerts.add(alert);
activeTriggers.addAll(getTriggers(alert));

try {
Optional<List<Map<?, ?>>> optionalAlerts = DiscordSRV.config().getOptional("Alerts");
boolean any = optionalAlerts.isPresent() && !optionalAlerts.get().isEmpty();
if (any) {
register();
long count = optionalAlerts.get().size();
DiscordSRV.info(optionalAlerts.get().size() + " alert" + (count > 1 ? "s" : "") + " registered");

for (Map<?, ?> map : optionalAlerts.get()) {
Dynamic alert = Dynamic.from(map);
alerts.add(alert);
activeTriggers.addAll(getTriggers(alert));
}
}
}
catch (ClassCastException ignored) {
DiscordSRV.error("alerts.yml has incorrect structure! Please refer to the wiki and correct the file (https://docs.discordsrv.com/alerts/#usage-examples)");
validClassNameCache.clear();
activeTriggers.clear();
alerts.clear();
unregister();
}
}

public List<Dynamic> getAlerts() {
Expand Down