properly resolve account usernames when replying to posts directly from remote instances' timelines

Author: aryanchoudharypro

src/commands.rs

@@ -1312,11 +1312,11 @@ pub fn handle_ui_command(cmd: UiCommand, ctx: &mut UiCommandContext<'_>) {
 					if let Some(reblog) = &status.reblog {
 						push_unique(suggestions, format!("@{}", reblog.account.full_acct()));
 						for mention in &reblog.mentions {
-							push_unique(suggestions, format!("@{}", mention.acct));
+							push_unique(suggestions, format!("@{}", mention.full_acct()));
 						}
 					}
 					for mention in &status.mentions {
-						push_unique(suggestions, format!("@{}", mention.acct));
+						push_unique(suggestions, format!("@{}", mention.full_acct()));
 					}
 				};
 
@@ -1440,24 +1440,22 @@ pub fn handle_ui_command(cmd: UiCommand, ctx: &mut UiCommandContext<'_>) {
 					return;
 				}
 
-				// Resolution chain: get_account by ID → lookup_account by acct → synthetic fallback
 				let account = if let (Some(client), Some(token)) = (&state.client, &state.access_token) {
 					let by_id = if mention.id.is_empty() { None } else { client.get_account(token, &mention.id).ok() };
-					by_id.or_else(|| client.lookup_account(token, &mention.acct).ok())
+					by_id.or_else(|| client.lookup_account(token, &mention.full_acct()).ok())
 				} else {
 					None
 				};
 				let account = match account {
 					Some(acc) => acc,
 					None if mention.id.is_empty() => {
-						// HTML-derived mention: no local ID and lookup failed — nothing we can do
-						live_region.announce(&format!("Could not resolve account @{}", mention.acct));
+						live_region.announce(&format!("Could not resolve account @{}", mention.full_acct()));
 						return;
 					}
 					None => crate::mastodon::Account {
 						id: mention.id.clone(),
 						username: mention.username.clone(),
-						acct: mention.acct.clone(),
+						acct: mention.full_acct(),
 						display_name: String::new(),
 						url: mention.url,
 						note: String::new(),
@@ -1635,11 +1633,11 @@ pub fn handle_ui_command(cmd: UiCommand, ctx: &mut UiCommandContext<'_>) {
 				all_mentions.push(crate::mastodon::Mention { id: String::new(), username, acct, url });
 			}
 			for mention in all_mentions {
-				if !all_users.iter().any(|u| u.acct == mention.acct) {
+				if !all_users.iter().any(|u| u.acct == mention.full_acct()) {
 					all_users.push(crate::mastodon::Account {
 						id: mention.id.clone(),
 						username: mention.username.clone(),
-						acct: mention.acct.clone(),
+						acct: mention.full_acct(),
 						display_name: String::new(),
 						url: mention.url,
 						note: String::new(),

src/mastodon.rs

@@ -252,6 +252,21 @@ pub struct Mention {
 	pub url: String,
 }
 
+impl Mention {
+	pub fn full_acct(&self) -> String {
+		if self.acct.contains('@') {
+			self.acct.clone()
+		} else {
+			if let Ok(url) = reqwest::Url::parse(&self.url) {
+				if let Some(host) = url.host_str() {
+					return format!("{}@{}", self.acct, host);
+				}
+			}
+			self.acct.clone()
+		}
+	}
+}
+
 #[derive(Debug, Clone, Deserialize)]
 #[allow(dead_code)]
 pub struct Tag {

src/ui/dialogs/compose.rs

@@ -1166,25 +1166,26 @@ pub fn prompt_for_reply(
 		let mut accts = Vec::new();
 		let self_acct = self_acct.map(|acct| acct.trim().trim_start_matches('@')).filter(|acct| !acct.is_empty());
 		if let Some(self_acct) = self_acct {
-			if !self_acct.eq_ignore_ascii_case(replying_to.account.acct.trim().trim_start_matches('@')) {
-				accts.push(replying_to.account.acct.clone());
+			if !self_acct.eq_ignore_ascii_case(replying_to.account.full_acct().trim().trim_start_matches('@')) {
+				accts.push(replying_to.account.full_acct());
 			}
 		} else {
-			accts.push(replying_to.account.acct.clone());
+			accts.push(replying_to.account.full_acct());
 		}
 		for m in &replying_to.mentions {
 			if let Some(self_acct) = self_acct
 				&& is_self_mention(self_acct, m)
 			{
 				continue;
 			}
-			if !accts.iter().any(|a| a == &m.acct) {
-				accts.push(m.acct.clone());
+			let m_full_acct = m.full_acct();
+			if !accts.iter().any(|a| a == &m_full_acct) {
+				accts.push(m_full_acct);
 			}
 		}
 		accts.iter().map(|a| format!("@{a}")).collect::<Vec<_>>().join(" ") + " "
 	} else {
-		format!("@{} ", replying_to.account.acct)
+		format!("@{} ", replying_to.account.full_acct())
 	};
 	let default_visibility = match replying_to.visibility.as_str() {
 		"unlisted" => PostVisibility::Unlisted,
@@ -1309,7 +1310,8 @@ pub fn prompt_for_quote(
 }
 
 fn is_self_mention(self_acct: &str, mention: &crate::mastodon::Mention) -> bool {
-	let mention_acct = mention.acct.trim().trim_start_matches('@');
+	let mention_acct = mention.full_acct();
+	let mention_acct = mention_acct.trim().trim_start_matches('@');
 	if self_acct.eq_ignore_ascii_case(mention_acct) {
 		return true;
 	}