reya/coop
1
0
Fork 0
Code Issues Pull Requests Releases Activity

wip: refactor

Browse Source
This commit is contained in:
reya
2024-12-15 07:53:53 +07:00
parent f82eaa4ac3
commit 2b9c88c5b7
5 changed files with 88 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
crates/app/src/main.rs
View File

@@ -4,14 +4,18 @@ use dirs::config_dir;
use gpui::*;
use nostr_sdk::prelude::*;
use std::{
collections::HashSet,
fs,
str::FromStr,
sync::{Arc, OnceLock},
time::Duration,
};
use tokio::sync::mpsc;
use tokio::{
sync::{broadcast, mpsc},
time::sleep,
};
use constants::{ALL_MESSAGES_SUB_ID, APP_NAME, FAKE_SIG, NEW_MESSAGE_SUB_ID};
use constants::{ALL_MESSAGES_SUB_ID, APP_NAME, FAKE_SIG, METADATA_DELAY, NEW_MESSAGE_SUB_ID};
use states::{account::AccountRegistry, chat::ChatRegistry, signal::SignalRegistry};
use views::app::AppView;
@@ -77,8 +81,12 @@ async fn main() {
let (new_chat_tx, mut new_chat_rx) = mpsc::channel::<Event>(1000); // TODO: adjust?
// Channel for all chats
// When receive EOSE from relay(s). Reload UI
let (all_chats_tx, mut all_chats_rx) = mpsc::channel::<i32>(1);
// Channel for metadata request queue
let (queue_tx, mut queue_rx) = broadcast::channel::<PublicKey>(100);
tokio::spawn(async move {
let sig = Signature::from_str(FAKE_SIG).unwrap();
let all_messages_sub_id = SubscriptionId::new(ALL_MESSAGES_SUB_ID);
@@ -115,9 +123,11 @@ async fn main() {
// Save rumor to database to further query
_ = client.database().save_event(&ev).await;
// Send event to channel
// Send event back to channel
if subscription_id == new_message_sub_id {
_ = new_chat_tx.send(ev).await;
if let Err(e) = new_chat_tx.send(ev).await {
println!("Error: {}", e)
}
}
}
}
@@ -133,13 +143,47 @@ async fn main() {
}
});
tokio::spawn(async move {
let mut queue: HashSet<PublicKey> = HashSet::new();
while let Ok(public_key) = queue_rx.recv().await {
queue.insert(public_key);
// Wait for METADATA_DELAY
sleep(Duration::from_millis(METADATA_DELAY)).await;
if !queue.is_empty() {
let authors: Vec<PublicKey> = queue.iter().copied().collect();
let total = authors.len();
let filter = Filter::new()
.authors(authors)
.kind(Kind::Metadata)
.limit(total);
let opts = SubscribeAutoCloseOptions::default()
.filter(FilterOptions::WaitDurationAfterEOSE(Duration::from_secs(2)));
// Clear queue
queue.clear();
if let Err(e) = client.subscribe(vec![filter], Some(opts)).await {
println!("Error: {}", e);
}
}
}
});
App::new()
.with_assets(Assets)
.with_http_client(Arc::new(reqwest_client::ReqwestClient::new()))
.run(move |cx| {
// Account state
AccountRegistry::set_global(cx);
// Chat state
ChatRegistry::set_global(cx);
SignalRegistry::set_global(cx);
// Hold all metadata requests and merged it
SignalRegistry::set_global(cx, Arc::new(queue_tx));
// Initialize components
coop_ui::init(cx);

16
crates/app/src/states/signal.rs
View File

@@ -1,15 +1,18 @@
use gpui::*;
use nostr_sdk::prelude::*;
use std::sync::Arc;
use tokio::sync::broadcast::Sender;
pub struct SignalRegistry {
public_keys: Vec<PublicKey>,
pub queue: Arc<Sender<PublicKey>>,
}
impl Global for SignalRegistry {}
impl SignalRegistry {
pub fn set_global(cx: &mut AppContext) {
cx.set_global(Self::new());
pub fn set_global(cx: &mut AppContext, queue: Arc<Sender<PublicKey>>) {
cx.set_global(Self::new(queue));
}
pub fn contains(&self, public_key: PublicKey) -> bool {
@@ -20,9 +23,16 @@ impl SignalRegistry {
self.public_keys.push(public_key);
}
fn new() -> Self {
pub fn add_to_queue(&mut self, public_key: PublicKey) {
if let Err(e) = self.queue.send(public_key) {
println!("Dropped: {}", e)
}
}
fn new(queue: Arc<Sender<PublicKey>>) -> Self {
Self {
public_keys: Vec::new(),
queue,
}
}
}

4
crates/app/src/views/dock/inbox/chat.rs
View File

@@ -170,6 +170,10 @@ impl Chat {
})
.detach();
cx.update_global::<SignalRegistry, _>(|state, _cx| {
state.add_to_queue(public_key);
});
cx.observe_global::<SignalRegistry>(|chat, cx| {
chat.load_profile(cx);
})

22
crates/app/src/views/dock/inbox/mod.rs
View File

@@ -1,6 +1,7 @@
use chat::Chat;
use coop_ui::{theme::ActiveTheme, v_flex, Collapsible, Icon, IconName, StyledExt};
use gpui::*;
use prelude::FluentBuilder;
use crate::states::chat::ChatRegistry;
@@ -10,6 +11,7 @@ pub mod chat;
pub struct Inbox {
label: SharedString,
chats: Model<Option<Vec<View<Chat>>>>,
is_loading: bool,
is_collapsed: bool,
}
@@ -17,19 +19,25 @@ impl Inbox {
pub fn new(cx: &mut ViewContext<'_, Self>) -> Self {
let chats = cx.new_model(|_| None);
// Reload UI if global state changes
cx.observe_global::<ChatRegistry>(|inbox, cx| {
inbox.add_chats(cx);
inbox.load(cx);
})
.detach();
Self {
chats,
label: "Inbox".into(),
is_loading: true,
is_collapsed: false,
}
}
fn add_chats(&self, cx: &mut ViewContext<Self>) {
fn load(&mut self, cx: &mut ViewContext<Self>) {
// Stop loading indicator;
self.set_loading(cx);
// Read global chat registry
let events = cx.global::<ChatRegistry>().get(cx);
if let Some(events) = events {
@@ -44,6 +52,11 @@ impl Inbox {
});
}
}
fn set_loading(&mut self, cx: &mut ViewContext<Self>) {
self.is_loading = false;
cx.notify();
}
}
impl Collapsible for Inbox {
@@ -63,6 +76,11 @@ impl Render for Inbox {
if let Some(chats) = self.chats.read(cx).as_ref() {
content = content.children(chats.clone())
} else {
match self.is_loading {
true => content = content.child("Loading..."),
false => content = content.child("Empty"),
}
}
v_flex()

4
crates/app/src/views/onboarding.rs
View File

@@ -49,8 +49,8 @@ impl Onboarding {
get_client().set_signer(keys).await;
});
// Update view
cx.update_global(|state: &mut AccountRegistry, cx| {
// Update globals state
cx.update_global::<AccountRegistry, _>(|state, cx| {
state.set_user(Some(public_key));
cx.notify();
});