[maven-release-plugin] prepare release oneplusbot-1.6.17

updating abstracto version

.env

@@ -0,0 +1,4 @@
+REGISTRY_PREFIX=harbor.sheldan.dev/oneplus-bot/
+ABSTRACTO_PREFIX=harbor.sheldan.dev/abstracto/
+VERSION=1.6.16
+ABSTRACTO_VERSION=1.5.23

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,42 @@
+name: Bug Report
+description: Found a bug that needs fixing?
+body:
+  - type: checkboxes
+    attributes:
+      label: General Troubleshooting
+      description: You confirm to have made the following checks first.
+      options:
+        - label: I have checked for similar issues on the Issue-tracker.
+          required: true
+        - label: I have updated to the latest version
+          required: true
+        - label: I have checked the branches or the maintainers' PRs for upcoming bug fixes.
+          required: true
+  - type: textarea
+    attributes:
+      label: "Description"
+      description: "General information about the bug"
+      placeholder: "..."
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: "Steps to reproduce"
+      description: "What happened when the bug occurred?"
+      placeholder: "1. ..."
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: "Expected behaviour"
+      description: "What should happen?"
+      placeholder: "It should..."
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: "Actual behaviour"
+      description: "What did happen instead?"
+      placeholder: "It actually ..."
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/feature.yml

@@ -0,0 +1,36 @@
+name: Feature request
+description: Want some functionality added?
+body:
+  - type: checkboxes
+    attributes:
+      label: General Information
+      description: You confirm to have made the following checks first.
+      options:
+        - label: I have checked for similar issues on the Issue-tracker.
+          required: true
+        - label: I have updated to the latest version
+          required: true
+        - label: I have checked the branches or the maintainers' PRs for upcoming features fixes.
+          required: true
+  - type: textarea
+    attributes:
+      label: "Description"
+      description: "General description of the feature"
+      placeholder: "..."
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: "Feature worth and general use"
+      description: "Why should this exist?"
+      placeholder: "..."
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: "Suggestions for implementation"
+      description: "Any ideas about what the feature should behave/look like? Commands?"
+      placeholder: "It should..."
+    validations:
+      required: false
+

.github/workflows/build.yml

@@ -17,11 +17,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
         with:
-          java-version: 1.8
+          persist-credentials: false
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: 17
       - name: Build with Maven
         run: mvn -s settings.xml -B install --file pom.xml
         env:

.github/workflows/release.yml

@@ -6,13 +6,14 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           persist-credentials: false
       - name: Set up Java for publishing to GitHub Packages
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          distribution: 'corretto'
+          java-version: 17
       - name: Load current version
         id: version
         run: echo "version=$(mvn -s settings.xml --file pom.xml -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec)" >> $GITHUB_ENV
@@ -22,17 +23,25 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           user: Sheldan
           token: ${{ secrets.ABSTRACTO_PAT }}
-      - name: Login to GitHub Packages Docker Registry
-        uses: docker/login-action@v1
+      - name: Login to Harbor
+        uses: docker/login-action@v2
         with:
-          registry: docker.pkg.github.com
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Push deployment container
-        working-directory: ./deployment/image-packaging/src/main/docker
+          registry: harbor.sheldan.dev
+          username: ${{ secrets.HARBOR_USERNAME }}
+          password: ${{ secrets.HARBOR_TOKEN }}
+      - name: Load env files
+        id: dotenv
+        uses: falti/dotenv-action@v1.0.4
+        with:
+          path: .env
+      - name: Push container
         run: docker-compose build && docker-compose push
         env:
-          REGISTRY_PREFIX: docker.pkg.github.com/sheldan/oneplusbot/
-          VERSION: ${{ env.version }}
-          ABSTRACTO_VERSION: 1.3.12
-          ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/
+          REGISTRY_PREFIX: ${{ steps.dotenv.outputs.registry_prefix }}
+          VERSION: ${{ steps.dotenv.outputs.version }}
+      - name: Helm push
+        working-directory: ./deployment/helm/
+        run: |-
+          helm registry login -u '${{ secrets.HARBOR_USERNAME }}' -p '${{ secrets.HARBOR_TOKEN }}' harbor.sheldan.dev
+          helm package oneplus-bot
+          helm push oneplus-bot*.tgz oci://harbor.sheldan.dev/oneplus-bot

.github/workflows/release_manual.yaml

@@ -0,0 +1,84 @@
+name: Publishes a new version of OnePlusBot
+on: workflow_dispatch
+permissions:
+  packages: write
+  contents: write
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: master
+      - name: Set up JDK
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: 17
+      - name: Load current version
+        id: version
+        run: echo "version=$(mvn -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec | cut -d- -f1)" >> $GITHUB_ENV
+      - name: Release maven packages
+        uses: qcastel/github-actions-maven-release@v1.12.41
+        env:
+          JAVA_HOME: /usr/lib/jvm/java-17-openjdk/
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          abstractoUser: Sheldan
+          abstractoToken: ${{ secrets.ABSTRACTO_PAT }}
+        with:
+          git-release-bot-name: "release-bot"
+          git-release-bot-email: "release-bot@sheldan.dev"
+          release-branch-name: master
+          maven-args: "-Dmaven.javadoc.skip=true -s settings.xml -DskipTests"
+          access-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Login to Harbor
+        uses: docker/login-action@v2
+        with:
+          registry: harbor.sheldan.dev
+          username: ${{ secrets.HARBOR_USERNAME }}
+          password: ${{ secrets.HARBOR_TOKEN }}
+      - name: Update Chart version file
+        uses: fjogeleit/yaml-update-action@v0.13.2
+        with:
+          valueFile: 'deployment/helm/oneplus-bot/Chart.yaml'
+          propertyPath: 'version'
+          value: ${{ env.version }}
+          commitChange: false
+      - name: Update value files version
+        uses: fjogeleit/yaml-update-action@v0.13.2
+        with:
+          valueFile: 'deployment/helm/oneplus-bot/values.yaml'
+          commitChange: false
+          changes: |
+            {
+              "bot.tag": "${{ env.version }}",
+              "templateDeploymentData.tag": "${{ env.version }}",
+              "dbConfigDeploymentData.tag": "${{ env.version }}"
+            }
+      - name: Update .env version
+        run:
+          sed -i '3s/.*/VERSION=${{ env.version }}/' .env
+      - name: Load env file
+        id: dotenv
+        uses: falti/dotenv-action@v1.0.4
+        with:
+          path: .env
+      - name: Build and push Docker containers
+        run: docker-compose build && docker-compose push
+        env:
+          REGISTRY_PREFIX: ${{ steps.dotenv.outputs.registry_prefix }}
+          VERSION: ${{ steps.dotenv.outputs.version }}
+      - name: Helm package and push
+        working-directory: ./deployment/helm/
+        run: |-
+          helm registry login -u '${{ secrets.HARBOR_USERNAME }}' -p '${{ secrets.HARBOR_TOKEN }}' harbor.sheldan.dev
+          helm package oneplus-bot
+          helm push oneplus-bot*.tgz oci://harbor.sheldan.dev/oneplus-bot
+      - name: Fix file permissions
+        run:
+          sudo chmod -R ugo+rwX . # https://github.com/actions/checkout/issues/164
+      - name: Commit updated versions
+        uses: EndBug/add-and-commit@v9
+        with:
+          author_name: "release-bot"
+          author_email: "release-bot@sheldan.dev"

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Sheldan
+Copyright (c) 2022 Sheldan
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Tiltfile

@@ -0,0 +1,42 @@
+allow_k8s_contexts('k8s-cluster')
+
+load('ext://restart_process', 'docker_build_with_restart')
+registry = 'harbor.sheldan.dev/oneplus-bot/'
+abstracto_registry = 'harbor.sheldan.dev/abstracto/'
+
+local_resource(
+  'oneplus-bot-java-compile',
+  'mvn install && ' +
+  'rm -rf application/executable/target/jar-staging && ' +
+  'unzip -o application/executable/target/oneplus-bot-exec.jar -d application/executable/target/jar-staging && ' +
+  'rsync --delete --inplace --checksum -r application/executable/target/jar-staging/ application/executable/target/jar && ' +
+  'mkdir application/executable/target/jar/snapshots && ' +
+  'rsync --delete --inplace --checksum -r application/executable/target/jar/BOOT-INF/lib/*-SNAPSHOT.jar application/executable/target/jar/snapshots && ' +
+  'rm -f application/executable/target/jar/BOOT-INF/lib/*-SNAPSHOT.jar ',
+  deps=['pom.xml'])
+
+docker_build_with_restart(
+  registry + 'oneplus-bot-image',
+  './application/executable/target/jar',
+  entrypoint=['java', '-noverify', '-cp', '.:./lib/*', 'dev.sheldan.oneplus.bot.executable.Application'],
+  dockerfile='./application/executable/Dockerfile',
+  live_update=[
+    sync('./application/executable/target/jar/BOOT-INF/lib', '/app/lib'),
+    sync('./application/executable/target/jar/META-INF', '/app/META-INF'),
+    sync('./application/executable/target/jar/BOOT-INF/classes', '/app'),
+    sync('./application/executable/target/jar/snapshots', '/app/lib')
+  ],
+)
+
+docker_build(registry + 'oneplus-bot-db-data', 'deployment/image-packaging/src/main/docker/db-data/')
+docker_build(registry + 'oneplus-bot-template-data', 'deployment/image-packaging/src/main/docker/template-data/')
+docker_build(registry + 'oneplus-bot-private-rest-api', 'deployment/image-packaging/src/main/docker/private-rest-api/', build_args={'REGISTRY_PREFIX': abstracto_registry})
+
+
+k8s_yaml(helm('deployment/helm/oneplus-bot', values=
+['./../OnePlusBot-environments/argocd/apps/oneplus-bot/values/local/values.yaml',
+'secrets://./../OnePlusBot-environments/argocd/apps/oneplus-bot/values/local/values.secrets.yaml']
+))
+
+local_resource('fetch-packages', 'mvn install -f deployment/image-packaging/pom.xml', auto_init=False, trigger_mode = TRIGGER_MODE_MANUAL)
+k8s_resource('chart-oneplus-bot', port_forwards='5005:5005')

application/database/pom.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>dev.sheldan.oneplus.bot.application</groupId>
-        <artifactId>application</artifactId>
-        <version>1.5.10</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>database</artifactId>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <descriptors>
-                        <descriptor>src/main/assembly/liquibase.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

application/database/src/main/assembly/liquibase.xml

@@ -1,18 +0,0 @@
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
-    <id>liquibase</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <fileSets>
-        <fileSet>
-            <outputDirectory>.</outputDirectory>
-            <directory>${project.basedir}/src/main/resources/migrations</directory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-</assembly>

application/executable/Dockerfile

