From d5b7f7b180b487c01616763559fa38cbed8bb45e Mon Sep 17 00:00:00 2001
From: Vika <vika@fireburn.ru>
Date: Fri, 28 Jul 2023 19:11:45 +0300
Subject: postgres: Fix pretty permalinks not being shown

---
 kittybox-rs/src/database/mod.rs          | 20 ++++++++++++++++++++
 kittybox-rs/src/database/postgres/mod.rs |  4 ++--
 2 files changed, 22 insertions(+), 2 deletions(-)

(limited to 'kittybox-rs/src/database')

diff --git a/kittybox-rs/src/database/mod.rs b/kittybox-rs/src/database/mod.rs
index 4f1c4de..b4b70b2 100644
--- a/kittybox-rs/src/database/mod.rs
+++ b/kittybox-rs/src/database/mod.rs
@@ -717,6 +717,25 @@ mod tests {
         assert_eq!(read_post["properties"]["comment"][0], reply);
     }
 
+    async fn test_pretty_permalinks<Backend: Storage>(db: Backend) {
+        const PERMALINK: &str = "https://fireburn.ru/posts/pretty-permalink";
+
+        let post = {
+            let mut post = gen_random_post("fireburn.ru");
+            let urls = post["properties"]["url"].as_array_mut().unwrap();
+            urls.push(serde_json::Value::String(
+                PERMALINK.to_owned()
+            ));
+
+            post
+        };
+        db.put_post(&post, "fireburn.ru").await.unwrap();
+
+        for i in post["properties"]["url"].as_array().unwrap() {
+            let (read_post, _) = db.read_feed_with_cursor(i.as_str().unwrap(), None, 20, None).await.unwrap().unwrap();
+            assert_eq!(read_post, post);
+        }
+    }
     /// Automatically generates a test suite for
     macro_rules! test_all {
         ($func_name:ident, $mod_name:ident) => {
@@ -727,6 +746,7 @@ mod tests {
                 $func_name!(test_update);
                 $func_name!(test_feed_pagination);
                 $func_name!(test_webmention_addition);
+                $func_name!(test_pretty_permalinks);
             }
         };
     }
diff --git a/kittybox-rs/src/database/postgres/mod.rs b/kittybox-rs/src/database/postgres/mod.rs
index 4477b9c..9176d12 100644
--- a/kittybox-rs/src/database/postgres/mod.rs
+++ b/kittybox-rs/src/database/postgres/mod.rs
@@ -259,7 +259,7 @@ SELECT jsonb_set(
     '{properties,author,0}',
     (SELECT mf2 FROM kittybox.mf2_json
      WHERE uid = mf2 #>> '{properties,author,0}')
-) FROM kittybox.mf2_json WHERE uid = $1
+) FROM kittybox.mf2_json WHERE uid = $1 OR mf2['properties']['url'] ? $1
 ")
             .bind(url)
             .fetch_optional(&self.db)
@@ -324,7 +324,7 @@ ORDER BY mf2 #>> '{properties,published,0}' DESC
 			.await?;
         tracing::debug!("Started txn: {:?}", txn);
         let mut feed = match sqlx::query_scalar::<_, serde_json::Value>("
-SELECT kittybox.hydrate_author(mf2) FROM kittybox.mf2_json WHERE uid = $1
+SELECT kittybox.hydrate_author(mf2) FROM kittybox.mf2_json WHERE uid = $1 OR mf2['properties']['url'] ? $1
 ")
             .bind(url)
             .fetch_optional(&mut *txn)
-- 
cgit 1.4.1