Forráskód Böngészése

app: update tor settings

darkfi 1 éve
szülő
commit
8c68819714

+ 2 - 2
bin/app/src/app/schema/chat.rs

@@ -123,7 +123,7 @@ mod ui_consts {
     use crate::gfx::{Point, Rectangle};
 
     // Chat UI
-    pub const CHANNEL_LABEL_Y: f32 = 30.;
+    pub const CHANNEL_LABEL_Y: f32 = 12.;
     pub const CHANNEL_LABEL_BASELINE: f32 = 37.;
     pub const BACKARROW_SCALE: f32 = 15.;
     pub const BACKARROW_X: f32 = 38.;
@@ -339,7 +339,7 @@ pub async fn make(
     node.register("shortcut", slot).unwrap();
     let listen_enter = app.ex.spawn(async move {
         while let Ok(_) = recvr.recv().await {
-            goback();
+            goback().await;
         }
     });
     app.tasks.lock().unwrap().push(listen_enter);

+ 5 - 5
bin/app/src/plugin/darkirc.rs

@@ -211,24 +211,24 @@ impl DarkIrc {
 
             p2p_settings.seeds.push(
                 url::Url::parse(
-                    "tor://czzulj66rr5kq3uhidzn7fh4qvt3vaxaoldukuxnl5vipayuj7obo7id.onion:5263",
+                    "tor://g7fxelebievvpr27w7gt24lflptpw3jeeuvafovgliq5utdst6xyruyd.onion:25552"
                 )
                 .unwrap(),
             );
             p2p_settings.seeds.push(
                 url::Url::parse(
-                    "tor://vgbfkcu5hcnlnwd2lz26nfoa6g6quciyxwbftm6ivvrx74yvv5jnaoid.onion:5273",
+                    "tor://yvklzjnfmwxhyodhrkpomawjcdvcaushsj6torjz2gyd7e25f3gfunyd.onion:25552"
                 )
                 .unwrap(),
             );
+            p2p_settings.allowed_transports = vec!["tor".to_string()];
         } else {
             i!("Setup P2P network [clearnet]");
             p2p_settings.outbound_connect_timeout = 40;
             p2p_settings.channel_handshake_timeout = 30;
 
-            p2p_settings.seeds.push(url::Url::parse("tcp+tls://lilith1.dark.fi:5262").unwrap());
-            p2p_settings.seeds.push(url::Url::parse("tcp+tls://agorism.dev:26661").unwrap());
-            p2p_settings.seeds.push(url::Url::parse("tcp+tls://agorism.dev:26671").unwrap());
+            p2p_settings.seeds.push(url::Url::parse("tcp+tls://lilith0.dark.fi:25551").unwrap());
+            p2p_settings.seeds.push(url::Url::parse("tcp+tls://lilith1.dark.fi:25551").unwrap());
         }
         p2p_settings.p2p_datastore = p2p_datastore_path().into_os_string().into_string().ok();
         p2p_settings.hostlist = hostlist_path().into_os_string().into_string().ok();

+ 5 - 1
bin/app/src/ui/chatedit.rs

@@ -634,6 +634,10 @@ impl ChatEdit {
                 if mods.shift {
                     drv.insert_or_replace_selection("\n");
                     editor.on_buffer_changed(atom);
+                } else {
+                    //let node = self.node.upgrade().unwrap();
+                    //node.trigger("enter_pressed", vec![]).await.unwrap();
+                    return false;
                 }
             }
             KeyCode::Delete => {
@@ -1579,7 +1583,7 @@ impl UIObject for ChatEdit {
         }
         drop(drv);
         drop(txt_ctx);
-        editor.on_buffer_changed(atom);
+        editor.on_buffer_changed(atom).await;
         drop(editor);
 
         self.redraw().await;

+ 3 - 3
bin/app/src/ui/chatview/page.rs

@@ -155,7 +155,7 @@ impl PrivMessage {
             return mesh.clone()
         }
 
-        t!("gen_mesh({})", glyph_str(&self.unwrapped_glyphs));
+        //t!("gen_mesh({})", glyph_str(&self.unwrapped_glyphs));
         let mut mesh = MeshBuilder::new();
 
         if self.is_selected {
@@ -992,13 +992,13 @@ impl MessageBuffer {
                     if newer_date != older_date {
                         let datemsg = self.get_date_msg(newer_date, font_size, window_scale);
                         let datemsg = unsafe { &mut *(datemsg as *mut Message) };
-                        t!("Adding date: {idx} {datemsg:?}");
+                        //t!("Adding date: {idx} {datemsg:?}");
                         yield datemsg;
                     }
                 }
                 last_date = Some(older_date);
 
-                t!("{idx} {msg:?}");
+                //t!("{idx} {msg:?}");
                 yield msg;
             }