Rename sender to more accurate client.

src/main.rs

@@ -11,8 +11,8 @@ use clap::Clap;
 use tokio::runtime;
 use tokio::sync::mpsc;
 
+mod client;
 mod config;
-mod sender;
 mod spool;
 
 use crate::config::*;
@@ -86,11 +86,11 @@ fn main() {
 
     // Init each account and put outgoing channels into a table for later reference.
     for cc in config.accounts.iter() {
-        match rt.block_on(sender::create_and_auth_client(cc.1.clone())) {
+        match rt.block_on(client::create_and_auth_client(cc.1.clone())) {
             Ok(c) => {
                 let (send, recv) = mpsc::channel(2); // FIXME configurable
                 clients.insert(cc.0.clone(), send);
-                sender_futs.push(sender::submit_messages(c, recv));
+                sender_futs.push(client::submit_messages(c, recv));
             }
             Err(e) => {
                 eprintln!("[init] error: client setup failed: {:?}", e);

src/spool.rs

@@ -25,8 +25,8 @@ use ruma_client_api::r0::message as rumamessage;
 use ruma_events::{self, room::message::*};
 use ruma_identifiers::RoomId;
 
+use crate::client;
 use crate::config::{self, *};
-use crate::sender;
 
 type MatrixClient = Client<HttpsConnector<HttpConnector<GaiResolver>>>;
 type MessageRequest = rumamessage::create_message_event::Request;
@@ -62,7 +62,7 @@ struct SpoolAction {
 
 pub async fn start_spoolers(
     conf: Config,
-    client_chans: HashMap<String, mpsc::Sender<sender::Message>>,
+    client_chans: HashMap<String, mpsc::Sender<client::Message>>,
 ) -> Result<(), Error> {
     for sd in conf.spool_dirs {
         let chan = client_chans
@@ -83,7 +83,7 @@ pub async fn start_spoolers(
 async fn do_watch_dir(
     inot: tokio_inotify::AsyncINotify,
     sdc: config::SpoolDir,
-    mut dest: mpsc::Sender<sender::Message>,
+    mut dest: mpsc::Sender<client::Message>,
 ) {
     let mut iter = inot.compat();
     while let Some(ent) = iter.next().await {
@@ -105,7 +105,7 @@ async fn do_watch_dir(
                 };
 
                 let msg =
-                    sender::Message::new_delay(sdc.dest_room_id.clone(), s, sdc.send_delay_sec);
+                    client::Message::new_delay(sdc.dest_room_id.clone(), s, sdc.send_delay_sec);
                 let tout = time::Duration::from_secs(30);
                 dest.send_timeout(msg, tout)
                     .map_err(|_| ())