[OPB-xxx] updating abstracto version to 1.5.57

adding config for currency conversion
fixing ban message template folder name

.env

@@ -1,4 +1,4 @@
 REGISTRY_PREFIX=harbor.sheldan.dev/oneplus-bot/
 ABSTRACTO_PREFIX=harbor.sheldan.dev/abstracto/
-VERSION=1.6.19
-ABSTRACTO_VERSION=1.5.25
+VERSION=1.6.34
+ABSTRACTO_VERSION=1.5.57

.github/workflows/build.yml

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

.github/workflows/release_manual.yaml

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

.gitignore

@@ -22,5 +22,7 @@ target/
 *.rar
 *.tgz
 
+Chart.lock
+
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*

.tiltignore

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

README.md

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

Tiltfile

@@ -18,7 +18,7 @@ local_resource(
 docker_build_with_restart(
   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'),
@@ -31,9 +31,11 @@ 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']
 ))

application/executable/pom.xml

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

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

@@ -2,8 +2,8 @@ spring.datasource.url=jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME}
 spring.datasource.username= ${DB_USER}
 spring.datasource.password= ${DB_PASS}
 spring.datasource.hikari.maximum-pool-size=${hikariPoolSize}
-spring.jpa.hibernate.default_schema=abstracto
-spring.jpa.properties.hibernate.default_schema=abstracto
+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

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

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

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

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

application/oneplus-bot-customizations/pom.xml

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

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

@@ -3,17 +3,13 @@
     <parent>
         <groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
         <artifactId>oneplus-bot-customizations</artifactId>
-        <version>1.6.20-SNAPSHOT</version>
+        <version>1.6.35-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>

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

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

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

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

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

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

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

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

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

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

application/oneplus-bot-modules/pom.xml

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

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

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

application/oneplus-bot-modules/referral/src/main/java/dev/sheldan/oneplus/bot/modules/referral/listener/ReferralListener.java

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

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

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

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

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

application/pom.xml

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

deployment/helm/oneplus-bot/Chart.yaml

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

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

@@ -4,4 +4,5 @@ metadata:
   name: api-keys
 data:
   discordToken: {{ $.Values.apiKeys.discord.token | b64enc }} # b64enc is needed, because a stringData secret field cannot hold numeric values
-  youtubeApiKey: {{ $.Values.apiKeys.youtube.apiKey | b64enc }}
+  youtubeApiKey: {{ $.Values.apiKeys.youtube.apiKey | b64enc }}
+  freeCurrencyApiApiKey: {{ $.Values.apiKeys.freeCurrencyApi.apiKey | b64enc }}

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

@@ -48,7 +48,7 @@ spec:
                   name: db-credentials
                   key: dbName
             - name: DB_SCHEME
-              value: "abstracto"
+              value: {{ .Values.dbCredentials.schema }}
           volumeMounts:
             - mountPath: "/var/db-config/"
               name: database-config-mount

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

@@ -57,6 +57,8 @@ spec:
                 secretKeyRef:
                   name: db-credentials
                   key: dbName
+            - name: DB_SCHEMA
+              value: {{ .Values.dbCredentials.schema }}
             - name: NEWS_FORUM_POST_NOTIFICATION_SERVER_ID
               value: "{{ .Values.bot.config.newsForumPostNotificationServerId }}"
             - name: TOKEN
@@ -73,8 +75,15 @@ spec:
                   key: youtubeApiKey
             - name: PRIVATE_REST_API_HOST
               value: "{{ .Values.privateRestApi.service.name }}.{{ .Release.Namespace }}.svc.cluster.local"
+            - name: FREE_CURRENCY_API_API_KEY
+              valueFrom:
+                secretKeyRef:
+                  name: api-keys
+                  key: freeCurrencyApiApiKey
             - name: PRIVATE_REST_API_PORT
               value: "{{ .Values.privateRestApi.service.targetPort }}"
+            - name: FRONTEND_BASE
+              value: "https://{{ .Values.bot.host }}"
             {{- range $key, $value := .Values.bot.propertyConfig }}
             - name: {{ $key | quote }}
               value: {{ $value | quote}}

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

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

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

