From b9f9fd4a12054af80e87aa2a9877291b06fe75c9 Mon Sep 17 00:00:00 2001
From: asonix <asonix@asonix.dog>
Date: Wed, 10 Feb 2021 09:23:55 -0600
Subject: [PATCH] Allow sub-actors of connected server-actors

---
 src/db.rs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/db.rs b/src/db.rs
index d35a992..3ce0fce 100644
--- a/src/db.rs
+++ b/src/db.rs
@@ -420,11 +420,19 @@ impl Db {
             .await
     }
 
-    pub(crate) async fn is_connected(&self, id: Url) -> Result<bool, MyError> {
+    pub(crate) async fn is_connected(&self, mut id: Url) -> Result<bool, MyError> {
+        id.set_path("");
+        id.set_query(None);
+        id.set_fragment(None);
+
         self.unblock(move |inner| {
             let connected = inner
                 .connected_actor_ids
-                .contains_key(id.as_str().as_bytes())?;
+                .scan_prefix(id.as_str().as_bytes())
+                .values()
+                .filter_map(|res| res.ok())
+                .next()
+                .is_some();
 
             Ok(connected)
         })
@@ -634,8 +642,9 @@ mod tests {
     fn connect_and_verify() {
         run(|db| async move {
             let example_actor: Url = "http://example.com/actor".parse().unwrap();
+            let example_sub_actor: Url = "http://example.com/users/fake".parse().unwrap();
             db.add_connection(example_actor.clone()).await.unwrap();
-            assert!(db.is_connected(example_actor).await.unwrap());
+            assert!(db.is_connected(example_sub_actor).await.unwrap());
         })
     }