Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-04-19 13:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

added check for existing system config when a feature is enabled

Browse Source
This commit is contained in:
Sheldan
2020-05-15 18:53:51 +02:00
parent f11232de05
commit b984129df6
24 changed files with 226 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/validator/ExperienceFeatureValidatorBean.java Normal file
View File

@@ -0,0 +1,22 @@
package dev.sheldan.abstracto.experience.validator;
import dev.sheldan.abstracto.core.config.FeatureConfig;
import dev.sheldan.abstracto.core.models.FeatureValidationResult;
import dev.sheldan.abstracto.core.models.database.AServer;
import dev.sheldan.abstracto.core.service.FeatureValidatorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
public class ExperienceFeatureValidatorBean implements ExperienceFeatureValidator {
@Autowired
private FeatureValidatorService featureValidatorService;
@Override
public void featureIsSetup(FeatureConfig featureConfig, AServer server, FeatureValidationResult validationResult) {
featureValidatorService.checkSystemConfig("expMultiplier", server, validationResult);
featureValidatorService.checkSystemConfig("minExp", server, validationResult);
featureValidatorService.checkSystemConfig("maxExp", server, validationResult);
}
}

14
abstracto-application/abstracto-modules/experience-tracking/experience-tracking-int/src/main/java/dev/sheldan/abstracto/experience/config/features/ExperienceFeatureConfig.java
View File

@@ -2,13 +2,27 @@ package dev.sheldan.abstracto.experience.config.features;
import dev.sheldan.abstracto.core.config.FeatureConfig;
import dev.sheldan.abstracto.core.config.FeatureEnum;
import dev.sheldan.abstracto.core.service.FeatureValidator;
import dev.sheldan.abstracto.experience.validator.ExperienceFeatureValidator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Arrays;
import java.util.List;
@Component
public class ExperienceFeatureConfig implements FeatureConfig {
@Autowired
private ExperienceFeatureValidator experienceFeatureValidator;
@Override
public FeatureEnum getFeature() {
return ExperienceFeature.EXPERIENCE;
}
@Override
public List<FeatureValidator> getAdditionalFeatureValidators() {
return Arrays.asList(experienceFeatureValidator);
}
}

6
abstracto-application/abstracto-modules/experience-tracking/experience-tracking-int/src/main/java/dev/sheldan/abstracto/experience/validator/ExperienceFeatureValidator.java Normal file
View File

@@ -0,0 +1,6 @@
package dev.sheldan.abstracto.experience.validator;
import dev.sheldan.abstracto.core.service.FeatureValidator;
public interface ExperienceFeatureValidator extends FeatureValidator {
}

2
abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/listener/WarnDecayConfigListener.java
View File

@@ -18,6 +18,6 @@ public class WarnDecayConfigListener implements ServerConfigListener {
@Override
public void updateServerConfig(AServer server) {
configManagementService.createIfNotExists(server.getId(), "decayDays", decayDays.longValue());
configManagementService.createIfNotExists(server.getId(), "decayDays", decayDays);
}
}

20
abstracto-application/abstracto-modules/moderation/moderation-impl/src/main/java/dev/sheldan/abstracto/moderation/validator/WarnDecayFeatureValidatorBean.java Normal file
View File

@@ -0,0 +1,20 @@
package dev.sheldan.abstracto.moderation.validator;
import dev.sheldan.abstracto.core.config.FeatureConfig;
import dev.sheldan.abstracto.core.models.FeatureValidationResult;
import dev.sheldan.abstracto.core.models.database.AServer;
import dev.sheldan.abstracto.core.service.FeatureValidatorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
public class WarnDecayFeatureValidatorBean implements WarnDecayFeatureValidator {
@Autowired
private FeatureValidatorService featureValidatorService;
@Override
public void featureIsSetup(FeatureConfig featureConfig, AServer server, FeatureValidationResult validationResult) {
featureValidatorService.checkSystemConfig("decayDays", server, validationResult);
}
}

10
abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/config/features/WarningDecayFeature.java
View File

