mirror of
https://github.com/Sheldan/OnePlusBot.git
synced 2026-01-23 03:24:39 +00:00
Compare commits
12 Commits
oneplusbot
...
oneplusbot
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
00db737bdb | ||
|
|
161327f27e | ||
|
|
d15f025309 | ||
|
|
b7555e9851 | ||
|
|
3aef21f281 | ||
|
|
597d3b8a8a | ||
|
|
bc353fed55 | ||
|
|
31279bb059 | ||
|
|
8e6804a1dc | ||
|
|
a39124e208 | ||
|
|
42a94359bb | ||
|
|
3bddf1d1c4 |
4
.env
4
.env
@@ -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.32
|
VERSION=1.6.35
|
||||||
ABSTRACTO_VERSION=1.5.50
|
ABSTRACTO_VERSION=1.5.59
|
||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>executable</artifactId>
|
<artifactId>executable</artifactId>
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -66,14 +66,14 @@ public class FAQ extends AbstractConditionableCommand {
|
|||||||
.forEach(faqResponseMessageModel ->
|
.forEach(faqResponseMessageModel ->
|
||||||
messageFutures.add(FutureUtils.
|
messageFutures.add(FutureUtils.
|
||||||
toSingleFutureGeneric(channelService.
|
toSingleFutureGeneric(channelService.
|
||||||
sendEmbedTemplateInTextChannelList(FAQ_RESPONSE_TEMPLATE_KEY,
|
sendEmbedTemplateInMessageChannel(FAQ_RESPONSE_TEMPLATE_KEY,
|
||||||
faqResponseMessageModel, commandContext.getChannel()))));
|
faqResponseMessageModel, commandContext.getChannel()))));
|
||||||
return FutureUtils.toSingleFutureGeneric(messageFutures);
|
return FutureUtils.toSingleFutureGeneric(messageFutures);
|
||||||
} else {
|
} else {
|
||||||
return FutureUtils
|
return FutureUtils
|
||||||
.toSingleFutureGeneric(
|
.toSingleFutureGeneric(
|
||||||
channelService.
|
channelService.
|
||||||
sendEmbedTemplateInTextChannelList(FAQ_RESPONSE_NO_COMMAND_FOUND_TEMPLATE_KEY,
|
sendEmbedTemplateInMessageChannel(FAQ_RESPONSE_NO_COMMAND_FOUND_TEMPLATE_KEY,
|
||||||
faqResponseModel, commandContext.getChannel()));
|
faqResponseModel, commandContext.getChannel()));
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -85,7 +85,7 @@ public class FAQ extends AbstractConditionableCommand {
|
|||||||
return FutureUtils
|
return FutureUtils
|
||||||
.toSingleFutureGeneric(
|
.toSingleFutureGeneric(
|
||||||
channelService.
|
channelService.
|
||||||
sendEmbedTemplateInTextChannelList(FAQ_RESPONSE_NO_COMMAND_FOUND_TEMPLATE_KEY,
|
sendEmbedTemplateInMessageChannel(FAQ_RESPONSE_NO_COMMAND_FOUND_TEMPLATE_KEY,
|
||||||
model, commandContext.getChannel()))
|
model, commandContext.getChannel()))
|
||||||
.thenApply(unused -> CommandResult.fromSuccess());
|
.thenApply(unused -> CommandResult.fromSuccess());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ public class FAQUsage extends AbstractConditionableCommand {
|
|||||||
model = faqUsageServiceBean.getFAQUsageModel(server, commandName);
|
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());
|
.thenApply(unused -> CommandResult.fromSuccess());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ public class ListFAQCommands extends AbstractConditionableCommand {
|
|||||||
public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
|
public CompletableFuture<CommandResult> executeAsync(CommandContext commandContext) {
|
||||||
AServer server = serverManagementService.loadServer(commandContext.getGuild());
|
AServer server = serverManagementService.loadServer(commandContext.getGuild());
|
||||||
ListFAQCommandsModel model = faqServiceBean.getCommandListingForServer(server);
|
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());
|
.thenApply(unused -> CommandResult.fromSuccess());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ public class ReferralListener implements AsyncMessageReceivedListener {
|
|||||||
.build();
|
.build();
|
||||||
ServerUser serverUser = ServerUser.fromMember(message.getMember());
|
ServerUser serverUser = ServerUser.fromMember(message.getMember());
|
||||||
CompletableFutureList<Message> sendFutures = new CompletableFutureList<>(channelService
|
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<Void> deletionFuture = messageService.deleteMessage(message);
|
||||||
CompletableFuture.allOf(sendFutures.getMainFuture(), deletionFuture)
|
CompletableFuture.allOf(sendFutures.getMainFuture(), deletionFuture)
|
||||||
.thenAccept(unused -> self.updateReferralStateInDatabase(serverUser))
|
.thenAccept(unused -> self.updateReferralStateInDatabase(serverUser))
|
||||||
@@ -139,7 +139,7 @@ public class ReferralListener implements AsyncMessageReceivedListener {
|
|||||||
|
|
||||||
private void deleteAndNotify(Message message, String usedTemplate, Object usedModel) {
|
private void deleteAndNotify(Message message, String usedTemplate, Object usedModel) {
|
||||||
CompletableFutureList<Message> futures = new CompletableFutureList<>(channelService
|
CompletableFutureList<Message> futures = new CompletableFutureList<>(channelService
|
||||||
.sendEmbedTemplateInMessageChannelList(usedTemplate, usedModel, message.getChannel()));
|
.sendEmbedTemplateInMessageChannel(usedTemplate, usedModel, message.getChannel()));
|
||||||
futures.getMainFuture().thenAccept(unused ->
|
futures.getMainFuture().thenAccept(unused ->
|
||||||
scheduledExecutorService.schedule(() ->
|
scheduledExecutorService.schedule(() ->
|
||||||
futures.getObjects().forEach(createdMessage -> messageService.deleteMessage(createdMessage)),
|
futures.getObjects().forEach(createdMessage -> messageService.deleteMessage(createdMessage)),
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</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.33</version>
|
<version>1.6.36</version>
|
||||||
<modules>
|
<modules>
|
||||||
<module>executable</module>
|
<module>executable</module>
|
||||||
<module>oneplus-bot-customizations</module>
|
<module>oneplus-bot-customizations</module>
|
||||||
|
|||||||
@@ -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.32
|
version: 1.6.35
|
||||||
|
|||||||
@@ -5,3 +5,4 @@ metadata:
|
|||||||
data:
|
data:
|
||||||
discordToken: {{ $.Values.apiKeys.discord.token | b64enc }} # b64enc is needed, because a stringData secret field cannot hold numeric values
|
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 }}
|
||||||
@@ -75,6 +75,11 @@ spec:
|
|||||||
key: youtubeApiKey
|
key: youtubeApiKey
|
||||||
- name: PRIVATE_REST_API_HOST
|
- name: PRIVATE_REST_API_HOST
|
||||||
value: "{{ .Values.privateRestApi.service.name }}.{{ .Release.Namespace }}.svc.cluster.local"
|
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
|
- name: PRIVATE_REST_API_PORT
|
||||||
value: "{{ .Values.privateRestApi.service.targetPort }}"
|
value: "{{ .Values.privateRestApi.service.targetPort }}"
|
||||||
- name: FRONTEND_BASE
|
- name: FRONTEND_BASE
|
||||||
|
|||||||
@@ -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.32
|
tag: 1.6.35
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
initialDelaySeconds: 60
|
initialDelaySeconds: 60
|
||||||
periodSeconds: 5
|
periodSeconds: 5
|
||||||
@@ -22,23 +22,23 @@ templateDeployment:
|
|||||||
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.50
|
tag: 1.5.59
|
||||||
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.32
|
tag: 1.6.35
|
||||||
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.50
|
tag: 1.5.59
|
||||||
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.32
|
tag: 1.6.35
|
||||||
dbCredentials:
|
dbCredentials:
|
||||||
host: null
|
host: null
|
||||||
port: null
|
port: null
|
||||||
@@ -51,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.32
|
tag: 1.6.35
|
||||||
podAnnotations: {}
|
podAnnotations: {}
|
||||||
podSecurityContext: {}
|
podSecurityContext: {}
|
||||||
securityContext: {}
|
securityContext: {}
|
||||||
@@ -82,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.32
|
tag: 1.6.35
|
||||||
podAnnotations: {}
|
podAnnotations: {}
|
||||||
podSecurityContext: {}
|
podSecurityContext: {}
|
||||||
securityContext: {}
|
securityContext: {}
|
||||||
@@ -138,6 +138,8 @@ apiKeys:
|
|||||||
twitch:
|
twitch:
|
||||||
secret: null
|
secret: null
|
||||||
clientId: null
|
clientId: null
|
||||||
|
freeCurrencyApi:
|
||||||
|
apiKey: null
|
||||||
imagePullSecrets: null
|
imagePullSecrets: null
|
||||||
nameOverride: ''
|
nameOverride: ''
|
||||||
fullnameOverride: ''
|
fullnameOverride: ''
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
8
pom.xml
8
pom.xml
@@ -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.33</version>
|
<version>1.6.36</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.50</abstracto.version>
|
<abstracto.version>1.5.59</abstracto.version>
|
||||||
<abstracto.templates.version>1.4.45</abstracto.templates.version>
|
<abstracto.templates.version>1.4.50</abstracto.templates.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
@@ -69,6 +69,6 @@
|
|||||||
<connection>scm:git:${project.scm.url}</connection>
|
<connection>scm:git:${project.scm.url}</connection>
|
||||||
<developerConnection>scm:git:${project.scm.url}</developerConnection>
|
<developerConnection>scm:git:${project.scm.url}</developerConnection>
|
||||||
<url>https://github.com/Sheldan/OnePlusBot.git</url>
|
<url>https://github.com/Sheldan/OnePlusBot.git</url>
|
||||||
<tag>oneplusbot-1.6.33</tag>
|
<tag>oneplusbot-1.6.36</tag>
|
||||||
</scm>
|
</scm>
|
||||||
</project>
|
</project>
|
||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</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.33</version>
|
<version>1.6.36</version>
|
||||||
<modules>
|
<modules>
|
||||||
<module>module-templates</module>
|
<module>module-templates</module>
|
||||||
<module>customization-templates</module>
|
<module>customization-templates</module>
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</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.33</version>
|
<version>1.6.36</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -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.33</version>
|
<version>1.6.36</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user