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

wip: refactor

Browse Source
This commit is contained in:
reya
2025-01-12 15:53:44 +07:00
parent 923966fb95
commit a9d109486e
6 changed files with 124 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
crates/app/src/states/chat/mod.rs
View File

@@ -162,10 +162,7 @@ impl ChatRegistry {
self.inbox.update(cx, |this, cx| { self.inbox.update(cx, |this, cx| {
if let Some(room) = this.rooms.iter().find(|room| { if let Some(room) = this.rooms.iter().find(|room| {
let room = room.read(cx); let all_keys = room.read(cx).get_all_keys();
let mut all_keys: Vec<_> = room.members.iter().map(|m| m.public_key()).collect();
all_keys.push(room.owner.public_key());
compare(&all_keys, &pubkeys) compare(&all_keys, &pubkeys)
}) { }) {
room.update(cx, |this, cx| { room.update(cx, |this, cx| {

50
crates/app/src/states/chat/room.rs
View File

@@ -1,4 +1,7 @@
use crate::utils::{room_hash, shorted_public_key}; use crate::{
constants::IMAGE_SERVICE,
utils::{room_hash, shorted_public_key},
};
use gpui::SharedString; use gpui::SharedString;
use nostr_sdk::prelude::*; use nostr_sdk::prelude::*;
use rnglib::{Language, RNG}; use rnglib::{Language, RNG};
@@ -21,8 +24,15 @@ impl Member {
self.public_key self.public_key
} }
pub fn metadata(&self) -> Metadata { pub fn avatar(&self) -> String {
self.metadata.clone() if let Some(picture) = &self.metadata.picture {
format!(
"{}/?url={}&w=100&h=100&fit=cover&mask=circle&n=-1",
IMAGE_SERVICE, picture
)
} else {
"brands/avatar.png".into()
}
} }
pub fn name(&self) -> String { pub fn name(&self) -> String {
@@ -92,14 +102,6 @@ impl Room {
} }
} }
pub fn metadata(&self, public_key: PublicKey) -> Metadata {
if let Some(member) = self.members.iter().find(|m| m.public_key == public_key) {
member.metadata()
} else {
Metadata::default()
}
}
pub fn set_metadata(&mut self, public_key: PublicKey, metadata: Metadata) { pub fn set_metadata(&mut self, public_key: PublicKey, metadata: Metadata) {
if self.owner.public_key() == public_key { if self.owner.public_key() == public_key {
self.owner.update(&metadata); self.owner.update(&metadata);
@@ -111,4 +113,30 @@ impl Room {
} }
} }
} }
pub fn member(&self, public_key: &PublicKey) -> Option<Member> {
if &self.owner.public_key() == public_key {
Some(self.owner.clone())
} else {
self.members
.iter()
.find(|m| &m.public_key() == public_key)
.cloned()
}
}
pub fn name(&self) -> String {
self.members
.iter()
.map(|profile| profile.name())
.collect::<Vec<String>>()
.join(", ")
}
pub fn get_all_keys(&self) -> Vec<PublicKey> {
let mut pubkeys: Vec<_> = self.members.iter().map(|m| m.public_key()).collect();
pubkeys.push(self.owner.public_key());
pubkeys
}
} }

4
crates/app/src/utils.rs
View File

@@ -46,9 +46,9 @@ pub fn show_npub(public_key: PublicKey, len: usize) -> String {
) )
} }
pub fn ago(time: u64) -> String { pub fn ago(time: Timestamp) -> String {
let now = Local::now(); let now = Local::now();
let input_time = Local.timestamp_opt(time as i64, 0).unwrap(); let input_time = Local.timestamp_opt(time.as_u64() as i64, 0).unwrap();
let diff = (now - input_time).num_hours(); let diff = (now - input_time).num_hours();
if diff < 24 { if diff < 24 {

69
crates/app/src/views/chat/message.rs
View File

@@ -1,46 +1,28 @@
use crate::states::chat::room::Member;
use gpui::{ use gpui::{
div, img, prelude::FluentBuilder, InteractiveElement, IntoElement, ParentElement, RenderOnce, div, img, InteractiveElement, IntoElement, ParentElement, RenderOnce, SharedString, Styled,
SharedString, Styled, WindowContext, WindowContext,
}; };
use nostr_sdk::prelude::*;
use ui::{theme::ActiveTheme, StyledExt}; use ui::{theme::ActiveTheme, StyledExt};
use crate::{
constants::IMAGE_SERVICE,
utils::{ago, show_npub},
};
#[derive(Clone, Debug, IntoElement)] #[derive(Clone, Debug, IntoElement)]
pub struct RoomMessage { pub struct Message {
#[allow(dead_code)] member: Member,
author: PublicKey,
fallback: SharedString,
metadata: Metadata,
content: SharedString, content: SharedString,
created_at: SharedString, ago: SharedString,
} }
impl RoomMessage { impl Message {
pub fn new( pub fn new(member: Member, content: SharedString, ago: SharedString) -> Self {
author: PublicKey,
metadata: Metadata,
content: String,
created_at: Timestamp,
) -> Self {
let created_at = ago(created_at.as_u64()).into();
let fallback = show_npub(author, 16).into();
Self { Self {
author, member,
metadata, content,
fallback, ago,
created_at,
content: content.into(),
} }
} }
} }
impl RenderOnce for RoomMessage { impl RenderOnce for Message {
fn render(self, cx: &mut WindowContext) -> impl IntoElement { fn render(self, cx: &mut WindowContext) -> impl IntoElement {
div() div()
.flex() .flex()
@@ -54,19 +36,12 @@ impl RenderOnce for RoomMessage {
.border_color(cx.theme().primary_active) .border_color(cx.theme().primary_active)
.text_color(cx.theme().muted_foreground) .text_color(cx.theme().muted_foreground)
}) })
.child(div().flex_shrink_0().map(|this| { .child(
if let Some(picture) = self.metadata.picture { img(self.member.avatar())
this.child( .size_8()
img(format!( .rounded_full()
"{}/?url={}&w=100&h=100&fit=cover&mask=circle&n=-1", .flex_shrink_0(),
IMAGE_SERVICE, picture
))
.size_8(),
) )
} else {
this.child(img("brand/avatar.png").size_8().rounded_full())
}
}))
.child( .child(
div() div()
.flex() .flex()
@@ -79,16 +54,10 @@ impl RenderOnce for RoomMessage {
.items_baseline() .items_baseline()
.gap_2() .gap_2()
.text_xs() .text_xs()
.child(div().font_semibold().map(|this| { .child(div().font_semibold().child(self.member.name()))
if let Some(display_name) = self.metadata.display_name {
this.child(display_name)
} else {
this.child(self.fallback)
}
}))
.child( .child(
div() div()
.child(self.created_at) .child(self.ago)
.text_color(cx.theme().muted_foreground), .text_color(cx.theme().muted_foreground),
), ),
) )

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

@@ -1,12 +1,16 @@
use crate::{get_client, states::chat::room::Room, utils::compare}; use crate::{
get_client,
states::chat::room::Room,
utils::{ago, compare},
};
use gpui::{ use gpui::{
div, list, px, AnyElement, AppContext, Context, EventEmitter, Flatten, FocusHandle, div, list, px, AnyElement, AppContext, Context, EventEmitter, Flatten, FocusHandle,
FocusableView, IntoElement, ListAlignment, ListState, Model, ParentElement, PathPromptOptions, FocusableView, IntoElement, ListAlignment, ListState, Model, ParentElement, PathPromptOptions,
Pixels, Render, SharedString, Styled, View, ViewContext, VisualContext, WeakModel, Pixels, Render, SharedString, Styled, View, ViewContext, VisualContext, WeakModel, WeakView,
WindowContext, WindowContext,
}; };
use itertools::Itertools; use itertools::Itertools;
use message::RoomMessage; use message::Message;
use nostr_sdk::prelude::*; use nostr_sdk::prelude::*;
use std::sync::Arc; use std::sync::Arc;
use ui::{ use ui::{
@@ -23,7 +27,7 @@ mod message;
#[derive(Clone)] #[derive(Clone)]
pub struct State { pub struct State {
count: usize, count: usize,
items: Vec<RoomMessage>, items: Vec<Message>,
} }
pub struct ChatPanel { pub struct ChatPanel {
@@ -61,19 +65,22 @@ impl ChatPanel {
.cleanable() .cleanable()
}); });
// Send message when user presses enter
cx.subscribe(&input, move |this: &mut ChatPanel, _, input_event, cx| {
if let InputEvent::PressEnter = input_event {
this.send_message(cx);
}
})
.detach();
let state = cx.new_model(|_| State { let state = cx.new_model(|_| State {
count: 0, count: 0,
items: vec![], items: vec![],
}); });
// Send message when user presses enter
cx.subscribe(
&input,
move |this: &mut ChatPanel, view, input_event, cx| {
if let InputEvent::PressEnter = input_event {
this.send_message(view.downgrade(), cx);
}
},
)
.detach();
// Update list on every state changes // Update list on every state changes
cx.observe(&state, |this, model, cx| { cx.observe(&state, |this, model, cx| {
let items = model.read(cx).items.clone(); let items = model.read(cx).items.clone();
@@ -117,10 +124,8 @@ impl ChatPanel {
let room = self.room.read(cx); let room = self.room.read(cx);
let members = room.members.clone(); let members = room.members.clone();
let owner = room.owner.clone(); let owner = room.owner.clone();
// Get all public keys // Get all public keys
let mut all_keys: Vec<_> = room.members.iter().map(|m| m.public_key()).collect(); let all_keys = room.get_all_keys();
all_keys.push(room.owner.public_key());
// Async // Async
let async_state = self.state.clone(); let async_state = self.state.clone();
@@ -157,7 +162,7 @@ impl ChatPanel {
.await; .await;
if let Ok(events) = events { if let Ok(events) = events {
let items: Vec<RoomMessage> = events let items: Vec<Message> = events
.into_iter() .into_iter()
.sorted_by_key(|ev| ev.created_at) .sorted_by_key(|ev| ev.created_at)
.filter_map(|ev| { .filter_map(|ev| {
@@ -165,21 +170,18 @@ impl ChatPanel {
pubkeys.push(ev.pubkey); pubkeys.push(ev.pubkey);
if compare(&pubkeys, &all_keys) { if compare(&pubkeys, &all_keys) {
let metadata = if let Some(member) = let member = if let Some(member) =
members.iter().find(|&m| m.public_key() == ev.pubkey) members.iter().find(|&m| m.public_key() == ev.pubkey)
{ {
member.metadata() member.to_owned()
} else if ev.pubkey == owner.public_key() {
owner.metadata()
} else { } else {
Metadata::default() owner.clone()
}; };
Some(RoomMessage::new( Some(Message::new(
ev.pubkey, member,
metadata, ev.content.into(),
ev.content, ago(ev.created_at).into(),
ev.created_at,
)) ))
} else { } else {
None None
@@ -202,19 +204,18 @@ impl ChatPanel {
fn load_new_messages(&self, model: WeakModel<Room>, cx: &mut ViewContext<Self>) { fn load_new_messages(&self, model: WeakModel<Room>, cx: &mut ViewContext<Self>) {
if let Some(model) = model.upgrade() { if let Some(model) = model.upgrade() {
let room = model.read(cx); let room = model.read(cx);
let items: Vec<RoomMessage> = room let items: Vec<Message> = room
.new_messages .new_messages
.iter() .iter()
.map(|event| { .filter_map(|event| {
let metadata = room.metadata(event.pubkey); room.member(&event.pubkey).map(|member| {
Message::new(
RoomMessage::new( member,
event.pubkey, event.content.clone().into(),
metadata, ago(event.created_at).into(),
event.content.clone(),
event.created_at,
) )
}) })
})
.collect(); .collect();
cx.update_model(&self.state, |model, cx| { cx.update_model(&self.state, |model, cx| {
@@ -225,7 +226,7 @@ impl ChatPanel {
} }
} }
fn send_message(&mut self, cx: &mut ViewContext<Self>) { fn send_message(&mut self, view: WeakView<TextInput>, cx: &mut ViewContext<Self>) {
let room = self.room.read(cx); let room = self.room.read(cx);
let content = Arc::new(self.input.read(cx).text().to_string()); let content = Arc::new(self.input.read(cx).text().to_string());
let owner = room.owner.clone(); let owner = room.owner.clone();
@@ -234,7 +235,6 @@ impl ChatPanel {
members.push(owner.clone()); members.push(owner.clone());
// Async // Async
let async_input = self.input.clone();
let async_state = self.state.clone(); let async_state = self.state.clone();
let mut async_cx = cx.to_async(); let mut async_cx = cx.to_async();
@@ -269,12 +269,10 @@ impl ChatPanel {
.detach(); .detach();
_ = async_cx.update_model(&async_state, |model, cx| { _ = async_cx.update_model(&async_state, |model, cx| {
let created_at = Timestamp::now(); let message = Message::new(
let message = RoomMessage::new( owner,
owner.public_key(), content.to_string().into(),
owner.metadata(), ago(Timestamp::now()).into(),
content.to_string(),
created_at,
); );
model.items.extend(vec![message]); model.items.extend(vec![message]);
@@ -282,9 +280,11 @@ impl ChatPanel {
cx.notify(); cx.notify();
}); });
_ = async_cx.update_view(&async_input, |input, cx| { if let Some(input) = view.upgrade() {
_ = async_cx.update_view(&input, |input, cx| {
input.set_text("", cx); input.set_text("", cx);
}); });
}
}) })
.detach(); .detach();
} }

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

@@ -1,5 +1,4 @@
use crate::{ use crate::{
constants::IMAGE_SERVICE,
states::chat::ChatRegistry, states::chat::ChatRegistry,
utils::ago, utils::ago,
views::app::{AddPanel, PanelKind}, views::app::{AddPanel, PanelKind},
@@ -50,18 +49,7 @@ impl Inbox {
let room = model.read(cx); let room = model.read(cx);
let id = room.id; let id = room.id;
let room_id: SharedString = id.to_string().into(); let room_id: SharedString = id.to_string().into();
let ago: SharedString = ago(room.last_seen.as_u64()).into(); let ago: SharedString = ago(room.last_seen).into();
let is_group = room.is_group;
// Get first member
let sender = room.members.first().unwrap();
// Compute group name based on member' names
let name: SharedString = room
.members
.iter()
.map(|profile| profile.name())
.collect::<Vec<String>>()
.join(", ")
.into();
div() div()
.id(room_id) .id(room_id)
@@ -81,32 +69,27 @@ impl Inbox {
.font_medium() .font_medium()
.text_color(cx.theme().sidebar_accent_foreground) .text_color(cx.theme().sidebar_accent_foreground)
.map(|this| { .map(|this| {
if is_group { if room.is_group {
this.flex() this.flex()
.items_center() .items_center()
.gap_2() .gap_2()
.child( .child(
img("brand/avatar.png").size_6().rounded_full(), img("brand/avatar.png").size_6().rounded_full(),
) )
.child(name) .child(room.name())
} else { } else {
this.when_some(room.members.first(), |this, sender| {
this.flex() this.flex()
.items_center() .items_center()
.gap_2() .gap_2()
.child( .child(
img(format!( img(sender.avatar())
"{}/?url={}&w=72&h=72&fit=cover&mask=circle&n=-1",
IMAGE_SERVICE,
sender
.metadata()
.picture
.unwrap_or("brand/avatar.png".into())
))
.flex_shrink_0()
.size_6() .size_6()
.rounded_full(), .rounded_full()
.flex_shrink_0(),
) )
.child(sender.name()) .child(sender.name())
})
} }
}), }),
) )