Fascinated/Bat
1
1
Fork 2
Code Issues 1 Pull Requests Actions Activity

make feature command less ugly and update feature disabled message
All checks were successful
Deploy to Dokku / docker (ubuntu-latest) (push) Successful in 38s
Details

Browse Source
This commit is contained in:
Lee 2024-06-30 07:41:31 +01:00
parent 5ce5ef6898
commit 5b1ddb145f
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/cc/fascinated/bat/features/command/DisableSubCommand.java
View File

@ -37,22 +37,30 @@ public class DisableSubCommand extends BatSubCommand {
FeatureProfile featureProfile = guild.getFeatureProfile(); FeatureProfile featureProfile = guild.getFeatureProfile();
OptionMapping featureOption = interaction.getOption("feature"); OptionMapping featureOption = interaction.getOption("feature");
if (featureOption == null) { if (featureOption == null) {
interaction.replyEmbeds(EmbedUtils.errorEmbed().setDescription("You must provide a feature to disable").build()).queue(); interaction.replyEmbeds(EmbedUtils.errorEmbed()
.setDescription("You must provide a feature to disable")
.build()).queue();
return; return;
} }
String featureName = featureOption.getAsString(); String featureName = featureOption.getAsString();
if (!FeatureService.INSTANCE.isFeature(featureName)) { if (!FeatureService.INSTANCE.isFeature(featureName)) {
interaction.replyEmbeds(EmbedUtils.errorEmbed().setDescription("That feature does not exist").build()).queue(); interaction.replyEmbeds(EmbedUtils.errorEmbed()
.setDescription("That feature does not exist")
.build()).queue();
return; return;
} }
Feature feature = FeatureService.INSTANCE.getFeature(featureName); Feature feature = FeatureService.INSTANCE.getFeature(featureName);
if (featureProfile.isFeatureDisabled(feature)) { if (featureProfile.isFeatureDisabled(feature)) {
interaction.replyEmbeds(EmbedUtils.errorEmbed().setDescription("That feature is already disabled").build()).queue(); interaction.replyEmbeds(EmbedUtils.errorEmbed()
.setDescription("The feature `%s` is already disabled".formatted(feature.getName()))
.build()).queue();
return; return;
} }
featureProfile.setFeatureState(feature, true); featureProfile.setFeatureState(feature, true);
guildService.saveGuild(guild); guildService.saveGuild(guild);
interaction.replyEmbeds(EmbedUtils.successEmbed().setDescription("Successfully disabled the feature " + feature.getName()).build()).queue(); interaction.replyEmbeds(EmbedUtils.successEmbed()
.setDescription("Successfully disabled the `%s` feature".formatted(feature.getName()))
.build()).queue();
} }
} }

16
src/main/java/cc/fascinated/bat/features/command/EnableSubCommand.java
View File

@ -37,22 +37,30 @@ public class EnableSubCommand extends BatSubCommand {
FeatureProfile featureProfile = guild.getFeatureProfile(); FeatureProfile featureProfile = guild.getFeatureProfile();
OptionMapping featureOption = interaction.getOption("feature"); OptionMapping featureOption = interaction.getOption("feature");
if (featureOption == null) { if (featureOption == null) {
interaction.replyEmbeds(EmbedUtils.errorEmbed().setDescription("You must provide a feature to enable").build()).queue(); interaction.replyEmbeds(EmbedUtils.errorEmbed()
.setDescription("You must provide a feature to enabled")
.build()).queue();
return; return;
} }
String featureName = featureOption.getAsString(); String featureName = featureOption.getAsString();
if (!FeatureService.INSTANCE.isFeature(featureName)) { if (!FeatureService.INSTANCE.isFeature(featureName)) {
interaction.replyEmbeds(EmbedUtils.errorEmbed().setDescription("That feature does not exist").build()).queue(); interaction.replyEmbeds(EmbedUtils.errorEmbed()
.setDescription("That feature does not exist")
.build()).queue();
return; return;
} }
Feature feature = FeatureService.INSTANCE.getFeature(featureName); Feature feature = FeatureService.INSTANCE.getFeature(featureName);
if (!featureProfile.isFeatureDisabled(feature)) { if (!featureProfile.isFeatureDisabled(feature)) {
interaction.replyEmbeds(EmbedUtils.errorEmbed().setDescription("That feature is already enabled").build()).queue(); interaction.replyEmbeds(EmbedUtils.errorEmbed()
.setDescription("The feature `%s` is already enabled".formatted(feature.getName()))
.build()).queue();
return; return;
} }
featureProfile.setFeatureState(feature, false); featureProfile.setFeatureState(feature, false);
guildService.saveGuild(guild); guildService.saveGuild(guild);
interaction.replyEmbeds(EmbedUtils.successEmbed().setDescription("Successfully enabled the feature " + feature.getName()).build()).queue(); interaction.replyEmbeds(EmbedUtils.successEmbed()
.setDescription("Successfully enabled the `%s` feature".formatted(feature.getName()))
.build()).queue();
} }
} }

2
src/main/java/cc/fascinated/bat/service/CommandService.java
View File

@ -224,7 +224,7 @@ public class CommandService extends ListenerAdapter {
FeatureProfile featureProfile = guild.getFeatureProfile(); FeatureProfile featureProfile = guild.getFeatureProfile();
if (featureProfile.isFeatureDisabled(command.getFeature())) { if (featureProfile.isFeatureDisabled(command.getFeature())) {
event.replyEmbeds(EmbedUtils.errorEmbed() event.replyEmbeds(EmbedUtils.errorEmbed()
.setDescription("This command has been disabled by the guild owner") .setDescription("The feature `%s` is disabled in this guild".formatted(command.getFeature().getName()))
.build()).setEphemeral(true).queue(); .build()).setEphemeral(true).queue();
return; return;
} }