kozabrada123/chorus
kozabrada123
/
chorus
mirror of https://github.com/polyphony-chat/chorus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add `Composite<T>` bound to automatically call `watch_whole()` on caller object.

This commit is contained in:
bitfl0wer 2023-08-15 20:19:16 +02:00
parent 32fd918a43
commit bdeaa476e2
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gateway.rs
View File

@ -1,6 +1,6 @@
use crate::errors::GatewayError; use crate::errors::GatewayError;
use crate::gateway::events::Events; use crate::gateway::events::Events;
use crate::types::{self, Channel, ChannelUpdate, Snowflake}; use crate::types::{self, Channel, ChannelUpdate, Composite, Snowflake};
use crate::types::{UpdateMessage, WebSocketEvent}; use crate::types::{UpdateMessage, WebSocketEvent};
use async_trait::async_trait; use async_trait::async_trait;
use std::any::Any; use std::any::Any;
@ -196,12 +196,13 @@ impl GatewayHandle {
.unwrap(); .unwrap();
} }
pub async fn observe<T: Updateable + Clone>( pub async fn observe<T: Updateable + Clone + Composite<T>>(
&self, &self,
object: Arc<RwLock<T>>, object: Arc<RwLock<T>>,
) -> watch::Receiver<Arc<RwLock<T>>> { ) -> watch::Receiver<Arc<RwLock<T>>> {
let mut store = self.store.lock().await; let mut store = self.store.lock().await;
if let Some(channel) = store.get(&object.clone().read().unwrap().id()) { let id = object.read().unwrap().id();
if let Some(channel) = store.get(&id) {
let (_, rx) = channel let (_, rx) = channel
.downcast_ref::<( .downcast_ref::<(
watch::Sender<Arc<RwLock<T>>>, watch::Sender<Arc<RwLock<T>>>,
@ -216,18 +217,20 @@ impl GatewayHandle {
rx.clone() rx.clone()
} else { } else {
let id = object.read().unwrap().id(); let id = object.read().unwrap().id();
let channel = watch::channel(object); let object = object.read().unwrap().clone();
let object = object.clone().watch_whole(self).await;
let channel = watch::channel(Arc::new(RwLock::new(object)));
let receiver = channel.1.clone(); let receiver = channel.1.clone();
store.insert(id, Box::new(channel)); store.insert(id, Box::new(channel));
receiver receiver
} }
} }
pub async fn observe_and_get<T: Updateable + Clone>( pub async fn observe_and_get<T: Updateable + Clone + Composite<T>>(
&self, &self,
object: Arc<RwLock<T>>, object: Arc<RwLock<T>>,
) -> Arc<RwLock<T>> { ) -> Arc<RwLock<T>> {
let channel = self.observe(object).await; let channel = self.observe(object.clone()).await;
let object = channel.borrow().clone(); let object = channel.borrow().clone();
object object
} }