diff --git a/.circleci/config.yml b/.circleci/config.yml
index 61c86a0..61341e8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,12 +4,7 @@ jobs:
build:
docker:
# specify the version you desire here
- - image: circleci/openjdk:8u171-jdk
-
- # Specify service dependencies here if necessary
- # CircleCI maintains a library of pre-built images
- # documented at https://circleci.com/docs/2.0/circleci-images/
- # - image: circleci/postgres:9.4
+ - image: cimg/openjdk:20.0.1
working_directory: ~/repo
@@ -19,6 +14,7 @@ jobs:
steps:
- checkout
+ - run: java --version
# Download and cache dependencies
- restore_cache:
diff --git a/.github/ISSUE_TEMPLATE/---.md b/.github/ISSUE_TEMPLATE/---.md
index cabf517..c4691cc 100644
--- a/.github/ISSUE_TEMPLATE/---.md
+++ b/.github/ISSUE_TEMPLATE/---.md
@@ -1,5 +1,7 @@
---
-name: その他 about: その他のIssueを立てたい場合はこちら title: ''
+name: その他
+about: その他のIssueを立てたい場合はこちら
+title: ''
labels: ''
assignees: ''
diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index 84cca76..d67b1f4 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -1,5 +1,7 @@
---
-name: バグレポート about: バグや予期しない動作を報告する title: "[バグレポート] タイトルを入力"
+name: バグレポート
+about: バグや予期しない動作を報告する
+title: "[バグレポート] タイトルを入力"
labels: ''
assignees: ''
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index ed44b4e..b9149dd 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,5 +1,7 @@
---
-name: 機能リクエスト about: このプロジェクトにアイデアを提案 title: "[機能要求]タイトルを入力"
+name: 機能リクエスト
+about: このプロジェクトにアイデアを提案
+title: "[機能要求]タイトルを入力"
labels: ''
assignees: ''
diff --git a/.github/workflows/code_quality.yml b/.github/workflows/code_quality.yml
index 4512633..22c2852 100644
--- a/.github/workflows/code_quality.yml
+++ b/.github/workflows/code_quality.yml
@@ -4,9 +4,7 @@ on:
pull_request:
push:
branches:
- - master
- - develop
- - 'releases/*'
+ - '*'
jobs:
qodana:
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index ccec7b6..1bec35e 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,13 +3,6 @@
-
-
-
-
-
-
-
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index a55e7a1..6e6eec1 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +1,6 @@
+
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 0f63fb0..d0b40cc 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -6,7 +6,6 @@
-
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index b2bb500..4ffb1c8 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -1,13 +1,16 @@
-
+
sqlite.xerial
true
org.sqlite.JDBC
- jdbc:sqlite:C:\Users\kosug\IdeaProjects\TextToSpeak\src\main\resources\UserData.sqlite
+ jdbc:sqlite:C:\Users\kosug\IdeaProjects\TextToSpeakBot\src\main\resources\UserData.sqlite
$ProjectFileDir$
+
+ file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.39.2/sqlite-jdbc-3.39.2.jar
+
file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/Xerial SQLiteJDBC/3.34.0/sqlite-jdbc-3.34.0.jar
diff --git a/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89.xml b/.idea/dataSources/648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml
similarity index 54%
rename from .idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89.xml
rename to .idea/dataSources/648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml
index 88350eb..c4f4622 100644
--- a/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89.xml
+++ b/.idea/dataSources/648c6ef7-2bba-4e14-b21f-f6619a5657a5.xml
@@ -1,827 +1,825 @@
-
- 3.40.1
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
1
+ 1
-
+
1
+ 1
-
+
1
+ 1
-
+
1
+ 1
-
+
1
+ 1
-
+
1
+ 1
-
+
1
+ 1
-
+
1
+ 1
-
+
1
+ 1
-
+
1
-
-
-
- window
-
-
1
-
+
1
+ 1
-
+
1
+ 1
-
-
+
1
1
-
-
-
+
1
1
-
+
1
+ 1
-
+
1
+ 1
-
-
-
- window
-
-
- window
-
-
-
-
-
+
1
1
-
+
1
1
-
+
1
+ 1
-
- window
+
+ 1
-
-
- 1
+
+ 1
-
- window
+
+ 1
-
- 1
+
+ 1
-
- 1
+
1
-
-
-
-
-
- 1
+
+ window
-
+
window
-
+
+
+
+
1
-
- 1
+
+ window
-
+
1
-
+
+ window
+
+
1
-
+
+
1
-
+
1
-
+
1
- 1
-
+
1
-
+
+
1
- 1
-
+
+
1
- window
-
+
1
+
+
window
-
+
1
- 1
-
+
1
- 1
-
- 1
+
+ window
-
- 1
+
+ window
-
+
1
- 1
-
+
1
- 1
-
+
1
- 1
-
+
1
-
+
1
-
+
1
- 1
-
-
- window
-
+
window
-
-
- window
-
-
- window
-
-
- window
+
+ 1
-
-
+
+
1
-
+
1
-
+
1
-
+
+ window
+
+
1
-
+
1
-
-
+
1
-
+
1
-
+
1
-
+
+
1
+ window
-
- aggregate
+
+ window
-
+
1
-
-
-
-
+
1
- 1
-
-
window
-
- aggregate
+
+ 1
-
+
1
- 1
-
- window
+
+ 1
-
+
1
-
- aggregate
+
+ 1
-
- window
+
+
+ 1
-
+
window
-
- 1
-
-
-
-
-
-
-
+
window
-
+
1
-
+
1
-
+
1
-
+
1
- 1
-
-
+
1
-
+
+
1
-
-
-
- window
+
+ 1
-
- 1
+
+ 1
-
+
1
-
-
-
-
+
1
-
+
window
-
- 1
-
-
-
-
+
1
-
+
+
+
+
1
-
+
1
-
+
1
-
- 1
+
+ 1
-
-
-
+
1
-
-
-
+
1
-
-
- aggregate
+
+
+ window
-
-
+
+ 1
+
+
1
- 1
-
+
1
-
+
+ window
+
+
1
-
+
1
-
+
+
+
window
-
+
1
-
+
1
-
+
1
- 1
-
+
window
-
-
- 1
+
+ window
+
+
+ window
-
+
1
-
+
1
-
+
1
-
+
+ window
+
+
1
- 1
-
+
1
-
+
1
-
+
aggregate
-
+
aggregate
-
- 1
+
+ aggregate
+
+
+
+ aggregate
+
+
+
+
+
+
+
+ aggregate
+
+
+
+
+
+
+
+
+
+
+ aggregate
+
+
+
+
+
+
+
+
+
+
1
R
-
- 1
+
+ R
-
- 2
+
+ R
-
+
R
-
- 1
+
+ R
-
- 2
+
+ R
-
+
R
-
- 1
+
+ R
-
+
R
-
- 1
+
+ R
-
+
R
-
- 1
+
+ R
-
+
R
-
- 1
+
+ R
-
+
R
-
- 1
+
+ R
-
+
R
-
- 1
+
+ R
-
+
R
-
- 1
+
+ R
-
- 2
+
+ R
-
+
R
-
- 1
+
+ R
-
+
R
-
+
+ R
+
+
1
-
+
2
-
+
+ 3
+
+
R
-
+
1
-
- R
+
+ 2
+
+
+ 3
-
+
R
-
+
1
-
+
+ 2
+
+
R
-
+
1
-
- R
+
+ 2
-
- R
+
+ 3
-
+
R
-
+
1
-
+
2
-
+
R
-
+
1
-
+
2
-
- 3
-
-
- R
-
-
+
R
-
+
1
-
+
+ 2
+
+
R
-
+
1
-
+
+ 2
+
+
R
-
+
1
-
+
R
-
+
1
-
+
+ 2
+
+
R
-
+
1
-
+
R
-
- R
+
+ 1
-
+
R
-
- R
+
+ 1
-
+
R
-
- R
+
+ 1
+
+
+ 2
-
+
R
-
+
1
-
+
+ 2
+
+
R
-
+
R
-
+
1
-
+
2
-
+
R
-
+
1
-
+
R
-
+
1
-
+
+ 2
+
+
R
-
+
1
-
+
R
-
+
+ 1
+
+
R
-
+
1
-
+
R
-
+
1
-
+
2
-
+
R
-
+
1
-
+
R
-
+
R
-
+
1
-
- 2
-
-
+
R
-
+
1
-
- 2
-
-
+
R
-
+
1
-
+
R
-
+
+ 1
+
+
R
-
+
1
-
+
2
-
+
R
-
+
1
-
+
2
-
- 3
-
-
+
R
-
+
1
-
+
2
-
+
R
-
+
1
-
+
R
-
+
R
-
+
1
-
+
2
-
+
R
-
- R
-
-
+
1
-
+
R
-
+
1
-
- 2
-
-
- R
-
-
- R
-
-
+
R
-
+
1
-
- 2
-
-
+
R
-
+
1
-
- R
-
-
- R
-
-
- R
+
+ 2
+ 3
+
+
R
-
+
1
-
- 2
-
- R
+ 2
- 1
+ 3
R
-
- R
+
+ 1
- 1
+ R
- 2
+ 1
R
@@ -829,14 +827,14 @@
1
-
- 2
+
+ R
-
- 3
+
+ 1
- R
+ 2
R
@@ -850,560 +848,560 @@
1
-
- 2
+
+ R
+ 1
+
+
R
-
+
1
-
+
2
-
- 3
-
-
+
R
-
+
1
-
+
2
-
+
R
-
+
1
-
+
R
-
+
1
-
- 2
+
+ R
-
- 3
+
+ 1
-
+
R
-
+
1
-
+
2
-
- R
-
-
- 1
+
+ 3
-
+
R
-
+
1
-
+
R
-
+
1
-
- 2
-
-
+
R
-
- 1
-
-
- 2
+
+ R
-
+
R
-
+
1
-
+