[OPB-xxx] updating docker compose file version

enabling experience leaderboard dashboard deployment

.env

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

.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

@@ -1,38 +0,0 @@
-name: Publish package to GitHub Packages
-on:
-  release:
-    types: [created]
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          persist-credentials: false
-      - name: Set up Java for publishing to GitHub Packages
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-      - 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
-      - name: Publish to GitHub Packages
-        run: mvn -s settings.xml --file pom.xml -B deploy -Dmaven.wagon.http.pool=false -DskipTests=true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          user: Sheldan
-          token: ${{ secrets.ABSTRACTO_PAT }}
-      - name: Login to GitHub Packages Docker Registry
-        uses: docker/login-action@v1
-        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
-        run: docker-compose build && docker-compose push
-        env:
-          REGISTRY_PREFIX: docker.pkg.github.com/sheldan/oneplusbot/
-          VERSION: ${{ env.version }}
-          ABSTRACTO_VERSION: 1.3.3
-          ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/

.github/workflows/release_manual.yaml

@@ -0,0 +1,91 @@
+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: Create a Release
+        uses: elgohr/Github-Release-Action@v5
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          title: Release of version ${{ env.version }}
+      - 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 }}",
+              "privateRestApi.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"

.gitignore

@@ -20,6 +20,9 @@ target/
 *.zip
 *.tar.gz
 *.rar
+*.tgz
+
+Chart.lock
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*

.tiltignore

