diff --git a/radicle-cli/src/commands/issue.rs b/radicle-cli/src/commands/issue.rs index 918760e5..2fb9c104 100644 --- a/radicle-cli/src/commands/issue.rs +++ b/radicle-cli/src/commands/issue.rs @@ -510,7 +510,7 @@ fn list( }; if let Some(a) = assignee { - if !issue.assigned().any(|v| v == &Did::from(a)) { + if !issue.assignees().any(|v| v == &Did::from(a)) { continue; } } @@ -544,7 +544,7 @@ fn list( for (id, issue) in all { let assigned: String = issue - .assigned() + .assignees() .map(|did| { let (alias, _) = Author::new(did.as_key(), profile).labels(); diff --git a/radicle-cli/src/commands/unassign.rs b/radicle-cli/src/commands/unassign.rs index 8d8added..e7bd05d7 100644 --- a/radicle-cli/src/commands/unassign.rs +++ b/radicle-cli/src/commands/unassign.rs @@ -87,7 +87,7 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> { })?; let signer = term::signer(&profile)?; let assigned = issue - .assigned() + .assignees() .cloned() .filter(|did| !options.from.contains(did)) .collect::>(); diff --git a/radicle-cli/src/terminal/issue.rs b/radicle-cli/src/terminal/issue.rs index d93641d2..518608ad 100644 --- a/radicle-cli/src/terminal/issue.rs +++ b/radicle-cli/src/terminal/issue.rs @@ -46,7 +46,7 @@ pub fn show( ) -> anyhow::Result<()> { let labels: Vec = issue.labels().cloned().map(|t| t.into()).collect(); let assignees: Vec = issue - .assigned() + .assignees() .map(|a| term::format::did(a).to_string()) .collect(); let author = issue.author(); diff --git a/radicle-httpd/src/api/json.rs b/radicle-httpd/src/api/json.rs index 318afba3..995f22b8 100644 --- a/radicle-httpd/src/api/json.rs +++ b/radicle-httpd/src/api/json.rs @@ -105,7 +105,7 @@ pub(crate) fn issue(id: IssueId, issue: Issue, aliases: &impl AliasStore) -> Val "author": author(&issue.author(), aliases.alias(issue.author().id())), "title": issue.title(), "state": issue.state(), - "assignees": issue.assigned().collect::>(), + "assignees": issue.assignees().collect::>(), "discussion": issue .comments() .map(|(id, comment)| Comment::new(id, comment, aliases)) diff --git a/radicle/src/cob/issue.rs b/radicle/src/cob/issue.rs index c1d320b0..2d1cf0f2 100644 --- a/radicle/src/cob/issue.rs +++ b/radicle/src/cob/issue.rs @@ -197,7 +197,7 @@ impl Issue { } } - pub fn assigned(&self) -> impl Iterator + '_ { + pub fn assignees(&self) -> impl Iterator + '_ { self.assignees.iter() } @@ -922,7 +922,7 @@ mod test { let id = issue.id; let issue = issues.get(&id).unwrap().unwrap(); - let assignees: Vec<_> = issue.assigned().cloned().collect::>(); + let assignees: Vec<_> = issue.assignees().cloned().collect::>(); assert_eq!(1, assignees.len()); assert!(assignees.contains(&assignee)); @@ -934,7 +934,7 @@ mod test { let id = issue.id; let issue = issues.get(&id).unwrap().unwrap(); - let assignees: Vec<_> = issue.assigned().cloned().collect::>(); + let assignees: Vec<_> = issue.assignees().cloned().collect::>(); assert_eq!(2, assignees.len()); assert!(assignees.contains(&assignee)); @@ -963,7 +963,7 @@ mod test { issue.assign([assignee_two], &node.signer).unwrap(); issue.reload().unwrap(); - let assignees: Vec<_> = issue.assigned().cloned().collect::>(); + let assignees: Vec<_> = issue.assignees().cloned().collect::>(); assert_eq!(1, assignees.len()); assert!(assignees.contains(&assignee_two)); @@ -971,7 +971,7 @@ mod test { issue.assign([], &node.signer).unwrap(); issue.reload().unwrap(); - assert_eq!(0, issue.assigned().count()); + assert_eq!(0, issue.assignees().count()); } #[test] @@ -1057,12 +1057,12 @@ mod test { &node.signer, ) .unwrap(); - assert_eq!(2, issue.assigned().count()); + assert_eq!(2, issue.assignees().count()); issue.assign([assignee_two], &node.signer).unwrap(); issue.reload().unwrap(); - let assignees: Vec<_> = issue.assigned().cloned().collect::>(); + let assignees: Vec<_> = issue.assignees().cloned().collect::>(); assert_eq!(1, assignees.len()); assert!(assignees.contains(&assignee_two));