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

[AB-69] adding additional info to userInfo command

Browse Source
This commit is contained in:
Sheldan
2022-08-27 14:44:46 +02:00
parent 9a0bff154b
commit a43725df39
3 changed files with 64 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
abstracto-application/abstracto-modules/utility/utility-impl/src/main/java/dev/sheldan/abstracto/utility/command/UserInfo.java
View File

@@ -12,6 +12,8 @@ import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParame
import dev.sheldan.abstracto.core.config.FeatureDefinition;
import dev.sheldan.abstracto.core.exception.EntityGuildMismatchException;
import dev.sheldan.abstracto.core.interaction.InteractionService;
import dev.sheldan.abstracto.core.models.template.display.MemberNameDisplay;
import dev.sheldan.abstracto.core.models.template.display.RoleDisplay;
import dev.sheldan.abstracto.core.service.ChannelService;
import dev.sheldan.abstracto.core.service.MemberService;
import dev.sheldan.abstracto.core.utils.FutureUtils;
@@ -19,6 +21,7 @@ import dev.sheldan.abstracto.utility.config.UtilityFeatureDefinition;
import dev.sheldan.abstracto.utility.config.UtilitySlashCommandNames;
import dev.sheldan.abstracto.utility.model.UserInfoModel;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.entities.Activity;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.MessageChannel;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
@@ -30,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
@Component
@@ -67,16 +71,12 @@ public class UserInfo extends AbstractConditionableCommand {
if(!memberToShow.hasTimeJoined()) {
log.info("Force reloading member {} in guild {} for user info.", memberToShow.getId(), memberToShow.getGuild().getId());
return memberService.forceReloadMember(memberToShow).thenCompose(member -> {
model.setMemberInfo(member);
model.setCreationDate(member.getTimeCreated().toInstant());
model.setJoinDate(member.getTimeJoined().toInstant());
fillUserInfoModel(model, member);
return self.sendResponse(commandContext.getChannel(), model)
.thenApply(aVoid -> CommandResult.fromIgnored());
});
} else {
model.setMemberInfo(memberToShow);
model.setCreationDate(memberToShow.getTimeCreated().toInstant());
model.setJoinDate(memberToShow.getTimeJoined().toInstant());
fillUserInfoModel(model, memberToShow);
return self.sendResponse(commandContext.getChannel(), model)
.thenApply(aVoid -> CommandResult.fromIgnored());
}
@@ -109,21 +109,32 @@ public class UserInfo extends AbstractConditionableCommand {
if(!memberToShow.hasTimeJoined()) {
log.info("Force reloading member {} in guild {} for user info.", memberToShow.getId(), memberToShow.getGuild().getId());
return memberService.forceReloadMember(memberToShow).thenCompose(member -> {
model.setMemberInfo(member);
model.setCreationDate(member.getTimeCreated().toInstant());
model.setJoinDate(member.getTimeJoined().toInstant());
fillUserInfoModel(model, member);
return self.sendResponse(event, model)
.thenApply(aVoid -> CommandResult.fromIgnored());
});
} else {
model.setMemberInfo(memberToShow);
model.setCreationDate(memberToShow.getTimeCreated().toInstant());
model.setJoinDate(memberToShow.getTimeJoined().toInstant());
fillUserInfoModel(model, memberToShow);
return self.sendResponse(event, model)
.thenApply(aVoid -> CommandResult.fromIgnored());
}
}
private void fillUserInfoModel(UserInfoModel model, Member member) {
model.setCreationDate(member.getTimeCreated().toInstant());
model.setJoinDate(member.getTimeJoined().toInstant());
model.setId(member.getIdLong());
model.setMemberDisplay(MemberNameDisplay.fromMember(member));
model.setOnlineStatus(member.getOnlineStatus().getKey());
member.getRoles().forEach(role -> model.getRoles().add(RoleDisplay.fromRole(role)));
member.getActivities().forEach(activity -> model.getActivities().add(activity.getType().name()));
Optional<Activity> customStatusOptional = member.getActivities().stream().filter(activity -> activity.getType().equals(Activity.ActivityType.CUSTOM_STATUS)).findFirst();
customStatusOptional.ifPresent(activity -> {
model.setCustomStatus(activity.getName());
model.setCustomEmoji(activity.getEmoji() != null ? activity.getEmoji().getAsMention() : null);
});
}
@Override
public CommandConfiguration getConfiguration() {
List<Parameter> parameters = new ArrayList<>();

15
abstracto-application/abstracto-modules/utility/utility-int/src/main/java/dev/sheldan/abstracto/utility/model/UserInfoModel.java
View File

@@ -1,17 +1,28 @@
package dev.sheldan.abstracto.utility.model;
import dev.sheldan.abstracto.core.models.template.display.MemberNameDisplay;
import dev.sheldan.abstracto.core.models.template.display.RoleDisplay;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.entities.Member;
import java.time.Instant;
import java.util.ArrayList;
import java.util.List;
@Getter
@Setter
@Builder
public class UserInfoModel {
private Member memberInfo;
private Long id;
private MemberNameDisplay memberDisplay;
private String onlineStatus;
@Builder.Default
private List<String> activities = new ArrayList<>();
private String customStatus;
private String customEmoji;
@Builder.Default
private List<RoleDisplay> roles = new ArrayList<>();
private Instant joinDate;
private Instant creationDate;
}

28
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/template/display/MemberNameDisplay.java Normal file
View File

@@ -0,0 +1,28 @@
package dev.sheldan.abstracto.core.models.template.display;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.entities.Member;
@Getter
@Setter
@Builder
public class MemberNameDisplay {
private String userName;
private String nickname;
private String discriminator;
private String userAvatarUrl;
private String memberAvatarUrl;
public static MemberNameDisplay fromMember(Member member) {
return MemberNameDisplay
.builder()
.memberAvatarUrl(member.getAvatarUrl())
.nickname(member.getNickname())
.userName(member.getUser().getName())
.userAvatarUrl(member.getUser().getAvatarUrl())
.discriminator(member.getUser().getDiscriminator())
.build();
}
}