diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 868dcda5..91aa1e2a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,7 +32,7 @@ jobs: working-directory: ./deployment/image-packaging/src/main/docker run: docker-compose build && docker-compose push env: - REGISTRY_PREFIX: docker.pkg.github.com/sheldan/r-austria-bot/ + REGISTRY_PREFIX: docker.pkg.github.com/sheldan/sissi/ VERSION: ${{ env.version }} ABSTRACTO_VERSION: 1.3.13 ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/ \ No newline at end of file diff --git a/application/executable/pom.xml b/application/executable/pom.xml index 802df52f..d1ff38a5 100644 --- a/application/executable/pom.xml +++ b/application/executable/pom.xml @@ -1,7 +1,7 @@ - dev.sheldan.raustria.bot.application + dev.sheldan.sissi.application application 1.0.3-SNAPSHOT @@ -76,7 +76,7 @@ - dev.sheldan.raustria.bot.application.module + dev.sheldan.sissi.application.module quotes ${project.version} diff --git a/application/executable/src/main/resources/application-local.properties b/application/executable/src/main/resources/application-local.properties index 2f179a61..01183ff8 100644 --- a/application/executable/src/main/resources/application-local.properties +++ b/application/executable/src/main/resources/application-local.properties @@ -1,6 +1,6 @@ spring.datasource.url=jdbc:postgresql://localhost:5432/abstracto -spring.datasource.username= abstracto -spring.datasource.password= abstracto +spring.datasource.username=abstracto +spring.datasource.password=abstracto spring.jpa.properties.hibernate.default_schema=abstracto spring.quartz.jdbc.initialize-schema=never @@ -13,9 +13,9 @@ log4j.logger.org.hibernate.SQL=trace log4j.logger.org.hibernate.type.descriptor.sql=trace log4j.logger.org.hibernate.type=trace -management.metrics.tags.application=r-austria-bot +management.metrics.tags.application=sissi spring.security.user.name=abstracto spring.security.user.password=password spring.security.user.roles=USER -spring.application.name=RAustriaBot \ No newline at end of file +spring.application.name=Sissi \ No newline at end of file diff --git a/application/executable/src/main/resources/application.properties b/application/executable/src/main/resources/application.properties index 3c0f60d4..b6340bd5 100644 --- a/application/executable/src/main/resources/application.properties +++ b/application/executable/src/main/resources/application.properties @@ -3,9 +3,9 @@ spring.datasource.username= ${DB_USER} spring.datasource.password= ${DB_PASS} spring.jpa.hibernate.default_schema=${DB_NAME} spring.quartz.jdbc.initialize-schema=never -management.metrics.tags.application=r-austria-bot +management.metrics.tags.application=Sissi spring.security.user.name= ${REST_USER_NAME} spring.security.user.password= ${REST_PASSWORD} spring.security.user.roles=USER -spring.application.name=RAustriaBot \ No newline at end of file +spring.application.name=Sissi \ No newline at end of file diff --git a/application/pom.xml b/application/pom.xml index 39d39d72..f56ee41e 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -1,8 +1,8 @@ - dev.sheldan.raustria.bot - r-austria-bot + dev.sheldan.sissi + sissi 1.0.3-SNAPSHOT 4.0.0 @@ -10,7 +10,7 @@ pom - dev.sheldan.raustria.bot.application + dev.sheldan.sissi.application application @@ -27,7 +27,7 @@ executable - r-austria-modules + sissi-modules diff --git a/application/r-austria-modules/pom.xml b/application/sissi-modules/pom.xml similarity index 81% rename from application/r-austria-modules/pom.xml rename to application/sissi-modules/pom.xml index 3ed79bc8..a68c1202 100644 --- a/application/r-austria-modules/pom.xml +++ b/application/sissi-modules/pom.xml @@ -1,13 +1,13 @@ + dev.sheldan.sissi.application application - dev.sheldan.raustria.bot.application 1.0.3-SNAPSHOT 4.0.0 - r-austria-modules + sissi-modules pom diff --git a/application/r-austria-modules/quotes/pom.xml b/application/sissi-modules/quotes/pom.xml similarity index 85% rename from application/r-austria-modules/quotes/pom.xml rename to application/sissi-modules/quotes/pom.xml index ac21475a..5a9bee52 100644 --- a/application/r-austria-modules/quotes/pom.xml +++ b/application/sissi-modules/quotes/pom.xml @@ -1,13 +1,13 @@ - r-austria-modules - dev.sheldan.raustria.bot.application + dev.sheldan.sissi.application + sissi-modules 1.0.3-SNAPSHOT 4.0.0 - dev.sheldan.raustria.bot.application.module + dev.sheldan.sissi.application.module quotes diff --git a/application/r-austria-modules/quotes/src/main/assembly/liquibase.xml b/application/sissi-modules/quotes/src/main/assembly/liquibase.xml similarity index 100% rename from application/r-austria-modules/quotes/src/main/assembly/liquibase.xml rename to application/sissi-modules/quotes/src/main/assembly/liquibase.xml diff --git a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/command/QuoteCommand.java b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/command/QuoteCommand.java similarity index 90% rename from application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/command/QuoteCommand.java rename to application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/command/QuoteCommand.java index 781e2862..7d387386 100644 --- a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/command/QuoteCommand.java +++ b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/command/QuoteCommand.java @@ -1,4 +1,4 @@ -package dev.sheldan.raustria.bot.module.quotes.command; +package dev.sheldan.sissi.module.quotes.command; import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand; import dev.sheldan.abstracto.core.command.config.CommandConfiguration; @@ -14,11 +14,11 @@ import dev.sheldan.abstracto.core.service.management.ServerManagementService; import dev.sheldan.abstracto.core.service.management.UserInServerManagementService; import dev.sheldan.abstracto.core.templating.model.MessageToSend; import dev.sheldan.abstracto.core.utils.FutureUtils; -import dev.sheldan.raustria.bot.module.quotes.config.QuotesFeatureDefinition; -import dev.sheldan.raustria.bot.module.quotes.config.QuotesModuleDefinition; -import dev.sheldan.raustria.bot.module.quotes.exception.QuoteNotFoundException; -import dev.sheldan.raustria.bot.module.quotes.model.database.Quote; -import dev.sheldan.raustria.bot.module.quotes.service.QuoteServiceBean; +import dev.sheldan.sissi.module.quotes.config.QuotesFeatureDefinition; +import dev.sheldan.sissi.module.quotes.config.QuotesModuleDefinition; +import dev.sheldan.sissi.module.quotes.exception.QuoteNotFoundException; +import dev.sheldan.sissi.module.quotes.model.database.Quote; +import dev.sheldan.sissi.module.quotes.service.QuoteServiceBean; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.MessageChannel; import org.springframework.beans.factory.annotation.Autowired; diff --git a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/command/QuoteDelete.java b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/command/QuoteDelete.java similarity index 88% rename from application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/command/QuoteDelete.java rename to application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/command/QuoteDelete.java index 4696fdad..a580200e 100644 --- a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/command/QuoteDelete.java +++ b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/command/QuoteDelete.java @@ -1,4 +1,4 @@ -package dev.sheldan.raustria.bot.module.quotes.command; +package dev.sheldan.sissi.module.quotes.command; import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand; import dev.sheldan.abstracto.core.command.config.CommandConfiguration; @@ -9,9 +9,9 @@ import dev.sheldan.abstracto.core.command.execution.CommandResult; import dev.sheldan.abstracto.core.config.FeatureDefinition; import dev.sheldan.abstracto.core.models.database.AServer; import dev.sheldan.abstracto.core.service.management.ServerManagementService; -import dev.sheldan.raustria.bot.module.quotes.config.QuotesFeatureDefinition; -import dev.sheldan.raustria.bot.module.quotes.config.QuotesModuleDefinition; -import dev.sheldan.raustria.bot.module.quotes.service.QuoteServiceBean; +import dev.sheldan.sissi.module.quotes.config.QuotesFeatureDefinition; +import dev.sheldan.sissi.module.quotes.config.QuotesModuleDefinition; +import dev.sheldan.sissi.module.quotes.service.QuoteServiceBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/command/QuoteGet.java b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/command/QuoteGet.java similarity index 88% rename from application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/command/QuoteGet.java rename to application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/command/QuoteGet.java index de4f80c3..586f0d0a 100644 --- a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/command/QuoteGet.java +++ b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/command/QuoteGet.java @@ -1,4 +1,4 @@ -package dev.sheldan.raustria.bot.module.quotes.command; +package dev.sheldan.sissi.module.quotes.command; import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand; import dev.sheldan.abstracto.core.command.config.CommandConfiguration; @@ -12,11 +12,11 @@ import dev.sheldan.abstracto.core.service.ChannelService; import dev.sheldan.abstracto.core.service.management.ServerManagementService; import dev.sheldan.abstracto.core.templating.model.MessageToSend; import dev.sheldan.abstracto.core.utils.FutureUtils; -import dev.sheldan.raustria.bot.module.quotes.config.QuotesFeatureDefinition; -import dev.sheldan.raustria.bot.module.quotes.config.QuotesModuleDefinition; -import dev.sheldan.raustria.bot.module.quotes.exception.QuoteNotFoundException; -import dev.sheldan.raustria.bot.module.quotes.model.database.Quote; -import dev.sheldan.raustria.bot.module.quotes.service.QuoteServiceBean; +import dev.sheldan.sissi.module.quotes.config.QuotesFeatureDefinition; +import dev.sheldan.sissi.module.quotes.config.QuotesModuleDefinition; +import dev.sheldan.sissi.module.quotes.exception.QuoteNotFoundException; +import dev.sheldan.sissi.module.quotes.model.database.Quote; +import dev.sheldan.sissi.module.quotes.service.QuoteServiceBean; import net.dv8tion.jda.api.entities.MessageChannel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/command/QuoteSearch.java b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/command/QuoteSearch.java similarity index 88% rename from application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/command/QuoteSearch.java rename to application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/command/QuoteSearch.java index 277144fb..10504094 100644 --- a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/command/QuoteSearch.java +++ b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/command/QuoteSearch.java @@ -1,4 +1,4 @@ -package dev.sheldan.raustria.bot.module.quotes.command; +package dev.sheldan.sissi.module.quotes.command; import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand; import dev.sheldan.abstracto.core.command.config.CommandConfiguration; @@ -12,11 +12,11 @@ import dev.sheldan.abstracto.core.service.ChannelService; import dev.sheldan.abstracto.core.service.management.ServerManagementService; import dev.sheldan.abstracto.core.templating.model.MessageToSend; import dev.sheldan.abstracto.core.utils.FutureUtils; -import dev.sheldan.raustria.bot.module.quotes.config.QuotesFeatureDefinition; -import dev.sheldan.raustria.bot.module.quotes.config.QuotesModuleDefinition; -import dev.sheldan.raustria.bot.module.quotes.exception.QuoteNotFoundException; -import dev.sheldan.raustria.bot.module.quotes.model.database.Quote; -import dev.sheldan.raustria.bot.module.quotes.service.QuoteServiceBean; +import dev.sheldan.sissi.module.quotes.config.QuotesFeatureDefinition; +import dev.sheldan.sissi.module.quotes.config.QuotesModuleDefinition; +import dev.sheldan.sissi.module.quotes.exception.QuoteNotFoundException; +import dev.sheldan.sissi.module.quotes.model.database.Quote; +import dev.sheldan.sissi.module.quotes.service.QuoteServiceBean; import net.dv8tion.jda.api.entities.MessageChannel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/command/QuoteStats.java b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/command/QuoteStats.java similarity index 88% rename from application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/command/QuoteStats.java rename to application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/command/QuoteStats.java index 6f8627c9..51979d29 100644 --- a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/command/QuoteStats.java +++ b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/command/QuoteStats.java @@ -1,4 +1,4 @@ -package dev.sheldan.raustria.bot.module.quotes.command; +package dev.sheldan.sissi.module.quotes.command; import dev.sheldan.abstracto.core.command.condition.AbstractConditionableCommand; import dev.sheldan.abstracto.core.command.config.CommandConfiguration; @@ -9,10 +9,10 @@ import dev.sheldan.abstracto.core.command.execution.CommandResult; import dev.sheldan.abstracto.core.config.FeatureDefinition; import dev.sheldan.abstracto.core.service.ChannelService; import dev.sheldan.abstracto.core.utils.FutureUtils; -import dev.sheldan.raustria.bot.module.quotes.config.QuotesFeatureDefinition; -import dev.sheldan.raustria.bot.module.quotes.config.QuotesModuleDefinition; -import dev.sheldan.raustria.bot.module.quotes.model.command.QuoteStatsModel; -import dev.sheldan.raustria.bot.module.quotes.service.QuoteServiceBean; +import dev.sheldan.sissi.module.quotes.config.QuotesFeatureDefinition; +import dev.sheldan.sissi.module.quotes.config.QuotesModuleDefinition; +import dev.sheldan.sissi.module.quotes.model.command.QuoteStatsModel; +import dev.sheldan.sissi.module.quotes.service.QuoteServiceBean; import net.dv8tion.jda.api.entities.Member; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/config/QuotesFeatureConfig.java b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/config/QuotesFeatureConfig.java similarity index 86% rename from application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/config/QuotesFeatureConfig.java rename to application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/config/QuotesFeatureConfig.java index 9550f2b8..71bdc703 100644 --- a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/config/QuotesFeatureConfig.java +++ b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/config/QuotesFeatureConfig.java @@ -1,4 +1,4 @@ -package dev.sheldan.raustria.bot.module.quotes.config; +package dev.sheldan.sissi.module.quotes.config; import dev.sheldan.abstracto.core.config.FeatureConfig; import dev.sheldan.abstracto.core.config.FeatureDefinition; diff --git a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/config/QuotesFeatureDefinition.java b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/config/QuotesFeatureDefinition.java similarity index 83% rename from application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/config/QuotesFeatureDefinition.java rename to application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/config/QuotesFeatureDefinition.java index 0c575ceb..29592c8f 100644 --- a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/config/QuotesFeatureDefinition.java +++ b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/config/QuotesFeatureDefinition.java @@ -1,4 +1,4 @@ -package dev.sheldan.raustria.bot.module.quotes.config; +package dev.sheldan.sissi.module.quotes.config; import dev.sheldan.abstracto.core.config.FeatureDefinition; import lombok.Getter; diff --git a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/config/QuotesModuleDefinition.java b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/config/QuotesModuleDefinition.java similarity index 91% rename from application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/config/QuotesModuleDefinition.java rename to application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/config/QuotesModuleDefinition.java index e899d942..b0e029b3 100644 --- a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/config/QuotesModuleDefinition.java +++ b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/config/QuotesModuleDefinition.java @@ -1,4 +1,4 @@ -package dev.sheldan.raustria.bot.module.quotes.config; +package dev.sheldan.sissi.module.quotes.config; import dev.sheldan.abstracto.core.command.config.ModuleDefinition; import dev.sheldan.abstracto.core.command.config.ModuleInfo; diff --git a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/config/QuotesProperties.java b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/config/QuotesProperties.java similarity index 80% rename from application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/config/QuotesProperties.java rename to application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/config/QuotesProperties.java index 401f9061..2272065f 100644 --- a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/config/QuotesProperties.java +++ b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/config/QuotesProperties.java @@ -1,4 +1,4 @@ -package dev.sheldan.raustria.bot.module.quotes.config; +package dev.sheldan.sissi.module.quotes.config; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; diff --git a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/exception/QuoteNotFoundException.java b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/exception/QuoteNotFoundException.java similarity index 85% rename from application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/exception/QuoteNotFoundException.java rename to application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/exception/QuoteNotFoundException.java index 77feef32..9ef5765e 100644 --- a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/exception/QuoteNotFoundException.java +++ b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/exception/QuoteNotFoundException.java @@ -1,4 +1,4 @@ -package dev.sheldan.raustria.bot.module.quotes.exception; +package dev.sheldan.sissi.module.quotes.exception; import dev.sheldan.abstracto.core.exception.AbstractoTemplatableException; diff --git a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/model/command/QuoteResponseModel.java b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/model/command/QuoteResponseModel.java similarity index 90% rename from application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/model/command/QuoteResponseModel.java rename to application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/model/command/QuoteResponseModel.java index 9f13fa87..624f57ae 100644 --- a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/model/command/QuoteResponseModel.java +++ b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/model/command/QuoteResponseModel.java @@ -1,4 +1,4 @@ -package dev.sheldan.raustria.bot.module.quotes.model.command; +package dev.sheldan.sissi.module.quotes.model.command; import dev.sheldan.abstracto.core.models.ServerChannelMessage; import lombok.Builder; diff --git a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/model/command/QuoteStatsModel.java b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/model/command/QuoteStatsModel.java similarity index 79% rename from application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/model/command/QuoteStatsModel.java rename to application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/model/command/QuoteStatsModel.java index 0bb8b239..bb335d91 100644 --- a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/model/command/QuoteStatsModel.java +++ b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/model/command/QuoteStatsModel.java @@ -1,4 +1,4 @@ -package dev.sheldan.raustria.bot.module.quotes.model.command; +package dev.sheldan.sissi.module.quotes.model.command; import lombok.Builder; import lombok.Getter; diff --git a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/model/database/Quote.java b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/model/database/Quote.java similarity index 96% rename from application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/model/database/Quote.java rename to application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/model/database/Quote.java index 03b9af00..47cae54d 100644 --- a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/model/database/Quote.java +++ b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/model/database/Quote.java @@ -1,4 +1,4 @@ -package dev.sheldan.raustria.bot.module.quotes.model.database; +package dev.sheldan.sissi.module.quotes.model.database; import dev.sheldan.abstracto.core.models.ServerSpecificId; import dev.sheldan.abstracto.core.models.database.AChannel; diff --git a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/model/database/QuoteAttachment.java b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/model/database/QuoteAttachment.java similarity index 93% rename from application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/model/database/QuoteAttachment.java rename to application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/model/database/QuoteAttachment.java index 0660f7fe..ac5f7c9d 100644 --- a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/model/database/QuoteAttachment.java +++ b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/model/database/QuoteAttachment.java @@ -1,4 +1,4 @@ -package dev.sheldan.raustria.bot.module.quotes.model.database; +package dev.sheldan.sissi.module.quotes.model.database; import lombok.*; diff --git a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/repository/QuoteRepository.java b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/repository/QuoteRepository.java similarity index 84% rename from application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/repository/QuoteRepository.java rename to application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/repository/QuoteRepository.java index a511017a..c2281e2f 100644 --- a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/repository/QuoteRepository.java +++ b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/repository/QuoteRepository.java @@ -1,9 +1,9 @@ -package dev.sheldan.raustria.bot.module.quotes.repository; +package dev.sheldan.sissi.module.quotes.repository; import dev.sheldan.abstracto.core.models.ServerSpecificId; import dev.sheldan.abstracto.core.models.database.AServer; import dev.sheldan.abstracto.core.models.database.AUserInAServer; -import dev.sheldan.raustria.bot.module.quotes.model.database.Quote; +import dev.sheldan.sissi.module.quotes.model.database.Quote; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/service/QuoteServiceBean.java b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/service/QuoteServiceBean.java similarity index 95% rename from application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/service/QuoteServiceBean.java rename to application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/service/QuoteServiceBean.java index 52292cd9..feb5faf0 100644 --- a/application/r-austria-modules/quotes/src/main/java/dev/sheldan/raustria/bot/module/quotes/service/QuoteServiceBean.java +++ b/application/sissi-modules/quotes/src/main/java/dev/sheldan/sissi/module/quotes/service/QuoteServiceBean.java @@ -1,4 +1,4 @@ -package dev.sheldan.raustria.bot.module.quotes.service; +package dev.sheldan.sissi.module.quotes.service; import dev.sheldan.abstracto.core.models.ServerChannelMessage; import dev.sheldan.abstracto.core.models.ServerSpecificId; @@ -11,12 +11,12 @@ import dev.sheldan.abstracto.core.service.management.UserInServerManagementServi import dev.sheldan.abstracto.core.templating.model.MessageToSend; import dev.sheldan.abstracto.core.templating.service.TemplateService; import dev.sheldan.abstracto.core.utils.CompletableFutureList; -import dev.sheldan.raustria.bot.module.quotes.exception.QuoteNotFoundException; -import dev.sheldan.raustria.bot.module.quotes.model.command.QuoteResponseModel; -import dev.sheldan.raustria.bot.module.quotes.model.command.QuoteStatsModel; -import dev.sheldan.raustria.bot.module.quotes.model.database.Quote; -import dev.sheldan.raustria.bot.module.quotes.model.database.QuoteAttachment; -import dev.sheldan.raustria.bot.module.quotes.repository.QuoteRepository; +import dev.sheldan.sissi.module.quotes.exception.QuoteNotFoundException; +import dev.sheldan.sissi.module.quotes.model.command.QuoteResponseModel; +import dev.sheldan.sissi.module.quotes.model.command.QuoteStatsModel; +import dev.sheldan.sissi.module.quotes.model.database.Quote; +import dev.sheldan.sissi.module.quotes.model.database.QuoteAttachment; +import dev.sheldan.sissi.module.quotes.repository.QuoteRepository; import lombok.extern.slf4j.Slf4j; import net.dv8tion.jda.api.entities.AbstractChannel; import net.dv8tion.jda.api.entities.Member; diff --git a/application/r-austria-modules/quotes/src/main/resources/migrations/1.0.2/collection.xml b/application/sissi-modules/quotes/src/main/resources/migrations/1.0.2/collection.xml similarity index 100% rename from application/r-austria-modules/quotes/src/main/resources/migrations/1.0.2/collection.xml rename to application/sissi-modules/quotes/src/main/resources/migrations/1.0.2/collection.xml diff --git a/application/r-austria-modules/quotes/src/main/resources/migrations/1.0.2/seedData/command.xml b/application/sissi-modules/quotes/src/main/resources/migrations/1.0.2/seedData/command.xml similarity index 100% rename from application/r-austria-modules/quotes/src/main/resources/migrations/1.0.2/seedData/command.xml rename to application/sissi-modules/quotes/src/main/resources/migrations/1.0.2/seedData/command.xml diff --git a/application/r-austria-modules/quotes/src/main/resources/migrations/1.0.2/seedData/data.xml b/application/sissi-modules/quotes/src/main/resources/migrations/1.0.2/seedData/data.xml similarity index 100% rename from application/r-austria-modules/quotes/src/main/resources/migrations/1.0.2/seedData/data.xml rename to application/sissi-modules/quotes/src/main/resources/migrations/1.0.2/seedData/data.xml diff --git a/application/r-austria-modules/quotes/src/main/resources/migrations/1.0.2/seedData/feature.xml b/application/sissi-modules/quotes/src/main/resources/migrations/1.0.2/seedData/feature.xml similarity index 100% rename from application/r-austria-modules/quotes/src/main/resources/migrations/1.0.2/seedData/feature.xml rename to application/sissi-modules/quotes/src/main/resources/migrations/1.0.2/seedData/feature.xml diff --git a/application/r-austria-modules/quotes/src/main/resources/migrations/1.0.2/seedData/module.xml b/application/sissi-modules/quotes/src/main/resources/migrations/1.0.2/seedData/module.xml similarity index 100% rename from application/r-austria-modules/quotes/src/main/resources/migrations/1.0.2/seedData/module.xml rename to application/sissi-modules/quotes/src/main/resources/migrations/1.0.2/seedData/module.xml diff --git a/application/r-austria-modules/quotes/src/main/resources/migrations/1.0.2/tables/quote.xml b/application/sissi-modules/quotes/src/main/resources/migrations/1.0.2/tables/quote.xml similarity index 100% rename from application/r-austria-modules/quotes/src/main/resources/migrations/1.0.2/tables/quote.xml rename to application/sissi-modules/quotes/src/main/resources/migrations/1.0.2/tables/quote.xml diff --git a/application/r-austria-modules/quotes/src/main/resources/migrations/1.0.2/tables/quote_attachment.xml b/application/sissi-modules/quotes/src/main/resources/migrations/1.0.2/tables/quote_attachment.xml similarity index 100% rename from application/r-austria-modules/quotes/src/main/resources/migrations/1.0.2/tables/quote_attachment.xml rename to application/sissi-modules/quotes/src/main/resources/migrations/1.0.2/tables/quote_attachment.xml diff --git a/application/r-austria-modules/quotes/src/main/resources/migrations/1.0.2/tables/tables.xml b/application/sissi-modules/quotes/src/main/resources/migrations/1.0.2/tables/tables.xml similarity index 100% rename from application/r-austria-modules/quotes/src/main/resources/migrations/1.0.2/tables/tables.xml rename to application/sissi-modules/quotes/src/main/resources/migrations/1.0.2/tables/tables.xml diff --git a/application/r-austria-modules/quotes/src/main/resources/migrations/dbchangelog.xsd b/application/sissi-modules/quotes/src/main/resources/migrations/dbchangelog.xsd similarity index 100% rename from application/r-austria-modules/quotes/src/main/resources/migrations/dbchangelog.xsd rename to application/sissi-modules/quotes/src/main/resources/migrations/dbchangelog.xsd diff --git a/application/r-austria-modules/quotes/src/main/resources/migrations/quotes-changeLog.xml b/application/sissi-modules/quotes/src/main/resources/migrations/quotes-changeLog.xml similarity index 100% rename from application/r-austria-modules/quotes/src/main/resources/migrations/quotes-changeLog.xml rename to application/sissi-modules/quotes/src/main/resources/migrations/quotes-changeLog.xml diff --git a/application/r-austria-modules/quotes/src/main/resources/quotes.properties b/application/sissi-modules/quotes/src/main/resources/quotes.properties similarity index 100% rename from application/r-austria-modules/quotes/src/main/resources/quotes.properties rename to application/sissi-modules/quotes/src/main/resources/quotes.properties diff --git a/deployment/docker-compose/pom.xml b/deployment/docker-compose/pom.xml index 1a459cf6..982bf159 100644 --- a/deployment/docker-compose/pom.xml +++ b/deployment/docker-compose/pom.xml @@ -1,7 +1,7 @@ - dev.sheldan.raustria.bot + dev.sheldan.sissi deployment 1.0.3-SNAPSHOT diff --git a/deployment/docker-compose/src/main/resources/.env b/deployment/docker-compose/src/main/resources/.env index ffbeb71e..be4471ae 100644 --- a/deployment/docker-compose/src/main/resources/.env +++ b/deployment/docker-compose/src/main/resources/.env @@ -1,4 +1,4 @@ -COMPOSE_PROJECT_NAME=r-austria +COMPOSE_PROJECT_NAME=sissi # database configuration DATABASE_HOST=database DATABASE_PORT=5432 @@ -30,4 +30,4 @@ PGADMIN_DEFAULT_EMAIL=sheldan@sheldan.dev PGADMIN_DEFAULT_PASSWORD=admin TOKEN= YOUTUBE_API_KEY= -R_AUSTRIA_BOT_VERSION=1.0.2 \ No newline at end of file +SISSI_VERSION=1.0.2 \ No newline at end of file diff --git a/deployment/docker-compose/src/main/resources/docker-compose.yml b/deployment/docker-compose/src/main/resources/docker-compose.yml index 48285902..30ebbf2d 100644 --- a/deployment/docker-compose/src/main/resources/docker-compose.yml +++ b/deployment/docker-compose/src/main/resources/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.7' services: db: - image: ${REGISTRY_PREFIX}r_austria_bot_database:${R_AUSTRIA_BOT_VERSION} + image: ${REGISTRY_PREFIX}sissi_database:${SISSI_VERSION} container_name: ${COMPOSE_PROJECT_NAME}_database restart: always environment: @@ -11,12 +11,12 @@ services: ports: - "127.0.0.1:${DATABASE_PORT}:5432" networks: - - raustriabot + - sissi volumes: - db-data:/var/lib/postgresql/data deployment_container: container_name: ${COMPOSE_PROJECT_NAME}_deployment - image: ${REGISTRY_PREFIX}r_austria_bot_deployment:${R_AUSTRIA_BOT_VERSION} + image: ${REGISTRY_PREFIX}sissi_deployment:${SISSI_VERSION} depends_on: - db environment: @@ -34,14 +34,14 @@ services: POSTGRES_DRIVER_PATH: ${EXECUTE_DEPLOYMENT:-/postgres/driver.jar} WAIT_HOSTS: ${COMPOSE_PROJECT_NAME}_${DATABASE_HOST}:${DATABASE_PORT} networks: - - raustriabot + - sissi bot: - image: ${REGISTRY_PREFIX}r_austria_bot:${R_AUSTRIA_BOT_VERSION} + image: ${REGISTRY_PREFIX}sissi:${SISSI_VERSION} depends_on: - db - deployment_container restart: on-failure - container_name: ${COMPOSE_PROJECT_NAME}_raustriabot + container_name: ${COMPOSE_PROJECT_NAME}bot environment: TOKEN: ${TOKEN} REMOTE_DEBUG: ${REMOTE_DEBUG} @@ -58,13 +58,13 @@ services: - "127.0.0.1:${DEBUG_PORT}:5005" - "127.0.0.1:${TOMCAT_PORT}:8080" networks: - - raustriabot + - sissi volumes: - bot-logs:/logs - ./config:/config pgadmin: container_name: ${COMPOSE_PROJECT_NAME}_pgadmin - image: ${REGISTRY_PREFIX}r_austria_bot_pg_admin:${R_AUSTRIA_BOT_VERSION} + image: ${REGISTRY_PREFIX}sissi_pg_admin:${SISSI_VERSION} depends_on: - db environment: @@ -74,23 +74,23 @@ services: - "127.0.0.1:${PGADMIN_PORT}:80" restart: unless-stopped networks: - - raustriabot + - sissi prometheus: container_name: ${COMPOSE_PROJECT_NAME}_prometheus - image: ${REGISTRY_PREFIX}r_austria_bot_prometheus:${R_AUSTRIA_BOT_VERSION} + image: ${REGISTRY_PREFIX}sissi_prometheus:${SISSI_VERSION} depends_on: - bot ports: - "127.0.0.1:${PROMETHEUS_PORT}:9090" restart: unless-stopped networks: - - raustriabot + - sissi volumes: - ./res/prometheus-scrapper-password-filled:/etc/prometheus/micrometer_password - prometheus-data:/prometheus grafana: container_name: ${COMPOSE_PROJECT_NAME}_grafana - image: ${REGISTRY_PREFIX}r_austria_bot_grafana:${R_AUSTRIA_BOT_VERSION} + image: ${REGISTRY_PREFIX}sissi_grafana:${SISSI_VERSION} depends_on: - prometheus - bot @@ -110,10 +110,10 @@ services: volumes: - grafana-user-data:/var/lib/grafana networks: - - raustriabot + - sissi promtail: container_name: ${COMPOSE_PROJECT_NAME}_promtail - image: ${REGISTRY_PREFIX}r_austria_bot_promtail:${R_AUSTRIA_BOT_VERSION} + image: ${REGISTRY_PREFIX}sissi_promtail:${SISSI_VERSION} depends_on: - bot restart: unless-stopped @@ -121,10 +121,10 @@ services: volumes: - bot-logs:/logs networks: - - raustriabot + - sissi loki: container_name: ${COMPOSE_PROJECT_NAME}_loki - image: ${REGISTRY_PREFIX}r_austria_bot_loki:${R_AUSTRIA_BOT_VERSION} + image: ${REGISTRY_PREFIX}sissi_loki:${SISSI_VERSION} depends_on: - promtail command: -config.file=/mnt/config/loki-config.yaml @@ -132,12 +132,12 @@ services: - "127.0.0.1:${LOKI_PORT}:3100" restart: unless-stopped networks: - - raustriabot + - sissi networks: - raustriabot: + sissi: driver: bridge - name: raustriabot-network + name: sissi-network volumes: db-data: diff --git a/deployment/image-packaging/pom.xml b/deployment/image-packaging/pom.xml index 7c3df603..a5e376b4 100644 --- a/deployment/image-packaging/pom.xml +++ b/deployment/image-packaging/pom.xml @@ -1,7 +1,7 @@ - dev.sheldan.raustria.bot + dev.sheldan.sissi deployment 1.0.3-SNAPSHOT @@ -32,13 +32,13 @@ - dev.sheldan.raustria.bot.application + dev.sheldan.sissi.application executable ${project.version} exec jar true - ${file.basedir}/r-austria-bot/bot + ${file.basedir}/sissi/bot app.jar @@ -73,7 +73,7 @@ - dev.sheldan.raustria.bot.templates + dev.sheldan.sissi.templates quotes-templates ${project.version} zip @@ -115,7 +115,7 @@ - dev.sheldan.raustria.bot.templates.translations + dev.sheldan.sissi.templates.translations quote-translations ${project.version} zip @@ -174,7 +174,7 @@ - dev.sheldan.raustria.bot.application.module + dev.sheldan.sissi.application.module quotes ${project.version} liquibase diff --git a/deployment/image-packaging/src/main/docker/docker-compose.yml b/deployment/image-packaging/src/main/docker/docker-compose.yml index af8c75a5..64c82496 100644 --- a/deployment/image-packaging/src/main/docker/docker-compose.yml +++ b/deployment/image-packaging/src/main/docker/docker-compose.yml @@ -3,48 +3,48 @@ version: "3.7" services: bot: build: - context: r-austria-bot - image: ${REGISTRY_PREFIX}r_austria_bot:${VERSION:-latest} + context: sissi + image: ${REGISTRY_PREFIX}sissi:${VERSION:-latest} database: build: context: database args: POSTGRES_VERSION: ${POSTGRES_VERSION} - image: ${REGISTRY_PREFIX}r_austria_bot_database:${VERSION:-latest} + image: ${REGISTRY_PREFIX}sissi_database:${VERSION:-latest} pg_admin: build: context: pgAdmin args: PG_ADMIN_VERSION: ${PG_ADMIN_VERSION} - image: ${REGISTRY_PREFIX}r_austria_bot_pg_admin:${VERSION:-latest} + image: ${REGISTRY_PREFIX}sissi_pg_admin:${VERSION:-latest} deployment_container: build: context: deployment args: ABSTRACTO_REGISTRY_PREFIX: ${ABSTRACTO_REGISTRY_PREFIX} ABSTRACTO_VERSION: ${ABSTRACTO_VERSION} - image: ${REGISTRY_PREFIX}r_austria_bot_deployment:${VERSION:-latest} + image: ${REGISTRY_PREFIX}sissi_deployment:${VERSION:-latest} prometheus: build: context: prometheus args: PROMETHEUS_VERSION: ${PROMETHEUS_VERSION} - image: ${REGISTRY_PREFIX}r_austria_bot_prometheus:${VERSION:-latest} + image: ${REGISTRY_PREFIX}sissi_prometheus:${VERSION:-latest} grafana: build: context: grafana args: GRAFANA_VERSION: ${GRAFANA_VERSION} - image: ${REGISTRY_PREFIX}r_austria_bot_grafana:${VERSION:-latest} + image: ${REGISTRY_PREFIX}sissi_grafana:${VERSION:-latest} promtail: build: context: promtail args: PROMTAIL_VERSION: ${PROMTAIL_VERSION} - image: ${REGISTRY_PREFIX}r_austria_bot_promtail:${VERSION:-latest} + image: ${REGISTRY_PREFIX}sissi_promtail:${VERSION:-latest} loki: build: context: loki args: LOKI_VERSION: ${LOKI_VERSION} - image: ${REGISTRY_PREFIX}r_austria_bot_loki:${VERSION:-latest} + image: ${REGISTRY_PREFIX}sissi_loki:${VERSION:-latest} diff --git a/deployment/image-packaging/src/main/docker/grafana/dashboards/jvm-dashboard.json b/deployment/image-packaging/src/main/docker/grafana/dashboards/jvm-dashboard.json index dff46bd3..e015f972 100644 --- a/deployment/image-packaging/src/main/docker/grafana/dashboards/jvm-dashboard.json +++ b/deployment/image-packaging/src/main/docker/grafana/dashboards/jvm-dashboard.json @@ -14,7 +14,7 @@ } ] }, - "description": "Dashboard for RAustria Bot spring boot monitoring (adapted from https://grafana.com/grafana/dashboards/4701)", + "description": "Dashboard for Sissi spring boot monitoring (adapted from https://grafana.com/grafana/dashboards/4701)", "editable": true, "gnetId": null, "graphTooltip": 1, @@ -1502,8 +1502,8 @@ "allValue": null, "current": { "selected": true, - "text": "raustriabot", - "value": "raustriabot" + "text": "Sissi", + "value": "sissi" }, "datasource": "prometheus", "definition": "", diff --git a/deployment/image-packaging/src/main/docker/grafana/dashboards/r-austria-bot-logs.json b/deployment/image-packaging/src/main/docker/grafana/dashboards/r-austria-bot-logs.json index bce6d2d0..fe4e376f 100644 --- a/deployment/image-packaging/src/main/docker/grafana/dashboards/r-austria-bot-logs.json +++ b/deployment/image-packaging/src/main/docker/grafana/dashboards/r-austria-bot-logs.json @@ -37,12 +37,12 @@ }, "targets": [ { - "expr": "{job=\"r-austria-bot-logs\", filename=\"/logs/log.log\"}", + "expr": "{job=\"sissi-logs\", filename=\"/logs/log.log\"}", "queryType": "randomWalk", "refId": "A" } ], - "title": "RAustria Bot logs", + "title": "Sissi logs", "type": "logs" } ], @@ -59,7 +59,7 @@ }, "timepicker": {}, "timezone": "", - "title": "RAustria Bot logs", + "title": "Sissi logs", "uid": "1uGb0q4nz", "version": 2 } \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/grafana/dashboards/r-austria-bot-status-dashboard.json b/deployment/image-packaging/src/main/docker/grafana/dashboards/r-austria-bot-status-dashboard.json index f190a9a9..1a0586c5 100644 --- a/deployment/image-packaging/src/main/docker/grafana/dashboards/r-austria-bot-status-dashboard.json +++ b/deployment/image-packaging/src/main/docker/grafana/dashboards/r-austria-bot-status-dashboard.json @@ -1082,7 +1082,7 @@ "hide": 2, "label": null, "name": "application", - "query": "r-austria-bot", + "query": "sissi", "skipUrlSync": false, "type": "constant" } @@ -1094,7 +1094,7 @@ }, "timepicker": {}, "timezone": "", - "title": "r-Austria Bot status", + "title": "Sissi status", "uid": "6WIJ36BMz", "version": 3 } \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/grafana/provisioning/dashboards/all.yml b/deployment/image-packaging/src/main/docker/grafana/provisioning/dashboards/all.yml index f969687a..c5b30acc 100644 --- a/deployment/image-packaging/src/main/docker/grafana/provisioning/dashboards/all.yml +++ b/deployment/image-packaging/src/main/docker/grafana/provisioning/dashboards/all.yml @@ -1,4 +1,4 @@ -- name: 'r-austria-bot-dashboards' +- name: 'sissi-bot-dashboards' org_id: 1 folder: '' type: 'file' diff --git a/deployment/image-packaging/src/main/docker/pgAdmin/config/servers.json b/deployment/image-packaging/src/main/docker/pgAdmin/config/servers.json index b3afdcc8..50164cdc 100644 --- a/deployment/image-packaging/src/main/docker/pgAdmin/config/servers.json +++ b/deployment/image-packaging/src/main/docker/pgAdmin/config/servers.json @@ -1,11 +1,11 @@ { "Servers": { "1": { - "Name": "r-austria bot database", + "Name": "Sissi database", "Group": "Server Group 1", "Port": 5432, "Username": "abstracto", - "Host": "r-austria_db", + "Host": "sissi_database", "SSLMode": "prefer", "MaintenanceDB": "postgres" } diff --git a/deployment/image-packaging/src/main/docker/prometheus/prometheus.yml b/deployment/image-packaging/src/main/docker/prometheus/prometheus.yml index e661c245..a1c2a1c0 100644 --- a/deployment/image-packaging/src/main/docker/prometheus/prometheus.yml +++ b/deployment/image-packaging/src/main/docker/prometheus/prometheus.yml @@ -3,7 +3,7 @@ global: scrape_timeout: 10s evaluation_interval: 1m scrape_configs: - - job_name: r_austria_bot_micrometer + - job_name: sissi_micrometer honor_timestamps: true scrape_interval: 5s scrape_timeout: 5s @@ -11,7 +11,7 @@ scrape_configs: scheme: http static_configs: - targets: - - r-austria_raustriabot:8080 + - sissibot:8080 basic_auth: username: "abstracto" password_file: /etc/prometheus/micrometer_password \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/promtail/promtail.yaml b/deployment/image-packaging/src/main/docker/promtail/promtail.yaml index b2bbff20..f8551d56 100644 --- a/deployment/image-packaging/src/main/docker/promtail/promtail.yaml +++ b/deployment/image-packaging/src/main/docker/promtail/promtail.yaml @@ -5,7 +5,7 @@ positions: filename: /tmp/positions.yaml clients: - - url: http://r-austria_loki:3100/loki/api/v1/push + - url: http://sissi_loki:3100/loki/api/v1/push scrape_configs: - job_name: system @@ -13,5 +13,5 @@ scrape_configs: - targets: - localhost labels: - job: r-austria-bot-logs + job: sissi-logs __path__: /logs/*.log \ No newline at end of file diff --git a/deployment/image-packaging/src/main/docker/r-austria-bot/Dockerfile b/deployment/image-packaging/src/main/docker/sissi/Dockerfile similarity index 100% rename from deployment/image-packaging/src/main/docker/r-austria-bot/Dockerfile rename to deployment/image-packaging/src/main/docker/sissi/Dockerfile diff --git a/deployment/image-packaging/src/main/docker/r-austria-bot/config/application.properties b/deployment/image-packaging/src/main/docker/sissi/config/application.properties similarity index 100% rename from deployment/image-packaging/src/main/docker/r-austria-bot/config/application.properties rename to deployment/image-packaging/src/main/docker/sissi/config/application.properties diff --git a/deployment/image-packaging/src/main/docker/r-austria-bot/config/logback.xml b/deployment/image-packaging/src/main/docker/sissi/config/logback.xml similarity index 100% rename from deployment/image-packaging/src/main/docker/r-austria-bot/config/logback.xml rename to deployment/image-packaging/src/main/docker/sissi/config/logback.xml diff --git a/deployment/image-packaging/src/main/docker/r-austria-bot/wrapper/start.sh b/deployment/image-packaging/src/main/docker/sissi/wrapper/start.sh similarity index 100% rename from deployment/image-packaging/src/main/docker/r-austria-bot/wrapper/start.sh rename to deployment/image-packaging/src/main/docker/sissi/wrapper/start.sh diff --git a/deployment/pom.xml b/deployment/pom.xml index 6887ada5..1cef3f0e 100644 --- a/deployment/pom.xml +++ b/deployment/pom.xml @@ -1,8 +1,8 @@ - dev.sheldan.raustria.bot - r-austria-bot + dev.sheldan.sissi + sissi 1.0.3-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 8b7accbe..07076639 100644 --- a/pom.xml +++ b/pom.xml @@ -10,8 +10,8 @@ - dev.sheldan.raustria.bot - r-austria-bot + dev.sheldan.sissi + sissi 1.0.3-SNAPSHOT @@ -49,13 +49,13 @@ github GitHub Packages - https://maven.pkg.github.com/Sheldan/r-austria-bot + https://maven.pkg.github.com/Sheldan/Sissi - https://maven.pkg.github.com/Sheldan/r-austria-bot - scm:git:git@github.com:Sheldan/r-austria-bot.git + https://maven.pkg.github.com/Sheldan/Sissi + scm:git:git@github.com:Sheldan/Sissi.git HEAD diff --git a/templates/pom.xml b/templates/pom.xml index 62efd4c9..bc6d8ac7 100644 --- a/templates/pom.xml +++ b/templates/pom.xml @@ -1,18 +1,18 @@ - r-austria-bot - dev.sheldan.raustria.bot + dev.sheldan.sissi + sissi 1.0.3-SNAPSHOT 4.0.0 - dev.sheldan.raustria.bot.templates + dev.sheldan.sissi.templates templates pom - r-austria-bot-templates - r-austria-bot-translations + sissi-templates + sissi-translations diff --git a/templates/r-austria-bot-templates/module-templates/pom.xml b/templates/sissi-templates/module-templates/pom.xml similarity index 81% rename from templates/r-austria-bot-templates/module-templates/pom.xml rename to templates/sissi-templates/module-templates/pom.xml index 4ed441b1..0ed9ad67 100644 --- a/templates/r-austria-bot-templates/module-templates/pom.xml +++ b/templates/sissi-templates/module-templates/pom.xml @@ -1,8 +1,8 @@ - dev.sheldan.raustria.bot.templates - r-austria-bot-templates + dev.sheldan.sissi.templates + sissi-templates 1.0.3-SNAPSHOT 4.0.0 diff --git a/templates/r-austria-bot-templates/module-templates/quotes-templates/pom.xml b/templates/sissi-templates/module-templates/quotes-templates/pom.xml similarity index 95% rename from templates/r-austria-bot-templates/module-templates/quotes-templates/pom.xml rename to templates/sissi-templates/module-templates/quotes-templates/pom.xml index 39ef5946..970c39fe 100644 --- a/templates/r-austria-bot-templates/module-templates/quotes-templates/pom.xml +++ b/templates/sissi-templates/module-templates/quotes-templates/pom.xml @@ -1,7 +1,7 @@ - dev.sheldan.raustria.bot.templates + dev.sheldan.sissi.templates module-templates 1.0.3-SNAPSHOT diff --git a/templates/r-austria-bot-templates/module-templates/quotes-templates/src/main/assembly/assembly.xml b/templates/sissi-templates/module-templates/quotes-templates/src/main/assembly/assembly.xml similarity index 100% rename from templates/r-austria-bot-templates/module-templates/quotes-templates/src/main/assembly/assembly.xml rename to templates/sissi-templates/module-templates/quotes-templates/src/main/assembly/assembly.xml diff --git a/templates/r-austria-bot-templates/module-templates/quotes-templates/src/main/resources/en_US/commands/quote/quote_response_embed_en_US.ftl b/templates/sissi-templates/module-templates/quotes-templates/src/main/resources/en_US/commands/quote/quote_response_embed_en_US.ftl similarity index 100% rename from templates/r-austria-bot-templates/module-templates/quotes-templates/src/main/resources/en_US/commands/quote/quote_response_embed_en_US.ftl rename to templates/sissi-templates/module-templates/quotes-templates/src/main/resources/en_US/commands/quote/quote_response_embed_en_US.ftl diff --git a/templates/r-austria-bot-templates/module-templates/quotes-templates/src/main/resources/en_US/commands/quoteStats/quoteStats_response_embed_en_US.ftl b/templates/sissi-templates/module-templates/quotes-templates/src/main/resources/en_US/commands/quoteStats/quoteStats_response_embed_en_US.ftl similarity index 100% rename from templates/r-austria-bot-templates/module-templates/quotes-templates/src/main/resources/en_US/commands/quoteStats/quoteStats_response_embed_en_US.ftl rename to templates/sissi-templates/module-templates/quotes-templates/src/main/resources/en_US/commands/quoteStats/quoteStats_response_embed_en_US.ftl diff --git a/templates/r-austria-bot-templates/module-templates/quotes-templates/src/main/resources/en_US/exceptions/quote_not_found_exception_en_US.ftl b/templates/sissi-templates/module-templates/quotes-templates/src/main/resources/en_US/exceptions/quote_not_found_exception_en_US.ftl similarity index 100% rename from templates/r-austria-bot-templates/module-templates/quotes-templates/src/main/resources/en_US/exceptions/quote_not_found_exception_en_US.ftl rename to templates/sissi-templates/module-templates/quotes-templates/src/main/resources/en_US/exceptions/quote_not_found_exception_en_US.ftl diff --git a/templates/r-austria-bot-templates/pom.xml b/templates/sissi-templates/pom.xml similarity index 81% rename from templates/r-austria-bot-templates/pom.xml rename to templates/sissi-templates/pom.xml index 0732a7e6..e917bdd7 100644 --- a/templates/r-austria-bot-templates/pom.xml +++ b/templates/sissi-templates/pom.xml @@ -1,13 +1,13 @@ + dev.sheldan.sissi.templates templates - dev.sheldan.raustria.bot.templates 1.0.3-SNAPSHOT 4.0.0 - r-austria-bot-templates + sissi-templates pom diff --git a/templates/r-austria-bot-translations/module-translations/pom.xml b/templates/sissi-translations/module-translations/pom.xml similarity index 79% rename from templates/r-austria-bot-translations/module-translations/pom.xml rename to templates/sissi-translations/module-translations/pom.xml index 0048a6cf..102fd205 100644 --- a/templates/r-austria-bot-translations/module-translations/pom.xml +++ b/templates/sissi-translations/module-translations/pom.xml @@ -1,8 +1,8 @@ - dev.sheldan.raustria.bot.templates.translations - r-austria-bot-translations + dev.sheldan.sissi.templates.translations + sissi-translations 1.0.3-SNAPSHOT 4.0.0 diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/pom.xml b/templates/sissi-translations/module-translations/quote-translations/pom.xml similarity index 94% rename from templates/r-austria-bot-translations/module-translations/quote-translations/pom.xml rename to templates/sissi-translations/module-translations/quote-translations/pom.xml index a83a547b..e6690457 100644 --- a/templates/r-austria-bot-translations/module-translations/quote-translations/pom.xml +++ b/templates/sissi-translations/module-translations/quote-translations/pom.xml @@ -1,8 +1,8 @@ + dev.sheldan.sissi.templates.translations module-translations - dev.sheldan.raustria.bot.templates.translations 1.0.3-SNAPSHOT 4.0.0 diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/assembly/assembly.xml b/templates/sissi-translations/module-translations/quote-translations/src/main/assembly/assembly.xml similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/assembly/assembly.xml rename to templates/sissi-translations/module-translations/quote-translations/src/main/assembly/assembly.xml diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/help/quote_description_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/help/quote_description_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/help/quote_description_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/help/quote_description_en_US.ftl diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/help/quote_long_help_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/help/quote_long_help_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/help/quote_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/help/quote_long_help_en_US.ftl diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/help/quote_parameter_member_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/help/quote_parameter_member_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/help/quote_parameter_member_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/help/quote_parameter_member_en_US.ftl diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_default_adder_name_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_default_adder_name_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_default_adder_name_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_default_adder_name_en_US.ftl diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_default_author_name_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_default_author_name_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_default_author_name_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_default_author_name_en_US.ftl diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_default_channel_name_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_default_channel_name_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_default_channel_name_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_default_channel_name_en_US.ftl diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_description_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_description_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_description_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_description_en_US.ftl diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_footer_adder_name_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_footer_adder_name_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_footer_adder_name_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_footer_adder_name_en_US.ftl diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_header_author_name_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_header_author_name_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_header_author_name_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quote/quote_response_header_author_name_en_US.ftl diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/help/quoteDelete_description_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/help/quoteDelete_description_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/help/quoteDelete_description_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/help/quoteDelete_description_en_US.ftl diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/help/quoteDelete_long_help_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/help/quoteDelete_long_help_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/help/quoteDelete_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/help/quoteDelete_long_help_en_US.ftl diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/help/quoteDelete_parameter_quoteId_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/help/quoteDelete_parameter_quoteId_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/help/quoteDelete_parameter_quoteId_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/help/quoteDelete_parameter_quoteId_en_US.ftl diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/quoteDelete_confirmation_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/quoteDelete_confirmation_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/quoteDelete_confirmation_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteDelete/quoteDelete_confirmation_en_US.ftl diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteGet/help/quoteGet_description_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteGet/help/quoteGet_description_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteGet/help/quoteGet_description_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteGet/help/quoteGet_description_en_US.ftl diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteGet/help/quoteGet_long_help_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteGet/help/quoteGet_long_help_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteGet/help/quoteGet_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteGet/help/quoteGet_long_help_en_US.ftl diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteGet/help/quoteGet_parameter_quoteId_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteGet/help/quoteGet_parameter_quoteId_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteGet/help/quoteGet_parameter_quoteId_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteGet/help/quoteGet_parameter_quoteId_en_US.ftl diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteSearch/help/quoteSearch_description_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteSearch/help/quoteSearch_description_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteSearch/help/quoteSearch_description_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteSearch/help/quoteSearch_description_en_US.ftl diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteSearch/help/quoteSearch_long_help_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteSearch/help/quoteSearch_long_help_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteSearch/help/quoteSearch_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteSearch/help/quoteSearch_long_help_en_US.ftl diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteSearch/help/quoteSearch_parameter_query_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteSearch/help/quoteSearch_parameter_query_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteSearch/help/quoteSearch_parameter_query_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteSearch/help/quoteSearch_parameter_query_en_US.ftl diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteStats/help/quoteStats_description_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteStats/help/quoteStats_description_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteStats/help/quoteStats_description_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteStats/help/quoteStats_description_en_US.ftl diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteStats/help/quoteStats_long_help_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteStats/help/quoteStats_long_help_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteStats/help/quoteStats_long_help_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteStats/help/quoteStats_long_help_en_US.ftl diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteStats/help/quoteStats_parameter_member_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteStats/help/quoteStats_parameter_member_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteStats/help/quoteStats_parameter_member_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteStats/help/quoteStats_parameter_member_en_US.ftl diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteStats/quoteStats_response_message_text_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteStats/quoteStats_response_message_text_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteStats/quoteStats_response_message_text_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/commands/quoteStats/quoteStats_response_message_text_en_US.ftl diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/config/feature_quotes_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/config/feature_quotes_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/config/feature_quotes_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/config/feature_quotes_en_US.ftl diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/config/module_quotes_description_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/config/module_quotes_description_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/config/module_quotes_description_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/config/module_quotes_description_en_US.ftl diff --git a/templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/exceptions/quote_not_found_exception_text_en_US.ftl b/templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/exceptions/quote_not_found_exception_text_en_US.ftl similarity index 100% rename from templates/r-austria-bot-translations/module-translations/quote-translations/src/main/resources/en_US/exceptions/quote_not_found_exception_text_en_US.ftl rename to templates/sissi-translations/module-translations/quote-translations/src/main/resources/en_US/exceptions/quote_not_found_exception_text_en_US.ftl diff --git a/templates/r-austria-bot-translations/pom.xml b/templates/sissi-translations/pom.xml similarity index 73% rename from templates/r-austria-bot-translations/pom.xml rename to templates/sissi-translations/pom.xml index 7753462c..08e34b24 100644 --- a/templates/r-austria-bot-translations/pom.xml +++ b/templates/sissi-translations/pom.xml @@ -1,14 +1,14 @@ + dev.sheldan.sissi.templates templates - dev.sheldan.raustria.bot.templates 1.0.3-SNAPSHOT 4.0.0 - dev.sheldan.raustria.bot.templates.translations - r-austria-bot-translations + dev.sheldan.sissi.templates.translations + sissi-translations pom module-translations