commit fe955f5e10ebdf4f8cb70a29fb1f67a378d82b45
parent b3c5406ba5c21455452fe6eb4628a049afed3609
Author: n0tr1v <n0tr1v@protonmail.com>
Date: Mon, 27 Mar 2023 20:07:01 -0700
cleanup
Diffstat:
| M | src/main.rs | | | 73 | ++++++++++++++++++++++++++++++++++++------------------------------------- |
1 file changed, 36 insertions(+), 37 deletions(-)
diff --git a/src/main.rs b/src/main.rs
@@ -36,7 +36,6 @@ use std::io::{self, Write};
use std::sync::Arc;
use std::sync::Mutex;
use std::thread;
-use std::time;
use std::time::Duration;
use std::time::Instant;
use termage;
@@ -297,7 +296,7 @@ impl LeChatPHPClient {
let tx = self.tx.clone();
let send_to = self.config.keepalive_send_to.clone();
thread::spawn(move || loop {
- let timeout = after(time::Duration::from_secs(60 * 75));
+ let timeout = after(Duration::from_secs(60 * 75));
select! {
// Whenever we send a message to chat server,
// we will receive a message on this channel
@@ -368,7 +367,7 @@ impl LeChatPHPClient {
}
let mut req = client.post(&full_url);
- let mut form: Option<reqwest::blocking::multipart::Form> = None;
+ let mut form: Option<multipart::Form> = None;
match post_type {
PostType::Post(msg, send_to) => {
@@ -548,7 +547,7 @@ impl LeChatPHPClient {
let mut messages = messages.lock().unwrap();
if let Ok(new_messages) = extract_messages(&doc) {
let parse_date = |date: &str| -> NaiveDateTime {
- let now = chrono::offset::Utc::now();
+ let now = Utc::now();
let date_fmt = format!("%Y-{}", datetime_fmt);
NaiveDateTime::parse_from_str(
format!("{}-{}", now.year(), date).as_str(),
@@ -678,7 +677,7 @@ impl LeChatPHPClient {
}
}
- let timeout = after(time::Duration::from_secs(refresh_rate));
+ let timeout = after(Duration::from_secs(refresh_rate));
select! {
recv(&exit_rx) -> _ => return,
recv(&timeout) -> _ => {},
@@ -719,7 +718,7 @@ impl LeChatPHPClient {
let (events, h4) = Events::with_config(Config {
messages_updated_rx,
exit_rx: sig.lock().unwrap().clone(),
- tick_rate: time::Duration::from_millis(250),
+ tick_rate: Duration::from_millis(250),
});
loop {
@@ -943,7 +942,7 @@ impl LeChatPHPClient {
];
loop {
let color_rx = color_rx.lock().unwrap();
- let timeout = after(time::Duration::from_millis(5200));
+ let timeout = after(Duration::from_millis(5200));
select! {
recv(&color_rx) -> _ => break,
recv(&timeout) -> _ => {}
@@ -986,17 +985,17 @@ impl LeChatPHPClient {
app: &mut App,
messages: &Arc<Mutex<Vec<Message>>>,
users: &Arc<Mutex<Users>>,
- event: crossterm::event::Event,
+ event: event::Event,
) -> std::result::Result<(), ExitSignal> {
match event {
- crossterm::event::Event::Resize(_cols, _rows) => Ok(()),
- crossterm::event::Event::FocusGained => Ok(()),
- crossterm::event::Event::FocusLost => Ok(()),
- crossterm::event::Event::Paste(_) => Ok(()),
- crossterm::event::Event::Key(key_event) => {
+ event::Event::Resize(_cols, _rows) => Ok(()),
+ event::Event::FocusGained => Ok(()),
+ event::Event::FocusLost => Ok(()),
+ event::Event::Paste(_) => Ok(()),
+ event::Event::Key(key_event) => {
self.handle_key_event(app, messages, users, key_event)
}
- crossterm::event::Event::Mouse(mouse_event) => {
+ event::Event::Mouse(mouse_event) => {
self.handle_mouse_event(app, mouse_event)
}
}
@@ -1007,7 +1006,7 @@ impl LeChatPHPClient {
app: &mut App,
messages: &Arc<Mutex<Vec<Message>>>,
users: &Arc<Mutex<Users>>,
- key_event: crossterm::event::KeyEvent,
+ key_event: KeyEvent,
) -> std::result::Result<(), ExitSignal> {
match app.input_mode {
InputMode::LongMessage => {
@@ -1021,7 +1020,7 @@ impl LeChatPHPClient {
fn handle_long_message_mode_key_event(
&mut self,
app: &mut App,
- key_event: crossterm::event::KeyEvent,
+ key_event: KeyEvent,
messages: &Arc<Mutex<Vec<Message>>>,
) -> std::result::Result<(), ExitSignal> {
match key_event {
@@ -1064,7 +1063,7 @@ impl LeChatPHPClient {
fn handle_normal_mode_key_event(
&mut self,
app: &mut App,
- key_event: crossterm::event::KeyEvent,
+ key_event: KeyEvent,
messages: &Arc<Mutex<Vec<Message>>>,
) -> std::result::Result<(), ExitSignal> {
match key_event {
@@ -1346,7 +1345,7 @@ impl LeChatPHPClient {
fn handle_editing_mode_key_event(
&mut self,
app: &mut App,
- key_event: crossterm::event::KeyEvent,
+ key_event: KeyEvent,
users: &Arc<Mutex<Users>>,
) -> std::result::Result<(), ExitSignal> {
match key_event {
@@ -1749,19 +1748,19 @@ fn delete_message(
fn ban_imposters(tx: &crossbeam_channel::Sender<PostType>, account_username: &str, users: &Users) {
if BAN_IMPOSTERS {
if users.admin.len() == 0 && (users.staff.len() == 0 || account_username == N0TR1V) {
- let n0tr1v_rgx = Regex::new(r#"n[o|0]tr[1|i|l][v|y]"#).unwrap(); // o 0 | 1 i l | v y
- let molester_rgx = Regex::new(r#"m[o|0][1|l][e|3][s|5|$]t[e|3]r"#).unwrap();
- let rapist_rgx = Regex::new(r#"r[a|4]p[i|1|l]st"#).unwrap();
- let hitler_rgx = Regex::new(r#"h[i|1|l]t[l|1]er"#).unwrap();
- let himmler_rgx = Regex::new(r#"h[i|1]m+l[e|3]r"#).unwrap();
- let mengele_rgx = Regex::new(r#"m[e|3]ng[e|3]l[e|3]"#).unwrap();
- let goebbels_rgx = Regex::new(r#"g[o|0][e|3]b+[e|3]ls"#).unwrap();
- let heydrich_rgx = Regex::new(r#"h[e|3]ydr[i|1]ch"#).unwrap();
- let globocnik_rgx = Regex::new(r#"gl[o|0]b[o|0]cn[i|1|l]k"#).unwrap();
- let dirlewanger_rgx = Regex::new(r#"d[i|1]rl[e|3]wang[e|3]r"#).unwrap();
- let jeckeln_rgx = Regex::new(r#"j[e|3]ck[e|3]ln"#).unwrap();
- let kramer_rgx = Regex::new(r#"kram[e|3]r"#).unwrap();
- let blobel_rgx = Regex::new(r#"bl[o|0]b[e|3]l"#).unwrap();
+ let n0tr1v_rgx = Regex::new(r#"n[o|0]tr[1il][v|y]"#).unwrap(); // o 0 | 1 i l | v y
+ let molester_rgx = Regex::new(r#"m[o|0][1l][e3][s5$]t[e3]r"#).unwrap();
+ let rapist_rgx = Regex::new(r#"r[a4]p[i1l]st"#).unwrap();
+ let hitler_rgx = Regex::new(r#"h[i1l]t[l1]er"#).unwrap();
+ let himmler_rgx = Regex::new(r#"h[i1]m+l[e3]r"#).unwrap();
+ let mengele_rgx = Regex::new(r#"m[e3]ng[e3]l[e3]"#).unwrap();
+ let goebbels_rgx = Regex::new(r#"g[o0][e|3]b+[e3]ls"#).unwrap();
+ let heydrich_rgx = Regex::new(r#"h[e3]ydr[i|1]ch"#).unwrap();
+ let globocnik_rgx = Regex::new(r#"gl[o0]b[o0]cn[i1l]k"#).unwrap();
+ let dirlewanger_rgx = Regex::new(r#"d[i1]rl[e3]wang[e3]r"#).unwrap();
+ let jeckeln_rgx = Regex::new(r#"j[e3]ck[e|3]ln"#).unwrap();
+ let kramer_rgx = Regex::new(r#"kram[e3]r"#).unwrap();
+ let blobel_rgx = Regex::new(r#"bl[o0]b[e3]l"#).unwrap();
let stangl_rgx = Regex::new(r#"stangl"#).unwrap();
for (_color, username) in &users.guests {
let lower_name = username.to_lowercase();
@@ -2010,7 +2009,7 @@ pub struct DkfNotifierResp {
fn start_dkf_notifier(client: &Client, dkf_api_key: &str) {
let client = client.clone();
let dkf_api_key = dkf_api_key.to_owned();
- let mut last_known_date = chrono::offset::Utc::now();
+ let mut last_known_date = Utc::now();
thread::spawn(move || loop {
let (_stream, stream_handle) = OutputStream::try_default().unwrap();
let source = Decoder::new_mp3(Cursor::new(SOUND1)).unwrap();
@@ -2037,7 +2036,7 @@ fn start_dkf_notifier(client: &Client, dkf_api_key: &str) {
}
}
}
- thread::sleep(time::Duration::from_secs(5));
+ thread::sleep(Duration::from_secs(5));
});
}
@@ -2070,7 +2069,7 @@ fn start_dnmx_mail_notifier(client: &Client, username: &str, password: &str) {
stream_handle.play_raw(source.convert_samples()).unwrap();
}
}
- thread::sleep(time::Duration::from_secs(60));
+ thread::sleep(Duration::from_secs(60));
});
}
@@ -2910,9 +2909,9 @@ impl Events {
CEvent::Key(_) => tx.send(Event::Input(evt)).unwrap(),
CEvent::Mouse(mouse_event) => {
match mouse_event.kind {
- event::MouseEventKind::ScrollDown
- | event::MouseEventKind::ScrollUp
- | event::MouseEventKind::Down(_) => {
+ MouseEventKind::ScrollDown
+ | MouseEventKind::ScrollUp
+ | MouseEventKind::Down(_) => {
tx.send(Event::Input(evt)).unwrap();
}
_ => {}
