@@ -702,7 +498,7 @@ pub fn ChatInput(
- // Slash command hint bar (/s[etting], /i[nventory], /w[hisper], /t[eleport])
+ // Slash command hint bar (/s[etting], /i[nventory], /w[hisper])
"/"
@@ -716,12 +512,6 @@ pub fn ChatInput(
"/"
"w"
"[hisper] name"
-
- "|"
- "/"
- "t"
- "[eleport]"
-
,
- /// Optional header text (e.g., username) displayed above the menu items.
- #[prop(optional, into)]
- header: Option>>,
/// Menu items to display.
#[prop(into)]
items: Signal>,
@@ -86,40 +82,12 @@ pub fn ContextMenu(
)
};
- // Click outside handler - use Effect with cleanup to properly remove handlers
+ // Click outside handler
#[cfg(feature = "hydrate")]
{
- use std::cell::RefCell;
- use std::rc::Rc;
use wasm_bindgen::{JsCast, closure::Closure};
- // Store closures so we can remove them on cleanup
- let mousedown_closure: Rc>>> =
- Rc::new(RefCell::new(None));
- let keydown_closure: Rc>>> =
- Rc::new(RefCell::new(None));
-
- let mousedown_closure_clone = mousedown_closure.clone();
- let keydown_closure_clone = keydown_closure.clone();
-
Effect::new(move |_| {
- let window = web_sys::window().unwrap();
-
- // Clean up previous handlers first
- if let Some(old_handler) = mousedown_closure_clone.borrow_mut().take() {
- let _ = window.remove_event_listener_with_callback(
- "mousedown",
- old_handler.as_ref().unchecked_ref(),
- );
- }
- if let Some(old_handler) = keydown_closure_clone.borrow_mut().take() {
- let _ = window.remove_event_listener_with_callback(
- "keydown",
- old_handler.as_ref().unchecked_ref(),
- );
- }
-
- // Only add handlers when menu is open
if !open.get() {
return;
}
@@ -132,7 +100,6 @@ pub fn ContextMenu(
let menu_el: web_sys::HtmlElement = menu_el.into();
let menu_el_clone = menu_el.clone();
- // Mousedown handler for click-outside detection
let handler =
Closure::::new(move |ev: web_sys::MouseEvent| {
if let Some(target) = ev.target() {
@@ -144,9 +111,9 @@ pub fn ContextMenu(
}
});
+ let window = web_sys::window().unwrap();
let _ = window
.add_event_listener_with_callback("mousedown", handler.as_ref().unchecked_ref());
- *mousedown_closure_clone.borrow_mut() = Some(handler);
// Escape key handler
let on_close_esc = on_close.clone();
@@ -162,7 +129,10 @@ pub fn ContextMenu(
"keydown",
keydown_handler.as_ref().unchecked_ref(),
);
- *keydown_closure_clone.borrow_mut() = Some(keydown_handler);
+
+ // Store handlers to clean up (they get cleaned up when Effect reruns)
+ handler.forget();
+ keydown_handler.forget();
});
}
@@ -175,17 +145,6 @@ pub fn ContextMenu(
role="menu"
aria-label="Context menu"
>
- // Header with username and divider
- {move || {
- header.and_then(|h| h.get()).map(|header_text| {
- view! {
-
- } - }) - }},
on_close: Callback<()>,
ws_sender: StoredValue, LocalStorage>,
#[prop(into)] realm_slug: Signal,
- /// Whether the current user is a guest. Guests see a locked overlay.
- #[prop(optional, into)]
- is_guest: Option>,
) -> impl IntoView {
- let is_guest = is_guest.unwrap_or_else(|| Signal::derive(|| false));
// Tab state
let (active_tab, set_active_tab) = signal("my_inventory");
@@ -243,59 +238,52 @@ pub fn InventoryPopup(
max_width="max-w-2xl"
class="max-h-[80vh] flex flex-col"
>
-
-
- {header_text}
- - } - }) - }}
- // Tab bar
- ,
scene_name: String,
scene_description: Option,
- online_count: Signal,
+ online_count: i32,
total_members: i32,
max_capacity: i32,
can_admin: bool,
on_logout: Callback<()>,
) -> impl IntoView {
let stats_tooltip = format!("Members: {} / Max: {}", total_members, max_capacity);
- let online_text = move || format!("{} ONLINE", online_count.get());
+ let online_text = format!("{} ONLINE", online_count);
let admin_url = format!("/admin/realms/{}", realm_slug);
view! {
diff --git a/crates/chattyness-user-ui/src/components/modals.rs b/crates/chattyness-user-ui/src/components/modals.rs
index 3bcde67..5baa588 100644
--- a/crates/chattyness-user-ui/src/components/modals.rs
+++ b/crates/chattyness-user-ui/src/components/modals.rs
@@ -314,45 +314,3 @@ pub fn ConfirmModal(
}
}
-
-// ============================================================================
-// Guest Locked Overlay
-// ============================================================================
-
-/// Overlay displayed when a feature is restricted to registered users.
-///
-/// Shows a semi-transparent backdrop with a padlock icon and diagonal
-/// "Registered Users" text. Designed to be placed inside a modal container
-/// with `position: relative`.
-///
-/// # Example
-///
-/// ```ignore
-/// ,
- /// Callback to trigger a reconnection attempt.
- on_reconnect: Callback<()>,
-) -> impl IntoView {
- // Internal overlay state
- let (overlay_state, set_overlay_state) = signal(OverlayState::Hidden);
-
- // Timer handle stored for cleanup
- #[cfg(feature = "hydrate")]
- let timer_handle: std::rc::Rc>> =
- std::rc::Rc::new(std::cell::RefCell::new(None));
-
- // Watch for WebSocket state changes
- #[cfg(feature = "hydrate")]
- {
- let timer_handle = timer_handle.clone();
-
- Effect::new(move |_| {
- let state = ws_state.get();
-
- match state {
- WsState::Connected => {
- // Connection restored - hide overlay and stop timer
- if let Some(timer) = timer_handle.borrow_mut().take() {
- drop(timer);
- }
- set_overlay_state.set(OverlayState::Hidden);
- }
- WsState::SilentReconnecting(_) => {
- // Silent reconnection in progress - keep overlay hidden
- // The ws_client handles the reconnection attempts internally
- if let Some(timer) = timer_handle.borrow_mut().take() {
- drop(timer);
- }
- set_overlay_state.set(OverlayState::Hidden);
- }
- WsState::Disconnected | WsState::Error => {
- // Check current state - only start countdown if we're hidden
- let current = overlay_state.get_untracked();
- if matches!(current, OverlayState::Hidden) {
- // Start initial countdown
- let phase = ReconnectionPhase::Initial { attempt: 1 };
- let duration = phase.countdown_duration();
- set_overlay_state.set(OverlayState::Countdown {
- phase,
- remaining: duration,
- });
-
- // Start timer
- start_countdown_timer(
- timer_handle.clone(),
- set_overlay_state,
- on_reconnect.clone(),
- );
- } else if matches!(current, OverlayState::Reconnecting { .. }) {
- // Reconnection attempt failed - advance to next attempt
- if let OverlayState::Reconnecting { phase } = current {
- let next_phase = phase.next();
- if matches!(next_phase, ReconnectionPhase::Failed) {
- set_overlay_state.set(OverlayState::Failed);
- } else {
- let duration = next_phase.countdown_duration();
- set_overlay_state.set(OverlayState::Countdown {
- phase: next_phase,
- remaining: duration,
- });
- // Restart timer for next countdown
- start_countdown_timer(
- timer_handle.clone(),
- set_overlay_state,
- on_reconnect.clone(),
- );
- }
- }
- }
- }
- WsState::Connecting => {
- // Currently attempting to connect - keep current state
- // The reconnecting state should already be set
- }
- }
- });
- }
-
- // Render based on state
- move || {
- let state = overlay_state.get();
-
- match state {
- OverlayState::Hidden => None,
- OverlayState::Countdown { phase, remaining } => {
- let (phase_text, attempt_text) = match phase {
- ReconnectionPhase::Initial { attempt } => {
- ("Attempt", format!("{} of 5", attempt))
- }
- ReconnectionPhase::Extended { attempt } => {
- ("Extended attempt", format!("{} of 10", attempt))
- }
- ReconnectionPhase::Failed => ("", String::new()),
- };
-
- Some(
- view! {
- >>,
- set_overlay_state: WriteSignal,
- on_reconnect: Callback<()>,
-) {
- use gloo_timers::callback::Interval;
-
- // Stop any existing timer
- if let Some(old_timer) = timer_handle.borrow_mut().take() {
- drop(old_timer);
- }
-
- // Create new timer that ticks every second
- let timer = Interval::new(1000, move || {
- set_overlay_state.update(|state| {
- if let OverlayState::Countdown { phase, remaining } = state {
- if *remaining > 1 {
- // Decrement countdown
- *remaining -= 1;
- } else {
- // Countdown reached zero - trigger reconnection
- *state = OverlayState::Reconnecting { phase: *phase };
- on_reconnect.run(());
- }
- }
- });
- });
-
- *timer_handle.borrow_mut() = Some(timer);
-}
diff --git a/crates/chattyness-user-ui/src/components/scene_list_popup.rs b/crates/chattyness-user-ui/src/components/scene_list_popup.rs
deleted file mode 100644
index fb6c459..0000000
--- a/crates/chattyness-user-ui/src/components/scene_list_popup.rs
+++ /dev/null
@@ -1,127 +0,0 @@
-//! Scene list popup component for teleport command.
-//!
-//! Shows available scenes in a realm for teleportation.
-
-use leptos::prelude::*;
-
-use chattyness_db::models::SceneSummary;
-
-/// Scene list popup component.
-///
-/// Shows scenes in a list with keyboard navigation for teleport selection.
-///
-/// Props:
-/// - `scenes`: List of available scenes
-/// - `on_select`: Callback when a scene is selected (receives SceneSummary)
-/// - `on_close`: Callback when popup should close
-/// - `scene_filter`: Signal containing the current filter text
-/// - `selected_idx`: Signal containing the currently selected index
-#[component]
-pub fn SceneListPopup(
- scenes: Signal>,
- on_select: Callback,
- #[prop(into)] on_close: Callback<()>,
- #[prop(into)] scene_filter: Signal,
- #[prop(into)] selected_idx: Signal,
-) -> impl IntoView {
- let _ = on_close; // Suppress unused warning
-
- // Get list of scenes, filtered by search text
- let filtered_scenes = move || {
- let filter_text = scene_filter.get().to_lowercase();
- scenes
- .get()
- .into_iter()
- .filter(|s| {
- filter_text.is_empty()
- || s.name.to_lowercase().contains(&filter_text)
- || s.slug.to_lowercase().contains(&filter_text)
- })
- .collect::>()
- };
-
- let filter_display = move || {
- let f = scene_filter.get();
- if f.is_empty() {
- "Type to filter...".to_string()
- } else {
- format!("Filter: {}", f)
- }
- };
-
- // Indexed scenes for selection tracking
- let indexed_scenes = move || {
- filtered_scenes()
- .into_iter()
- .enumerate()
- .collect::>()
- };
-
- view! {
- >>,
- /// Whether the current user is a guest (guests cannot use context menu).
- #[prop(optional, into)]
- is_guest: Option>,
/// Callback when whisper is requested on a member.
#[prop(optional, into)]
on_whisper_request: Option>,
) -> impl IntoView {
- let is_guest = is_guest.unwrap_or_else(|| Signal::derive(|| false));
// Use default settings if none provided
let settings = settings.unwrap_or_else(|| Signal::derive(ViewerSettings::default));
let dimensions = parse_bounds_dimensions(&scene.bounds_wkt);
@@ -187,19 +183,14 @@ pub fn RealmSceneViewer(
move |ev: web_sys::MouseEvent| {
use wasm_bindgen::JsCast;
- // Guests cannot message other users - don't show context menu
- if is_guest.get() {
- return;
- }
+ // Get click position
+ let client_x = ev.client_x() as f64;
+ let client_y = ev.client_y() as f64;
// Get current user identity for filtering
let my_user_id = current_user_id.map(|s| s.get()).flatten();
let my_guest_session_id = current_guest_session_id.map(|s| s.get()).flatten();
- // Get click position
- let client_x = ev.client_x() as f64;
- let client_y = ev.client_y() as f64;
-
// Query all avatar canvases and check for hit
let document = web_sys::window().unwrap().document().unwrap();
@@ -1042,7 +1033,6 @@ pub fn RealmSceneViewer(
,
/// The user's display name.
pub display_name: String,
- /// Whether this user is a guest (has the 'guest' tag).
- pub is_guest: bool,
}
/// WebSocket error info for UI display.
@@ -79,15 +71,6 @@ pub struct WsError {
pub message: String,
}
-/// Teleport information received from server.
-#[derive(Clone, Debug)]
-pub struct TeleportInfo {
- /// Scene ID to teleport to.
- pub scene_id: uuid::Uuid,
- /// Scene slug for URL.
- pub scene_slug: String,
-}
-
/// Hook to manage WebSocket connection for a channel.
///
/// Returns a tuple of:
@@ -97,7 +80,6 @@ pub struct TeleportInfo {
pub fn use_channel_websocket(
realm_slug: Signal,
channel_id: Signal>,
- reconnect_trigger: RwSignal,
on_members_update: Callback>,
on_chat_message: Callback,
on_loose_props_sync: Callback>,
@@ -106,7 +88,6 @@ pub fn use_channel_websocket(
on_member_fading: Callback,
on_welcome: Option>,
on_error: Option>,
- on_teleport_approved: Option>,
) -> (Signal, WsSenderStorage) {
use std::cell::RefCell;
use std::rc::Rc;
@@ -116,11 +97,6 @@ pub fn use_channel_websocket(
let (ws_state, set_ws_state) = signal(WsState::Disconnected);
let ws_ref: Rc>> = Rc::new(RefCell::new(None));
let members: Rc>> = Rc::new(RefCell::new(Vec::new()));
- // Track current user's ID to ignore self MemberLeft during reconnection
- let current_user_id: Rc>> = Rc::new(RefCell::new(None));
- // Flag to track intentional closes (teleport, scene change) - guarantees local state
- // even if close code doesn't arrive correctly due to browser/server quirks
- let is_intentional_close: Rc> = Rc::new(RefCell::new(false));
// Create a stored sender function (using new_local for WASM single-threaded environment)
let ws_ref_for_send = ws_ref.clone();
@@ -140,24 +116,14 @@ pub fn use_channel_websocket(
// Effect to manage WebSocket lifecycle
let ws_ref_clone = ws_ref.clone();
let members_clone = members.clone();
- let is_intentional_close_for_cleanup = is_intentional_close.clone();
Effect::new(move |_| {
let slug = realm_slug.get();
let ch_id = channel_id.get();
- // Track reconnect_trigger to force reconnection when it changes
- let _trigger = reconnect_trigger.get();
// Cleanup previous connection
if let Some(old_ws) = ws_ref_clone.borrow_mut().take() {
- #[cfg(debug_assertions)]
- web_sys::console::log_1(
- &format!("[WS] Closing old connection, readyState={}", old_ws.ready_state()).into(),
- );
- // Set flag BEFORE closing - guarantees local state even if close code doesn't arrive
- *is_intentional_close_for_cleanup.borrow_mut() = true;
- // Close with SCENE_CHANGE code so onclose handler knows this was intentional
- let _ = old_ws.close_with_code_and_reason(close_codes::SCENE_CHANGE, "scene change");
+ let _ = old_ws.close();
}
let Some(ch_id) = ch_id else {
@@ -219,13 +185,10 @@ pub fn use_channel_websocket(
let on_member_fading_clone = on_member_fading.clone();
let on_welcome_clone = on_welcome.clone();
let on_error_clone = on_error.clone();
- let on_teleport_approved_clone = on_teleport_approved.clone();
// For starting heartbeat on Welcome
let ws_ref_for_heartbeat = ws_ref.clone();
let heartbeat_started: Rc> = Rc::new(RefCell::new(false));
let heartbeat_started_clone = heartbeat_started.clone();
- // For tracking current user ID to ignore self MemberLeft during reconnection
- let current_user_id_for_msg = current_user_id.clone();
let onmessage = Closure::wrap(Box::new(move |e: MessageEvent| {
if let Ok(text) = e.data().dyn_into::() {
let text: String = text.into();
@@ -240,9 +203,6 @@ pub fn use_channel_websocket(
..
} = msg
{
- // Track current user ID for MemberLeft filtering
- *current_user_id_for_msg.borrow_mut() = member.user_id;
-
if !*heartbeat_started_clone.borrow() {
*heartbeat_started_clone.borrow_mut() = true;
let ping_interval_ms = config.ping_interval_secs * 1000;
@@ -277,7 +237,6 @@ pub fn use_channel_websocket(
user_id: member.user_id,
guest_session_id: member.guest_session_id,
display_name: member.display_name.clone(),
- is_guest: member.is_guest,
};
callback.run(info);
}
@@ -292,8 +251,6 @@ pub fn use_channel_websocket(
&on_prop_picked_up_clone,
&on_member_fading_clone,
&on_error_clone,
- &on_teleport_approved_clone,
- ¤t_user_id_for_msg,
);
}
}
@@ -303,82 +260,22 @@ pub fn use_channel_websocket(
// onerror
let set_ws_state_err = set_ws_state;
- let ws_state_for_err = ws_state;
- let reconnect_trigger_for_error = reconnect_trigger;
let onerror = Closure::wrap(Box::new(move |e: ErrorEvent| {
#[cfg(debug_assertions)]
web_sys::console::error_1(&format!("[WS] Error: {:?}", e.message()).into());
-
- // Check if we're in silent reconnection mode
- let current_state = ws_state_for_err.get_untracked();
- if let WsState::SilentReconnecting(attempt) = current_state {
- if attempt < MAX_SILENT_RECONNECT_ATTEMPTS {
- // Try another silent reconnection
- let next_attempt = attempt + 1;
- #[cfg(debug_assertions)]
- web_sys::console::log_1(
- &format!(
- "[WS] Silent reconnection attempt {} failed, trying attempt {}",
- attempt, next_attempt
- )
- .into(),
- );
- set_ws_state_err.set(WsState::SilentReconnecting(next_attempt));
- // Schedule next reconnection attempt
- let reconnect_trigger = reconnect_trigger_for_error;
- gloo_timers::callback::Timeout::new(SILENT_RECONNECT_DELAY_MS, move || {
- reconnect_trigger.update(|v| *v = v.wrapping_add(1));
- })
- .forget();
- } else {
- // Max attempts reached, fall back to showing overlay
- #[cfg(debug_assertions)]
- web_sys::console::log_1(
- &"[WS] Silent reconnection failed, showing reconnection overlay".into(),
- );
- set_ws_state_err.set(WsState::Error);
- }
- } else {
- set_ws_state_err.set(WsState::Error);
- }
+ set_ws_state_err.set(WsState::Error);
}) as Box);
ws.set_onerror(Some(onerror.as_ref().unchecked_ref()));
onerror.forget();
// onclose
let set_ws_state_close = set_ws_state;
- let reconnect_trigger_for_close = reconnect_trigger;
- let is_intentional_close_for_onclose = is_intentional_close.clone();
let onclose = Closure::wrap(Box::new(move |e: CloseEvent| {
- let code = e.code();
#[cfg(debug_assertions)]
web_sys::console::log_1(
- &format!("[WS] Closed: code={}, reason={}", code, e.reason()).into(),
+ &format!("[WS] Closed: code={}, reason={}", e.code(), e.reason()).into(),
);
-
- // Handle based on close code with defense-in-depth using flag
- if code == close_codes::SERVER_TIMEOUT {
- // Server timeout - attempt silent reconnection (highest priority)
- #[cfg(debug_assertions)]
- web_sys::console::log_1(&"[WS] Server timeout, attempting silent reconnection".into());
- set_ws_state_close.set(WsState::SilentReconnecting(1));
- // Schedule reconnection after delay
- let reconnect_trigger = reconnect_trigger_for_close;
- gloo_timers::callback::Timeout::new(SILENT_RECONNECT_DELAY_MS, move || {
- reconnect_trigger.update(|v| *v = v.wrapping_add(1));
- })
- .forget();
- } else if code == close_codes::SCENE_CHANGE || *is_intentional_close_for_onclose.borrow() {
- // Intentional close (scene change/teleport) - don't show disconnection
- // Check both code AND flag for defense-in-depth (flag is guaranteed local state)
- #[cfg(debug_assertions)]
- web_sys::console::log_1(&"[WS] Intentional close, not setting Disconnected".into());
- // Reset the flag for future connections
- *is_intentional_close_for_onclose.borrow_mut() = false;
- } else {
- // Other close codes - treat as disconnection
- set_ws_state_close.set(WsState::Disconnected);
- }
+ set_ws_state_close.set(WsState::Disconnected);
}) as Box);
ws.set_onclose(Some(onclose.as_ref().unchecked_ref()));
onclose.forget();
@@ -401,8 +298,6 @@ fn handle_server_message(
on_prop_picked_up: &Callback,
on_member_fading: &Callback,
on_error: &Option>,
- on_teleport_approved: &Option>,
- current_user_id: &std::rc::Rc>>,
) {
let mut members_vec = members.borrow_mut();
@@ -429,18 +324,6 @@ fn handle_server_message(
guest_session_id,
reason,
} => {
- // Check if this is our own MemberLeft due to timeout - ignore it during reconnection
- // so we don't see our own avatar fade out
- let own_user_id = *current_user_id.borrow();
- let is_self = own_user_id.is_some() && user_id == own_user_id;
- if is_self && reason == DisconnectReason::Timeout {
- #[cfg(debug_assertions)]
- web_sys::console::log_1(
- &"[WS] Ignoring self MemberLeft during reconnection".into(),
- );
- return;
- }
-
// Find the member before removing
let leaving_member = members_vec
.iter()
@@ -567,17 +450,6 @@ fn handle_server_message(
}
on_update.run(members_vec.clone());
}
- ServerMessage::TeleportApproved {
- scene_id,
- scene_slug,
- } => {
- if let Some(callback) = on_teleport_approved {
- callback.run(TeleportInfo {
- scene_id,
- scene_slug,
- });
- }
- }
}
}
@@ -586,7 +458,6 @@ fn handle_server_message(
pub fn use_channel_websocket(
_realm_slug: Signal,
_channel_id: Signal>,
- _reconnect_trigger: RwSignal,
_on_members_update: Callback>,
_on_chat_message: Callback,
_on_loose_props_sync: Callback>,
@@ -595,7 +466,6 @@ pub fn use_channel_websocket(
_on_member_fading: Callback,
_on_welcome: Option>,
_on_error: Option>,
- _on_teleport_approved: Option>,
) -> (Signal, WsSenderStorage) {
let (ws_state, _) = signal(WsState::Disconnected);
let sender: WsSenderStorage = StoredValue::new_local(None);
diff --git a/crates/chattyness-user-ui/src/pages/realm.rs b/crates/chattyness-user-ui/src/pages/realm.rs
index ef81a32..38f9609 100644
--- a/crates/chattyness-user-ui/src/pages/realm.rs
+++ b/crates/chattyness-user-ui/src/pages/realm.rs
@@ -14,20 +14,20 @@ use uuid::Uuid;
use crate::components::{
ActiveBubble, AvatarEditorPopup, Card, ChatInput, ConversationModal, EmotionKeybindings,
FadingMember, InventoryPopup, KeybindingsPopup, MessageLog, NotificationHistoryModal,
- NotificationMessage, NotificationToast, RealmHeader, RealmSceneViewer, ReconnectionOverlay,
- SettingsPopup, ViewerSettings,
+ NotificationMessage, NotificationToast, RealmHeader, RealmSceneViewer, SettingsPopup,
+ ViewerSettings,
};
#[cfg(feature = "hydrate")]
use crate::components::{
ChannelMemberInfo, ChatMessage, DEFAULT_BUBBLE_TIMEOUT_MS, FADE_DURATION_MS, HistoryEntry,
- TeleportInfo, WsError, add_to_history, use_channel_websocket,
+ WsError, add_to_history, use_channel_websocket,
};
use crate::utils::LocalStoragePersist;
#[cfg(feature = "hydrate")]
use crate::utils::parse_bounds_dimensions;
use chattyness_db::models::{
AvatarWithPaths, ChannelMemberWithAvatar, EmotionAvailability, LooseProp, RealmRole,
- RealmWithUserRole, Scene, SceneSummary,
+ RealmWithUserRole, Scene,
};
#[cfg(feature = "hydrate")]
use chattyness_db::ws_messages::ClientMessage;
@@ -44,9 +44,6 @@ pub fn RealmPage() -> impl IntoView {
let slug = Signal::derive(move || params.read().get("slug").unwrap_or_default());
- // Scene slug from URL (for direct scene navigation)
- let scene_slug_param = Signal::derive(move || params.read().get("scene_slug"));
-
// Channel member state
let (members, set_members) = signal(Vec::::new());
let (channel_id, set_channel_id) = signal(Option::::None);
@@ -101,8 +98,6 @@ pub fn RealmPage() -> impl IntoView {
// Current user identity (received from WebSocket Welcome message)
let (current_user_id, set_current_user_id) = signal(Option::::None);
let (current_guest_session_id, set_current_guest_session_id) = signal(Option::::None);
- // Whether the current user is a guest (has the 'guest' tag)
- let (is_guest, set_is_guest) = signal(false);
// Whisper target - when set, triggers pre-fill in ChatInput
let (whisper_target, set_whisper_target) = signal(Option::::None);
@@ -123,18 +118,6 @@ pub fn RealmPage() -> impl IntoView {
// Error notification state (for whisper failures, etc.)
let (error_message, set_error_message) = signal(Option::::None);
- // Reconnection trigger - increment to force WebSocket reconnection
- let reconnect_trigger = RwSignal::new(0u32);
-
- // Current scene (changes when teleporting)
- let (current_scene, set_current_scene) = signal(Option::::None);
-
- // Available scenes for teleportation (cached on load)
- let (available_scenes, set_available_scenes) = signal(Vec::::new());
-
- // Whether teleportation is allowed in this realm
- let (allow_user_teleport, set_allow_user_teleport) = signal(false);
-
let realm_data = LocalResource::new(move || {
let slug = slug.get();
async move {
@@ -327,7 +310,6 @@ pub fn RealmPage() -> impl IntoView {
set_current_user_id.set(info.user_id);
set_current_guest_session_id.set(info.guest_session_id);
set_current_display_name.set(info.display_name.clone());
- set_is_guest.set(info.is_guest);
});
// Callback for WebSocket errors (whisper failures, etc.)
@@ -336,8 +318,6 @@ pub fn RealmPage() -> impl IntoView {
// Display user-friendly error message
let msg = match error.code.as_str() {
"WHISPER_TARGET_NOT_FOUND" => error.message,
- "TELEPORT_DISABLED" => error.message,
- "SCENE_NOT_FOUND" => error.message,
_ => format!("Error: {}", error.message),
};
set_error_message.set(Some(msg));
@@ -349,74 +329,10 @@ pub fn RealmPage() -> impl IntoView {
.forget();
});
- // Callback for teleport approval - navigate to new scene
#[cfg(feature = "hydrate")]
- let on_teleport_approved = Callback::new(move |info: TeleportInfo| {
- let scene_id = info.scene_id;
- let scene_slug = info.scene_slug.clone();
- let realm_slug = slug.get_untracked();
-
- // Fetch the new scene data to update the canvas background
- let scene_slug_for_url = scene_slug.clone();
- let realm_slug_for_url = realm_slug.clone();
- spawn_local(async move {
- use gloo_net::http::Request;
- let response = Request::get(&format!(
- "/api/realms/{}/scenes/{}",
- realm_slug, scene_slug
- ))
- .send()
- .await;
-
- if let Ok(resp) = response {
- if resp.ok() {
- if let Ok(scene) = resp.json::().await {
- // Update scene dimensions from the new scene
- if let Some((w, h)) = parse_bounds_dimensions(&scene.bounds_wkt) {
- set_scene_dimensions.set((w as f64, h as f64));
- }
-
- // Update URL to reflect new scene
- if let Some(window) = web_sys::window() {
- if let Ok(history) = window.history() {
- let new_url = if scene.is_entry_point {
- format!("/realms/{}", realm_slug_for_url)
- } else {
- format!(
- "/realms/{}/scenes/{}",
- realm_slug_for_url, scene_slug_for_url
- )
- };
- let _ = history.replace_state_with_url(
- &wasm_bindgen::JsValue::NULL,
- "",
- Some(&new_url),
- );
- }
- }
-
- // Update the current scene for the viewer
- set_current_scene.set(Some(scene));
- }
- }
- }
-
- // Update channel_id to trigger WebSocket reconnection
- set_channel_id.set(Some(scene_id));
-
- // Clear members since we're switching scenes
- set_members.set(Vec::new());
-
- // Trigger a reconnect to ensure fresh connection
- reconnect_trigger.update(|t| *t += 1);
- });
- });
-
- #[cfg(feature = "hydrate")]
- let (ws_state, ws_sender) = use_channel_websocket(
+ let (_ws_state, ws_sender) = use_channel_websocket(
slug,
Signal::derive(move || channel_id.get()),
- reconnect_trigger,
on_members_update,
on_chat_message,
on_loose_props_sync,
@@ -425,172 +341,23 @@ pub fn RealmPage() -> impl IntoView {
on_member_fading,
Some(on_welcome),
Some(on_ws_error),
- Some(on_teleport_approved),
);
- // Set channel ID, current scene, and scene dimensions when entry scene loads
+ // Set channel ID and scene dimensions when scene loads
// Note: Currently using scene.id as the channel_id since channel_members
// uses scenes directly. Proper channel infrastructure can be added later.
#[cfg(feature = "hydrate")]
{
- // Track whether we've handled initial scene load to prevent double-loading
- let initial_scene_handled = StoredValue::new_local(false);
-
Effect::new(move |_| {
- // Skip if already handled
- if initial_scene_handled.get_value() {
- return;
- }
-
- let url_scene_slug = scene_slug_param.get();
- let has_url_scene = url_scene_slug
- .as_ref()
- .is_some_and(|s| !s.is_empty());
-
- if has_url_scene {
- // URL has a scene slug - wait for realm data to check if teleport is allowed
- let Some(realm_with_role) = realm_data.get().flatten() else {
- return;
- };
-
- let realm_slug_val = slug.get();
- let scene_slug_val = url_scene_slug.unwrap();
-
- if !realm_with_role.realm.allow_user_teleport {
- // Teleport disabled - redirect to base realm URL and show error
- initial_scene_handled.set_value(true);
- set_error_message.set(Some(
- "Direct scene access is disabled for this realm".to_string(),
- ));
-
- // Redirect to base realm URL
- let navigate = use_navigate();
- navigate(
- &format!("/realms/{}", realm_slug_val),
- leptos_router::NavigateOptions {
- replace: true,
- ..Default::default()
- },
- );
-
- // Auto-dismiss error after 5 seconds
- use gloo_timers::callback::Timeout;
- Timeout::new(5000, move || {
- set_error_message.set(None);
- })
- .forget();
-
- // Fall back to entry scene
- if let Some(scene) = entry_scene.get().flatten() {
- set_channel_id.set(Some(scene.id));
- set_current_scene.set(Some(scene.clone()));
- if let Some((w, h)) = parse_bounds_dimensions(&scene.bounds_wkt) {
- set_scene_dimensions.set((w as f64, h as f64));
- }
- }
- return;
- }
-
- // Teleport allowed - fetch the specific scene
- initial_scene_handled.set_value(true);
- spawn_local(async move {
- use gloo_net::http::Request;
- let response = Request::get(&format!(
- "/api/realms/{}/scenes/{}",
- realm_slug_val, scene_slug_val
- ))
- .send()
- .await;
-
- if let Ok(resp) = response {
- if resp.ok() {
- if let Ok(scene) = resp.json::().await {
- set_channel_id.set(Some(scene.id));
- if let Some((w, h)) = parse_bounds_dimensions(&scene.bounds_wkt) {
- set_scene_dimensions.set((w as f64, h as f64));
- }
- set_current_scene.set(Some(scene));
- return;
- }
- }
- }
-
- // Scene not found - show error and fall back to entry scene
- set_error_message.set(Some(format!(
- "Scene '{}' not found",
- scene_slug_val
- )));
-
- // Update URL to base realm URL
- if let Some(window) = web_sys::window() {
- if let Ok(history) = window.history() {
- let _ = history.replace_state_with_url(
- &wasm_bindgen::JsValue::NULL,
- "",
- Some(&format!("/realms/{}", realm_slug_val)),
- );
- }
- }
-
- // Auto-dismiss error after 5 seconds
- use gloo_timers::callback::Timeout;
- Timeout::new(5000, move || {
- set_error_message.set(None);
- })
- .forget();
- });
- } else {
- // No URL scene slug - use entry scene
- let Some(scene) = entry_scene.get().flatten() else {
- return;
- };
- initial_scene_handled.set_value(true);
- set_channel_id.set(Some(scene.id));
- set_current_scene.set(Some(scene.clone()));
-
- // Extract scene dimensions from bounds_wkt
- if let Some((w, h)) = parse_bounds_dimensions(&scene.bounds_wkt) {
- set_scene_dimensions.set((w as f64, h as f64));
- }
- }
- });
- }
-
- // Fetch available scenes and realm settings when realm loads
- #[cfg(feature = "hydrate")]
- {
- Effect::new(move |_| {
- let Some(realm_with_role) = realm_data.get().flatten() else {
+ let Some(scene) = entry_scene.get().flatten() else {
return;
};
+ set_channel_id.set(Some(scene.id));
- // Set allow_user_teleport from realm settings
- set_allow_user_teleport.set(realm_with_role.realm.allow_user_teleport);
-
- // Fetch scenes list for teleport command
- let current_slug = slug.get();
- if current_slug.is_empty() {
- return;
+ // Extract scene dimensions from bounds_wkt
+ if let Some((w, h)) = parse_bounds_dimensions(&scene.bounds_wkt) {
+ set_scene_dimensions.set((w as f64, h as f64));
}
-
- spawn_local(async move {
- use gloo_net::http::Request;
- let response = Request::get(&format!("/api/realms/{}/scenes", current_slug))
- .send()
- .await;
- if let Ok(resp) = response {
- if resp.ok() {
- if let Ok(scenes) = resp.json::>().await {
- // Filter out hidden scenes
- let visible_scenes: Vec = scenes
- .into_iter()
- .filter(|s| !s.is_hidden)
- .collect();
- set_available_scenes.set(visible_scenes);
- }
- }
- }
- });
});
}
@@ -919,8 +686,7 @@ pub fn RealmPage() -> impl IntoView {
let realm_name = realm.name.clone();
let realm_slug_val = realm.slug.clone();
let realm_description = realm.tagline.clone();
- // Derive online count reactively from members signal
- let online_count = Signal::derive(move || members.get().len() as i32);
+ let online_count = realm.current_user_count;
let total_members = realm.member_count;
let max_capacity = realm.max_users;
let scene_name = scene_info.0;
@@ -955,16 +721,11 @@ pub fn RealmPage() -> impl IntoView {
let realm_slug_for_viewer = realm_slug_val.clone();
#[cfg(feature = "hydrate")]
let ws_sender_clone = ws_sender.clone();
- // Read current_scene in reactive context (before .map())
- // so changes trigger re-render
- let current_scene_val = current_scene.get();
entry_scene
.get()
.map(|maybe_scene| {
match maybe_scene {
- Some(entry_scene_data) => {
- // Use current_scene if set (after teleport), otherwise use entry scene
- let display_scene = current_scene_val.clone().unwrap_or_else(|| entry_scene_data.clone());
+ Some(scene) => {
let members_signal = Signal::derive(move || members.get());
let emotion_avail_signal = Signal::derive(move || emotion_availability.get());
let skin_path_signal = Signal::derive(move || skin_preview_path.get());
@@ -986,22 +747,10 @@ pub fn RealmPage() -> impl IntoView {
let on_whisper_request_cb = Callback::new(move |target: String| {
set_whisper_target.set(Some(target));
});
- let scenes_signal = Signal::derive(move || available_scenes.get());
- let teleport_enabled_signal = Signal::derive(move || allow_user_teleport.get());
- #[cfg(feature = "hydrate")]
- let ws_for_teleport = ws_sender_clone.clone();
- let on_teleport_cb = Callback::new(move |scene_id: Uuid| {
- #[cfg(feature = "hydrate")]
- ws_for_teleport.with_value(|sender| {
- if let Some(send_fn) = sender {
- send_fn(ClientMessage::Teleport { scene_id });
- }
- });
- });
view! {
impl IntoView {
fading_members=Signal::derive(move || fading_members.get())
current_user_id=Signal::derive(move || current_user_id.get())
current_guest_session_id=Signal::derive(move || current_guest_session_id.get())
- is_guest=Signal::derive(move || is_guest.get())
on_whisper_request=on_whisper_request_cb
/>
@@ -1073,7 +818,6 @@ pub fn RealmPage() -> impl IntoView {
})
ws_sender=ws_sender_for_inv
realm_slug=Signal::derive(move || slug.get())
- is_guest=Signal::derive(move || is_guest.get())
/>
}
}
@@ -1118,7 +862,6 @@ pub fn RealmPage() -> impl IntoView {
set_skin_preview_path.set(updated.skin_layer[4].clone());
})
ws_sender=ws_sender_for_avatar
- is_guest=Signal::derive(move || is_guest.get())
/>
}
}
@@ -1210,22 +953,6 @@ pub fn RealmPage() -> impl IntoView {
/>
}
}
-
- // Reconnection overlay - shown when WebSocket disconnects
- {
- #[cfg(feature = "hydrate")]
- let ws_state_for_overlay = ws_state;
- #[cfg(not(feature = "hydrate"))]
- let ws_state_for_overlay = Signal::derive(|| crate::components::ws_client::WsState::Disconnected);
- view! {
-
- // My Inventory tab
-
-
+ // Tab content
+
-
+
diff --git a/crates/chattyness-user-ui/src/components/layout.rs b/crates/chattyness-user-ui/src/components/layout.rs
index 6892f82..9f12aac 100644
--- a/crates/chattyness-user-ui/src/components/layout.rs
+++ b/crates/chattyness-user-ui/src/components/layout.rs
@@ -42,14 +42,14 @@ pub fn RealmHeader(
realm_description: Option
+ // My Inventory tab
+
+
- // Server tab
-
-
+ // Server tab
+
+
- // Realm tab
-
-
-
-
- // Guest locked overlay
-
-/// // Modal content here
-///
-/// ```
-#[component]
-pub fn GuestLockedOverlay() -> impl IntoView {
- view! {
-
-
- }
-}
diff --git a/crates/chattyness-user-ui/src/components/reconnection_overlay.rs b/crates/chattyness-user-ui/src/components/reconnection_overlay.rs
deleted file mode 100644
index 43c3f44..0000000
--- a/crates/chattyness-user-ui/src/components/reconnection_overlay.rs
+++ /dev/null
@@ -1,399 +0,0 @@
-//! Reconnection overlay component.
-//!
-//! Displays a full-screen overlay when WebSocket connection is lost,
-//! with countdown timer and automatic retry logic.
-
-use leptos::prelude::*;
-
-use super::ws_client::WsState;
-
-/// Reconnection attempt phase.
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub enum ReconnectionPhase {
- /// Initial phase: 5 attempts with 5-second countdown each.
- Initial { attempt: u8 },
- /// Extended phase: 10 attempts with 10-second countdown each.
- Extended { attempt: u8 },
- /// All attempts exhausted.
- Failed,
-}
-
-impl ReconnectionPhase {
- /// Get the countdown duration in seconds for the current phase.
- pub fn countdown_duration(&self) -> u32 {
- match self {
- Self::Initial { .. } => 5,
- Self::Extended { .. } => 10,
- Self::Failed => 0,
- }
- }
-
- /// Get the maximum attempts for the current phase.
- pub fn max_attempts(&self) -> u8 {
- match self {
- Self::Initial { .. } => 5,
- Self::Extended { .. } => 10,
- Self::Failed => 0,
- }
- }
-
- /// Advance to the next attempt or phase.
- pub fn next(self) -> Self {
- match self {
- Self::Initial { attempt } if attempt < 5 => Self::Initial { attempt: attempt + 1 },
- Self::Initial { .. } => Self::Extended { attempt: 1 },
- Self::Extended { attempt } if attempt < 10 => Self::Extended { attempt: attempt + 1 },
- Self::Extended { .. } | Self::Failed => Self::Failed,
- }
- }
-
- /// Get the current attempt number.
- pub fn attempt(&self) -> u8 {
- match self {
- Self::Initial { attempt } | Self::Extended { attempt } => *attempt,
- Self::Failed => 0,
- }
- }
-
- /// Check if this is the initial phase.
- pub fn is_initial(&self) -> bool {
- matches!(self, Self::Initial { .. })
- }
-}
-
-/// Internal state for the reconnection overlay.
-#[derive(Clone, Copy, Debug)]
-enum OverlayState {
- /// Hidden (connected).
- Hidden,
- /// Showing countdown.
- Countdown {
- phase: ReconnectionPhase,
- remaining: u32,
- },
- /// Currently attempting to reconnect.
- Reconnecting { phase: ReconnectionPhase },
- /// All attempts failed.
- Failed,
-}
-
-/// Reconnection overlay component.
-///
-/// Shows a full-screen overlay when WebSocket connection is lost,
-/// with countdown timer and automatic retry logic.
-#[component]
-pub fn ReconnectionOverlay(
- /// WebSocket connection state to monitor.
- ws_state: Signal
-
-
- "Registered Users"
-
-
- 
-
- // Darkened backdrop
-
-
- // Dialog box
-
- }
- .into_any(),
- )
- }
- OverlayState::Reconnecting { phase } => {
- let (phase_text, attempt_text) = match phase {
- ReconnectionPhase::Initial { attempt } => {
- ("Attempt", format!("{} of 5", attempt))
- }
- ReconnectionPhase::Extended { attempt } => {
- ("Extended attempt", format!("{} of 10", attempt))
- }
- ReconnectionPhase::Failed => ("", String::new()),
- };
-
- Some(
- view! {
-
- // Countdown circle
-
-
-
- {remaining}
-
-
-
- - "Lost connection..." -
- -- {format!("attempting to reconnect in {} seconds", remaining)} -
- -- {format!("{} {}", phase_text, attempt_text)} -
-
- // Darkened backdrop
-
-
- // Dialog box
-
- }
- .into_any(),
- )
- }
- OverlayState::Failed => Some(
- view! {
-
- // Spinner
-
-
-
-
-
- - "Reconnecting..." -
- -"Attempting to restore connection"
- -- {format!("{} {}", phase_text, attempt_text)} -
-
- // Darkened backdrop
-
-
- // Dialog box
-
- }
- .into_any(),
- ),
- }
- }
-}
-
-/// Start the countdown timer.
-#[cfg(feature = "hydrate")]
-fn start_countdown_timer(
- timer_handle: std::rc::Rc
- // Error icon
-
-
-
-
-
- - "Connection Failed" -
- -- "Unable to reconnect after multiple attempts. Please check your network connection and try again." -
- - -
-
-
-
- }
-}
diff --git a/crates/chattyness-user-ui/src/components/scene_viewer.rs b/crates/chattyness-user-ui/src/components/scene_viewer.rs
index 23dff40..5f19fd2 100644
--- a/crates/chattyness-user-ui/src/components/scene_viewer.rs
+++ b/crates/chattyness-user-ui/src/components/scene_viewer.rs
@@ -56,14 +56,10 @@ pub fn RealmSceneViewer(
/// Current user's guest_session_id (for context menu filtering).
#[prop(optional, into)]
current_guest_session_id: Option
- "Select a scene to teleport to:"
- {filter_display}
-
-
- {move || {
- indexed_scenes()
- .into_iter()
- .map(|(idx, scene)| {
- let on_select = on_select.clone();
- let scene_for_click = scene.clone();
- let scene_name = scene.name.clone();
- let scene_slug = scene.slug.clone();
- let is_selected = move || selected_idx.get() == idx;
- view! {
-
- }
- })
- .collect_view()
- }}
-
-
- {move || {
- if scene_filter.get().is_empty() {
- "No scenes available"
- } else {
- "No matching scenes"
- }
- }}
-
-
- "^_"
- " navigate "
- "Enter"
- " select "
- "Esc"
- " cancel"
-
-
@@ -1032,9 +780,6 @@ pub fn RealmPage() -> impl IntoView {
on_open_settings=on_open_settings_cb
on_open_inventory=on_open_inventory_cb
whisper_target=whisper_target_signal
- scenes=scenes_signal
- allow_user_teleport=teleport_enabled_signal
- on_teleport=on_teleport_cb
/>