From 365d8083ade5cd46546020ebfb8841d946ad4540 Mon Sep 17 00:00:00 2001
From: Vladislav Kuznetsov <v.a.kuznetsov@bftcom.com>
Date: Fri, 5 Jul 2024 17:43:11 +0300
Subject: [PATCH] =?UTF-8?q?=D0=90=D0=BA=D1=82=D1=83=D0=B0=D0=BB=D0=B8?=
 =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BE=D0=BA=D1=80=D1=83=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F,=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B9,=20github=20=D0=B4=D0=B5=D0=B9=D1=81=D1=82?=
 =?UTF-8?q?=D0=B2=D0=B8=D0=B9,=20=D0=B4=D0=BE=D0=BA=D0=B5=D1=80=D0=B0=20?=
 =?UTF-8?q?=D0=B8=20=D1=82=D0=B0=D0=BA=20=D0=B4=D0=B0=D0=BB=D0=B5=D0=B5=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D0=BD=D0=B0=D1=87=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B0=20=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=B1=D0=BE=D1=82=D0=BE=D0=BC=20"Protego=20Tota?=
 =?UTF-8?q?lum".?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/release-drafter.yml                      |  7 ++++---
 .github/workflows/ci.yml                         |  3 +++
 .github/workflows/release_draft.yml              |  7 -------
 .gitignore                                       |  1 +
 .idea/runConfigurations/ProtegoTotalumBotApp.xml |  2 +-
 docker/postgres/Dockerfile                       |  3 ++-
 pt-database/src/main/resources/database.yml      | 16 ++++++++--------
 .../{LeoBotApp.kt => ProtegoTotalumBotApp.kt}    |  4 ++--
 pt-discord/src/main/resources/application.yml    |  2 +-
 .../2023.1/db.2023.1-create_tables.yaml          |  4 ++--
 10 files changed, 24 insertions(+), 25 deletions(-)
 rename pt-discord/src/main/kotlin/io/github/hogwartsschoolofmagic/{LeoBotApp.kt => ProtegoTotalumBotApp.kt} (90%)

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index ca6c268..d12c565 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -18,9 +18,10 @@ categories:
   - title: '🪲 Исправления ошибок'
     label: '🪲 type: bug'
   - title: '🧰 Обслуживание'
-    label:
-      - '🧰 type: maintenance'
-      - '🧰 type: refactoring'
+    labels: [
+      '🧰 type: maintenance',
+      '🧰 type: refactoring'
+    ]
   - title: '📖 Документация'
     label: '📖 type: documentation'
   - title: '📝 Другие изменения'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a9950ad..8875ba6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,6 +2,9 @@ name: CI
 
 on:
   workflow_dispatch:
+  push:
+    branches:
+      - master
   pull_request:
     types: [ opened, synchronize, reopened ]
 
diff --git a/.github/workflows/release_draft.yml b/.github/workflows/release_draft.yml
index 45d71dc..e7a09de 100644
--- a/.github/workflows/release_draft.yml
+++ b/.github/workflows/release_draft.yml
@@ -2,13 +2,6 @@ name: Release Draft
 
 on:
   workflow_dispatch:
-  #push:
-  #  branches:
-  #    - master
-  #pull_request:
-  #  types: [ opened, reopened, synchronize ]
-  #pull_request_target:
-  #  types: [ opened, reopened, synchronize ]
 
 jobs:
   update_release_draft:
diff --git a/.gitignore b/.gitignore
index 7c7b760..1592478 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@
 .idea/sonarlint.xml
 .idea/vcs.xml
 .idea/git_toolbox_prj.xml
+.idea/uiDesigner.xml
 
 ### Gradle ###
 **/.gradle/
diff --git a/.idea/runConfigurations/ProtegoTotalumBotApp.xml b/.idea/runConfigurations/ProtegoTotalumBotApp.xml
index df50123..955d87c 100644
--- a/.idea/runConfigurations/ProtegoTotalumBotApp.xml
+++ b/.idea/runConfigurations/ProtegoTotalumBotApp.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="ProtegoTotalumBotApp" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
     <module name="ProtegoTotalumBot.pt-discord.main" />
-    <option name="SPRING_BOOT_MAIN_CLASS" value="io.github.hogwartsschoolofmagic.LeoBotApp" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="io.github.hogwartsschoolofmagic.ProtegoTotalumBotApp" />
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/docker/postgres/Dockerfile b/docker/postgres/Dockerfile
index 14db0e1..6f92e56 100644
--- a/docker/postgres/Dockerfile
+++ b/docker/postgres/Dockerfile
@@ -1,4 +1,5 @@
-FROM postgres
+FROM postgres:16-alpine
+USER 65534
 RUN localedef -i ru_RU -c -f UTF-8 -A /usr/share/locale/locale.alias ru_RU.UTF-8
 ENV LANG ru_RU.utf8
 
diff --git a/pt-database/src/main/resources/database.yml b/pt-database/src/main/resources/database.yml
index 1503e43..a567a5d 100644
--- a/pt-database/src/main/resources/database.yml
+++ b/pt-database/src/main/resources/database.yml
@@ -1,17 +1,17 @@
 spring:
   # Для добавления схемы для подключения к БД добавить в конец 'spring.r2dbc/liquibase.url':
