bin/ircd: rename p2p_notifiers to notify_clients

bin/ircd/src/irc/client.rs

@@ -40,7 +40,7 @@ pub struct IrcClient<C: AsyncRead + AsyncWrite + Send + Unpin + 'static> {
 
     // p2p
     p2p: P2pPtr,
-    p2p_notifiers: SubscriberPtr<Privmsg>,
+    notify_clients: SubscriberPtr<Privmsg>,
     subscription: Subscription<Privmsg>,
 }
 
@@ -51,10 +51,10 @@ impl<C: AsyncRead + AsyncWrite + Send + Unpin + 'static> IrcClient<C> {
         buffers: Buffers,
         irc_config: IrcConfig,
         p2p: P2pPtr,
-        p2p_notifiers: SubscriberPtr<Privmsg>,
+        notify_clients: SubscriberPtr<Privmsg>,
         subscription: Subscription<Privmsg>,
     ) -> Self {
-        Self { write_stream, address, buffers, irc_config, p2p, p2p_notifiers, subscription }
+        Self { write_stream, address, buffers, irc_config, p2p, notify_clients, subscription }
     }
 
     /// Start listening for messages came from p2p network or irc client
@@ -215,7 +215,7 @@ impl<C: AsyncRead + AsyncWrite + Send + Unpin + 'static> IrcClient<C> {
                     (msg.nickname == self.irc_config.nickname && !msg.target.starts_with('#'));
 
                 if is_dm {
-                    self.p2p_notifiers.notify_by_id(msg.clone(), self.subscription.get_id()).await;
+                    self.notify_clients.notify_by_id(msg.clone(), self.subscription.get_id()).await;
                 }
             }
             drop(privmsgs_buffer);
@@ -479,7 +479,7 @@ impl<C: AsyncRead + AsyncWrite + Send + Unpin + 'static> IrcClient<C> {
             (*self.buffers.unread_msgs.lock().await).insert(&privmsg);
         }
 
-        self.p2p_notifiers
+        self.notify_clients
             .notify_with_exclude(privmsg.clone(), &[self.subscription.get_id()])
             .await;
 
@@ -521,7 +521,7 @@ impl<C: AsyncRead + AsyncWrite + Send + Unpin + 'static> IrcClient<C> {
             if !self.irc_config.capabilities.get("no-history").unwrap() {
                 for msg in self.buffers.privmsgs.lock().await.iter() {
                     if msg.target == *chan {
-                        self.p2p_notifiers
+                        self.notify_clients
                             .notify_by_id(msg.clone(), self.subscription.get_id())
                             .await;
                     }

bin/ircd/src/irc/mod.rs

@@ -82,7 +82,7 @@ pub struct IrcServer {
     irc_config: IrcConfig,
     buffers: Buffers,
     p2p: P2pPtr,
-    p2p_notifiers: SubscriberPtr<Privmsg>,
+    notify_clients: SubscriberPtr<Privmsg>,
 }
 
 impl IrcServer {
@@ -90,10 +90,10 @@ impl IrcServer {
         settings: Args,
         buffers: Buffers,
         p2p: P2pPtr,
-        p2p_notifiers: SubscriberPtr<Privmsg>,
+        notify_clients: SubscriberPtr<Privmsg>,
     ) -> Result<Self> {
         let irc_config = IrcConfig::new(&settings)?;
-        Ok(Self { settings, irc_config, buffers, p2p, p2p_notifiers })
+        Ok(Self { settings, irc_config, buffers, p2p, notify_clients })
     }
 
     /// Start listening to new irc clients connecting to the irc server address
@@ -145,7 +145,7 @@ impl IrcServer {
         let reader = BufReader::new(reader);
 
         // New subscription
-        let p2p_subscription = self.p2p_notifiers.clone().subscribe().await;
+        let client_subscription = self.notify_clients.clone().subscribe().await;
 
         // New irc connection
         let mut client = IrcClient::new(
@@ -154,8 +154,8 @@ impl IrcServer {
             self.buffers.clone(),
             self.irc_config.clone(),
             self.p2p.clone(),
-            self.p2p_notifiers.clone(),
-            p2p_subscription,
+            self.notify_clients.clone(),
+            client_subscription,
         );
 
         executor

bin/ircd/src/main.rs

@@ -52,13 +52,13 @@ impl fmt::Display for KeyPair {
 }
 
 struct Ircd {
-    p2p_notifiers: SubscriberPtr<Privmsg>,
+    notify_clients: SubscriberPtr<Privmsg>,
 }
 
 impl Ircd {
     fn new() -> Self {
-        let p2p_notifiers = Subscriber::new();
-        Self { p2p_notifiers }
+        let notify_clients = Subscriber::new();
+        Self { notify_clients }
     }
 
     async fn start(
@@ -69,11 +69,11 @@ impl Ircd {
         p2p_receiver: Receiver<Privmsg>,
         executor: Arc<Executor<'_>>,
     ) -> Result<()> {
-        let p2p_notifiers = self.p2p_notifiers.clone();
+        let notify_clients = self.notify_clients.clone();
         executor
             .spawn(async move {
                 while let Ok(msg) = p2p_receiver.recv().await {
-                    p2p_notifiers.notify(msg).await;
+                    notify_clients.notify(msg).await;
                 }
             })
             .detach();
@@ -82,7 +82,7 @@ impl Ircd {
             settings.clone(),
             buffers.clone(),
             p2p.clone(),
-            self.p2p_notifiers.clone(),
+            self.notify_clients.clone(),
         )
         .await?;