Compare commits

...

128 Commits

Author SHA1 Message Date
Sheldan
976defa902 [OPB-xxx] adding docker and helm build to build job 2025-08-16 13:10:10 +02:00
Sheldan
96d5ca06e7 [OPB-xxx] adding feature mode to fully automate news posts 2025-08-16 13:08:22 +02:00
release-bot
bdcfccf5ad Commit from GitHub Actions (Publishes a new version of OnePlusBot) 2025-06-15 06:25:16 +00:00
release-bot
e60ab82870 [maven-release-plugin] prepare for next development iteration 2025-06-15 06:20:23 +00:00
release-bot
2ca92279ae [maven-release-plugin] prepare release oneplusbot-1.7.2 2025-06-15 06:20:22 +00:00
Sheldan
fc41501a21 [OPB-xxx] a limit for user posts was added 2025-06-15 08:17:12 +02:00
release-bot
320efc91b4 [maven-release-plugin] prepare for next development iteration 2025-05-29 20:25:10 +00:00
release-bot
3bcfca46b6 [maven-release-plugin] prepare release oneplusbot-1.7.1 2025-05-29 20:25:09 +00:00
Sheldan
615d1d10b5 [OPB-xxx] updating abstracto version to 1.6.8 for fixes
preparing for release
2025-05-29 22:20:46 +02:00
Sheldan
2926d9fe09 [OPB-xxx] updating policy 2025-02-23 23:08:46 +01:00
Sheldan
edad07ac94 [OPB-xxx] updating privacy policy 2025-02-23 22:56:22 +01:00
release-bot
d1eeb15253 Commit from GitHub Actions (Publishes a new version of OnePlusBot) 2025-02-23 21:01:35 +00:00
release-bot
6b0bbca290 [maven-release-plugin] prepare for next development iteration 2025-02-23 20:57:37 +00:00
release-bot
780c0d05bc [maven-release-plugin] prepare release oneplusbot-1.7.0 2025-02-23 20:57:36 +00:00
Sheldan
14d4091bf7 [OPB-xxx] updating abstracto version to 1.6.4 to get better command permissions, user installable application support, reducing docker image size, 2025-02-23 21:54:30 +01:00
release-bot
c4e1ce6cd7 Commit from GitHub Actions (Publishes a new version of OnePlusBot) 2025-01-27 21:10:30 +00:00
release-bot
06fd28e536 [maven-release-plugin] prepare for next development iteration 2025-01-27 21:05:48 +00:00
release-bot
00db737bdb [maven-release-plugin] prepare release oneplusbot-1.6.36 2025-01-27 21:05:46 +00:00
Sheldan
161327f27e [OPB-xxx] updating abstracto version to 1.5.57 to get better emote tracking 2025-01-27 22:02:13 +01:00
release-bot
d15f025309 Commit from GitHub Actions (Publishes a new version of OnePlusBot) 2025-01-15 22:14:03 +00:00
release-bot
b7555e9851 [maven-release-plugin] prepare for next development iteration 2025-01-15 22:09:50 +00:00
release-bot
3aef21f281 [maven-release-plugin] prepare release oneplusbot-1.6.35 2025-01-15 22:09:48 +00:00
Sheldan
597d3b8a8a [OPB-xxx] updating abstracto version to 1.5.57
adding config for currency conversion
fixing ban message template folder name
2025-01-15 23:06:44 +01:00
release-bot
bc353fed55 Commit from GitHub Actions (Publishes a new version of OnePlusBot) 2024-11-22 22:22:14 +00:00
release-bot
31279bb059 [maven-release-plugin] prepare for next development iteration 2024-11-22 22:16:29 +00:00
release-bot
8e6804a1dc [maven-release-plugin] prepare release oneplusbot-1.6.34 2024-11-22 22:16:28 +00:00
Sheldan
a39124e208 [OPB-xxx] updating abstracto version to 1.5.51
adapting templates to use the default locale
2024-11-22 23:12:07 +01:00
release-bot
42a94359bb Commit from GitHub Actions (Publishes a new version of OnePlusBot) 2024-11-05 22:37:27 +00:00
release-bot
3bddf1d1c4 [maven-release-plugin] prepare for next development iteration 2024-11-05 22:33:17 +00:00
release-bot
c10dc6765c [maven-release-plugin] prepare release oneplusbot-1.6.33 2024-11-05 22:33:16 +00:00
Sheldan
0b4b163e43 [OPB-xxx] updating abstracto version to 1.5.50 2024-11-05 23:29:44 +01:00
release-bot
7be4891075 Commit from GitHub Actions (Publishes a new version of OnePlusBot) 2024-11-04 20:03:40 +00:00
release-bot
6f0ce5af12 [maven-release-plugin] prepare for next development iteration 2024-11-04 19:58:17 +00:00
release-bot
f9d50fa6cc [maven-release-plugin] prepare release oneplusbot-1.6.32 2024-11-04 19:58:16 +00:00
Sheldan
095a5d826f [OPB-xxx] updating agent version for build and release 2024-11-04 20:54:18 +01:00
release-bot
88efc47ce2 [maven-release-plugin] prepare for next development iteration 2024-11-04 19:42:06 +00:00
release-bot
d8a6c9b2ce [maven-release-plugin] prepare release oneplusbot-1.6.31 2024-11-04 19:42:03 +00:00
Sheldan
6088a5ad6e [OPB-xxx] updating abstracto version 2024-11-04 20:38:21 +01:00
release-bot
e44180d4b7 Commit from GitHub Actions (Publishes a new version of OnePlusBot) 2024-06-13 16:44:52 +00:00
release-bot
ad1f6bdd08 [maven-release-plugin] prepare for next development iteration 2024-06-13 16:40:08 +00:00
release-bot
46567418ad [maven-release-plugin] prepare release oneplusbot-1.6.30 2024-06-13 16:40:06 +00:00
Sheldan
46a812db9c [OPB-xxx] updating abstracto version 2024-06-13 18:37:04 +02:00
release-bot
d5768d673f Commit from GitHub Actions (Publishes a new version of OnePlusBot) 2024-06-08 07:36:13 +00:00
release-bot
ec327e0371 [maven-release-plugin] prepare for next development iteration 2024-06-08 07:31:45 +00:00
release-bot
a1bc14a87c [maven-release-plugin] prepare release oneplusbot-1.6.29 2024-06-08 07:31:44 +00:00
Sheldan
b7391eaad6 [OPB-xxx] changing ban notification text 2024-06-08 09:27:58 +02:00
Sheldan
71feb8bae1 [OPB-xxx] updating abstracto version 2024-06-08 09:14:43 +02:00
Sheldan
a43a7fd910 [OPB-xxx] fixing incorrect ID formatting for leave template 2024-05-15 22:09:42 +02:00
release-bot
6d2dfd712f Commit from GitHub Actions (Publishes a new version of OnePlusBot) 2024-05-05 22:36:20 +00:00
release-bot
4be04f7d58 [maven-release-plugin] prepare for next development iteration 2024-05-05 22:32:11 +00:00
release-bot
78baed209e [maven-release-plugin] prepare release oneplusbot-1.6.28 2024-05-05 22:32:09 +00:00
Sheldan
82c63aa255 [OPB-xxx] upgrading abstracto version 2024-05-06 00:27:44 +02:00
release-bot
94e1501169 Commit from GitHub Actions (Publishes a new version of OnePlusBot) 2024-04-05 13:53:22 +00:00
release-bot
6df6a6caa8 [maven-release-plugin] prepare for next development iteration 2024-04-05 13:48:29 +00:00
release-bot
c1701accc6 [maven-release-plugin] prepare release oneplusbot-1.6.27 2024-04-05 13:48:27 +00:00
Sheldan
cac654fc10 [OPB-xxx] upgrading abstracto version 2024-04-05 15:45:03 +02:00
Sheldan
72c8d4dbf3 [OPB-xxx] adding environment variable to get the url the bot can be reached at 2024-04-05 01:59:47 +02:00
release-bot
563f2bd35a Commit from GitHub Actions (Publishes a new version of OnePlusBot) 2024-03-27 21:59:13 +00:00
release-bot
3f54b4c57d [maven-release-plugin] prepare for next development iteration 2024-03-27 21:54:46 +00:00
release-bot
0ca48d1676 [maven-release-plugin] prepare release oneplusbot-1.6.26 2024-03-27 21:54:44 +00:00
Sheldan
01232e1a7a [OPB-xxx] fixing release job 2024-03-27 22:51:56 +01:00
release-bot
7284ddc1f1 [maven-release-plugin] prepare for next development iteration 2024-03-27 21:42:23 +00:00
release-bot
90f88f6254 [maven-release-plugin] prepare release oneplusbot-1.6.25 2024-03-27 21:42:21 +00:00
Sheldan
05c95a0a00 [OPB-xxx] updating abstracto version 2024-03-27 22:28:47 +01:00
Sheldan
88cb53fad1 [OPB-xxx] fixing not updating rest api version on release 2024-03-27 00:45:22 +01:00
release-bot
b445b1c99b Commit from GitHub Actions (Publishes a new version of OnePlusBot) 2024-03-26 23:38:35 +00:00
release-bot
313670d87f [maven-release-plugin] prepare for next development iteration 2024-03-26 23:34:06 +00:00
release-bot
7810acc5b8 [maven-release-plugin] prepare release oneplusbot-1.6.24 2024-03-26 23:34:04 +00:00
Sheldan
ce6a2da5d1 [OPB-xxx] updating docker compose file version 2024-03-27 00:31:02 +01:00
release-bot
0220254c84 [maven-release-plugin] prepare for next development iteration 2024-03-26 23:17:42 +00:00
release-bot
e369802bda [maven-release-plugin] prepare release oneplusbot-1.6.23 2024-03-26 23:17:40 +00:00
Sheldan
718445bbd6 [OPB-xxx] upgrading abstracto version
enabling experience leaderboard dashboard deployment
2024-03-27 00:13:23 +01:00
release-bot
6b777c9f20 Commit from GitHub Actions (Publishes a new version of OnePlusBot) 2024-03-17 12:56:15 +00:00
release-bot
d254f111b4 [maven-release-plugin] prepare for next development iteration 2024-03-17 12:52:21 +00:00
release-bot
fef4b0ad01 [maven-release-plugin] prepare release oneplusbot-1.6.22 2024-03-17 12:52:19 +00:00
Sheldan
ac93e11a47 [OPB-xxx] remove not accurate technology section 2024-03-17 13:49:31 +01:00
Sheldan
5bfe4a4aeb [OPB-xxx] upgrading abstracto version 2024-03-17 13:22:36 +01:00
Sheldan
216c578e08 [OPB-xxx] restructuring to use local postgres container for dev purposes
adding debug options to local dev version
removing deprecated flag from tilt file
2024-03-17 13:22:05 +01:00
release-bot
568cc85907 Commit from GitHub Actions (Publishes a new version of OnePlusBot) 2024-03-06 22:04:45 +00:00
release-bot
b19b3a9840 [maven-release-plugin] prepare for next development iteration 2024-03-06 21:59:09 +00:00
release-bot
54359e513e [maven-release-plugin] prepare release oneplusbot-1.6.21 2024-03-06 21:59:07 +00:00
Sheldan
65a86d2a52 [OPB-xxx] updating abstracto version to 1.5.26 2024-03-06 22:53:27 +01:00
release-bot
704d18e2f6 Commit from GitHub Actions (Publishes a new version of OnePlusBot) 2024-02-19 00:51:52 +00:00
release-bot
82d889019c [maven-release-plugin] prepare for next development iteration 2024-02-19 00:47:28 +00:00
release-bot
921789cd0b [maven-release-plugin] prepare release oneplusbot-1.6.20 2024-02-19 00:47:26 +00:00
Sheldan
716e65eeae [OPB-xxx] adding creation of release to release job
removing old release job
2024-02-19 01:44:20 +01:00
Sheldan
66fb06b594 [OPB-xxx] upating abstracto version
removing not needed dbchangelog.xsd files
2024-02-19 01:42:41 +01:00
release-bot
3ff8fed7fd Commit from GitHub Actions (Publishes a new version of OnePlusBot) 2024-02-09 22:42:28 +00:00
release-bot
c07aa25b92 [maven-release-plugin] prepare for next development iteration 2024-02-09 22:38:23 +00:00
release-bot
69b2cb38b3 [maven-release-plugin] prepare release oneplusbot-1.6.19 2024-02-09 22:38:22 +00:00
Sheldan
c82d975299 [OPB-xxx] updating abstracto version 2024-02-09 23:29:15 +01:00
release-bot
590b6e88f8 Commit from GitHub Actions (Publishes a new version of OnePlusBot) 2024-02-03 20:08:57 +00:00
release-bot
952af32bdb [maven-release-plugin] prepare for next development iteration 2024-02-03 20:03:36 +00:00
release-bot
24a6b6159a [maven-release-plugin] prepare release oneplusbot-1.6.18 2024-02-03 20:03:34 +00:00
Sheldan
1a81c27790 [OPB-xxx] removing app version from chart 2024-02-03 21:00:11 +01:00
Sheldan
37492335a4 [OPB-xxx] adding missed version to update in release job 2024-02-03 20:59:27 +01:00
Sheldan
2826ffdcad [OPB-xxx] adding *.tgz to gitignore 2024-02-03 20:58:24 +01:00
release-bot
b5a5061bb4 Commit from GitHub Actions (Publishes a new version of OnePlusBot) 2024-02-03 19:56:48 +00:00
release-bot
6ef01eb88b [maven-release-plugin] prepare for next development iteration 2024-02-03 19:52:47 +00:00
release-bot
7e6b99cf48 [maven-release-plugin] prepare release oneplusbot-1.6.17 2024-02-03 19:52:46 +00:00
Sheldan
af4d43192f [OPB-xxx] updating abstracto version 2024-02-03 20:48:58 +01:00
Sheldan
622b05430f [OPB-xxx] adding manual release pipeline
updating abstracto version
2024-02-03 20:47:33 +01:00
Sheldan
8736a9fe3f [maven-release-plugin] prepare for next development iteration 2023-12-29 00:50:45 +01:00
Sheldan
f92ef50fcf [maven-release-plugin] prepare release oneplusbot-1.6.16 2023-12-29 00:50:41 +01:00
Sheldan
656ca113f3 [OPB-xxx] updating abstracto version and preparing for release 2023-12-29 00:28:05 +01:00
Sheldan
4bb2d2ca5e [maven-release-plugin] prepare for next development iteration 2023-12-28 22:56:55 +01:00
Sheldan
47957d10e9 [maven-release-plugin] prepare release oneplusbot-1.6.15 2023-12-28 22:56:52 +01:00
Sheldan
19f2c885e4 [OPB-xxx] updating abstracto version and preparing for release 2023-12-28 22:46:37 +01:00
Sheldan
591e8f1586 [maven-release-plugin] prepare for next development iteration 2023-12-27 11:22:21 +01:00
Sheldan
36ac023eea [maven-release-plugin] prepare release oneplusbot-1.6.14 2023-12-27 11:22:17 +01:00
Sheldan
be13313000 [OPB-xxx] updating abstracto version and preparing for release 2023-12-27 11:20:31 +01:00
Sheldan
b6180614ff [maven-release-plugin] prepare for next development iteration 2023-12-25 19:05:57 +01:00
Sheldan
e4434fcb25 [maven-release-plugin] prepare release oneplusbot-1.6.13 2023-12-25 19:05:52 +01:00
Sheldan
b3bbd20da0 [OPB-xxx] preparing for release 2023-12-25 19:05:11 +01:00
Sheldan
fe50e1331b [OPB-xxx] updating abstracto version
enabling giveaway and image generation feature
2023-12-25 19:04:22 +01:00
Sheldan
e77c448824 [maven-release-plugin] prepare for next development iteration 2023-11-14 23:23:48 +01:00
Sheldan
8cc2ed5e96 [maven-release-plugin] prepare release oneplusbot-1.6.12 2023-11-14 23:23:43 +01:00
Sheldan
aaf4afe92e [OPB-xxx] preparing for release 2023-11-14 23:23:05 +01:00
Sheldan
17e24b14f4 [OPB-xxx] enabling to configure database pool sizes externally 2023-11-14 23:22:13 +01:00
Sheldan
ae88377d30 [maven-release-plugin] prepare for next development iteration 2023-11-08 21:26:14 +01:00
Sheldan
4e645885f3 [maven-release-plugin] prepare release oneplusbot-1.6.11 2023-11-08 21:26:09 +01:00
Sheldan
77bb7b043b [OPB-3] adding daily job to check for new news posts
updating to abstracto 1.5.12
preparing for release
2023-11-08 21:25:09 +01:00
Sheldan
9f8d4ebcc8 [maven-release-plugin] prepare for next development iteration 2023-09-26 23:21:45 +02:00
Sheldan
021d07bf47 [maven-release-plugin] prepare release oneplusbot-1.6.10 2023-09-26 23:21:41 +02:00
Sheldan
0a7eda239f [OPB-xxx] removing discriminators 2023-09-26 23:19:55 +02:00
Sheldan
a8587d29af [OPB-xxx] prepare for release 2023-09-26 23:19:07 +02:00
Sheldan
e38f5c8382 [OPB-xxx] fixing app name in log dashboard 2023-09-23 22:05:31 +02:00
Sheldan
3ab491b5f3 [maven-release-plugin] prepare for next development iteration 2023-09-23 21:36:02 +02:00
313 changed files with 1628 additions and 11658 deletions

