Merge pull request #189 from kounoike:feature/interactive-auto-search

自動検索UIの大改造と自動検索削除機能実装
kounoike · May 6, 2023 · 8409365 · 8409365
2 parents ef626d4 + 13a72ee
commit 8409365
Show file tree

Hide file tree

Showing 34 changed files with 1,127 additions and 314 deletions.
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
@@ -101,7 +101,7 @@ services:
       TZ: Asia/Tokyo
       TS_HOSTNAME: tv-dev
   meilisearch:
-    image: getmeili/meilisearch:prototype-japanese-1
+    image: getmeili/meilisearch:prototype-japanese-2
     volumes:
       - /qnap/video/develop/meili:/melili_data:rw
     ports:

diff --git a/README.md b/README.md
@@ -59,6 +59,7 @@ WebへのアクセスのためにはTailscaleにサインアップして、ク
     - Read Messages/View Channels
     - Send Messages
     - Send Messages in Threads
+    - Manage Threads
     - Read Message History
     - Add Reactions
 14. 一番下の GENERATED URL の Copy ボタンを押して URL をコピーします

diff --git a/cmd/bot.go b/cmd/bot.go
@@ -235,7 +235,7 @@ func (c *BotCommand) Execute(ctx context.Context, f *flag.FlagSet, args ...inter
 		return subcommands.ExitFailure
 	}
 
-	usecase, err := dtv.NewDTVUsecase(config, asynqClient, asynqInspector, discordClient, mirakcClient, scheduler, queries, discordLogger, config.Match.KanaMatch, config.Match.FuzzyMatch, gptClient, meiliClient)
+	usecase, err := dtv.NewDTVUsecase(config, asynqClient, asynqInspector, discordClient, mirakcClient, scheduler, queries, discordLogger, gptClient, meiliClient)
 	if err != nil {
 		logger.Error("can't create DTVUsecase", zap.Error(err))
 		return subcommands.ExitFailure
@@ -246,7 +246,7 @@ func (c *BotCommand) Execute(ctx context.Context, f *flag.FlagSet, args ...inter
 	logMessage := fmt.Sprintf("起動しました。\ndtv-discord-go version:%s\nmirakc version:%s\n", "v"+c.version, mirakcVersion.Current)
 	discordClient.SendMessage(discord.InformationCategory, discord.LogChannel, logMessage)
 
-	discordHandler := discord_handler.NewDiscordHandler(usecase, discordClient.Session(), logger)
+	discordHandler := discord_handler.NewDiscordHandler(usecase, discordClient, discordClient.Session(), logger)
 
 	err = usecase.InitializeServiceChannels(ctx)
 	if err != nil {

diff --git a/config/config.go b/config/config.go
@@ -45,10 +45,6 @@ type Config struct {
 		ScriptPath string `required:"true" env:"TRANSCRIPTION_SCRIPT_PATH"`
 		ModelSize  string `required:"true" env:"TRANSCRIPTION_MODEL_SIZE"`
 	}
-	Match struct {
-		KanaMatch  bool `default:"true" env:"KANA_MATCH"`
-		FuzzyMatch bool `default:"true" env:"FUZZY_MATCH"`
-	}
 	OpenAI struct {
 		Enabled bool   `default:"false" env:"PARSE_TITLE_WITH_GPT"`
 		Token   string `default:"" env:"OPENAI_TOKEN"`

diff --git a/db/auto_search.sql.go b/db/auto_search.sql.go
diff --git a/db/auto_search_found_message.sql.go b/db/auto_search_found_message.sql.go
diff --git a/db/auto_search_message.sql.go b/db/auto_search_message.sql.go
diff --git a/db/component_version.sql.go b/db/component_version.sql.go
diff --git a/db/db.go b/db/db.go
diff --git a/db/discord_server.sql.go b/db/discord_server.sql.go
diff --git a/db/encode_task.sql.go b/db/encode_task.sql.go
diff --git a/db/migrations/20230504225800-create-auto_search_found_message.sql b/db/migrations/20230504225800-create-auto_search_found_message.sql
@@ -0,0 +1,10 @@
+CREATE TABLE IF NOT EXISTS `auto_search_found_message` (
+    `id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
+    `thread_id` TEXT NOT NULL,
+    `program_id` BIGINT UNSIGNED NOT NULL,
+    `message_id` TEXT NOT NULL,
+    `created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    `updated_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    PRIMARY KEY (`id`),
+    INDEX `auto_search_found_message_message_id_idx` (`message_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;