invite-notify

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Unreleased
 
+Added:
+
+- IRCv3 capability `userhost-in-names` support added
+- IRCv3 capability `invite-notify` support added
+
 # 2023.4 (2023-08-03)
 
 Added:

README.md

@@ -47,12 +47,16 @@ cargo run --release
 
 Halloy supports the following IRCv3.2 capabilities
 
-- `away-notify`
-- `batch`
-- `server-time`
-- `sasl=PLAIN,EXTERNAL`
-- `labeled-response`
-- `echo-message` (server must also support `labeled-response`)
+| Capabilities                                                              |
+|---------------------------------------------------------------------------|
+| [away-notify](https://ircv3.net/specs/extensions/away-notify)             |
+| [batch](https://ircv3.net/specs/extensions/batch)                         |
+| [server-time](https://ircv3.net/specs/extensions/server-time)             |
+| [labeled-response](https://ircv3.net/specs/extensions/labeled-response)   |
+| [echo-message](https://ircv3.net/specs/extensions/echo-message)           |
+| [invite-notify](https://ircv3.net/specs/extensions/invite-notify)         |
+| [userhost-in-names](https://ircv3.net/specs/extensions/userhost-in-names) |
+| [sasl-3.1](https://ircv3.net/specs/extensions/sasl-3.1)                   |
 
 ## Why?
 <div align="center">
@@ -66,10 +70,6 @@ Halloy supports the following IRCv3.2 capabilities
 
 Halloy is released under the GPL-3.0 License. For more details, see the [LICENSE](LICENSE) file.
 
-## Disclaimer
-
-Halloy is still in the early stages of development. Bugs and incomplete features may be present. Use it at your own risk.
-
 ## Contact
 
 For any questions, suggestions, or issues, please open an issue on the [GitHub repository](https://github.com/squidowl/halloy/issues).

data/src/client.rs

@@ -45,6 +45,11 @@ pub enum Brodcast {
         ourself: bool,
         channels: Vec<String>,
     },
+    Invite {
+        inviter: User,
+        channel: String,
+        user_channels: Vec<String>,
+    },
 }
 
 #[derive(Debug)]
@@ -272,6 +277,12 @@ impl Client {
 
                     let contains = |s| self.listed_caps.iter().any(|cap| cap == s);
 
+                    if contains("invite-notify") {
+                        requested.push("invite-notify");
+                    }
+                    if contains("userhost-in-names") {
+                        requested.push("userhost-in-names");
+                    }
                     if contains("away-notify") {
                         requested.push("away-notify");
                     }
@@ -361,6 +372,17 @@ impl Client {
                     }
                 }
             }
+            Command::INVITE(user, channel) => {
+                let user = User::from(Nick::from(user.as_str()));
+                let inviter = message.user()?;
+                let user_channels = self.user_channels(user.nickname());
+
+                return Some(vec![Event::Brodcast(Brodcast::Invite {
+                    inviter,
+                    channel: channel.clone(),
+                    user_channels,
+                })]);
+            }
             Command::NICK(nick) => {
                 let old_user = message.user()?;
                 let ourself = self.nickname() == old_user.nickname();

data/src/history/manager.rs

@@ -320,6 +320,11 @@ impl Manager {
                     )
                 }
             }
+            Broadcast::Invite {
+                inviter,
+                channel,
+                user_channels,
+            } => message::broadcast::invite(inviter, channel, user_channels),
         };
 
         messages.into_iter().for_each(|message| {
@@ -519,4 +524,9 @@ pub enum Broadcast {
         ourself: bool,
         user_channels: Vec<String>,
     },
+    Invite {
+        inviter: Nick,
+        channel: String,
+        user_channels: Vec<String>,
+    },
 }

data/src/message/broadcast.rs

@@ -145,3 +145,13 @@ pub fn nickname(
 
     expand(channels, queries, false, Cause::Server(None), text)
 }
+
+pub fn invite(
+    inviter: Nick,
+    channel: String,
+    channels: impl IntoIterator<Item = String>,
+) -> Vec<Message> {
+    let text = format!(" ∙ {inviter} invited you to join {channel}");
+
+    expand(channels, [], false, Cause::Server(None), text)
+}

src/main.rs

@@ -338,6 +338,20 @@ impl Application for Halloy {
                                             channels,
                                         );
                                     }
+                                    data::client::Brodcast::Invite {
+                                        inviter,
+                                        channel,
+                                        user_channels,
+                                    } => {
+                                        let inviter = inviter.nickname();
+
+                                        dashboard.broadcast_invite(
+                                            &server,
+                                            inviter.to_owned(),
+                                            channel,
+                                            user_channels,
+                                        );
+                                    }
                                 },
                             }
                         }

src/screen/dashboard.rs

@@ -707,6 +707,23 @@ impl Dashboard {
         );
     }
 
+    pub fn broadcast_invite(
+        &mut self,
+        server: &Server,
+        inviter: Nick,
+        channel: String,
+        user_channels: Vec<String>,
+    ) {
+        self.history.broadcast(
+            server,
+            Broadcast::Invite {
+                inviter,
+                channel,
+                user_channels,
+            },
+        );
+    }
+
     pub fn broadcast_connecting(&mut self, server: &Server) {
         self.history.broadcast(server, Broadcast::Connecting);
     }