chore: rename data managers to just managers
This commit is contained in:
22
src/call.rs
22
src/call.rs
@@ -1,7 +1,7 @@
|
||||
use crate::{
|
||||
OneToManyUniqueBTreeMap, UserDataManager,
|
||||
OneToManyUniqueBTreeMap, UserManager,
|
||||
option_ext::OptionExt as _,
|
||||
recording_data::{Clip, Recording, RecordingData, RecordingDataManager},
|
||||
recording_data::{Clip, Recording, RecordingData, RecordingManager},
|
||||
user_capnp::user::Consent,
|
||||
user_data::RECORD_IF_CONSENT_UNSPECIFIED,
|
||||
};
|
||||
@@ -26,7 +26,7 @@ struct Handler {
|
||||
start_instant: Instant,
|
||||
start_utc: UtcDateTime,
|
||||
|
||||
recording_data_manager: RecordingDataManager,
|
||||
recording_manager: RecordingManager,
|
||||
|
||||
guild_id: Id<GuildMarker>,
|
||||
channel_id: Id<ChannelMarker>,
|
||||
@@ -36,7 +36,7 @@ struct Handler {
|
||||
audio_channels: u16,
|
||||
audio_sample_rate: u32,
|
||||
|
||||
user_data_manager: UserDataManager,
|
||||
user_manager: UserManager,
|
||||
}
|
||||
|
||||
#[async_trait]
|
||||
@@ -73,7 +73,7 @@ impl EventHandler for Handler {
|
||||
if let Some(pcm) = &voice_data.decoded_voice {
|
||||
let may_record = user_id
|
||||
.map_async(|user_id| {
|
||||
self.user_data_manager
|
||||
self.user_manager
|
||||
.with(user_id, |user_data| {
|
||||
user_data.get_voice_recording_consent().unwrap()
|
||||
})
|
||||
@@ -133,7 +133,7 @@ impl EventHandler for Handler {
|
||||
|
||||
tracing::info!("going to write the audio shortly");
|
||||
|
||||
let recording_data_manager = self.recording_data_manager.clone();
|
||||
let recording_manager = self.recording_manager.clone();
|
||||
let samples = pcm.clone();
|
||||
|
||||
let recording_data = RecordingData {
|
||||
@@ -143,7 +143,7 @@ impl EventHandler for Handler {
|
||||
};
|
||||
|
||||
tokio::spawn(async move {
|
||||
recording_data_manager
|
||||
recording_manager
|
||||
.write(&recording, recording_data)
|
||||
.await
|
||||
.expect("TODO");
|
||||
@@ -175,9 +175,9 @@ pub async fn join_and_record(
|
||||
audio_channels: Channels,
|
||||
audio_sample_rate: SampleRate,
|
||||
guild_id: Id<GuildMarker>,
|
||||
recording_data_manager: RecordingDataManager,
|
||||
recording_manager: RecordingManager,
|
||||
songbird: &Songbird,
|
||||
user_data_manager: UserDataManager,
|
||||
user_manager: UserManager,
|
||||
voice_channel_id: Id<ChannelMarker>,
|
||||
) -> Result<(), songbird::error::JoinError> {
|
||||
let start_instant = Instant::now();
|
||||
@@ -190,7 +190,7 @@ pub async fn join_and_record(
|
||||
let handler = Handler {
|
||||
start_instant,
|
||||
start_utc,
|
||||
recording_data_manager,
|
||||
recording_manager,
|
||||
guild_id,
|
||||
channel_id: voice_channel_id,
|
||||
known_ssrcs: Default::default(),
|
||||
@@ -198,7 +198,7 @@ pub async fn join_and_record(
|
||||
audio_channels,
|
||||
audio_sample_rate,
|
||||
|
||||
user_data_manager,
|
||||
user_manager,
|
||||
};
|
||||
|
||||
let call = songbird.get_or_insert(guild_id);
|
||||
|
||||
Reference in New Issue
Block a user