Compare commits
No commits in common. "c895210cea449bf479e84c0f581622a4e2034343" and "247f35994bad9c4e14899188ee71ff739bdcafa7" have entirely different histories.
c895210cea
...
247f35994b
|
@ -2,10 +2,6 @@
|
|||
name = "e2e-irc"
|
||||
version = "3.0.0"
|
||||
edition = "2021"
|
||||
license = "GPL-3.0"
|
||||
keywords = ["irc", "encryption"]
|
||||
description = "An IRC bouncer that can send encrypted messages"
|
||||
repository = "https://forgejo.vanten-s.com/vanten-s/e2e-irc/"
|
||||
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
|
@ -14,7 +10,7 @@ argparse = "0.2.2"
|
|||
base64 = "0.21.4"
|
||||
dirs = "5.0.1"
|
||||
eyre = "0.6.8"
|
||||
ircparser-vanten = "0.2.1"
|
||||
ircparser = { git = "https://forgejo.vanten-s.com/vanten-s/ircparser" }
|
||||
openssl = "0.10"
|
||||
pgp = "0.10.2"
|
||||
rand = "0.8.5"
|
||||
|
|
|
@ -136,7 +136,7 @@ fn main() -> Result<()> {
|
|||
&writer_channel_rx,
|
||||
&listener_channel_tx,
|
||||
&listener_channel_rx,
|
||||
&state,
|
||||
&mut state,
|
||||
);
|
||||
}
|
||||
Err(error) => match error {
|
||||
|
|
|
@ -26,7 +26,7 @@ pub fn handle_message_from_server(
|
|||
writer_channel_rx: &Receiver<String>,
|
||||
listener_channel_tx: &Sender<String>,
|
||||
_listener_channel_rx: &Receiver<String>,
|
||||
state: &State,
|
||||
state: &mut State,
|
||||
) -> Result<()> {
|
||||
let recieved_parsed = &unwrap_or_return_result!(ircparser::parse(recieved))[0];
|
||||
|
||||
|
@ -39,7 +39,7 @@ pub fn handle_message_from_server(
|
|||
|
||||
if recieved_parsed.command != "PRIVMSG"
|
||||
|| reciever.starts_with('#')
|
||||
|| state.nicks_without_encryption.contains(reciever)
|
||||
|| state.nicks_without_encryption.contains(&reciever)
|
||||
{
|
||||
forward(recieved, listener_channel_tx, server)?;
|
||||
return Ok(());
|
||||
|
|
|
@ -18,7 +18,7 @@ pub fn write_to_server(
|
|||
|
||||
let connector = SslConnector::builder(SslMethod::tls()).unwrap().build();
|
||||
let mut stream = connector
|
||||
.connect(server, &tcp_stream)
|
||||
.connect(&server, &tcp_stream)
|
||||
.expect("Couldn't start TLS");
|
||||
|
||||
stream
|
||||
|
|
Loading…
Reference in a new issue