karx/dircord
1
0
Fork 4
Code Issues 2 Pull requests 1 Projects Releases Wiki Activity

Rustfmt

Browse source
This commit is contained in:
Yash Karandikar 2022-01-27 11:14:14 -06:00
parent b25ec4de18
commit 78b02420fd
1 changed files with 25 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/main.rs
View file

@ -134,7 +134,6 @@ impl EventHandler for Handler {
.await .await
.unwrap(); .unwrap();
let mut computed = String::new(); let mut computed = String::new();
let mut replaced = msg.content.clone(); let mut replaced = msg.content.clone();
@ -143,17 +142,16 @@ impl EventHandler for Handler {
let id = slice.parse::<u64>().unwrap(); let id = slice.parse::<u64>().unwrap();
for member in &*members.lock().await { for member in &*members.lock().await {
if id == member.user.id.0 { if id == member.user.id.0 {
let nick = { let nick = {
match &member.nick { match &member.nick {
Some(n) => n.clone(), Some(n) => n.clone(),
None => member.user.name.clone(), None => member.user.name.clone(),
} }
}; };
replaced = PING_RE_1
.replace(&replaced, format!("@{}", nick))
.to_string();
replaced = PING_RE_1
.replace(&replaced, format!("@{}", nick))
.to_string();
} }
} }
} }
@ -163,16 +161,16 @@ impl EventHandler for Handler {
let id = slice.parse::<u64>().unwrap(); let id = slice.parse::<u64>().unwrap();
for member in &*members.lock().await { for member in &*members.lock().await {
if id == member.user.id.0 { if id == member.user.id.0 {
let nick = { let nick = {
match &member.nick { match &member.nick {
Some(n) => n.clone(), Some(n) => n.clone(),
None => member.user.name.clone(), None => member.user.name.clone(),
} }
}; };
replaced = PING_RE_2 replaced = PING_RE_2
.replace(&replaced, format!("@{}", nick)) .replace(&replaced, format!("@{}", nick))
.to_string(); .to_string();
} }
} }
} }
@ -571,19 +569,17 @@ async fn irc_loop(
for mat in PING_RE_2.find_iter(message) { for mat in PING_RE_2.find_iter(message) {
let slice = &message[mat.start() + 1..mat.end()]; let slice = &message[mat.start() + 1..mat.end()];
for member in members_temp { for member in members_temp {
let nick = match &member.nick {
let nick = match &member.nick { Some(s) => s.to_owned(),
Some(s) => s.to_owned(), None => member.user.name.clone(),
None => member.user.name.clone(), };
};
if slice.starts_with(&nick) { if slice.starts_with(&nick) {
let id = member.user.id.0; let id = member.user.id.0;
computed = PING_RE_2 computed = PING_RE_2
.replace(&computed, format!("<@{}>", id)) .replace(&computed, format!("<@{}>", id))
.to_string(); .to_string();
} }
} }
} }