Merge pull request #1644 from squidowl/add-reactions

Add reactions

Author: casperstorm

CHANGELOG.md

@@ -6,6 +6,7 @@ Added:
 - Emoji and command picker entries are now clickable and insert the selected completion directly into the input.
 - Multi-line send support (uses IRCv3 [`multiline`](https://ircv3.net/specs/extensions/multiline) when available)
 - Typing indicator support (uses IRCv3 [`typing`](https://ircv3.net/specs/client-tags/typing))
+- Add emoji reactions for supported servers (uses IRCv3 [`react`](https://ircv3.net/specs/client-tags/react.html))
 
 Fixed:
 

README.md

@@ -39,6 +39,7 @@ Halloy is also available from [Flathub](https://flathub.org/apps/org.squidowl.ha
     * [msgid](https://ircv3.net/specs/extensions/message-ids)
     * [multi-prefix](https://ircv3.net/specs/extensions/multi-prefix)
     * [multiline](https://ircv3.net/specs/extensions/multiline)
+    * [react](https://ircv3.net/specs/client-tags/react.html)
     * [read-marker](https://ircv3.net/specs/extensions/read-marker)
     * [sasl-3.1](https://ircv3.net/specs/extensions/sasl-3.1)
     * [server-time](https://ircv3.net/specs/extensions/server-time)

assets/fontello/config.json

@@ -257,6 +257,12 @@
       "css": "menu-1",
       "code": 59422,
       "src": "typicons"
+    },
+    {
+      "uid": "70370693ada58ef0a60fa0984fe8d52a",
+      "css": "plus-1",
+      "code": 59424,
+      "src": "entypo"
     }
   ]
 }

book/src/README.md

@@ -22,6 +22,7 @@
     * [msgid](https://ircv3.net/specs/extensions/message-ids)
     * [multi-prefix](https://ircv3.net/specs/extensions/multi-prefix)
     * [multiline](https://ircv3.net/specs/extensions/multiline)
+    * [react](https://ircv3.net/specs/client-tags/react.html)
     * [read-marker](https://ircv3.net/specs/extensions/read-marker)
     * [sasl-3.1](https://ircv3.net/specs/extensions/sasl-3.1)
     * [server-time](https://ircv3.net/specs/extensions/server-time)

data/src/client.rs

@@ -3814,7 +3814,15 @@ impl Client {
 
     fn can_send_typing(&self) -> bool {
         self.capabilities.acknowledged(Capability::MessageTags)
-            && !isupport::is_client_only_tag_denied(&self.isupport, "typing")
+            && isupport::is_client_tag_allowed(&self.isupport, "typing")
+    }
+
+    fn can_send_reactions(&self) -> bool {
+        self.capabilities.acknowledged(Capability::MessageTags)
+            && isupport::is_client_tag_allowed(&self.isupport, "draft/react")
+            && isupport::is_client_tag_allowed(&self.isupport, "draft/unreact")
+            && (isupport::is_client_tag_allowed(&self.isupport, "draft/reply")
+                || isupport::is_client_tag_allowed(&self.isupport, "reply"))
     }
 
     pub fn is_channel(&self, target: &str) -> bool {
@@ -4301,6 +4309,10 @@ impl Map {
         self.client(server).is_some_and(Client::supports_typing)
     }
 
+    pub fn get_server_can_send_reactions(&self, server: &Server) -> bool {
+        self.client(server).is_some_and(Client::can_send_reactions)
+    }
+
     pub fn get_server_can_send_typing(&self, server: &Server) -> bool {
         self.client(server).is_some_and(Client::can_send_typing)
     }

data/src/command.rs

@@ -1,3 +1,4 @@
+use std::borrow::Cow;
 use std::collections::HashMap;
 use std::str::FromStr;
 
@@ -47,12 +48,12 @@ pub enum Irc {
     React {
         target: String,
         msgid: message::Id,
-        text: String,
+        text: Cow<'static, str>,
     },
     Unreact {
         target: String,
         msgid: message::Id,
-        text: String,
+        text: Cow<'static, str>,
     },
     Me(String, String),
     Whois(Option<String>, String),
@@ -1263,12 +1264,12 @@ impl TryFrom<Irc> for proto::Message {
             Irc::React { msgid, text, .. } => tags![
                 "+reply" => msgid.to_string(),
                 "+draft/reply" => msgid.to_string(),
-                "+draft/react" => text,
+                "+draft/react" => text.as_ref(),
             ],
             Irc::Unreact { msgid, text, .. } => tags![
                 "+reply" => msgid.to_string(),
                 "+draft/reply" => msgid.to_string(),
-                "+draft/unreact" => text,
+                "+draft/unreact" => text.as_ref(),
             ],
             Irc::Typing { value, .. } => tags!["+typing" => value.as_str()],
             _ => tags![],

data/src/history.rs

@@ -1009,7 +1009,9 @@ pub fn insert_message(
     if let Some(index) = replace_at {
         if messages[index].server_time == message.server_time {
             if has_matching_content(&messages[index], &message, false) {
-                messages[index].id = message.id;
+                if let Some(id) = message.id {
+                    messages[index].id = Some(id);
+                }
                 messages[index].received_at = message.received_at;
             } else {
                 messages[index] = message;

data/src/isupport.rs

@@ -1339,3 +1339,10 @@ pub fn is_client_only_tag_denied(
 
     tag_denied || (has_deny_all && !tag_allowed)
 }
+
+pub fn is_client_tag_allowed(
+    isupport: &HashMap<Kind, Parameter>,
+    tag: &str,
+) -> bool {
+    !is_client_only_tag_denied(isupport, tag)
+}

fonts/halloy-icons.ttf

@@ -1,3 +1,4 @@
+use std::borrow::Cow;
 use std::path::PathBuf;
 
 use chrono::{DateTime, Utc};
@@ -205,6 +206,36 @@ impl Buffer {
         }
     }
 
+    pub fn reaction_message(
+        &self,
+        msgid: message::Id,
+        text: Cow<'static, str>,
+        unreact: bool,
+    ) -> Option<Message> {
+        match self {
+            Buffer::Channel(_) => Some(Message::Channel(
+                channel::Message::ScrollView(if unreact {
+                    scroll_view::Message::Unreacted { msgid, text }
+                } else {
+                    scroll_view::Message::Reacted { msgid, text }
+                }),
+            )),
+            Buffer::Query(_) => {
+                Some(Message::Query(query::Message::ScrollView(if unreact {
+                    scroll_view::Message::Unreacted { msgid, text }
+                } else {
+                    scroll_view::Message::Reacted { msgid, text }
+                })))
+            }
+            Buffer::Empty
+            | Buffer::Server(_)
+            | Buffer::FileTransfers(_)
+            | Buffer::Logs(_)
+            | Buffer::Highlights(_)
+            | Buffer::ChannelDiscovery(_) => None,
+        }
+    }
+
     pub fn update(
         &mut self,
         message: Message,