From b16b12d996ca00536943502c046896cd75b8311b Mon Sep 17 00:00:00 2001
From: Pitchfork-and-Torch
 <297513015+Pitchfork-and-Torch@users.noreply.github.com>
Date: Sun, 6 Sep 2026 00:08:09 -0400
Subject: [PATCH] Stop QuoteHydrator from skipping quoted ids on retweets

---
 .../candidate_hydrators/quote_hydrator.rs     | 93 ++++++++++++++++++-
 1 file changed, 91 insertions(+), 2 deletions(-)

diff --git a/home-mixer/candidate_hydrators/quote_hydrator.rs b/home-mixer/candidate_hydrators/quote_hydrator.rs
index 47ff7842..5bd8eb1d 100644
--- a/home-mixer/candidate_hydrators/quote_hydrator.rs
+++ b/home-mixer/candidate_hydrators/quote_hydrator.rs
@@ -1,5 +1,5 @@
 use crate::clients::tweet_entity_service_client::TESClient;
-use crate::models::candidate::PostCandidate;
+use crate::models::candidate::{CandidateHelpers, PostCandidate};
 use crate::models::query::ScoredPostsQuery;
 use crate::params::EnableQuotedVqvDurationCheck;
 use std::collections::HashMap;
@@ -78,7 +78,10 @@ impl Hydrator<ScoredPostsQuery, PostCandidate> for QuoteHydrator {
         query: &ScoredPostsQuery,
         candidates: &[PostCandidate],
     ) -> Vec<Result<PostCandidate, String>> {
-        let tweet_ids: Vec<u64> = candidates.iter().map(|c| c.tweet_id).collect();
+        let tweet_ids: Vec<u64> = candidates
+            .iter()
+            .map(|c| c.get_original_tweet_id())
+            .collect();
 
         let mut cache_misses: Vec<u64> = Vec::new();
         let mut resolved: Vec<(u64, Option<u64>, Option<u64>)> =
@@ -174,3 +177,89 @@ impl Hydrator<ScoredPostsQuery, PostCandidate> for QuoteHydrator {
         candidate.quoted_video_duration_ms = hydrated.quoted_video_duration_ms;
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::clients::tweet_entity_service_client::MockTESClient;
+    use std::collections::HashMap;
+    use xai_candidate_pipeline::component_library::clients::MockSocialGraphClient;
+    use xai_candidate_pipeline::hydrator::Hydrator;
+    use xai_core_entities::entities::QuotedTweet;
+
+    fn tes_quote(
+        quoting_id: u64,
+        quoted_id: u64,
+        quoted_user: u64,
+    ) -> Arc<dyn TESClient + Send + Sync> {
+        let mut quoted_tweets = HashMap::new();
+        quoted_tweets.insert(
+            quoting_id,
+            Some(QuotedTweet {
+                tweet_id: quoted_id,
+                user_id: quoted_user,
+            }),
+        );
+        Arc::new(MockTESClient {
+            quoted_tweets,
+            ..Default::default()
+        })
+    }
+
+    async fn hydrate(
+        tes: Arc<dyn TESClient + Send + Sync>,
+        candidates: &[PostCandidate],
+    ) -> Vec<Result<PostCandidate, String>> {
+        let hydrator = QuoteHydrator::new(
+            tes,
+            Arc::new(MockSocialGraphClient) as Arc<dyn SocialGraphClientOps>,
+        )
+        .await;
+        hydrator
+            .hydrate(&ScoredPostsQuery::default(), candidates)
+            .await
+    }
+
+    #[tokio::test]
+    async fn native_quote_still_hydrates() {
+        let tes = tes_quote(20, 30, 99);
+        let candidates = vec![PostCandidate {
+            tweet_id: 20,
+            ..Default::default()
+        }];
+        let result = hydrate(tes, &candidates).await;
+        assert_eq!(result.len(), 1);
+        let hydrated = result[0].as_ref().unwrap();
+        assert_eq!(hydrated.quoted_tweet_id, Some(30));
+        assert_eq!(hydrated.quoted_user_id, Some(99));
+    }
+
+    #[tokio::test]
+    async fn retweet_of_quote_uses_original_tweet_id() {
+        let tes = tes_quote(20, 30, 99);
+        let candidates = vec![PostCandidate {
+            tweet_id: 10,
+            retweeted_tweet_id: Some(20),
+            ..Default::default()
+        }];
+        let result = hydrate(tes, &candidates).await;
+        assert_eq!(result.len(), 1);
+        let hydrated = result[0].as_ref().unwrap();
+        assert_eq!(hydrated.quoted_tweet_id, Some(30));
+        assert_eq!(hydrated.quoted_user_id, Some(99));
+    }
+
+    #[tokio::test]
+    async fn wrapper_id_is_not_the_tes_key() {
+        let tes = tes_quote(10, 30, 99);
+        let candidates = vec![PostCandidate {
+            tweet_id: 10,
+            retweeted_tweet_id: Some(20),
+            ..Default::default()
+        }];
+        let result = hydrate(tes, &candidates).await;
+        let hydrated = result[0].as_ref().unwrap();
+        assert_eq!(hydrated.quoted_tweet_id, None);
+        assert_eq!(hydrated.quoted_user_id, None);
+    }
+}