github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-01-09 14:48:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

darkirc: fix getting NAMES list of history msgs

Browse Source
This commit is contained in:
dasman
2024-06-08 03:12:58 +03:00
parent 10c649f5dd
commit 49716b3e4c
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bin/darkirc/src/irc/command.rs
View File

@@ -928,11 +928,20 @@ impl Client {
let mut channels = HashSet::new();
// If we have any configured autojoin channels, let's join the user
// and set their topics, if any. And request NAMES list.
// and set their topics, if any.
if !*self.caps.read().await.get("no-autojoin").unwrap() {
for channel in self.server.autojoin.read().await.iter() {
replies.extend(self.handle_cmd_join(channel, false).await.unwrap());
channels.insert(channel.to_string());
}
}
// Potentially extend the replies with channel history
replies.extend(self.get_history(&channels).await.unwrap());
// And request NAMES list.
if !*self.caps.read().await.get("no-autojoin").unwrap() {
for channel in self.server.autojoin.read().await.iter() {
if let Some(chan) = self.server.channels.read().await.get(channel) {
let nicks: Vec<String> = chan.nicks.iter().cloned().collect();
@@ -946,13 +955,9 @@ impl Client {
RPL_ENDOFNAMES,
format!("{} {} :End of NAMES list", nick, channel),
)));
channels.insert(channel.to_string());
}
}
// Potentially extend the replies with channel history
replies.extend(self.get_history(&channels).await.unwrap());
replies
}