Keep input module locked down

squidowl · Jun 28, 2023 · 322ec2e · 322ec2e
1 parent ff679d1
commit 322ec2e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/data/src/input.rs b/data/src/input.rs
@@ -17,11 +17,18 @@ pub fn parse(buffer: Buffer, input: &str) -> Result<Input, command::Error> {
 
 #[derive(Debug, Clone)]
 pub struct Input {
-    pub buffer: Buffer,
-    pub content: Content,
+    buffer: Buffer,
+    content: Content,
 }
 
 impl Input {
+    pub fn command(buffer: Buffer, command: Command) -> Self {
+        Self {
+            buffer,
+            content: Content::Command(command),
+        }
+    }
+
     pub fn server(&self) -> &Server {
         self.buffer.server()
     }
@@ -74,7 +81,7 @@ impl Input {
 }
 
 #[derive(Debug, Clone)]
-pub enum Content {
+enum Content {
     Text(String),
     Command(Command),
 }

diff --git a/src/buffer/channel.rs b/src/buffer/channel.rs
@@ -221,10 +221,11 @@ mod nick_list {
         match message {
             Message::Whois(user) => {
                 let command = data::Command::Whois(None, user.nickname().to_string());
-                let input = data::Input {
-                    buffer: data::Buffer::Channel(server.clone(), channel.to_string()),
-                    content: data::input::Content::Command(command),
-                };
+
+                let input = data::Input::command(
+                    data::Buffer::Channel(server.clone(), channel.to_string()),
+                    command,
+                );
 
                 if let Some(encoded) = input.encoded() {
                     clients.send(server, encoded);