improve handling of trailing strings

1 files changed, 6 insertions, 9 deletions

diff --git a/src/server_int.rs b/src/server_int.rs
index b5077db..cd6d52b 100644
--- a/src/server_int.rs
+++ b/src/server_int.rs
@@ -72,24 +72,21 @@ impl Message {
 
         message.command = part.next()
             .map_or(String::new(), |x| x.to_string().to_uppercase());
-        let mut is_trailing = false;
         let mut trailing = String::new();
         while let Some(p) = part.next() {
             if p.starts_with(":") {
-                is_trailing = true;
                 trailing = p.to_string();
                 trailing.remove(0);
-                trailing.push(' ');
-            } else if is_trailing {
-                trailing.push_str(p);
-                trailing.push(' ');
+                while let Some(p) = part.next() {
+                    trailing.push(' ');
+                    trailing.push_str(p);
+                }
+                message.params.push(trailing.to_string());
+                break;
             } else {
                 message.params.push(p.to_string());
             }
         }
-        if is_trailing {
-            message.params.push(trailing.trim().to_string());
-        }
 
         message
     }