1 files changed, 11 insertions, 16 deletions
diff --git a/lampada/src/connection/mod.rs b/lampada/src/connection/mod.rs
index 3a3187f..51c3758 100644
--- a/lampada/src/connection/mod.rs
+++ b/lampada/src/connection/mod.rs
@@ -7,7 +7,7 @@ use std::{
     time::Duration,
 };
 
-use jid::JID;
+use jid::{BareJID, FullJID, JID};
 use luz::jabber_stream::bound_stream::BoundJabberStream;
 use read::{ReadControl, ReadControlHandle, ReadState};
 use stanza::{client::Stanza, stream_error::Error as StreamError};
@@ -121,12 +121,11 @@ where
                                 break
                             }
 
-                            let mut jid = self.connected.jid.clone();
-                            let mut domain = jid.domainpart.clone();
+                            let mut jid = self.connected.jid.clone().into();
                             // TODO: make sure connect_and_login does not modify the jid, but instead returns a jid. or something like that
-                            let connection = luz::connect_and_login(&mut jid, &*self.password, &mut domain).await;
+                            let connection = luz::connect_and_login(&jid, &*self.password).await;
                             match connection {
-                                Ok(c) => {
+                                Ok((c, full_jid)) => {
                                     let (read, write) = c.split();
                                     let (send, recv) = oneshot::channel();
                                     self.writer_crash = recv;
@@ -169,12 +168,11 @@ where
                         else => break,
                     };
 
-                    let mut jid = self.connected.jid.clone();
-                    let mut domain = jid.domainpart.clone();
+                    let mut jid = self.connected.jid.clone().into();
                     // TODO: same here
-                    let connection = luz::connect_and_login(&mut jid, &*self.password, &mut domain).await;
+                    let connection = luz::connect_and_login(&jid, &*self.password).await;
                     match connection {
-                        Ok(c) => {
+                        Ok((c, full_jid)) => {
                             let (read, write) = c.split();
                             let (send, recv) = oneshot::channel();
                             self.writer_crash = recv;
@@ -214,11 +212,10 @@ where
                         else => break,
                     };
 
-                    let mut jid = self.connected.jid.clone();
-                    let mut domain = jid.domainpart.clone();
-                    let connection = luz::connect_and_login(&mut jid, &*self.password, &mut domain).await;
+                    let mut jid = self.connected.jid.clone().into();
+                    let connection = luz::connect_and_login(&jid, &*self.password).await;
                     match connection {
-                        Ok(c) => {
+                        Ok((c, full_jid)) => {
                             let (read, write) = c.split();
                             let (send, recv) = oneshot::channel();
                             self.writer_crash = recv;
@@ -305,8 +302,7 @@ impl SupervisorHandle {
     pub fn new<Lgc>(
         streams: BoundJabberStream,
         on_crash: oneshot::Sender<()>,
-        jid: JID,
-        server: JID,
+        jid: FullJID,
         password: Arc<String>,
         logic: Lgc,
     ) -> (WriteHandle, Self)
@@ -327,7 +323,6 @@ impl SupervisorHandle {
         let connected = Connected {
             jid,
             write_handle: write_handle.clone(),
-            server,
         };
 
         let supervisor_sender = SupervisorSender {