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

[AB-xxx] changing the structure of starboard post model

Browse Source
This commit is contained in:
Sheldan
2025-11-22 15:28:00 +01:00
parent d293d764db
commit c791c063e3
8 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/command/CommandReceivedHandler.java
View File

@@ -426,7 +426,7 @@ public class CommandReceivedHandler extends ListenerAdapter {
Parameter param = parameters.get(0);
CommandParameterIterators iterators = new CommandParameterIterators(channelIterator, emoteIterator, memberIterator, roleIterator);
Set<CommandParameterHandler> usedParameterHandler = findNecessaryCommandParameterHandlers(parameters, unParsedCommandParameter);
List<CompletableFuture> futures = new ArrayList<>();
List<CompletableFuture<?>> futures = new ArrayList<>();
// the actual parameters which were handled, might not coincide with the unparsed parameters
// because we might ignore some parameters (for example referenced messages) in case the command does not use this as a parameter
int parsedParameter = 0;
@@ -443,7 +443,7 @@ public class CommandReceivedHandler extends ListenerAdapter {
.getDependentFeatures()
.stream()
.map(s -> featureConfigService.getFeatureEnum(s))
.collect(Collectors.toList());
.toList();
boolean parameterActiveForFeatures = false;
for (FeatureDefinition featureDefinition : featureDefinitions) {
if(featureFlagService.getFeatureFlagValue(featureDefinition, message.getGuild().getIdLong())) {
@@ -460,7 +460,7 @@ public class CommandReceivedHandler extends ListenerAdapter {
try {
if (handler.handles(param.getType(), value)) {
if (handler.async()) {
CompletableFuture future = handler.handleAsync(value, iterators, param, message, command);
CompletableFuture<?> future = handler.handleAsync(value, iterators, param, message, command);
futures.add(future);
parsedParameters.add(ParseResult.builder().parameter(param).result(future).build());
} else {
@@ -488,11 +488,11 @@ public class CommandReceivedHandler extends ListenerAdapter {
combinedFuture.thenAccept(aVoid -> {
List<Object> allParamResults = parsedParameters.stream().map(o -> {
if (o.getResult() instanceof CompletableFuture) {
return ((CompletableFuture) o.getResult()).join();
return ((CompletableFuture<?>) o.getResult()).join();
} else {
return o.getResult();
}
}).collect(Collectors.toList());
}).toList();
List<ParseResult> parseResults = new ArrayList<>();
for (int i = 0; i < allParamResults.size(); i++) {
if (allParamResults.get(i) != null) {

2
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/CacheEntityServiceBean.java
View File

@@ -232,7 +232,7 @@ public class CacheEntityServiceBean implements CacheEntityService {
List<CompletableFuture<CachedReactions>> reactionFutures = new ArrayList<>();
log.debug("Caching {} reactions.", message.getReactions().size());
message.getReactions().forEach(messageReaction -> reactionFutures.add(getCachedReactionFromReaction(messageReaction)));
List<CompletableFuture> allFutures = new ArrayList<>(reactionFutures);
List<CompletableFuture<?>> allFutures = new ArrayList<>(reactionFutures);
allFutures.add(referencedMessageFuture);
FutureUtils.toSingleFuture(allFutures).thenAccept(aVoid ->
{

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

@@ -14,6 +14,7 @@ import net.dv8tion.jda.api.entities.Member;
@Builder
public class MemberDisplay {
private String memberMention;
private String avatarUrl;
private String name;
private Long userId;
private String discriminator;
@@ -25,6 +26,7 @@ public class MemberDisplay {
.memberMention(member.getAsMention())
.name(member.getEffectiveName())
.discriminator(member.getUser().getDiscriminator())
.avatarUrl(member.getEffectiveAvatarUrl())
.serverId(member.getGuild().getIdLong())
.userId(member.getIdLong())
.build();

4
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/template/display/UserDisplay.java
View File

@@ -15,13 +15,15 @@ public class UserDisplay {
private String userMention;
private String discriminator;
private String name;
private String globalName;
private String avatarUrl;
public static UserDisplay fromUser(User user) {
return UserDisplay
.builder()
.userMention(MemberUtils.getUserAsMention(user.getIdLong()))
.userMention(user.getAsMention())
.name(user.getEffectiveName())
.globalName(user.getGlobalName())
.discriminator(user.getDiscriminator())
.id(user.getIdLong())
.avatarUrl(user.getEffectiveAvatarUrl())

2
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/utils/FutureUtils.java
View File

@@ -12,7 +12,7 @@ public class FutureUtils {
return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
}
public static CompletableFuture<Void> toSingleFuture(List<CompletableFuture> futures) {
public static CompletableFuture<Void> toSingleFuture(List<CompletableFuture<?>> futures) {
return CompletableFuture.allOf(futures.toArray(new CompletableFuture[0]));
}
}