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

[AB-8] upgrading to new JDA alpha version 19

Browse Source 
cleaning up imports
This commit is contained in:
Sheldan
2022-09-18 15:51:49 +02:00
parent 102209aaca
commit 4e1f9e0018
216 changed files with 682 additions and 704 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,7 +70,7 @@ public class ServerInfo extends AbstractConditionableCommand {
.build();
List<EmoteDisplay> staticEmotes = new ArrayList<>();
List<EmoteDisplay> animatedEmotes = new ArrayList<>();
guild.getEmotes().forEach(emote -> {
guild.getEmojis().forEach(emote -> {
EmoteDisplay emoteDisplay = EmoteDisplay.fromEmote(emote);
if(emote.isAnimated()) {
animatedEmotes.add(emoteDisplay);

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

@@ -5,7 +5,6 @@ import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand
import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
import dev.sheldan.abstracto.core.command.config.HelpInfo;
import dev.sheldan.abstracto.core.command.config.Parameter;
import dev.sheldan.abstracto.core.interaction.slash.SlashCommandConfig;
import dev.sheldan.abstracto.core.command.execution.CommandContext;
import dev.sheldan.abstracto.core.command.execution.CommandResult;
import dev.sheldan.abstracto.core.interaction.slash.parameter.SlashCommandParameterService;
@@ -14,11 +13,8 @@ import dev.sheldan.abstracto.core.interaction.InteractionService;
import dev.sheldan.abstracto.core.service.ChannelService;
import dev.sheldan.abstracto.core.utils.FutureUtils;
import dev.sheldan.abstracto.utility.config.UtilityFeatureDefinition;
import dev.sheldan.abstracto.utility.config.UtilitySlashCommandNames;
import dev.sheldan.abstracto.utility.model.ShowEmoteLog;
import net.dv8tion.jda.api.entities.Emoji;
import net.dv8tion.jda.api.entities.Emote;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
import net.dv8tion.jda.api.entities.emoji.CustomEmoji;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -45,7 +41,7 @@ public class ShowEmote extends AbstractConditionableCommand {
@Override
public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
List<Object> parameters = commandContext.getParameters().getParameters();
Emote emoteParameter = (Emote) parameters.get(0);
CustomEmoji emoteParameter = (CustomEmoji) parameters.get(0);
ShowEmoteLog emoteLog = ShowEmoteLog
.builder()
.emote(emoteParameter)
@@ -60,7 +56,7 @@ public class ShowEmote extends AbstractConditionableCommand {
Parameter emoteParameter = Parameter
.builder()
.name(EMOTE_PARAMETER)
.type(Emote.class)
.type(CustomEmoji.class)
.templated(true)
.build();
parameters.add(emoteParameter);

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

@@ -23,7 +23,7 @@ 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.entities.channel.middleman.MessageChannel;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
import net.dv8tion.jda.api.interactions.InteractionHook;
import net.dv8tion.jda.api.interactions.callbacks.IReplyCallback;
@@ -131,7 +131,7 @@ public class UserInfo extends AbstractConditionableCommand {
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);
model.setCustomEmoji(activity.getEmoji() != null ? activity.getEmoji().getFormatted() : null);
});
}