From 03f66637681555fded839e615a48caaf9521b482 Mon Sep 17 00:00:00 2001
From: aprilthepink <aprl@acab.dev>
Date: Mon, 17 Jun 2024 22:33:30 +0200
Subject: [PATCH] fix: Refactor lysand note handling in conversion.rs

---
 src/lysand/conversion.rs | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/lysand/conversion.rs b/src/lysand/conversion.rs
index 38503b1..3155804 100644
--- a/src/lysand/conversion.rs
+++ b/src/lysand/conversion.rs
@@ -131,25 +131,13 @@ pub async fn receive_lysand_note(note: Note, db_id: String) -> anyhow::Result<en
         } else {
             None
         };
-        let reply_string: Option<String> = if let Some(rep) = note.replies_to.clone() {
-            let note = fetch_note_from_url(rep).await?;
-            let fake_rep_url = Url::parse(&format!(
-                "https://{}/apbridge/object/{}",
-                API_DOMAIN.to_string(),
-                &note.id.to_string()
-            ))?;
-            Some(fake_rep_url.into())
+        let reply_uuid: Option<String> = if let Some(rep) = note.replies_to.clone() {
+            Some(db_post_from_url(rep).await?.id)
         } else {
             None
         };
-        let quote_string: Option<String> = if let Some(rep) = note.quotes.clone() {
-            let note = fetch_note_from_url(rep).await?;
-            let fake_rep_url = Url::parse(&format!(
-                "https://{}/apbridge/object/{}",
-                API_DOMAIN.to_string(),
-                &note.id.to_string()
-            ))?;
-            Some(fake_rep_url.into())
+        let quote_uuid: Option<String> = if let Some(rep) = note.quotes.clone() {
+            Some(db_post_from_url(rep).await?.id)
         } else {
             None
         };
@@ -189,8 +177,8 @@ pub async fn receive_lysand_note(note: Note, db_id: String) -> anyhow::Result<en
             visibility: Set(visibility.to_string()),
             title: Set(note.subject.clone()),
             url: Set(ap_note.id.to_string()),
-            reply_id: Set(reply_string),
-            quoting_id: Set(quote_string),
+            reply_id: Set(reply_uuid),
+            quoting_id: Set(quote_uuid),
             spoiler_text: Set(note.subject),
             ..Default::default()
         };