4
.env Normal file
View File

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

View File

@@ -14,7 +14,7 @@ on:
jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
@@ -31,3 +31,23 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
user: Sheldan
token: ${{ secrets.ABSTRACTO_PAT }}
- name: Login to Harbor
uses: docker/login-action@v3
with:
registry: harbor.sheldan.dev
username: ${{ secrets.HARBOR_USERNAME }}
password: ${{ secrets.HARBOR_TOKEN }}
- name: Load env file
id: dotenv
uses: falti/dotenv-action@v1.0.4
with:
path: .env
- name: Docker build
run: docker compose build
env:
REGISTRY_PREFIX: ${{ steps.dotenv.outputs.registry_prefix }}
VERSION: ${{ steps.dotenv.outputs.version }}
- name: Helm package and push
working-directory: ./deployment/helm/
run: |-
helm package oneplus-bot

View File

@@ -1,48 +0,0 @@
name: Publish package to GitHub Packages
on:
release:
types: [created]
jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
persist-credentials: false
- name: Set up Java for publishing to GitHub Packages
uses: actions/setup-java@v3
with:
distribution: 'corretto'
java-version: 17
- name: Load current version
id: version
run: echo "version=$(mvn -s settings.xml --file pom.xml -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec)" >> $GITHUB_ENV
- 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 Harbor
uses: docker/login-action@v2
with:
registry: harbor.sheldan.dev
username: ${{ secrets.HARBOR_USERNAME }}
password: ${{ secrets.HARBOR_TOKEN }}
- name: Load env files
id: dotenv
uses: falti/dotenv-action@v1.0.4
with:
path: ./deployment/image-packaging/src/main/docker/.env
- name: Push container
working-directory: ./deployment/image-packaging/src/main/docker
run: docker-compose build && docker-compose push
env:
REGISTRY_PREFIX: ${{ steps.dotenv.outputs.registry_prefix }}
VERSION: ${{ steps.dotenv.outputs.version }}
- name: Helm push
working-directory: ./deployment/helm/
run: |-
helm registry login -u '${{ secrets.HARBOR_USERNAME }}' -p '${{ secrets.HARBOR_TOKEN }}' harbor.sheldan.dev
helm package oneplus-bot
helm push oneplus-bot*.tgz oci://harbor.sheldan.dev/oneplus-bot

