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

Compare commits

base: karx:97963714b51b3b23a3a9e5cb498e8afb5f25f01f
Branches Tags
karx:master
...
compare: karx:5d8c653b2a402150cf12c8e4055d4e676ae13275
Branches Tags
karx:master

3 commits
97963714b5 ... 5d8c653b2a

Author SHA1 Message Date
Yash Karandikar 5d8c653b2a Update README.md 2022-01-07 11:34:58 -06:00
Yash Karandikar 66280535a6 Run rustfmt 2022-01-07 11:33:25 -06:00
Yash Karandikar aaf1697a52 Handle having multiple pings in a message 2022-01-07 11:31:52 -06:00
2 changed files with 52 additions and 37 deletions
Show stats Expand all files Collapse all files

2
README.md
View file

@ -9,5 +9,5 @@ TODO:
- [x] handle attachments properly
- [x] don't ping IRC users (and color IRC usernames)
- [x] handle discord pings
- [ ] handle multiple pings
- [x] handle multiple pings
- [ ] multiple channels

87
src/main.rs
View file

@ -196,7 +196,7 @@ async fn irc_loop(
lazy_static! {
static ref PING_NICK_1: Regex = Regex::new(r"^[\w+]+(:|,)").unwrap();
static ref PING_RE_2: Regex = Regex::new(r"@\w+").unwrap();
static ref PING_RE_2: Regex = Regex::new(r"@[^0-9\s]+").unwrap();
}
client.identify()?;
@ -206,10 +206,13 @@ async fn irc_loop(
print!("{}", orig_message);
if let Command::PRIVMSG(_, ref message) = orig_message.command {
let nickname = orig_message.source_nickname().unwrap();
let mut mentioned_1: Option<u64> = None;
if PING_NICK_1.is_match(message) {
if let Some(mat) = PING_NICK_1.find(message) {
let slice = &message[mat.start()..mat.end() - 1];
if id_cache.get(slice).is_none() {
if let Some(id) = id_cache.get(slice) {
mentioned_1 = id.to_owned();
} else {
let mut found = false;
for member in &members {
let nick = match &member.nick {
@ -220,20 +223,20 @@ async fn irc_loop(
if nick == slice {
found = true;
let id = member.user.id.0;
id_cache.insert(nickname.to_string(), Some(id));
break;
mentioned_1 = Some(id);
}
}
if !found {
id_cache.insert(nickname.to_string(), None);
mentioned_1 = None;
}
}
}
}
if PING_RE_2.is_match(message) {
if let Some(mat) = PING_RE_2.find(message) {
let slice = &message[mat.start()+1..mat.end()];
for mat in PING_RE_2.find_iter(message) {
let slice = &message[mat.start() + 1..mat.end()];
dbg!(slice);
if id_cache.get(slice).is_none() {
let mut found = false;
for member in &members {
@ -245,13 +248,13 @@ async fn irc_loop(
if nick == slice {
found = true;
let id = member.user.id.0;
id_cache.insert(nickname.to_string(), Some(id));
id_cache.insert(slice.to_string(), Some(id));
break;
}
}
if !found {
id_cache.insert(nickname.to_string(), None);
id_cache.insert(slice.to_string(), None);
}
}
}
@ -285,42 +288,54 @@ async fn irc_loop(
w.avatar_url(url);
}
}
if let Some(cached) = id_cache.get(nickname) {
if let &Some(id) = cached {
w.content(PING_NICK_1.replace(&PING_RE_2.replace(message, format!("<@{}>", id)), format!("<@{}>", id)));
} else {
w.content(message);
let mut computed = message.to_string();
for mat in PING_RE_2.find_iter(message) {
let slice = &message[mat.start() + 1..mat.end()];
if let Some(cached) = id_cache.get(slice) {
if let &Some(id) = cached {
computed = PING_RE_2
.replace(&computed, format!("<@{}>", id))
.to_string();
}
}
} else {
w.content(message);
}
if let Some(id) = mentioned_1 {
computed = PING_NICK_1
.replace(&computed, format!("<@{}>", id))
.to_string();
}
w.username(nickname);
w.content(computed);
w
})
.await?;
} else {
if let Some(cached) = id_cache.get(nickname) {
if let &Some(id) = cached {
channel_id
.say(
&http,
format!(
"{}: {}",
nickname,
PING_NICK_1.replace(&PING_RE_2.replace(message, format!("<@{}>", id)), format!("<@{}>", id))
),
)
.await?;
} else {
channel_id
.say(&http, format!("{}: {}", nickname, message))
.await?;
let mut computed = message.to_string();
for mat in PING_RE_2.find_iter(message) {
let slice = &message[mat.start() + 1..mat.end()];
if let Some(cached) = id_cache.get(slice) {
if let &Some(id) = cached {
computed = PING_RE_2
.replace(&computed, format!("<@{}>", id))
.to_string();
}
}
} else {
channel_id
.say(&http, format!("{}: {}", nickname, message))
.await?;
}
if let Some(id) = mentioned_1 {
computed = PING_NICK_1
.replace(&computed, format!("<@{}>", id))
.to_string();
}
channel_id
.say(&http, format!("<{}> {}", nickname, computed))
.await?;
}
} else if let Command::JOIN(_, _, _) = orig_message.command {
let nickname = orig_message.source_nickname().unwrap();