From 906f34ff2ddcaacc130700cfb9bcc269826016a2 Mon Sep 17 00:00:00 2001
From: Dessalines <happydooby@gmail.com>
Date: Wed, 29 Apr 2020 12:55:54 -0400
Subject: [PATCH] Adding shorthand federated object searching.

---
 server/src/apub/fetcher.rs   | 14 +++++++++++---
 ui/src/api_tests/api.spec.ts |  4 +++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/server/src/apub/fetcher.rs b/server/src/apub/fetcher.rs
index e07e410ba..2164dec8b 100644
--- a/server/src/apub/fetcher.rs
+++ b/server/src/apub/fetcher.rs
@@ -45,11 +45,19 @@ pub enum SearchAcceptedObjects {
 /// Attempt to parse the query as URL, and fetch an ActivityPub object from it.
 ///
 /// Some working examples for use with the docker/federation/ setup:
-/// http://lemmy_alpha:8540/c/main
-/// http://lemmy_alpha:8540/u/lemmy_alpha
+/// http://lemmy_alpha:8540/c/main, or /c/main@lemmy_alpha:8540
+/// http://lemmy_alpha:8540/u/lemmy_alpha, or /u/lemmy_alpha@lemmy_alpha:8540
 /// http://lemmy_alpha:8540/p/3
 pub fn search_by_apub_id(query: &str, conn: &PgConnection) -> Result<SearchResponse, Error> {
-  let query_url = Url::parse(&query)?;
+  // Parse the shorthand query url
+  let query_url = if query.contains('@') {
+    let split = query.split('@').collect::<Vec<&str>>();
+    let url = format!("{}://{}{}", get_apub_protocol_string(), split[1], split[0]);
+    Url::parse(&url)?
+  } else {
+    Url::parse(&query)?
+  };
+
   let mut response = SearchResponse {
     type_: SearchType::All.to_string(),
     comments: vec![],
diff --git a/ui/src/api_tests/api.spec.ts b/ui/src/api_tests/api.spec.ts
index ffc33888b..7a810d9a0 100644
--- a/ui/src/api_tests/api.spec.ts
+++ b/ui/src/api_tests/api.spec.ts
@@ -95,7 +95,9 @@ describe('main', () => {
   describe('follow_accept', () => {
     test('/u/lemmy_alpha follows and accepts lemmy_beta/c/main', async () => {
       // Make sure lemmy_beta/c/main is cached on lemmy_alpha
-      let searchUrl = `${lemmyAlphaApiUrl}/search?q=http://lemmy_beta:8550/c/main&type_=All&sort=TopAll`;
+      // Use short-hand search url
+      let searchUrl = `${lemmyAlphaApiUrl}/search?q=/c/main@lemmy_beta:8550&type_=All&sort=TopAll`;
+
       let searchResponse: SearchResponse = await fetch(searchUrl, {
         method: 'GET',
       }).then(d => d.json());