FediMovies/fedimovies
1
1
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Activity

Make subscribers part of primary audience of Note

Browse source
This commit is contained in:
silverpill 2022-07-29 09:27:05 +00:00
parent edc64bbbb2
commit eb5e6b969b
2 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/activitypub/builders/create_note.rs
View file

@ -73,6 +73,7 @@ pub fn build_note(
url: Some(url), url: Some(url),
} }
}).collect(); }).collect();
let mut primary_audience = vec![]; let mut primary_audience = vec![];
let mut secondary_audience = vec![]; let mut secondary_audience = vec![];
let followers_collection_id = let followers_collection_id =
@ -92,11 +93,20 @@ pub fn build_note(
}, },
Visibility::Direct => (), Visibility::Direct => (),
}; };
let mut tags = vec![]; let mut tags = vec![];
for profile in &post.mentions { let mut mentions = post.mentions.clone();
if post.visibility == Visibility::Subscribers {
// Mention all subscribers
// (for recipients that don't support subscribers-only posts)
mentions.extend(subscribers);
};
for profile in mentions {
let tag_name = format!("@{}", profile.actor_address(instance_host)); let tag_name = format!("@{}", profile.actor_address(instance_host));
let actor_id = profile.actor_id(instance_url); let actor_id = profile.actor_id(instance_url);
primary_audience.push(actor_id.clone()); if !primary_audience.contains(&actor_id) {
primary_audience.push(actor_id.clone());
};
let tag = Tag { let tag = Tag {
name: Some(tag_name), name: Some(tag_name),
tag_type: MENTION.to_string(), tag_type: MENTION.to_string(),
@ -104,21 +114,6 @@ pub fn build_note(
}; };
tags.push(tag); tags.push(tag);
}; };
if matches!(post.visibility, Visibility::Subscribers) {
// Mention all subscribers
// (for recipients that don't support subscribers-only posts)
for profile in subscribers {
let tag_name = format!("@{}", profile.actor_address(instance_host));
let actor_id = profile.actor_id(instance_url);
secondary_audience.push(actor_id.clone());
let tag = Tag {
name: Some(tag_name),
tag_type: MENTION.to_string(),
href: Some(actor_id),
};
tags.push(tag);
};
};
for tag_name in &post.tags { for tag_name in &post.tags {
let tag_page_url = get_tag_page_url(instance_url, tag_name); let tag_page_url = get_tag_page_url(instance_url, tag_name);
let tag = Tag { let tag = Tag {
@ -217,7 +212,7 @@ pub async fn prepare_create_note(
post: &Post, post: &Post,
) -> Result<OutgoingActivity<Activity>, DatabaseError> { ) -> Result<OutgoingActivity<Activity>, DatabaseError> {
assert_eq!(author.id, post.author.id); assert_eq!(author.id, post.author.id);
let subscribers = if matches!(post.visibility, Visibility::Subscribers) { let subscribers = if post.visibility == Visibility::Subscribers {
get_subscribers(db_client, &author.id).await? get_subscribers(db_client, &author.id).await?
} else { } else {
vec![] vec![]
@ -305,8 +300,9 @@ mod tests {
assert_eq!(note.to, vec![ assert_eq!(note.to, vec![
local_actor_subscribers(INSTANCE_URL, &post.author.username), local_actor_subscribers(INSTANCE_URL, &post.author.username),
subscriber_id.to_string(),
]); ]);
assert_eq!(note.cc, vec![subscriber_id]); assert_eq!(note.cc.is_empty(), true);
} }
#[test] #[test]

2
src/activitypub/builders/delete_note.rs
View file

@ -57,7 +57,7 @@ pub async fn prepare_delete_note(
post: &Post, post: &Post,
) -> Result<OutgoingActivity<Activity>, DatabaseError> { ) -> Result<OutgoingActivity<Activity>, DatabaseError> {
assert_eq!(author.id, post.author.id); assert_eq!(author.id, post.author.id);
let subscribers = if matches!(post.visibility, Visibility::Subscribers) { let subscribers = if post.visibility == Visibility::Subscribers {
get_subscribers(db_client, &author.id).await? get_subscribers(db_client, &author.id).await?
} else { } else {
vec![] vec![]