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

chore: adapt latest changes from GPUI and nostr-sdk

Browse Source
This commit is contained in:
reya
2025-01-30 08:03:39 +07:00
parent 72a6d79bc5
commit 82f18fc478
19 changed files with 276 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,7 +61,81 @@ async fn main() {
// Handle notifications from relays
// Send notify back to GPUI
tokio::spawn(async move { handle_notifications(client, signal_tx, mta_tx).await });
tokio::spawn(async move {
let mut notifications = client.notifications();
let sig = Signature::from_str(FAKE_SIG).unwrap();
let new_message = SubscriptionId::new(NEW_MESSAGE_SUB_ID);
let all_messages = SubscriptionId::new(ALL_MESSAGES_SUB_ID);
while let Ok(notification) = notifications.recv().await {
if let RelayPoolNotification::Message { message, .. } = notification {
if let RelayMessage::Event {
event,
subscription_id,
} = message
{
match event.kind {
Kind::GiftWrap => {
match client.unwrap_gift_wrap(&event).await {
Ok(UnwrappedGift { mut rumor, sender }) => {
// Request metadata
if let Err(e) = mta_tx.send(sender).await {
warn!("Send error: {}", e)
};
// Compute event id if not exist
rumor.ensure_id();
if let Some(id) = rumor.id {
let ev = Event::new(
id,
rumor.pubkey,
rumor.created_at,
rumor.kind,
rumor.tags,
rumor.content,
sig,
);
// Save rumor to database to further query
if let Err(e) = client.database().save_event(&ev).await {
warn!("Save error: {}", e);
}
// Send event back to channel
if subscription_id == new_message {
if let Err(e) = signal_tx.send(Signal::Event(ev)).await
{
warn!("Send error: {}", e)
}
}
}
}
Err(e) => warn!("Unwrap error: {}", e),
}
}
Kind::ContactList => {
let public_keys: Vec<PublicKey> =
event.tags.public_keys().copied().collect();
for public_key in public_keys.into_iter() {
if let Err(e) = mta_tx.send(public_key).await {
warn!("Send error: {}", e)
};
}
}
_ => {}
}
} else if let RelayMessage::EndOfStoredEvents(subscription_id) = message {
if subscription_id == all_messages {
if let Err(e) = signal_tx.send(Signal::Eose).await {
warn!("Send error: {}", e)
};
}
}
}
}
});
// Handle metadata request
// Merge all requests into single subscription
@@ -187,85 +261,6 @@ async fn main() {
});
}
async fn handle_notifications(
client: &Client,
signal_tx: mpsc::Sender<Signal>,
mta_tx: mpsc::Sender<PublicKey>,
) {
let mut notifications = client.notifications();
let sig = Signature::from_str(FAKE_SIG).unwrap();
let new_message = SubscriptionId::new(NEW_MESSAGE_SUB_ID);
let all_messages = SubscriptionId::new(ALL_MESSAGES_SUB_ID);
while let Ok(notification) = notifications.recv().await {
if let RelayPoolNotification::Message { message, .. } = notification {
if let RelayMessage::Event {
event,
subscription_id,
} = message
{
match event.kind {
Kind::GiftWrap => {
match client.unwrap_gift_wrap(&event).await {
Ok(UnwrappedGift { mut rumor, sender }) => {
// Request metadata
if let Err(e) = mta_tx.send(sender).await {
warn!("Send error: {}", e)
};
// Compute event id if not exist
rumor.ensure_id();
if let Some(id) = rumor.id {
let ev = Event::new(
id,
rumor.pubkey,
rumor.created_at,
rumor.kind,
rumor.tags,
rumor.content,
sig,
);
// Save rumor to database to further query
if let Err(e) = client.database().save_event(&ev).await {
warn!("Save error: {}", e);
}
// Send event back to channel
if subscription_id == new_message {
if let Err(e) = signal_tx.send(Signal::Event(ev)).await {
warn!("Send error: {}", e)
}
}
}
}
Err(e) => warn!("Unwrap error: {}", e),
}
}
Kind::ContactList => {
let public_keys: Vec<PublicKey> =
event.tags.public_keys().copied().collect();
for public_key in public_keys.into_iter() {
if let Err(e) = mta_tx.send(public_key).await {
warn!("Send error: {}", e)
};
}
}
_ => {}
}
} else if let RelayMessage::EndOfStoredEvents(subscription_id) = message {
if subscription_id == all_messages {
if let Err(e) = signal_tx.send(Signal::Eose).await {
warn!("Send error: {}", e)
};
}
}
}
}
}
async fn handle_metadata(client: &'static Client, mut mta_rx: mpsc::Receiver<PublicKey>) {
let queue: Arc<Mutex<HashSet<PublicKey>>> = Arc::new(Mutex::new(HashSet::new()));
let queue_clone = Arc::clone(&queue);

6
crates/app/src/views/chat/mod.rs
View File

@@ -169,9 +169,11 @@ impl ChatPanel {
.pubkey(author);
// Get all DM events in database
let query = client.database().query(vec![recv, send]).await?;
let recv_events = client.database().query(recv).await?;
let send_events = client.database().query(send).await?;
let events = recv_events.merge(send_events);
Ok(query)
Ok(events)
}
})
.await;

2
crates/app/src/views/sidebar/compose.rs
View File

@@ -312,7 +312,7 @@ impl Render for Compose {
if let Some(contacts) = self.contacts.read(cx).clone() {
this.child(
uniform_list(
cx.model().clone(),
cx.entity().clone(),
"contacts",
contacts.len(),
move |this, range, window, cx| {

2
crates/app/src/views/sidebar/mod.rs
View File

@@ -42,7 +42,7 @@ impl Sidebar {
closeable: true,
zoomable: true,
focus_handle: cx.focus_handle(),
view_id: cx.model().entity_id(),
view_id: cx.entity().entity_id(),
inbox,
}
}