refactor settings

crates/coop/src/sidebar/mod.rs

@@ -331,7 +331,11 @@ impl Sidebar {
 
             // Create a new room and emit it
             async_chat.update_in(cx, |this, _window, cx| {
-                let room = cx.new(|_| Room::new(public_key, receivers).kind(RoomKind::Ongoing));
+                let room = cx.new(|_| {
+                    Room::new(public_key, receivers)
+                        .organize(&public_key)
+                        .kind(RoomKind::Ongoing)
+                });
                 this.emit_room(&room, cx);
             })?;
 

crates/settings/Cargo.toml

@@ -5,10 +5,11 @@ edition.workspace = true
 publish.workspace = true
 
 [dependencies]
-state = { path = "../state" }
+common = { path = "../common" }
 
 nostr-sdk.workspace = true
 gpui.workspace = true
+smol.workspace = true
 anyhow.workspace = true
 log.workspace = true
 smallvec.workspace = true

crates/settings/src/lib.rs

@@ -1,13 +1,11 @@
 use std::collections::{HashMap, HashSet};
 
-use anyhow::{anyhow, Context as AnyhowContext, Error};
+use anyhow::{anyhow, Error};
+use common::config_dir;
 use gpui::{App, AppContext, Context, Entity, Global, Subscription, Task};
 use nostr_sdk::prelude::*;
 use serde::{Deserialize, Serialize};
 use smallvec::{smallvec, SmallVec};
-use state::NostrRegistry;
-
-const SETTINGS_IDENTIFIER: &str = "coop:settings";
 
 pub fn init(cx: &mut App) {
     AppSettings::set_global(cx.new(AppSettings::new), cx)
@@ -133,7 +131,6 @@ impl AppSettings {
     }
 
     fn new(cx: &mut Context<Self>) -> Self {
-        let nostr = NostrRegistry::global(cx);
         let mut subscriptions = smallvec![];
 
         subscriptions.push(
@@ -143,12 +140,13 @@ impl AppSettings {
             }),
         );
 
-        subscriptions.push(
-            // Observe and automatically save settings on changes
-            cx.observe(&nostr, |this, _state, cx| {
+        cx.defer(|cx| {
+            let settings = AppSettings::global(cx);
+
+            settings.update(cx, |this, cx| {
                 this.load(cx);
-            }),
-        );
+            });
+        });
 
         Self {
             values: Settings::default(),
@@ -164,21 +162,11 @@ impl AppSettings {
 
     /// Load settings
     fn load(&mut self, cx: &mut Context<Self>) {
-        let nostr = NostrRegistry::global(cx);
-        let client = nostr.read(cx).client();
-
         let task: Task<Result<Settings, Error>> = cx.background_spawn(async move {
-            let signer = client.signer().context("Signer not found")?;
-            let public_key = signer.get_public_key().await?;
+            let path = config_dir().join(".settings");
 
-            let filter = Filter::new()
-                .kind(Kind::ApplicationSpecificData)
-                .identifier(SETTINGS_IDENTIFIER)
-                .author(public_key)
-                .limit(1);
-
-            if let Some(event) = client.database().query(filter).await?.last_owned() {
-                Ok(serde_json::from_str(&event.content)?)
+            if let Ok(content) = smol::fs::read_to_string(&path).await {
+                Ok(serde_json::from_str(&content)?)
             } else {
                 Err(anyhow!("Not found"))
             }
@@ -198,23 +186,14 @@ impl AppSettings {
 
     /// Save settings
     pub fn save(&mut self, cx: &mut Context<Self>) {
-        let nostr = NostrRegistry::global(cx);
-        let client = nostr.read(cx).client();
         let settings = self.values.clone();
 
         let task: Task<Result<(), Error>> = cx.background_spawn(async move {
-            let signer = client.signer().context("Signer not found")?;
-            let public_key = signer.get_public_key().await?;
+            let path = config_dir().join(".settings");
             let content = serde_json::to_string(&settings)?;
 
-            let event = EventBuilder::new(Kind::ApplicationSpecificData, content)
-                .tag(Tag::identifier(SETTINGS_IDENTIFIER))
-                .build(public_key)
-                .sign(&Keys::generate())
-                .await?;
-
-            // Save event to the local database only
-            client.database().save_event(&event).await?;
+            // Write settings to file
+            smol::fs::write(&path, content).await?;
 
             Ok(())
         });

crates/state/src/constants.rs

@@ -13,7 +13,7 @@ pub const APP_ID: &str = "su.reya.coop";
 pub const KEYRING: &str = "Coop Safe Storage";
 
 /// Default timeout for subscription
-pub const TIMEOUT: u64 = 3;
+pub const TIMEOUT: u64 = 2;
 
 /// Default delay for searching
 pub const FIND_DELAY: u64 = 600;

crates/ui/src/input/state.rs

@@ -1009,8 +1009,7 @@ impl InputState {
         let left_part = self.text.slice(0..offset).to_string();
 
         UnicodeSegmentation::split_word_bound_indices(left_part.as_str())
-            .filter(|(_, s)| !s.trim_start().is_empty())
-            .next_back()
+            .rfind(|(_, s)| !s.trim_start().is_empty())
             .map(|(i, _)| i)
             .unwrap_or(0)
     }

crates/ui/src/menu/popup_menu.rs

@@ -1094,13 +1094,10 @@ impl Render for PopupMenu {
         self.update_submenu_menu_anchor(window);
 
         let max_width = self.max_width();
-        let max_height = self.max_height.map_or_else(
-            || {
-                let window_half_height = window.window_bounds().get_bounds().size.height * 0.5;
-                window_half_height.min(px(450.))
-            },
-            |height| height,
-        );
+        let max_height = self.max_height.unwrap_or_else(|| {
+            let window_half_height = window.window_bounds().get_bounds().size.height * 0.5;
+            window_half_height.min(px(450.))
+        });
 
         let view = cx.entity().clone();
         let items_count = self.menu_items.len();

rust-toolchain.toml

@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.91"
+channel = "1.92"
 profile = "minimal"
 components = ["rustfmt", "clippy"]
 targets = [