fix: later addEventListener

quasicolon · Dec 21, 2023 · 977a32a · 977a32a
1 parent 4624aa0
commit 977a32a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/dev/qixils/quasicord/Quasicord.java b/src/main/java/dev/qixils/quasicord/Quasicord.java
@@ -105,6 +105,7 @@ protected Quasicord(@NonNull String namespace, @NonNull List<Locale> locales, @N
 		// late initialize (depends on JDA)
 		rootRegistry = new RegistryRegistry(this);
 		this.commandManager = new CommandManager(this);
+		jda.addEventListener(commandManager);
 		registerCommands();
 		commandManager.upsertCommands(jda);
 	}
@@ -136,7 +137,6 @@ protected JDA initJDA(@Nullable Activity activity) {
 		JDA jda = builder.build();
 		jda.setRequiredScopes("applications.commands");
 		jda.addEventListener(tempListenerExecutor);
-		jda.addEventListener(commandManager);
 		jda.addEventListener(new Object() {
 			@net.dv8tion.jda.api.hooks.SubscribeEvent
 			public void on(net.dv8tion.jda.api.events.Event event) {

diff --git a/src/main/java/dev/qixils/quasicord/locale/TranslationProvider.java b/src/main/java/dev/qixils/quasicord/locale/TranslationProvider.java
@@ -149,7 +149,12 @@ public void loadTranslations() throws IOException {
 					logger.warn("Failed to load translations for locale {} in namespace {}: file not found", locale, namespace);
 					continue;
 				}
+
 				Map<String, Object> translationMap = yaml.load(inputStream);
+				if (translationMap == null) {
+					logger.warn("Failed to load translations for locale {} in namespace {}: yaml returned null", locale, namespace);
+					continue;
+				}
 
 				// some language files are nested inside the language code, so we need to extract
 				// the inner map