fix(api_mastodon): check in_reply_to_id

importantimport · Feb 2, 2024 · 3be0336 · 3be0336
1 parent 95bf9d9
commit 3be0336
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/crates/api_mastodon/src/entities/status.rs b/crates/api_mastodon/src/entities/status.rs
@@ -11,7 +11,8 @@ use crate::entities::{Account, CustomEmoji};
 #[derive(Debug, Deserialize, Serialize, ToSchema)]
 pub struct Status {
     pub id: Url,
-    pub in_reply_to_id: Option<Url>,
+    // pub in_reply_to_id: Option<Url>,
+    pub in_reply_to_id: Option<String>,
     pub uri: Url,
     pub url: Url,
     pub account: Account,
@@ -36,7 +37,7 @@ impl Status {
 
         Ok(Self {
             id: note.id.clone().into(),
-            in_reply_to_id: note.in_reply_to.map(std::convert::Into::into),
+            in_reply_to_id: note.in_reply_to.map(|url| url.to_string()),
             // TODO: replace
             uri: note.id.clone().into(),
             // TODO: replace

diff --git a/crates/api_mastodon/src/routes/statuses/status_context.rs b/crates/api_mastodon/src/routes/statuses/status_context.rs
@@ -2,7 +2,7 @@ use activitypub_federation::config::Data;
 use axum::{debug_handler, extract::Path, Json};
 use hatsu_utils::{AppData, AppError};
 
-use crate::entities::Context;
+use crate::entities::{Context, Status};
 
 /// Get parent and child statuses in context
 ///
@@ -31,7 +31,21 @@ pub async fn status_context(
             Ok(url) if url.starts_with("https://") => {
                 let object_url = hatsu_utils::url::generate_object_url(data.domain(), url)?;
                 let context = Context::find_by_id(object_url.to_string(), &data).await?;
-                Ok(Json(context))
+
+                Ok(Json(Context {
+                    descendants: context
+                        .descendants
+                        .into_iter()
+                        .map(|status| match status.in_reply_to_id {
+                            Some(id) if id == object_url.to_string() => Status {
+                                in_reply_to_id: Some(base64_url.clone()),
+                                ..status
+                            },
+                            _ => status,
+                        })
+                        .collect(),
+                    ..context
+                }))
             }
             _ => Err(AppError::not_found("Record", &base64_url)),
         },