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

abstracto-application/abstracto-modules/experience-tracking/experience-tracking-impl/src/main/java/dev/sheldan/abstracto/experience/command/LeaderBoardCommand.java

@@ -97,7 +97,7 @@ public class LeaderBoardCommand extends AbstractConditionableCommand {
         } else {
             leaderBoard = userExperienceService.findLeaderBoardData(server, page);
         }
-        List<CompletableFuture> futures = new ArrayList<>();
+        List<CompletableFuture<?>> futures = new ArrayList<>();
         CompletableFuture<List<LeaderBoardEntryModel>> completableFutures = converter.fromLeaderBoard(leaderBoard, actorUser.getGuild().getIdLong());
         futures.add(completableFutures);
         log.info("Rendering leaderboard for page {} in server {} for user {}.", page, actorUser.getId(), actorUser.getGuild().getId());

abstracto-application/abstracto-modules/starboard/starboard-impl/src/main/java/dev/sheldan/abstracto/starboard/service/StarboardServiceBean.java

@@ -8,6 +8,8 @@ import dev.sheldan.abstracto.core.models.database.AChannel;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import dev.sheldan.abstracto.core.models.database.PostTarget;
 import dev.sheldan.abstracto.core.models.property.SystemConfigProperty;
+import dev.sheldan.abstracto.core.models.template.display.MemberDisplay;
+import dev.sheldan.abstracto.core.models.template.display.UserDisplay;
 import dev.sheldan.abstracto.core.service.*;
 import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
 import dev.sheldan.abstracto.core.service.management.DefaultConfigManagementService;
@@ -148,22 +150,43 @@ public class StarboardServiceBean implements StarboardService {
 
 
     private CompletableFuture<StarboardPostModel> buildStarboardPostModel(CachedMessage message, Integer starCount)  {
-        return userService.retrieveUserForId(message.getAuthor().getAuthorId())
+        CompletableFuture<User> userFuture = userService.retrieveUserForId(message.getAuthor().getAuthorId());
-        .thenApply(user -> createStarboardModel(message, starCount, user))
+        CompletableFuture<Member> memberFuture = memberService.retrieveMemberInServer(message.getAuthorAsServerUser());
+        CompletableFuture<StarboardPostModel> returnedFuture = new CompletableFuture<>();
+        FutureUtils.toSingleFuture(List.of(userFuture, memberFuture))
+        .whenComplete((any, error) -> {
+            User user = null;
+            if(!userFuture.isCompletedExceptionally()) {
+                user = userFuture.join();
+            } else {
+                log.warn("Failed to retrieve user for author {} of starboard post.", message.getAuthor().getAuthorId());
+            }
+            Member member = null;
+            if(!memberFuture.isCompletedExceptionally()) {
+                member = memberFuture.join();
+            } else {
+                log.warn("Failed to retrieve user for author {} of starboard post.", message.getAuthor().getAuthorId());
+            }
+            StarboardPostModel starboardModel = createStarboardModel(message, starCount, user, member);
+            returnedFuture.complete(starboardModel);
+        })
         .exceptionally(throwable -> {
-            log.warn("Failed to retrieve user for author {} of starboard post.", message.getAuthor().getAuthorId(), throwable);
+            log.warn("Complete failure when handling creation starboard post of message {}.", message.getMessageId(), throwable);
-            return createStarboardModel(message, starCount, null);
+            returnedFuture.completeExceptionally(throwable);
+            return null;
         });
+        return returnedFuture;
     }
 
-    private StarboardPostModel createStarboardModel(CachedMessage message, Integer starCount, net.dv8tion.jda.api.entities.User user) {
+    private StarboardPostModel createStarboardModel(CachedMessage message, Integer starCount, net.dv8tion.jda.api.entities.User user, Member member) {
         Optional<GuildMessageChannel> channel = channelService.getMessageChannelFromServerOptional(message.getServerId(), message.getChannelId());
         Optional<Guild> guild = guildService.getGuildByIdOptional(message.getServerId());
         String starLevelEmote = getAppropriateEmote(message.getServerId(), starCount);
         return StarboardPostModel
                 .builder()
                 .message(message)
-                .author(user)
+                .authorUser(user != null ? UserDisplay.fromUser(user) : null)
+                .authorMember(member != null ? MemberDisplay.fromMember(member) : null)
                 .sourceChannelId(message.getChannelId())
                 .channel(channel.orElse(null))
                 .starCount(starCount)
@@ -214,7 +237,7 @@ public class StarboardServiceBean implements StarboardService {
         int count = 3;
         List<CompletableFuture<StarStatsUser>> topStarGiverFutures = starboardPostReactorManagementService.retrieveTopStarGiver(serverId, count);
         List<CompletableFuture<StarStatsUser>> topStarReceiverFutures = starboardPostReactorManagementService.retrieveTopStarReceiver(serverId, count);
-        List<CompletableFuture> allFutures = new ArrayList<>();
+        List<CompletableFuture<?>> allFutures = new ArrayList<>();
         allFutures.addAll(topStarGiverFutures);
         allFutures.addAll(topStarReceiverFutures);
         return FutureUtils.toSingleFuture(allFutures).thenApply(aVoid -> {

abstracto-application/abstracto-modules/starboard/starboard-int/src/main/java/dev/sheldan/abstracto/starboard/model/template/StarboardPostModel.java

@@ -2,17 +2,19 @@ package dev.sheldan.abstracto.starboard.model.template;
 
 import dev.sheldan.abstracto.core.models.cache.CachedMessage;
 import dev.sheldan.abstracto.core.models.context.ServerContext;
+import dev.sheldan.abstracto.core.models.template.display.MemberDisplay;
+import dev.sheldan.abstracto.core.models.template.display.UserDisplay;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;
-import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
 
 @Getter
 @Setter
 @SuperBuilder
 public class StarboardPostModel extends ServerContext {
-    private User author;
+    private UserDisplay authorUser;
+    private MemberDisplay authorMember;
     private GuildMessageChannel channel;
     private Long sourceChannelId;
     private CachedMessage message;

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

@@ -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) {

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

@@ -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 ->
                 {

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

@@ -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();

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

@@ -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())

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

@@ -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]));
     }
 }