92
.github/workflows/release_manual.yaml vendored Normal file
View File

@@ -0,0 +1,92 @@
name: Publishes a new version of OnePlusBot
on: workflow_dispatch
permissions:
packages: write
contents: write
jobs:
publish:
runs-on: ubuntu-24.04
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 }}",
"restApi.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"

3
.gitignore vendored
View File

@@ -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*

3
.tiltignore Normal file
View File

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

View File

@@ -1,6 +1,6 @@
# r/oneplus Discord bot privacy policy
Last updated: 06.09.2021
Last updated: 23.02.2025
## Description
@@ -16,17 +16,20 @@ The detailed list of what information is stored and processed is the following:
* the name of emotes which are used in the bot for convenience, if they are customized
* towards which channel (identified by ID) certain messages by the bot are posted. e.g. logging, news, starboard
* **no message content, username, channel name or role name is stored, except at the places where its mentioned**
* a logfile is used in order to examine any malfunctions, the content is deleted after 7 days
* most of the stored records have a 'created' and 'updated' timestamp, in order to assist in examining bugs and malfunctions
* which commands have which cooldown in which channel group and in which channel group they are disabled
* which channel is in which channel group
* which role is allowed to execute which command
* which features are enabled
* which feature modes are enabled
* **aliases** created for the commands
* **information** necessary to handle components (buttons, select menus). This information is of varying nature and can be user identifiable information
* **emotes** which should be used for varying places (assignable roles, particular emotes which are overwriten, such as star board)
### Moderation
* the date of the latest report via the reaction report system, in order to disallow quick reports
* mute reason, duration, mute date, who muted whom and in which message was the mute executed
* **mute reason**, duration, mute date, who muted whom and in which message was the mute executed
* the names of filtered invite link servers in order to find out if it would be valid to allow the invite
* any configured allowed invite links the server ID and the actually used invite
* this is necessary in order to determine the server via its ID and allow other unknown invite links. The invite link is necessary as there is no way to map server ID to actual server
@@ -41,6 +44,9 @@ The detailed list of what information is stored and processed is the following:
* the user who warned a user
* whether the warning was decayed and when
### Giveaway
* the give away information: **description**, provider, manager, target date, winners and participants
### Embedded messages
* embedded message information
* this information includes who embedded which message in which channel and is deleted after a few days
@@ -49,10 +55,12 @@ The detailed list of what information is stored and processed is the following:
* the name of emotes which are being tracked in the emote usage tracking system for purely convenience reasons
* **who** used which emote is **not** tracked
* at which day an emote was used how many times
* whether the emote was a reaction
### News
* general information about news posts
* the source message of the command, the created news post, and the author in order to enable the update mechanism
* news posts from the oneplus Forums for automatic retrieval and comparison to see which posts are new. The ID of the users for who the forum posts are checked.
### Referral system
* the date of the latest referral post in order to enforce the referral bump mechanism
@@ -62,6 +70,13 @@ The detailed list of what information is stored and processed is the following:
* the date it was created, and the date it is due
* the id of the message which contained the command
* whether you have been reminded
* the users who have joined the reminders
### Modmail
* the information that a modmail thread existed (creation, status and close date), and the IDs of the messages that have been sent in both directions
### Polls
* the **text** of polls, the creator of polls and who made which decision in polls
### Starboard
* the message which was the origin for the starboard post
@@ -71,11 +86,11 @@ The detailed list of what information is stored and processed is the following:
* this is necessary to provide the information about 'top star giver' and to disallow duplicate starboard reactions
### Suggestion
* *the message content* of the message used to create the suggestion
* **the message content** of the message used to create the suggestion
* 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
* whether you voted for a suggestion and which decision you made
### Leveling system
* the amount of messages which were considered for the leveling system
@@ -86,6 +101,10 @@ The detailed list of what information is stored and processed is the following:
* which roles are configured to be used as experience roles and at which level they are assigned
* which roles are used to disable experience gain
### Entertainment
* PressF: for **what** the pressF was initiated by whom and who participated
### FAQ
* the names of FAQ commands
* in which channel groups a FAQ command has a response
@@ -100,6 +119,7 @@ The detailed list of what information is stored and processed is the following:
### Assignable roles
* the names of assignable role places and assignable role button text, together with the associated emote markdown (if given)
* the assigned assignable roles for each member in order to provide the 'unique' assignable role functionality
* custom configured conditions to enable a level restriction
## Grafana dashboard
@@ -121,7 +141,7 @@ All of this information cannot be linked to any user (or any server for that mat
## How can I decide which information is collected?
It is not possible to opt-out of singular sub-services of the bot. Should you decide that your information should not be collected, please cease usage of the bot immediately (leave any guild the bot operates in).
_Should you decide to no longer utilize the bot, you may request your data to be erased within 30 days as per GDPR if you are a citizen of the EU. You can do this by sending an email to oneplus.appeals@pm.me with the subject: GDPR Data removal <Username#0000> <UserId>. If your request is incomplete, we cannot acknowledge it and therefore your data will not be removed. In order to identify authentic requests, please contact modmail beforehand by sending a direct message to the bot and stating your intention._
_Should you decide to no longer utilize the bot, you may request your data to be erased within 30 days as per GDPR if you are a citizen of the EU. You can do this by sending a message to the user "sheldan" on Discord: GDPR Data removal <Username> <UserId>. If your request is incomplete, we cannot acknowledge it and therefore your data will not be removed. In order to identify authentic requests, please contact modmail beforehand by sending a direct message to the bot and stating your intention._
## Legal information
@@ -134,7 +154,7 @@ OnePlus and OPPO are legal owners of OxygenOS. Visit https://oneplus.com/brand t
## Open source content
This bot uses the following open source libraries and frameworks:
* [abstracto](https://github.com/Sheldan/abstracto) is used as a base for this bot, providing a lot of the functionalities
* [abstracto](https://github.com/Sheldan/abstracto) is used as a base for this bot, providing most of the functionalities
* [JDA](https://github.com/DV8FromTheWorld/JDA/) The Discord API Wrapper used
* [Spring boot](https://github.com/spring-projects/spring-boot) is used as a framework to create standalone application in Java with Java EE methods. (including Dependency injection and more)
* [Hibernate](https://github.com/hibernate/hibernate-orm) is used as a reference implementation of JPA.
@@ -142,7 +162,8 @@ This bot uses the following open source libraries and frameworks:
* [Ehcache](https://github.com/ehcache/ehcache3) is used as a caching implementation.
* [Lombok](https://github.com/rzwitserloot/lombok) is used as a framework in order to speed up creation of container classes and builders.
* [Quartz](https://github.com/quartz-scheduler/quartz) is used as a scheduling framework in order to provide functionalities which either require a delayed or cronjob behaviour.
* [Docker](https://github.com/docker) is used to package the application into a container and [Docker Compose](https://github.com/docker/compose) is used to orchestrate the containers
* [Docker](https://github.com/docker) is used to package the application into a container and [k3s](https://k3s.io/) to orchestrate the containers
* [Liquibase](https://github.com/liquibase/liquibase) is used to manage changes to the database
* [Prometheus](https://prometheus.io) to scrap and collect the metrics about how the bot is operating
* [Grafana](https://grafana.com) to visualize metrics of the bot
* [Grafana](https://grafana.com) to visualize metrics of the bot and [Loki](https://grafana.com/oss/loki/) for logging

View File

@@ -11,11 +11,3 @@ Custom features which were ported
- [x] Setup channel handling
- [x] Referral link handling
# Technologies used in addition to the ones provided in abstracto
- [grafana](https://github.com/grafana/grafana) for visualization of the bot status and metrics
- [Loki](https://github.com/grafana/loki) to visualize and query log files
- [pgAdmin](https://github.com/postgres/pgadmin4) to view the database
- [prometheus](https://github.com/prometheus/prometheus) for metric collection
- [postgres](https://github.com/postgres/postgres) as a database
- [loki](https://github.com/grafana/loki) for log aggregation

View File

@@ -2,6 +2,7 @@ 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',
@@ -15,9 +16,9 @@ local_resource(
deps=['pom.xml'])
docker_build_with_restart(
registry + 'oneplus-bot',
registry + 'oneplus-bot-image',
'./application/executable/target/jar',
entrypoint=['java', '-noverify', '-cp', '.:./lib/*', 'dev.sheldan.oneplus.bot.executable.Application'],
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'),
@@ -29,9 +30,12 @@ docker_build_with_restart(
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})
k8s_yaml(helm('deployment/helm/oneplus-bot', values=
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']
))

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.oneplus.bot.application</groupId>
<artifactId>application</artifactId>
<version>1.6.9</version>
<version>1.7.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>executable</artifactId>
@@ -151,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>

View File

@@ -1,8 +1,9 @@
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=abstracto
spring.jpa.properties.hibernate.default_schema=abstracto
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=OnePlusBot
management.endpoint.health.probes.enabled=true

View File

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

View File

@@ -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>

View File

@@ -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"/>

View File

@@ -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>

View File

@@ -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>

View File

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

View File

@@ -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>

View File

@@ -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">

View File

@@ -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>

View File

@@ -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"/>

View File

@@ -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>

View File

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

View File

@@ -3,17 +3,13 @@
<parent>
<groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
<artifactId>oneplus-bot-customizations</artifactId>
<version>1.6.9</version>
<version>1.7.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>starboard-custom</artifactId>
<packaging>jar</packaging>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>
<build>
<plugins>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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"/>

View File

@@ -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>

View File

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

View File

@@ -8,10 +8,7 @@ import dev.sheldan.abstracto.core.command.execution.CommandContext;
import dev.sheldan.abstracto.core.command.execution.CommandResult;
import dev.sheldan.abstracto.core.config.FeatureDefinition;
import dev.sheldan.abstracto.core.models.database.AServer;
import dev.sheldan.abstracto.core.service.ChannelService;
import dev.sheldan.abstracto.core.service.JSONValidationService;
import dev.sheldan.abstracto.core.service.management.ServerManagementService;
import dev.sheldan.abstracto.core.utils.FileService;
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.service.FAQServiceBean;
@@ -27,18 +24,9 @@ import java.util.concurrent.CompletableFuture;
@Slf4j
public class DeleteFAQ extends AbstractConditionableCommand {
@Autowired
private FileService fileService;
@Autowired
private FAQServiceBean faqServiceBean;
@Autowired
private ChannelService channelService;
@Autowired
private JSONValidationService jsonValidationService;
@Autowired
private ServerManagementService serverManagementService;

View File

@@ -66,14 +66,14 @@ public class FAQ extends AbstractConditionableCommand {
.forEach(faqResponseMessageModel ->
messageFutures.add(FutureUtils.
toSingleFutureGeneric(channelService.
sendEmbedTemplateInTextChannelList(FAQ_RESPONSE_TEMPLATE_KEY,
sendEmbedTemplateInMessageChannel(FAQ_RESPONSE_TEMPLATE_KEY,
faqResponseMessageModel, commandContext.getChannel()))));
return FutureUtils.toSingleFutureGeneric(messageFutures);
} else {
return FutureUtils
.toSingleFutureGeneric(
channelService.
sendEmbedTemplateInTextChannelList(FAQ_RESPONSE_NO_COMMAND_FOUND_TEMPLATE_KEY,
sendEmbedTemplateInMessageChannel(FAQ_RESPONSE_NO_COMMAND_FOUND_TEMPLATE_KEY,
faqResponseModel, commandContext.getChannel()));
}
})
@@ -85,7 +85,7 @@ public class FAQ extends AbstractConditionableCommand {
return FutureUtils
.toSingleFutureGeneric(
channelService.
sendEmbedTemplateInTextChannelList(FAQ_RESPONSE_NO_COMMAND_FOUND_TEMPLATE_KEY,
sendEmbedTemplateInMessageChannel(FAQ_RESPONSE_NO_COMMAND_FOUND_TEMPLATE_KEY,
model, commandContext.getChannel()))
.thenApply(unused -> CommandResult.fromSuccess());
}

View File

@@ -52,7 +52,7 @@ public class FAQUsage extends AbstractConditionableCommand {
model = faqUsageServiceBean.getFAQUsageModel(server, commandName);
}
return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInTextChannelList(FAQ_USAGE_RESPONSE_TEMPLATE_KEY, model, commandContext.getChannel()))
return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInMessageChannel(FAQ_USAGE_RESPONSE_TEMPLATE_KEY, model, commandContext.getChannel()))
.thenApply(unused -> CommandResult.fromSuccess());
}

View File

@@ -39,7 +39,7 @@ public class ListFAQCommands extends AbstractConditionableCommand {
public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
AServer server = serverManagementService.loadServer(commandContext.getGuild());
ListFAQCommandsModel model = faqServiceBean.getCommandListingForServer(server);
return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInTextChannelList(LIST_FAQ_COMMANDS_RESPONSE_TEMPLATE_KEY, model, commandContext.getChannel()))
return FutureUtils.toSingleFutureGeneric(channelService.sendEmbedTemplateInMessageChannel(LIST_FAQ_COMMANDS_RESPONSE_TEMPLATE_KEY, model, commandContext.getChannel()))
.thenApply(unused -> CommandResult.fromSuccess());
}

View File

@@ -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>

View File

@@ -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"/>

View File

@@ -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" >

View File

@@ -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"/>

View File

@@ -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"/>

View File

@@ -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"/>

View File

@@ -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">

View File

@@ -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">

View File

@@ -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">

View File

@@ -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">

View File

@@ -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">

View File

@@ -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"/>

View File

@@ -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>

View File

@@ -3,22 +3,21 @@
<parent>
<groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
<artifactId>oneplus-bot-modules</artifactId>
<version>1.6.9</version>
<version>1.7.3-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>

View File

@@ -36,10 +36,24 @@ public class UpdateNews extends AbstractConditionableCommand {
@Override
public CommandConfiguration getConfiguration() {
Parameter newsPostId = Parameter.builder().name("newsPostId").type(Long.class).templated(true).build();
Parameter newsText = Parameter.builder().name("text").type(String.class).remainder(true).templated(true).build();
Parameter newsPostId = Parameter
.builder()
.name("newsPostId")
.type(Long.class)
.templated(true)
.build();
Parameter newsText = Parameter
.builder()
.name("text")
.type(String.class)
.remainder(true)
.templated(true)
.build();
List<Parameter> parameters = Arrays.asList(newsPostId, newsText);
HelpInfo helpInfo = HelpInfo.builder().templated(true).build();
HelpInfo helpInfo = HelpInfo
.builder()
.templated(true)
.build();
return CommandConfiguration.builder()
.name("updateNews")
.module(NewsModuleDefinition.NEWS)

View File

@@ -2,6 +2,7 @@ package dev.sheldan.oneplus.bot.modules.news.config;
import dev.sheldan.abstracto.core.config.FeatureConfig;
import dev.sheldan.abstracto.core.config.FeatureDefinition;
import dev.sheldan.abstracto.core.config.FeatureMode;
import dev.sheldan.abstracto.core.config.PostTargetEnum;
import org.springframework.stereotype.Component;
@@ -11,6 +12,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 +21,11 @@ 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);
}
@Override
public List<FeatureMode> getAvailableModes() {
return Arrays.asList(NewsFeatureMode.AUTOMATIC_POST, NewsFeatureMode.AUTOMATIC_PUBLISH);
}
}

View File

@@ -0,0 +1,16 @@
package dev.sheldan.oneplus.bot.modules.news.config;
import dev.sheldan.abstracto.core.config.FeatureMode;
import lombok.Getter;
@Getter
public enum NewsFeatureMode implements FeatureMode {
AUTOMATIC_POST("automaticPost"),
AUTOMATIC_PUBLISH("automaticPublish");
private final String key;
NewsFeatureMode(String key) {
this.key = key;
}
}

View File

@@ -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;

View File

@@ -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);
}
}
}

View File

@@ -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 ForumPostEntry {
private Long postId;
private String subject;
private String content;
private Long creatorId;
public static ForumPostEntry fromPost(ForumPost forumPost) {
return ForumPostEntry
.builder()
.postId(forumPost.getId())
.subject(forumPost.getSubject())
.content(forumPost.getContent())
.creatorId(forumPost.getSource().getUserId())
.build();
}
}

View File

@@ -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 ForumPostModel {
private List<ForumPostEntry> entries;
}

View File

@@ -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();
}
}

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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();
}
}

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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> {
}

View File

@@ -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> {
}

View File

@@ -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<>();
}
}

View File

@@ -0,0 +1,197 @@
package dev.sheldan.oneplus.bot.modules.news.service;
import dev.sheldan.abstracto.core.service.FeatureModeService;
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.NewsFeatureDefinition;
import dev.sheldan.oneplus.bot.modules.news.config.NewsFeatureMode;
import dev.sheldan.oneplus.bot.modules.news.config.NewsPostTarget;
import dev.sheldan.oneplus.bot.modules.news.model.ForumPostEntry;
import dev.sheldan.oneplus.bot.modules.news.model.ForumPostModel;
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 net.dv8tion.jda.api.entities.Message;
import org.apache.commons.lang3.tuple.Pair;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import java.util.concurrent.CompletableFuture;
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;
@Autowired
private FeatureModeService featureModeService;
private static final String NEWS_FORUM_POST_NOTIFICATION_TEMPLATE_KEY = "newsForumPost_notification";
private static final String NEWS_FORUM_POST_TEMPLATE_KEY = "newsForumPost";
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;
}
if(featureModeService.featureModeActive(NewsFeatureDefinition.NEWS, targetServerId, NewsFeatureMode.AUTOMATIC_POST)) {
List<ForumPostEntry> entries = new ArrayList<>();
newForumPosts.forEach(forumPost -> entries.add(ForumPostEntry.fromPost(forumPost)));
ForumPostModel model = ForumPostModel
.builder()
.entries(entries)
.build();
MessageToSend messageToSend = templateService.renderEmbedTemplate(NEWS_FORUM_POST_TEMPLATE_KEY, model, targetServerId);
List<CompletableFuture<Message>> messageFutures = postTargetService.sendEmbedInPostTarget(messageToSend, NewsPostTarget.NEWS_TARGET, targetServerId);
FutureUtils.toSingleFutureGeneric(messageFutures)
.thenAccept(unused -> {
log.info("Sent news forum post notification.");
List<Pair<Long, Long>> posts = entries
.stream()
.map(forumPostNotificationEntry -> Pair.of(forumPostNotificationEntry.getCreatorId(), forumPostNotificationEntry.getPostId()))
.toList();
self.persistForumPostsAndThreadCount(posts);
self.handleAutomaticPublish(messageFutures, targetServerId);
});
} else {
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.");
List<Pair<Long, Long>> posts = entries
.stream()
.map(forumPostNotificationEntry -> Pair.of(forumPostNotificationEntry.getCreatorId(), forumPostNotificationEntry.getPostId()))
.toList();
self.persistForumPostsAndThreadCount(posts);
}).exceptionally(throwable -> {
log.error("Failed to send news forum post notification.", throwable);
return null;
});
}
}
@Transactional
public CompletableFuture<Message> handleAutomaticPublish(List<CompletableFuture<Message>> messageFutures, Long serverId) {
if(featureModeService.featureModeActive(NewsFeatureDefinition.NEWS, serverId, NewsFeatureMode.AUTOMATIC_PUBLISH)) {
if(messageFutures != null && !messageFutures.isEmpty() && messageFutures.get(0) != null) {
Message newsMessage = messageFutures.get(0).join();
log.info("Publishing message {} in server {}.", newsMessage.getId(), serverId);
return newsMessage.crosspost().submit();
} else {
log.info("No message found - not cross posting.");
return CompletableFuture.completedFuture(null);
}
} else {
log.info("Automatic publishing disabled in server {}.", serverId);
return CompletableFuture.completedFuture(null);
}
}
@Transactional
public void persistForumPostsAndThreadCount(List<Pair<Long, Long>> posts) {
Map<Long, NewsSource> sourceMap = newsSourceManagementServiceBean.loadNewsSources()
.stream()
.collect(Collectors.toMap(NewsSource::getUserId, Function.identity()));
posts.forEach(forumPostNotificationEntry ->
newsForumPostManagementServiceBean.createPost(sourceMap.get(forumPostNotificationEntry.getLeft()), forumPostNotificationEntry.getRight()));
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();
}
}

View File

@@ -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);
}
}

