Skip to content

Commit 2fe2a78

Browse files
[translate] Add missing locale codes
1 parent 1165b35 commit 2fe2a78

16 files changed

Lines changed: 44 additions & 36 deletions

File tree

src/main/java/de/chojo/repbot/commands/messages/handler/States.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,18 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
3636
.setPlaceholder("command.messages.states.message.choose")
3737
.setRequiredRange(1, 1)
3838
.addOption("command.messages.states.message.option.reactionconfirmation.name", "reaction_confirmation", "command.messages.states.message.option.reactionConfirmation.description")
39+
.addOption("command.messages.states.message.option.commandreputationephemeral.name", "command_reply", "command.messages.states.message.option.commandreputationephemeral.description")
3940
.build();
4041
var reactions = getMenu("reaction_confirmation",
4142
"command.messages.states.message.option.reactionconfirmation.name",
4243
"command.messages.states.message.choice.reactionConfirmation.true",
4344
"command.messages.states.message.choice.reactionConfirmation.false",
4445
settings.messages().isReactionConfirmation());
45-
var commandReply = getMenu("reaction_confirmation",
46-
"command.messages.states.message.option.reactionconfirmation.name",
47-
"command.messages.states.message.choice.reactionConfirmation.true",
48-
"command.messages.states.message.choice.reactionConfirmation.false",
49-
settings.messages().isReactionConfirmation());
46+
var commandreputationephemeral = getMenu("command_reply",
47+
"command.messages.states.message.option.commandreputationephemeral.name",
48+
"command.messages.states.message.choice.commandreputationephemeral.true",
49+
"command.messages.states.message.choice.commandreputationephemeral.false",
50+
settings.messages().isCommandReputationEphemeral());
5051

