Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-04-18 04:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AB-137] fixing occurrences for templates in cases entities do not exist anymore

Browse Source 
fixing feature mode retrieval to adapt to lowercase
fixing disable exp role creation and retrieval
removing ansible code
This commit is contained in:
Sheldan
2021-03-09 21:33:51 +01:00
parent d0c06538e3
commit e780b0e75c
29 changed files with 200 additions and 909 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/commands/channels/ListChannelGroups.java
View File

@@ -59,14 +59,12 @@ public class ListChannelGroups extends AbstractConditionableCommand {
List<ChannelGroupChannelModel> convertedChannels = new ArrayList<>();
group.getChannels().forEach(channel -> {
Optional<TextChannel> textChannelInGuild = channelService.getTextChannelFromServerOptional(channel.getServer().getId(), channel.getId());
if(textChannelInGuild.isPresent()) {
ChannelGroupChannelModel convertedChannel = ChannelGroupChannelModel
.builder()
.channel(channel)
.discordChannel(textChannelInGuild.get())
.build();
convertedChannels.add(convertedChannel);
}
ChannelGroupChannelModel convertedChannel = ChannelGroupChannelModel
.builder()
.channel(channel)
.discordChannel(textChannelInGuild.orElse(null))
.build();
convertedChannels.add(convertedChannel);
});
ChannelGroupModel channelGroup = ChannelGroupModel
.builder()

4
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/management/DefaultFeatureModeManagementBean.java
View File

@@ -41,11 +41,11 @@ public class DefaultFeatureModeManagementBean implements DefaultFeatureModeManag
public Optional<FeatureModeProperty> getFeatureModeOptional(AFeature feature, String mode) {
return Optional.ofNullable(defaultConfigProperties
.getFeatureModes()
.get(mode));
.get(mode.toLowerCase()));
}
@Override
public FeatureModeProperty getFeatureMode(AFeature feature, String mode) {
return getFeatureModeOptional(feature, mode).orElseThrow(() -> new FeatureModeNotFoundException(mode, featureConfigService.getFeatureModesFromFeatureAsString(feature.getKey())));
return getFeatureModeOptional(feature, mode.toLowerCase()).orElseThrow(() -> new FeatureModeNotFoundException(mode, featureConfigService.getFeatureModesFromFeatureAsString(feature.getKey())));
}
}

2
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/FutureMemberPair.java
View File

@@ -14,4 +14,6 @@ import java.util.concurrent.CompletableFuture;
public class FutureMemberPair {
private CompletableFuture<Member> firstMember;
private CompletableFuture<Member> secondMember;
private ServerUser firstUser;
private ServerUser secondUser;
}

8
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/ServerUser.java
View File

@@ -1,5 +1,6 @@
package dev.sheldan.abstracto.core.models;
import dev.sheldan.abstracto.core.models.database.AUserInAServer;
import lombok.Builder;
import lombok.EqualsAndHashCode;
import lombok.Getter;
@@ -12,4 +13,11 @@ import lombok.Setter;
public class ServerUser {
private Long serverId;
private Long userId;
public static ServerUser fromAUserInAServer(AUserInAServer aUserInAServer) {
return ServerUser
.builder()
.serverId(aUserInAServer.getServerReference().getId())
.userId(aUserInAServer.getUserReference().getId()).build();
}
}