[maven-release-plugin] prepare release sissi-1.3.29

[SIS-xxx] prepare for release
[SIS-xxx] limiting shown meetups to the ones created in the channel
2026-01-08 18:34:00 +00:00 · 2023-06-04 21:41:49 +02:00 · 2023-06-04 21:14:24 +02:00 · 2023-05-23 01:11:45 +02:00 · 2023-05-19 00:47:13 +02:00 · 2023-05-19 00:47:09 +02:00
40 changed files with 47 additions and 52 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,5 +34,5 @@ jobs:
        env:
          REGISTRY_PREFIX: docker.pkg.github.com/sheldan/sissi/
          VERSION: ${{ env.version }}
-          ABSTRACTO_VERSION: 1.4.24
+          ABSTRACTO_VERSION: 1.4.26
          ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/
--- a/application/executable/pom.xml
+++ b/application/executable/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.application</groupId>
        <artifactId>application</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>executable</artifactId>
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi</groupId>
        <artifactId>sissi</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/sissi-customizations/moderation-custom/pom.xml
+++ b/application/sissi-customizations/moderation-custom/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.application.module.custom</groupId>
        <artifactId>sissi-customizations</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/sissi-customizations/pom.xml
+++ b/application/sissi-customizations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>application</artifactId>
        <groupId>dev.sheldan.sissi.application</groupId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/sissi-modules/debra/pom.xml
+++ b/application/sissi-modules/debra/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.application</groupId>
        <artifactId>sissi-modules</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/sissi-modules/meetup/pom.xml
+++ b/application/sissi-modules/meetup/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.application</groupId>
        <artifactId>sissi-modules</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/commands/ListMeetups.java
+++ b/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/commands/ListMeetups.java
@@ -49,19 +49,19 @@ public class ListMeetups extends AbstractConditionableCommand {

    @Override
    public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
-        MessageToSend messageToSend = getMessageToSend(commandContext.getGuild().getIdLong());
+        MessageToSend messageToSend = getMessageToSend(commandContext.getGuild().getIdLong(), commandContext.getChannel().getIdLong());
        return FutureUtils.toSingleFutureGeneric(channelService.sendMessageToSendToChannel(messageToSend, commandContext.getChannel()))
                .thenApply(unused -> CommandResult.fromIgnored());
    }

    @Override
    public CompletableFuture<CommandResult> executeSlash(SlashCommandInteractionEvent event) {
-        return interactionService.replyMessageToSend(getMessageToSend(event.getGuild().getIdLong()), event)
+        return interactionService.replyMessageToSend(getMessageToSend(event.getGuild().getIdLong(), event.getChannel().getIdLong()), event)
                .thenApply(interactionHook -> CommandResult.fromSuccess());
    }