@@ -0,0 +1,3 @@
+*.tgz
+tilt/oneplusbot-dev/tmpcharts/
+tilt/oneplusbot-dev/charts/*.tgz

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

PRIVACY_POLICY.md

@@ -1,6 +1,6 @@
 # r/oneplus Discord bot privacy policy
 
-Last updated: 04.07.2021
+Last updated: 06.09.2021
 
 ## Description
 
@@ -75,6 +75,7 @@ The detailed list of what information is stored and processed is the following:
     * this was used for the message used to update the status of a suggestion, but this is currently disabled
 * the author of the suggestion and the message which has been posted in the suggestions channel
 * every suggestion will be deleted completely from the database a few days after it has reached a final state (rejected, denied, accepted)
+* whether you voted for a suggestion and which decision you took
 
 ### Leveling system
 * the amount of messages which were considered for the leveling system

README.md

@@ -1,11 +1,13 @@
 # r/oneplus Discord server bot
 
-This repository contains the rewrite of the [Bot](https://github.com/Rithari/OnePlusBot), which is still in use. The features will be gradually be ported 
-and most of them will be in [abstracto](https://github.com/Sheldan/abstracto), but some of the features need to be customized, as they are r/oneplus specific.
+This repository contains the rewrite of the [Bot](https://github.com/Rithari/OnePlusBot). It is developed by customizing [abstracto](https://github.com/Sheldan/abstracto), because some features are r/oneplus specific.
 
 The migration of the existing data from the database is handled via one time migration, and can be found [here](https://github.com/Sheldan/OnePlusBot-migration).
 
+The FAQ configuration can be found [here](https://github.com/Sheldan/OnePlusBot-faq/).
+
 Custom features which were ported
  - [x] FAQ
  - [x] Setup channel handling
  - [x] Referral link handling 
+

Tiltfile

@@ -0,0 +1,44 @@
+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', '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005', '-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})
+docker_build(registry + 'oneplus-bot-rest-api', 'deployment/image-packaging/src/main/docker/rest-api/', build_args={'REGISTRY_PREFIX': abstracto_registry})
+
+
+local('cd tilt/oneplusbot-dev && helm dep up')
+k8s_yaml(helm('tilt/oneplusbot-dev', 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/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.2</version>
+        <version>1.6.24-SNAPSHOT</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>
@@ -191,6 +202,12 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
+            <artifactId>seasonal</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
     </dependencies>
 
 </project>

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=${DB_SCHEMA}
+spring.jpa.properties.hibernate.default_schema=${DB_SCHEMA}
 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.2</version>
+        <version>1.6.24-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-customizations/dynamic-activity-custom/src/main/resources/migrations/1.5.1/collection.xml

@@ -1,10 +1,6 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <include file="seedData/data.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

application/oneplus-bot-customizations/dynamic-activity-custom/src/main/resources/migrations/1.5.1/seedData/activity.xml

@@ -1,11 +1,7 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <changeSet author="Sheldan" id="dynamic_activity-insertion">
         <insert tableName="activity">
             <column name="type" value="STREAMING"/>

application/oneplus-bot-customizations/dynamic-activity-custom/src/main/resources/migrations/1.5.1/seedData/data.xml

@@ -1,10 +1,6 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <include file="activity.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

application/oneplus-bot-customizations/dynamic-activity-custom/src/main/resources/migrations/dynamicActivity-custom-changeLog.xml

@@ -1,10 +1,6 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <include file="1.5.1/collection.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

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.2</version>
+        <version>1.6.24-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-customizations/moderation-custom/src/main/java/dev/sheldan/oneplus/bot/custom/moderation/config/ModerationCustomFeature.java

@@ -2,6 +2,7 @@ package dev.sheldan.oneplus.bot.custom.moderation.config;
 
 import dev.sheldan.abstracto.core.config.FeatureConfig;
 import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.core.config.PostTargetEnum;
 import dev.sheldan.abstracto.moderation.config.feature.ModerationFeatureConfig;
 import dev.sheldan.oneplus.bot.custom.moderation.service.ModModeServiceBean;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +15,8 @@ import java.util.List;
 @Component
 public class ModerationCustomFeature implements FeatureConfig {
 
+    public static final String WARN_NOTIFICATION_THRESHOLD = "warnNotificationThreshold";
+
     @Autowired
     private ModerationFeatureConfig moderationFeatureConfig;
 
@@ -27,9 +30,14 @@ public class ModerationCustomFeature implements FeatureConfig {
         return Arrays.asList(moderationFeatureConfig);
     }
 
+    @Override
+    public List<PostTargetEnum> getRequiredPostTargets() {
+        return Arrays.asList(ModerationCustomPostTarget.WARN_THRESHOLD_NOTIFICATION);
+    }
+
     @Override
     public List<String> getRequiredSystemConfigKeys() {
         return Arrays.asList(ModModeServiceBean.MODMODE_ROLE_CONFIG_KEY,
-                ModModeServiceBean.MODMODE_CHANGED_ROLE_COLOR_CONFIG_KEY);
+                ModModeServiceBean.MODMODE_CHANGED_ROLE_COLOR_CONFIG_KEY, WARN_NOTIFICATION_THRESHOLD);
     }
 }

application/oneplus-bot-customizations/moderation-custom/src/main/java/dev/sheldan/oneplus/bot/custom/moderation/config/ModerationCustomPostTarget.java

@@ -0,0 +1,15 @@
+package dev.sheldan.oneplus.bot.custom.moderation.config;
+
+import dev.sheldan.abstracto.core.config.PostTargetEnum;
+import lombok.Getter;
+
+@Getter
+public enum ModerationCustomPostTarget implements PostTargetEnum {
+    WARN_THRESHOLD_NOTIFICATION("warnThresholdNotification");
+
+    private String key;
+
+    ModerationCustomPostTarget(String key) {
+        this.key = key;
+    }
+}

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

@@ -0,0 +1,98 @@
+package dev.sheldan.oneplus.bot.custom.moderation.listener;
+
+import dev.sheldan.abstracto.core.config.FeatureDefinition;
+import dev.sheldan.abstracto.core.listener.DefaultListenerResult;
+import dev.sheldan.abstracto.core.models.ServerUser;
+import dev.sheldan.abstracto.core.models.database.AUserInAServer;
+import dev.sheldan.abstracto.core.models.template.display.ChannelDisplay;
+import dev.sheldan.abstracto.core.models.template.display.MemberDisplay;
+import dev.sheldan.abstracto.core.service.*;
+import dev.sheldan.abstracto.core.service.management.UserInServerManagementService;
+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.abstracto.moderation.listener.WarningCreatedListener;
+import dev.sheldan.abstracto.moderation.model.listener.WarningCreatedEventModel;
+import dev.sheldan.abstracto.moderation.service.management.WarnManagementService;
+import dev.sheldan.oneplus.bot.custom.moderation.config.ModerationCustomFeature;
+import dev.sheldan.oneplus.bot.custom.moderation.config.ModerationCustomFeatureDefinition;
+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.channel.middleman.GuildMessageChannel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@Component
+@Slf4j
+public class WarningAddedListener implements WarningCreatedListener {
+
+    @Autowired
+    private ConfigService configService;
+
+    @Autowired
+    private WarnManagementService warnManagementService;
+
+    @Autowired
+    private UserInServerManagementService userInServerManagementService;
+
+    @Autowired
+    private ChannelService channelService;
+
+    @Autowired
+    private PostTargetService postTargetService;
+
+    @Autowired
+    private TemplateService templateService;
+
+    public static final String WARN_THRESHOLD_NOTIFICATION_TEMPLATE_KEY = "warning_threshold_notification";
+
+    @Override
+    public DefaultListenerResult execute(WarningCreatedEventModel model) {
+        Long warnNotificationAmount = configService.getLongValueOrConfigDefault(ModerationCustomFeature.WARN_NOTIFICATION_THRESHOLD, model.getServerId());
+        ServerUser warnedUser = ServerUser
+                .builder()
+                .userId(model.getWarnedUserId())
+                .serverId(model.getServerId())
+                .build();
+        AUserInAServer warnedUserInAServer = userInServerManagementService.loadOrCreateUser(warnedUser);
+        List<Long> activeWarnsForUser = warnManagementService.getActiveWarnsForUser(warnedUserInAServer)
+                .stream().map(warning -> warning.getWarnId().getId()).collect(Collectors.toList());
+        Set<Long> warnIds = new HashSet<>(activeWarnsForUser);
+        // we cant be sure we receive the newly persisted warning yet, sadly
+        warnIds.add(model.getWarningId());
+        if(warnIds.size() == warnNotificationAmount) {
+            Long serverId = model.getServerId();
+
+            Long channelId = model.getWarningChannelId();
+            Long warnedUserId = model.getWarnedUserId();
+            GuildMessageChannel channel = channelService.getMessageChannelFromServer(serverId, channelId);
+            WarningThresholdNotificationModel notificationModel = WarningThresholdNotificationModel
+                    .builder()
+                    .channelDisplay(ChannelDisplay.fromChannel(channel))
+                    .memberDisplay(MemberDisplay.fromAUserInAServer(warnedUserInAServer))
+                    .messageId(model.getWarningMessageId())
+                    .warnCount(warnIds.size())
+                    .build();
+
+            MessageToSend messageToSend = templateService.renderEmbedTemplate(WARN_THRESHOLD_NOTIFICATION_TEMPLATE_KEY, notificationModel,  serverId);
+            FutureUtils.toSingleFutureGeneric(postTargetService.sendEmbedInPostTarget(messageToSend, ModerationCustomPostTarget.WARN_THRESHOLD_NOTIFICATION, serverId))
+            .thenAccept(unused -> log.info("Warn threshold notification sent for user {} in server {}.", warnedUserId, serverId))
+            .exceptionally(throwable -> {
+                log.error("Failed to sent warn threshold notification for user {} in server {}.", warnedUserId, serverId, throwable);
+                return null;
+            });
+        }
+        return DefaultListenerResult.PROCESSED;
+    }
+
+    @Override
+    public FeatureDefinition getFeature() {
+        return ModerationCustomFeatureDefinition.MODERATION_CUSTOM;
+    }
+}

application/oneplus-bot-customizations/moderation-custom/src/main/java/dev/sheldan/oneplus/bot/custom/moderation/model/template/WarningThresholdNotificationModel.java

@@ -0,0 +1,15 @@
+package dev.sheldan.oneplus.bot.custom.moderation.model.template;
+
+import dev.sheldan.abstracto.core.models.template.display.ChannelDisplay;
+import dev.sheldan.abstracto.core.models.template.display.MemberDisplay;
+import lombok.Builder;
+import lombok.Getter;
+
+@Builder
+@Getter
+public class WarningThresholdNotificationModel {
+    private MemberDisplay memberDisplay;
+    private Integer warnCount;
+    private ChannelDisplay channelDisplay;
+    private Long messageId;
+}

application/oneplus-bot-customizations/moderation-custom/src/main/resources/migrations/1.5.2/collection.xml

@@ -1,10 +1,6 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <include file="seedData/data.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

application/oneplus-bot-customizations/moderation-custom/src/main/resources/migrations/1.5.2/seedData/command.xml

@@ -1,11 +1,7 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <property name="moderationCustomFeature" value="(SELECT id FROM feature WHERE key = 'moderationCustom')"/>
     <property name="moderationModule" value="(SELECT id FROM module WHERE name = 'moderation')"/>
     <changeSet  author="Sheldan"  id="moderationCustom_modmode-commands">

application/oneplus-bot-customizations/moderation-custom/src/main/resources/migrations/1.5.2/seedData/data.xml

@@ -1,11 +1,7 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <include file="feature.xml" relativeToChangelogFile="true"/>
     <include file="command.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

application/oneplus-bot-customizations/moderation-custom/src/main/resources/migrations/1.5.2/seedData/feature.xml

@@ -1,11 +1,7 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <changeSet author="Sheldan"  id="moderation_custom_feature-insertion">
         <insert tableName="feature">
             <column name="key" value="moderationCustom"/>

application/oneplus-bot-customizations/moderation-custom/src/main/resources/migrations/moderation-custom-changeLog.xml

@@ -1,10 +1,6 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <include file="1.5.2/collection.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

application/oneplus-bot-customizations/moderation-custom/src/main/resources/moderation-custom.properties

@@ -5,4 +5,9 @@ abstracto.systemConfigs.modModeRoleId.name=modModeRoleId
 abstracto.systemConfigs.modModeRoleId.longValue=0
 
 abstracto.systemConfigs.modModeNewRoleColor.name=modModeNewRoleColor
-abstracto.systemConfigs.modModeNewRoleColor.stringValue=0,0,0
+abstracto.systemConfigs.modModeNewRoleColor.stringValue=0,0,0
+
+abstracto.systemConfigs.warnNotificationThreshold.name=warnNotificationThreshold
+abstracto.systemConfigs.warnNotificationThreshold.longValue=3
+
+abstracto.postTargets.warnThresholdNotification.name=warnThresholdNotification

application/oneplus-bot-customizations/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application</groupId>
         <artifactId>application</artifactId>
-        <version>1.5.2</version>
+        <version>1.6.24-SNAPSHOT</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.2</version>
+        <version>1.6.24-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

application/oneplus-bot-customizations/starboard-custom/src/main/resources/migrations/1.0-starboard-custom/collection.xml

@@ -1,10 +1,6 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <include file="starboard-custom-seedData/data.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

application/oneplus-bot-customizations/starboard-custom/src/main/resources/migrations/1.0-starboard-custom/starboard-custom-seedData/data.xml

@@ -1,10 +1,6 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <include file="feature.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

application/oneplus-bot-customizations/starboard-custom/src/main/resources/migrations/1.0-starboard-custom/starboard-custom-seedData/feature.xml

@@ -1,11 +1,7 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <changeSet author="Sheldan"  id="starboard_custom_feature-insertion">
         <insert tableName="feature">
             <column name="key" value="starboardNotification"/>

application/oneplus-bot-customizations/starboard-custom/src/main/resources/migrations/starboard-custom-changeLog.xml

@@ -1,10 +1,6 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <include file="1.0-starboard-custom/collection.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

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.2</version>
+        <version>1.6.24-SNAPSHOT</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/command/ImportFAQ.java

@@ -66,6 +66,7 @@ public class ImportFAQ extends AbstractConditionableCommand {
                 AServer server = serverManagementService.loadServer(commandContext.getGuild());
                 List<FaqCommandConfig> commands = faqServiceBean.loadFAQCommandsFromJson(jsonContent);
                 faqServiceBean.createOrUpdateFAQCommands(commands, server);
+                return CompletableFuture.completedFuture(CommandResult.fromSuccess());
             } else {
 
                 List<String> errors = jsonValidationService.getDetailedException(result.getExceptions())
@@ -73,8 +74,8 @@ public class ImportFAQ extends AbstractConditionableCommand {
                         .map(ValidationException::getMessage)
                         .collect(Collectors.toList());
                 channelService.sendTextToChannel(String.join("\n", errors), commandContext.getChannel());
+                return CompletableFuture.completedFuture(CommandResult.fromError("Incorrect faq config."));
             }
-            return CompletableFuture.completedFuture(CommandResult.fromSuccess());
         } catch (IOException e) {
             log.error("IO Exception when loading input file.", e);
             throw new AbstractoTemplatedException("Failed to load json config.", "failed_to_set_template_exception", e);

application/oneplus-bot-modules/faq/src/main/java/dev/sheldan/oneplus/bot/modules/faq/converter/FAQCommandConfigConverter.java

@@ -1,6 +1,7 @@
 package dev.sheldan.oneplus.bot.modules.faq.converter;
 
 import com.google.gson.Gson;
+import dev.sheldan.abstracto.core.service.BotService;
 import dev.sheldan.oneplus.bot.modules.faq.models.command.config.*;
 import dev.sheldan.oneplus.bot.modules.faq.models.database.FAQChannelGroupCommand;
 import dev.sheldan.oneplus.bot.modules.faq.models.database.FAQCommand;
@@ -9,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -18,9 +20,16 @@ public class FAQCommandConfigConverter {
     @Autowired
     private Gson gson;
 
+    @Autowired
+    private BotService botService;
+
     public String serializeCommands(List<FAQCommand> asList) {
+        Long botId = botService.getInstance().getSelfUser().getIdLong();
+        asList.sort(Comparator.comparing(FAQCommand::getName));
         List<FaqCommandConfig> config = asList.stream().map(faqCommand -> {
-            List<FaqCommandResponseConfig> commandResponseConfigs = convertGroupCommands(faqCommand.getGroupResponses());
+            List<FAQChannelGroupCommand> responses = faqCommand.getGroupResponses();
+            responses.sort(Comparator.comparing(groupCommand -> groupCommand.getChannelGroup().getChannelGroup().getGroupName()));
+            List<FaqCommandResponseConfig> commandResponseConfigs = convertGroupCommands(responses, botId);
             List<String> aliases;
             if(faqCommand.getAliases() != null) {
                 aliases = faqCommand.getAliases().stream().map(faqCommandAlias -> faqCommandAlias.getId().getAlias()).collect(Collectors.toList());
@@ -39,9 +48,9 @@ public class FAQCommandConfigConverter {
         return gson.toJson(config);
     }
 
-    private List<FaqCommandResponseConfig> convertGroupCommands(List<FAQChannelGroupCommand> responses) {
+    private List<FaqCommandResponseConfig> convertGroupCommands(List<FAQChannelGroupCommand> responses, Long botUserId) {
         return responses.stream().map(faqChannelGroupCommand -> {
-            List<FaqCommandResponseMessageConfig> responseConfigs = convertCommandResponses(faqChannelGroupCommand.getResponses());
+            List<FaqCommandResponseMessageConfig> responseConfigs = convertCommandResponses(faqChannelGroupCommand.getResponses(), botUserId);
             return FaqCommandResponseConfig
                     .builder()
                     .channelGroupName(faqChannelGroupCommand.getChannelGroup().getChannelGroup().getGroupName())
@@ -50,13 +59,15 @@ public class FAQCommandConfigConverter {
         }).collect(Collectors.toList());
     }
 
-    private List<FaqCommandResponseMessageConfig> convertCommandResponses(List<FAQCommandResponse> responses) {
-        return responses.stream().map(this::convertCommandResponse).collect(Collectors.toList());
+    private List<FaqCommandResponseMessageConfig> convertCommandResponses(List<FAQCommandResponse> responses, Long botUserId) {
+        return responses.stream().map(response -> convertCommandResponse(response, botUserId)).collect(Collectors.toList());
     }
 
-    private FaqCommandResponseMessageConfig convertCommandResponse(FAQCommandResponse response) {
+    private FaqCommandResponseMessageConfig convertCommandResponse(FAQCommandResponse response, Long botUserId) {
         FaqCommandResponseEmbedConfig embedConfig = null;
-        if(response.getDescription() != null) {
+        // one of those must not be null, for it to be considered a proper embed
+        if(response.getDescription() != null || response.getImageURL() != null) {
+            boolean useBot = response.getAuthorUserId().equals(botUserId);
             FaqCommandResponseEmbedColorConfig colorConfig = FaqCommandResponseEmbedColorConfig
                     .builder()
                     .red(response.getRed())
@@ -65,8 +76,8 @@ public class FAQCommandConfigConverter {
                     .build();
             FaqCommandResponseEmbedAuthorConfig authorConfig = FaqCommandResponseEmbedAuthorConfig
                     .builder()
-                    .userId(response.getAuthorUserId())
-                    .useBot(null)
+                    .userId(useBot ? null : response.getAuthorUserId())
+                    .useBot(useBot)
                     .build();
             embedConfig = FaqCommandResponseEmbedConfig
                     .builder()

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/faq/src/main/resources/migrations/1.4.4/collection.xml

@@ -1,11 +1,7 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <include file="tables/tables.xml" relativeToChangelogFile="true"/>
     <include file="seedData/data.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

application/oneplus-bot-modules/faq/src/main/resources/migrations/1.4.4/seedData/channel_group_type.xml

@@ -1,11 +1,7 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <changeSet author="Sheldan"  id="faq_channel_group_type-insertion">
         <insert tableName="channel_group_type">
             <column name="group_type_key" value="faq"/>

application/oneplus-bot-modules/faq/src/main/resources/migrations/1.4.4/seedData/command.xml

@@ -1,11 +1,7 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <property name="faqFeature" value="(SELECT id FROM feature WHERE key = 'faq')"/>
     <property name="faqModule" value="(SELECT id FROM module WHERE name = 'faqModule')"/>
     <changeSet author="Sheldan" id="faq-commands" >

application/oneplus-bot-modules/faq/src/main/resources/migrations/1.4.4/seedData/data.xml

@@ -1,11 +1,7 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <include file="feature.xml" relativeToChangelogFile="true"/>
     <include file="module.xml" relativeToChangelogFile="true"/>
     <include file="command.xml" relativeToChangelogFile="true"/>

application/oneplus-bot-modules/faq/src/main/resources/migrations/1.4.4/seedData/feature.xml

@@ -1,11 +1,7 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <changeSet author="Sheldan"  id="faq_feature-insertion">
         <insert tableName="feature">
             <column name="key" value="faq"/>

application/oneplus-bot-modules/faq/src/main/resources/migrations/1.4.4/seedData/module.xml

@@ -1,11 +1,7 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <changeSet  author="Sheldan"  id="faq-module-insertion">
         <insert tableName="module">
             <column name="name" value="faqModule"/>

application/oneplus-bot-modules/faq/src/main/resources/migrations/1.4.4/tables/faq_channel_group.xml

@@ -1,11 +1,7 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <changeSet author="Sheldan" id="faq_channel_group-table">
         <createTable tableName="faq_channel_group">
             <column name="id" type="BIGINT">

application/oneplus-bot-modules/faq/src/main/resources/migrations/1.4.4/tables/faq_channel_group_command.xml

@@ -1,11 +1,7 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <changeSet author="Sheldan" id="faq_channel_group_command-table">
         <createTable tableName="faq_channel_group_command">
             <column name="channel_group_id" type="BIGINT">

application/oneplus-bot-modules/faq/src/main/resources/migrations/1.4.4/tables/faq_command.xml

@@ -1,11 +1,7 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <changeSet author="Sheldan" id="faq_command-table">
         <createTable tableName="faq_command">
             <column name="id" type="BIGINT" autoIncrement="true">

application/oneplus-bot-modules/faq/src/main/resources/migrations/1.4.4/tables/faq_command_alias.xml

@@ -1,11 +1,7 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <changeSet author="Sheldan" id="faq_command_alias-table">
         <createTable tableName="faq_command_alias">
             <column name="command_id" type="BIGINT">

application/oneplus-bot-modules/faq/src/main/resources/migrations/1.4.4/tables/faq_command_response.xml

@@ -1,11 +1,7 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <changeSet author="Sheldan" id="faq_command_response-table">
         <createTable tableName="faq_command_response">
             <column name="created" type="TIMESTAMP WITHOUT TIME ZONE">

application/oneplus-bot-modules/faq/src/main/resources/migrations/1.4.4/tables/tables.xml

@@ -1,11 +1,7 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <include file="faq_channel_group.xml" relativeToChangelogFile="true"/>
     <include file="faq_command.xml" relativeToChangelogFile="true"/>
     <include file="faq_command_alias.xml" relativeToChangelogFile="true"/>

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

@@ -1,10 +1,6 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <include file="1.4.4/collection.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

application/oneplus-bot-modules/faq/src/main/resources/validation/createScheme.json

@@ -3,143 +3,124 @@
   "type": "array",
   "minItems": 1,
   "maxItems": 30,
-  "items": [
-    {
-      "type": "object",
-      "properties": {
-        "faqCommandName": {
+  "items": {
+    "type": "object",
+    "properties": {
+      "faqCommandName": {
+        "type": "string",
+        "minLength": 1,
+        "maxLength": 30,
+        "pattern": "\\w*"
+      },
+      "global": {
+        "default": false,
+        "type": "boolean"
+      },
+      "aliases": {
+        "type": "array",
+        "minItems": 0,
+        "maxItems": 20,
+        "items": {
           "type": "string",
           "minLength": 1,
           "maxLength": 30,
           "pattern": "\\w*"
-        },
-        "global": {
-          "default": false,
-          "type": "boolean"
-        },
-        "aliases": {
-          "type": "array",
-          "minItems": 1,
-          "maxItems": 20,
-          "items": {
-            "type": "string",
-            "minLength": 1,
-            "maxLength": 30,
-            "pattern": "\\w*"
-          }
-        },
-        "responses": {
-          "type": "array",
-          "minItems": 1,
-          "maxItems": 255,
-          "items": {
-            "type": "object",
-            "properties": {
-              "channelGroupName": {
-                "type": "string",
-                "minLength": 1,
-                "maxLength": 20,
-                "pattern": "\\w*"
-              },
-              "messages": {
-                "type": "array",
-                "minItems": 1,
-                "maxItems": 3,
-                "items": [
-                  {
+        }
+      },
+      "responses": {
+        "type": "array",
+        "minItems": 1,
+        "maxItems": 255,
+        "items": {
+          "type": "object",
+          "properties": {
+            "channelGroupName": {
+              "type": "string",
+              "minLength": 1,
+              "maxLength": 20,
+              "pattern": "\\w*"
+            },
+            "messages": {
+              "type": "array",
+              "minItems": 1,
+              "maxItems": 3,
+              "items": {
+                "type": "object",
+                "properties": {
+                  "position": {
+                    "type": "number",
+                    "minimum": 0,
+                    "maximum": 2
+                  },
+                  "additionalMessage": {
+                    "type": "string",
+                    "minLength": 1,
+                    "maxLength": 2000
+                  },
+                  "embed": {
                     "type": "object",
                     "properties": {
-                      "position": {
-                        "type": "number",
-                        "minimum": 0,
-                        "maximum": 2
-                      },
-                      "additionalMessage": {
+                      "description": {
                         "type": "string",
                         "minLength": 1,
                         "maxLength": 2000
                       },
-                      "embed": {
+                      "imageUrl": {
+                        "type": "string",
+                        "minLength": 1,
+                        "maxLength": 2000,
+                        "pattern": "\\s*https?:\/\/\\S+"
+                      },
+                      "color": {
                         "type": "object",
                         "properties": {
-                          "description": {
-                            "type": "string",
-                            "minLength": 1,
-                            "maxLength": 2000
+                          "red": {
+                            "type": "integer",
+                            "minimum": 0,
+                            "default": 0,
+                            "maximum": 255
                           },
-                          "imageUrl": {
-                            "type": "string",
-                            "minLength": 1,
-                            "maxLength": 2000,
-                            "pattern": "\\s*https?:\/\/\\S+"
+                          "green": {
+                            "type": "integer",
+                            "minimum": 0,
+                            "default": 0,
+                            "maximum": 255
                           },
-                          "color": {
-                            "type": "object",
-                            "properties": {
-                              "red": {
-                                "type": "integer",
-                                "minimum": 0,
-                                "default": 0,
-                                "maximum": 255
-                              },
-                              "green": {
-                                "type": "integer",
-                                "minimum": 0,
-                                "default": 0,
-                                "maximum": 255
-                              },
-                              "blue": {
-                                "type": "integer",
-                                "minimum": 0,
-                                "default": 0,
-                                "maximum": 255
-                              }
-                            },
-                            "required": [
-                              "red",
-                              "green",
-                              "blue"
-                            ]
+                          "blue": {
+                            "type": "integer",
+                            "minimum": 0,
+                            "default": 0,
+                            "maximum": 255
+                          }
+                        },
+                        "required": [
+                          "red",
+                          "green",
+                          "blue"
+                        ]
+                      },
+                      "author": {
+                        "type": "object",
+                        "properties": {
+                          "userId": {
+                            "minimum": 1,
+                            "maximum": 18446744073709551615,
+                            "type": "integer"
                           },
-                          "author": {
-                            "type": "object",
-                            "properties": {
-                              "userId": {
-                                "minimum": 1,
-                                "maximum": 18446744073709551615,
-                                "type": "integer"
-                              },
-                              "useBot": {
-                                "type": "boolean"
-                              }
-                            },
-                            "additionalProperties": false,
-                            "anyOf": [
-                              {
-                                "required": [
-                                  "userId"
-                                ]
-                              },
-                              {
-                                "required": [
-                                  "useBot"
-                                ]
-                              }
-                            ]
+                          "useBot": {
+                            "type": "boolean"
                           }
                         },
                         "additionalProperties": false,
                         "anyOf": [
                           {
                             "required": [
-                              "description",
-                              "author"
+                              "userId"
                             ]
                           },
                           {
                             "required": [
-                              "imageUrl",
-                              "author"
+                              "useBot"
                             ]
                           }
                         ]
@@ -149,41 +130,56 @@
                     "anyOf": [
                       {
                         "required": [
-                          "additionalMessage",
-                          "position"
+                          "description",
+                          "author"
                         ]
                       },
                       {
                         "required": [
-                          "embed",
-                          "position"
-                        ]
-                      },
-                      {
-                        "required": [
-                          "additionalMessage",
-                          "embed",
-                          "position"
+                          "imageUrl",
+                          "author"
                         ]
                       }
                     ]
                   }
+                },
+                "additionalProperties": false,
+                "anyOf": [
+                  {
+                    "required": [
+                      "additionalMessage",
+                      "position"
+                    ]
+                  },
+                  {
+                    "required": [
+                      "embed",
+                      "position"
+                    ]
+                  },
+                  {
+                    "required": [
+                      "additionalMessage",
+                      "embed",
+                      "position"
+                    ]
+                  }
                 ]
               }
-            },
-            "additionalProperties": false,
-            "required": [
-              "channelGroupName",
-              "messages"
-            ]
-          }
+            }
+          },
+          "additionalProperties": false,
+          "required": [
+            "channelGroupName",
+            "messages"
+          ]
         }
-      },
-      "additionalProperties": false,
-      "required": [
-        "faqCommandName",
-        "responses"
-      ]
-    }
-  ]
+      }
+    },
+    "additionalProperties": false,
+    "required": [
+      "faqCommandName",
+      "responses"
+    ]
+  }
 }

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.2</version>
+        <version>1.6.24-SNAPSHOT</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.3.10-news/collection.xml

@@ -1,10 +1,6 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <include file="news-update/update.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

application/oneplus-bot-modules/news/src/main/resources/migrations/1.3.10-news/news-update/module.xml

@@ -1,11 +1,7 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <changeSet author="Sheldan" id="rename-news-module">
         <update tableName="module">
             <column name="name" value="newsModule" />

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

@@ -1,10 +1,6 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <include file="module.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

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

@@ -1,11 +1,7 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <include file="news-tables/tables.xml" relativeToChangelogFile="true"/>
     <include file="news-seedData/data.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>

application/oneplus-bot-modules/news/src/main/resources/migrations/1.3.9-news/news-seedData/command.xml

@@ -1,11 +1,7 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <property name="newsFeature" value="(SELECT id FROM feature WHERE key = 'news')"/>
     <property name="newsModule" value="(SELECT id FROM module WHERE name = 'news')"/>
     <changeSet author="Sheldan" id="news-commands" >

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

@@ -1,11 +1,7 @@
 <?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" >
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
     <include file="feature.xml" relativeToChangelogFile="true"/>
     <include file="module.xml" relativeToChangelogFile="true"/>
     <include file="command.xml" relativeToChangelogFile="true"/>