Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-04-20 21:29:08 +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

1
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/execution/CommandContext.java
View File

@@ -8,6 +8,7 @@ import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.entities.*;
import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
import java.util.List;

6
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/handler/CommandParameterIterators.java
View File

@@ -2,10 +2,10 @@ package dev.sheldan.abstracto.core.command.handler;
import lombok.AllArgsConstructor;
import lombok.Getter;
import net.dv8tion.jda.api.entities.Emote;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Role;
import net.dv8tion.jda.api.entities.TextChannel;
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
import net.dv8tion.jda.api.entities.emoji.CustomEmoji;
import java.util.Iterator;
@@ -13,7 +13,7 @@ import java.util.Iterator;
@AllArgsConstructor
public class CommandParameterIterators {
private Iterator<TextChannel> channelIterator;
private Iterator<Emote> emoteIterator;
private Iterator<CustomEmoji> emoteIterator;
private Iterator<Member> memberIterator;
private Iterator<Role> roleIterator;
}

2
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/command/service/ExceptionService.java
View File

@@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.command.Command;
import dev.sheldan.abstracto.core.command.execution.CommandContext;
import dev.sheldan.abstracto.core.command.execution.CommandResult;
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.message.MessageReceivedEvent;
public interface ExceptionService {

4
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/exception/EmoteNotUsableException.java
View File

@@ -2,13 +2,13 @@ package dev.sheldan.abstracto.core.exception;
import dev.sheldan.abstracto.core.models.exception.EmoteNotUsableExceptionModel;
import dev.sheldan.abstracto.core.templating.Templatable;
import net.dv8tion.jda.api.entities.Emote;
import net.dv8tion.jda.api.entities.emoji.CustomEmoji;
public class EmoteNotUsableException extends AbstractoRunTimeException implements Templatable {
private final EmoteNotUsableExceptionModel model;
public EmoteNotUsableException(Emote emote) {
public EmoteNotUsableException(CustomEmoji emote) {
super(String.format("Emote %s not usable by bot.", emote.getId()));
this.model = EmoteNotUsableExceptionModel
.builder()

2
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/interaction/ComponentService.java
View File

@@ -1,8 +1,8 @@
package dev.sheldan.abstracto.core.interaction;
import dev.sheldan.abstracto.core.interaction.button.ButtonConfigModel;
import net.dv8tion.jda.api.entities.GuildMessageChannel;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
import net.dv8tion.jda.api.interactions.components.ActionComponent;
import net.dv8tion.jda.api.interactions.components.ActionRow;
import net.dv8tion.jda.api.interactions.components.Component;

1
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/interaction/InteractionCommandService.java
View File

@@ -3,7 +3,6 @@ package dev.sheldan.abstracto.core.interaction;
import dev.sheldan.abstracto.core.command.config.CommandConfiguration;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.interactions.commands.Command;
import net.dv8tion.jda.api.interactions.commands.build.CommandData;
import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
import org.springframework.data.util.Pair;

2
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/interaction/slash/parameter/SlashCommandParameterService.java
View File

@@ -2,7 +2,7 @@ package dev.sheldan.abstracto.core.interaction.slash.parameter;
import dev.sheldan.abstracto.core.models.database.AEmote;
import net.dv8tion.jda.api.entities.Emoji;
import net.dv8tion.jda.api.entities.emoji.Emoji;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
import net.dv8tion.jda.api.interactions.commands.OptionType;

2
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/interactive/InteractiveUtils.java
View File

@@ -2,7 +2,7 @@ package dev.sheldan.abstracto.core.interactive;
import dev.sheldan.abstracto.core.service.ChannelService;
import dev.sheldan.abstracto.core.templating.service.TemplateService;
import net.dv8tion.jda.api.entities.GuildMessageChannel;
import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

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

@@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.models.database.AChannel;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.entities.Channel;
import net.dv8tion.jda.api.entities.channel.Channel;
import java.io.Serializable;

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

@@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.models.database.AEmote;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.entities.Emote;
import net.dv8tion.jda.api.entities.emoji.CustomEmoji;
import java.io.Serializable;
@@ -13,7 +13,7 @@ import java.io.Serializable;
@Builder
public class FullEmote implements Serializable {
private AEmote fakeEmote;
private transient Emote emote;
private transient CustomEmoji emote;
public String getEmoteRepr() {
if(!fakeEmote.getCustom()) {

1
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/GuildChannelMember.java
View File

@@ -4,6 +4,7 @@ import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.entities.*;
import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
@Getter
@Setter

1
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/GuildMemberMessageChannel.java
View File

@@ -4,6 +4,7 @@ import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.entities.*;
import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
@Getter
@Setter

4
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/context/SlimUserInitiatedServerContext.java
View File

@@ -1,17 +1,19 @@
package dev.sheldan.abstracto.core.models.context;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.experimental.SuperBuilder;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.MessageChannel;
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
@Getter
@NoArgsConstructor
@Setter
@SuperBuilder
@AllArgsConstructor
public class SlimUserInitiatedServerContext extends SlimServerContext {
private MessageChannel channel;
private Member member;

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

@@ -7,7 +7,7 @@ import lombok.Setter;
import lombok.experimental.SuperBuilder;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.MessageChannel;
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
@Getter
@NoArgsConstructor

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

@@ -1,6 +1,6 @@
package dev.sheldan.abstracto.core.models.database;
import net.dv8tion.jda.api.entities.ChannelType;
import net.dv8tion.jda.api.entities.channel.ChannelType;
public enum AChannelType {
TEXT, DM, VOICE, NEWS, CATEGORY, UNKNOWN, NEWS_THREAD, PUBLIC_THREAD, PRIVATE_THREAD, STAGE;

4
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/exception/EmoteNotUsableExceptionModel.java
View File

@@ -2,12 +2,12 @@ package dev.sheldan.abstracto.core.models.exception;
import lombok.Builder;
import lombok.Getter;
import net.dv8tion.jda.api.entities.Emote;
import net.dv8tion.jda.api.entities.emoji.CustomEmoji;
import java.io.Serializable;
@Getter
@Builder
public class EmoteNotUsableExceptionModel implements Serializable {
private transient Emote emote;
private transient CustomEmoji emote;
}

4
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/listener/EmoteCreatedModel.java
View File

@@ -4,14 +4,14 @@ import dev.sheldan.abstracto.core.listener.FeatureAwareListenerModel;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.entities.Emote;
import net.dv8tion.jda.api.entities.emoji.RichCustomEmoji;
@Getter
@Setter
@Builder
public class EmoteCreatedModel implements FeatureAwareListenerModel {
private Emote emote;
private RichCustomEmoji emote;
@Override
public Long getServerId() {

4
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/listener/EmoteDeletedModel.java
View File

@@ -4,13 +4,13 @@ import dev.sheldan.abstracto.core.listener.FeatureAwareListenerModel;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.entities.Emote;
import net.dv8tion.jda.api.entities.emoji.RichCustomEmoji;
@Getter
@Setter
@Builder
public class EmoteDeletedModel implements FeatureAwareListenerModel {
private Emote emote;
private RichCustomEmoji emote;
@Override
public Long getServerId() {

4
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/listener/EmoteNameUpdatedModel.java
View File

@@ -4,14 +4,14 @@ import dev.sheldan.abstracto.core.listener.FeatureAwareListenerModel;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.entities.Emote;
import net.dv8tion.jda.api.entities.emoji.RichCustomEmoji;
@Getter
@Setter
@Builder
public class EmoteNameUpdatedModel implements FeatureAwareListenerModel {
private Emote emote;
private RichCustomEmoji emote;
private String newValue;
private String oldValue;

4
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/listener/ReactionClearedModel.java
View File

@@ -5,8 +5,8 @@ import dev.sheldan.abstracto.core.models.cache.CachedMessage;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.entities.Channel;
import net.dv8tion.jda.api.entities.GuildChannel;
import net.dv8tion.jda.api.entities.channel.Channel;
import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
@Getter
@Setter

4
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/listener/TextChannelCreatedModel.java
View File

@@ -4,8 +4,8 @@ import dev.sheldan.abstracto.core.listener.FeatureAwareListenerModel;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.entities.Channel;
import net.dv8tion.jda.api.entities.GuildChannel;
import net.dv8tion.jda.api.entities.channel.Channel;
import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
@Getter
@Setter

4
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/listener/TextChannelDeletedModel.java
View File

@@ -4,8 +4,8 @@ import dev.sheldan.abstracto.core.listener.FeatureAwareListenerModel;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.entities.Channel;
import net.dv8tion.jda.api.entities.GuildChannel;
import net.dv8tion.jda.api.entities.channel.Channel;
import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
@Getter
@Setter

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

@@ -4,8 +4,8 @@ import dev.sheldan.abstracto.core.listener.FeatureAwareListenerModel;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.entities.AudioChannel;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel;
@Getter
@Setter

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

@@ -4,8 +4,8 @@ import dev.sheldan.abstracto.core.listener.FeatureAwareListenerModel;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.entities.AudioChannel;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel;
@Getter
@Setter

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

@@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.models.database.AChannel;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.entities.MessageChannel;
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
@Getter
@Setter

1
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/models/template/commands/FeatureModeDisplay.java
View File

@@ -1,7 +1,6 @@
package dev.sheldan.abstracto.core.models.template.commands;
import dev.sheldan.abstracto.core.config.FeatureConfig;
import dev.sheldan.abstracto.core.models.database.AFeatureMode;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;

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

@@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.models.database.PostTarget;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.entities.MessageChannel;
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
@Getter
@Setter

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

@@ -3,7 +3,7 @@ package dev.sheldan.abstracto.core.models.template.commands;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.entities.MessageChannel;
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
@Getter
@Setter

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

@@ -3,8 +3,8 @@ package dev.sheldan.abstracto.core.models.template.display;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.entities.GuildMessageChannel;
import net.dv8tion.jda.api.entities.TextChannel;
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
@Getter
@Setter

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

@@ -3,7 +3,7 @@ package dev.sheldan.abstracto.core.models.template.display;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.entities.Emote;
import net.dv8tion.jda.api.entities.emoji.CustomEmoji;
@Getter
@Builder
@@ -16,7 +16,7 @@ public class EmoteDisplay {
private Boolean animated;
private String imageUrl;
public static EmoteDisplay fromEmote(Emote emote) {
public static EmoteDisplay fromEmote(CustomEmoji emote) {
return EmoteDisplay
.builder()
.emoteId(emote.getIdLong())

2
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/service/AllowedMentionService.java
View File

@@ -3,7 +3,7 @@ package dev.sheldan.abstracto.core.service;
import dev.sheldan.abstracto.core.models.database.AllowedMention;
import dev.sheldan.abstracto.core.templating.model.MessageToSend;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.MessageChannel;
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
import java.util.Set;

6
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/service/CacheEntityService.java
View File

@@ -2,13 +2,15 @@ package dev.sheldan.abstracto.core.service;
import dev.sheldan.abstracto.core.models.cache.*;
import net.dv8tion.jda.api.entities.*;
import net.dv8tion.jda.api.entities.emoji.CustomEmoji;
import net.dv8tion.jda.api.entities.emoji.Emoji;
import java.util.List;
import java.util.concurrent.CompletableFuture;
public interface CacheEntityService {
CachedEmote getCachedEmoteFromEmote(Emote emote, Guild guild);
CachedEmote getCachedEmoteFromEmote(MessageReaction.ReactionEmote emote, Guild guild);
CachedEmote getCachedEmoteFromEmote(CustomEmoji emote, Guild guild);
CachedEmote getCachedEmoteFromEmote(Emoji emote, Guild guild);
CachedAttachment getCachedAttachment(Message.Attachment attachment);
CachedEmbed getCachedEmbedFromEmbed(MessageEmbed embed);
List<CachedAttachment> getCachedAttachments(List<Message.Attachment> attachments);

4
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/service/ChannelGroupService.java
View File

@@ -4,8 +4,8 @@ import dev.sheldan.abstracto.core.models.database.AChannel;
import dev.sheldan.abstracto.core.models.database.AChannelGroup;
import dev.sheldan.abstracto.core.models.database.ChannelGroupType;
import dev.sheldan.abstracto.core.models.template.commands.ChannelGroupModel;
import net.dv8tion.jda.api.entities.GuildChannel;
import net.dv8tion.jda.api.entities.TextChannel;
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
import java.util.List;

8
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/service/ChannelService.java
View File

@@ -4,7 +4,11 @@ import dev.sheldan.abstracto.core.models.database.AChannel;
import dev.sheldan.abstracto.core.models.database.AServer;
import dev.sheldan.abstracto.core.templating.model.MessageToSend;
import net.dv8tion.jda.api.entities.*;
import net.dv8tion.jda.api.requests.restaction.MessageAction;
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
import net.dv8tion.jda.api.requests.restaction.MessageCreateAction;
import java.util.List;
import java.util.Optional;
@@ -19,7 +23,7 @@ public interface ChannelService {
CompletableFuture<Message> sendTextToChannel(String text, MessageChannel channel);
CompletableFuture<Message> sendEmbedToAChannel(MessageEmbed embed, AChannel channel);
CompletableFuture<Message> sendEmbedToChannel(MessageEmbed embed, MessageChannel channel);
MessageAction sendEmbedToChannelInComplete(MessageEmbed embed, MessageChannel channel);
MessageCreateAction sendEmbedToChannelInComplete(MessageEmbed embed, MessageChannel channel);
List<CompletableFuture<Message>> sendMessageEmbedToSendToAChannel(MessageToSend messageToSend, AChannel channel);
CompletableFuture<Message> sendMessageEmbedToSendToAChannel(MessageToSend messageToSend, AChannel channel, Integer embedIndex);

21
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/service/EmoteService.java
View File

@@ -4,33 +4,32 @@ import dev.sheldan.abstracto.core.models.cache.CachedEmote;
import dev.sheldan.abstracto.core.models.cache.CachedMessage;
import dev.sheldan.abstracto.core.models.cache.CachedReactions;
import dev.sheldan.abstracto.core.models.database.AEmote;
import net.dv8tion.jda.api.entities.Emoji;
import net.dv8tion.jda.api.entities.Emote;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.MessageReaction;
import net.dv8tion.jda.api.entities.emoji.CustomEmoji;
import net.dv8tion.jda.api.entities.emoji.Emoji;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
public interface EmoteService {
boolean isEmoteUsableByBot(Emote emote);
AEmote buildAEmoteFromReaction(MessageReaction.ReactionEmote reaction);
boolean isEmoteUsableByBot(CustomEmoji emote);
AEmote buildAEmoteFromReaction(Emoji reaction);
String getEmoteAsMention(AEmote emote, Long serverId, String defaultText);
String getEmoteAsMention(AEmote emote, Long serverId);
String getUsableEmoteOrDefault(Long serverId, String name);
void throwIfEmoteDoesNotExist(String emoteKey, Long serverId);
AEmote getEmoteOrDefaultEmote(String emoteKey, Long serverId);
String getDefaultEmote(String emoteKey);
boolean isReactionEmoteAEmote(MessageReaction.ReactionEmote reaction, AEmote storedEmote);
boolean isReactionEmoteAEmote(Emoji reaction, AEmote storedEmote);
Optional<CachedReactions> getReactionFromMessageByEmote(CachedMessage message, AEmote emote);
boolean compareAEmote(AEmote a, AEmote b);
boolean compareCachedEmoteWithAEmote(CachedEmote a, AEmote b);
AEmote getFakeEmote(Object object);
AEmote getFakeEmoteFromEmote(Emote emote);
AEmote getFakeEmoteFromEmote(CustomEmoji emote);
AEmote getFakeEmoteFromEmoji(Emoji emoji);
boolean emoteIsFromGuild(Emote emote, Guild guild);
CompletableFuture<Emote> getEmoteFromCachedEmote(CachedEmote cachedEmote);
boolean emoteIsFromGuild(CustomEmoji emote, Guild guild);
CompletableFuture<CustomEmoji> getEmoteFromCachedEmote(CachedEmote cachedEmote);
Optional<Emote> getEmote(Long serverId, AEmote emote);
Optional<Emote> getEmote(AEmote emote);
Optional<CustomEmoji> getEmote(Long serverId, AEmote emote);
Optional<Emoji> getEmote(AEmote emote);
}

8
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/service/MessageService.java
View File

@@ -6,12 +6,12 @@ import dev.sheldan.abstracto.core.models.database.AChannel;
import dev.sheldan.abstracto.core.models.database.AUserInAServer;
import dev.sheldan.abstracto.core.templating.model.MessageToSend;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.MessageChannel;
import net.dv8tion.jda.api.entities.MessageEmbed;
import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
import net.dv8tion.jda.api.interactions.components.ActionRow;
import net.dv8tion.jda.api.requests.restaction.AuditableRestAction;
import net.dv8tion.jda.api.requests.restaction.MessageAction;
import net.dv8tion.jda.api.requests.restaction.MessageEditAction;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@@ -38,8 +38,8 @@ public interface MessageService {
CompletableFuture<Message> loadMessage(Long serverId, Long channelId, Long messageId);
CompletableFuture<Message> loadMessage(Message message);
CompletableFuture<Message> editMessageWithNewTemplate(Message message, String templateKey, Object model);
MessageAction editMessage(Message message, MessageEmbed messageEmbed);
MessageAction editMessage(Message message, String text, MessageEmbed messageEmbed);
MessageEditAction editMessage(Message message, MessageEmbed messageEmbed);
MessageEditAction editMessage(Message message, String text, MessageEmbed messageEmbed);
AuditableRestAction<Void> deleteMessageWithAction(Message message);
CompletableFuture<Void> deleteMessage(Message message);
CompletableFuture<Void> editMessageWithActionRows(Message message, List<ActionRow> rows);

2
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/service/PaginatorService.java
View File

@@ -1,7 +1,7 @@
package dev.sheldan.abstracto.core.service;
import net.dv8tion.jda.api.entities.GuildMessageChannel;
import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
import net.dv8tion.jda.api.interactions.callbacks.IReplyCallback;
import java.util.concurrent.CompletableFuture;

13
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/service/ReactionService.java
View File

@@ -7,6 +7,7 @@ import dev.sheldan.abstracto.core.models.cache.CachedReaction;
import dev.sheldan.abstracto.core.models.database.AEmote;
import dev.sheldan.abstracto.core.utils.CompletableFutureList;
import net.dv8tion.jda.api.entities.*;
import net.dv8tion.jda.api.entities.emoji.Emoji;
import java.util.List;
import java.util.concurrent.CompletableFuture;
@@ -24,21 +25,21 @@ public interface ReactionService {
CompletableFuture<Void> addReactionToMessageAsync(String emoteKey, Guild guild, Message message);
CompletableFuture<Void> addReactionToMessageAsync(AEmote emote, Long serverId, Message message);
CompletableFuture<Void> addReactionToMessageAsync(AEmote emote, Guild guild, Message message);
CompletableFuture<Void> addReactionToMessageAsync(Emote emote,Message message);
CompletableFuture<Void> addReactionToMessageAsync(Emoji emote, Message message);
CompletableFuture<Void> addReactionToMessageAsync(Long emoteId, Long serverId, Message message);
CompletableFuture<Void> addReactionToMessageAsync(String emoteKey, Long serverId, Long channelId, Long messageId);
CompletableFuture<Void> removeReaction(Message message, String key);
CompletableFuture<Void> removeReaction(Message message, String key, User user);
CompletableFuture<Void> removeReaction(Message message, Emote emoteById);
CompletableFuture<Void> removeReaction(Message message, Emote emoteById, User user);
CompletableFuture<Void> removeReaction(Message message, Emoji emoteById);
CompletableFuture<Void> removeReaction(Message message, Emoji emoteById, User user);
CompletableFuture<Void> removeReaction(Message message, CachedEmote cachedEmote, User user);
CompletableFuture<Void> removeReaction(CachedMessage message, CachedEmote cachedEmote, ServerUser user);
CompletableFuture<Void> removeReactionFromMessageWithFuture(AEmote emote, Message message);
CompletableFuture<Void> removeReactionFromMessageWithFuture(MessageReaction.ReactionEmote emote, Message message);
CompletableFuture<Void> removeReactionFromMessageWithFuture(MessageReaction.ReactionEmote emote, Message message, User user);
CompletableFuture<Void> removeReactionFromMessageWithFuture(Emoji emote, Message message);
CompletableFuture<Void> removeReactionFromMessageWithFuture(Emoji emote, Message message, User user);
CompletableFuture<Void> clearReactionFromMessageWithFuture(AEmote emote, Message message);
CompletableFuture<Void> clearReaction(Message message, String key);
CompletableFuture<Void> clearReaction(Message message, Emote emote);
CompletableFuture<Void> clearReaction(Message message, Emoji emote);
CompletableFuture<Void> removeReactionFromMessageWithFuture(Integer emoteId, Message message);
CompletableFuture<Void> clearReactionFromMessageWithFuture(Integer emoteId, Message message);
CompletableFuture<Void> removeReactionFromMessageWithFuture(AEmote emote, Long serverId, Long channelId, Long messageId);

2
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/service/management/ChannelManagementService.java
View File

@@ -3,7 +3,7 @@ package dev.sheldan.abstracto.core.service.management;
import dev.sheldan.abstracto.core.models.database.AChannel;
import dev.sheldan.abstracto.core.models.database.AChannelType;
import dev.sheldan.abstracto.core.models.database.AServer;
import net.dv8tion.jda.api.entities.Channel;
import net.dv8tion.jda.api.entities.channel.Channel;
import java.util.Optional;

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

@@ -2,7 +2,7 @@ package dev.sheldan.abstracto.core.service.management;
import dev.sheldan.abstracto.core.models.database.AEmote;
import dev.sheldan.abstracto.core.models.database.AServer;
import net.dv8tion.jda.api.entities.Emote;
import net.dv8tion.jda.api.entities.emoji.CustomEmoji;
import java.util.Optional;
@@ -17,7 +17,7 @@ public interface EmoteManagementService {
Optional<AEmote> loadEmoteByName(String name, Long serverId);
Optional<AEmote> loadEmoteByName(String name, AServer server);
AEmote setEmoteToCustomEmote(String name, String emoteKey, Long emoteId, Boolean animated, Long serverId);
AEmote setEmoteToCustomEmote(String name, Emote emote, Long serverId);
AEmote setEmoteToCustomEmote(String name, CustomEmoji emote, Long serverId);
AEmote setEmoteToDefaultEmote(String name, String emoteKey, Long serverId);
AEmote setEmoteToAEmote(String name, AEmote emote, Long serverId);
AEmote createEmote(String name, AEmote emote, Long serverId, boolean validateName);

13
abstracto-application/core/core-int/src/main/java/dev/sheldan/abstracto/core/templating/model/AttachedFile.java
View File

@@ -3,10 +3,9 @@ package dev.sheldan.abstracto.core.templating.model;
import lombok.Builder;
import lombok.Getter;
import lombok.Setter;
import net.dv8tion.jda.api.utils.AttachmentOption;
import net.dv8tion.jda.api.utils.FileUpload;
import java.io.File;
import java.util.List;
@Getter
@Setter
@@ -14,5 +13,13 @@ import java.util.List;
public class AttachedFile {
private File file;
private String fileName;
private List<AttachmentOption> options;
private boolean spoiler;
public FileUpload convertToFileUpload() {
FileUpload fileUpload = FileUpload.fromData(file, fileName);
if(spoiler) {
fileUpload = fileUpload.asSpoiler();
}
return fileUpload;
}
}

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

@@ -8,7 +8,7 @@ import dev.sheldan.abstracto.core.service.MemberService;
import dev.sheldan.abstracto.core.service.management.ChannelManagementService;
import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
import lombok.extern.slf4j.Slf4j;
import net.dv8tion.jda.api.entities.GuildMessageChannel;
import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

2
abstracto-application/core/core-int/src/test/java/dev/sheldan/abstracto/core/test/command/CommandTestUtilities.java
View File

@@ -10,7 +10,7 @@ import dev.sheldan.abstracto.core.models.context.UserInitiatedServerContext;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.Member;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.TextChannel;
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
import org.junit.Assert;
import org.mockito.Mockito;