-    private MessageToSend getMessageToSend(Long serverId) {
-        List<Meetup> meetups = meetupManagementServiceBean.getIncomingMeetups();
+    private MessageToSend getMessageToSend(Long serverId, Long channelId) {
+        List<Meetup> meetups = meetupManagementServiceBean.getIncomingMeetups(serverId, channelId);
        List<MeetupListItemModel> listItems = meetups
                .stream()
                .map(MeetupListItemModel::fromMeetup)
--- a/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/repository/MeetupRepository.java
+++ b/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/repository/MeetupRepository.java
@@ -12,7 +12,6 @@ import java.util.List;
@Repository
 public interface MeetupRepository extends JpaRepository<Meetup, ServerSpecificId> {
    List<Meetup> findByMeetupTimeLessThan(Instant date);
-    List<Meetup> findByMeetupTimeGreaterThan(Instant date);
-    List<Meetup> findByMeetupTimeGreaterThanAndState(Instant date, MeetupState state);
+    List<Meetup> findByMeetupTimeGreaterThanAndStateAndServer_IdAndMeetupChannel_Id(Instant date, MeetupState state, Long serverId, Long channelId);
    List<Meetup> findByState(MeetupState state);
 }
--- a/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/service/management/MeetupManagementServiceBean.java
+++ b/application/sissi-modules/meetup/src/main/java/dev/sheldan/sissi/module/meetup/service/management/MeetupManagementServiceBean.java
@@ -72,12 +72,8 @@ public class MeetupManagementServiceBean {
        return meetupRepository.findByState(MeetupState.CANCELLED);
    }

-    public List<Meetup> getFutureMeetups() {
-        return meetupRepository.findByMeetupTimeGreaterThan(Instant.now());
-    }
-
-    public List<Meetup> getIncomingMeetups() {
-        return meetupRepository.findByMeetupTimeGreaterThanAndState(Instant.now(), MeetupState.CONFIRMED);
+    public List<Meetup> getIncomingMeetups(Long serverId, Long channelId) {
+        return meetupRepository.findByMeetupTimeGreaterThanAndStateAndServer_IdAndMeetupChannel_Id(Instant.now(), MeetupState.CONFIRMED, serverId, channelId);
    }

    public void deleteMeetups(List<Meetup> meetups) {
--- a/application/sissi-modules/pom.xml
+++ b/application/sissi-modules/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.application</groupId>
        <artifactId>application</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/application/sissi-modules/quotes/pom.xml
+++ b/application/sissi-modules/quotes/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.application</groupId>
        <artifactId>sissi-modules</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/deployment/docker-compose/pom.xml
+++ b/deployment/docker-compose/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi</groupId>
        <artifactId>deployment</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/deployment/docker-compose/src/main/resources/.env
+++ b/deployment/docker-compose/src/main/resources/.env
@@ -32,4 +32,4 @@ PGADMIN_DEFAULT_PASSWORD=admin
 TOKEN=<INSERT_TOKEN>
 YOUTUBE_API_KEY=<INSERT_KEY>
 OPEN_WEATHER_MAP_API_KEY=<INSERT_KEY>
-SISSI_VERSION=1.3.27
+SISSI_VERSION=1.3.29
--- a/deployment/image-packaging/pom.xml
+++ b/deployment/image-packaging/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi</groupId>
        <artifactId>deployment</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/deployment/pom.xml
+++ b/deployment/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi</groupId>
        <artifactId>sissi</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/pom.xml
+++ b/pom.xml
@@ -13,15 +13,15 @@
    <groupId>dev.sheldan.sissi</groupId>
    <artifactId>sissi</artifactId>
    <name>Sissi</name>
-    <version>1.3.27</version>
+    <version>1.3.29</version>

    <properties>
        <maven.compiler.target>1.8</maven.compiler.target>
        <maven.compiler.source>1.8</maven.compiler.source>
        <!-- edit in release.yml as well -->
        <!-- when releasing a new bot version, update the .env as well-->
-        <abstracto.version>1.4.24</abstracto.version>
-        <abstracto.templates.version>1.4.16</abstracto.templates.version>
+        <abstracto.version>1.4.26</abstracto.version>
+        <abstracto.templates.version>1.4.17</abstracto.templates.version>
    </properties>

    <modules>
@@ -57,7 +57,7 @@
    <scm>
        <url>https://maven.pkg.github.com/Sheldan/Sissi</url>
        <developerConnection>scm:git:git@github.com:Sheldan/Sissi.git</developerConnection>
-        <tag>sissi-1.3.27</tag>
+        <tag>sissi-1.3.29</tag>
    </scm>

 </project>
--- a/templates/pom.xml
+++ b/templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi</groupId>
        <artifactId>sissi</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/customization-templates/moderation-customization-templates/pom.xml
+++ b/templates/sissi-templates/customization-templates/moderation-customization-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>customization-templates</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/customization-templates/pom.xml
+++ b/templates/sissi-templates/customization-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>sissi-templates</artifactId>
        <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/module-templates/debra-templates/pom.xml
+++ b/templates/sissi-templates/module-templates/debra-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>module-templates</artifactId>
        <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/module-templates/meetup-templates/pom.xml
+++ b/templates/sissi-templates/module-templates/meetup-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>module-templates</artifactId>
        <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/module-templates/pom.xml
+++ b/templates/sissi-templates/module-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>sissi-templates</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/module-templates/quotes-templates/pom.xml
+++ b/templates/sissi-templates/module-templates/quotes-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>module-templates</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/pom.xml
+++ b/templates/sissi-templates/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>templates</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/template-overrides/experience-template-overrides/pom.xml
+++ b/templates/sissi-templates/template-overrides/experience-template-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>template-overrides</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/template-overrides/logging-template-overrides/pom.xml
+++ b/templates/sissi-templates/template-overrides/logging-template-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>template-overrides</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/template-overrides/moderation-template-overrides/pom.xml
+++ b/templates/sissi-templates/template-overrides/moderation-template-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>template-overrides</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-templates/template-overrides/pom.xml
+++ b/templates/sissi-templates/template-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>sissi-templates</artifactId>
        <groupId>dev.sheldan.sissi.templates</groupId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/customization-translations/moderation-customization-translations/pom.xml
+++ b/templates/sissi-translations/customization-translations/moderation-customization-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations</groupId>
        <artifactId>customization-translations</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/customization-translations/pom.xml
+++ b/templates/sissi-translations/customization-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>sissi-translations</artifactId>
        <groupId>dev.sheldan.sissi.templates.translations</groupId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/module-translations/debra-translations/pom.xml
+++ b/templates/sissi-translations/module-translations/debra-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>module-translations</artifactId>
        <groupId>dev.sheldan.sissi.templates.translations</groupId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/module-translations/meetup-translations/pom.xml
+++ b/templates/sissi-translations/module-translations/meetup-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations</groupId>
        <artifactId>module-translations</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/module-translations/pom.xml
+++ b/templates/sissi-translations/module-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations</groupId>
        <artifactId>sissi-translations</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/module-translations/quote-translations/pom.xml
+++ b/templates/sissi-translations/module-translations/quote-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations</groupId>
        <artifactId>module-translations</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/pom.xml
+++ b/templates/sissi-translations/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates</groupId>
        <artifactId>templates</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/translation-overrides/experience-translation-overrides/pom.xml
+++ b/templates/sissi-translations/translation-overrides/experience-translation-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations.overrides</groupId>
        <artifactId>translation-overrides</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/translation-overrides/logging-translation-overrides/pom.xml
+++ b/templates/sissi-translations/translation-overrides/logging-translation-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations.overrides</groupId>
        <artifactId>translation-overrides</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/translation-overrides/moderation-translation-overrides/pom.xml
+++ b/templates/sissi-translations/translation-overrides/moderation-translation-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations.overrides</groupId>
        <artifactId>translation-overrides</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/templates/sissi-translations/translation-overrides/pom.xml
+++ b/templates/sissi-translations/translation-overrides/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>dev.sheldan.sissi.templates.translations</groupId>
        <artifactId>sissi-translations</artifactId>
-        <version>1.3.27</version>
+        <version>1.3.29</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
Author	SHA1	Message	Date
Sheldan	583c2cc4be	[maven-release-plugin] prepare release sissi-1.3.29	2023-06-04 21:41:49 +02:00
Sheldan	0c36564331	[SIS-xxx] prepare for release	2023-06-04 21:14:24 +02:00
Sheldan	d7bd458bed	[SIS-xxx] limiting shown meetups to the ones created in the channel	2023-05-23 01:11:45 +02:00
Sheldan	bbcd77e3c8	[maven-release-plugin] prepare for next development iteration	2023-05-19 00:47:13 +02:00
Sheldan	ec166167f4	[maven-release-plugin] prepare release sissi-1.3.28	2023-05-19 00:47:09 +02:00
Sheldan	d5b4835d1f	[SIS-xxx] preparing for release	2023-05-19 00:43:40 +02:00
Sheldan	41304551e4	[SIS-xxx] preparing for release	2023-05-19 00:25:39 +02:00
Sheldan	279959f256	[maven-release-plugin] prepare for next development iteration	2023-05-19 00:06:57 +02:00