Compare commits

...

12 Commits

Author SHA1 Message Date
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
186 changed files with 75 additions and 67 deletions

4
.env
View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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

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

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.oneplus.bot.application</groupId>
<artifactId>application</artifactId>
<version>1.6.32-SNAPSHOT</version>
<version>1.6.35-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.32-SNAPSHOT</version>
<version>1.6.35-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

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

View File

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

View File

@@ -5,13 +5,13 @@
<parent>
<groupId>dev.sheldan.oneplus.bot</groupId>
<artifactId>oneplusbot</artifactId>
<version>1.6.32-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.32-SNAPSHOT</version>
<version>1.6.35-SNAPSHOT</version>
<modules>
<module>executable</module>
<module>oneplus-bot-customizations</module>

View File

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

View File

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

View File

@@ -75,6 +75,11 @@ 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

View File

@@ -3,7 +3,7 @@ bot:
repository: harbor.sheldan.dev/oneplus-bot
pullPolicy: IfNotPresent
image: oneplus-bot-image
tag: 1.6.30
tag: 1.6.34
livenessProbe:
initialDelaySeconds: 60
periodSeconds: 5
@@ -22,23 +22,23 @@ templateDeployment:
repository: harbor.sheldan.dev/abstracto
pullPolicy: Always
image: abstracto-template-deployment
tag: 1.5.48
tag: 1.5.57
templateDeploymentData:
repository: harbor.sheldan.dev/oneplus-bot
pullPolicy: Always
image: oneplus-bot-template-data
tag: 1.6.30
tag: 1.6.34
dbConfigDeployment:
enabled: true
repository: harbor.sheldan.dev/abstracto
pullPolicy: Always
image: abstracto-db-deployment
tag: 1.5.48
tag: 1.5.57
dbConfigDeploymentData:
repository: harbor.sheldan.dev/oneplus-bot
pullPolicy: Always
image: oneplus-bot-db-data
tag: 1.6.30
tag: 1.6.34
dbCredentials:
host: null
port: null
@@ -51,7 +51,7 @@ privateRestApi:
repository: harbor.sheldan.dev/oneplus-bot
pullPolicy: Always
image: oneplus-bot-private-rest-api
tag: 1.6.30
tag: 1.6.34
podAnnotations: {}
podSecurityContext: {}
securityContext: {}
@@ -82,7 +82,7 @@ restApi:
repository: harbor.sheldan.dev/oneplus-bot
pullPolicy: Always
image: oneplus-bot-rest-api
tag: 1.6.30
tag: 1.6.34
podAnnotations: {}
podSecurityContext: {}
securityContext: {}
@@ -138,6 +138,8 @@ apiKeys:
twitch:
secret: null
clientId: null
freeCurrencyApi:
apiKey: null
imagePullSecrets: null
nameOverride: ''
fullnameOverride: ''

View File

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

View File

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

View File

@@ -12,13 +12,13 @@
<groupId>dev.sheldan.oneplus.bot</groupId>
<artifactId>oneplusbot</artifactId>
<version>1.6.32-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.48</abstracto.version>
<abstracto.templates.version>1.4.45</abstracto.templates.version>
<abstracto.version>1.5.57</abstracto.version>
<abstracto.templates.version>1.4.49</abstracto.templates.version>
</properties>
<modules>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -3,13 +3,13 @@
<parent>
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
<artifactId>templates</artifactId>
<version>1.6.32-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.32-SNAPSHOT</version>
<version>1.6.35-SNAPSHOT</version>
<modules>
<module>module-templates</module>
<module>customization-templates</module>

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>dev.sheldan.oneplus.bot</groupId>
<artifactId>oneplusbot</artifactId>
<version>1.6.32-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.32-SNAPSHOT</version>
<version>1.6.35-SNAPSHOT</version>
<packaging>pom</packaging>
</project>

View File

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

View File

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

View File

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

View File

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

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