diff --git a/src/implement/message.rs b/src/implement/message.rs index 04a47bc..afc3e3e 100644 --- a/src/implement/message.rs +++ b/src/implement/message.rs @@ -1,7 +1,7 @@ use async_trait::async_trait; use regex::Regex; use serenity::{model::prelude::Message, prelude::Context}; -use songbird::input::cached::Compressed; +use songbird::tracks::Track; use crate::{ data::{DatabaseClientData, TTSClientData}, @@ -88,7 +88,7 @@ impl TTSMessage for Message { res } - async fn synthesize(&self, instance: &mut TTSInstance, ctx: &Context) -> Vec { + async fn synthesize(&self, instance: &mut TTSInstance, ctx: &Context) -> Vec { let text = self.parse(instance, ctx).await; let data_read = ctx.data.read().await; @@ -110,8 +110,8 @@ impl TTSMessage for Message { .get::() .expect("Cannot get GCP TTSClientStorage"); - let audio = match config.tts_type.unwrap_or(TTSType::GCP) { - TTSType::GCP => tts + match config.tts_type.unwrap_or(TTSType::GCP) { + TTSType::GCP => vec![tts .synthesize_gcp(SynthesizeRequest { input: SynthesisInput { text: None, @@ -125,17 +125,17 @@ impl TTSMessage for Message { }, }) .await - .unwrap(), + .unwrap() + .into()], - TTSType::VOICEVOX => tts + TTSType::VOICEVOX => vec![tts .synthesize_voicevox( &text.replace("", "、"), config.voicevox_speaker.unwrap_or(1), ) .await - .unwrap(), - }; - - vec![audio] + .unwrap() + .into()], + } } } diff --git a/src/tts/message.rs b/src/tts/message.rs index ef62f5b..bd3f815 100644 --- a/src/tts/message.rs +++ b/src/tts/message.rs @@ -1,6 +1,6 @@ use async_trait::async_trait; use serenity::prelude::Context; -use songbird::input::cached::Compressed; +use songbird::tracks::Track; use crate::{data::TTSClientData, tts::instance::TTSInstance}; @@ -26,7 +26,7 @@ pub trait TTSMessage { /// ```rust /// let audio = message.synthesize(instance, ctx).await; /// ``` - async fn synthesize(&self, instance: &mut TTSInstance, ctx: &Context) -> Vec; + async fn synthesize(&self, instance: &mut TTSInstance, ctx: &Context) -> Vec; } #[derive(Debug, Clone)] @@ -44,7 +44,7 @@ impl TTSMessage for AnnounceMessage { ) } - async fn synthesize(&self, instance: &mut TTSInstance, ctx: &Context) -> Vec { + async fn synthesize(&self, instance: &mut TTSInstance, ctx: &Context) -> Vec { let text = self.parse(instance, ctx).await; let data_read = ctx.data.read().await; let tts = data_read @@ -71,6 +71,6 @@ impl TTSMessage for AnnounceMessage { .await .unwrap(); - vec![audio] + vec![audio.into()] } }