Skip to content

IRCv3 no-implicit-names support #1834

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
englut wants to merge 1 commit into
base: main
Choose a base branch
from
Open

IRCv3 no-implicit-names support #1834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Added:
- Expanded `tooltips` setting to allow hiding auto-complete tooltips
- emacs bindings for <kbd>ctrl</kbd> + <kbd>u</kbd> and <kbd>ctrl</kbd> + <kbd>w</kbd>
- `buffer.text_input.kill_to_clipboard` to control key bindings moving killed text to clipboard
- `no-implicit-names` support

Changed:

Expand Down
17 changes: 17 additions & 0 deletions data/src/capabilities.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ pub enum Capability {
MessageTags,
Multiline,
MultiPrefix,
NoImplicitNames,
ReadMarker,
Sasl,
ServerTime,
Expand Down Expand Up @@ -60,6 +61,9 @@ impl FromStr for Capability {
"labeled-response" => Ok(Self::LabeledResponse),
"message-tags" => Ok(Self::MessageTags),
"multi-prefix" => Ok(Self::MultiPrefix),
"no-implicit-names" => Ok(Self::NoImplicitNames),
// TODO(quaff): remove `draft/no-implicit-names` support when ergo & soju have both been upgraded
"draft/no-implicit-names" => Ok(Self::NoImplicitNames),
"server-time" => Ok(Self::ServerTime),
"setname" => Ok(Self::Setname),
"soju.im/bouncer-networks" => Ok(Self::BouncerNetworks),
Expand Down Expand Up @@ -345,6 +349,19 @@ impl Capabilities {
requested.push("sasl");
}

if self.pending.contains("no-implicit-names")
&& !self.acknowledged(Capability::NoImplicitNames)
{
requested.push("no-implicit-names");
}

// TODO(quaff): remove `draft/no-implicit-names` support when ergo & soju have both been upgraded
if self.pending.contains("draft/no-implicit-names")
&& !self.acknowledged(Capability::NoImplicitNames)
{
requested.push("draft/no-implicit-names");
}

if let Some(multiline) = self
.pending
.iter()
Expand Down
174 changes: 123 additions & 51 deletions data/src/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1733,10 +1733,28 @@ impl Client {
.iter()
.any(|who_poll| who_poll.channel == target_channel)
{
self.who_polls.push_back(WhoPoll {
let mut who_poll = WhoPoll {
channel: target_channel.clone(),
status: WhoStatus::Joined,
});
};

if self
.capabilities
.acknowledged(Capability::NoImplicitNames)
{
let message = prepare_who_polls(
&self.isupport,
&self.capabilities,
&mut who_poll,
);
self.send(
None,
message.into(),
TokenPriority::High,
);
}

self.who_polls.push_back(who_poll);
}

if !self.mode_requests.iter().any(|mode_request| {
Expand Down Expand Up @@ -1810,6 +1828,10 @@ impl Client {
}
Command::Numeric(RPL_WHOREPLY, args) => {
let channel = ok!(args.get(1));
let user = ok!(args.get(2));
let host = ok!(args.get(3));
let nick = ok!(args.get(5));
let flags = ok!(args.get(6));

let casemapping = self.casemapping();

Expand All @@ -1825,8 +1847,8 @@ impl Client {
self.chanmap.get_mut(&target_channel)
{
client_channel.update_user_away(
ok!(args.get(5)),
ok!(args.get(6)),
nick,
flags,
casemapping,
);

Expand All @@ -1844,6 +1866,20 @@ impl Client {
self.server
);
}

if let Ok(mut user) = User::parse_from_whoreply(
nick,
flags,
user,
host,
casemapping,
isupport::get_prefix(&self.isupport),
) {
if flags.starts_with('G') {
user.update_away(true);
}
client_channel.users.insert(user);
}
}

if !user_request {
Expand All @@ -1865,7 +1901,13 @@ impl Client {
}
}
Command::Numeric(RPL_WHOSPCRPL, args) => {
let token = ok!(args.get(1));
let channel = ok!(args.get(2));
let user = ok!(args.get(3));
let host = ok!(args.get(4));
let nick = ok!(args.get(5));
let flags = ok!(args.get(6));
let account = args.get(7);

let casemapping = self.casemapping();

Expand All @@ -1890,8 +1932,7 @@ impl Client {
_,
Some(request_token),
) if matches!(source, WhoSource::Poll) => {
if let Ok(token) =
ok!(args.get(1)).parse::<WhoToken>()
if let Ok(token) = token.parse::<WhoToken>()
&& *request_token == token
{
who_poll.status = WhoStatus::Receiving(
Expand Down Expand Up @@ -1926,36 +1967,49 @@ impl Client {
&who_poll.status
{
// Check token to ~ensure reply is to poll request
if let Ok(token) =
ok!(args.get(1)).parse::<WhoToken>()
{
if let Ok(token) = token.parse::<WhoToken>() {
if token == WhoXPollParameters::Default.token()
{
client_channel.update_user_away(
ok!(args.get(3)),
ok!(args.get(4)),
nick,
flags,
casemapping,
);
} else if token
== WhoXPollParameters::WithAccountName
.token()
{
let user = ok!(args.get(3));

client_channel.update_user_away(
user,
ok!(args.get(4)),
nick,
flags,
casemapping,
);

client_channel.update_user_accountname(
user,
ok!(args.get(5)),
nick,
ok!(account),
casemapping,
);
}
}
}

if let Ok(mut user) = User::parse_from_whoreply(
nick,
flags,
user,
host,
casemapping,
isupport::get_prefix(&self.isupport),
) {
if let Some(account) = account {
user = user.with_accountname(account);
}
if flags.starts_with('G') {
user.update_away(true);
}
client_channel.users.insert(user);
}
}

if !user_request {
Expand Down Expand Up @@ -2012,8 +2066,17 @@ impl Client {
matches!(who_poll.status, WhoStatus::Received)
}))
{
self.who_polls[pos].status =
WhoStatus::Waiting(Instant::now());
if !self
.capabilities
.acknowledged(Capability::NoImplicitNames)
|| matches!(
self.who_polls[pos].status,
WhoStatus::Received
)
{
self.who_polls[pos].status =
WhoStatus::Waiting(Instant::now());
}

if pos != 0
&& let Some(who_poll) =
Expand Down Expand Up @@ -3916,6 +3979,9 @@ impl Client {
let request = match &who_poll.status {
WhoStatus::Joined => {
(self.capabilities.acknowledged(Capability::AwayNotify)
|| self
.capabilities
.acknowledged(Capability::NoImplicitNames)
|| self.config.who_poll_enabled)
.then_some(Request::Poll)
}
Expand Down Expand Up @@ -3961,38 +4027,11 @@ impl Client {
}
);

let message =
if self.isupport.contains_key(&isupport::Kind::WHOX) {
let whox_params = if self
.capabilities
.acknowledged(Capability::AccountNotify)
{
WhoXPollParameters::WithAccountName
} else {
WhoXPollParameters::Default
};

who_poll.status = WhoStatus::Requested(
WhoSource::Poll,
Instant::now(),
Some(whox_params.token()),
);

command!(
"WHO",
who_poll.channel.to_string(),
whox_params.fields().to_string(),
whox_params.token().to_owned()
)
} else {
who_poll.status = WhoStatus::Requested(
WhoSource::Poll,
Instant::now(),
None,
);

command!("WHO", who_poll.channel.to_string())
};
let message = prepare_who_polls(
&self.isupport,
&self.capabilities,
who_poll,
);

self.send(None, message.into(), TokenPriority::Low);
}
Expand Down Expand Up @@ -4163,6 +4202,39 @@ fn compare_channels_default(chantypes: &[char], a: &str, b: &str) -> Ordering {
a.cmp(b)
}

fn prepare_who_polls(
isupport: &HashMap<isupport::Kind, isupport::Parameter>,
capabilities: &Capabilities,
who_poll: &mut WhoPoll,
) -> irc::proto::Message {
if isupport.contains_key(&isupport::Kind::WHOX) {
let whox_params =
if capabilities.acknowledged(Capability::AccountNotify) {
WhoXPollParameters::WithAccountName
} else {
WhoXPollParameters::Default
};

who_poll.status = WhoStatus::Requested(
WhoSource::Poll,
Instant::now(),
Some(whox_params.token()),
);

command!(
"WHO",
who_poll.channel.to_string(),
whox_params.fields().to_string(),
whox_params.token().to_owned()
)
} else {
who_poll.status =
WhoStatus::Requested(WhoSource::Poll, Instant::now(), None);

command!("WHO", who_poll.channel.to_string())
}
}

fn compare_channels(
config: &config::server::Server,
chantypes: &[char],
Expand Down
4 changes: 2 additions & 2 deletions data/src/isupport.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1134,8 +1134,8 @@ pub enum WhoXPollParameters {
impl WhoXPollParameters {
pub fn fields(&self) -> &'static str {
match self {
WhoXPollParameters::Default => "tcnf",
WhoXPollParameters::WithAccountName => "tcnfa",
WhoXPollParameters::Default => "tcnfuh",
WhoXPollParameters::WithAccountName => "tcnfuha",
}
}

Expand Down
25 changes: 25 additions & 0 deletions data/src/user.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,31 @@ impl User {
away: false,
})
}

pub fn parse_from_whoreply(
nick: &String,
flags: &str,
user: &String,
host: &String,
casemapping: isupport::CaseMap,
prefix: Option<&[isupport::PrefixMap]>,
) -> Result<Self, ParseUserError> {
let access_level: String = flags[1..]
.chars()
.filter(|c| {
if let Some(prefix) = prefix {
prefix.iter().any(|p| p.prefix == *c)
} else {
AccessLevel::try_from(*c).is_ok()
}
})
.collect();
User::parse(
format!("{access_level}{nick}!{user}@{host}").as_str(),
casemapping,
prefix,
)
}
}

fn parse_user_names(
Expand Down
Loading