Compare commits

...

41 Commits

Author SHA1 Message Date
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
54 changed files with 74 additions and 71 deletions

4
.env
View File

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

View File

@@ -14,7 +14,7 @@ on:
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-24.04
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3

View File

@@ -5,7 +5,7 @@ permissions:
contents: write contents: write
jobs: jobs:
publish: publish:
runs-on: ubuntu-latest runs-on: ubuntu-24.04
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
@@ -60,7 +60,8 @@ jobs:
"bot.tag": "${{ env.version }}", "bot.tag": "${{ env.version }}",
"templateDeploymentData.tag": "${{ env.version }}", "templateDeploymentData.tag": "${{ env.version }}",
"dbConfigDeploymentData.tag": "${{ env.version }}", "dbConfigDeploymentData.tag": "${{ env.version }}",
"privateRestApi.tag": "${{ env.version }}" "privateRestApi.tag": "${{ env.version }}",
"restApi.tag": "${{ env.version }}"
} }
- name: Update .env version - name: Update .env version
run: run:
@@ -71,7 +72,7 @@ jobs:
with: with:
path: .env path: .env
- name: Build and push Docker containers - name: Build and push Docker containers
run: docker-compose build && docker-compose push run: docker compose build && docker compose push
env: env:
REGISTRY_PREFIX: ${{ steps.dotenv.outputs.registry_prefix }} REGISTRY_PREFIX: ${{ steps.dotenv.outputs.registry_prefix }}
VERSION: ${{ steps.dotenv.outputs.version }} VERSION: ${{ steps.dotenv.outputs.version }}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -5,13 +5,13 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot</groupId> <groupId>dev.sheldan.oneplus.bot</groupId>
<artifactId>oneplusbot</artifactId> <artifactId>oneplusbot</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<groupId>dev.sheldan.oneplus.bot.application</groupId> <groupId>dev.sheldan.oneplus.bot.application</groupId>
<artifactId>application</artifactId> <artifactId>application</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
<modules> <modules>
<module>executable</module> <module>executable</module>
<module>oneplus-bot-customizations</module> <module>oneplus-bot-customizations</module>

View File

@@ -2,4 +2,4 @@ apiVersion: v2
name: oneplus-bot name: oneplus-bot
description: A Helm chart for Kubernetes description: A Helm chart for Kubernetes
type: application type: application
version: 1.6.22 version: 1.6.32

View File

@@ -77,6 +77,8 @@ spec:
value: "{{ .Values.privateRestApi.service.name }}.{{ .Release.Namespace }}.svc.cluster.local" value: "{{ .Values.privateRestApi.service.name }}.{{ .Release.Namespace }}.svc.cluster.local"
- name: PRIVATE_REST_API_PORT - name: PRIVATE_REST_API_PORT
value: "{{ .Values.privateRestApi.service.targetPort }}" value: "{{ .Values.privateRestApi.service.targetPort }}"
- name: FRONTEND_BASE
value: "https://{{ .Values.bot.host }}"
{{- range $key, $value := .Values.bot.propertyConfig }} {{- range $key, $value := .Values.bot.propertyConfig }}
- name: {{ $key | quote }} - name: {{ $key | quote }}
value: {{ $value | quote}} value: {{ $value | quote}}

View File

