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

wip: refactor

Browse Source
This commit is contained in:
reya
2025-01-08 12:34:13 +07:00
parent fe24f84b02
commit 122ee4c8bb
13 changed files with 360 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
crates/app/src/views/sidebar/contact_list.rs
View File

@@ -1,6 +1,4 @@
use crate::{
constants::IMAGE_SERVICE, get_client, states::account::AccountRegistry, utils::show_npub,
};
use crate::{constants::IMAGE_SERVICE, get_client, utils::show_npub};
use gpui::{
div, img, impl_actions, list, px, Context, ElementId, FocusHandle, InteractiveElement,
IntoElement, ListAlignment, ListState, Model, ParentElement, Pixels, Render, RenderOnce,
@@ -24,12 +22,12 @@ impl_actions!(contacts, [SelectContact]);
struct ContactListItem {
id: ElementId,
public_key: PublicKey,
metadata: Option<Metadata>,
metadata: Metadata,
selected: bool,
}
impl ContactListItem {
pub fn new(public_key: PublicKey, metadata: Option<Metadata>) -> Self {
pub fn new(public_key: PublicKey, metadata: Metadata) -> Self {
let id = SharedString::from(public_key.to_hex()).into();
Self {
@@ -55,36 +53,6 @@ impl Selectable for ContactListItem {
impl RenderOnce for ContactListItem {
fn render(self, cx: &mut WindowContext) -> impl IntoElement {
let fallback = show_npub(self.public_key, 16);
let mut content = div().flex().items_center().gap_2().text_sm();
if let Some(metadata) = self.metadata {
content = content
.map(|this| {
if let Some(picture) = metadata.picture {
this.flex_shrink_0().child(
img(format!(
"{}/?url={}&w=72&h=72&fit=cover&mask=circle&n=-1",
IMAGE_SERVICE, picture
))
.size_6(),
)
} else {
this.flex_shrink_0()
.child(img("brand/avatar.png").size_6().rounded_full())
}
})
.map(|this| {
if let Some(display_name) = metadata.display_name {
this.flex_1().child(display_name)
} else {
this.flex_1().child(fallback)
}
})
} else {
content = content
.child(img("brand/avatar.png").size_6().rounded_full())
.child(fallback)
}
div()
.id(self.id)
@@ -95,7 +63,34 @@ impl RenderOnce for ContactListItem {
.flex()
.items_center()
.justify_between()
.child(content)
.child(
div()
.flex()
.items_center()
.gap_2()
.text_sm()
.map(|this| {
if let Some(picture) = self.metadata.picture {
this.flex_shrink_0().child(
img(format!(
"{}/?url={}&w=72&h=72&fit=cover&mask=circle&n=-1",
IMAGE_SERVICE, picture
))
.size_6(),
)
} else {
this.flex_shrink_0()
.child(img("brand/avatar.png").size_6().rounded_full())
}
})
.map(|this| {
if let Some(display_name) = self.metadata.display_name {
this.flex_1().child(display_name)
} else {
this.flex_1().child(fallback)
}
}),
)
.when(self.selected, |this| {
this.child(
Icon::new(IconName::CircleCheck)
@@ -141,20 +136,24 @@ impl ContactList {
cx.foreground_executor()
.spawn({
let client = get_client();
let current_user = cx.global::<AccountRegistry>().get();
async move {
if let Some(public_key) = current_user {
if let Ok(profiles) = async_cx
.background_executor()
.spawn(async move { client.database().contacts(public_key).await })
.await
{
_ = async_cx.update_model(&async_contacts, |model, cx| {
*model = profiles;
cx.notify();
});
}
let query: anyhow::Result<BTreeSet<Profile>, anyhow::Error> = async_cx
.background_executor()
.spawn(async move {
let signer = client.signer().await?;
let public_key = signer.get_public_key().await?;
let profiles = client.database().contacts(public_key).await?;
Ok(profiles)
})
.await;
if let Ok(profiles) = query {
_ = async_cx.update_model(&async_contacts, |model, cx| {
*model = profiles;
cx.notify();
});
}
}
})
@@ -166,9 +165,7 @@ impl ContactList {
count: profiles.len(),
items: profiles
.into_iter()
.map(|contact| {
ContactListItem::new(contact.public_key(), Some(contact.metadata()))
})
.map(|contact| ContactListItem::new(contact.public_key(), contact.metadata()))
.collect(),
};
@@ -194,7 +191,7 @@ impl ContactList {
}
}
pub fn selected(&self) -> Vec<PublicKey> {
pub fn _selected(&self) -> Vec<PublicKey> {
self.selected.clone().into_iter().collect()
}
@@ -210,7 +207,7 @@ impl ContactList {
let public_key = contact.public_key();
let metadata = contact.metadata();
ContactListItem::new(public_key, Some(metadata))
ContactListItem::new(contact.public_key(), metadata)
.selected(self.selected.contains(&public_key))
})
.collect(),
@@ -238,7 +235,7 @@ impl Render for ContactList {
.flex()
.flex_col()
.gap_1()
.child(div().font_semibold().child("Contacts"))
.child(div().font_semibold().text_sm().child("Contacts"))
.child(
div()
.p_1()

64
crates/app/src/views/sidebar/inbox.rs
View File

@@ -1,10 +1,11 @@
use crate::{
constants::IMAGE_SERVICE,
get_client,
states::chat::ChatRegistry,
states::chat::Room,
utils::get_room_id,
utils::{ago, show_npub},
states::{
app::AppRegistry,
chat::{ChatRegistry, Room},
},
utils::{ago, get_room_id, show_npub},
views::app::{AddPanel, PanelKind},
};
use gpui::prelude::FluentBuilder;
@@ -20,12 +21,21 @@ use ui::{skeleton::Skeleton, theme::ActiveTheme, v_flex, Collapsible, Icon, Icon
struct InboxListItem {
id: SharedString,
event: Event,
metadata: Option<Metadata>,
metadata: Model<Option<Metadata>>,
}
impl InboxListItem {
pub fn new(event: Event, metadata: Option<Metadata>, _cx: &mut ViewContext<'_, Self>) -> Self {
pub fn new(event: Event, metadata: Option<Metadata>, cx: &mut ViewContext<'_, Self>) -> Self {
let id = SharedString::from(get_room_id(&event.pubkey, &event.tags));
let metadata = cx.new_model(|_| metadata);
let refreshs = cx.global_mut::<AppRegistry>().refreshs();
if let Some(refreshs) = refreshs.upgrade() {
cx.observe(&refreshs, |this, _, cx| {
this.load_metadata(cx);
})
.detach();
}
Self {
id,
@@ -34,8 +44,35 @@ impl InboxListItem {
}
}
pub fn load_metadata(&self, cx: &mut ViewContext<Self>) {
let mut async_cx = cx.to_async();
let async_metadata = self.metadata.clone();
cx.foreground_executor()
.spawn({
let client = get_client();
let public_key = self.event.pubkey;
async move {
let metadata = async_cx
.background_executor()
.spawn(async move { client.database().metadata(public_key).await })
.await;
if let Ok(metadata) = metadata {
_ = async_cx.update_model(&async_metadata, |model, cx| {
*model = metadata;
cx.notify();
});
}
}
})
.detach();
}
pub fn action(&self, cx: &mut WindowContext<'_>) {
let room = Arc::new(Room::parse(&self.event, self.metadata.clone()));
let metadata = self.metadata.read(cx).clone();
let room = Arc::new(Room::parse(&self.event, metadata));
cx.dispatch_action(Box::new(AddPanel {
panel: PanelKind::Room(room),
@@ -53,7 +90,7 @@ impl Render for InboxListItem {
.font_medium()
.text_color(cx.theme().sidebar_accent_foreground);
if let Some(metadata) = self.metadata.clone() {
if let Some(metadata) = self.metadata.read(cx).as_ref() {
content = content
.flex()
.items_center()
@@ -145,9 +182,6 @@ impl Inbox {
}
pub fn load(&mut self, cx: &mut ViewContext<Self>) {
// Hide loading indicator
self.set_loading(cx);
// Get all room's events
let events: Vec<Event> = cx.global::<ChatRegistry>().rooms.read(cx).clone();
@@ -179,15 +213,13 @@ impl Inbox {
*model = Some(views);
cx.notify()
});
this.is_loading = false;
cx.notify();
});
})
.detach();
}
fn set_loading(&mut self, cx: &mut ViewContext<Self>) {
self.is_loading = false;
cx.notify();
}
}
impl Collapsible for Inbox {

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

@@ -57,8 +57,8 @@ impl Sidebar {
.rounded(ButtonRounded::Large)
.w_full()
.on_click({
let contact_list = contact_list.clone();
move |_, cx| {
let _contact_list = contact_list.clone();
move |_, _cx| {
// TODO: open room
}
}),