Swap to precondition builder

Author: JakeJMattson

src/main/kotlin/io/github/jakejmattson/embedbot/preconditions/LoadedEmbedPrecondition.kt

@@ -6,14 +6,14 @@ import me.aberrantfox.kjdautils.api.dsl.*
 import me.aberrantfox.kjdautils.internal.command.*
 
 @Precondition
-fun produceHasLoadedEmbedPrecondition() = exit@{ event: CommandEvent ->
-    val command = event.container.commands[event.commandStruct.commandName] ?: return@exit Pass
+fun produceHasLoadedEmbedPrecondition() = precondition { event: CommandEvent ->
+    val command = event.container.commands[event.commandStruct.commandName] ?: return@precondition Pass
 
     val guild = event.guild
-        ?: return@exit Fail(messages.errors.MISSING_GUILD)
+        ?: return@precondition Fail(messages.errors.MISSING_GUILD)
 
     if (command.requiresLoadedEmbed && !guild.hasLoadedEmbed())
-        return@exit Fail(messages.errors.MISSING_EMBED)
+        return@precondition Fail(messages.errors.MISSING_EMBED)
 
-    return@exit Pass
+    return@precondition Pass
 }

src/main/kotlin/io/github/jakejmattson/embedbot/preconditions/PermissionPrecondition.kt

@@ -8,14 +8,14 @@ import me.aberrantfox.kjdautils.extensions.jda.toMember
 import me.aberrantfox.kjdautils.internal.command.*
 
 @Precondition
-fun produceHasPermissionPrecondition(permissionsService: PermissionsService) = exit@{ event: CommandEvent ->
+fun produceHasPermissionPrecondition(permissionsService: PermissionsService) = precondition { event: CommandEvent ->
     val command = event.container.commands[event.commandStruct.commandName]
     val requiredPermissionLevel = command?.requiredPermissionLevel ?: DEFAULT_REQUIRED_PERMISSION
-    val guild = event.guild ?: return@exit Fail(messages.errors.MISSING_GUILD)
+    val guild = event.guild ?: return@precondition Fail(messages.errors.MISSING_GUILD)
     val member = event.author.toMember(guild)!!
 
     if (!permissionsService.hasClearance(member, requiredPermissionLevel))
-        return@exit Fail(messages.errors.MISSING_CLEARANCE)
+        return@precondition Fail(messages.errors.MISSING_CLEARANCE)
 
-    return@exit Pass
+    return@precondition Pass
 }