Reroute Ergo/Solanum mass-message targets to the server buffer.

Author: andymandias

data/src/command.rs

@@ -107,11 +107,15 @@ impl Irc {
         casemapping: isupport::CaseMap,
         supports_echoes: bool,
     ) -> Option<Vec<Message>> {
-        let to_targets = |target: &str, source| {
+        let to_message_target = |target: &str, source| {
+            if target == "*" || target.starts_with('$') {
+                return message::Target::Server { source };
+            }
+
             let target =
                 Target::parse(target, chantypes, statusmsg, casemapping);
 
-            let message_target = match &target {
+            match &target {
                 Target::Channel(channel) => message::Target::Channel {
                     channel: channel.clone(),
                     source,
@@ -121,17 +125,15 @@ impl Irc {
                     query: query.clone(),
                     source,
                 },
-            };
-
-            (target, message_target)
+            }
         };
 
         match self {
             Irc::Msg(targets, text) => Some(
                 targets
                     .split(',')
                     .map(|target| {
-                        let (target, message_target) = to_targets(
+                        let message_target = to_message_target(
                             target,
                             message::Source::User(user.clone()),
                         );
@@ -155,7 +157,7 @@ impl Irc {
                 targets
                     .split(',')
                     .map(|target| {
-                        let (target, message_target) = to_targets(
+                        let message_target = to_message_target(
                             target,
                             message::Source::User(user.clone()),
                         );
@@ -176,7 +178,7 @@ impl Irc {
                     .collect(),
             ),
             Irc::Me(target, action) => {
-                let (_, message_target) = to_targets(
+                let message_target = to_message_target(
                     target,
                     message::Source::Action(Some(user.clone())),
                 );

data/src/message.rs

@@ -2260,7 +2260,7 @@ fn target(
                 }
             };
 
-            if target == "*" {
+            if target == "*" || target.starts_with('$') {
                 let source = user.map_or(Source::Server(None), source);
 
                 return Some((Target::Server { source }, None));