View File

@@ -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();
}
}

View File

@@ -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>

View File

@@ -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" />

View File

@@ -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>

View File

@@ -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>

View File

@@ -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" >

View File

@@ -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"/>

View File

@@ -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="news_feature-insertion">
<insert tableName="feature">
<column name="key" value="news"/>

View File

@@ -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="news-module-insertion">
<insert tableName="module">
<column name="name" value="news"/>

View File

@@ -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="news-job-insert">
<insert tableName="scheduler_job">
<column name="name" value="newsLockJob"/>

View File

@@ -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="news_post-table">
<createTable tableName="news_post">

View File

@@ -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_post.xml" relativeToChangelogFile="true"/>
</databaseChangeLog>

View File

@@ -0,0 +1,7 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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>

View File

@@ -0,0 +1,6 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
<include file="news_check_job.xml" relativeToChangelogFile="true"/>
</databaseChangeLog>

View File

@@ -0,0 +1,15 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
<changeSet author="Sheldan" id="check_for_news_job-insert">
<insert tableName="scheduler_job">
<column name="name" value="checkForNewsJob"/>
<column name="group_name" value="news"/>
<column name="clazz" value="dev.sheldan.oneplus.bot.modules.news.job.CheckForNewsPosts"/>
<column name="active" value="true"/>
<column name="cron_expression" value="0 0 0 * * ?"/>
<column name="recovery" value="false"/>
</insert>
</changeSet>
</databaseChangeLog>