@@ -3,7 +3,9 @@ package dev.sheldan.abstracto.moderation.config.features;
import dev.sheldan.abstracto.core.config.FeatureConfig;
import dev.sheldan.abstracto.core.config.FeatureEnum;
import dev.sheldan.abstracto.core.config.PostTargetEnum;
import dev.sheldan.abstracto.core.service.FeatureValidator;
import dev.sheldan.abstracto.moderation.config.posttargets.WarnDecayPostTarget;
import dev.sheldan.abstracto.moderation.validator.WarnDecayFeatureValidator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -16,6 +18,9 @@ public class WarningDecayFeature implements FeatureConfig {
@Autowired
private WarningFeature warningFeature;
@Autowired
private WarnDecayFeatureValidator warnDecayFeatureValidator;
@Override
public FeatureEnum getFeature() {
return ModerationFeatures.AUTOMATIC_WARN_DECAY;
@@ -30,4 +35,9 @@ public class WarningDecayFeature implements FeatureConfig {
public List<PostTargetEnum> getRequiredPostTargets() {
return Arrays.asList(WarnDecayPostTarget.DECAY_LOG);
}
@Override
public List<FeatureValidator> getAdditionalFeatureValidators() {
return Arrays.asList(warnDecayFeatureValidator);
}
}

6
abstracto-application/abstracto-modules/moderation/moderation-int/src/main/java/dev/sheldan/abstracto/moderation/validator/WarnDecayFeatureValidator.java Normal file
View File

@@ -0,0 +1,6 @@
package dev.sheldan.abstracto.moderation.validator;
import dev.sheldan.abstracto.core.service.FeatureValidator;
public interface WarnDecayFeatureValidator extends FeatureValidator {
}

50
abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/java/dev/sheldan/abstracto/modmail/validator/ModMailFeatureValidatorBean.java Normal file
View File

@@ -0,0 +1,50 @@
package dev.sheldan.abstracto.modmail.validator;
import dev.sheldan.abstracto.core.config.FeatureConfig;
import dev.sheldan.abstracto.core.models.FeatureValidationResult;
import dev.sheldan.abstracto.core.models.database.AServer;
import dev.sheldan.abstracto.core.service.BotService;
import dev.sheldan.abstracto.core.service.ConfigService;
import dev.sheldan.abstracto.core.service.FeatureValidatorService;
import dev.sheldan.abstracto.modmail.models.template.ModMailCategoryValidationError;
import dev.sheldan.abstracto.modmail.service.ModMailThreadServiceBean;
import net.dv8tion.jda.api.entities.Category;
import net.dv8tion.jda.api.entities.Guild;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Optional;
@Component
public class ModMailFeatureValidatorBean implements ModMailFeatureValidator {
@Autowired
private BotService botService;
@Autowired
private ConfigService configService;
@Autowired
private FeatureValidatorService featureValidatorService;
@Override
public void featureIsSetup(FeatureConfig featureConfig, AServer server, FeatureValidationResult validationResult) {
Optional<Guild> guildById = botService.getGuildById(server.getId());
if(guildById.isPresent()) {
Guild guild = guildById.get();
boolean checkSucceeded = featureValidatorService.checkSystemConfig(ModMailThreadServiceBean.MODMAIL_CATEGORY, server, validationResult);
if(checkSucceeded) {
Long modMailCategory = configService.getLongValue(ModMailThreadServiceBean.MODMAIL_CATEGORY, server.getId());
Category categoryById = guild.getCategoryById(modMailCategory);
if(categoryById == null) {
validationResult.setValidationResult(false);
ModMailCategoryValidationError newError = ModMailCategoryValidationError
.builder()
.currentCategoryId(modMailCategory)
.build();
validationResult.getValidationErrors().add(newError);
}
}
}
}
}

1
abstracto-application/abstracto-modules/modmail/modmail-impl/src/main/resources/templates/exception/modmail_category_not_setup_en_US.ftl Normal file
View File

@@ -0,0 +1 @@
<#assign categoryId>${(error.templateModel['categoryId'])!"0"}</#assign><#include "modmail_category_not_setup_text">

10
abstracto-application/abstracto-modules/modmail/modmail-int/src/main/java/dev/sheldan/abstracto/modmail/config/ModMailFeature.java
View File

@@ -3,6 +3,8 @@ package dev.sheldan.abstracto.modmail.config;
import dev.sheldan.abstracto.core.config.FeatureConfig;
import dev.sheldan.abstracto.core.config.FeatureEnum;
import dev.sheldan.abstracto.core.config.PostTargetEnum;
import dev.sheldan.abstracto.core.service.FeatureValidator;
import dev.sheldan.abstracto.modmail.validator.ModMailFeatureValidator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -12,6 +14,9 @@ import java.util.List;
@Component
public class ModMailFeature implements FeatureConfig {
@Autowired
private ModMailFeatureValidator modMailFeatureValidator;
@Autowired
private ModMailLoggingFeature modMailLoggingFeature;
@@ -29,4 +34,9 @@ public class ModMailFeature implements FeatureConfig {
public List<PostTargetEnum> getRequiredPostTargets() {
return Arrays.asList(ModMailPostTargets.MOD_MAIL_PING);
}
@Override
public List<FeatureValidator> getAdditionalFeatureValidators() {
return Arrays.asList(modMailFeatureValidator);
}
}

27
abstracto-application/abstracto-modules/modmail/modmail-int/src/main/java/dev/sheldan/abstracto/modmail/models/template/ModMailCategoryValidationError.java Normal file
View File

@@ -0,0 +1,27 @@
package dev.sheldan.abstracto.modmail.models.template;
import dev.sheldan.abstracto.core.models.ValidationError;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import java.util.HashMap;
@Getter
@Setter
@Builder
public class ModMailCategoryValidationError implements ValidationError {
private Long currentCategoryId;
@Override
public String getTemplateName() {
return "modmail_category_not_setup";
}
@Override
public Object getTemplateModel() {
HashMap<String, Long> params = new HashMap<>();
params.put("categoryId", currentCategoryId);
return params;
}
}

6
abstracto-application/abstracto-modules/modmail/modmail-int/src/main/java/dev/sheldan/abstracto/modmail/validator/ModMailFeatureValidator.java Normal file
View File

@@ -0,0 +1,6 @@
package dev.sheldan.abstracto.modmail.validator;
import dev.sheldan.abstracto.core.service.FeatureValidator;
public interface ModMailFeatureValidator extends FeatureValidator {
}

27
abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/validator/StarboardFeatureValidatorService.java Normal file
View File

@@ -0,0 +1,27 @@
package dev.sheldan.abstracto.utility.validator;
import dev.sheldan.abstracto.core.config.FeatureConfig;
import dev.sheldan.abstracto.core.models.FeatureValidationResult;
import dev.sheldan.abstracto.core.models.database.AServer;
import dev.sheldan.abstracto.core.service.FeatureValidatorService;
import dev.sheldan.abstracto.utility.StarboardFeatureValidator;
import dev.sheldan.abstracto.utility.config.StarboardConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@Component
public class StarboardFeatureValidatorService implements StarboardFeatureValidator {
@Autowired
private StarboardConfig starboardConfig;
@Autowired
private FeatureValidatorService featureValidatorService;
@Override
public void featureIsSetup(FeatureConfig featureConfig, AServer server, FeatureValidationResult validationResult) {
for(int i = starboardConfig.getLvl().size(); i > 0; i--) {
featureValidatorService.checkSystemConfig("starLvl" + i, server, validationResult);
}
}
}

6
abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/StarboardFeatureValidator.java Normal file
View File

@@ -0,0 +1,6 @@
package dev.sheldan.abstracto.utility;
import dev.sheldan.abstracto.core.service.FeatureValidator;
public interface StarboardFeatureValidator extends FeatureValidator {
}

11
abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/config/features/StarboardFeature.java
View File

@@ -3,7 +3,10 @@ package dev.sheldan.abstracto.utility.config.features;
import dev.sheldan.abstracto.core.config.FeatureEnum;
import dev.sheldan.abstracto.core.config.FeatureConfig;
import dev.sheldan.abstracto.core.config.PostTargetEnum;
import dev.sheldan.abstracto.core.service.FeatureValidator;
import dev.sheldan.abstracto.utility.StarboardFeatureValidator;
import dev.sheldan.abstracto.utility.config.posttargets.StarboardPostTarget;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.Arrays;
@@ -12,6 +15,9 @@ import java.util.List;
@Component
public class StarboardFeature implements FeatureConfig {
@Autowired
private StarboardFeatureValidator starboardFeatureValidator;
@Override
public FeatureEnum getFeature() {
return UtilityFeature.STARBOARD;
@@ -21,4 +27,9 @@ public class StarboardFeature implements FeatureConfig {
public List<PostTargetEnum> getRequiredPostTargets() {
return Arrays.asList(StarboardPostTarget.STARBOARD);
}
@Override
public List<FeatureValidator> getAdditionalFeatureValidators() {
return Arrays.asList(starboardFeatureValidator);
}
}