@@ -0,0 +1,10 @@
+FROM amazoncorretto:17.0.8-alpine3.18
+RUN apk add entr
+
+WORKDIR /app
+ADD BOOT-INF/lib/ /app/lib
+ADD snapshots/ /app/lib
+ADD META-INF /app/META-INF
+ADD BOOT-INF/classes /app
+
+ENTRYPOINT java -cp .:./lib/* dev.sheldan.oneplus.bot.executable.Application

application/executable/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>executable</artifactId>
@@ -14,6 +14,7 @@
     </properties>
 
     <build>
+        <finalName>oneplus-bot</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
@@ -150,6 +151,16 @@
             <artifactId>experience-tracking-impl</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>dev.sheldan.abstracto.modules</groupId>
+            <artifactId>giveaway-impl</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>dev.sheldan.abstracto.modules</groupId>
+            <artifactId>image-generation-impl</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>dev.sheldan.abstracto.modules</groupId>
             <artifactId>moderation-impl</artifactId>

application/executable/src/main/java/dev/sheldan/oneplus/bot/executable/SecurityConfig.java

@@ -0,0 +1,18 @@
+package dev.sheldan.oneplus.bot.executable;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.web.SecurityFilterChain;
+
+@Configuration
+public class SecurityConfig {
+
+    @Bean
+    public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+        http.authorizeHttpRequests((authorize) -> authorize
+                .anyRequest().permitAll());
+        return http.build();
+    }
+
+}

application/executable/src/main/resources/application-local.properties

@@ -1,21 +0,0 @@
-spring.datasource.url=jdbc:postgresql://localhost:5432/abstracto
-spring.datasource.username= abstracto
-spring.datasource.password= abstracto
-spring.jpa.properties.hibernate.default_schema=abstracto
-spring.quartz.jdbc.initialize-schema=never
-
-spring.jpa.hibernate.ddl-auto = none
-
-spring.jpa.show-sql = false
-
-spring.jpa.properties.hibernate.format_sql = true
-log4j.logger.org.hibernate.SQL=trace
-log4j.logger.org.hibernate.type.descriptor.sql=trace
-log4j.logger.org.hibernate.type=trace
-
-management.metrics.tags.application=oneplus-bot
-spring.security.user.name=abstracto
-spring.security.user.password=password
-spring.security.user.roles=USER
-
-spring.application.name=OnePlusBot

application/executable/src/main/resources/application.properties

@@ -1,11 +1,14 @@
 spring.datasource.url=jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME}
 spring.datasource.username= ${DB_USER}
 spring.datasource.password= ${DB_PASS}
-spring.jpa.hibernate.default_schema=${DB_NAME}
+spring.datasource.hikari.maximum-pool-size=${hikariPoolSize}
+spring.jpa.hibernate.default_schema=abstracto
+spring.jpa.properties.hibernate.default_schema=abstracto
 spring.quartz.jdbc.initialize-schema=never
-management.metrics.tags.application=oneplus-bot
-spring.security.user.name= ${REST_USER_NAME}
-spring.security.user.password= ${REST_PASSWORD}
-spring.security.user.roles=USER
+management.metrics.tags.application=OnePlusBot
+management.endpoint.health.probes.enabled=true
+management.health.livenessState.enabled=true
+management.health.readinessState.enabled=true
+spring.application.name=OnePlusBot
 
-spring.application.name=OnePlusBot
+spring.main.allow-circular-references=true

application/oneplus-bot-customizations/dynamic-activity-custom/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
         <artifactId>oneplus-bot-customizations</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-customizations/moderation-custom/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>oneplus-bot-customizations</artifactId>
         <groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
-        <version>1.5.10</version>
+        <version>1.6.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-customizations/moderation-custom/src/main/java/dev/sheldan/oneplus/bot/custom/moderation/listener/WarningAddedListener.java

@@ -19,7 +19,7 @@ import dev.sheldan.oneplus.bot.custom.moderation.config.ModerationCustomFeatureD
 import dev.sheldan.oneplus.bot.custom.moderation.config.ModerationCustomPostTarget;
 import dev.sheldan.oneplus.bot.custom.moderation.model.template.WarningThresholdNotificationModel;
 import lombok.extern.slf4j.Slf4j;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -71,7 +71,7 @@ public class WarningAddedListener implements WarningCreatedListener {
 
             Long channelId = model.getWarningChannelId();
             Long warnedUserId = model.getWarnedUserId();
-            TextChannel channel = channelService.getTextChannelFromServer(serverId, channelId);
+            GuildMessageChannel channel = channelService.getMessageChannelFromServer(serverId, channelId);
             WarningThresholdNotificationModel notificationModel = WarningThresholdNotificationModel
                     .builder()
                     .channelDisplay(ChannelDisplay.fromChannel(channel))

application/oneplus-bot-customizations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-customizations/starboard-custom/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
         <artifactId>oneplus-bot-customizations</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-modules/faq/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>oneplus-bot-modules</artifactId>
         <groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
-        <version>1.5.10</version>
+        <version>1.6.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/command/FAQ.java

@@ -17,7 +17,8 @@ import dev.sheldan.oneplus.bot.modules.faq.config.FAQFeatureDefinition;
 import dev.sheldan.oneplus.bot.modules.faq.config.FAQModuleDefinition;
 import dev.sheldan.oneplus.bot.modules.faq.models.command.faq.FAQResponseModel;
 import dev.sheldan.oneplus.bot.modules.faq.service.FAQResponseServiceBean;
-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;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -50,7 +51,7 @@ public class FAQ extends AbstractConditionableCommand {
         String commandName;
         if(!parameters.isEmpty()) {
             commandName = (String) parameters.get(0);
-            TextChannel channel;
+            GuildMessageChannel channel;
             if (parameters.size() == 2) {
                 channel = (TextChannel) parameters.get(1);
             } else {

application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/models/database/FAQChannelGroup.java

@@ -3,7 +3,7 @@ package dev.sheldan.oneplus.bot.modules.faq.models.database;
 import dev.sheldan.abstracto.core.models.database.AChannelGroup;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.Instant;
 
 @Builder

application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/models/database/FAQChannelGroupCommand.java

@@ -3,7 +3,7 @@ package dev.sheldan.oneplus.bot.modules.faq.models.database;
 import dev.sheldan.oneplus.bot.modules.faq.models.database.embed.ChannelGroupCommandId;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.time.Instant;
 import java.util.ArrayList;

application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/models/database/FAQCommand.java

@@ -3,7 +3,7 @@ package dev.sheldan.oneplus.bot.modules.faq.models.database;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.time.Instant;
 import java.util.ArrayList;

application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/models/database/FAQCommandAlias.java

@@ -3,7 +3,7 @@ package dev.sheldan.oneplus.bot.modules.faq.models.database;
 import dev.sheldan.oneplus.bot.modules.faq.models.database.embed.FAQCommandAliasId;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.time.Instant;
 

application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/models/database/FAQCommandResponse.java

@@ -3,7 +3,7 @@ package dev.sheldan.oneplus.bot.modules.faq.models.database;
 import dev.sheldan.oneplus.bot.modules.faq.models.database.embed.CommandResponseId;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.Instant;
 
 @Builder

application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/models/database/embed/ChannelGroupCommandId.java

@@ -2,8 +2,8 @@ package dev.sheldan.oneplus.bot.modules.faq.models.database.embed;
 
 import lombok.*;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 import java.io.Serializable;
 
 @Embeddable

application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/models/database/embed/CommandResponseId.java

@@ -2,8 +2,8 @@ package dev.sheldan.oneplus.bot.modules.faq.models.database.embed;
 
 import lombok.*;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 import java.io.Serializable;
 
 @Embeddable

application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/models/database/embed/FAQCommandAliasId.java

@@ -2,8 +2,8 @@ package dev.sheldan.oneplus.bot.modules.faq.models.database.embed;
 
 import lombok.*;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 import java.io.Serializable;
 
 @Embeddable

application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/service/FAQResponseServiceBean.java

@@ -22,10 +22,8 @@ import dev.sheldan.oneplus.bot.modules.faq.service.management.FAQChannelGroupCom
 import dev.sheldan.oneplus.bot.modules.faq.service.management.FAQCommandAliasManagementService;
 import dev.sheldan.oneplus.bot.modules.faq.service.management.FAQCommandManagementServiceBean;
 import lombok.extern.slf4j.Slf4j;
-import net.dv8tion.jda.api.entities.ISnowflake;
-import net.dv8tion.jda.api.entities.SelfUser;
-import net.dv8tion.jda.api.entities.TextChannel;
-import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.entities.*;
+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;
@@ -67,7 +65,7 @@ public class FAQResponseServiceBean {
     @Autowired
     private FAQResponseServiceBean self;
 
-    public CompletableFuture<FAQResponseModel> loadFAQResponse(String commandName, TextChannel textChannel) {
+    public CompletableFuture<FAQResponseModel> loadFAQResponse(String commandName, GuildMessageChannel textChannel) {
         AServer server = serverManagementService.loadServer(textChannel.getGuild().getIdLong());
         Optional<FAQCommand> faqCommandOptional = faqCommandManagementServiceBean.findByNameAndServer(commandName, server);
         if(!faqCommandOptional.isPresent()) {

application/oneplus-bot-modules/news/pom.xml

@@ -3,16 +3,22 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
         <artifactId>oneplus-bot-modules</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>news</artifactId>
 
-    <properties>
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>dev.sheldan.abstracto.scheduling</groupId>
+            <artifactId>scheduling-int</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+    </dependencies>
 
     <build>
         <plugins>

application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/config/NewsFeature.java

@@ -11,6 +11,8 @@ import java.util.List;
 @Component
 public class NewsFeature implements FeatureConfig {
 
+    public static final String NEWS_FORUM_POST_NOTIFICATION_SERVER_ID_ENV_NAME = "NEWS_FORUM_POST_NOTIFICATION_SERVER_ID";
+
     @Override
     public FeatureDefinition getFeature() {
         return NewsFeatureDefinition.NEWS;
@@ -18,6 +20,6 @@ public class NewsFeature implements FeatureConfig {
 
     @Override
     public List<PostTargetEnum> getRequiredPostTargets() {
-        return Arrays.asList(NewsPostTarget.NEWS_TARGET);
+        return Arrays.asList(NewsPostTarget.NEWS_TARGET, NewsPostTarget.FORUM_POST_NOTIFICATION);
     }
 }

application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/config/NewsPostTarget.java

@@ -5,7 +5,7 @@ import lombok.Getter;
 
 @Getter
 public enum NewsPostTarget implements PostTargetEnum {
-    NEWS_TARGET("news");
+    NEWS_TARGET("news"), FORUM_POST_NOTIFICATION("forumPostNotification");
 
     private String key;
 

application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/job/CheckForNewsPosts.java

@@ -0,0 +1,31 @@
+package dev.sheldan.oneplus.bot.modules.news.job;
+
+import dev.sheldan.oneplus.bot.modules.news.service.NewsSourceServiceBean;
+import lombok.extern.slf4j.Slf4j;
+import org.quartz.DisallowConcurrentExecution;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.quartz.PersistJobDataAfterExecution;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.quartz.QuartzJobBean;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@DisallowConcurrentExecution
+@Component
+@PersistJobDataAfterExecution
+public class CheckForNewsPosts extends QuartzJobBean {
+
+    @Autowired
+    private NewsSourceServiceBean newsSourceServiceBean;
+
+    @Override
+    protected void executeInternal(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+        try {
+            log.info("Executing news post check job.");
+            newsSourceServiceBean.checkForNewThreads();
+        } catch (Exception exception) {
+            log.error("Failed to execute news post check job.", exception);
+        }
+    }
+}

application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/model/ForumPostNotificationEntry.java

@@ -0,0 +1,24 @@
+package dev.sheldan.oneplus.bot.modules.news.model;
+
+import dev.sheldan.oneplus.bot.modules.news.model.forum.ForumPost;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@Getter
+public class ForumPostNotificationEntry {
+    private Long postId;
+    private String subject;
+    private String content;
+    private Long creatorId;
+
+    public static ForumPostNotificationEntry fromPost(ForumPost forumPost) {
+        return ForumPostNotificationEntry
+                .builder()
+                .postId(forumPost.getId())
+                .subject(forumPost.getSubject())
+                .content(forumPost.getContent())
+                .creatorId(forumPost.getSource().getUserId())
+                .build();
+    }
+}

application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/model/ForumPostNotificationModel.java

@@ -0,0 +1,12 @@
+package dev.sheldan.oneplus.bot.modules.news.model;
+
+import lombok.Builder;
+import lombok.Getter;
+
+import java.util.List;
+
+@Getter
+@Builder
+public class ForumPostNotificationModel {
+    private List<ForumPostNotificationEntry> entries;
+}

application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/model/database/NewsForumPost.java

@@ -0,0 +1,30 @@
+package dev.sheldan.oneplus.bot.modules.news.model.database;
+
+import jakarta.persistence.*;
+import lombok.*;
+
+import java.time.Instant;
+
+@Builder
+@Entity
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "news_forum_post")
+@Getter
+@Setter
+@EqualsAndHashCode
+public class NewsForumPost {
+    @Id
+    @Column(name = "id")
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "creator_id", nullable = false)
+    private NewsSource creator;
+
+    @Column(name = "created")
+    private Instant created;
+
+    @Column(name = "updated")
+    private Instant updated;
+}

application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/model/database/NewsPost.java

@@ -5,7 +5,7 @@ import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.Instant;
 
 @Builder

application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/model/database/NewsSource.java

@@ -0,0 +1,29 @@
+package dev.sheldan.oneplus.bot.modules.news.model.database;
+
+import jakarta.persistence.*;
+import lombok.*;
+
+import java.time.Instant;
+
+@Builder
+@Entity
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "news_source")
+@Getter
+@Setter
+@EqualsAndHashCode
+public class NewsSource {
+    @Id
+    @Column(name = "user_id")
+    private Long userId;
+
+    @Column(name = "thread_count")
+    private Long threadCount;
+
+    @Column(name = "created")
+    private Instant created;
+
+    @Column(name = "updated")
+    private Instant updated;
+}

application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/model/forum/ForumPost.java

@@ -0,0 +1,24 @@
+package dev.sheldan.oneplus.bot.modules.news.model.forum;
+
+import dev.sheldan.oneplus.bot.modules.news.model.database.NewsSource;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class ForumPost {
+    private Long id;
+    private String subject;
+    private String content;
+    private NewsSource source;
+
+    public static ForumPost fromRow(NewsForumPostDataRow dataRow, NewsSource newsSource) {
+        return ForumPost
+                .builder()
+                .subject(dataRow.getSubject())
+                .id(dataRow.getId())
+                .content(dataRow.getContent())
+                .source(newsSource)
+                .build();
+    }
+}

application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/model/forum/NewsForumPostData.java

@@ -0,0 +1,12 @@
+package dev.sheldan.oneplus.bot.modules.news.model.forum;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Getter;
+
+import java.util.List;
+
+@Getter
+public class NewsForumPostData {
+    @SerializedName("rows")
+    private List<NewsForumPostDataRow> rows;
+}

application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/model/forum/NewsForumPostDataRow.java

@@ -0,0 +1,16 @@
+package dev.sheldan.oneplus.bot.modules.news.model.forum;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Getter;
+
+@Getter
+public class NewsForumPostDataRow {
+    @SerializedName("id")
+    private Long id;
+
+    @SerializedName("subject")
+    private String subject;
+
+    @SerializedName("content")
+    private String content;
+}

application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/model/forum/NewsForumPostResponse.java

@@ -0,0 +1,11 @@
+package dev.sheldan.oneplus.bot.modules.news.model.forum;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Getter;
+
+@Getter
+public class NewsForumPostResponse {
+
+    @SerializedName("data")
+    private NewsForumPostData newsForumPostData;
+}

application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/model/forum/NewsSourceResponse.java

@@ -0,0 +1,12 @@
+package dev.sheldan.oneplus.bot.modules.news.model.forum;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@Getter
+public class NewsSourceResponse {
+    @SerializedName("data")
+    private NewsSourceUserData user;
+}

application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/model/forum/NewsSourceUserData.java

@@ -0,0 +1,12 @@
+package dev.sheldan.oneplus.bot.modules.news.model.forum;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@Getter
+public class NewsSourceUserData {
+    @SerializedName("userStatVO")
+    private NewsSourceUserStats userStats;
+}

application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/model/forum/NewsSourceUserStats.java

@@ -0,0 +1,12 @@
+package dev.sheldan.oneplus.bot.modules.news.model.forum;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@Getter
+public class NewsSourceUserStats {
+    @SerializedName("threadCount")
+    private Long threadCount;
+}

application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/repository/NewsForumPostRepository.java

@@ -0,0 +1,9 @@
+package dev.sheldan.oneplus.bot.modules.news.repository;
+
+import dev.sheldan.oneplus.bot.modules.news.model.database.NewsForumPost;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface NewsForumPostRepository extends JpaRepository<NewsForumPost, Long> {
+}

application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/repository/NewsResourceRepository.java

@@ -0,0 +1,9 @@
+package dev.sheldan.oneplus.bot.modules.news.repository;
+
+import dev.sheldan.oneplus.bot.modules.news.model.database.NewsSource;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface NewsResourceRepository extends JpaRepository<NewsSource, Long> {
+}

application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/service/ForumApiClient.java

@@ -0,0 +1,85 @@
+package dev.sheldan.oneplus.bot.modules.news.service;
+
+import com.google.gson.Gson;
+import dev.sheldan.abstracto.core.exception.AbstractoRunTimeException;
+import dev.sheldan.oneplus.bot.modules.news.model.database.NewsSource;
+import dev.sheldan.oneplus.bot.modules.news.model.forum.ForumPost;
+import dev.sheldan.oneplus.bot.modules.news.model.forum.NewsForumPostResponse;
+import dev.sheldan.oneplus.bot.modules.news.model.forum.NewsSourceResponse;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+@Component
+public class ForumApiClient {
+
+    @Autowired
+    private OkHttpClient okHttpClient;
+
+    @Autowired
+    private Gson gson;
+
+    @Value("${abstracto.feature.news.userURL}")
+    private String userRequestURL;
+
+    @Value("${abstracto.feature.news.threadURL}")
+    private String threadInfoUrl;
+
+    public Long getCurrentThreadCount(NewsSource newsSource) {
+        Request request = new Request.Builder()
+                .url(String.format(userRequestURL, newsSource.getUserId()))
+                .get()
+                .build();
+        Response response;
+        try {
+            response = okHttpClient.newCall(request).execute();
+            if(!response.isSuccessful()) {
+                throw new AbstractoRunTimeException(String.format("Failed to load user info for id %s", newsSource.getUserId()));
+            }
+            NewsSourceResponse newsSourceResponse = gson.fromJson(response.body().string(), NewsSourceResponse.class);
+            if (newsSourceResponse.getUser() != null
+                    && newsSourceResponse.getUser().getUserStats() != null
+                    && newsSourceResponse.getUser().getUserStats().getThreadCount() != null) {
+                return newsSourceResponse.getUser().getUserStats().getThreadCount();
+            }
+        } catch (IOException e) {
+            throw new AbstractoRunTimeException(e);
+        }
+        return 0L;
+    }
+
+    public List<ForumPost> getPostsOfSource(NewsSource source) {
+        Request request = new Request.Builder()
+                .url(String.format(threadInfoUrl, source.getUserId()))
+                .get()
+                .build();
+        Response response;
+        try {
+            response = okHttpClient.newCall(request).execute();
+            if(!response.isSuccessful()) {
+                throw new AbstractoRunTimeException(String.format("Failed to load thread info for id %s", source.getUserId()));
+            }
+            NewsForumPostResponse newsSourceResponse = gson.fromJson(response.body().string(), NewsForumPostResponse.class);
+            if (newsSourceResponse.getNewsForumPostData() != null
+                    && newsSourceResponse.getNewsForumPostData().getRows() != null) {
+                return newsSourceResponse
+                        .getNewsForumPostData()
+                        .getRows()
+                        .stream()
+                        .map(dataRow -> ForumPost.fromRow(dataRow, source))
+                        .toList();
+            }
+        } catch (IOException e) {
+            throw new AbstractoRunTimeException(e);
+        }
+        return new ArrayList<>();
+    }
+
+}

application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/service/NewsServiceBean.java

@@ -12,7 +12,7 @@ import dev.sheldan.oneplus.bot.modules.news.model.database.NewsPost;
 import dev.sheldan.oneplus.bot.modules.news.service.management.NewsPostManagementServiceBean;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -113,7 +113,7 @@ public class NewsServiceBean {
         log.info("Updating news post {} with new content based on message from user {} in server {}.",
                 newsPost.getSourceMessageId(), updatedMessage.getIdLong(), updatedMessage.getGuild().getId());
         MessageToSend messageToSend = templateService.renderEmbedTemplate(MESSAGE_TEMPLATE_KEY, model, serverId);
-        TextChannel newsChannel = channelService.getTextChannelFromServer(serverId, newsPost.getNewsChannel().getId());
+        GuildMessageChannel newsChannel = channelService.getMessageChannelFromServer(serverId, newsPost.getNewsChannel().getId());
         return channelService.editMessageInAChannelFuture(messageToSend, newsChannel, newsPost.getNewsMessageId())
                 .thenApply(message -> null);
     }

application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/service/NewsSourceServiceBean.java

@@ -0,0 +1,144 @@
+package dev.sheldan.oneplus.bot.modules.news.service;
+
+import dev.sheldan.abstracto.core.service.PostTargetService;
+import dev.sheldan.abstracto.core.templating.model.MessageToSend;
+import dev.sheldan.abstracto.core.templating.service.TemplateService;
+import dev.sheldan.abstracto.core.utils.FutureUtils;
+import dev.sheldan.oneplus.bot.modules.news.config.NewsPostTarget;
+import dev.sheldan.oneplus.bot.modules.news.model.ForumPostNotificationEntry;
+import dev.sheldan.oneplus.bot.modules.news.model.ForumPostNotificationModel;
+import dev.sheldan.oneplus.bot.modules.news.model.database.NewsForumPost;
+import dev.sheldan.oneplus.bot.modules.news.model.database.NewsSource;
+import dev.sheldan.oneplus.bot.modules.news.model.forum.ForumPost;
+import dev.sheldan.oneplus.bot.modules.news.service.management.NewsForumPostManagementServiceBean;
+import dev.sheldan.oneplus.bot.modules.news.service.management.NewsSourceManagementServiceBean;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import static dev.sheldan.oneplus.bot.modules.news.config.NewsFeature.NEWS_FORUM_POST_NOTIFICATION_SERVER_ID_ENV_NAME;
+
+@Component
+@Slf4j
+public class NewsSourceServiceBean {
+
+    @Autowired
+    private ForumApiClient forumApiClient;
+
+    @Autowired
+    private NewsSourceManagementServiceBean newsSourceManagementServiceBean;
+
+    @Autowired
+    private NewsForumPostManagementServiceBean newsForumPostManagementServiceBean;
+
+    @Autowired
+    private PostTargetService postTargetService;
+
+    @Autowired
+    private TemplateService templateService;
+
+    @Autowired
+    private NewsSourceServiceBean self;
+
+    private static final String NEWS_FORUM_POST_NOTIFICATION_TEMPLATE_KEY = "newsForumPost_notification";
+
+    public void checkForNewThreads() {
+        Long targetServerId = Long.parseLong(System.getenv(NEWS_FORUM_POST_NOTIFICATION_SERVER_ID_ENV_NAME));
+        List<ForumPost> newForumPosts = getNewForumPosts();
+        log.info("Found {} new forum posts.", newForumPosts.size());
+        if(newForumPosts.isEmpty()) {
+            return;
+        }
+        List<ForumPostNotificationEntry> entries = new ArrayList<>();
+        newForumPosts.forEach(forumPost -> entries.add(ForumPostNotificationEntry.fromPost(forumPost)));
+
+        ForumPostNotificationModel model = ForumPostNotificationModel
+                .builder()
+                .entries(entries)
+                .build();
+
+        MessageToSend messageToSend = templateService.renderEmbedTemplate(NEWS_FORUM_POST_NOTIFICATION_TEMPLATE_KEY, model, targetServerId);
+
+        FutureUtils.toSingleFutureGeneric(postTargetService.sendEmbedInPostTarget(messageToSend, NewsPostTarget.FORUM_POST_NOTIFICATION, targetServerId))
+                .thenAccept(unused -> {
+                    log.info("Sent news forum post notification.");
+                    self.persistForumPostsAndThreadCount(entries);
+                }).exceptionally(throwable -> {
+                    log.error("Failed to send news forum post notification.", throwable);
+                    return null;
+                });
+    }
+
+    @Transactional
+    public void persistForumPostsAndThreadCount(List<ForumPostNotificationEntry> entries) {
+        Map<Long, NewsSource> sourceMap = newsSourceManagementServiceBean.loadNewsSources()
+                .stream()
+                .collect(Collectors.toMap(NewsSource::getUserId, Function.identity()));
+
+        entries.forEach(forumPostNotificationEntry ->
+                newsForumPostManagementServiceBean.createPost(sourceMap.get(forumPostNotificationEntry.getCreatorId()), forumPostNotificationEntry.getPostId()));
+
+        sourceMap.values().forEach(newsSource -> {
+            Long currentThreadCount = forumApiClient.getCurrentThreadCount(newsSource);
+            newsSource.setThreadCount(currentThreadCount);
+        });
+    }
+
+    private boolean hasThreadCountChanged(NewsSource newsSource) {
+        Long currentThreadCount = forumApiClient.getCurrentThreadCount(newsSource);
+        return !currentThreadCount.equals(newsSource.getThreadCount());
+    }
+
+    private List<ForumPost> getNewForumPosts() {
+        List<NewsSource> newsSources = newsSourceManagementServiceBean.loadNewsSources();
+        log.info("Total news source count: {}", newsSources.size());
+        List<NewsSource> sourcesWithChangedThreadCount = newsSources
+                .stream()
+                .filter(this::hasThreadCountChanged)
+                .toList();
+
+        log.info("News sources with new thread count: {}", sourcesWithChangedThreadCount.size());
+
+        List<ForumPost> currentForumPosts = sourcesWithChangedThreadCount
+                .stream()
+                .map(newsSource -> forumApiClient.getPostsOfSource(newsSource))
+                .flatMap(Collection::stream)
+                .toList();
+
+        log.info("Total amount of incoming forum posts: {}", currentForumPosts.size());
+        if(currentForumPosts.isEmpty()) {
+            return new ArrayList<>();
+        }
+
+        Set<Long> incomingForumPostIds = currentForumPosts
+                .stream()
+                .map(ForumPost::getId)
+                .collect(Collectors.toSet());
+
+        List<NewsForumPost> existingNewsForumPosts = newsForumPostManagementServiceBean.getAllPosts();
+
+        log.info("Total amount of existing and tracked forum posts: {}", existingNewsForumPosts.size());
+
+        Set<Long> existingForumPostIds = existingNewsForumPosts
+                .stream()
+                .map(NewsForumPost::getId)
+                .collect(Collectors.toSet());
+
+        incomingForumPostIds.removeAll(existingForumPostIds);
+
+        if(incomingForumPostIds.isEmpty()) {
+            return new ArrayList<>();
+        }
+
+        Map<Long, ForumPost> incomingPostMap = currentForumPosts
+                .stream()
+                .collect(Collectors.toMap(ForumPost::getId, Function.identity()));
+
+        return incomingForumPostIds.stream().map(incomingPostMap::get).toList();
+    }
+}

application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/service/management/NewsForumPostManagementServiceBean.java

@@ -0,0 +1,30 @@
+package dev.sheldan.oneplus.bot.modules.news.service.management;
+
+import dev.sheldan.oneplus.bot.modules.news.model.database.NewsForumPost;
+import dev.sheldan.oneplus.bot.modules.news.model.database.NewsSource;
+import dev.sheldan.oneplus.bot.modules.news.repository.NewsForumPostRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class NewsForumPostManagementServiceBean {
+
+    @Autowired
+    private NewsForumPostRepository repository;
+
+    public List<NewsForumPost> getAllPosts() {
+        return repository.findAll();
+    }
+
+    public NewsForumPost createPost(NewsSource creator, Long id) {
+        NewsForumPost post = NewsForumPost
+                .builder()
+                .creator(creator)
+                .id(id)
+                .build();
+        return repository.save(post);
+    }
+
+}

application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/service/management/NewsPostManagementServiceBean.java

@@ -6,12 +6,12 @@ import dev.sheldan.abstracto.core.service.management.UserInServerManagementServi
 import dev.sheldan.oneplus.bot.modules.news.exception.NewsPostNotFoundException;
 import dev.sheldan.oneplus.bot.modules.news.model.database.NewsPost;
 import dev.sheldan.oneplus.bot.modules.news.repository.NewsPostRepository;
+import jakarta.persistence.*;
 import lombok.extern.slf4j.Slf4j;
 import net.dv8tion.jda.api.entities.Message;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.persistence.EntityManager;
 import java.time.Instant;
 import java.util.List;
 import java.util.Optional;

application/oneplus-bot-modules/news/src/main/java/dev/sheldan/oneplus/bot/modules/news/service/management/NewsSourceManagementServiceBean.java

@@ -0,0 +1,20 @@
+package dev.sheldan.oneplus.bot.modules.news.service.management;
+
+import dev.sheldan.oneplus.bot.modules.news.model.database.NewsSource;
+import dev.sheldan.oneplus.bot.modules.news.repository.NewsResourceRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+public class NewsSourceManagementServiceBean {
+
+    @Autowired
+    private NewsResourceRepository newsResourceRepository;
+
+    public List<NewsSource> loadNewsSources() {
+        return newsResourceRepository.findAll();
+    }
+
+}

application/oneplus-bot-modules/news/src/main/resources/migrations/1.6.11/collection.xml

@@ -6,5 +6,6 @@
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
     http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
     http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
-    <include file="structure/structure.xml" relativeToChangelogFile="true"/>
+    <include file="tables/tables.xml" relativeToChangelogFile="true"/>
+    <include file="seedData/data.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

application/oneplus-bot-modules/news/src/main/resources/migrations/1.6.11/seedData/data.xml

@@ -6,5 +6,5 @@
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
     http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
     http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
-    <include file="grafana_user.xml" relativeToChangelogFile="true"/>
+    <include file="news_check_job.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

application/oneplus-bot-modules/news/src/main/resources/migrations/1.6.11/seedData/news_check_job.xml

@@ -6,14 +6,14 @@
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
     http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
     http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
-    <changeSet author="Sheldan" id="create_grafana_user">
-        <sql>
-            CREATE USER ${abstractografanadbuser} WITH PASSWORD '${abstractografanadbpass}';
-            GRANT CONNECT ON DATABASE abstracto TO ${abstractografanadbuser};
-            GRANT USAGE ON SCHEMA abstracto TO ${abstractografanadbuser};
-            GRANT SELECT ON ALL TABLES IN SCHEMA abstracto TO ${abstractografanadbuser};
-            ALTER DEFAULT PRIVILEGES IN SCHEMA abstracto
-            GRANT SELECT ON TABLES TO ${abstractografanadbuser};
-        </sql>
+    <changeSet  author="Sheldan" id="check_for_news_job-insert">
+        <insert tableName="scheduler_job">
+            <column name="name" value="checkForNewsJob"/>
+            <column name="group_name" value="news"/>
+            <column name="clazz" value="dev.sheldan.oneplus.bot.modules.news.job.CheckForNewsPosts"/>
+            <column name="active" value="true"/>
+            <column name="cron_expression" value="0 0 0 * * ?"/>
+            <column name="recovery" value="false"/>
+        </insert>
     </changeSet>
 </databaseChangeLog>

application/oneplus-bot-modules/news/src/main/resources/migrations/1.6.11/tables/news_forum_post.xml

@@ -0,0 +1,37 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+
+    <changeSet author="Sheldan" id="news_forum_post-table">
+        <createTable tableName="news_forum_post">
+            <column name="id" type="BIGINT">
+                <constraints nullable="true" primaryKey="true" primaryKeyName="pk_news_forum_post"/>
+            </column>
+            <column name="creator_id" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="created" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="true"/>
+            </column>
+            <column name="updated" type="TIMESTAMP WITHOUT TIME ZONE"/>
+        </createTable>
+        <addForeignKeyConstraint baseColumnNames="creator_id" baseTableName="news_forum_post" constraintName="fk_news_forum_post_creator"
+                                 deferrable="false" initiallyDeferred="false" onDelete="NO ACTION" onUpdate="NO ACTION"
+                                 referencedColumnNames="user_id" referencedTableName="news_source" validate="true"/>
+
+        <sql>
+            DROP TRIGGER IF EXISTS news_forum_post_update_trigger ON news_forum_post;
+            CREATE TRIGGER repost_check_channel_group_update_trigger BEFORE UPDATE ON news_forum_post FOR EACH ROW EXECUTE PROCEDURE update_trigger_procedure();
+        </sql>
+        <sql>
+            DROP TRIGGER IF EXISTS news_forum_post_insert_trigger ON news_forum_post;
+            CREATE TRIGGER repost_check_channel_group_insert_trigger BEFORE INSERT ON news_forum_post FOR EACH ROW EXECUTE PROCEDURE insert_trigger_procedure();
+        </sql>
+    </changeSet>
+
+</databaseChangeLog>

application/oneplus-bot-modules/news/src/main/resources/migrations/1.6.11/tables/news_source.xml

@@ -0,0 +1,34 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
+                   xmlns:pro="http://www.liquibase.org/xml/ns/pro"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
+    http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
+
+    <changeSet author="Sheldan" id="news_source-table">
+        <createTable tableName="news_source">
+            <column name="user_id" type="BIGINT">
+                <constraints nullable="true" primaryKey="true" primaryKeyName="pk_news_source"/>
+            </column>
+            <column name="thread_count" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+            <column name="created" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="true"/>
+            </column>
+            <column name="updated" type="TIMESTAMP WITHOUT TIME ZONE"/>
+        </createTable>
+
+        <sql>
+            DROP TRIGGER IF EXISTS news_source_update_trigger ON news_source;
+            CREATE TRIGGER repost_check_channel_group_update_trigger BEFORE UPDATE ON news_source FOR EACH ROW EXECUTE PROCEDURE update_trigger_procedure();
+        </sql>
+        <sql>
+            DROP TRIGGER IF EXISTS news_source_insert_trigger ON news_source;
+            CREATE TRIGGER repost_check_channel_group_insert_trigger BEFORE INSERT ON news_source FOR EACH ROW EXECUTE PROCEDURE insert_trigger_procedure();
+        </sql>
+    </changeSet>
+
+</databaseChangeLog>

application/oneplus-bot-modules/news/src/main/resources/migrations/1.6.11/tables/tables.xml

@@ -6,5 +6,6 @@
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog dbchangelog.xsd
     http://www.liquibase.org/xml/ns/dbchangelog-ext dbchangelog.xsd
     http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
-    <include file="1.5.4/collection.xml" relativeToChangelogFile="true"/>
+    <include file="news_source.xml" relativeToChangelogFile="true"/>
+    <include file="news_forum_post.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

application/oneplus-bot-modules/news/src/main/resources/migrations/news-changeLog.xml

@@ -8,4 +8,5 @@
     http://www.liquibase.org/xml/ns/pro dbchangelog.xsd" >
     <include file="1.3.9-news/collection.xml" relativeToChangelogFile="true"/>
     <include file="1.3.10-news/collection.xml" relativeToChangelogFile="true"/>
+    <include file="1.6.11/collection.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

application/oneplus-bot-modules/news/src/main/resources/news.properties

@@ -1,7 +1,12 @@
 abstracto.postTargets.news.name=news
+abstracto.postTargets.forumPostNotification.name=forumPostNotification
 
 abstracto.featureFlags.news.featureName=news
 abstracto.featureFlags.news.enabled=false
 
 abstracto.feature.news.removalDays=4
 abstracto.feature.news.postLockSeconds=3600
+
+abstracto.feature.news.userURL=https://community.oneplus.com/ajax/user/frontend/user/info?uid=%s
+# TODO support pagination.. eventually
+abstracto.feature.news.threadURL=https://community.oneplus.com/ajax/user/frontend/thread/page?page=1&limit=1000&uid=%s

application/oneplus-bot-modules/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-modules/referral/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
         <artifactId>oneplus-bot-modules</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-modules/referral/src/main/java/dev/sheldan/oneplus/bot/modules/referral/model/database/ReferralUserInAServer.java

@@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.models.database.AServer;
 import dev.sheldan.abstracto.core.models.database.AUserInAServer;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.Instant;
 
 @Builder

application/oneplus-bot-modules/seasonal/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
         <artifactId>oneplus-bot-modules</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-modules/seasonal/src/main/java/dev/sheldan/oneplus/bot/modules/seasonal/lights/models/database/LightsRole.java

@@ -4,7 +4,7 @@ import dev.sheldan.abstracto.core.models.database.ARole;
 import dev.sheldan.abstracto.core.models.database.AServer;
 import lombok.*;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Builder
 @Entity

application/oneplus-bot-modules/setup/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>oneplus-bot-modules</artifactId>
         <groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
-        <version>1.5.10</version>
+        <version>1.6.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/pom.xml

@@ -5,18 +5,17 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot</groupId>
         <artifactId>oneplusbot</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.17</version>
     </parent>
 
     <groupId>dev.sheldan.oneplus.bot.application</groupId>
     <artifactId>application</artifactId>
     <packaging>pom</packaging>
-    <version>1.5.10</version>
+    <version>1.6.17</version>
     <modules>
         <module>executable</module>
         <module>oneplus-bot-customizations</module>
         <module>oneplus-bot-modules</module>
-        <module>database</module>
     </modules>
 
     <dependencyManagement>
@@ -38,15 +37,7 @@
             <artifactId>core-int</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>dev.sheldan.abstracto.modules</groupId>
-            <artifactId>utility-int</artifactId>
-        </dependency>
 
-        <dependency>
-            <groupId>dev.sheldan.abstracto.scheduling</groupId>
-            <artifactId>scheduling-int</artifactId>
-        </dependency>
     </dependencies>
 
 </project>

deployment/docker-compose/pom.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>dev.sheldan.oneplus.bot.deployment</groupId>
-        <artifactId>deployment</artifactId>
-        <version>1.5.10</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <packaging>pom</packaging>
-    <artifactId>docker-compose</artifactId>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>assembly-docker-compose-configuration</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/assembly/docker-compose.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>

deployment/docker-compose/src/main/assembly/docker-compose.xml

@@ -1,19 +0,0 @@
-<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
-    <id>docker-compose</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <fileSets>
-        <fileSet>
-            <outputDirectory>./docker-compose</outputDirectory>
-            <directory>${project.basedir}/src/main/resources/</directory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-            <filtered>true</filtered>
-        </fileSet>
-    </fileSets>
-</assembly>

deployment/docker-compose/src/main/resources/.env

@@ -1,32 +0,0 @@
-# database configuration
-DATABASE_HOST=database
-DATABASE_PORT=5432
-DATABASE_USER=abstracto
-DATABASE_NAME=abstracto
-DATABASE_PASSWORD=abstracto
-GRAFANA_DATABASE_PASSWORD=grafana
-GRAFANA_DATABASE_USER=grafana
-# deployment configuration, whether or not the container should execute the parts on startup
-EXECUTE_DEPLOYMENT=true
-EXECUTE_LIQUIBASE=true
-EXECUTE_TEMPLATES=true
-# whether or not remote debug should be enabled on the application
-REMOTE_DEBUG=false
-DEBUG_PORT=5005
-TOMCAT_PORT=8080
-# authentication for actuator endpoints
-REST_USER_NAME=abstracto
-REST_PASSWORD=password
-# port grafana will be reachable
-GRAFANA_PORT=3000
-# port prometheus will be reachable
-LOKI_PORT=3100
-PROMETHEUS_PORT=9090
-# port pg admin will be reachable
-PGADMIN_PORT=5050
-# default authentication for pg admin
-PGADMIN_DEFAULT_EMAIL=sheldan@sheldan.dev
-PGADMIN_DEFAULT_PASSWORD=admin
-TOKEN=<INSERT TOKEN>
-YOUTUBE_API_KEY=<INSERT KEY>
-ONEPLUS_BOT_VERSION=1.5.10

deployment/docker-compose/src/main/resources/README.md

@@ -1,10 +0,0 @@
-# Setup for local docker-compose deployment
-
-* Install docker [here](https://docs.docker.com/get-docker/)
-* Install docker-compose [here](https://docs.docker.com/compose/install/).
-* Execute `docker-compose build` in `image-packaging`.
-* Fill out values in `.env` for token and database password. There are some default values, but token is required to be changed.
-* Execute `fill-prometheus-file-sh` in order to populate the prometheus config with the correct password (https://github.com/prometheus/prometheus/issues/2357)
-* Execute `docker-compose up` in this directory and wait for completion.
-* Per default pgAdmin is available on `localhost:5050` with the configured user and password. It will contain a configuration in the servers list.
-

deployment/docker-compose/src/main/resources/docker-compose.yml

@@ -1,146 +0,0 @@
-version: '3.7'
-
-services:
-  db:
-    image: ${REGISTRY_PREFIX}oneplus_bot_database:${ONEPLUS_BOT_VERSION}
-    container_name: database
-    restart: always
-    environment:
-      POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
-      POSTGRES_USER: ${DATABASE_USER}
-    ports:
-      - "127.0.0.1:${DATABASE_PORT}:5432"
-    networks:
-      - oneplusbot
-    volumes:
-      - db-data:/var/lib/postgresql/data
-  deployment_container:
-    container_name: deployment
-    image: ${REGISTRY_PREFIX}oneplus_bot_deployment:${ONEPLUS_BOT_VERSION}
-    depends_on:
-      - db
-    environment:
-      DB_PASS: ${DATABASE_PASSWORD}
-      DB_HOST: ${DATABASE_HOST}
-      DB_PORT: ${DATABASE_PORT}
-      DB_USER: ${DATABASE_USER}
-      DB_NAME: ${DATABASE_NAME}
-      ABSTRACTO_GRAFANA_DB_PASS: ${GRAFANA_DATABASE_PASSWORD}
-      ABSTRACTO_GRAFANA_DB_USER: ${GRAFANA_DATABASE_USER}
-      EXECUTE_DEPLOYMENT: ${EXECUTE_DEPLOYMENT}
-      EXECUTE_LIQUIBASE: ${EXECUTE_LIQUIBASE}
-      EXECUTE_TEMPLATES: ${EXECUTE_TEMPLATES}
-      LIQUIBASE_PATH: ${LIQUIBASE_PATH:-/liquibase}
-      POSTGRES_DRIVER_PATH: ${EXECUTE_DEPLOYMENT:-/postgres/driver.jar}
-      WAIT_HOSTS: ${DATABASE_HOST}:${DATABASE_PORT}
-    networks:
-      - oneplusbot
-  bot:
-    image: ${REGISTRY_PREFIX}oneplus_bot:${ONEPLUS_BOT_VERSION}
-    depends_on:
-      - db
-      - deployment_container
-    restart: on-failure
-    container_name: oneplusbot
-    environment:
-      TOKEN: ${TOKEN}
-      REMOTE_DEBUG: ${REMOTE_DEBUG}
-      DB_PASS: ${DATABASE_PASSWORD}
-      DB_HOST: ${DATABASE_HOST}
-      DB_PORT: ${DATABASE_PORT}
-      DB_USER: ${DATABASE_USER}
-      DB_NAME: ${DATABASE_NAME}
-      REST_USER_NAME: ${REST_USER_NAME}
-      REST_PASSWORD: ${REST_PASSWORD}
-      YOUTUBE_API_KEY: ${YOUTUBE_API_KEY}
-    command: sh -c "while ping -c1 deployment_container &>/dev/null; do sleep 1; done; echo 'Liquibase finished!' && ./start.sh"
-    ports:
-      - "127.0.0.1:${DEBUG_PORT}:5005"
-      - "127.0.0.1:${TOMCAT_PORT}:8080"
-    networks:
-      - oneplusbot
-    volumes:
-      - bot-logs:/logs
-      - ./config:/config
-  pgadmin:
-    container_name: pgadmin
-    image: ${REGISTRY_PREFIX}oneplus_bot_pg_admin:${ONEPLUS_BOT_VERSION}
-    depends_on:
-      - db
-    environment:
-      PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL}
-      PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD}
-    ports:
-      - "127.0.0.1:${PGADMIN_PORT}:80"
-    restart: unless-stopped
-    networks:
-      - oneplusbot
-  prometheus:
-    container_name: prometheus
-    image: ${REGISTRY_PREFIX}oneplus_bot_prometheus:${ONEPLUS_BOT_VERSION}
-    depends_on:
-      - bot
-    ports:
-      - "127.0.0.1:${PROMETHEUS_PORT}:9090"
-    restart: unless-stopped
-    networks:
-      - oneplusbot
-    volumes:
-      - ./res/prometheus-scrapper-password-filled:/etc/prometheus/micrometer_password
-      - prometheus-data:/prometheus
-  grafana:
-    container_name: grafana
-    image: ${REGISTRY_PREFIX}oneplus_bot_grafana:${ONEPLUS_BOT_VERSION}
-    depends_on:
-      - prometheus
-      - bot
-    ports:
-      - "127.0.0.1:${GRAFANA_PORT}:3000"
-    restart: unless-stopped
-    environment:
-      DB_PASS: ${GRAFANA_DATABASE_PASSWORD}
-      DB_HOST: ${DATABASE_HOST}
-      DB_PORT: ${DATABASE_PORT}
-      DB_USER: ${GRAFANA_DATABASE_USER}
-      DB_NAME: ${DATABASE_NAME}
-      PROMETHEUS_HOST: 'prometheus'
-      PROMETHEUS_PORT: 9090
-      LOKI_HOST: 'loki'
-      LOKI_PORT: ${LOKI_PORT}
-    volumes:
-      - grafana-user-data:/var/lib/grafana
-    networks:
-      - oneplusbot
-  promtail:
-    container_name: promtail
-    image: ${REGISTRY_PREFIX}oneplus_bot_promtail:${ONEPLUS_BOT_VERSION}
-    depends_on:
-      - bot
-    restart: unless-stopped
-    command: -config.file=/mnt/config/promtail-config.yaml
-    volumes:
-      - bot-logs:/logs
-    networks:
-      - oneplusbot
-  loki:
-    container_name: loki
-    image: ${REGISTRY_PREFIX}oneplus_bot_loki:${ONEPLUS_BOT_VERSION}
-    depends_on:
-      - promtail
-    command: -config.file=/mnt/config/loki-config.yaml
-    ports:
-      - "127.0.0.1:${LOKI_PORT}:3100"
-    restart: unless-stopped
-    networks:
-      - oneplusbot
-
-networks:
-  oneplusbot:
-    driver: bridge
-    name: oneplusbot-network
-
-volumes:
-  db-data:
-  grafana-user-data:
-  prometheus-data:
-  bot-logs:

deployment/docker-compose/src/main/resources/fill-prometheus-file.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-set -o allexport
-source .env
-set +o allexport
-envsubst < res/prometheus-scrapper-password > res/prometheus-scrapper-password-filled

deployment/docker-compose/src/main/resources/res/prometheus-scrapper-password

@@ -1 +0,0 @@
-${REST_PASSWORD}

deployment/helm/oneplus-bot/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

deployment/helm/oneplus-bot/Chart.yaml

@@ -0,0 +1,24 @@
+apiVersion: v2
+name: oneplus-bot
+description: A Helm chart for Kubernetes
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 1.6.16
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: "1.6.16"

deployment/helm/oneplus-bot/configuration/grafana/config.yaml

@@ -0,0 +1,4 @@
+base_url: {{ $.Values.grafanaDeployment.grafana.host }}
+username: {{ $.Values.grafanaDeployment.grafana.basicAuth.username }}
+password: {{ $.Values.grafanaDeployment.grafana.basicAuth.password }}
+folder_name: OnePlusBot

deployment/helm/oneplus-bot/configuration/grafana/oneplus-bot-discord-dashboard.json

@@ -0,0 +1,939 @@
+{
+  "dashboard": {
+    "annotations": {
+      "list": [
+        {
+          "builtIn": 1,
+          "datasource": {
+            "type": "grafana",
+            "uid": "-- Grafana --"
+          },
+          "enable": true,
+          "hide": true,
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "name": "Annotations & Alerts",
+          "type": "dashboard"
+        }
+      ]
+    },
+    "editable": true,
+    "fiscalYearStartMonth": 0,
+    "graphTooltip": 0,
+    "links": [],
+    "liveNow": false,
+    "panels": [
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "prometheus"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "line",
+              "fillOpacity": 0,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 8,
+          "w": 12,
+          "x": 0,
+          "y": 0
+        },
+        "id": 1,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "prometheus"
+            },
+            "editorMode": "code",
+            "expr": "increase(discord_api_interactions_total{namespace=\"oneplus-bot\"}[1m]) /2",
+            "instant": false,
+            "legendFormat": "{{ "{{" }} action {{ "}}" }}",
+            "range": true,
+            "refId": "A"
+          }
+        ],
+        "title": "Discord API Interaction",
+        "type": "timeseries"
+      },
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "prometheus"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "line",
+              "fillOpacity": 0,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 8,
+          "w": 12,
+          "x": 12,
+          "y": 0
+        },
+        "id": 2,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "prometheus"
+            },
+            "editorMode": "code",
+            "expr": "increase(command_processed_total{namespace=\"oneplus-bot\"}[1m]) / 2",
+            "instant": false,
+            "legendFormat": "{{ "{{" }}type{{ "}}" }}-{{ "{{" }}status{{ "}}" }}",
+            "range": true,
+            "refId": "A"
+          }
+        ],
+        "title": "Commands processed",
+        "type": "timeseries"
+      },
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "prometheus"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "line",
+              "fillOpacity": 0,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 8,
+          "w": 12,
+          "x": 0,
+          "y": 8
+        },
+        "id": 3,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "prometheus"
+            },
+            "editorMode": "code",
+            "expr": "increase(message_total{namespace=\"oneplus-bot\"}[1m]) / 2",
+            "instant": false,
+            "legendFormat": "{{ "{{" }} action {{ "}}" }}",
+            "range": true,
+            "refId": "A"
+          }
+        ],
+        "title": "Message events",
+        "type": "timeseries"
+      },
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "prometheus"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "line",
+              "fillOpacity": 0,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 8,
+          "w": 12,
+          "x": 12,
+          "y": 8
+        },
+        "id": 4,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "prometheus"
+            },
+            "editorMode": "code",
+            "expr": "increase(okhttp_request_total{namespace=\"oneplus-bot\"}[1m]) / 2",
+            "instant": false,
+            "legendFormat": "{{ "{{" }} http_code {{ "}}" }}",
+            "range": true,
+            "refId": "A"
+          }
+        ],
+        "title": "HTTP Reponse codes",
+        "type": "timeseries"
+      },
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "prometheus"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "line",
+              "fillOpacity": 0,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 8,
+          "w": 12,
+          "x": 0,
+          "y": 16
+        },
+        "id": 5,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "prometheus"
+            },
+            "editorMode": "code",
+            "expr": "increase(cache_evictions_total{application=\"$application\", cache=\"messages\", namespace=\"oneplus-bot\"}[1m]) / 2",
+            "instant": false,
+            "legendFormat": "Cache evictions",
+            "range": true,
+            "refId": "A"
+          },
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "prometheus"
+            },
+            "editorMode": "code",
+            "expr": "increase(cache_gets_total{application=\"$application\", cache=\"messages\", namespace=\"oneplus-bot\"}[1m]) / 2",
+            "hide": false,
+            "instant": false,
+            "legendFormat": "Cache gets {{ "{{" }} result {{ "}}" }}",
+            "range": true,
+            "refId": "B"
+          },
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "prometheus"
+            },
+            "editorMode": "code",
+            "expr": "increase(cache_puts_total{application=\"$application\", cache=\"messages\", namespace=\"oneplus-bot\"}[1m]) / 2",
+            "hide": false,
+            "instant": false,
+            "legendFormat": "Cache puts",
+            "range": true,
+            "refId": "C"
+          },
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "prometheus"
+            },
+            "editorMode": "code",
+            "expr": "increase(cache_removals{application=\"$application\", cache=\"messages\", namespace=\"oneplus-bot\"}[1m]) / 2",
+            "hide": false,
+            "instant": false,
+            "legendFormat": "Cache  removals",
+            "range": true,
+            "refId": "D"
+          }
+        ],
+        "title": "Message cache statistic",
+        "type": "timeseries"
+      },
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "prometheus"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "line",
+              "fillOpacity": 0,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 8,
+          "w": 12,
+          "x": 12,
+          "y": 16
+        },
+        "id": 6,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "prometheus"
+            },
+            "editorMode": "code",
+            "expr": "discord_gateway_ping{namespace=\"oneplus-bot\"}",
+            "instant": false,
+            "legendFormat": "Gateway ping",
+            "range": true,
+            "refId": "A"
+          }
+        ],
+        "title": "Gateway ping",
+        "type": "timeseries"
+      },
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "prometheus"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "line",
+              "fillOpacity": 0,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 8,
+          "w": 12,
+          "x": 0,
+          "y": 24
+        },
+        "id": 7,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "prometheus"
+            },
+            "editorMode": "code",
+            "expr": "increase(starboard_stars_total{namespace=\"oneplus-bot\"}[1m]) / 2",
+            "instant": false,
+            "legendFormat": "{{ "{{" }} action {{ "}}" }}",
+            "range": true,
+            "refId": "A"
+          }
+        ],
+        "title": "Starboard reactions",
+        "type": "timeseries"
+      },
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "prometheus"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "line",
+              "fillOpacity": 0,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 8,
+          "w": 12,
+          "x": 12,
+          "y": 24
+        },
+        "id": 8,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "prometheus"
+            },
+            "editorMode": "code",
+            "expr": "increase(emote_usages_total{namespace=\"oneplus-bot\"}[1m]) / 2",
+            "instant": false,
+            "legendFormat": "Used emotes",
+            "range": true,
+            "refId": "A"
+          }
+        ],
+        "title": "Used tracked emotes",
+        "type": "timeseries"
+      },
+      {
+        "datasource": {
+          "type": "prometheus",
+          "uid": "prometheus"
+        },
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "line",
+              "fillOpacity": 0,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 16,
+          "w": 24,
+          "x": 0,
+          "y": 32
+        },
+        "id": 9,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "prometheus",
+              "uid": "prometheus"
+            },
+            "editorMode": "code",
+            "expr": "increase(jda_event_total{namespace=\"oneplus-bot\"}[1m]) / 2",
+            "instant": false,
+            "legendFormat": "{{ "{{" }} event_class {{ "}}" }}",
+            "range": true,
+            "refId": "A"
+          }
+        ],
+        "title": "JDA Events",
+        "type": "timeseries"
+      }
+    ],
+    "refresh": "",
+    "schemaVersion": 38,
+    "style": "dark",
+    "tags": [],
+    "templating": {
+      "list": [
+        {
+          "hide": 2,
+          "label": "",
+          "name": "application",
+          "query": "OnePlusBot",
+          "skipUrlSync": false,
+          "type": "constant"
+        }
+      ]
+    },
+    "time": {
+      "from": "now-30m",
+      "to": "now"
+    },
+    "timepicker": {},
+    "timezone": "",
+    "title": "OnePlusBot Discord status",
+    "uid": "8e3188c3-4ea2-4223-865e-d1681f1ef0fb",
+    "version": 2,
+    "weekStart": ""
+  },
+  "overwrite": true
+}

deployment/helm/oneplus-bot/configuration/grafana/oneplus-bot-log-dashboard.json

@@ -0,0 +1,238 @@
+{
+  "dashboard": {
+    "annotations": {
+      "list": [
+        {
+          "builtIn": 1,
+          "datasource": {
+            "type": "grafana",
+            "uid": "-- Grafana --"
+          },
+          "enable": true,
+          "hide": true,
+          "iconColor": "rgba(0, 211, 255, 1)",
+          "name": "Annotations & Alerts",
+          "type": "dashboard"
+        }
+      ]
+    },
+    "description": "Overview over logging outputs of OnePlusBot",
+    "editable": true,
+    "fiscalYearStartMonth": 0,
+    "graphTooltip": 0,
+    "links": [],
+    "liveNow": false,
+    "panels": [
+      {
+        "datasource": {
+          "type": "loki",
+          "uid": "loki"
+        },
+        "description": "Display logs and search for logs",
+        "gridPos": {
+          "h": 13,
+          "w": 24,
+          "x": 0,
+          "y": 0
+        },
+        "id": 4,
+        "options": {
+          "dedupStrategy": "none",
+          "enableLogDetails": true,
+          "prettifyLogMessage": false,
+          "showCommonLabels": false,
+          "showLabels": false,
+          "showTime": false,
+          "sortOrder": "Ascending",
+          "wrapLogMessage": true
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "loki",
+              "uid": "loki"
+            },
+            "editorMode": "builder",
+            "expr": "{app=\"oneplus-bot\", namespace=\"oneplus-bot\"} |= `$logFilter`",
+            "maxLines": 5000,
+            "queryType": "range",
+            "refId": "A"
+          }
+        ],
+        "title": "OnePlusBot Logs",
+        "type": "logs"
+      },
+      {
+        "datasource": {
+          "type": "loki",
+          "uid": "loki"
+        },
+        "description": "Any line on level ERROR",
+        "gridPos": {
+          "h": 8,
+          "w": 12,
+          "x": 0,
+          "y": 13
+        },
+        "id": 2,
+        "options": {
+          "dedupStrategy": "none",
+          "enableLogDetails": true,
+          "prettifyLogMessage": false,
+          "showCommonLabels": false,
+          "showLabels": false,
+          "showTime": false,
+          "sortOrder": "Ascending",
+          "wrapLogMessage": true
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "loki",
+              "uid": "loki"
+            },
+            "editorMode": "code",
+            "expr": "{app=\"oneplus-bot\", namespace=\"oneplus-bot\"} |= \"ERROR\"",
+            "maxLines": 5000,
+            "queryType": "range",
+            "refId": "A"
+          }
+        ],
+        "title": "OnePlusBot Error Logs",
+        "type": "logs"
+      },
+      {
+        "datasource": {
+          "type": "loki",
+          "uid": "loki"
+        },
+        "description": "Number of log events",
+        "fieldConfig": {
+          "defaults": {
+            "color": {
+              "mode": "palette-classic"
+            },
+            "custom": {
+              "axisCenteredZero": false,
+              "axisColorMode": "text",
+              "axisLabel": "",
+              "axisPlacement": "auto",
+              "barAlignment": 0,
+              "drawStyle": "line",
+              "fillOpacity": 0,
+              "gradientMode": "none",
+              "hideFrom": {
+                "legend": false,
+                "tooltip": false,
+                "viz": false
+              },
+              "insertNulls": false,
+              "lineInterpolation": "linear",
+              "lineWidth": 1,
+              "pointSize": 5,
+              "scaleDistribution": {
+                "type": "linear"
+              },
+              "showPoints": "auto",
+              "spanNulls": false,
+              "stacking": {
+                "group": "A",
+                "mode": "none"
+              },
+              "thresholdsStyle": {
+                "mode": "off"
+              }
+            },
+            "mappings": [],
+            "thresholds": {
+              "mode": "absolute",
+              "steps": [
+                {
+                  "color": "green",
+                  "value": null
+                },
+                {
+                  "color": "red",
+                  "value": 80
+                }
+              ]
+            }
+          },
+          "overrides": []
+        },
+        "gridPos": {
+          "h": 8,
+          "w": 12,
+          "x": 12,
+          "y": 13
+        },
+        "id": 3,
+        "options": {
+          "legend": {
+            "calcs": [],
+            "displayMode": "list",
+            "placement": "bottom",
+            "showLegend": true
+          },
+          "tooltip": {
+            "mode": "single",
+            "sort": "none"
+          }
+        },
+        "targets": [
+          {
+            "datasource": {
+              "type": "loki",
+              "uid": "loki"
+            },
+            "editorMode": "code",
+            "expr": "rate({app=\"oneplus-bot\", namespace=\"oneplus-bot\"}[$__interval])",
+            "queryType": "range",
+            "refId": "A"
+          }
+        ],
+        "title": "Log Rate",
+        "type": "timeseries"
+      }
+    ],
+    "refresh": "",
+    "schemaVersion": 38,
+    "style": "dark",
+    "tags": [],
+    "templating": {
+      "list": [
+        {
+          "current": {
+            "selected": false,
+            "text": "",
+            "value": ""
+          },
+          "description": "What to search in the logs",
+          "hide": 0,
+          "name": "logFilter",
+          "options": [
+            {
+              "selected": true,
+              "text": "",
+              "value": ""
+            }
+          ],
+          "query": "",
+          "skipUrlSync": false,
+          "type": "textbox"
+        }
+      ]
+    },
+    "time": {
+      "from": "now-30m",
+      "to": "now"
+    },
+    "timepicker": {},
+    "timezone": "",
+    "title": "OnePlus Bot Logs",
+    "uid": "b30e19ce-eb4b-4534-bf51-9fd7da75f606",
+    "version": 2,
+    "weekStart": ""
+  },
+  "overwrite": true
+}

deployment/helm/oneplus-bot/templates/_helpers.tpl

@@ -0,0 +1,62 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "oneplusBot.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "oneplusBot.fullname" -}}
+{{- if .Values.fullnameOverride }}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- if contains $name .Release.Name }}
+{{- .Release.Name | trunc 63 | trimSuffix "-" }}
+{{- else }}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
+{{- end }}
+{{- end }}
+{{- end }}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "oneplusBot.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "oneplusBot.labels" -}}
+helm.sh/chart: {{ include "oneplusBot.chart" . }}
+{{ include "oneplusBot.selectorLabels" . }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "oneplusBot.selectorLabels" -}}
+app.kubernetes.io/name: {{ include "oneplusBot.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "oneplusBot.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create }}
+{{- default (include "oneplusBot.fullname" .) .Values.serviceAccount.name }}
+{{- else }}
+{{- default "default" .Values.serviceAccount.name }}
+{{- end }}
+{{- end }}

deployment/helm/oneplus-bot/templates/api-keys.yaml

@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: api-keys
+data:
+  discordToken: {{ $.Values.apiKeys.discord.token | b64enc }} # b64enc is needed, because a stringData secret field cannot hold numeric values
+  youtubeApiKey: {{ $.Values.apiKeys.youtube.apiKey | b64enc }}

deployment/helm/oneplus-bot/templates/db-config-deployment-job.yaml

@@ -0,0 +1,69 @@
+{{- if .Values.dbConfigDeployment.enabled -}}
+apiVersion: batch/v1
+kind: Job
+metadata:
+{{- $deploymentJobName := print ((include "oneplusBot.fullname" .) | trunc 39) "-db-config-deployment-job" }}
+  name: {{ $deploymentJobName | trunc 63 }}
+  annotations:
+    "helm.sh/hook": pre-upgrade,pre-install
+    "helm.sh/hook-weight": "-5"
+    "helm.sh/hook-delete-policy": hook-succeeded
+spec:
+  template:
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      containers:
+        - name: db-config-deployment-job
+          image: "{{ $.Values.dbConfigDeployment.repository }}/{{ $.Values.dbConfigDeployment.image }}:{{ $.Values.dbConfigDeployment.tag | default .Chart.AppVersion}}"
+          imagePullPolicy: {{ $.Values.dbConfigDeployment.pullPolicy }}
+          args:
+            - "/var/db-config/"
+          env:
+            - name: DB_PASS
+              valueFrom:
+                secretKeyRef:
+                  name: db-credentials
+                  key: dbPassword
+            - name: DB_HOST
+              valueFrom:
+                secretKeyRef:
+                  name: db-credentials
+                  key: dbHost
+            - name: DB_PORT
+              valueFrom:
+                secretKeyRef:
+                  name: db-credentials
+                  key: dbPort
+            - name: DB_USER
+              valueFrom:
+                secretKeyRef:
+                  name: db-credentials
+                  key: dbUser
+            - name: DB_NAME
+              valueFrom:
+                secretKeyRef:
+                  name: db-credentials
+                  key: dbName
+            - name: DB_SCHEME
+              value: "abstracto"
+          volumeMounts:
+            - mountPath: "/var/db-config/"
+              name: database-config-mount
+      restartPolicy: Never
+      initContainers:
+        - name: database-config-data
+          image: "{{ $.Values.dbConfigDeploymentData.repository }}/{{ $.Values.dbConfigDeploymentData.image }}:{{ $.Values.dbConfigDeploymentData.tag | default .Chart.AppVersion}}"
+          imagePullPolicy: {{ $.Values.dbConfigDeploymentData.pullPolicy }}
+          volumeMounts:
+            - mountPath: "/var/run-config"
+              name: database-config-mount
+      volumes:
+        - name: database-config-mount
+          emptyDir: {}
+  backoffLimit: 4
+{{- end }}
+
+

deployment/helm/oneplus-bot/templates/db-credentials.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: db-credentials
+  annotations:
+    "helm.sh/hook": pre-upgrade,pre-install
+    "helm.sh/hook-weight": "-6"
+data:
+  dbPassword: {{ $.Values.dbCredentials.password | b64enc }} # b64enc is needed, because a stringData secret field cannot hold numeric values
+  dbUser: {{ $.Values.dbCredentials.userName | b64enc }}
+  dbHost: {{ $.Values.dbCredentials.host | b64enc }}
+  dbPort: {{ $.Values.dbCredentials.port | b64enc }}
+  dbName: {{ $.Values.dbCredentials.name | b64enc }}

deployment/helm/oneplus-bot/templates/deployment.yaml

@@ -0,0 +1,116 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "oneplusBot.fullname" . }}
+  labels:
+    {{- include "oneplusBot.labels" . | nindent 4 }}
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      {{- include "oneplusBot.selectorLabels" . | nindent 6 }}
+  template:
+    metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        {{- include "oneplusBot.selectorLabels" . | nindent 8 }}
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "oneplusBot.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
+          image: "{{ .Values.bot.repository }}/{{ .Values.bot.image }}:{{ .Values.bot.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.bot.pullPolicy }}
+          env:
+            - name: DB_PASS
+              valueFrom:
+                secretKeyRef:
+                  name: db-credentials
+                  key: dbPassword
+            - name: DB_HOST
+              valueFrom:
+                secretKeyRef:
+                  name: db-credentials
+                  key: dbHost
+            - name: DB_PORT
+              valueFrom:
+                secretKeyRef:
+                  name: db-credentials
+                  key: dbPort
+            - name: DB_USER
+              valueFrom:
+                secretKeyRef:
+                  name: db-credentials
+                  key: dbUser
+            - name: DB_NAME
+              valueFrom:
+                secretKeyRef:
+                  name: db-credentials
+                  key: dbName
+            - name: NEWS_FORUM_POST_NOTIFICATION_SERVER_ID
+              value: "{{ .Values.bot.config.newsForumPostNotificationServerId }}"
+            - name: TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: api-keys
+                  key: discordToken
+            - name: OPEN_WEATHER_MAP_API_KEY
+              value: "placeholder" # a value is required, if the webservices module is loaded, but weather not used
+            - name: YOUTUBE_API_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: api-keys
+                  key: youtubeApiKey
+            - name: PRIVATE_REST_API_HOST
+              value: "{{ .Values.privateRestApi.service.name }}.{{ .Release.Namespace }}.svc.cluster.local"
+            - name: PRIVATE_REST_API_PORT
+              value: "{{ .Values.privateRestApi.service.targetPort }}"
+            {{- range $key, $value := .Values.bot.propertyConfig }}
+            - name: {{ $key | quote }}
+              value: {{ $value | quote}}
+            {{- end }}
+          ports:
+            - name: http
+              containerPort: {{ .Values.service.port }}
+              protocol: TCP
+            - name: debug
+              containerPort: 5005
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /actuator/health/liveness
+              port: 8080
+            initialDelaySeconds: {{ $.Values.bot.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ $.Values.bot.livenessProbe.periodSeconds }}
+            failureThreshold: {{ $.Values.bot.livenessProbe.failureThreshold }}
+          readinessProbe:
+            httpGet:
+              path: /actuator/health/readiness
+              port: 8080
+            initialDelaySeconds: {{ $.Values.bot.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ $.Values.bot.readinessProbe.periodSeconds }}
+            failureThreshold: {{ $.Values.bot.readinessProbe.failureThreshold }}
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}

deployment/helm/oneplus-bot/templates/grafana-dashboard-deployment.yaml

@@ -0,0 +1,42 @@
+{{- if $.Values.grafanaDeployment.enabled }}
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: grafana-dashboard-deployment-job
+  annotations:
+    "helm.sh/hook": post-install
+    "helm.sh/hook-weight": "-4"
+    "helm.sh/hook-delete-policy": hook-succeeded
+spec:
+  template:
+    spec:
+        {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
+      containers:
+        - name: template-deployment-job
+          image: "{{ $.Values.grafanaDeployment.repository }}/{{ $.Values.grafanaDeployment.image }}:{{ $.Values.grafanaDeployment.tag }}"
+          imagePullPolicy: {{ $.Values.grafanaDeployment.pullPolicy }}
+          args:
+            - "/var/userconfig"
+          volumeMounts:
+            - mountPath: "/var/userconfig"
+              name: grafana-dashboard-config
+              readOnly: true
+      volumes:
+        - name: grafana-dashboard-config
+          secret:
+            secretName: grafana-dashboard-config
+      restartPolicy: Never
+  backoffLimit: 4
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: grafana-dashboard-config
+data:
+  config.yaml: {{ (tpl (.Files.Get "configuration/grafana/config.yaml") . ) | b64enc }}
+  log-dashboard.json: {{ (tpl (.Files.Get "configuration/grafana/oneplus-bot-log-dashboard.json") . ) | b64enc }}
+  discord-dashboard.json: {{ (tpl (.Files.Get "configuration/grafana/oneplus-bot-discord-dashboard.json") . ) | b64enc }}
+{{- end }}

deployment/helm/oneplus-bot/templates/private-rest-api-deployment.yaml

@@ -0,0 +1,65 @@
+{{- if .Values.privateRestApi.enabled -}}
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ include "oneplusBot.fullname" . }}-private-rest-api
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: private-rest-api
+  template:
+    metadata:
+      {{- with .Values.privateRestApi.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      labels:
+        app: private-rest-api
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      serviceAccountName: {{ include "oneplusBot.serviceAccountName" . }}
+      securityContext:
+        {{- toYaml .Values.privateRestApi.podSecurityContext | nindent 8 }}
+      containers:
+        - name: {{ .Chart.Name }}-private-rest-api
+          securityContext:
+            {{- toYaml .Values.privateRestApi.securityContext | nindent 12 }}
+          image: "{{ .Values.privateRestApi.repository }}/{{ .Values.privateRestApi.image }}:{{ .Values.privateRestApi.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.privateRestApi.pullPolicy }}
+          ports:
+            - name: {{ .Values.privateRestApi.service.name }}
+              containerPort: {{ .Values.privateRestApi.service.port }}
+              protocol: TCP
+          livenessProbe:
+            httpGet:
+              path: /
+              port: {{ .Values.privateRestApi.service.port }}
+            initialDelaySeconds: {{ $.Values.privateRestApi.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ $.Values.privateRestApi.livenessProbe.periodSeconds }}
+            failureThreshold: {{ $.Values.privateRestApi.livenessProbe.failureThreshold }}
+          readinessProbe:
+            httpGet:
+              path: /
+              port: {{ .Values.privateRestApi.service.port }}
+            initialDelaySeconds: {{ $.Values.privateRestApi.readinessProbe.initialDelaySeconds }}
+            periodSeconds: {{ $.Values.privateRestApi.readinessProbe.periodSeconds }}
+            failureThreshold: {{ $.Values.privateRestApi.readinessProbe.failureThreshold }}
+          resources:
+            {{- toYaml .Values.privateRestApi.resources | nindent 12 }}
+      {{- with .Values.privateRestApi.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.privateRestApi.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.privateRestApi.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+{{- end }}

deployment/helm/oneplus-bot/templates/private-rest-api-service.yaml

@@ -0,0 +1,12 @@
+{{- if .Values.privateRestApi.enabled -}}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ .Values.privateRestApi.service.name }}
+spec:
+  selector:
+    app: private-rest-api
+  ports:
+    - port: {{ .Values.privateRestApi.service.targetPort }}
+      targetPort: {{ .Values.privateRestApi.service.port }}
+{{- end }}

deployment/helm/oneplus-bot/templates/service.yaml

@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "oneplusBot.fullname" . }}
+  labels:
+    {{- include "oneplusBot.labels" . | nindent 4 }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  type: {{ .Values.service.type }}
+  ports:
+    - port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "oneplusBot.selectorLabels" . | nindent 4 }}

deployment/helm/oneplus-bot/templates/serviceaccount.yaml

@@ -0,0 +1,12 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "oneplusBot.serviceAccountName" . }}
+  labels:
+    {{- include "oneplusBot.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}

deployment/helm/oneplus-bot/templates/template-deployment-job.yaml

@@ -0,0 +1,69 @@
+{{- if .Values.dbConfigDeployment.enabled -}}
+apiVersion: batch/v1
+kind: Job
+metadata:
+{{- $deploymentJobName := print ((include "oneplusBot.fullname" .) | trunc 39) "-template-deployment-job" }}
+  name: {{ $deploymentJobName | trunc 63 }}
+  annotations:
+    "helm.sh/hook": pre-upgrade,pre-install
+    "helm.sh/hook-weight": "-4"
+    "helm.sh/hook-delete-policy": hook-succeeded
+spec:
+  template:
+    spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      containers:
+        - name: template-deployment-job
+          image: "{{ $.Values.templateDeployment.repository }}/{{ $.Values.templateDeployment.image }}:{{ $.Values.templateDeployment.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ $.Values.templateDeployment.pullPolicy }}
+          args:
+            - "/var/template-config/"
+          env:
+            - name: DB_PASS
+              valueFrom:
+                secretKeyRef:
+                  name: db-credentials
+                  key: dbPassword
+            - name: DB_HOST
+              valueFrom:
+                secretKeyRef:
+                  name: db-credentials
+                  key: dbHost
+            - name: DB_PORT
+              valueFrom:
+                secretKeyRef:
+                  name: db-credentials
+                  key: dbPort
+            - name: DB_USER
+              valueFrom:
+                secretKeyRef:
+                  name: db-credentials
+                  key: dbUser
+            - name: DB_NAME
+              valueFrom:
+                secretKeyRef:
+                  name: db-credentials
+                  key: dbName
+            - name: DB_SCHEME
+              value: "abstracto."
+          volumeMounts:
+            - mountPath: "/var/template-config/"
+              name: template-config-mount
+      initContainers:
+        - name: database-config-data
+          image: "{{ $.Values.templateDeploymentData.repository }}/{{ $.Values.templateDeploymentData.image }}:{{ $.Values.templateDeploymentData.tag | default .Chart.AppVersion}}"
+          imagePullPolicy: {{ $.Values.templateDeploymentData.pullPolicy }}
+          volumeMounts:
+            - mountPath: "/var/run-config"
+              name: template-config-mount
+      volumes:
+        - name: template-config-mount
+          emptyDir: {}
+      restartPolicy: Never
+  backoffLimit: 4
+{{- end }}
+
+

deployment/helm/oneplus-bot/values.yaml

@@ -0,0 +1,161 @@
+# Default values for oneplus-bot.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+bot:
+  repository: harbor.sheldan.dev/oneplus-bot
+  pullPolicy: IfNotPresent
+  image: oneplus-bot-image
+  tag: 1.6.16
+  livenessProbe:
+    initialDelaySeconds: 60
+    periodSeconds: 5
+    failureThreshold: 3
+  readinessProbe:
+    initialDelaySeconds: 60
+    periodSeconds: 5
+    failureThreshold: 3
+  config:
+    newsForumPostNotificationServerId:
+  propertyConfig:
+    hikariPoolSize: 10
+
+templateDeployment:
+  enabled: true
+  repository: harbor.sheldan.dev/abstracto
+  pullPolicy: Always
+  image: abstracto-template-deployment
+  tag: 1.5.23
+
+templateDeploymentData:
+  repository: harbor.sheldan.dev/oneplus-bot
+  pullPolicy: Always
+  image: oneplus-bot-template-data
+  tag: 1.6.16
+
+dbConfigDeployment:
+  enabled: true
+  repository: harbor.sheldan.dev/abstracto
+  pullPolicy: Always
+  image: abstracto-db-deployment
+  tag: 1.5.23
+
+dbConfigDeploymentData:
+  repository: harbor.sheldan.dev/oneplus-bot
+  pullPolicy: Always
+  image: oneplus-bot-db-data
+  tag: 1.6.16
+
+dbCredentials:
+  host:
+  port:
+  userName:
+  password:
+  name:
+
+privateRestApi:
+  enabled: true
+  repository: harbor.sheldan.dev/oneplus-bot
+  pullPolicy: Always
+  image: oneplus-bot-private-rest-api
+  tag: 1.6.16
+  podAnnotations: {}
+  podSecurityContext: {}
+  securityContext: {}
+  livenessProbe:
+    initialDelaySeconds: 2
+    periodSeconds: 5
+    failureThreshold: 3
+  readinessProbe:
+    initialDelaySeconds: 2
+    periodSeconds: 5
+    failureThreshold: 3
+  service:
+    port: 8080
+    targetPort: 80
+    name: private-restapi # must be less than 16 chars
+  resources:
+    limits:
+      cpu:
+      memory:
+    requests:
+      cpu:
+      memory:
+  nodeSelector: {}
+  tolerations: []
+  affinity: {}
+
+grafanaDeployment:
+  repository: harbor.sheldan.dev/grafana-tools
+  pullPolicy: Always
+  image: grafana-dashboard-deployment
+  tag: 0.0.2
+  enabled: true
+  grafana:
+    host:
+    basicAuth:
+      username:
+      password:
+
+apiKeys:
+  discord:
+    token:
+  youtube:
+    apiKey:
+  openWeatherMap:
+    apiKey:
+  twitch:
+    secret:
+    clientId:
+
+
+imagePullSecrets:
+nameOverride: ""
+fullnameOverride: ""
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+
+podAnnotations: {}
+
+podSecurityContext: {}
+  # fsGroup: 2000
+
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 8080
+  annotations:
+    prometheus.io/scrape: "true"
+    prometheus.io/path: "/actuator/prometheus"
+    prometheus.io/port: "8080"
+
+resources:
+  limits:
+    cpu:
+    memory:
+  requests:
+    cpu:
+    memory:
+
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}

deployment/image-packaging/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.deployment</groupId>
         <artifactId>deployment</artifactId>
-        <version>1.5.10</version>
+        <version>1.6.17</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -49,7 +49,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>core.zip</destFileName>
                         </artifactItem>
 
@@ -59,7 +59,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>experience-tracking.zip</destFileName>
                         </artifactItem>
 
@@ -69,7 +69,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>assignable-roles.zip</destFileName>
                         </artifactItem>
 
@@ -79,7 +79,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>anti-raid.zip</destFileName>
                         </artifactItem>
 
@@ -89,7 +89,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>voice-channel-context.zip</destFileName>
                         </artifactItem>
 
@@ -99,7 +99,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>modmail.zip</destFileName>
                         </artifactItem>
 
@@ -109,7 +109,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>moderation.zip</destFileName>
                         </artifactItem>
 
@@ -119,7 +119,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>entertainment.zip</destFileName>
                         </artifactItem>
                         <artifactItem>
@@ -128,7 +128,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>link-embed.zip</destFileName>
                         </artifactItem>
                         <artifactItem>
@@ -137,7 +137,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>starboard.zip</destFileName>
                         </artifactItem>
                         <artifactItem>
@@ -146,7 +146,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>utility.zip</destFileName>
                         </artifactItem>
 
@@ -156,7 +156,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>webservices.zip</destFileName>
                         </artifactItem>
 
@@ -166,7 +166,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>remind.zip</destFileName>
                         </artifactItem>
 
@@ -176,7 +176,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>suggestion.zip</destFileName>
                         </artifactItem>
 
@@ -186,7 +186,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>invite-filter.zip</destFileName>
                         </artifactItem>
 
@@ -196,17 +196,37 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>statistic.zip</destFileName>
                         </artifactItem>
 
+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto-templates.templates</groupId>
+                            <artifactId>giveaway</artifactId>
+                            <version>${abstracto.templates.version}</version>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
+                            <destFileName>giveaway.zip</destFileName>
+                        </artifactItem>
+
+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto-templates.templates</groupId>
+                            <artifactId>image-generation</artifactId>
+                            <version>${abstracto.templates.version}</version>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
+                            <destFileName>image-generation.zip</destFileName>
+                        </artifactItem>
+
                         <artifactItem>
                             <groupId>dev.sheldan.abstracto-templates.templates</groupId>
                             <artifactId>logging</artifactId>
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>logging.zip</destFileName>
                         </artifactItem>
 
@@ -216,7 +236,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>profanity-filter.zip</destFileName>
                         </artifactItem>
 
@@ -226,7 +246,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>starboard-custom.zip</destFileName>
                         </artifactItem>
 
@@ -236,7 +256,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>news.zip</destFileName>
                         </artifactItem>
 
@@ -246,7 +266,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>referral.zip</destFileName>
                         </artifactItem>
 
@@ -256,7 +276,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>faq.zip</destFileName>
                         </artifactItem>
 
@@ -268,7 +288,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>core.zip</destFileName>
                         </artifactItem>
 
@@ -278,7 +298,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>modmail.zip</destFileName>
                         </artifactItem>
 
@@ -288,7 +308,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>assignable-roles.zip</destFileName>
                         </artifactItem>
 
@@ -298,7 +318,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>anti-raid.zip</destFileName>
                         </artifactItem>
 
@@ -308,7 +328,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>voice-channel-context.zip</destFileName>
                         </artifactItem>
 
@@ -318,7 +338,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>utility.zip</destFileName>
                         </artifactItem>
 
@@ -328,7 +348,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>experience-tracking.zip</destFileName>
                         </artifactItem>
 
@@ -338,7 +358,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>entertainment.zip</destFileName>
                         </artifactItem>
 
@@ -348,7 +368,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>moderation.zip</destFileName>
                         </artifactItem>
 
@@ -358,7 +378,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>link-embed.zip</destFileName>
                         </artifactItem>
 
@@ -368,27 +388,17 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>starboard.zip</destFileName>
                         </artifactItem>
 
-                        <artifactItem>
-                            <groupId>dev.sheldan.abstracto-templates.translations</groupId>
-                            <artifactId>utility</artifactId>
-                            <version>${abstracto.templates.version}</version>
-                            <type>zip</type>
-                            <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
-                            <destFileName>utility.zip</destFileName>
-                        </artifactItem>
-
                         <artifactItem>
                             <groupId>dev.sheldan.abstracto-templates.translations</groupId>
                             <artifactId>webservices</artifactId>
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>webservices.zip</destFileName>
                         </artifactItem>
 
@@ -398,7 +408,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>remind.zip</destFileName>
                         </artifactItem>
 
@@ -408,7 +418,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>suggestion.zip</destFileName>
                         </artifactItem>
 
@@ -418,7 +428,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>invite-filter.zip</destFileName>
                         </artifactItem>
 
@@ -428,7 +438,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>statistic.zip</destFileName>
                         </artifactItem>
 
@@ -438,7 +448,7 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>profanity-filter.zip</destFileName>
                         </artifactItem>
 
@@ -448,17 +458,37 @@
                             <version>${abstracto.templates.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>logging.zip</destFileName>
                         </artifactItem>
 
+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto-templates.translations</groupId>
+                            <artifactId>giveaway</artifactId>
+                            <version>${abstracto.templates.version}</version>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
+                            <destFileName>giveaway.zip</destFileName>
+                        </artifactItem>
+
+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto-templates.translations</groupId>
+                            <artifactId>image-generation</artifactId>
+                            <version>${abstracto.templates.version}</version>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
+                            <destFileName>image-generation.zip</destFileName>
+                        </artifactItem>
+
                         <artifactItem>
                             <groupId>dev.sheldan.oneplus.bot.templates.translations.customizations</groupId>
                             <artifactId>starboard-customization-translations</artifactId>
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>starboard-custom.zip</destFileName>
                         </artifactItem>
 
@@ -468,7 +498,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>moderation-custom.zip</destFileName>
                         </artifactItem>
 
@@ -478,7 +508,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>dynamic-activity-custom-translations.zip</destFileName>
                         </artifactItem>
 
@@ -489,7 +519,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>news.zip</destFileName>
                         </artifactItem>
 
@@ -499,7 +529,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>setup.zip</destFileName>
                         </artifactItem>
 
@@ -509,7 +539,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>referral.zip</destFileName>
                         </artifactItem>
 
@@ -519,7 +549,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>seasonal.zip</destFileName>
                         </artifactItem>
 
@@ -529,7 +559,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>faq.zip</destFileName>
                         </artifactItem>
 
@@ -541,7 +571,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>scheduling.zip</destFileName>
                         </artifactItem>
 
@@ -552,7 +582,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>core.zip</destFileName>
                         </artifactItem>
 
@@ -563,7 +593,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>assignable-roles.zip</destFileName>
                         </artifactItem>
 
@@ -574,7 +604,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>anti-raid.zip</destFileName>
                         </artifactItem>
 
@@ -585,7 +615,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>voice-channel-context.zip</destFileName>
                         </artifactItem>
 
@@ -596,21 +626,10 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>dynamic-activity.zip</destFileName>
                         </artifactItem>
 
-                        <artifactItem>
-                            <groupId>dev.sheldan.abstracto.modules</groupId>
-                            <artifactId>utility-impl</artifactId>
-                            <version>${abstracto.version}</version>
-                            <classifier>liquibase</classifier>
-                            <type>zip</type>
-                            <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
-                            <destFileName>utility.zip</destFileName>
-                        </artifactItem>
-
                         <artifactItem>
                             <groupId>dev.sheldan.abstracto.modules</groupId>
                             <artifactId>modmail-impl</artifactId>
@@ -618,7 +637,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>modmail.zip</destFileName>
                         </artifactItem>
 
@@ -629,7 +648,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>moderation.zip</destFileName>
                         </artifactItem>
 
@@ -640,7 +659,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>experience-tracking.zip</destFileName>
                         </artifactItem>
 
@@ -651,7 +670,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>entertainment.zip</destFileName>
                         </artifactItem>
 
@@ -662,7 +681,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>link-embed.zip</destFileName>
                         </artifactItem>
 
@@ -673,7 +692,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>starboard.zip</destFileName>
                         </artifactItem>
 
@@ -685,7 +704,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>utility.zip</destFileName>
                         </artifactItem>
 
@@ -696,7 +715,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>webservices.zip</destFileName>
                         </artifactItem>
 
@@ -707,7 +726,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>remind.zip</destFileName>
                         </artifactItem>
 
@@ -718,7 +737,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>suggestion.zip</destFileName>
                         </artifactItem>
 
@@ -729,7 +748,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>invite-filter.zip</destFileName>
                         </artifactItem>
 
@@ -740,7 +759,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>statistic.zip</destFileName>
                         </artifactItem>
 
@@ -751,7 +770,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>profanity-filter.zip</destFileName>
                         </artifactItem>
 
@@ -762,10 +781,32 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>logging.zip</destFileName>
                         </artifactItem>
 
+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto.modules</groupId>
+                            <artifactId>giveaway-impl</artifactId>
+                            <version>${abstracto.version}</version>
+                            <classifier>liquibase</classifier>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
+                            <destFileName>giveaway.zip</destFileName>
+                        </artifactItem>
+
+                        <artifactItem>
+                            <groupId>dev.sheldan.abstracto.modules</groupId>
+                            <artifactId>image-generation-impl</artifactId>
+                            <version>${abstracto.version}</version>
+                            <classifier>liquibase</classifier>
+                            <type>zip</type>
+                            <overWrite>true</overWrite>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
+                            <destFileName>image-generation.zip</destFileName>
+                        </artifactItem>
+
                         <!-- customizations -->
                         <artifactItem>
                             <groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
@@ -774,7 +815,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>starboard-custom.zip</destFileName>
                         </artifactItem>
 
@@ -785,7 +826,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>moderation-custom.zip</destFileName>
                         </artifactItem>
 
@@ -796,7 +837,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>dynamic-activity-custom.zip</destFileName>
                         </artifactItem>
 
@@ -807,7 +848,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>news.zip</destFileName>
                         </artifactItem>
 
@@ -818,7 +859,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>setup.zip</destFileName>
                         </artifactItem>
 
@@ -829,7 +870,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>referral.zip</destFileName>
                         </artifactItem>
 
@@ -840,7 +881,7 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>faq.zip</destFileName>
                         </artifactItem>
 
@@ -851,21 +892,10 @@
                             <classifier>liquibase</classifier>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/db-data/liquibase-artifacts/</outputDirectory>
                             <destFileName>seasonal.zip</destFileName>
                         </artifactItem>
 
-                        <artifactItem>
-                            <groupId>dev.sheldan.oneplus.bot.application</groupId>
-                            <artifactId>database</artifactId>
-                            <version>${project.version}</version>
-                            <classifier>liquibase</classifier>
-                            <type>zip</type>
-                            <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
-                            <destFileName>database.zip</destFileName>
-                        </artifactItem>
-
                         <!-- overrides -->
 
                         <artifactItem>
@@ -874,7 +904,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>overrides-templates-core.zip</destFileName>
                         </artifactItem>
 
@@ -884,7 +914,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>overrides-templates-webservices.zip</destFileName>
                         </artifactItem>
 
@@ -894,7 +924,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>overrides-templates-logging.zip</destFileName>
                         </artifactItem>
 
@@ -905,7 +935,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>overrides-templates-statistic.zip</destFileName>
                         </artifactItem>
 
@@ -915,7 +945,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>overrides-templates-modmail.zip</destFileName>
                         </artifactItem>
 
@@ -925,7 +955,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/template-artifacts/</outputDirectory>
                             <destFileName>overrides-templates-moderation.zip</destFileName>
                         </artifactItem>
 
@@ -936,7 +966,7 @@
                             <version>${project.version}</version>
                             <type>zip</type>
                             <overWrite>true</overWrite>
-                            <outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
+                            <outputDirectory>${file.basedir}/template-data/translation-artifacts/</outputDirectory>
                             <destFileName>overrides-translation-moderation.zip</destFileName>
                         </artifactItem>
 

deployment/image-packaging/src/main/docker/.env

@@ -1,6 +0,0 @@
-PROMTAIL_VERSION=2.2.1
-LOKI_VERSION=2.2.1
-PROMETHEUS_VERSION=v2.28.1
-PG_ADMIN_VERSION=5.5
-GRAFANA_VERSION=8.0.6
-POSTGRES_VERSION=13.3-buster

deployment/image-packaging/src/main/docker/database/Dockerfile

@@ -1,5 +0,0 @@
-ARG POSTGRES_VERSION
-FROM postgres:${POSTGRES_VERSION}
-MAINTAINER Sheldan
-VOLUME /tmp
-ADD sql/init.sql /docker-entrypoint-initdb.d/init.sql

deployment/image-packaging/src/main/docker/database/sql/init.sql

@@ -1 +0,0 @@
-CREATE SCHEMA abstracto

deployment/image-packaging/src/main/docker/db-data/Dockerfile

@@ -0,0 +1,6 @@
+FROM alpine:3.18.0
+MAINTAINER Sheldan
+ADD config/ /var/db-config/
+ADD liquibase-artifacts /var/db-config/liquibase-zips
+
+CMD ["/bin/sh", "/var/db-config/move.sh"]