@@ -0,0 +1,45 @@
+{{- if .Values.restApi.enabled -}}
+{{- $servicePort := .Values.restApi.service.port -}}
+{{- $serviceName := .Values.restApi.service.name -}}
+{{- $ingressPath := .Values.restApi.ingress.path -}}
+{{- $ingressPathType := .Values.restApi.ingress.pathType -}}
+{{- $extraPaths := .Values.restApi.ingress.extraPaths -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: ingress-rest-api
+  labels:
+    {{- with .Values.restApi.ingress.labels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+  {{- with .Values.restApi.ingress.annotations }}
+  annotations:
+    {{- range $key, $value := . }}
+    {{ $key }}: {{ tpl $value $ | quote }}
+    {{- end }}
+  {{- end }}
+spec:
+  ingressClassName: nginx
+  {{- with .Values.restApi.ingress.tls }}
+  tls:
+    {{- tpl (toYaml .) $ | nindent 4 }}
+  {{- end }}
+  rules:
+  {{- if .Values.restApi.ingress.hosts  }}
+  {{- range .Values.restApi.ingress.hosts }}
+    - host: {{ tpl . $ }}
+      http:
+        paths:
+          {{- with $extraPaths }}
+          {{- toYaml . | nindent 10 }}
+          {{- end }}
+          - path: {{ $ingressPath }}
+            pathType: {{ $ingressPathType }}
+            backend:
+              service:
+                name: {{ $serviceName }}
+                port:
+                  number: {{ $servicePort }}
+  {{- end }}
+  {{- end -}}
+{{- end }}

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

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

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

@@ -48,7 +48,7 @@ spec:
                   name: db-credentials
                   key: dbName
             - name: DB_SCHEME
-              value: "abstracto."
+              value: "{{ .Values.dbCredentials.schema }}."
           volumeMounts:
             - mountPath: "/var/template-config/"
               name: template-config-mount

deployment/helm/oneplus-bot/values.yaml

@@ -3,7 +3,7 @@ bot:
   repository: harbor.sheldan.dev/oneplus-bot
   pullPolicy: IfNotPresent
   image: oneplus-bot-image
-  tag: 1.6.19
+  tag: 1.6.34
   livenessProbe:
     initialDelaySeconds: 60
     periodSeconds: 5
@@ -16,40 +16,42 @@ bot:
     newsForumPostNotificationServerId: null
   propertyConfig:
     hikariPoolSize: 10
+  host: null
 templateDeployment:
   enabled: true
   repository: harbor.sheldan.dev/abstracto
   pullPolicy: Always
   image: abstracto-template-deployment
-  tag: 1.5.25
+  tag: 1.5.57
 templateDeploymentData:
   repository: harbor.sheldan.dev/oneplus-bot
   pullPolicy: Always
   image: oneplus-bot-template-data
-  tag: 1.6.19
+  tag: 1.6.34
 dbConfigDeployment:
   enabled: true
   repository: harbor.sheldan.dev/abstracto
   pullPolicy: Always
   image: abstracto-db-deployment
-  tag: 1.5.25
+  tag: 1.5.57
 dbConfigDeploymentData:
   repository: harbor.sheldan.dev/oneplus-bot
   pullPolicy: Always
   image: oneplus-bot-db-data
-  tag: 1.6.19
+  tag: 1.6.34
 dbCredentials:
   host: null
   port: null
   userName: null
   password: null
   name: null
+  schema: abstracto
 privateRestApi:
   enabled: true
   repository: harbor.sheldan.dev/oneplus-bot
   pullPolicy: Always
   image: oneplus-bot-private-rest-api
-  tag: 1.6.19
+  tag: 1.6.34
   podAnnotations: {}
   podSecurityContext: {}
   securityContext: {}
@@ -75,6 +77,46 @@ privateRestApi:
   nodeSelector: {}
   tolerations: []
   affinity: {}
+restApi:
+  enabled: true
+  repository: harbor.sheldan.dev/oneplus-bot
+  pullPolicy: Always
+  image: oneplus-bot-rest-api
+  tag: 1.6.34
+  podAnnotations: {}
+  podSecurityContext: {}
+  securityContext: {}
+  livenessProbe:
+    initialDelaySeconds: 2
+    periodSeconds: 5
+    failureThreshold: 3
+  readinessProbe:
+    initialDelaySeconds: 2
+    periodSeconds: 5
+    failureThreshold: 3
+  service:
+    port: 8080
+    targetPort: 80
+    name: rest-api
+  resources:
+    limits:
+      cpu: null
+      memory: null
+    requests:
+      cpu: null
+      memory: null
+  nodeSelector: {}
+  tolerations: []
+  affinity: {}
+  ingress:
+    enabled: false
+    annotations: {}
+    labels: {}
+    path: /
+    pathType: Prefix
+    hosts: null
+    extraPaths: []
+    tls: []
 grafanaDeployment:
   repository: harbor.sheldan.dev/grafana-tools
   pullPolicy: Always
@@ -96,6 +138,8 @@ apiKeys:
   twitch:
     secret: null
     clientId: null
+  freeCurrencyApi:
+    apiKey: null
 imagePullSecrets: null
 nameOverride: ''
 fullnameOverride: ''

deployment/image-packaging/pom.xml

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

deployment/image-packaging/src/main/docker/rest-api/Dockerfile

@@ -0,0 +1,9 @@
+ARG REGISTRY_PREFIX
+ARG ABSTRACTO_VERSION
+FROM ${REGISTRY_PREFIX}abstracto-rest-api-experience:${ABSTRACTO_VERSION:-latest} AS experience-api
+FROM ${REGISTRY_PREFIX}abstracto-rest-api-core:${ABSTRACTO_VERSION:-latest} AS core-api
+
+
+FROM ${REGISTRY_PREFIX}abstracto-rest-api:${ABSTRACTO_VERSION:-latest}
+COPY --from=core-api /python /python
+COPY --from=experience-api /python /python

deployment/pom.xml

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

docker-compose.yml

@@ -1,4 +1,4 @@
-version: "3.7"
+version: "3.8"
 
 services:
   bot:
@@ -16,6 +16,13 @@ services:
         REGISTRY_PREFIX: ${ABSTRACTO_PREFIX}
         ABSTRACTO_VERSION: ${ABSTRACTO_VERSION}
     image: ${REGISTRY_PREFIX}oneplus-bot-private-rest-api:${VERSION:-latest}
+  rest-api-packaging:
+    build:
+      context: deployment/image-packaging/src/main/docker/rest-api
+      args:
+        REGISTRY_PREFIX: ${ABSTRACTO_PREFIX}
+        ABSTRACTO_VERSION: ${ABSTRACTO_VERSION}
+    image: ${REGISTRY_PREFIX}oneplus-bot-rest-api:${VERSION:-latest}
   template-data:
     build:
       context: deployment/image-packaging/src/main/docker/template-data

pom.xml

@@ -12,13 +12,13 @@
 
     <groupId>dev.sheldan.oneplus.bot</groupId>
     <artifactId>oneplusbot</artifactId>
-    <version>1.6.20-SNAPSHOT</version>
+    <version>1.6.35-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.target>17</maven.compiler.target>
         <maven.compiler.source>17</maven.compiler.source>
-        <abstracto.version>1.5.25</abstracto.version>
-        <abstracto.templates.version>1.4.33</abstracto.templates.version>
+        <abstracto.version>1.5.57</abstracto.version>
+        <abstracto.templates.version>1.4.49</abstracto.templates.version>
     </properties>
 
     <modules>

templates/oneplus-bot-templates/customization-templates/moderation-customization-templates/pom.xml

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

templates/oneplus-bot-templates/customization-templates/pom.xml

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

templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/pom.xml

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

templates/oneplus-bot-templates/module-templates/faq-templates/pom.xml

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

templates/oneplus-bot-templates/module-templates/news-templates/pom.xml

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

templates/oneplus-bot-templates/module-templates/pom.xml

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

templates/oneplus-bot-templates/module-templates/referral-templates/pom.xml

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

templates/oneplus-bot-templates/pom.xml

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

templates/oneplus-bot-templates/template-overrides/core-template-overrides/pom.xml

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

templates/oneplus-bot-templates/template-overrides/logging-template-overrides/pom.xml

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

templates/oneplus-bot-templates/template-overrides/logging-template-overrides/src/main/resources/default/listener/user_left/user_leave_embed.ftl

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

templates/oneplus-bot-templates/template-overrides/moderation-template-overrides/pom.xml

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

templates/oneplus-bot-templates/template-overrides/modmail-template-overrides/pom.xml

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

templates/oneplus-bot-templates/template-overrides/pom.xml

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

templates/oneplus-bot-templates/template-overrides/statistic-template-overrides/pom.xml

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

templates/oneplus-bot-templates/template-overrides/webservices-template-overrides/pom.xml

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

templates/pom.xml

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

templates/translations/customization-translations/dynamic-activity-customization-translations/pom.xml

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

templates/translations/customization-translations/moderation-customization-translations/pom.xml

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