diff --git a/crates/projection-irc/src/commands/mod.rs b/crates/projection-irc/src/commands/mod.rs index 98decf1..8df7a93 100644 --- a/crates/projection-irc/src/commands/mod.rs +++ b/crates/projection-irc/src/commands/mod.rs @@ -1,6 +1,6 @@ use lavina_core::prelude::Str; use lavina_core::repo::Storage; -use proto_irc::response::SendResponse; +use proto_irc::response::WriteResponse; use std::future::Future; use tokio::io::AsyncWrite; diff --git a/crates/projection-irc/src/commands/whois/error.rs b/crates/projection-irc/src/commands/whois/error.rs index e2e0d6b..2b8f3c4 100644 --- a/crates/projection-irc/src/commands/whois/error.rs +++ b/crates/projection-irc/src/commands/whois/error.rs @@ -1,7 +1,7 @@ use tokio::io::{AsyncWrite, AsyncWriteExt}; use lavina_core::prelude::Str; -use proto_irc::response::SendResponse; +use proto_irc::response::WriteResponse; /// ERR_NOSUCHNICK (401) pub struct ErrNoSuchNick401 { @@ -33,7 +33,7 @@ impl ErrNoNicknameGiven431 { } } -impl SendResponse for ErrNoSuchNick401 { +impl WriteResponse for ErrNoSuchNick401 { async fn write_response(self, writer: &mut (impl AsyncWrite + Unpin)) -> std::io::Result<()> { writer.write_all(b"401 ").await?; writer.write_all(self.client.as_bytes()).await?; @@ -45,7 +45,7 @@ impl SendResponse for ErrNoSuchNick401 { } } -impl SendResponse for ErrNoNicknameGiven431 { +impl WriteResponse for ErrNoNicknameGiven431 { async fn write_response(self, writer: &mut (impl AsyncWrite + Unpin)) -> std::io::Result<()> { writer.write_all(b"431").await?; writer.write_all(self.client.as_bytes()).await?; @@ -55,7 +55,7 @@ impl SendResponse for ErrNoNicknameGiven431 { } } -impl SendResponse for ErrNoSuchServer402 { +impl WriteResponse for ErrNoSuchServer402 { async fn write_response(self, writer: &mut (impl AsyncWrite + Unpin)) -> std::io::Result<()> { writer.write_all(b"402 ").await?; writer.write_all(self.client.as_bytes()).await?; diff --git a/crates/projection-irc/src/commands/whois/mod.rs b/crates/projection-irc/src/commands/whois/mod.rs index f2f3ca2..1ab32e0 100644 --- a/crates/projection-irc/src/commands/whois/mod.rs +++ b/crates/projection-irc/src/commands/whois/mod.rs @@ -4,7 +4,7 @@ use tracing::instrument::WithSubscriber; use lavina_core::prelude::Str; use lavina_core::repo::Storage; use proto_irc::client::command_args::Whois; -use proto_irc::response::{IrcResponseMessage, SendResponse}; +use proto_irc::response::{IrcResponseMessage, WriteResponse}; use crate::commands::whois::error::{ErrNoNicknameGiven431, ErrNoSuchNick401}; use crate::commands::whois::response::{RplWhoIsUser311, RPL_ENDOFWHOIS_318}; diff --git a/crates/projection-irc/src/commands/whois/response.rs b/crates/projection-irc/src/commands/whois/response.rs index 3196e06..e7f42b8 100644 --- a/crates/projection-irc/src/commands/whois/response.rs +++ b/crates/projection-irc/src/commands/whois/response.rs @@ -1,7 +1,7 @@ use tokio::io::{AsyncWrite, AsyncWriteExt}; use lavina_core::prelude::Str; -use proto_irc::response::SendResponse; +use proto_irc::response::WriteResponse; struct RplWhoisCertfp276; struct RplWhoisRegNick307; @@ -47,7 +47,7 @@ impl RPL_ENDOFWHOIS_318 { } } -impl SendResponse for RplWhoIsUser311 { +impl WriteResponse for RplWhoIsUser311 { async fn write_response(self, writer: &mut (impl AsyncWrite + Unpin)) -> std::io::Result<()> { writer.write_all(b"311 ").await?; writer.write_all(self.client.as_bytes()).await?; @@ -70,7 +70,7 @@ impl SendResponse for RplWhoIsUser311 { } } -impl SendResponse for RPL_ENDOFWHOIS_318 { +impl WriteResponse for RPL_ENDOFWHOIS_318 { async fn write_response(self, writer: &mut (impl AsyncWrite + Unpin)) -> std::io::Result<()> { writer.write_all(b"318 ").await?; writer.write_all(self.client.as_bytes()).await?; diff --git a/crates/proto-irc/src/response.rs b/crates/proto-irc/src/response.rs index be4cd81..227f17c 100644 --- a/crates/proto-irc/src/response.rs +++ b/crates/proto-irc/src/response.rs @@ -5,7 +5,7 @@ use tokio::io::{AsyncWrite, AsyncWriteExt}; use crate::prelude::Str; use crate::Tag; -pub trait SendResponse { +pub trait WriteResponse { fn write_response(self, writer: &mut (impl AsyncWrite + Unpin)) -> impl Future>; } @@ -33,7 +33,7 @@ impl IrcResponseMessage { } } -impl SendResponse for IrcResponseMessage { +impl WriteResponse for IrcResponseMessage { async fn write_response(self, writer: &mut (impl AsyncWrite + Unpin)) -> std::io::Result<()> { if let Some(sender) = &self.sender { writer.write_all(b":").await?;