feat: add invite management, replies and subgroup support

This commit is contained in:
2026-10-11 08:51:03 +07:00
parent 4c279a0686
commit 440d6dfea3
7 changed files with 675 additions and 157 deletions
+183 -5
View File
@@ -1,9 +1,20 @@
use gpui::{App, AppContext, Entity, ParentElement, Styled, WeakEntity, Window, px};
use nip29::{Group, GroupMetadata};
use std::sync::Arc;
use gpui::http_client::{AsyncBody, HttpClient};
use gpui::prelude::FluentBuilder;
use gpui::{
AnyElement, App, AppContext, Entity, IntoElement, ParentElement, SharedString, Styled,
WeakEntity, Window, div, px,
};
use nip29::{Group, GroupId, GroupMetadata};
use nostr_sdk::prelude::RelayUrl;
use theme::{ActiveTheme, TextStyle, Typeset as _};
use ui::button::{Button, ButtonVariants};
use ui::dialog::DialogButtonProps;
use ui::input::InputState;
use ui::notification::Notification;
use ui::switch::Switch;
use ui::{WindowExtension, v_flex};
use ui::{Sizable, WindowExtension, h_flex, v_flex};
use crate::util::field;
@@ -53,10 +64,40 @@ pub(crate) fn open(group: WeakEntity<Group>, window: &mut Window, cx: &mut App)
.default_value(base.picture.clone().unwrap_or_default())
});
let parent = cx.new(|cx| {
InputState::new(window, cx)
.placeholder("Parent group id, empty for a root group")
.default_value(
base.parent
.as_ref()
.map(|id| id.as_str().to_owned())
.unwrap_or_default(),
)
});
let children = cx.new(|_cx| base.children.clone());
let flags = cx.new(|_cx| Flags::of(&base));
let livekit = cx.new(|_cx| None);
if let Ok(relay) = group.read_with(cx, |group, _cx| group.key().relay().clone()) {
let http = cx.http_client();
let probe = cx.background_spawn(async move { probe_livekit(http, relay).await });
let livekit = livekit.clone();
cx.spawn(async move |cx| {
let supported = probe.await;
livekit.update(cx, |livekit, cx| {
*livekit = Some(supported);
cx.notify();
});
})
.detach();
}
window.open_dialog(cx, move |this, _window, cx| {
let current = *flags.read(cx);
let supported = *livekit.read(cx) != Some(false);
this.confirm()
.title("Edit Group")
@@ -71,6 +112,8 @@ pub(crate) fn open(group: WeakEntity<Group>, window: &mut Window, cx: &mut App)
.child(field("Name", &name, cx))
.child(field("About", &about, cx))
.child(field("Picture", &picture, cx))
.child(field("Parent", &parent, cx))
.child(children_section(&children, cx))
.child(
v_flex()
.gap(px(theme::SPACE))
@@ -105,9 +148,26 @@ pub(crate) fn open(group: WeakEntity<Group>, window: &mut Window, cx: &mut App)
.child(
Switch::new("livekit")
.label("LiveKit")
.description("Announce audio and video support.")
.description(if supported {
"Announce audio and video support."
} else {
"The relay doesn't announce LiveKit support."
})
.checked(current.livekit)
.on_click(toggle(&flags, |flags| &mut flags.livekit)),
.on_click({
let flags = flags.clone();
let livekit = livekit.clone();
move |next, _window, cx| {
if *next && *livekit.read(cx) == Some(false) {
return;
}
flags.update(cx, |flags, cx| {
flags.livekit = *next;
cx.notify();
});
}
}),
),
),
)
@@ -116,6 +176,8 @@ pub(crate) fn open(group: WeakEntity<Group>, window: &mut Window, cx: &mut App)
let name = name.clone();
let about = about.clone();
let picture = picture.clone();
let parent = parent.clone();
let children = children.clone();
let flags = flags.clone();
move |_event, window, cx| {
@@ -129,6 +191,40 @@ pub(crate) fn open(group: WeakEntity<Group>, window: &mut Window, cx: &mut App)
next.about = value(&about, cx);
next.picture = value(&picture, cx);
match value(&parent, cx).map(GroupId::new) {
Some(Ok(id)) => next.parent = Some(id),
Some(Err(error)) => {
window.push_notification(Notification::error(error.to_string()), cx);
return false;
}
None => next.parent = None,
}
next.children = children.read(cx).clone();
// The relay must reject these anyway; catch them early.
if let Some(id) = &next.parent {
let key = group
.read_with(cx, |group, _cx| group.key().id().as_str().to_owned())
.ok();
if key.as_deref() == Some(id.as_str()) {
window.push_notification(
Notification::error("A group can't be its own parent"),
cx,
);
return false;
}
if next.children.iter().any(|child| child == id) {
window.push_notification(
Notification::error("The parent is one of this group's children"),
cx,
);
return false;
}
}
let current = flags.read(cx);
next.private = current.private;
next.restricted = current.restricted;
@@ -147,6 +243,88 @@ pub(crate) fn open(group: WeakEntity<Group>, window: &mut Window, cx: &mut App)
});
}
/// NIP-29: relays announce LiveKit support with a 204 at this well-known path.
async fn probe_livekit(http: Arc<dyn HttpClient>, relay: RelayUrl) -> bool {
let base = relay
.as_str()
.replacen("wss://", "https://", 1)
.replacen("ws://", "http://", 1);
let url = format!("{}/.well-known/nip29/livekit", base.trim_end_matches('/'));
match http.get(&url, AsyncBody::default(), true).await {
Ok(response) => response.status() == 204,
Err(_) => false,
}
}
fn children_section(children: &Entity<Vec<GroupId>>, cx: &App) -> AnyElement {
let list = children.read(cx);
let mut section = v_flex()
.gap_1()
.text_style(TextStyle::Callout)
.text_color(cx.theme().text_muted)
.child("Children");
if list.is_empty() {
return section
.child(
div()
.text_color(cx.theme().text_faint)
.child("No subgroups"),
)
.into_any_element();
}
for (ix, child) in list.iter().enumerate() {
let order = h_flex()
.flex_shrink_0()
.gap_1()
.when(ix > 0, |this| {
this.child(move_button(children.clone(), ix, ix - 1, "up"))
})
.when(ix + 1 < list.len(), |this| {
this.child(move_button(children.clone(), ix, ix + 1, "down"))
});
section = section.child(
h_flex()
.justify_between()
.gap_2()
.child(
div()
.min_w_0()
.truncate()
.text_color(cx.theme().text)
.child(SharedString::from(child.as_str().to_owned())),
)
.child(order),
);
}
section.into_any_element()
}
fn move_button(
children: Entity<Vec<GroupId>>,
ix: usize,
target: usize,
direction: &'static str,
) -> Button {
Button::new(SharedString::from(format!("child-{direction}-{ix}")))
.label(if direction == "up" { "Up" } else { "Down" })
.ghost()
.small()
.on_click(move |_event, _window, cx| {
children.update(cx, |children, cx| {
if target < children.len() {
children.swap(ix, target);
cx.notify();
}
});
})
}
fn toggle(
flags: &Entity<Flags>,
select: fn(&mut Flags) -> &mut bool,