Merge remote-tracking branch 'origin/main'

quasicolon · Dec 22, 2023 · 868cd53 · 868cd53
2 parents 0f63db1 + 1ade314
commit 868cd53
Show file tree

Hide file tree

Showing 10 changed files with 171 additions and 233 deletions.
diff --git a/src/main/java/dev/qixils/quasicord/commands/UserConfigCommand.java b/src/main/java/dev/qixils/quasicord/commands/UserConfigCommand.java
@@ -75,7 +75,7 @@ public Mono<QuasiMessage> setTimeZoneCommand(
 		Channel channel
 	) {
 		var collection = library.getDatabaseManager().collection(TimeZoneConfig.class);
-		var filter = eq("id", user.getIdLong());
+		var filter = eq("_id", user.getIdLong());
 		Publisher<?> result;
 		if (tz == null) {
 			result = collection.deleteOne(filter);

diff --git a/src/main/java/dev/qixils/quasicord/db/CollectionName.java b/src/main/java/dev/qixils/quasicord/db/CollectionName.java
@@ -16,5 +16,5 @@
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface CollectionName {
-	@NonNull String name();
+	@NonNull String value();
 }
diff --git a/src/main/java/dev/qixils/quasicord/db/DatabaseManager.java b/src/main/java/dev/qixils/quasicord/db/DatabaseManager.java
@@ -62,7 +62,7 @@ private static String collectionNameOf(Object object) {
 	private static String collectionNameOf(Class<?> clazz) {
 		String collectionName;
 		if (clazz.isAnnotationPresent(CollectionName.class))
-			collectionName = clazz.getAnnotation(CollectionName.class).name();
+			collectionName = clazz.getAnnotation(CollectionName.class).value();
 		else
 			collectionName = clazz.getSimpleName();
 		return collectionName.substring(0, Math.min(collectionName.length(), 127));

diff --git a/src/main/java/dev/qixils/quasicord/db/collection/LocaleConfig.java b/src/main/java/dev/qixils/quasicord/db/collection/LocaleConfig.java
@@ -19,7 +19,7 @@
  * An entry in the locale configuration database collection.
  * This stores the selected locale for a user, channel, or guild.
  */
-@CollectionName(name = "locale")
+@CollectionName("locale")
 public class LocaleConfig {
 
 	@BsonId

diff --git a/src/main/java/dev/qixils/quasicord/db/collection/TimeZoneConfig.java b/src/main/java/dev/qixils/quasicord/db/collection/TimeZoneConfig.java
@@ -19,7 +19,7 @@
  * An entry in the timezone configuration database collection.
  * This stores the selected timezone for a user.
  */
-@CollectionName(name = "timezone")
+@CollectionName("timezone")
 public class TimeZoneConfig {
 
 	@BsonId

diff --git a/src/main/java/dev/qixils/quasicord/decorators/ParserCommand.java b/src/main/java/dev/qixils/quasicord/decorators/ParserCommand.java
@@ -67,8 +67,8 @@ public static void consumeCommandResult(@NonNull CommandInteraction interaction,
 			case Mono<?> mono -> mono.subscribe(res -> consumeCommandResult(interaction, res));
 			case CompletableFuture<?> fut -> fut.thenAccept(res -> consumeCommandResult(interaction, res));
 			// terminal cases:
-			case null -> interaction.deferReply().queue();
-			case Boolean ephemeral -> interaction.deferReply(ephemeral).queue();
+			case null -> {}
+			case Boolean ephemeral -> interaction.deferReply(ephemeral).queue(); // TODO: replace with little enum class?
 			case QuasiMessage message -> message.text().asString(Context.fromInteraction(interaction)).subscribe(string -> {
 				var action = interaction.reply(string);
 				message.modifier().accept(action);