View File

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

View File

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

View File

@@ -0,0 +1,7 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog https://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.26.xsd" >
<include file="news_source.xml" relativeToChangelogFile="true"/>
<include file="news_forum_post.xml" relativeToChangelogFile="true"/>
</databaseChangeLog>

View File

@@ -1,11 +1,8 @@
<?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.3.9-news/collection.xml" relativeToChangelogFile="true"/>
<include file="1.3.10-news/collection.xml" relativeToChangelogFile="true"/>
<include file="1.6.11/collection.xml" relativeToChangelogFile="true"/>
</databaseChangeLog>

View File

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

View File

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

View File

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

View File

@@ -119,7 +119,7 @@ public class ReferralListener implements AsyncMessageReceivedListener {
.build();
ServerUser serverUser = ServerUser.fromMember(message.getMember());
CompletableFutureList<Message> sendFutures = new CompletableFutureList<>(channelService
.sendEmbedTemplateInMessageChannelList(REFERRAL_POST_EMBED_TEMPLATE_KEY, postModel, message.getChannel()));
.sendEmbedTemplateInMessageChannel(REFERRAL_POST_EMBED_TEMPLATE_KEY, postModel, message.getChannel()));
CompletableFuture<Void> deletionFuture = messageService.deleteMessage(message);
CompletableFuture.allOf(sendFutures.getMainFuture(), deletionFuture)
.thenAccept(unused -> self.updateReferralStateInDatabase(serverUser))
@@ -139,7 +139,7 @@ public class ReferralListener implements AsyncMessageReceivedListener {
private void deleteAndNotify(Message message, String usedTemplate, Object usedModel) {
CompletableFutureList<Message> futures = new CompletableFutureList<>(channelService
.sendEmbedTemplateInMessageChannelList(usedTemplate, usedModel, message.getChannel()));
.sendEmbedTemplateInMessageChannel(usedTemplate, usedModel, message.getChannel()));
futures.getMainFuture().thenAccept(unused ->
scheduledExecutorService.schedule(() ->
futures.getObjects().forEach(createdMessage -> messageService.deleteMessage(createdMessage)),

View File

@@ -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="referral-tables/tables.xml" relativeToChangelogFile="true"/>
<include file="referral-seedData/data.xml" relativeToChangelogFile="true"/>
</databaseChangeLog>

View File

@@ -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>

Some files were not shown because too many files have changed in this diff Show More