Skip to content

Auto-default homeserver suffix for username and room during interactive login #219

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

Merged
Benjamin-Loison merged 5 commits into from
Jul 22, 2026
Merged

Auto-default homeserver suffix for username and room during interactive login #219

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c866be
fix: decouple homeserver from username and default room in interactiv…
Itz-Agasta Jul 2, 2026
3eb356c
Normalize local user login and room IDs formatting
Itz-Agasta Jul 4, 2026
7fc7591
fix: normalize sigil-less full IDs in interactive login
Itz-Agasta Jul 9, 2026
5fd28d4
fix: reject room input with a server part but no sigil
Itz-Agasta Jul 22, 2026
06d2435
fix: assume https for homeserver and avoid panic on host-less URL
Itz-Agasta Jul 22, 2026
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
20 changes: 15 additions & 5 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2588,10 +2588,15 @@ fn get_user_login(ap: &mut Args) {
if trimmed_input.is_empty() {
error!("Error: Empty username is not allowed!");
} else {
// With ':' it is a full user id; otherwise it is a local part
// (with or without a leading '@') and we append the homeserver.
// With ':' it is a full user id; prepend a '@' sigil if missing.
// Otherwise it is a local part (with or without a leading '@')
// and we append the homeserver.
let full_username = if trimmed_input.contains(':') {
trimmed_input.to_string()
if trimmed_input.starts_with('@') {
trimmed_input.to_string()
} else {
format!("@{trimmed_input}")
}
} else {
let host = ap.homeserver.as_ref().and_then(Url::host_str).unwrap();
format!("@{}:{host}", trimmed_input.trim_start_matches('@'))
Comment thread
Benjamin-Loison marked this conversation as resolved.
Expand Down Expand Up @@ -2677,10 +2682,15 @@ fn get_room_default(ap: &mut Args) {
if trimmed_input.is_empty() {
error!("Error: Empty name of default room is not allowed!");
} else {
// With ':' it is a full room id (e.g. pasted from a client); otherwise
// With ':' it is a full room id (e.g. pasted from a client);
// prepend a '!' sigil if no '!'/'#' sigil is present. Otherwise
// keep any '!'/'#' sigil (default '!') and append the homeserver.
Comment thread
Benjamin-Loison marked this conversation as resolved.
Outdated
let full_room = if trimmed_input.contains(':') {
Comment thread
Benjamin-Loison marked this conversation as resolved.
trimmed_input.to_string()
if trimmed_input.starts_with('!') || trimmed_input.starts_with('#') {
trimmed_input.to_string()
} else {
format!("!{trimmed_input}")
Comment thread
Itz-Agasta marked this conversation as resolved.
Outdated
}
} else {
let host = ap.homeserver.as_ref().and_then(Url::host_str).unwrap();
if trimmed_input.starts_with('!') || trimmed_input.starts_with('#') {
Expand Down