@@ -3,7 +3,7 @@ bot:
repository: harbor.sheldan.dev/oneplus-bot repository: harbor.sheldan.dev/oneplus-bot
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
image: oneplus-bot-image image: oneplus-bot-image
tag: 1.6.22 tag: 1.6.32
livenessProbe: livenessProbe:
initialDelaySeconds: 60 initialDelaySeconds: 60
periodSeconds: 5 periodSeconds: 5
@@ -16,28 +16,29 @@ bot:
newsForumPostNotificationServerId: null newsForumPostNotificationServerId: null
propertyConfig: propertyConfig:
hikariPoolSize: 10 hikariPoolSize: 10
host: null
templateDeployment: templateDeployment:
enabled: true enabled: true
repository: harbor.sheldan.dev/abstracto repository: harbor.sheldan.dev/abstracto
pullPolicy: Always pullPolicy: Always
image: abstracto-template-deployment image: abstracto-template-deployment
tag: 1.5.32 tag: 1.5.50
templateDeploymentData: templateDeploymentData:
repository: harbor.sheldan.dev/oneplus-bot repository: harbor.sheldan.dev/oneplus-bot
pullPolicy: Always pullPolicy: Always
image: oneplus-bot-template-data image: oneplus-bot-template-data
tag: 1.6.22 tag: 1.6.32
dbConfigDeployment: dbConfigDeployment:
enabled: true enabled: true
repository: harbor.sheldan.dev/abstracto repository: harbor.sheldan.dev/abstracto
pullPolicy: Always pullPolicy: Always
image: abstracto-db-deployment image: abstracto-db-deployment
tag: 1.5.32 tag: 1.5.50
dbConfigDeploymentData: dbConfigDeploymentData:
repository: harbor.sheldan.dev/oneplus-bot repository: harbor.sheldan.dev/oneplus-bot
pullPolicy: Always pullPolicy: Always
image: oneplus-bot-db-data image: oneplus-bot-db-data
tag: 1.6.22 tag: 1.6.32
dbCredentials: dbCredentials:
host: null host: null
port: null port: null
@@ -50,7 +51,7 @@ privateRestApi:
repository: harbor.sheldan.dev/oneplus-bot repository: harbor.sheldan.dev/oneplus-bot
pullPolicy: Always pullPolicy: Always
image: oneplus-bot-private-rest-api image: oneplus-bot-private-rest-api
tag: 1.6.22 tag: 1.6.32
podAnnotations: {} podAnnotations: {}
podSecurityContext: {} podSecurityContext: {}
securityContext: {} securityContext: {}
@@ -81,7 +82,7 @@ restApi:
repository: harbor.sheldan.dev/oneplus-bot repository: harbor.sheldan.dev/oneplus-bot
pullPolicy: Always pullPolicy: Always
image: oneplus-bot-rest-api image: oneplus-bot-rest-api
tag: 1.6.22 tag: 1.6.32
podAnnotations: {} podAnnotations: {}
podSecurityContext: {} podSecurityContext: {}
securityContext: {} securityContext: {}

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.deployment</groupId> <groupId>dev.sheldan.oneplus.bot.deployment</groupId>
<artifactId>deployment</artifactId> <artifactId>deployment</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<artifactId>oneplusbot</artifactId> <artifactId>oneplusbot</artifactId>
<groupId>dev.sheldan.oneplus.bot</groupId> <groupId>dev.sheldan.oneplus.bot</groupId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -1,4 +1,4 @@
version: "3.7" version: "3.8"
services: services:
bot: bot:

View File

