Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(dna): notifications only include responses *after* my response #221

Merged
merged 7 commits into from
Sep 11, 2023
Merged

fix(dna): notifications only include responses *after* my response #221

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6ca5486
fix(dna): notifications include responses to mews I responded to that…
mattyg Sep 8, 2023
01c23a5
Merge branch 'main' into fix/notifications-only-show-responses-after-…
mattyg Sep 8, 2023
0c9355a
Merge branch 'main' into fix/notifications-only-show-responses-after-…
mattyg Sep 9, 2023
80e7138
chore(dna): fmt+clippy
mattyg Sep 9, 2023
ea35ae0
Merge branch 'main' into fix/notifications-only-show-responses-after-…
mattyg Sep 10, 2023
94e4758
fix(dna): prevent redundant notifications when an agent has responded…
mattyg Sep 10, 2023
0a343a3
fix(dna): de-duplicate notifications for both 'reply to my mew' and '…
mattyg Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 101 additions & 35 deletions dnas/mewsfeed/zomes/coordinator/mews/src/agent_to_notifications.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,30 +91,65 @@ pub fn get_notifications_for_agent(
.collect();

// Responses to Mews I have responded to
let mew_hashes_i_responded_to: Vec<ActionHash> = agent_mews
let mut mew_hashes_i_responded_to: Vec<(Record, ActionHash)> = agent_mews
.iter()
.filter_map(|record| match record.entry().to_app_option::<Mew>().ok() {
Some(Some(mew)) => match mew.mew_type {
MewType::Reply(ah) | MewType::Quote(ah) | MewType::Mewmew(ah) => Some(ah),
// Filter only mew types that are responses
.filter_map(
|response_record| match response_record.entry().to_app_option::<Mew>().ok() {
Some(Some(mew)) => match mew.mew_type {
MewType::Reply(original_ah)
| MewType::Quote(original_ah)
| MewType::Mewmew(original_ah) => Some((response_record.clone(), original_ah)),
_ => None,
},
_ => None,
},
_ => None,
)
// Exclude responses to agent's mews to avoid duplicate notifications for both "responded to your mew" and "responded to a yarn you participated in"
.filter(|(_, original_ah)| {
agent_mews
.iter()
.filter(|authored_record| {
authored_record.action_hashed().hash == original_ah.clone()
})
.count()
== 0
})
.collect();
let mews_responding_to_mews_i_responded_to: Vec<Record> = mew_hashes_i_responded_to
.iter()
.map(|ah| {
get_responses_for_mew(GetResponsesForMewInput {
original_mew_hash: ah.clone(),
response_type: None,
page: None,
mew_hashes_i_responded_to
.sort_by_key(|(response_record, _)| response_record.action().timestamp());
mew_hashes_i_responded_to.dedup_by_key(|(_, original_ah)| original_ah.clone());

let mews_responding_to_mews_i_responded_to: Vec<(Record, Vec<Record>)> =
mew_hashes_i_responded_to
.iter()
.map(|(my_response, original_ah)| {
// Still have to use a get_links here because we cannot filter count_links by excluding an author
let responses_result = get_responses_for_mew(GetResponsesForMewInput {
original_mew_hash: original_ah.clone(),
response_type: None,
page: None,
});

match responses_result {
Ok(all_responses) => Ok((my_response.clone(), all_responses)),
Err(e) => Err(e),
}
})
})
.collect::<ExternResult<Vec<Vec<Record>>>>()?
.collect::<ExternResult<Vec<(Record, Vec<Record>)>>>()?;

let mews_responding_to_mews_i_responded_to = mews_responding_to_mews_i_responded_to
.iter()
.flatten()
.cloned()
.filter(|r| r.action().author().clone() != input.agent.clone())
.flat_map(|(my_response, all_responses)| -> Vec<Record> {
all_responses
.iter()
.filter(|other_response| {
other_response.action().author().clone() != input.agent.clone()
&& other_response.action().timestamp() >= my_response.action().timestamp()
})
.cloned()
.collect()
})
.collect();

let mut n = make_notifications_for_records(
Expand Down Expand Up @@ -223,32 +258,63 @@ pub fn count_notifications_for_agent(agent: AgentPubKey) -> ExternResult<usize>
.sum();

// Responses to Mews I have responded to
let mew_hashes_i_responded_to: Vec<ActionHash> = agent_mews
let mut mew_hashes_i_responded_to: Vec<(Record, ActionHash)> = agent_mews
.iter()
.filter_map(|record| match record.entry().to_app_option::<Mew>().ok() {
Some(Some(mew)) => match mew.mew_type {
MewType::Reply(ah) | MewType::Quote(ah) | MewType::Mewmew(ah) => Some(ah),
.filter_map(
|response_record| match response_record.entry().to_app_option::<Mew>().ok() {
Some(Some(mew)) => match mew.mew_type {
MewType::Reply(original_ah)
| MewType::Quote(original_ah)
| MewType::Mewmew(original_ah) => Some((response_record.clone(), original_ah)),
_ => None,
},
_ => None,
},
_ => None,
)
.filter(|(_, original_ah)| {
agent_mews
.iter()
.filter(|authored_record| {
authored_record.action_hashed().hash == original_ah.clone()
})
.count()
== 0
})
.collect();
mew_hashes_i_responded_to
.sort_by_key(|(response_record, _)| response_record.action().timestamp());
mew_hashes_i_responded_to.dedup_by_key(|(_, original_ah)| original_ah.clone());

let mews_responding_to_mews_i_responded_to: Vec<(Record, Vec<Record>)> =
mew_hashes_i_responded_to
.iter()
.map(|(my_response, original_ah)| {
// Still have to use a get_links here because we cannot filter count_links by excluding an author
let responses_result = get_responses_for_mew(GetResponsesForMewInput {
original_mew_hash: original_ah.clone(),
response_type: None,
page: None,
});

match responses_result {
Ok(all_responses) => Ok((my_response.clone(), all_responses)),
Err(e) => Err(e),
}
})
.collect::<ExternResult<Vec<(Record, Vec<Record>)>>>()?;

let mews_responding_to_mews_i_responded_to_count: usize = mew_hashes_i_responded_to
let mews_responding_to_mews_i_responded_to_count = mews_responding_to_mews_i_responded_to
.iter()
.map(|ah| {
// Still have to use a get_links here because we cannot filter count_links by excluding an author
get_responses_for_mew(GetResponsesForMewInput {
original_mew_hash: ah.clone(),
response_type: None,
page: None,
})
.flat_map(|(my_response, all_responses)| -> Vec<Record> {
all_responses
.iter()
.filter(|other_response| {
other_response.action().author().clone() != agent.clone()
&& other_response.action().timestamp() >= my_response.action().timestamp()
})
.cloned()
.collect()
})
.collect::<ExternResult<Vec<Vec<Record>>>>()?
.iter()
.flatten()
.cloned()
.filter(|r| r.action().author().clone() != agent.clone())
.count();

Ok(notifications_count + mews_responding_to_mews_i_responded_to_count)
Expand Down
Loading