Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-04-14 03:45:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AB-66] fixing not reducing the bid on mines

Browse Source 
fixing reaction report sometimes running into a timeout
This commit is contained in:
Sheldan
2022-12-03 20:14:18 +01:00
parent 1217e03725
commit 650a9099c4
5 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
abstracto-application/abstracto-modules/entertainment/entertainment-impl/src/main/java/dev/sheldan/abstracto/entertainment/service/GameServiceBean.java
View File

@@ -23,8 +23,8 @@ import java.security.SecureRandom;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static dev.sheldan.abstracto.entertainment.config.EconomyFeatureConfig.MINES_MINIMUM_MINES_RATIO;
import static dev.sheldan.abstracto.entertainment.config.GamesFeatureConfig.MINES_CREDITS_FACTOR; import static dev.sheldan.abstracto.entertainment.config.GamesFeatureConfig.MINES_CREDITS_FACTOR;
import static dev.sheldan.abstracto.entertainment.config.GamesFeatureConfig.MINES_MINIMUM_MINES_RATIO;
@Component @Component
public class GameServiceBean implements GameService { public class GameServiceBean implements GameService {
@@ -134,6 +134,7 @@ public class GameServiceBean implements GameService {
.build(); .build();
Optional<EconomyUser> economyUserOptional = economyUserManagementService.getUser(serverUser); Optional<EconomyUser> economyUserOptional = economyUserManagementService.getUser(serverUser);
if(economyUserOptional.isPresent()) { if(economyUserOptional.isPresent()) {
economyService.addCredits(economyUserOptional.get(), -credits);
economyService.addCredits(economyUserOptional.get(), creditChange); economyService.addCredits(economyUserOptional.get(), creditChange);
} }
mineBoard.setCreditChange(creditChange); mineBoard.setCreditChange(creditChange);

3
abstracto-application/abstracto-modules/entertainment/entertainment-int/src/main/java/dev/sheldan/abstracto/entertainment/config/EconomyFeatureConfig.java
View File

@@ -13,7 +13,6 @@ public class EconomyFeatureConfig implements FeatureConfig {
public static final String PAYDAY_CREDITS_CONFIG_KEY = "paydayCredits"; public static final String PAYDAY_CREDITS_CONFIG_KEY = "paydayCredits";
public static final String PAYDAY_COOLDOWN_CONFIG_KEY = "paydayCooldown"; public static final String PAYDAY_COOLDOWN_CONFIG_KEY = "paydayCooldown";
public static final String SLOTS_COOLDOWN_CONFIG_KEY = "slotsCooldown"; public static final String SLOTS_COOLDOWN_CONFIG_KEY = "slotsCooldown";
public static final String MINES_MINIMUM_MINES_RATIO = "minesMinMineRatio";
@Override @Override
public FeatureDefinition getFeature() { public FeatureDefinition getFeature() {
@@ -22,6 +21,6 @@ public class EconomyFeatureConfig implements FeatureConfig {
@Override @Override
public List<String> getRequiredSystemConfigKeys() { public List<String> getRequiredSystemConfigKeys() {
return Arrays.asList(PAYDAY_CREDITS_CONFIG_KEY, PAYDAY_COOLDOWN_CONFIG_KEY, SLOTS_COOLDOWN_CONFIG_KEY, MINES_MINIMUM_MINES_RATIO); return Arrays.asList(PAYDAY_CREDITS_CONFIG_KEY, PAYDAY_COOLDOWN_CONFIG_KEY, SLOTS_COOLDOWN_CONFIG_KEY);
} }
} }

3
abstracto-application/abstracto-modules/entertainment/entertainment-int/src/main/java/dev/sheldan/abstracto/entertainment/config/GamesFeatureConfig.java
View File

@@ -11,6 +11,7 @@ import java.util.List;
public class GamesFeatureConfig implements FeatureConfig { public class GamesFeatureConfig implements FeatureConfig {
public static final String MINES_CREDITS_FACTOR = "minesCreditsFactor"; public static final String MINES_CREDITS_FACTOR = "minesCreditsFactor";
public static final String MINES_MINIMUM_MINES_RATIO = "minesMinMineRatio";
@Override @Override
public FeatureDefinition getFeature() { public FeatureDefinition getFeature() {
@@ -19,7 +20,7 @@ public class GamesFeatureConfig implements FeatureConfig {
@Override @Override
public List<String> getRequiredSystemConfigKeys() { public List<String> getRequiredSystemConfigKeys() {
return Arrays.asList(MINES_CREDITS_FACTOR); return Arrays.asList(MINES_CREDITS_FACTOR, MINES_MINIMUM_MINES_RATIO);
} }
} }

49
abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/interaction/ReportContextCommandListener.java
View File

@@ -33,33 +33,32 @@ public class ReportContextCommandListener implements MessageContextCommandListen
@Override @Override
public DefaultListenerResult execute(MessageContextInteractionModel model) { public DefaultListenerResult execute(MessageContextInteractionModel model) {
Message targetMessage = model.getEvent().getTarget(); model.getEvent().deferReply(true).queue(interactionHook -> {
if(targetMessage.getAuthor().getIdLong() == model.getEvent().getUser().getIdLong()) { Message targetMessage = model.getEvent().getTarget();
interactionService.replyEmbed(ReactionReportServiceBean.REACTION_REPORT_OWN_MESSAGE_RESPONSE_TEMPLATE, new Object(), model.getEvent()); if(targetMessage.getAuthor().getIdLong() == model.getEvent().getUser().getIdLong()) {
return DefaultListenerResult.IGNORED; interactionService.sendMessageToInteraction(ReactionReportServiceBean.REACTION_REPORT_OWN_MESSAGE_RESPONSE_TEMPLATE, new Object(), interactionHook);
} return;
ServerUser userReporting = ServerUser }
.builder() ServerUser userReporting = ServerUser
.serverId(model.getServerId()) .builder()
.userId(model.getEvent().getUser().getIdLong()) .serverId(model.getServerId())
.isBot(model.getEvent().getUser().isBot()) .userId(model.getEvent().getUser().getIdLong())
.build(); .isBot(model.getEvent().getUser().isBot())
.build();
if(!reactionReportService.allowedToReport(userReporting)) { if(!reactionReportService.allowedToReport(userReporting)) {
log.info("User {} was reported on message {} in server {} within the cooldown. Ignoring.", log.info("User {} was reported on message {} in server {} within the cooldown. Ignoring.",
targetMessage.getAuthor().getIdLong(), targetMessage.getIdLong(), targetMessage.getGuild().getIdLong()); targetMessage.getAuthor().getIdLong(), targetMessage.getIdLong(), targetMessage.getGuild().getIdLong());
interactionService.replyEmbed(ReactionReportServiceBean.REACTION_REPORT_COOLDOWN_RESPONSE_TEMPLATE, new Object(), model.getEvent()); interactionService.sendMessageToInteraction(ReactionReportServiceBean.REACTION_REPORT_COOLDOWN_RESPONSE_TEMPLATE, new Object(),interactionHook);
return DefaultListenerResult.IGNORED; return;
} }
reactionReportService.createReactionReport(targetMessage, userReporting, null).exceptionally(throwable -> {
reactionReportService.createReactionReport(targetMessage, userReporting, null).exceptionally(throwable -> { log.error("Failed to create reaction report in server {} on message {} in channel {} with interaction.",
log.error("Failed to create reaction report in server {} on message {} in channel {} with interaction.", model.getServerId(), targetMessage.getIdLong(), model.getEvent().getChannel().getIdLong(), throwable);
model.getServerId(), targetMessage.getIdLong(), model.getEvent().getChannel().getIdLong(), throwable); return null;
return null; });
interactionService.sendMessageToInteraction(REACTION_REPORT_RESPONSE_TEMPLATE, new Object(), interactionHook);
}); });
interactionService.replyEmbed(REACTION_REPORT_RESPONSE_TEMPLATE, new Object(), model.getEvent());
return DefaultListenerResult.PROCESSED; return DefaultListenerResult.PROCESSED;
} }

1
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/interaction/InteractionServiceBean.java
View File

@@ -106,6 +106,7 @@ public class InteractionServiceBean implements InteractionService {
if(messageToSend.getEphemeral()) { if(messageToSend.getEphemeral()) {
Interaction interaction = interactionHook.getInteraction(); Interaction interaction = interactionHook.getInteraction();
interactionHook.setEphemeral(messageToSend.getEphemeral());
log.info("Sending ephemeral message to interaction in guild {} in channel {} for user {}.", log.info("Sending ephemeral message to interaction in guild {} in channel {} for user {}.",
interaction.getGuild().getIdLong(), interaction.getChannel().getId(), interaction.getGuild().getIdLong(), interaction.getChannel().getId(),
interaction.getMember().getIdLong()); interaction.getMember().getIdLong());