From ce2c35f4bd050cc38436007ccf9aaecfd636f26e Mon Sep 17 00:00:00 2001
From: Sheldan <5037282+Sheldan@users.noreply.github.com>
Date: Thu, 16 Jun 2022 17:55:13 +0200
Subject: [PATCH] [RAB-2] updating to new abstracto version
---
application/executable/pom.xml | 2 +-
application/pom.xml | 2 +-
application/sissi-modules/pom.xml | 2 +-
application/sissi-modules/quotes/pom.xml | 2 +-
.../sissi/module/quotes/service/QuoteServiceBean.java | 11 ++++-------
deployment/docker-compose/pom.xml | 2 +-
deployment/image-packaging/pom.xml | 2 +-
deployment/pom.xml | 2 +-
pom.xml | 7 ++++---
templates/pom.xml | 2 +-
templates/sissi-templates/module-templates/pom.xml | 2 +-
.../module-templates/quotes-templates/pom.xml | 2 +-
templates/sissi-templates/pom.xml | 2 +-
.../sissi-translations/module-translations/pom.xml | 2 +-
.../module-translations/quote-translations/pom.xml | 2 +-
templates/sissi-translations/pom.xml | 2 +-
16 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/application/executable/pom.xml b/application/executable/pom.xml
index d1ff38a5..98bdde16 100644
--- a/application/executable/pom.xml
+++ b/application/executable/pom.xml
@@ -3,7 +3,7 @@
dev.sheldan.sissi.application
application
- 1.0.3-SNAPSHOT
+ 1.1.0-SNAPSHOT
4.0.0
executable
diff --git a/application/pom.xml b/application/pom.xml
index f56ee41e..e370611a 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -3,7 +3,7 @@
dev.sheldan.sissi
sissi
- 1.0.3-SNAPSHOT
+ 1.1.0-SNAPSHOT
4.0.0
diff --git a/application/sissi-modules/pom.xml b/application/sissi-modules/pom.xml
index a68c1202..3f1bba42 100644
--- a/application/sissi-modules/pom.xml
+++ b/application/sissi-modules/pom.xml
@@ -3,7 +3,7 @@
dev.sheldan.sissi.application
application
- 1.0.3-SNAPSHOT
+ 1.1.0-SNAPSHOT
4.0.0
diff --git a/application/sissi-modules/quotes/pom.xml b/application/sissi-modules/quotes/pom.xml
index 5a9bee52..ff17677b 100644
--- a/application/sissi-modules/quotes/pom.xml
+++ b/application/sissi-modules/quotes/pom.xml
@@ -3,7 +3,7 @@
dev.sheldan.sissi.application
sissi-modules
- 1.0.3-SNAPSHOT
+ 1.1.0-SNAPSHOT
4.0.0
diff --git a/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/service/QuoteServiceBean.java b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/service/QuoteServiceBean.java
index feb5faf0..4bcc6768 100644
--- a/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/service/QuoteServiceBean.java
+++ b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/service/QuoteServiceBean.java
@@ -18,10 +18,7 @@ import dev.sheldan.sissi.module.quotes.model.database.Quote;
import dev.sheldan.sissi.module.quotes.model.database.QuoteAttachment;
import dev.sheldan.sissi.module.quotes.repository.QuoteRepository;
import lombok.extern.slf4j.Slf4j;
-import net.dv8tion.jda.api.entities.AbstractChannel;
-import net.dv8tion.jda.api.entities.Member;
-import net.dv8tion.jda.api.entities.TextChannel;
-import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.entities.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -127,7 +124,7 @@ public class QuoteServiceBean {
Long quoteAdderUserId = quote.getAdder().getUserReference().getId();
Long serverId = quote.getServer().getId();
Long channelId = quote.getSourceChannel().getId();
- Optional sourceChannel = channelService.getTextChannelFromServerOptional(serverId, channelId);
+ Optional sourceChannel = channelService.getMessageChannelFromServerOptional(serverId, channelId);
List userIds = Arrays.asList(quotedUserId, quoteAdderUserId);
CompletableFutureList futureList = userService.retrieveUsers(userIds);
CompletableFuture messageFuture = new CompletableFuture<>();
@@ -143,7 +140,7 @@ public class QuoteServiceBean {
}
private CompletableFuture createMessageToSend( CompletableFutureList possibleUsers, QuoteResponseModel.QuoteResponseModelBuilder modelBuilder,
- Long quotedUserId, Long quoteAdderUserId, Long serverId, Optional sourceChannel) {
+ Long quotedUserId, Long quoteAdderUserId, Long serverId, Optional sourceChannel) {
return memberService.getMembersInServerAsync(serverId, Arrays.asList(quotedUserId, quoteAdderUserId))
.thenApply(members -> {
List foundUsers = possibleUsers.getObjects();
@@ -196,7 +193,7 @@ public class QuoteServiceBean {
.map(User::getName)
.orElse(null));
String channelName = sourceChannel
- .map(AbstractChannel::getName)
+ .map(Channel::getName)
.orElse(null);
QuoteResponseModel model = modelBuilder
.adderAvatarURL(adderAvatar)
diff --git a/deployment/docker-compose/pom.xml b/deployment/docker-compose/pom.xml
index 982bf159..e7642d92 100644
--- a/deployment/docker-compose/pom.xml
+++ b/deployment/docker-compose/pom.xml
@@ -3,7 +3,7 @@
dev.sheldan.sissi
deployment
- 1.0.3-SNAPSHOT
+ 1.1.0-SNAPSHOT
4.0.0
diff --git a/deployment/image-packaging/pom.xml b/deployment/image-packaging/pom.xml
index a5e376b4..a65d7f44 100644
--- a/deployment/image-packaging/pom.xml
+++ b/deployment/image-packaging/pom.xml
@@ -3,7 +3,7 @@
dev.sheldan.sissi
deployment
- 1.0.3-SNAPSHOT
+ 1.1.0-SNAPSHOT
4.0.0
diff --git a/deployment/pom.xml b/deployment/pom.xml
index 1cef3f0e..5b3c3af3 100644
--- a/deployment/pom.xml
+++ b/deployment/pom.xml
@@ -3,7 +3,7 @@
dev.sheldan.sissi
sissi
- 1.0.3-SNAPSHOT
+ 1.1.0-SNAPSHOT
4.0.0
diff --git a/pom.xml b/pom.xml
index 07076639..aa5890d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,15 +12,16 @@
dev.sheldan.sissi
sissi
- 1.0.3-SNAPSHOT
+ Sissi
+ 1.1.0-SNAPSHOT
1.8
1.8
- 1.3.13
- 1.3.2
+ 1.4.0-SNAPSHOT
+ 1.4.0-SNAPSHOT
diff --git a/templates/pom.xml b/templates/pom.xml
index bc6d8ac7..bae15144 100644
--- a/templates/pom.xml
+++ b/templates/pom.xml
@@ -3,7 +3,7 @@
dev.sheldan.sissi
sissi
- 1.0.3-SNAPSHOT
+ 1.1.0-SNAPSHOT
4.0.0
diff --git a/templates/sissi-templates/module-templates/pom.xml b/templates/sissi-templates/module-templates/pom.xml
index 0ed9ad67..e8d3a98a 100644
--- a/templates/sissi-templates/module-templates/pom.xml
+++ b/templates/sissi-templates/module-templates/pom.xml
@@ -3,7 +3,7 @@
dev.sheldan.sissi.templates
sissi-templates
- 1.0.3-SNAPSHOT
+ 1.1.0-SNAPSHOT
4.0.0
diff --git a/templates/sissi-templates/module-templates/quotes-templates/pom.xml b/templates/sissi-templates/module-templates/quotes-templates/pom.xml
index 970c39fe..e7240759 100644
--- a/templates/sissi-templates/module-templates/quotes-templates/pom.xml
+++ b/templates/sissi-templates/module-templates/quotes-templates/pom.xml
@@ -3,7 +3,7 @@
dev.sheldan.sissi.templates
module-templates
- 1.0.3-SNAPSHOT
+ 1.1.0-SNAPSHOT
4.0.0
diff --git a/templates/sissi-templates/pom.xml b/templates/sissi-templates/pom.xml
index e917bdd7..ffd98fab 100644
--- a/templates/sissi-templates/pom.xml
+++ b/templates/sissi-templates/pom.xml
@@ -3,7 +3,7 @@
dev.sheldan.sissi.templates
templates
- 1.0.3-SNAPSHOT
+ 1.1.0-SNAPSHOT
4.0.0
diff --git a/templates/sissi-translations/module-translations/pom.xml b/templates/sissi-translations/module-translations/pom.xml
index 102fd205..3df159c2 100644
--- a/templates/sissi-translations/module-translations/pom.xml
+++ b/templates/sissi-translations/module-translations/pom.xml
@@ -3,7 +3,7 @@
dev.sheldan.sissi.templates.translations
sissi-translations
- 1.0.3-SNAPSHOT
+ 1.1.0-SNAPSHOT
4.0.0
diff --git a/templates/sissi-translations/module-translations/quote-translations/pom.xml b/templates/sissi-translations/module-translations/quote-translations/pom.xml
index e6690457..eed40109 100644
--- a/templates/sissi-translations/module-translations/quote-translations/pom.xml
+++ b/templates/sissi-translations/module-translations/quote-translations/pom.xml
@@ -3,7 +3,7 @@
dev.sheldan.sissi.templates.translations
module-translations
- 1.0.3-SNAPSHOT
+ 1.1.0-SNAPSHOT
4.0.0
diff --git a/templates/sissi-translations/pom.xml b/templates/sissi-translations/pom.xml
index 08e34b24..af978e03 100644
--- a/templates/sissi-translations/pom.xml
+++ b/templates/sissi-translations/pom.xml
@@ -3,7 +3,7 @@
dev.sheldan.sissi.templates
templates
- 1.0.3-SNAPSHOT
+ 1.1.0-SNAPSHOT
4.0.0