diff --git a/.src.ci.yaml b/.src.ci.yaml index b93c06c..d6d2c24 100644 --- a/.src.ci.yaml +++ b/.src.ci.yaml @@ -28,4 +28,4 @@ tasks: - ./gradlew assemble artifacts: paths: - - build/libs/memes-tv-0.0.1-SNAPSHOT.jar + - build/libs/memevizor-0.0.1-SNAPSHOT.jar diff --git a/mise.toml b/mise.toml index 73fb59c..a1e67c1 100644 --- a/mise.toml +++ b/mise.toml @@ -3,7 +3,7 @@ java = "temurin-17" [tasks.release] description = 'Build and push docker image' -run = './gradlew build && ./gradlew jib --image=cr.yandex/crph26nr2d2ds65t2m7b/memes-tv:0.0.1-SNAPSHOT' +run = './gradlew build && ./gradlew jib --image=cr.yandex/crph26nr2d2ds65t2m7b/memevizor:0.0.1-SNAPSHOT' [tasks.fmt] description = 'Fourmat source code' diff --git a/settings.gradle.kts b/settings.gradle.kts index 56f6f41..dd92b7a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,4 +1,4 @@ -rootProject.name = "memes-tv" +rootProject.name = "memevizor" dependencyResolutionManagement { repositories { diff --git a/src/main/kotlin/com/pischule/memestv/MemesTvApplication.kt b/src/main/kotlin/com/pischule/memevizor/MemesTvApplication.kt similarity index 88% rename from src/main/kotlin/com/pischule/memestv/MemesTvApplication.kt rename to src/main/kotlin/com/pischule/memevizor/MemesTvApplication.kt index 0a9687b..9baf784 100644 --- a/src/main/kotlin/com/pischule/memestv/MemesTvApplication.kt +++ b/src/main/kotlin/com/pischule/memevizor/MemesTvApplication.kt @@ -1,4 +1,4 @@ -package com.pischule.memestv +package com.pischule.memevizor import org.springframework.boot.autoconfigure.SpringBootApplication import org.springframework.boot.runApplication diff --git a/src/main/kotlin/com/pischule/memestv/bot/BotConfiguration.kt b/src/main/kotlin/com/pischule/memevizor/bot/BotConfiguration.kt similarity index 90% rename from src/main/kotlin/com/pischule/memestv/bot/BotConfiguration.kt rename to src/main/kotlin/com/pischule/memevizor/bot/BotConfiguration.kt index 276e116..d3d9fbb 100644 --- a/src/main/kotlin/com/pischule/memestv/bot/BotConfiguration.kt +++ b/src/main/kotlin/com/pischule/memevizor/bot/BotConfiguration.kt @@ -1,4 +1,4 @@ -package com.pischule.memestv.bot +package com.pischule.memevizor.bot import com.github.kotlintelegrambot.Bot import com.github.kotlintelegrambot.bot @@ -6,9 +6,9 @@ import com.github.kotlintelegrambot.dispatch import com.github.kotlintelegrambot.dispatcher.message import com.github.kotlintelegrambot.dispatcher.photos import com.github.kotlintelegrambot.entities.Message -import com.pischule.memestv.bot.handler.PhotoHandlerService -import com.pischule.memestv.bot.handler.ThisCommandHandlerService -import com.pischule.memestv.util.getMaxResPhotoId +import com.pischule.memevizor.bot.handler.PhotoHandlerService +import com.pischule.memevizor.bot.handler.ThisCommandHandlerService +import com.pischule.memevizor.util.getMaxResPhotoId import io.github.oshai.kotlinlogging.KotlinLogging import io.github.oshai.kotlinlogging.withLoggingContext import org.springframework.boot.context.properties.EnableConfigurationProperties diff --git a/src/main/kotlin/com/pischule/memestv/bot/BotProps.kt b/src/main/kotlin/com/pischule/memevizor/bot/BotProps.kt similarity index 83% rename from src/main/kotlin/com/pischule/memestv/bot/BotProps.kt rename to src/main/kotlin/com/pischule/memevizor/bot/BotProps.kt index bbdd11c..0daa9b2 100644 --- a/src/main/kotlin/com/pischule/memestv/bot/BotProps.kt +++ b/src/main/kotlin/com/pischule/memevizor/bot/BotProps.kt @@ -1,4 +1,4 @@ -package com.pischule.memestv.bot +package com.pischule.memevizor.bot import org.springframework.boot.context.properties.ConfigurationProperties diff --git a/src/main/kotlin/com/pischule/memestv/bot/BotService.kt b/src/main/kotlin/com/pischule/memevizor/bot/BotService.kt similarity index 95% rename from src/main/kotlin/com/pischule/memestv/bot/BotService.kt rename to src/main/kotlin/com/pischule/memevizor/bot/BotService.kt index 365e0f6..b099499 100644 --- a/src/main/kotlin/com/pischule/memestv/bot/BotService.kt +++ b/src/main/kotlin/com/pischule/memevizor/bot/BotService.kt @@ -1,4 +1,4 @@ -package com.pischule.memestv.bot +package com.pischule.memevizor.bot import com.github.kotlintelegrambot.Bot import io.github.oshai.kotlinlogging.KotlinLogging diff --git a/src/main/kotlin/com/pischule/memestv/bot/handler/PhotoHandlerService.kt b/src/main/kotlin/com/pischule/memevizor/bot/handler/PhotoHandlerService.kt similarity index 95% rename from src/main/kotlin/com/pischule/memestv/bot/handler/PhotoHandlerService.kt rename to src/main/kotlin/com/pischule/memevizor/bot/handler/PhotoHandlerService.kt index f5c379a..c69a267 100644 --- a/src/main/kotlin/com/pischule/memestv/bot/handler/PhotoHandlerService.kt +++ b/src/main/kotlin/com/pischule/memevizor/bot/handler/PhotoHandlerService.kt @@ -1,10 +1,10 @@ -package com.pischule.memestv.bot.handler +package com.pischule.memevizor.bot.handler import com.github.kotlintelegrambot.dispatcher.handlers.media.MediaHandlerEnvironment import com.github.kotlintelegrambot.entities.ChatId import com.github.kotlintelegrambot.entities.files.PhotoSize import com.github.kotlintelegrambot.entities.reaction.ReactionType -import com.pischule.memestv.bot.BotProps +import com.pischule.memevizor.bot.BotProps import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.stereotype.Service diff --git a/src/main/kotlin/com/pischule/memestv/bot/handler/ThisCommandHandlerService.kt b/src/main/kotlin/com/pischule/memevizor/bot/handler/ThisCommandHandlerService.kt similarity index 91% rename from src/main/kotlin/com/pischule/memestv/bot/handler/ThisCommandHandlerService.kt rename to src/main/kotlin/com/pischule/memevizor/bot/handler/ThisCommandHandlerService.kt index f44ab4c..c228807 100644 --- a/src/main/kotlin/com/pischule/memestv/bot/handler/ThisCommandHandlerService.kt +++ b/src/main/kotlin/com/pischule/memevizor/bot/handler/ThisCommandHandlerService.kt @@ -1,11 +1,11 @@ -package com.pischule.memestv.bot.handler +package com.pischule.memevizor.bot.handler import com.github.kotlintelegrambot.dispatcher.handlers.MessageHandlerEnvironment import com.github.kotlintelegrambot.entities.ChatId import com.github.kotlintelegrambot.entities.reaction.ReactionType -import com.pischule.memestv.bot.BotProps -import com.pischule.memestv.upload.FileUploaderService -import com.pischule.memestv.util.getMaxResPhotoId +import com.pischule.memevizor.bot.BotProps +import com.pischule.memevizor.upload.FileUploaderService +import com.pischule.memevizor.util.getMaxResPhotoId import io.github.oshai.kotlinlogging.KotlinLogging import io.github.oshai.kotlinlogging.withLoggingContext import org.springframework.stereotype.Component diff --git a/src/main/kotlin/com/pischule/memestv/upload/DummyFileUploadService.kt b/src/main/kotlin/com/pischule/memevizor/upload/DummyFileUploadService.kt similarity index 92% rename from src/main/kotlin/com/pischule/memestv/upload/DummyFileUploadService.kt rename to src/main/kotlin/com/pischule/memevizor/upload/DummyFileUploadService.kt index 8c48a15..670c65b 100644 --- a/src/main/kotlin/com/pischule/memestv/upload/DummyFileUploadService.kt +++ b/src/main/kotlin/com/pischule/memevizor/upload/DummyFileUploadService.kt @@ -1,4 +1,4 @@ -package com.pischule.memestv.upload +package com.pischule.memevizor.upload import io.github.oshai.kotlinlogging.KotlinLogging import org.springframework.context.annotation.Profile diff --git a/src/main/kotlin/com/pischule/memestv/upload/FileUploaderService.kt b/src/main/kotlin/com/pischule/memevizor/upload/FileUploaderService.kt similarity index 82% rename from src/main/kotlin/com/pischule/memestv/upload/FileUploaderService.kt rename to src/main/kotlin/com/pischule/memevizor/upload/FileUploaderService.kt index aed920f..583996b 100644 --- a/src/main/kotlin/com/pischule/memestv/upload/FileUploaderService.kt +++ b/src/main/kotlin/com/pischule/memevizor/upload/FileUploaderService.kt @@ -1,4 +1,4 @@ -package com.pischule.memestv.upload +package com.pischule.memevizor.upload import org.springframework.stereotype.Service diff --git a/src/main/kotlin/com/pischule/memestv/upload/IndexInitializer.kt b/src/main/kotlin/com/pischule/memevizor/upload/IndexInitializer.kt similarity index 96% rename from src/main/kotlin/com/pischule/memestv/upload/IndexInitializer.kt rename to src/main/kotlin/com/pischule/memevizor/upload/IndexInitializer.kt index 930ad63..d18cb9c 100644 --- a/src/main/kotlin/com/pischule/memestv/upload/IndexInitializer.kt +++ b/src/main/kotlin/com/pischule/memevizor/upload/IndexInitializer.kt @@ -1,4 +1,4 @@ -package com.pischule.memestv.upload +package com.pischule.memevizor.upload import io.github.oshai.kotlinlogging.KotlinLogging import kotlinx.coroutines.runBlocking diff --git a/src/main/kotlin/com/pischule/memestv/upload/S3Config.kt b/src/main/kotlin/com/pischule/memevizor/upload/S3Config.kt similarity index 95% rename from src/main/kotlin/com/pischule/memestv/upload/S3Config.kt rename to src/main/kotlin/com/pischule/memevizor/upload/S3Config.kt index a618afa..b971491 100644 --- a/src/main/kotlin/com/pischule/memestv/upload/S3Config.kt +++ b/src/main/kotlin/com/pischule/memevizor/upload/S3Config.kt @@ -1,4 +1,4 @@ -package com.pischule.memestv.upload +package com.pischule.memevizor.upload import aws.sdk.kotlin.runtime.auth.credentials.StaticCredentialsProvider import aws.sdk.kotlin.services.s3.S3Client diff --git a/src/main/kotlin/com/pischule/memestv/upload/S3FileUploaderService.kt b/src/main/kotlin/com/pischule/memevizor/upload/S3FileUploaderService.kt similarity index 96% rename from src/main/kotlin/com/pischule/memestv/upload/S3FileUploaderService.kt rename to src/main/kotlin/com/pischule/memevizor/upload/S3FileUploaderService.kt index 5fea278..08adbf4 100644 --- a/src/main/kotlin/com/pischule/memestv/upload/S3FileUploaderService.kt +++ b/src/main/kotlin/com/pischule/memevizor/upload/S3FileUploaderService.kt @@ -1,4 +1,4 @@ -package com.pischule.memestv.upload +package com.pischule.memevizor.upload import aws.sdk.kotlin.services.s3.S3Client import aws.sdk.kotlin.services.s3.model.PutObjectRequest diff --git a/src/main/kotlin/com/pischule/memestv/upload/S3Props.kt b/src/main/kotlin/com/pischule/memevizor/upload/S3Props.kt similarity index 84% rename from src/main/kotlin/com/pischule/memestv/upload/S3Props.kt rename to src/main/kotlin/com/pischule/memevizor/upload/S3Props.kt index ea821dc..56c1851 100644 --- a/src/main/kotlin/com/pischule/memestv/upload/S3Props.kt +++ b/src/main/kotlin/com/pischule/memevizor/upload/S3Props.kt @@ -1,4 +1,4 @@ -package com.pischule.memestv.upload +package com.pischule.memevizor.upload import org.springframework.boot.context.properties.ConfigurationProperties diff --git a/src/main/kotlin/com/pischule/memestv/util/TelegramHelper.kt b/src/main/kotlin/com/pischule/memevizor/util/TelegramHelper.kt similarity index 78% rename from src/main/kotlin/com/pischule/memestv/util/TelegramHelper.kt rename to src/main/kotlin/com/pischule/memevizor/util/TelegramHelper.kt index e349adc..bcc410b 100644 --- a/src/main/kotlin/com/pischule/memestv/util/TelegramHelper.kt +++ b/src/main/kotlin/com/pischule/memevizor/util/TelegramHelper.kt @@ -1,4 +1,4 @@ -package com.pischule.memestv.util +package com.pischule.memevizor.util import com.github.kotlintelegrambot.entities.Message diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 0afa645..23fe2d9 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,2 +1,2 @@ -spring.application.name=memes-tv +spring.application.name=memevizor logging.structured.format.console=ecs \ No newline at end of file diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html index 57a8eda..cb48504 100644 --- a/src/main/resources/static/index.html +++ b/src/main/resources/static/index.html @@ -5,7 +5,7 @@ -