5152
context.registerMenu(MenuAction.forCallback(getSettings(context, settings), event)
5253
.addComponent(MenuEntry.of(setting, ctx -> {
@@ -63,7 +64,7 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
6364
.addComponent(MenuEntry.of(reactions, ctx -> refresh(ctx, res -> settings.messages()
6465
.reactionConfirmation(res), context, settings))
6566
.hidden())
66-
.addComponent(MenuEntry.of(commandReply, ctx -> refresh(ctx, res -> settings.messages()
67+
.addComponent(MenuEntry.of(commandreputationephemeral, ctx -> refresh(ctx, res -> settings.messages()
6768
.commandReputationEphemeral(res), context, settings))
6869
.hidden())
6970
.asEphemeral()

src/main/java/de/chojo/repbot/commands/repsettings/handler/Info.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,17 @@
1818
import net.dv8tion.jda.api.entities.MessageEmbed;
1919
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
2020
import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionEvent;
21+
import org.slf4j.Logger;
2122

2223
import java.awt.*;
2324
import java.util.Collections;
25+
import java.util.concurrent.CompletableFuture;
2426
import java.util.function.Consumer;
2527

28+
import static org.slf4j.LoggerFactory.getLogger;
29+
2630
public class Info implements SlashHandler {
31+
private static final Logger log = getLogger(Info.class);
2732
private final GuildRepository guildRepository;
2833

2934
public Info(GuildRepository guildRepository) {
@@ -121,7 +126,11 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
121126
.addComponent(MenuEntry.of(command, ctx -> refresh(ctx, res -> {
122127
guildSettings.reputation().commandActive(res);
123128
// The command needs to be hidden or enabled additionally
124-
context.interactionHub().refreshGuildCommands(event.getGuild());
129+
CompletableFuture.runAsync(() -> context.interactionHub().refreshGuildCommands(event.getGuild()))
130+
.exceptionally(err -> {
131+
log.error("Error during command refresh", err);
132+
return null;
133+
});
125134
}, context, guildSettings))
126135
.hidden())
127136
.addComponent(MenuEntry.of(skipSingleEmbed, ctx -> refresh(ctx, res -> guildSettings.reputation()

src/main/java/de/chojo/repbot/commands/reputation/Reputation.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public Slash slash() {
2828
return Slash.of("reputation", "command.reputation.description")
2929
.privateCommand()
3030
.command(new Give(guildRepository, reputationService))
31-
.argument(user("user", "command.reputation.user.description"))
31+
.argument(user("user", "command.reputation.options.user.description").asRequired())
3232
.build();
3333
}
3434
}

src/main/java/de/chojo/repbot/commands/reputation/handler/Give.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void onSlashCommand(SlashCommandInteractionEvent event, EventContext cont
3535
return;
3636
}
3737

38-
var result = reputationService.submitReputation(event.getGuild(), event.getMember(), event.getOption("user", OptionMapping::getAsMember), ReputationContext.fromInteraction(event), null, ThankType.ANSWER);
38+
var result = reputationService.submitReputation(event.getGuild(), event.getMember(), event.getOption("user", OptionMapping::getAsMember), ReputationContext.fromInteraction(event), null, ThankType.COMMAND);
3939
if (result.type() == SubmitResultType.SUCCESS) {
4040
event.reply("success").setEphemeral(guild.settings().messages().isReactionConfirmation()).queue();
4141
} else {

src/main/java/de/chojo/repbot/core/Bot.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ private void initInteractions() {
268268
})
269269
.withGuildCommandMapper(cmd -> switch (cmd.name()) {
270270
case "bot" -> Collections.singletonList(configuration.baseSettings().botGuild());
271-
case "rep" -> data.guilds().byCommandReputationEnabled();
271+
case "reputation" -> data.guilds().byCommandReputationEnabled();
272272
default -> Collections.emptyList();
273273
})
274274
.withDefaultMenuService()

src/main/java/de/chojo/repbot/dao/access/guild/settings/Settings.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ public Reputation reputation() {
9696
mention_active,
9797
fuzzy_active,
9898
embed_active,
99-
skip_single_embed
99+
skip_single_embed,
100+
command_active
100101
FROM
101102
reputation_settings
102103
WHERE guild_id = ?;

src/main/java/de/chojo/repbot/dao/access/guild/settings/sub/Messages.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ ON CONFLICT(guild_id)
8888
public String toLocalizedString() {
8989
var setting = List.of(
9090
getSetting("command.messages.states.message.option.reactionconfirmation.name", isReactionConfirmation()),
91-
getSetting("command.messages.states.message.option.commandreputationephemeral.name", isCommandReputationEphemeral())
91+
getSetting("command.messages.states.message.option.commandreply.name", isCommandReputationEphemeral())
9292
);
9393

9494
return String.join("\n", setting);

src/main/java/de/chojo/repbot/dao/access/guild/settings/sub/Reputation.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,10 @@ public String toLocalizedString() {
146146
getSetting("command.repsettings.info.message.option.bymention.name", isMentionActive()),
147147
getSetting("command.repsettings.info.message.option.byfuzzy.name", isFuzzyActive()),
148148
getSetting("command.repsettings.info.message.option.byembed.name", isEmbedActive()),
149+
getSetting("command.repsettings.info.message.option.bycommand.name", settings.reputation()
150+
.isCommandActive()),
149151
getSetting("command.repsettings.info.message.option.skipsingletarget.name", settings.reputation()
150-
.isDirectActive()),
152+
.isDirectActive()),
151153
getSetting("command.repsettings.info.message.option.reputationmode.name", settings.general()
152154
.reputationMode()
153155
.localeCode())

src/main/java/de/chojo/repbot/service/reputation/ReputationService.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,8 @@ private SubmitResult log(Guild guild, Member donor, Member receiver, ReputationC
264264
Instant.now()));
265265

266266
// mark messages
267-
if(context.isMessage()){
268-
Messages.markMessage(context.asMessage(), refMessage, settings);
267+
if (context.isMessage()) {
268+
Messages.markMessage(context.asMessage(), refMessage, settings);
269269
}
270270
// update role
271271
var newRank = assigner.updateReporting(receiver, context.getChannel());
@@ -325,6 +325,9 @@ private boolean isTypeDisabled(ThankType type, Reputation reputation) {
325325
case DIRECT -> {
326326
if (!reputation.isDirectActive()) return true;
327327
}
328+
case COMMAND -> {
329+
if (!reputation.isCommandActive()) return true;
330+
}
328331
default -> throw new IllegalStateException("Unexpected value: " + type);
329332
}
330333
return false;

src/main/resources/locale.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -541,9 +541,9 @@ command.repsettings.info.message.option.bycommand.description=
541541
command.repsettings.info.message.bycommand.true=
542542
command.repsettings.info.message.bycommand.false=
543543
command.reputation.description=
544-
command.reputation.user.description=
544+
command.reputation.options.user.description=
545545
command.repsettings.info.message.option.bycommand.name=
546546
thankType.command.name=
547547
submitresult.success=
548-
command.messages.states.message.option.commandreputationephemeral.name=
549-
command.messages.states.message.option.commandreputationephemeral.description=
548+
549+

0 commit comments

Comments
 (0)