-  # '?currentSchema=${LEO_DB_SCHEMA_NAME:leo_bot_schema}'
+  # '?currentSchema=${PT_DB_SCHEMA_NAME:protego_totalum}'
   r2dbc:
-    url: r2dbc:${LEO_DB_TYPE:postgresql}://${LEO_DB_HOST:localhost}:${LEO_DB_PORT:5123}/${LEO_DB_NAME:leo_db}
-    username: ${LEO_DB_LOGIN:leo_login}
-    password: ${LEO_DB_PASSWORD:leo_password}
+    url: r2dbc:${PT_DB_TYPE:postgresql}://${PT_DB_HOST:localhost}:${PT_DB_PORT:5123}/${PT_DB_NAME:protego_totalum}
+    username: ${PT_DB_LOGIN:protego_totalum}
+    password: ${PT_DB_PASSWORD:protego_totalum}
   liquibase:
-    url: jdbc:${LEO_DB_TYPE:postgresql}://${LEO_DB_HOST:localhost}:${LEO_DB_PORT:5123}/${LEO_DB_NAME:leo_db}
-    user: ${LEO_DB_LOGIN:leo_login}
-    password: ${LEO_DB_PASSWORD:leo_password}
+    url: jdbc:${PT_DB_TYPE:postgresql}://${PT_DB_HOST:localhost}:${PT_DB_PORT:5123}/${PT_DB_NAME:protego_totalum}
+    user: ${PT_DB_LOGIN:protego_totalum}
+    password: ${PT_DB_PASSWORD:protego_totalum}
 
 logging:
   level:
     org:
       springframework:
-        r2dbc: ${LEO_R2DBC_LOGGING_LEVEL:DEBUG}
\ No newline at end of file
+        r2dbc: ${PT_R2DBC_LOGGING_LEVEL:DEBUG}
\ No newline at end of file
diff --git a/pt-discord/src/main/kotlin/io/github/hogwartsschoolofmagic/LeoBotApp.kt b/pt-discord/src/main/kotlin/io/github/hogwartsschoolofmagic/ProtegoTotalumBotApp.kt
similarity index 90%
rename from pt-discord/src/main/kotlin/io/github/hogwartsschoolofmagic/LeoBotApp.kt
rename to pt-discord/src/main/kotlin/io/github/hogwartsschoolofmagic/ProtegoTotalumBotApp.kt
index af8f566..6f2bb29 100644
--- a/pt-discord/src/main/kotlin/io/github/hogwartsschoolofmagic/LeoBotApp.kt
+++ b/pt-discord/src/main/kotlin/io/github/hogwartsschoolofmagic/ProtegoTotalumBotApp.kt
@@ -8,10 +8,10 @@ import org.springframework.boot.runApplication
  * Клас для запуска Discord бота.
  */
 @SpringBootApplication
-class LeoBotApp
+class ProtegoTotalumBotApp
 
 fun main() {
-    runApplication<LeoBotApp> {
+    runApplication<ProtegoTotalumBotApp> {
         // Исправление ошибки "NativePRNGNonBlocking is not found, fallback to SHA1PRNG".
         System.setProperty("io.ktor.random.secure.random.provider", "DRBG")
 
diff --git a/pt-discord/src/main/resources/application.yml b/pt-discord/src/main/resources/application.yml
index 1e66437..e134f2a 100644
--- a/pt-discord/src/main/resources/application.yml
+++ b/pt-discord/src/main/resources/application.yml
@@ -1,2 +1,2 @@
 server:
-  port: ${LEO_SERVER_PORT:2303}
\ No newline at end of file
+  port: ${PT_SERVER_PORT:2303}
\ No newline at end of file
diff --git a/pt-discord/src/main/resources/db/changelog/2023.1/db.2023.1-create_tables.yaml b/pt-discord/src/main/resources/db/changelog/2023.1/db.2023.1-create_tables.yaml
index b3b612b..49e258e 100644
--- a/pt-discord/src/main/resources/db/changelog/2023.1/db.2023.1-create_tables.yaml
+++ b/pt-discord/src/main/resources/db/changelog/2023.1/db.2023.1-create_tables.yaml
@@ -36,7 +36,7 @@ databaseChangeLog:
                     nullable: false
                   defaultValueBoolean: false
                   remarks: Флаг того, что бот присутствует/не присутствует на сервере
-            remarks: Информация о серверах, где присутствует 'Leo Bot'
+            remarks: Информация о серверах, где присутствует бот 'Protego Totalum'
             tableName: bot_servers
         - createTable:
             columns:
@@ -79,7 +79,7 @@ databaseChangeLog:
                   name: description
                   type: text
                   remarks: Описание команды
-            remarks: Информация о командах серверов, где присутствует 'Leo Bot'
+            remarks: Информация о командах серверов, где присутствует бот 'Protego Totalum'
             tableName: bot_commands
         - createIndex:
             columns: