From 703328601c750143d7ec04066082efb83865f1cf Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Sun, 14 Feb 2021 22:15:32 +0900
Subject: [PATCH] [BUG FIX] Don't append host part twice to remote interact URI

---
 src/routes/user.rs | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/routes/user.rs b/src/routes/user.rs
index 4a3b8a8f..2a8265b7 100644
--- a/src/routes/user.rs
+++ b/src/routes/user.rs
@@ -134,16 +134,7 @@ pub fn follow_not_connected(
     if let Some(remote_form) = remote_form {
         if let Some(uri) = User::fetch_remote_interact_uri(&remote_form)
             .ok()
-            .and_then(|uri| {
-                Some(uri.replace(
-                    "{uri}",
-                    &format!(
-                        "{}@{}",
-                        target.fqn,
-                        target.get_instance(&conn).ok()?.public_domain
-                    ),
-                ))
-            })
+            .and_then(|uri| Some(uri.replace("{uri}", &target.acct_authority(&conn).ok()?)))
         {
             Ok(Redirect::to(uri).into())
         } else {