LemmyNet/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-30 00:01:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

reuse vars

Browse source
This commit is contained in:
phiresky 2024-07-16 20:48:24 +02:00
parent c60cf5a657
commit b487fa0437
1 changed files with 50 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

141
crates/federate/src/inboxes.rs
View file

@ -231,7 +231,6 @@ mod tests {
}; };
use mockall::{mock, predicate::*}; use mockall::{mock, predicate::*};
use serde_json::json; use serde_json::json;
mock! { mock! {
DataSource {} DataSource {}
#[async_trait] #[async_trait]
@ -277,6 +276,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_get_inbox_urls_send_all_instances() { async fn test_get_inbox_urls_send_all_instances() {
let mut collector = setup_collector(); let mut collector = setup_collector();
let site_inbox = Url::parse("https://example.com/inbox").unwrap();
let site = Site { let site = Site {
id: SiteId(1), id: SiteId(1),
name: "Test Site".to_string(), name: "Test Site".to_string(),
@ -288,7 +288,7 @@ mod tests {
description: None, description: None,
actor_id: Url::parse("https://example.com/site").unwrap().into(), actor_id: Url::parse("https://example.com/site").unwrap().into(),
last_refreshed_at: Utc::now(), last_refreshed_at: Utc::now(),
inbox_url: Url::parse("https://example.com/inbox").unwrap().into(), inbox_url: site_inbox.clone().into(),
private_key: None, private_key: None,
public_key: "test_key".to_string(), public_key: "test_key".to_string(),
instance_id: InstanceId(1), instance_id: InstanceId(1),
@ -317,31 +317,23 @@ mod tests {
let result = collector.get_inbox_urls(&activity).await.unwrap(); let result = collector.get_inbox_urls(&activity).await.unwrap();
assert_eq!(result.len(), 1); assert_eq!(result.len(), 1);
assert_eq!(result[0], Url::parse("https://example.com/inbox").unwrap()); assert_eq!(result[0], site_inbox);
} }
#[tokio::test] #[tokio::test]
async fn test_get_inbox_urls_community_followers() { async fn test_get_inbox_urls_community_followers() {
let mut collector = setup_collector(); let mut collector = setup_collector();
let community_id = CommunityId(1); let community_id = CommunityId(1);
let url1 = "https://follower1.example.com/inbox";
let url2 = "https://follower2.example.com/inbox";
collector collector
.data_source .data_source
.expect_get_instance_followed_community_inboxes() .expect_get_instance_followed_community_inboxes()
.return_once(move |_, _| { .return_once(move |_, _| {
Ok(vec![ Ok(vec![
( (community_id, Url::parse(url1).unwrap().into()),
community_id, (community_id, Url::parse(url2).unwrap().into()),
Url::parse("https://follower1.example.com/inbox")
.unwrap()
.into(),
),
(
community_id,
Url::parse("https://follower2.example.com/inbox")
.unwrap()
.into(),
),
]) ])
}); });
@ -364,15 +356,17 @@ mod tests {
let result = collector.get_inbox_urls(&activity).await.unwrap(); let result = collector.get_inbox_urls(&activity).await.unwrap();
assert_eq!(result.len(), 2); assert_eq!(result.len(), 2);
assert!(result.contains(&Url::parse("https://follower1.example.com/inbox").unwrap())); assert!(result.contains(&Url::parse(url1).unwrap()));
assert!(result.contains(&Url::parse("https://follower2.example.com/inbox").unwrap())); assert!(result.contains(&Url::parse(url2).unwrap()));
} }
#[tokio::test] #[tokio::test]
async fn test_get_inbox_urls_send_inboxes() { async fn test_get_inbox_urls_send_inboxes() {
let mut collector = setup_collector(); let mut collector = setup_collector();
collector.domain = "example.com".to_string(); collector.domain = "example.com".to_string();
let inbox_user_1 = Url::parse("https://example.com/user1/inbox").unwrap();
let inbox_user_2 = Url::parse("https://example.com/user2/inbox").unwrap();
let other_domain_inbox = Url::parse("https://other-domain.com/user3/inbox").unwrap();
let activity = SentActivity { let activity = SentActivity {
id: ActivityId(1), id: ActivityId(1),
ap_id: Url::parse("https://example.com/activities/1") ap_id: Url::parse("https://example.com/activities/1")
@ -382,21 +376,9 @@ mod tests {
sensitive: false, sensitive: false,
published: Utc::now(), published: Utc::now(),
send_inboxes: vec![ send_inboxes: vec![
Some( Some(inbox_user_1.clone().into()),
Url::parse("https://example.com/user1/inbox") Some(inbox_user_2.clone().into()),
.unwrap() Some(other_domain_inbox.clone().into()),
.into(),
),
Some(
Url::parse("https://example.com/user2/inbox")
.unwrap()
.into(),
),
Some(
Url::parse("https://other-domain.com/user3/inbox")
.unwrap()
.into(),
),
], ],
send_community_followers_of: None, send_community_followers_of: None,
send_all_instances: false, send_all_instances: false,
@ -406,9 +388,9 @@ mod tests {
let result = collector.get_inbox_urls(&activity).await.unwrap(); let result = collector.get_inbox_urls(&activity).await.unwrap();
assert_eq!(result.len(), 2); assert_eq!(result.len(), 2);
assert!(result.contains(&Url::parse("https://example.com/user1/inbox").unwrap())); assert!(result.contains(&inbox_user_1));
assert!(result.contains(&Url::parse("https://example.com/user2/inbox").unwrap())); assert!(result.contains(&inbox_user_2));
assert!(!result.contains(&Url::parse("https://other-domain.com/user3/inbox").unwrap())); assert!(!result.contains(&other_domain_inbox));
} }
#[tokio::test] #[tokio::test]
@ -417,6 +399,7 @@ mod tests {
collector.domain = "example.com".to_string(); collector.domain = "example.com".to_string();
let community_id = CommunityId(1); let community_id = CommunityId(1);
let site_inbox = Url::parse("https://example.com/site_inbox").unwrap();
let site = Site { let site = Site {
id: SiteId(1), id: SiteId(1),
name: "Test Site".to_string(), name: "Test Site".to_string(),
@ -428,7 +411,7 @@ mod tests {
description: None, description: None,
actor_id: Url::parse("https://example.com/site").unwrap().into(), actor_id: Url::parse("https://example.com/site").unwrap().into(),
last_refreshed_at: Utc::now(), last_refreshed_at: Utc::now(),
inbox_url: Url::parse("https://example.com/site_inbox").unwrap().into(), inbox_url: site_inbox.clone().into(),
private_key: None, private_key: None,
public_key: "test_key".to_string(), public_key: "test_key".to_string(),
instance_id: InstanceId(1), instance_id: InstanceId(1),
@ -440,20 +423,20 @@ mod tests {
.expect_read_site_from_instance_id() .expect_read_site_from_instance_id()
.return_once(move |_| Ok(Some(site))); .return_once(move |_| Ok(Some(site)));
let subdomain_inbox = "https://follower.example.com/inbox";
collector collector
.data_source .data_source
.expect_get_instance_followed_community_inboxes() .expect_get_instance_followed_community_inboxes()
.return_once(move |_, _| { .return_once(move |_, _| {
Ok(vec![( Ok(vec![(
community_id, community_id,
Url::parse("https://follower.example.com/inbox") Url::parse(subdomain_inbox).unwrap().into(),
.unwrap()
.into(),
)]) )])
}); });
collector.update_communities().await.unwrap(); collector.update_communities().await.unwrap();
let user1_inbox = Url::parse("https://example.com/user1/inbox").unwrap();
let user2_inbox = Url::parse("https://other-domain.com/user2/inbox").unwrap();
let activity = SentActivity { let activity = SentActivity {
id: ActivityId(1), id: ActivityId(1),
ap_id: Url::parse("https://example.com/activities/1") ap_id: Url::parse("https://example.com/activities/1")
@ -463,16 +446,8 @@ mod tests {
sensitive: false, sensitive: false,
published: Utc::now(), published: Utc::now(),
send_inboxes: vec![ send_inboxes: vec![
Some( Some(user1_inbox.clone().into()),
Url::parse("https://example.com/user1/inbox") Some(user2_inbox.clone().into()),
.unwrap()
.into(),
),
Some(
Url::parse("https://other-domain.com/user2/inbox")
.unwrap()
.into(),
),
], ],
send_community_followers_of: Some(community_id), send_community_followers_of: Some(community_id),
send_all_instances: true, send_all_instances: true,
@ -482,10 +457,10 @@ mod tests {
let result = collector.get_inbox_urls(&activity).await.unwrap(); let result = collector.get_inbox_urls(&activity).await.unwrap();
assert_eq!(result.len(), 3); assert_eq!(result.len(), 3);
assert!(result.contains(&Url::parse("https://example.com/site_inbox").unwrap())); assert!(result.contains(&site_inbox));
assert!(result.contains(&Url::parse("https://follower.example.com/inbox").unwrap())); assert!(result.contains(&Url::parse(subdomain_inbox).unwrap()));
assert!(result.contains(&Url::parse("https://example.com/user1/inbox").unwrap())); assert!(result.contains(&user1_inbox));
assert!(!result.contains(&Url::parse("https://other-domain.com/user2/inbox").unwrap())); assert!(!result.contains(&user2_inbox));
} }
#[tokio::test] #[tokio::test]
@ -495,6 +470,13 @@ mod tests {
let community_id2 = CommunityId(2); let community_id2 = CommunityId(2);
let community_id3 = CommunityId(3); let community_id3 = CommunityId(3);
let user1_inbox_str = "https://follower1.example.com/inbox";
let user1_inbox = Url::parse(user1_inbox_str).unwrap();
let user2_inbox_str = "https://follower2.example.com/inbox";
let user2_inbox = Url::parse(user2_inbox_str).unwrap();
let user3_inbox_str = "https://follower3.example.com/inbox";
let user3_inbox = Url::parse(user3_inbox_str).unwrap();
collector collector
.data_source .data_source
.expect_get_instance_followed_community_inboxes() .expect_get_instance_followed_community_inboxes()
@ -502,25 +484,13 @@ mod tests {
.returning(move |_, last_fetch| { .returning(move |_, last_fetch| {
if last_fetch == Utc.timestamp_nanos(0) { if last_fetch == Utc.timestamp_nanos(0) {
Ok(vec![ Ok(vec![
( (community_id1, Url::parse(user1_inbox_str).unwrap().into()),
community_id1, (community_id2, Url::parse(user2_inbox_str).unwrap().into()),
Url::parse("https://follower1.example.com/inbox")
.unwrap()
.into(),
),
(
community_id2,
Url::parse("https://follower2.example.com/inbox")
.unwrap()
.into(),
),
]) ])
} else { } else {
Ok(vec![( Ok(vec![(
community_id3, community_id3,
Url::parse("https://follower3.example.com/inbox") Url::parse(user3_inbox_str).unwrap().into(),
.unwrap()
.into(),
)]) )])
} }
}); });
@ -528,10 +498,8 @@ mod tests {
// First update // First update
collector.update_communities().await.unwrap(); collector.update_communities().await.unwrap();
assert_eq!(collector.followed_communities.len(), 2); assert_eq!(collector.followed_communities.len(), 2);
assert!(collector.followed_communities[&community_id1] assert!(collector.followed_communities[&community_id1].contains(&user1_inbox));
.contains(&Url::parse("https://follower1.example.com/inbox").unwrap())); assert!(collector.followed_communities[&community_id2].contains(&user2_inbox));
assert!(collector.followed_communities[&community_id2]
.contains(&Url::parse("https://follower2.example.com/inbox").unwrap()));
// Simulate time passing // Simulate time passing
collector.last_full_communities_fetch = Utc::now() - chrono::TimeDelta::try_minutes(3).unwrap(); collector.last_full_communities_fetch = Utc::now() - chrono::TimeDelta::try_minutes(3).unwrap();
@ -541,12 +509,9 @@ mod tests {
// Second update (incremental) // Second update (incremental)
collector.update_communities().await.unwrap(); collector.update_communities().await.unwrap();
assert_eq!(collector.followed_communities.len(), 3); assert_eq!(collector.followed_communities.len(), 3);
assert!(collector.followed_communities[&community_id1] assert!(collector.followed_communities[&community_id1].contains(&user1_inbox));
.contains(&Url::parse("https://follower1.example.com/inbox").unwrap())); assert!(collector.followed_communities[&community_id3].contains(&user3_inbox));
assert!(collector.followed_communities[&community_id3] assert!(collector.followed_communities[&community_id2].contains(&user2_inbox));
.contains(&Url::parse("https://follower3.example.com/inbox").unwrap()));
assert!(collector.followed_communities[&community_id2]
.contains(&Url::parse("https://follower2.example.com/inbox").unwrap()));
} }
#[tokio::test] #[tokio::test]
@ -554,7 +519,8 @@ mod tests {
let mut collector = setup_collector(); let mut collector = setup_collector();
collector.domain = "example.com".to_string(); collector.domain = "example.com".to_string();
let community_id = CommunityId(1); let community_id = CommunityId(1);
let site_inbox = Url::parse("https://example.com/site_inbox").unwrap();
let site_inbox_clone = site_inbox.clone();
let site = Site { let site = Site {
id: SiteId(1), id: SiteId(1),
name: "Test Site".to_string(), name: "Test Site".to_string(),
@ -566,7 +532,7 @@ mod tests {
description: None, description: None,
actor_id: Url::parse("https://example.com/site").unwrap().into(), actor_id: Url::parse("https://example.com/site").unwrap().into(),
last_refreshed_at: Utc::now(), last_refreshed_at: Utc::now(),
inbox_url: Url::parse("https://example.com/site_inbox").unwrap().into(), inbox_url: site_inbox.clone().into(),
private_key: None, private_key: None,
public_key: "test_key".to_string(), public_key: "test_key".to_string(),
instance_id: InstanceId(1), instance_id: InstanceId(1),
@ -581,12 +547,7 @@ mod tests {
collector collector
.data_source .data_source
.expect_get_instance_followed_community_inboxes() .expect_get_instance_followed_community_inboxes()
.return_once(move |_, _| { .return_once(move |_, _| Ok(vec![(community_id, site_inbox_clone.into())]));
Ok(vec![(
community_id,
Url::parse("https://example.com/site_inbox").unwrap().into(),
)])
});
collector.update_communities().await.unwrap(); collector.update_communities().await.unwrap();
@ -598,9 +559,7 @@ mod tests {
data: json!({}), data: json!({}),
sensitive: false, sensitive: false,
published: Utc::now(), published: Utc::now(),
send_inboxes: vec![Some( send_inboxes: vec![Some(site_inbox.into())],
Url::parse("https://example.com/site_inbox").unwrap().into(),
)],
send_community_followers_of: Some(community_id), send_community_followers_of: Some(community_id),
send_all_instances: true, send_all_instances: true,
actor_type: ActorType::Person, actor_type: ActorType::Person,