@@ -12,13 +12,13 @@
<groupId>dev.sheldan.oneplus.bot</groupId> <groupId>dev.sheldan.oneplus.bot</groupId>
<artifactId>oneplusbot</artifactId> <artifactId>oneplusbot</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
<properties> <properties>
<maven.compiler.target>17</maven.compiler.target> <maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source> <maven.compiler.source>17</maven.compiler.source>
<abstracto.version>1.5.32</abstracto.version> <abstracto.version>1.5.50</abstracto.version>
<abstracto.templates.version>1.4.35</abstracto.templates.version> <abstracto.templates.version>1.4.45</abstracto.templates.version>
</properties> </properties>
<modules> <modules>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates.customizations</groupId> <groupId>dev.sheldan.oneplus.bot.templates.customizations</groupId>
<artifactId>customization-templates</artifactId> <artifactId>customization-templates</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates</groupId> <groupId>dev.sheldan.oneplus.bot.templates</groupId>
<artifactId>oneplus-bot-templates</artifactId> <artifactId>oneplus-bot-templates</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates.customizations</groupId> <groupId>dev.sheldan.oneplus.bot.templates.customizations</groupId>
<artifactId>customization-templates</artifactId> <artifactId>customization-templates</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates.modules</groupId> <groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
<artifactId>oneplus-bot-module-templates</artifactId> <artifactId>oneplus-bot-module-templates</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates.modules</groupId> <groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
<artifactId>oneplus-bot-module-templates</artifactId> <artifactId>oneplus-bot-module-templates</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates</groupId> <groupId>dev.sheldan.oneplus.bot.templates</groupId>
<artifactId>oneplus-bot-templates</artifactId> <artifactId>oneplus-bot-templates</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates.modules</groupId> <groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
<artifactId>oneplus-bot-module-templates</artifactId> <artifactId>oneplus-bot-module-templates</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,13 +3,13 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates</groupId> <groupId>dev.sheldan.oneplus.bot.templates</groupId>
<artifactId>templates</artifactId> <artifactId>templates</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>oneplus-bot-templates</artifactId> <artifactId>oneplus-bot-templates</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
<modules> <modules>
<module>module-templates</module> <module>module-templates</module>
<module>customization-templates</module> <module>customization-templates</module>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId> <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
<artifactId>template-overrides</artifactId> <artifactId>template-overrides</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId> <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
<artifactId>template-overrides</artifactId> <artifactId>template-overrides</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -1,4 +1,4 @@
{ {
<#assign user>${user.name} (${user.id})</#assign> <#assign user>${user.name} (${user.id?c})</#assign>
"additionalMessage": "<@safe_include "user_left_text"/>" "additionalMessage": "<@safe_include "user_left_text"/>"
} }

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId> <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
<artifactId>template-overrides</artifactId> <artifactId>template-overrides</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId> <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
<artifactId>template-overrides</artifactId> <artifactId>template-overrides</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates</groupId> <groupId>dev.sheldan.oneplus.bot.templates</groupId>
<artifactId>oneplus-bot-templates</artifactId> <artifactId>oneplus-bot-templates</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId> <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
<artifactId>template-overrides</artifactId> <artifactId>template-overrides</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId> <groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
<artifactId>template-overrides</artifactId> <artifactId>template-overrides</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -4,7 +4,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot</groupId> <groupId>dev.sheldan.oneplus.bot</groupId>
<artifactId>oneplusbot</artifactId> <artifactId>oneplusbot</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modules> <modules>
@@ -14,7 +14,7 @@
<groupId>dev.sheldan.oneplus.bot.templates</groupId> <groupId>dev.sheldan.oneplus.bot.templates</groupId>
<artifactId>templates</artifactId> <artifactId>templates</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
</project> </project>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates.translations.customizations</groupId> <groupId>dev.sheldan.oneplus.bot.templates.translations.customizations</groupId>
<artifactId>customization-translations</artifactId> <artifactId>customization-translations</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates.translations.customizations</groupId> <groupId>dev.sheldan.oneplus.bot.templates.translations.customizations</groupId>
<artifactId>customization-translations</artifactId> <artifactId>customization-translations</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates.translations</groupId> <groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
<artifactId>translations</artifactId> <artifactId>translations</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates.translations.customizations</groupId> <groupId>dev.sheldan.oneplus.bot.templates.translations.customizations</groupId>
<artifactId>customization-translations</artifactId> <artifactId>customization-translations</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId> <groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId>
<artifactId>module-translations</artifactId> <artifactId>module-translations</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId> <groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId>
<artifactId>module-translations</artifactId> <artifactId>module-translations</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates.translations</groupId> <groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
<artifactId>translations</artifactId> <artifactId>translations</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId> <groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId>
<artifactId>module-translations</artifactId> <artifactId>module-translations</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId> <groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId>
<artifactId>module-translations</artifactId> <artifactId>module-translations</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId> <groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId>
<artifactId>module-translations</artifactId> <artifactId>module-translations</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates</groupId> <groupId>dev.sheldan.oneplus.bot.templates</groupId>
<artifactId>templates</artifactId> <artifactId>templates</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates.translations.overrides</groupId> <groupId>dev.sheldan.oneplus.bot.templates.translations.overrides</groupId>
<artifactId>translation-overrides</artifactId> <artifactId>translation-overrides</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -1 +1,4 @@
You were banned from the server ${serverName} for `${reason}`. You can appeal at: oneplus.appeals@pm.me. You were banned from the server ${serverName} for `${reason}`.
If you want to appeal, join the server https://discord.gg/JxCv73wh45 and then MESSAGE THIS BOT, this opens up a modmail.
Joining the server is necessary in order to make communication to the bot possible.
If the appeal is denied, you will be banned from the above-mentioned server.

View File

@@ -3,7 +3,7 @@
<parent> <parent>
<groupId>dev.sheldan.oneplus.bot.templates.translations</groupId> <groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
<artifactId>translations</artifactId> <artifactId>translations</artifactId>
<version>1.6.23-SNAPSHOT</version> <version>1.6.33-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View File

@@ -8,4 +8,4 @@ dependencies:
version: ">= 0.0.1" version: ">= 0.0.1"
- name: postgresql - name: postgresql
repository: oci://registry-1.docker.io/bitnamicharts repository: oci://registry-1.docker.io/bitnamicharts
version: 12.12.10 # 13.x.x uses postgresql 16.x version: 15.3.2