| 1 | |
|
| 2 | |
|
| 3 | |
|
| 4 | | use super::history::{render_files, FileRows}; |
| 5 | | use super::settings::{csrf, require}; |
| 6 | | use super::{filters, lookup, lookup_role, Error, Page, RepoShell, Shell}; |
| 7 | | use crate::auth::{Access, Role, Viewer}; |
| 8 | | use crate::db::{self, accounts, proposals as pdb}; |
| 9 | | use crate::render::{self, diff}; |
| 10 | | use crate::repos::proposals::{self as pl, Projection, Source}; |
| 11 | | use crate::repos::view::{self, ChangeView, ConflictView}; |
| 12 | | use crate::repos::RepoName; |
| 13 | | use crate::Shared; |
| 14 | | use askama::Template; |
| 15 | | use axum::extract::{Form, Path, Query, State}; |
| 16 | | use axum::response::{IntoResponse, Redirect, Response}; |
| 17 | | use hub_api::{Approval, ProposalSource, ProposalState}; |
| 18 | | use oxy_core::hash::ChangeHash; |
| 19 | | use serde::Deserialize; |
| 20 | | use std::collections::{BTreeMap, HashMap}; |
| 21 | |
|
| 22 | |
|
| 23 | |
|
| 24 | | #[derive(Template)] |
| 25 | | #[template(path = "proposals.html")] |
| 26 | | pub struct ProposalsPage { |
| 27 | | shell: Shell, |
| 28 | | repo: RepoShell, |
| 29 | | rows: Vec<pdb::ProposalRow>, |
| 30 | | filter: String, |
| 31 | | counts: (usize, usize, usize), |
| 32 | | bookmarks: Vec<String>, |
| 33 | | q: String, |
| 34 | | sort: String, |
| 35 | | pager: super::Pager, |
| 36 | | labels: std::collections::HashMap<i64, Vec<db::issues::Label>>, |
| 37 | | } |
| 38 | |
|
| 39 | | impl ProposalsPage { |
| 40 | 5× | fn labels_of(&self, id: &i64) -> &[db::issues::Label] { |
| 41 | 5× | self.labels.get(id).map(Vec::as_slice).unwrap_or(&[]) |
| 42 | 5× | } |
| 43 | | } |
| 44 | |
|
| 45 | | #[derive(Deserialize)] |
| 46 | | pub struct ListQuery { |
| 47 | | state: Option<String>, |
| 48 | | q: Option<String>, |
| 49 | | sort: Option<String>, |
| 50 | | page: Option<usize>, |
| 51 | | } |
| 52 | |
|
| 53 | |
|
| 54 | | pub const SORTS: &[(&str, &str)] = &[("updated", "recently updated"), ("newest", "newest"), ("oldest", "oldest")]; |
| 55 | |
|
| 56 | 5× | pub async fn list( |
| 57 | 5× | State(app): State<Shared>, |
| 58 | 5× | viewer: Viewer, |
| 59 | 5× | Path((owner, name)): Path<(String, String)>, |
| 60 | 5× | Query(q): Query<ListQuery>, |
| 61 | 5× | ) -> Result<Page<ProposalsPage>, Error> { |
| 62 | 5× | let shell = Shell::new(&app, &format!("/{owner}/{name}/proposals"), &viewer); |
| 63 | 5× | let (repo, row, role) = lookup(&app, &shell, &viewer, &owner, &name).await?; |
| 64 | 5× | let all = pdb::list(&app.db, row.id, &[]).await.map_err(|e| Error::from_db(shell.clone(), e))?; |
| 65 | 5× | let counts = ( |
| 66 | 11× | all.iter().filter(|p| p.is_open()).count(), |
| 67 | 11× | all.iter().filter(|p| p.state == "landed").count(), |
| 68 | 11× | all.iter().filter(|p| p.state == "closed").count(), |
| 69 | | ); |
| 70 | 5× | let filter = q.state.unwrap_or_else(|| "open".into()); |
| 71 | 5× | let mut labels: std::collections::HashMap<i64, Vec<db::issues::Label>> = std::collections::HashMap::new(); |
| 72 | 5× | for (id, l) in db::issues::labels_by_proposal(&app.db, row.id).await.map_err(|e| Error::from_db(shell.clone(), e))? { |
| 73 | 3× | labels.entry(id).or_default().push(l); |
| 74 | 3× | } |
| 75 | | |
| 76 | 5× | let qtext = q.q.clone().unwrap_or_default(); |
| 77 | 5× | let (mut authors, mut wanted, mut targets, mut words) = (vec![], vec![], vec![], vec![]); |
| 78 | 5× | for tok in qtext.split_whitespace() { |
| 79 | 3× | match tok.split_once(':') { |
| 80 | 3× | Some(("author", v)) => authors.push(v.to_lowercase()), |
| 81 | 2× | Some(("label", v)) => wanted.push(v.to_lowercase()), |
| 82 | 1× | Some(("target", v)) => targets.push(v.to_string()), |
| 83 | 0× | _ => words.push(tok.to_lowercase()), |
| 84 | | } |
| 85 | | } |
| 86 | 5× | let mut rows: Vec<pdb::ProposalRow> = all |
| 87 | 5× | .into_iter() |
| 88 | 11× | .filter(|p| match filter.as_str() { |
| 89 | 11× | "open" => p.is_open(), |
| 90 | 1× | "landed" => p.state == "landed", |
| 91 | 0× | "closed" => p.state == "closed", |
| 92 | 0× | _ => true, |
| 93 | 11× | }) |
| 94 | 11× | .filter(|p| authors.is_empty() || authors.contains(&p.author.to_lowercase())) |
| 95 | 9× | .filter(|p| targets.is_empty() || targets.contains(&p.target)) |
| 96 | 7× | .filter(|p| wanted.iter().all(|w| labels.get(&p.id).is_some_and(|ls| ls.iter().any(|l| l.name.to_lowercase() == *w)))) |
| 97 | 5× | .filter(|p| words.iter().all(|w| p.title.to_lowercase().contains(w) || p.body.to_lowercase().contains(w))) |
| 98 | 5× | .collect(); |
| 99 | 5× | let sort = q.sort.filter(|s| SORTS.iter().any(|(k, _)| k == s)).unwrap_or_else(|| "updated".into()); |
| 100 | 5× | match sort.as_str() { |
| 101 | 5× | "newest" => rows.sort_by_key(|p| std::cmp::Reverse(p.number)), |
| 102 | 5× | "oldest" => rows.sort_by_key(|p| p.number), |
| 103 | 5× | _ => rows.sort_by_key(|p| std::cmp::Reverse(p.updated_ms)), |
| 104 | | } |
| 105 | 5× | let pager = super::Pager::new(rows.len(), q.page, &[("state", &filter), ("q", &qtext), ("sort", &sort)]); |
| 106 | 5× | let rows = pager.slice(rows); |
| 107 | 5× | let bookmarks = app |
| 108 | 5× | .repos |
| 109 | 5× | .read(&repo, |r, _| Ok(r.bookmarks()?.into_iter().map(|b| b.name).collect::<Vec<_>>())) |
| 110 | 5× | .await |
| 111 | 5× | .map_err(|e| Error::from_repo(shell.clone(), e))?; |
| 112 | 5× | Ok(Page(ProposalsPage { |
| 113 | 5× | shell, |
| 114 | 5× | repo: RepoShell::new(&app, &row, "proposals").with_role(role), |
| 115 | 5× | rows, |
| 116 | 5× | filter, |
| 117 | 5× | counts, |
| 118 | 5× | bookmarks, |
| 119 | 5× | q: qtext, |
| 120 | 5× | sort, |
| 121 | 5× | pager, |
| 122 | 5× | labels, |
| 123 | 5× | })) |
| 124 | 5× | } |
| 125 | |
|
| 126 | |
|
| 127 | |
|
| 128 | | #[derive(Template)] |
| 129 | | #[template(path = "proposal_new.html")] |
| 130 | | pub struct NewProposalPage { |
| 131 | | shell: Shell, |
| 132 | | repo: RepoShell, |
| 133 | | bookmarks: Vec<String>, |
| 134 | | source: String, |
| 135 | | target: String, |
| 136 | | error: Option<String>, |
| 137 | | |
| 138 | | preview: Vec<ChangeView>, |
| 139 | | conflicted: bool, |
| 140 | | |
| 141 | | title: String, |
| 142 | | body: String, |
| 143 | | |
| 144 | | assistants: Vec<String>, |
| 145 | | } |
| 146 | |
|
| 147 | | #[derive(Deserialize)] |
| 148 | | pub struct NewQuery { |
| 149 | | source: Option<String>, |
| 150 | | target: Option<String>, |
| 151 | | } |
| 152 | |
|
| 153 | |
|
| 154 | |
|
| 155 | |
|
| 156 | |
|
| 157 | 77× | fn parse_source(app: &Shared, repo: &RepoName, source: &str) -> Option<(Option<RepoName>, String)> { |
| 158 | 492× | let plain = |b: &str| !b.is_empty() && !b.chars().any(|c| c.is_control() || c == ':'); |
| 159 | 77× | if let Some((slug, bookmark)) = source.split_once(':') { |
| 160 | 8× | let fork = RepoName::parse(slug)?; |
| 161 | 8× | if !plain(bookmark) { |
| 162 | 0× | return None; |
| 163 | 8× | } |
| 164 | 8× | if fork == *repo { |
| 165 | 2× | return Some((None, bookmark.to_string())); |
| 166 | 6× | } |
| 167 | 6× | if !app.repos.exists(&fork) { |
| 168 | 0× | return None; |
| 169 | 6× | } |
| 170 | 6× | return Some((Some(fork), bookmark.to_string())); |
| 171 | 69× | } |
| 172 | 69× | plain(source).then(|| (None, source.to_string())) |
| 173 | 77× | } |
| 174 | |
|
| 175 | 45× | async fn preview_for( |
| 176 | 45× | app: &Shared, |
| 177 | 45× | repo: &RepoName, |
| 178 | 45× | target: &str, |
| 179 | 45× | source: &str, |
| 180 | 45× | ) -> Result<(Vec<ChangeView>, bool), crate::repos::RepoError> { |
| 181 | 45× | let Some((fork, bookmark)) = parse_source(app, repo, source) else { return Ok((vec![], false)) }; |
| 182 | 45× | let target = target.to_string(); |
| 183 | 45× | let fork_dir = fork.as_ref().map(|f| app.repos.dir(f)); |
| 184 | 45× | app.repos |
| 185 | 45× | .read(repo, move |r, cache| { |
| 186 | 45× | let projection = match &fork_dir { |
| 187 | 4× | Some(dir) => { |
| 188 | 4× | let fork_repo = oxy_core::repo::Repo::open(dir)?; |
| 189 | 4× | let heads = fork_repo.bookmarks()?.into_iter().find(|b| b.name == bookmark).map(|b| b.heads).unwrap_or_default(); |
| 190 | 4× | pl::project(r, cache, &target, Source::Fork { fork: &fork_repo, heads })? |
| 191 | | } |
| 192 | | None => { |
| 193 | 63× | let heads = r.bookmarks()?.into_iter().find(|b| b.name == bookmark).map(|b| b.heads).unwrap_or_default(); |
| 194 | 41× | pl::project(r, cache, &target, Source::Bookmark(heads))? |
| 195 | | } |
| 196 | | }; |
| 197 | 45× | Ok((projection.changes, projection.conflicted)) |
| 198 | 45× | }) |
| 199 | 45× | .await |
| 200 | 45× | } |
| 201 | |
|
| 202 | 14× | pub async fn new_form( |
| 203 | 14× | State(app): State<Shared>, |
| 204 | 14× | viewer: Viewer, |
| 205 | 14× | Path((owner, name)): Path<(String, String)>, |
| 206 | 14× | Query(q): Query<NewQuery>, |
| 207 | 14× | ) -> Result<Page<NewProposalPage>, Error> { |
| 208 | 14× | let shell = Shell::new(&app, &format!("/{owner}/{name}/proposals/new"), &viewer); |
| 209 | 14× | require(&viewer, &shell)?; |
| 210 | 14× | let (repo, row, role) = lookup(&app, &shell, &viewer, &owner, &name).await?; |
| 211 | 14× | let bookmarks = app |
| 212 | 14× | .repos |
| 213 | 14× | .read(&repo, |r, _| Ok(r.bookmarks()?.into_iter().map(|b| b.name).collect::<Vec<_>>())) |
| 214 | 14× | .await |
| 215 | 14× | .map_err(|e| Error::from_repo(shell.clone(), e))?; |
| 216 | 14× | let target = q.target.unwrap_or_else(|| row.default_bookmark.clone()); |
| 217 | 14× | let source = q.source.unwrap_or_default(); |
| 218 | 14× | let (preview, conflicted) = |
| 219 | 14× | if source.is_empty() { (vec![], false) } else { preview_for(&app, &repo, &target, &source).await.unwrap_or((vec![], false)) }; |
| 220 | 14× | let assistants = if preview.is_empty() { vec![] } else { assistant_names(&app, &row).await }; |
| 221 | 14× | Ok(Page(NewProposalPage { |
| 222 | 14× | shell, |
| 223 | 14× | repo: RepoShell::new(&app, &row, "proposals").with_role(role), |
| 224 | 14× | bookmarks, |
| 225 | 14× | source, |
| 226 | 14× | target, |
| 227 | 14× | error: None, |
| 228 | 14× | preview, |
| 229 | 14× | conflicted, |
| 230 | 14× | title: String::new(), |
| 231 | 14× | body: String::new(), |
| 232 | 14× | assistants, |
| 233 | 14× | })) |
| 234 | 14× | } |
| 235 | |
|
| 236 | | #[derive(Deserialize)] |
| 237 | | pub struct NewForm { |
| 238 | | #[serde(rename = "_csrf")] |
| 239 | | csrf_token: String, |
| 240 | | title: String, |
| 241 | | #[serde(default)] |
| 242 | | body: String, |
| 243 | | target: String, |
| 244 | | source: String, |
| 245 | | #[serde(default)] |
| 246 | | draft: Option<String>, |
| 247 | | |
| 248 | | #[serde(default)] |
| 249 | | assistant: String, |
| 250 | | } |
| 251 | |
|
| 252 | |
|
| 253 | | #[allow(clippy::too_many_arguments)] |
| 254 | 30× | pub async fn open_proposal( |
| 255 | 30× | app: &Shared, |
| 256 | 30× | repo: &RepoName, |
| 257 | 30× | row: &db::repos::RepoRow, |
| 258 | 30× | me: &accounts::Account, |
| 259 | 30× | title: &str, |
| 260 | 30× | body: &str, |
| 261 | 30× | target: &str, |
| 262 | 30× | source: &str, |
| 263 | 30× | draft: bool, |
| 264 | 30× | ) -> Result<pdb::ProposalRow, String> { |
| 265 | 30× | if title.trim().is_empty() { |
| 266 | 0× | return Err("Give the proposal a title.".into()); |
| 267 | 30× | } |
| 268 | 30× | let bookmarks = |
| 269 | 30× | app.repos.read(repo, |r, _| Ok(r.bookmarks()?.into_iter().map(|b| b.name).collect::<Vec<_>>())).await.map_err(|e| e.to_string())?; |
| 270 | 70× | if !bookmarks.iter().any(|b| b == target) { |
| 271 | 0× | return Err("Pick a target bookmark of this repository.".into()); |
| 272 | 30× | } |
| 273 | 30× | let Some((fork, bookmark)) = parse_source(app, repo, source.trim()) else { |
| 274 | 0× | return Err("The source is a bookmark of this repository, or owner/name:bookmark of a fork.".into()); |
| 275 | | }; |
| 276 | 30× | if fork.is_none() && !bookmarks.contains(&bookmark) { |
| 277 | 1× | return Err(format!("There is no bookmark {bookmark} in this repository.")); |
| 278 | 29× | } |
| 279 | 29× | if fork.is_none() && bookmark == target { |
| 280 | 0× | return Err("The source and the target are the same bookmark.".into()); |
| 281 | 29× | } |
| 282 | 29× | let (preview, _) = preview_for(app, repo, target, source.trim()).await.map_err(|e| e.to_string())?; |
| 283 | 29× | if preview.is_empty() { |
| 284 | 0× | return Err("The source adds nothing to the target.".into()); |
| 285 | 29× | } |
| 286 | 29× | let source_repo_id = match &fork { |
| 287 | 2× | Some(fk) => db::repos::get(&app.db, &fk.owner, &fk.name).await.map_err(|e| e.to_string())?.map(|r| r.id), |
| 288 | 27× | None => None, |
| 289 | | }; |
| 290 | 29× | let created = pdb::create( |
| 291 | 29× | &app.db, |
| 292 | | pdb::NewProposal { |
| 293 | 29× | repo_id: row.id, |
| 294 | 29× | title: title.trim(), |
| 295 | 29× | body: body.trim(), |
| 296 | 29× | author_id: Some(me.id), |
| 297 | 29× | author: &me.username, |
| 298 | 29× | draft, |
| 299 | 29× | target, |
| 300 | 29× | source_kind: if fork.is_some() { "fork" } else { "bookmark" }, |
| 301 | 29× | source_repo_id, |
| 302 | 29× | source_bookmark: &bookmark, |
| 303 | 29× | source_changes: "", |
| 304 | | }, |
| 305 | | ) |
| 306 | 29× | .await |
| 307 | 29× | .map_err(|e| e.to_string())?; |
| 308 | 29× | pdb::add_event(&app.db, created.id, &me.username, "opened", "").await.ok(); |
| 309 | 29× | accounts::audit(&app.db, Some(me), "proposal.opened", &format!("{}#{}", row.slug(), created.number), title).await.ok(); |
| 310 | 29× | db::notify::index(&app.db, "proposal", row.id, created.id, created.number, &created.title, &created.body).await.ok(); |
| 311 | 29× | let url = format!("/{}/proposal/{}", row.slug(), created.number); |
| 312 | 29× | crate::notify::deliver( |
| 313 | 29× | app, |
| 314 | 29× | crate::notify::Event { |
| 315 | 29× | kind: "proposal.opened", |
| 316 | 29× | title: format!("{}#{}: {}", row.slug(), created.number, created.title), |
| 317 | 29× | url, |
| 318 | 29× | actor: me, |
| 319 | 29× | repo_id: row.id, |
| 320 | 29× | thread: Some(("proposal", created.id)), |
| 321 | 29× | mention_text: body, |
| 322 | 29× | direct: vec![], |
| 323 | 29× | }, |
| 324 | 29× | ) |
| 325 | 29× | .await; |
| 326 | 29× | crate::hooks::emit( |
| 327 | 29× | app, |
| 328 | 29× | row, |
| 329 | 29× | "proposal.opened", |
| 330 | 29× | &me.username, |
| 331 | 29× | serde_json::json!({ "number": created.number, "title": created.title, "target": target, "source": source }), |
| 332 | 29× | ) |
| 333 | 29× | .await; |
| 334 | 29× | Ok(created) |
| 335 | 30× | } |
| 336 | |
|
| 337 | 12× | pub async fn create( |
| 338 | 12× | State(app): State<Shared>, |
| 339 | 12× | viewer: Viewer, |
| 340 | 12× | Path((owner, name)): Path<(String, String)>, |
| 341 | 12× | Form(f): Form<NewForm>, |
| 342 | 12× | ) -> Result<Response, Error> { |
| 343 | 12× | let shell = Shell::new(&app, &format!("/{owner}/{name}/proposals/new"), &viewer); |
| 344 | 12× | let me = require(&viewer, &shell)?; |
| 345 | 12× | csrf(&viewer, &f.csrf_token, &shell)?; |
| 346 | 12× | let (repo, row, role) = lookup(&app, &shell, &viewer, &owner, &name).await?; |
| 347 | 12× | super::writable(&row, &shell)?; |
| 348 | 12× | match open_proposal(&app, &repo, &row, &me.account, &f.title, &f.body, &f.target, &f.source, f.draft.is_some()).await { |
| 349 | 12× | Ok(created) => Ok(Redirect::to(&format!("/{owner}/{name}/proposal/{}", created.number)).into_response()), |
| 350 | 0× | Err(msg) => { |
| 351 | 0× | let bookmarks = |
| 352 | 0× | app.repos.read(&repo, |r, _| Ok(r.bookmarks()?.into_iter().map(|b| b.name).collect::<Vec<_>>())).await.unwrap_or_default(); |
| 353 | 0× | Ok(Page(NewProposalPage { |
| 354 | 0× | shell, |
| 355 | 0× | repo: RepoShell::new(&app, &row, "proposals").with_role(role), |
| 356 | 0× | bookmarks, |
| 357 | 0× | source: f.source.clone(), |
| 358 | 0× | target: f.target.clone(), |
| 359 | 0× | error: Some(msg), |
| 360 | 0× | preview: vec![], |
| 361 | 0× | conflicted: false, |
| 362 | 0× | title: f.title.clone(), |
| 363 | 0× | body: f.body.clone(), |
| 364 | 0× | assistants: vec![], |
| 365 | 0× | }) |
| 366 | 0× | .into_response()) |
| 367 | | } |
| 368 | | } |
| 369 | 12× | } |
| 370 | |
|
| 371 | |
|
| 372 | |
|
| 373 | |
|
| 374 | | pub struct CommentView { |
| 375 | | pub row: pdb::CommentRow, |
| 376 | | pub body_html: String, |
| 377 | | pub line: Option<usize>, |
| 378 | | } |
| 379 | |
|
| 380 | |
|
| 381 | |
|
| 382 | | pub struct Entry { |
| 383 | | pub kind: &'static str, |
| 384 | | pub index: usize, |
| 385 | | } |
| 386 | |
|
| 387 | | pub struct ReviewView { |
| 388 | | pub row: pdb::ReviewRow, |
| 389 | | pub body_html: String, |
| 390 | | pub sealed: bool, |
| 391 | | } |
| 392 | |
|
| 393 | |
|
| 394 | | pub struct Loaded { |
| 395 | | pub row: pdb::ProposalRow, |
| 396 | | pub changes: Vec<ChangeView>, |
| 397 | | pub hashes: Vec<ChangeHash>, |
| 398 | | pub heads: Vec<ChangeHash>, |
| 399 | | pub target_heads: Vec<ChangeHash>, |
| 400 | | pub state: String, |
| 401 | | pub target_state: String, |
| 402 | | pub conflicted: bool, |
| 403 | | pub conflicts: Vec<ConflictView>, |
| 404 | | pub files: Vec<FileRows>, |
| 405 | | |
| 406 | | pub diffs: Vec<oxy_core::repo::FileDiff>, |
| 407 | | pub bases: std::collections::BTreeMap<String, Vec<u8>>, |
| 408 | | |
| 409 | | pub atoms: HashMap<(String, usize), (String, u32)>, |
| 410 | | pub sealing_keys: Vec<String>, |
| 411 | | pub touched: Vec<String>, |
| 412 | | pub owners: Vec<String>, |
| 413 | | pub landed_already: bool, |
| 414 | | |
| 415 | | |
| 416 | | |
| 417 | | pub source_has_changes: bool, |
| 418 | | } |
| 419 | |
|
| 420 | |
|
| 421 | 102× | pub async fn load(app: &Shared, repo: &RepoName, row: pdb::ProposalRow) -> Result<Loaded, crate::repos::RepoError> { |
| 422 | 102× | load_with(app, repo, row, true).await |
| 423 | 102× | } |
| 424 | |
|
| 425 | |
|
| 426 | |
|
| 427 | |
|
| 428 | |
|
| 429 | 64× | pub async fn load_summary(app: &Shared, repo: &RepoName, row: pdb::ProposalRow) -> Result<Loaded, crate::repos::RepoError> { |
| 430 | 64× | load_with(app, repo, row, false).await |
| 431 | 64× | } |
| 432 | |
|
| 433 | 166× | async fn load_with(app: &Shared, repo: &RepoName, row: pdb::ProposalRow, render: bool) -> Result<Loaded, crate::repos::RepoError> { |
| 434 | 166× | let fork_dir = match (row.source_kind.as_str(), row.source_repo_id) { |
| 435 | 166× | ("fork", Some(id)) => { |
| 436 | 6× | db::repos::get_by_id(&app.db, id).await.ok().flatten().and_then(|r| RepoName::new(&r.owner, &r.name)).map(|n| app.repos.dir(&n)) |
| 437 | | } |
| 438 | 160× | _ => None, |
| 439 | | }; |
| 440 | 166× | let r2 = row.clone(); |
| 441 | 166× | let loaded = app |
| 442 | 166× | .repos |
| 443 | 166× | .read(repo, move |r, cache| { |
| 444 | 166× | let source = match (r2.source_kind.as_str(), &fork_dir) { |
| 445 | 166× | ("changes", _) => Source::Changes(r2.source_changes().iter().filter_map(|h| ChangeHash::from_hex(h)).collect()), |
| 446 | 166× | ("fork", Some(dir)) => { |
| 447 | 6× | let fork_repo = oxy_core::repo::Repo::open(dir)?; |
| 448 | 6× | let heads = |
| 449 | 6× | fork_repo.bookmarks()?.into_iter().find(|b| b.name == r2.source_bookmark).map(|b| b.heads).unwrap_or_default(); |
| 450 | | |
| 451 | 6× | let fork_state = fork_repo.load_state(&heads)?; |
| 452 | 16× | let missing: Vec<ChangeHash> = fork_state.changes().map(|(h, _)| *h).filter(|h| !r.store().has(h)).collect(); |
| 453 | 6× | if !missing.is_empty() { |
| 454 | 0× | r.import_bundle(&fork_repo.bundle_for(&missing)?, r.current_policy()?.is_some())?; |
| 455 | 6× | } |
| 456 | 6× | Source::Changes(heads) |
| 457 | | } |
| 458 | | _ => { |
| 459 | 230× | let heads = r.bookmarks()?.into_iter().find(|b| b.name == r2.source_bookmark).map(|b| b.heads).unwrap_or_default(); |
| 460 | 160× | Source::Bookmark(heads) |
| 461 | | } |
| 462 | | }; |
| 463 | 166× | let source_has_changes = match &source { |
| 464 | 166× | Source::Changes(h) | Source::Bookmark(h) | Source::Fork { heads: h, .. } => !h.is_empty(), |
| 465 | | }; |
| 466 | 166× | let p: Projection = pl::project(r, cache, &r2.target, source)?; |
| 467 | 166× | let target_loaded = cache.load(r, &p.target_heads)?; |
| 468 | 166× | let files = if render { render_files(&p.files, &p.bases) } else { Vec::new() }; |
| 469 | 166× | let mut atoms = HashMap::new(); |
| 470 | 166× | for f in &files { |
| 471 | | |
| 472 | 100× | let Some(live) = pl::atoms_of(&p.loaded, &f.path) else { continue }; |
| 473 | 208× | for l in &f.lines { |
| 474 | 208× | if let Some((h, i)) = l.new_no.and_then(|n| live.get((n as usize).checked_sub(1)?)) { |
| 475 | 198× | atoms.insert((f.path.clone(), l.new_no.unwrap_or(0) as usize), (h.to_hex(), *i)); |
| 476 | 198× | } |
| 477 | | } |
| 478 | | } |
| 479 | 179× | let touched: Vec<String> = p.files.iter().map(|f| f.path.clone()).collect(); |
| 480 | 166× | let owners = pl::owners_for(&target_loaded, &touched); |
| 481 | 166× | let sealing = pl::sealing_keys(r, &p.hashes)?.into_iter().map(|k| k.to_hex()).collect(); |
| 482 | 166× | let landed_already = !p.hashes.is_empty() && p.hashes.iter().all(|h| target_loaded.state.contains(h)); |
| 483 | | |
| 484 | | |
| 485 | 166× | let (changes, hashes) = if r2.state == "landed" && p.hashes.is_empty() { |
| 486 | 14× | let hashes: Vec<ChangeHash> = r2.projected_changes().iter().filter_map(|h| ChangeHash::from_hex(h)).collect(); |
| 487 | 14× | let labels = HashMap::new(); |
| 488 | 14× | let changes = hashes |
| 489 | 14× | .iter() |
| 490 | 14× | .filter_map(|h| Some(view::change_view_pub(r, h, &r.store().get_change_meta(h).ok()?, false, &labels))) |
| 491 | 14× | .collect(); |
| 492 | 14× | (changes, hashes) |
| 493 | | } else { |
| 494 | 152× | (p.changes, p.hashes) |
| 495 | | }; |
| 496 | 166× | Ok(Loaded { |
| 497 | 166× | row: r2, |
| 498 | 166× | changes, |
| 499 | 166× | hashes, |
| 500 | 166× | heads: p.heads, |
| 501 | 166× | target_heads: p.target_heads.clone(), |
| 502 | 166× | state: p.state.to_hex(), |
| 503 | 166× | target_state: p.target_state.to_hex(), |
| 504 | 166× | conflicted: p.conflicted, |
| 505 | 166× | conflicts: p.conflicts, |
| 506 | 166× | files, |
| 507 | 166× | diffs: p.files.clone(), |
| 508 | 166× | bases: p.bases.clone(), |
| 509 | 166× | atoms, |
| 510 | 166× | sealing_keys: sealing, |
| 511 | 166× | touched, |
| 512 | 166× | owners, |
| 513 | 166× | landed_already, |
| 514 | 166× | source_has_changes, |
| 515 | 166× | }) |
| 516 | 166× | }) |
| 517 | 166× | .await?; |
| 518 | | |
| 519 | | |
| 520 | | |
| 521 | | |
| 522 | 166× | let mut loaded = loaded; |
| 523 | 166× | if loaded.row.is_open() |
| 524 | 148× | && loaded.source_has_changes |
| 525 | 148× | && loaded.hashes.is_empty() |
| 526 | 1× | && pdb::set_landed(&app.db, loaded.row.id, &loaded.target_state, "", "push").await.is_ok() |
| 527 | | { |
| 528 | 1× | loaded.row.state = "landed".into(); |
| 529 | 1× | loaded.row.landed_via = "push".into(); |
| 530 | 1× | loaded.row.landed_state = loaded.target_state.clone(); |
| 531 | 1× | return Ok(loaded); |
| 532 | 165× | } |
| 533 | | |
| 534 | | |
| 535 | | |
| 536 | 165× | if !loaded.row.is_open() { |
| 537 | 18× | return Ok(loaded); |
| 538 | 147× | } |
| 539 | 271× | let heads_csv = loaded.heads.iter().map(|h| h.to_hex()).collect::<Vec<_>>().join(","); |
| 540 | 149× | let changes_csv = loaded.hashes.iter().map(|h| h.to_hex()).collect::<Vec<_>>().join(","); |
| 541 | 147× | pdb::set_projection(&app.db, loaded.row.id, &loaded.state, &heads_csv, &loaded.target_state, &changes_csv, loaded.conflicted) |
| 542 | 147× | .await |
| 543 | 147× | .ok(); |
| 544 | 147× | Ok(loaded) |
| 545 | 166× | } |
| 546 | |
|
| 547 | |
|
| 548 | |
|
| 549 | 256× | pub async fn settle_after_push(app: &Shared, row: &db::repos::RepoRow, bookmark: &str, actor: &str) { |
| 550 | 256× | let Some(repo) = RepoName::new(&row.owner, &row.name) else { return }; |
| 551 | 256× | let Ok(open) = pdb::list(&app.db, row.id, &["open", "draft"]).await else { return }; |
| 552 | 256× | for p in open.into_iter().filter(|p| p.target == bookmark) { |
| 553 | 9× | let id = p.id; |
| 554 | 9× | let number = p.number; |
| 555 | 9× | if let Ok(l) = load_summary(app, &repo, p).await { |
| 556 | 9× | if l.row.state == "landed" && l.row.landed_by.is_empty() { |
| 557 | 1× | pdb::set_landed(&app.db, id, &l.target_state, actor, "push").await.ok(); |
| 558 | 1× | crate::flow::moot_after_landing(app, row, &l.row).await; |
| 559 | 8× | } else if l.row.is_open() && !l.hashes.is_empty() && crate::flow::enabled(app, row) { |
| 560 | | |
| 561 | | |
| 562 | | |
| 563 | 3× | let ran: i64 = sqlx::query_scalar("SELECT COUNT(*) FROM flow_runs WHERE repo_id = $1 AND state = $2") |
| 564 | 3× | .bind(row.id) |
| 565 | 3× | .bind(&l.state) |
| 566 | 3× | .fetch_one(&app.db) |
| 567 | 3× | .await |
| 568 | 3× | .unwrap_or(1); |
| 569 | 3× | if ran == 0 { |
| 570 | 2× | let label = format!("proposal/{number}"); |
| 571 | 2× | match crate::flow::start_run_scoped(app, row, &label, &l.state, &l.heads, actor, "proposal", None).await { |
| 572 | 1× | Ok(Some(n)) => tracing::info!("proposal {number}: its target moved; run #{n} checks its new projected state"), |
| 573 | 1× | Ok(None) => {} |
| 574 | 0× | Err(e) => tracing::warn!("proposal {number}: a run of its new projected state did not start: {e}"), |
| 575 | | } |
| 576 | 1× | } |
| 577 | 5× | } |
| 578 | 0× | } |
| 579 | | } |
| 580 | 256× | } |
| 581 | |
|
| 582 | |
|
| 583 | | pub struct Verdict { |
| 584 | | pub reviews: Vec<ReviewView>, |
| 585 | | pub approvals: Vec<Approval>, |
| 586 | | pub blockers: Vec<String>, |
| 587 | | |
| 588 | | |
| 589 | | pub checks_blocker: Option<String>, |
| 590 | | pub depends_on: Vec<i64>, |
| 591 | | pub requirements: pdb::Requirements, |
| 592 | | } |
| 593 | |
|
| 594 | 139× | pub async fn verdict(app: &Shared, loaded: &Loaded, repo_id: i64) -> Result<Verdict, sqlx::Error> { |
| 595 | 139× | let rows = pdb::reviews(&app.db, loaded.row.id).await?; |
| 596 | 139× | let links = accounts::identity_accounts(&app.db).await?; |
| 597 | 139× | let sealed_accounts: Vec<String> = links.iter().filter(|(k, _)| loaded.sealing_keys.contains(k)).map(|(_, u)| u.clone()).collect(); |
| 598 | | |
| 599 | 139× | let mut latest: BTreeMap<String, &pdb::ReviewRow> = BTreeMap::new(); |
| 600 | 139× | for r in rows.iter().filter(|r| r.via.is_empty()) { |
| 601 | 31× | |
| 602 | 31× | latest.insert(r.author.clone(), r); |
| 603 | 31× | } |
| 604 | 139× | let mut approvals = Vec::new(); |
| 605 | 139× | for (who, r) in &latest { |
| 606 | 31× | if r.verdict == "approve" { |
| 607 | 21× | let sealed = sealed_accounts.contains(who); |
| 608 | 21× | let key = links.iter().find(|(k, u)| u == who && loaded.sealing_keys.contains(k)).map(|(k, _)| k.clone()); |
| 609 | 21× | approvals.push(Approval { account: who.clone(), sealed, key }); |
| 610 | 10× | } |
| 611 | | } |
| 612 | 139× | let reviews = rows |
| 613 | 139× | .iter() |
| 614 | 139× | .map(|r| ReviewView { |
| 615 | 41× | row: r.clone(), |
| 616 | 41× | body_html: render::markdown::render(&r.body, "/", "/"), |
| 617 | 41× | sealed: r.verdict == "approve" && sealed_accounts.contains(&r.author), |
| 618 | 41× | }) |
| 619 | 139× | .collect(); |
| 620 | 139× | let requirements = pdb::requirements(&app.db, repo_id).await?; |
| 621 | 139× | let mut blockers = Vec::new(); |
| 622 | | |
| 623 | 139× | if !loaded.row.is_open() { |
| 624 | 18× | return Ok(Verdict { reviews, approvals, blockers, checks_blocker: None, depends_on: vec![], requirements }); |
| 625 | 121× | } |
| 626 | 121× | if loaded.row.state == "draft" { |
| 627 | 2× | blockers.push("the proposal is a draft".into()); |
| 628 | 119× | } |
| 629 | 121× | if loaded.hashes.is_empty() { |
| 630 | 0× | blockers.push("the proposal adds no changes".into()); |
| 631 | 121× | } |
| 632 | 121× | let sealed_count = approvals.iter().filter(|a| a.sealed).count() as i64; |
| 633 | 121× | if sealed_count < requirements.required_approvals { |
| 634 | 7× | blockers.push(format!("{sealed_count} of {} required sealed approvals", requirements.required_approvals)); |
| 635 | 114× | } |
| 636 | 121× | if requirements.require_owners { |
| 637 | 10× | let missing: Vec<&String> = loaded.owners.iter().filter(|o| !approvals.iter().any(|a| a.sealed && &a.account == *o)).collect(); |
| 638 | 10× | if !missing.is_empty() { |
| 639 | 7× | blockers.push(format!("code owners still to approve: {}", missing.iter().map(|s| s.as_str()).collect::<Vec<_>>().join(", "))); |
| 640 | 3× | } |
| 641 | 111× | } |
| 642 | 121× | if loaded.conflicted && !requirements.allow_conflicts { |
| 643 | 0× | blockers.push(format!( |
| 644 | 0× | "landing would carry conflicts, which this repository refuses: resolve them on the source (oxy merge {} there, fix the marked files, oxy commit, push)", |
| 645 | 0× | loaded.row.target |
| 646 | 0× | )); |
| 647 | 121× | } |
| 648 | 121× | let mut checks_blocker = None; |
| 649 | 121× | let required = db::hooks::required_checks(&app.db, repo_id).await?; |
| 650 | 121× | if !required.is_empty() { |
| 651 | 44× | let checks = db::hooks::checks_for_state(&app.db, repo_id, &loaded.state).await?; |
| 652 | 44× | let missing: Vec<String> = |
| 653 | 44× | required.iter().filter(|n| !checks.iter().any(|c| &c.name == *n && c.status == "passed")).cloned().collect(); |
| 654 | 44× | if !missing.is_empty() { |
| 655 | 25× | let b = format!("required checks not passed on the projected state: {}", missing.join(", ")); |
| 656 | 25× | checks_blocker = Some(b.clone()); |
| 657 | 25× | blockers.push(b); |
| 658 | 25× | } |
| 659 | 77× | } |
| 660 | 121× | let requesting: Vec<&String> = latest.iter().filter(|(_, r)| r.verdict == "changes").map(|(who, _)| who).collect(); |
| 661 | 121× | if !requesting.is_empty() { |
| 662 | 0× | blockers.push(format!("changes requested by {}", requesting.iter().map(|s| s.as_str()).collect::<Vec<_>>().join(", "))); |
| 663 | 121× | } |
| 664 | | |
| 665 | 121× | let mut depends_on = Vec::new(); |
| 666 | 157× | for other in pdb::list(&app.db, repo_id, &["open", "draft"]).await? { |
| 667 | 157× | if other.id == loaded.row.id || other.number > loaded.row.number { |
| 668 | 147× | continue; |
| 669 | 10× | } |
| 670 | 10× | let theirs = other.projected_changes(); |
| 671 | 10× | if !theirs.is_empty() && theirs.iter().all(|h| loaded.hashes.iter().any(|m| m.to_hex() == *h)) { |
| 672 | 1× | depends_on.push(other.number); |
| 673 | 9× | } |
| 674 | | } |
| 675 | 121× | if !depends_on.is_empty() { |
| 676 | 1× | blockers.push(format!("depends on {}", depends_on.iter().map(|n| format!("#{n}")).collect::<Vec<_>>().join(", "))); |
| 677 | 120× | } |
| 678 | 121× | Ok(Verdict { reviews, approvals, blockers, checks_blocker, depends_on, requirements }) |
| 679 | 139× | } |
| 680 | |
|
| 681 | | #[derive(Template)] |
| 682 | | #[template(path = "proposal.html")] |
| 683 | | pub struct ProposalPage { |
| 684 | | shell: Shell, |
| 685 | | repo: RepoShell, |
| 686 | | p: pdb::ProposalRow, |
| 687 | | |
| 688 | | |
| 689 | | live_topic: String, |
| 690 | | repo_topic: String, |
| 691 | | |
| 692 | | pending: Vec<String>, |
| 693 | | |
| 694 | | closes: Vec<super::chain::Link>, |
| 695 | | |
| 696 | | project_choices: Option<Vec<db::projects::Project>>, |
| 697 | | |
| 698 | | timeline: Vec<Entry>, |
| 699 | | |
| 700 | | can_triage: bool, |
| 701 | | body_html: String, |
| 702 | | tab: String, |
| 703 | | changes: Vec<ChangeView>, |
| 704 | | files: Vec<FileRows>, |
| 705 | | diffs: Vec<oxy_core::repo::FileDiff>, |
| 706 | | bases: std::collections::BTreeMap<String, Vec<u8>>, |
| 707 | | |
| 708 | | ignore_ws: bool, |
| 709 | | conflicts: Vec<ConflictView>, |
| 710 | | conflicted: bool, |
| 711 | | comments: Vec<CommentView>, |
| 712 | | |
| 713 | | placed: HashMap<(String, usize), Vec<usize>>, |
| 714 | | outdated: Vec<usize>, |
| 715 | | reviews: Vec<ReviewView>, |
| 716 | | approvals: Vec<Approval>, |
| 717 | | blockers: Vec<String>, |
| 718 | | depends_on: Vec<i64>, |
| 719 | | events: Vec<pdb::EventRow>, |
| 720 | | owners: Vec<String>, |
| 721 | | requirements: pdb::Requirements, |
| 722 | | landed_already: bool, |
| 723 | | can_edit: bool, |
| 724 | | |
| 725 | | |
| 726 | | deletable_source: Option<String>, |
| 727 | | can_land: bool, |
| 728 | | can_land_over_checks: bool, |
| 729 | | can_auto_land: bool, |
| 730 | | hub_can_land: bool, |
| 731 | | notice: Option<String>, |
| 732 | | error: Option<String>, |
| 733 | | heads: Vec<String>, |
| 734 | | state_hash: String, |
| 735 | | source_label: String, |
| 736 | | api_url: String, |
| 737 | | labels: Vec<db::issues::Label>, |
| 738 | | all_labels: Vec<db::issues::Label>, |
| 739 | | checks: Vec<db::hooks::Check>, |
| 740 | | required_checks: Vec<String>, |
| 741 | | |
| 742 | | projects: Vec<(db::projects::Project, String)>, |
| 743 | | |
| 744 | | requested: Vec<String>, |
| 745 | | |
| 746 | | reviewable: Vec<String>, |
| 747 | | |
| 748 | | can_request: bool, |
| 749 | | |
| 750 | | assistants: Vec<String>, |
| 751 | | |
| 752 | | draft: Option<String>, |
| 753 | | } |
| 754 | |
|
| 755 | | #[derive(Deserialize)] |
| 756 | | pub struct DetailQuery { |
| 757 | | tab: Option<String>, |
| 758 | | |
| 759 | | #[serde(default)] |
| 760 | | notice: Option<String>, |
| 761 | | #[serde(default)] |
| 762 | | error: Option<String>, |
| 763 | | #[serde(default)] |
| 764 | | w: Option<String>, |
| 765 | | |
| 766 | | #[serde(default)] |
| 767 | | fragment: Option<String>, |
| 768 | | } |
| 769 | |
|
| 770 | |
|
| 771 | |
|
| 772 | | #[allow(clippy::too_many_arguments)] |
| 773 | 72× | async fn detail( |
| 774 | 72× | app: &Shared, |
| 775 | 72× | shell: Shell, |
| 776 | 72× | viewer: &Viewer, |
| 777 | 72× | owner: &str, |
| 778 | 72× | name: &str, |
| 779 | 72× | number: i64, |
| 780 | 72× | tab: String, |
| 781 | 72× | notice: Option<String>, |
| 782 | 72× | error: Option<String>, |
| 783 | 72× | ) -> Result<Page<ProposalPage>, Error> { |
| 784 | 72× | let (repo, row, role) = lookup(app, &shell, viewer, owner, name).await?; |
| 785 | 72× | let p = pdb::get(&app.db, row.id, number) |
| 786 | 72× | .await |
| 787 | 72× | .map_err(|e| Error::from_db(shell.clone(), e))? |
| 788 | 72× | .ok_or_else(|| Error::not_found(shell.clone()))?; |
| 789 | 72× | let p_id = p.id; |
| 790 | 72× | let loaded = load(app, &repo, p).await.map_err(|e| Error::from_repo(shell.clone(), e))?; |
| 791 | | |
| 792 | 72× | if loaded.landed_already && loaded.row.is_open() { |
| 793 | 0× | pdb::set_state(&app.db, loaded.row.id, "landed", &loaded.target_state).await.ok(); |
| 794 | 0× | pdb::add_event(&app.db, loaded.row.id, "", "landed", "every change reached the target").await.ok(); |
| 795 | 0× | crate::flow::moot_after_landing(app, &row, &loaded.row).await; |
| 796 | 72× | } |
| 797 | 72× | let p = pdb::get(&app.db, row.id, number).await.map_err(|e| Error::from_db(shell.clone(), e))?.unwrap_or(loaded.row.clone()); |
| 798 | 72× | let v = verdict(app, &loaded, row.id).await.map_err(|e| Error::from_db(shell.clone(), e))?; |
| 799 | 72× | let comment_rows = pdb::comments(&app.db, loaded.row.id).await.map_err(|e| Error::from_db(shell.clone(), e))?; |
| 800 | 72× | let events = pdb::events(&app.db, loaded.row.id).await.map_err(|e| Error::from_db(shell.clone(), e))?; |
| 801 | | |
| 802 | 72× | let mut by_atom: HashMap<(String, String, u32), usize> = HashMap::new(); |
| 803 | 141× | for ((path, line), (h, i)) in &loaded.atoms { |
| 804 | 141× | by_atom.insert((path.clone(), h.clone(), *i), *line); |
| 805 | 141× | } |
| 806 | 72× | let mut comments = Vec::new(); |
| 807 | 72× | let mut placed: HashMap<(String, usize), Vec<usize>> = HashMap::new(); |
| 808 | 72× | let mut outdated = Vec::new(); |
| 809 | 72× | for (idx, c) in comment_rows.into_iter().enumerate() { |
| 810 | 36× | let line = if c.anchor_change.is_empty() { |
| 811 | 17× | None |
| 812 | | } else { |
| 813 | 19× | by_atom.get(&(c.path.clone(), c.anchor_change.clone(), c.anchor_index as u32)).copied() |
| 814 | | }; |
| 815 | 36× | if !c.anchor_change.is_empty() { |
| 816 | 19× | match line { |
| 817 | 16× | Some(l) => placed.entry((c.path.clone(), l)).or_default().push(idx), |
| 818 | 3× | None => outdated.push(idx), |
| 819 | | } |
| 820 | 17× | } |
| 821 | 36× | comments.push(CommentView { body_html: render::markdown::render(&c.body, "/", "/"), row: c, line }); |
| 822 | | } |
| 823 | 72× | let mut changes = loaded.changes.clone(); |
| 824 | 72× | super::attribute(app, &mut changes.iter_mut().collect::<Vec<_>>()).await; |
| 825 | 72× | let me = viewer.account(); |
| 826 | 72× | let can_edit = me.is_some_and(|a| Some(a.id) == p.author_id || role >= Role::Maintain); |
| 827 | 72× | let deletable_source = |
| 828 | 72× | if p.state == "landed" && p.source_kind == "bookmark" && role >= Role::Write && p.source_bookmark != row.default_bookmark { |
| 829 | 6× | let b = p.source_bookmark.clone(); |
| 830 | 6× | app.repos |
| 831 | 6× | .read(&repo, move |r, _| Ok(r.view()?.bookmarks.contains_key(&b))) |
| 832 | 6× | .await |
| 833 | 6× | .unwrap_or(false) |
| 834 | 6× | .then(|| p.source_bookmark.clone()) |
| 835 | | } else { |
| 836 | 66× | None |
| 837 | | }; |
| 838 | 72× | let can_land = role >= Role::Write && p.is_open() && v.blockers.is_empty(); |
| 839 | | |
| 840 | | |
| 841 | 72× | let can_auto_land = role >= Role::Write && p.is_open() && !v.blockers.is_empty(); |
| 842 | | |
| 843 | 72× | let can_land_over_checks = role >= Role::Maintain && p.is_open() && v.checks_blocker.is_some() && v.blockers.len() == 1; |
| 844 | 72× | let can_request = p.is_open() && me.is_some_and(|a| Some(a.id) == p.author_id || role >= Role::Write); |
| 845 | 72× | let requested = pdb::review_requests(&app.db, p.id).await.unwrap_or_default(); |
| 846 | 72× | let mut reviewable: Vec<String> = if can_request { |
| 847 | 66× | accounts::assignable(&app.db, row.id, &row.owner).await.unwrap_or_default().into_iter().filter(|u| *u != p.author).collect() |
| 848 | | } else { |
| 849 | 10× | Vec::new() |
| 850 | | }; |
| 851 | 72× | for r in &requested { |
| 852 | 1× | if !reviewable.iter().any(|x| x.eq_ignore_ascii_case(r)) { |
| 853 | 0× | reviewable.push(r.clone()); |
| 854 | 1× | } |
| 855 | | } |
| 856 | 72× | let assistants: Vec<String> = if (can_request || can_edit) && p.is_open() { assistant_names(app, &row).await } else { Vec::new() }; |
| 857 | 72× | let delegated = match viewer.account() { |
| 858 | 69× | Some(a) => super::edit::delegated_identity(app, a.id).await.is_some(), |
| 859 | 3× | None => false, |
| 860 | | }; |
| 861 | 72× | let hub_can_land = delegated || app.repos.read(&repo, |r, _| Ok(r.current_policy()?.is_none())).await.unwrap_or(false); |
| 862 | 72× | let source_label = match p.source_kind.as_str() { |
| 863 | 72× | "fork" => format!( |
| 864 | | "fork {}", |
| 865 | 6× | db::repos::get_by_id(&app.db, p.source_repo_id.unwrap_or(0)) |
| 866 | 6× | .await |
| 867 | 6× | .ok() |
| 868 | 6× | .flatten() |
| 869 | 6× | .map(|r| format!("{}:{}", r.slug(), p.source_bookmark)) |
| 870 | 6× | .unwrap_or_default() |
| 871 | | ), |
| 872 | 66× | "changes" => format!("{} changes", p.source_changes().len()), |
| 873 | 66× | _ => p.source_bookmark.clone(), |
| 874 | | }; |
| 875 | 72× | let projects = super::projects::placements_for(app, viewer, &row, p.number).await; |
| 876 | 72× | let texts: Vec<String> = std::iter::once(p.body.clone()).chain(changes.iter().map(|c| format!("{}\n{}", c.title, c.body))).collect(); |
| 877 | 72× | let closes = super::chain::issues_closed_by(app, &row, &texts.iter().map(String::as_str).collect::<Vec<_>>()).await; |
| 878 | 72× | let project_choices = super::projects::project_choices(app, viewer, &row, &projects).await; |
| 879 | 72× | let mut dated: Vec<(i64, Entry)> = Vec::new(); |
| 880 | 72× | for (index, c) in comments.iter().enumerate() { |
| 881 | 36× | if c.row.anchor_change.is_empty() { |
| 882 | 17× | dated.push((c.row.created_ms, Entry { kind: "comment", index })); |
| 883 | 19× | } |
| 884 | | } |
| 885 | 72× | for (index, r) in v.reviews.iter().enumerate() { |
| 886 | 23× | dated.push((r.row.created_ms, Entry { kind: "review", index })); |
| 887 | 23× | } |
| 888 | 138× | for (index, e) in events.iter().enumerate() { |
| 889 | 138× | dated.push((e.at_ms, Entry { kind: "event", index })); |
| 890 | 138× | } |
| 891 | 72× | dated.sort_by_key(|(at, _)| *at); |
| 892 | 72× | let timeline: Vec<Entry> = dated.into_iter().map(|(_, e)| e).collect(); |
| 893 | 72× | let pending = app.assistant_gate.lock().unwrap_or_else(|e| e.into_inner()).answering(p_id); |
| 894 | | Ok(Page(ProposalPage { |
| 895 | 72× | live_topic: crate::events::topic::proposal(row.id, number), |
| 896 | 72× | repo_topic: crate::events::topic::repo(row.id), |
| 897 | 72× | pending, |
| 898 | 72× | can_triage: role >= Role::Triage, |
| 899 | 72× | timeline, |
| 900 | 72× | closes, |
| 901 | 72× | project_choices, |
| 902 | 72× | projects, |
| 903 | 72× | shell, |
| 904 | 72× | repo: RepoShell::new(app, &row, "proposals").with_role(role).with_sky(app, &row).await, |
| 905 | 72× | body_html: super::issues::markdown(app, &row, &row.default_bookmark, &p.body).await, |
| 906 | 72× | p, |
| 907 | 72× | tab, |
| 908 | 72× | changes, |
| 909 | 72× | files: loaded.files, |
| 910 | 72× | diffs: loaded.diffs, |
| 911 | 72× | bases: loaded.bases, |
| 912 | | ignore_ws: false, |
| 913 | 72× | conflicts: loaded.conflicts, |
| 914 | 72× | conflicted: loaded.conflicted, |
| 915 | 72× | comments, |
| 916 | 72× | placed, |
| 917 | 72× | outdated, |
| 918 | 72× | reviews: v.reviews, |
| 919 | 72× | approvals: v.approvals, |
| 920 | 72× | blockers: v.blockers, |
| 921 | 72× | depends_on: v.depends_on, |
| 922 | 72× | events, |
| 923 | 72× | owners: loaded.owners, |
| 924 | 72× | requirements: v.requirements, |
| 925 | 72× | landed_already: loaded.landed_already, |
| 926 | 72× | can_edit, |
| 927 | 72× | deletable_source, |
| 928 | 72× | can_land, |
| 929 | 72× | can_land_over_checks, |
| 930 | 72× | can_auto_land, |
| 931 | 72× | hub_can_land, |
| 932 | 72× | notice, |
| 933 | 72× | error, |
| 934 | 128× | heads: loaded.heads.iter().map(|h| h.to_hex()).collect(), |
| 935 | 72× | state_hash: loaded.state.clone(), |
| 936 | 72× | source_label, |
| 937 | 72× | api_url: format!("{}/api/v1/repos/{owner}/{name}/proposals/{number}", app.config.base_url()), |
| 938 | 72× | labels: db::issues::proposal_labels(&app.db, loaded.row.id).await.unwrap_or_default(), |
| 939 | 72× | all_labels: db::issues::labels(&app.db, row.id).await.unwrap_or_default(), |
| 940 | 72× | checks: db::hooks::checks_for_state(&app.db, row.id, &loaded.state).await.unwrap_or_default(), |
| 941 | 72× | required_checks: db::hooks::required_checks(&app.db, row.id).await.unwrap_or_default(), |
| 942 | 72× | requested, |
| 943 | 72× | reviewable, |
| 944 | 72× | assistants, |
| 945 | 72× | draft: None, |
| 946 | 72× | can_request, |
| 947 | | })) |
| 948 | 72× | } |
| 949 | |
|
| 950 | |
|
| 951 | |
|
| 952 | 28× | fn back(owner: &str, name: &str, number: i64, tab: &str, notice: Option<String>, error: Option<String>) -> Response { |
| 953 | 28× | let mut url = format!("/{owner}/{name}/proposal/{number}?tab={tab}"); |
| 954 | 28× | if let Some(n) = notice { |
| 955 | 19× | url.push_str(&format!("¬ice={}", super::settings::urlencode(&n))); |
| 956 | 19× | } |
| 957 | 28× | if let Some(e) = error { |
| 958 | 4× | url.push_str(&format!("&error={}", super::settings::urlencode(&e))); |
| 959 | 24× | } |
| 960 | 28× | Redirect::to(&url).into_response() |
| 961 | 28× | } |
| 962 | |
|
| 963 | 71× | pub async fn show( |
| 964 | 71× | State(app): State<Shared>, |
| 965 | 71× | viewer: Viewer, |
| 966 | 71× | Path((owner, name, number)): Path<(String, String, i64)>, |
| 967 | 71× | Query(q): Query<DetailQuery>, |
| 968 | 71× | ) -> Result<Response, Error> { |
| 969 | 71× | let shell = Shell::new(&app, &format!("/{owner}/{name}/proposal/{number}"), &viewer); |
| 970 | 71× | let mut page = |
| 971 | 71× | detail(&app, shell, &viewer, &owner, &name, number, q.tab.unwrap_or_else(|| "conversation".into()), q.notice, q.error).await?; |
| 972 | 71× | if q.w.as_deref() == Some("1") { |
| 973 | 0× | |
| 974 | 0× | page.0.files = |
| 975 | 0× | super::history::render_files_with(&page.0.diffs, &page.0.bases, crate::render::diff::Options { ignore_whitespace: true }); |
| 976 | 0× | page.0.ignore_ws = true; |
| 977 | 71× | } |
| 978 | | |
| 979 | | |
| 980 | 71× | if let Some(name) = q.fragment.as_deref() { |
| 981 | 4× | let html = page.0.render().map_err(|e| Error::bad(page.0.shell.clone(), e.to_string()))?; |
| 982 | 4× | return Ok(match super::fragment(&html, name) { |
| 983 | 3× | Some(part) => ([(axum::http::header::CACHE_CONTROL, "no-store")], axum::response::Html(part)).into_response(), |
| 984 | 1× | None => (axum::http::StatusCode::NOT_FOUND, "no such fragment").into_response(), |
| 985 | | }); |
| 986 | 67× | } |
| 987 | 67× | Ok(page.into_response()) |
| 988 | 71× | } |
| 989 | |
|
| 990 | |
|
| 991 | |
|
| 992 | | #[derive(Deserialize)] |
| 993 | | pub struct CommentForm { |
| 994 | | #[serde(rename = "_csrf")] |
| 995 | | csrf_token: String, |
| 996 | | body: String, |
| 997 | | #[serde(default)] |
| 998 | | path: String, |
| 999 | | #[serde(default)] |
| 1000 | | line: Option<usize>, |
| 1001 | | } |
| 1002 | |
|
| 1003 | 2× | pub async fn comment( |
| 1004 | 2× | State(app): State<Shared>, |
| 1005 | 2× | viewer: Viewer, |
| 1006 | 2× | Path((owner, name, number)): Path<(String, String, i64)>, |
| 1007 | 2× | Form(f): Form<CommentForm>, |
| 1008 | 2× | ) -> Result<Response, Error> { |
| 1009 | 2× | let shell = Shell::new(&app, &format!("/{owner}/{name}/proposal/{number}"), &viewer); |
| 1010 | 2× | let me = require(&viewer, &shell)?; |
| 1011 | 2× | csrf(&viewer, &f.csrf_token, &shell)?; |
| 1012 | 2× | let (repo, row, _) = lookup(&app, &shell, &viewer, &owner, &name).await?; |
| 1013 | 2× | super::writable(&row, &shell)?; |
| 1014 | 2× | let p = pdb::get(&app.db, row.id, number) |
| 1015 | 2× | .await |
| 1016 | 2× | .map_err(|e| Error::from_db(shell.clone(), e))? |
| 1017 | 2× | .ok_or_else(|| Error::not_found(shell.clone()))?; |
| 1018 | 2× | if f.body.trim().is_empty() { |
| 1019 | 0× | return Ok(back(&owner, &name, number, "conversation", None, Some("An empty comment says nothing.".into()))); |
| 1020 | 2× | } |
| 1021 | 2× | let anchor = match (f.path.trim(), f.line) { |
| 1022 | 2× | ("", _) | (_, None) => None, |
| 1023 | 1× | (path, Some(line)) => { |
| 1024 | 1× | let loaded = load(&app, &repo, p.clone()).await.map_err(|e| Error::from_repo(shell.clone(), e))?; |
| 1025 | 1× | loaded.atoms.get(&(path.to_string(), line)).cloned() |
| 1026 | | } |
| 1027 | | }; |
| 1028 | 2× | let tab = if anchor.is_some() { "files" } else { "conversation" }; |
| 1029 | 2× | pdb::add_comment( |
| 1030 | 2× | &app.db, |
| 1031 | 2× | p.id, |
| 1032 | 2× | Some(me.account.id), |
| 1033 | 2× | &me.account.username, |
| 1034 | 2× | f.body.trim(), |
| 1035 | 2× | f.path.trim(), |
| 1036 | 2× | anchor.as_ref().map(|(h, i)| (h.as_str(), *i as i64)), |
| 1037 | | ) |
| 1038 | 2× | .await |
| 1039 | 2× | .map_err(|e| Error::from_db(shell.clone(), e))?; |
| 1040 | 2× | app.bus.live(&crate::events::topic::proposal(row.id, number), "comment"); |
| 1041 | 2× | Ok(back(&owner, &name, number, tab, None, None)) |
| 1042 | 2× | } |
| 1043 | |
|
| 1044 | | #[derive(Deserialize)] |
| 1045 | | pub struct ReviewForm { |
| 1046 | | #[serde(rename = "_csrf")] |
| 1047 | | csrf_token: String, |
| 1048 | | verdict: String, |
| 1049 | | #[serde(default)] |
| 1050 | | body: String, |
| 1051 | | } |
| 1052 | |
|
| 1053 | 3× | pub async fn review( |
| 1054 | 3× | State(app): State<Shared>, |
| 1055 | 3× | viewer: Viewer, |
| 1056 | 3× | Path((owner, name, number)): Path<(String, String, i64)>, |
| 1057 | 3× | Form(f): Form<ReviewForm>, |
| 1058 | 3× | ) -> Result<Response, Error> { |
| 1059 | 3× | let shell = Shell::new(&app, &format!("/{owner}/{name}/proposal/{number}"), &viewer); |
| 1060 | 3× | let me = require(&viewer, &shell)?; |
| 1061 | 3× | csrf(&viewer, &f.csrf_token, &shell)?; |
| 1062 | 3× | let (_, row, _) = lookup(&app, &shell, &viewer, &owner, &name).await?; |
| 1063 | 3× | super::writable(&row, &shell)?; |
| 1064 | 3× | let p = pdb::get(&app.db, row.id, number) |
| 1065 | 3× | .await |
| 1066 | 3× | .map_err(|e| Error::from_db(shell.clone(), e))? |
| 1067 | 3× | .ok_or_else(|| Error::not_found(shell.clone()))?; |
| 1068 | 3× | if !matches!(f.verdict.as_str(), "comment" | "changes" | "approve") { |
| 1069 | 0× | return Err(Error::bad(shell, "a review is comment, changes or approve")); |
| 1070 | 3× | } |
| 1071 | 3× | if f.verdict == "approve" && Some(me.account.id) == p.author_id { |
| 1072 | 1× | return Ok(back(&owner, &name, number, "conversation", None, Some("You cannot approve your own proposal.".into()))); |
| 1073 | 2× | } |
| 1074 | 2× | pdb::add_review(&app.db, p.id, me.account.id, &me.account.username, &f.verdict, f.body.trim()) |
| 1075 | 2× | .await |
| 1076 | 2× | .map_err(|e| Error::from_db(shell.clone(), e))?; |
| 1077 | 2× | pdb::add_event(&app.db, p.id, &me.account.username, &format!("review.{}", f.verdict), "").await.ok(); |
| 1078 | 2× | reviewed(&app, &row, &p, &me.account, &f.verdict).await; |
| 1079 | 2× | crate::hooks::emit(&app, &row, "review", &me.account.username, serde_json::json!({ "number": number, "verdict": f.verdict })).await; |
| 1080 | 2× | let notice = if f.verdict == "approve" { |
| 1081 | 2× | Some(format!( |
| 1082 | 2× | "Approval recorded. It counts once you seal the changes: oxy seal --proposal {}/{owner}/{name}/proposal/{number}", |
| 1083 | 2× | app.config.base_url() |
| 1084 | 2× | )) |
| 1085 | | } else { |
| 1086 | 0× | None |
| 1087 | | }; |
| 1088 | 2× | Ok(back(&owner, &name, number, "conversation", notice, None)) |
| 1089 | 3× | } |
| 1090 | |
|
| 1091 | | #[derive(Deserialize)] |
| 1092 | | pub struct EditForm { |
| 1093 | | #[serde(rename = "_csrf")] |
| 1094 | | csrf_token: String, |
| 1095 | | title: String, |
| 1096 | | #[serde(default)] |
| 1097 | | body: String, |
| 1098 | | target: String, |
| 1099 | | } |
| 1100 | |
|
| 1101 | 0× | pub async fn edit( |
| 1102 | 0× | State(app): State<Shared>, |
| 1103 | 0× | viewer: Viewer, |
| 1104 | 0× | Path((owner, name, number)): Path<(String, String, i64)>, |
| 1105 | 0× | Form(f): Form<EditForm>, |
| 1106 | 0× | ) -> Result<Response, Error> { |
| 1107 | 0× | let shell = Shell::new(&app, &format!("/{owner}/{name}/proposal/{number}"), &viewer); |
| 1108 | 0× | let me = require(&viewer, &shell)?; |
| 1109 | 0× | csrf(&viewer, &f.csrf_token, &shell)?; |
| 1110 | 0× | let (_, row, role) = lookup(&app, &shell, &viewer, &owner, &name).await?; |
| 1111 | 0× | let p = pdb::get(&app.db, row.id, number) |
| 1112 | 0× | .await |
| 1113 | 0× | .map_err(|e| Error::from_db(shell.clone(), e))? |
| 1114 | 0× | .ok_or_else(|| Error::not_found(shell.clone()))?; |
| 1115 | 0× | if Some(me.account.id) != p.author_id && role < Role::Maintain { |
| 1116 | 0× | return Err(Error::not_found(shell)); |
| 1117 | 0× | } |
| 1118 | 0× | let target = if crate::repos::names::valid_segment(f.target.trim()) { f.target.trim() } else { &p.target }; |
| 1119 | 0× | pdb::edit(&app.db, p.id, f.title.trim(), f.body.trim(), target).await.map_err(|e| Error::from_db(shell.clone(), e))?; |
| 1120 | 0× | pdb::add_event(&app.db, p.id, &me.account.username, "edited", "").await.ok(); |
| 1121 | 0× | Ok(back(&owner, &name, number, "conversation", Some("Saved.".into()), None)) |
| 1122 | 0× | } |
| 1123 | |
|
| 1124 | | #[derive(Deserialize)] |
| 1125 | | pub struct StateForm { |
| 1126 | | #[serde(rename = "_csrf")] |
| 1127 | | csrf_token: String, |
| 1128 | | action: String, |
| 1129 | | } |
| 1130 | |
|
| 1131 | 2× | pub async fn state( |
| 1132 | 2× | State(app): State<Shared>, |
| 1133 | 2× | viewer: Viewer, |
| 1134 | 2× | Path((owner, name, number)): Path<(String, String, i64)>, |
| 1135 | 2× | Form(f): Form<StateForm>, |
| 1136 | 2× | ) -> Result<Response, Error> { |
| 1137 | 2× | let shell = Shell::new(&app, &format!("/{owner}/{name}/proposal/{number}"), &viewer); |
| 1138 | 2× | let me = require(&viewer, &shell)?; |
| 1139 | 2× | csrf(&viewer, &f.csrf_token, &shell)?; |
| 1140 | 2× | let (_, row, role) = lookup(&app, &shell, &viewer, &owner, &name).await?; |
| 1141 | 2× | let p = pdb::get(&app.db, row.id, number) |
| 1142 | 2× | .await |
| 1143 | 2× | .map_err(|e| Error::from_db(shell.clone(), e))? |
| 1144 | 2× | .ok_or_else(|| Error::not_found(shell.clone()))?; |
| 1145 | 2× | if Some(me.account.id) != p.author_id && role < Role::Triage { |
| 1146 | 0× | return Err(Error::not_found(shell)); |
| 1147 | 2× | } |
| 1148 | 2× | let new_state = match (f.action.as_str(), p.state.as_str()) { |
| 1149 | 2× | ("close", "open" | "draft") => "closed", |
| 1150 | 1× | ("reopen", "closed") => "open", |
| 1151 | 0× | ("ready", "draft") => "open", |
| 1152 | 0× | ("draft", "open") => "draft", |
| 1153 | 0× | _ => return Err(Error::bad(shell, "that transition is not possible")), |
| 1154 | | }; |
| 1155 | 2× | pdb::set_state(&app.db, p.id, new_state, "").await.map_err(|e| Error::from_db(shell.clone(), e))?; |
| 1156 | 2× | pdb::add_event(&app.db, p.id, &me.account.username, new_state, "").await.ok(); |
| 1157 | 2× | crate::hooks::emit(&app, &row, &format!("proposal.{new_state}"), &me.account.username, serde_json::json!({ "number": number })).await; |
| 1158 | 2× | Ok(back(&owner, &name, number, "conversation", None, None)) |
| 1159 | 2× | } |
| 1160 | |
|
| 1161 | 0× | pub async fn resolve_comment( |
| 1162 | 0× | State(app): State<Shared>, |
| 1163 | 0× | viewer: Viewer, |
| 1164 | 0× | Path((owner, name, number, id)): Path<(String, String, i64, i64)>, |
| 1165 | 0× | Form(f): Form<super::session::CsrfForm>, |
| 1166 | 0× | ) -> Result<Response, Error> { |
| 1167 | 0× | let shell = Shell::new(&app, &format!("/{owner}/{name}/proposal/{number}"), &viewer); |
| 1168 | 0× | require(&viewer, &shell)?; |
| 1169 | 0× | csrf(&viewer, &f.csrf, &shell)?; |
| 1170 | 0× | let (_, row, _) = lookup(&app, &shell, &viewer, &owner, &name).await?; |
| 1171 | 0× | let p = pdb::get(&app.db, row.id, number) |
| 1172 | 0× | .await |
| 1173 | 0× | .map_err(|e| Error::from_db(shell.clone(), e))? |
| 1174 | 0× | .ok_or_else(|| Error::not_found(shell.clone()))?; |
| 1175 | 0× | let current: Option<bool> = sqlx::query_scalar("SELECT resolved FROM proposal_comments WHERE id = $1 AND proposal_id = $2") |
| 1176 | 0× | .bind(id) |
| 1177 | 0× | .bind(p.id) |
| 1178 | 0× | .fetch_optional(&app.db) |
| 1179 | 0× | .await |
| 1180 | 0× | .map_err(|e| Error::from_db(shell.clone(), e))?; |
| 1181 | 0× | if let Some(r) = current { |
| 1182 | 0× | pdb::set_comment_resolved(&app.db, id, !r).await.map_err(|e| Error::from_db(shell.clone(), e))?; |
| 1183 | 0× | } |
| 1184 | 0× | Ok(back(&owner, &name, number, "files", None, None)) |
| 1185 | 0× | } |
| 1186 | |
|
| 1187 | |
|
| 1188 | |
|
| 1189 | | #[derive(serde::Deserialize)] |
| 1190 | | pub struct LandForm { |
| 1191 | | #[serde(rename = "_csrf")] |
| 1192 | | csrf: String, |
| 1193 | | |
| 1194 | | #[serde(default)] |
| 1195 | | over_checks: Option<String>, |
| 1196 | | } |
| 1197 | |
|
| 1198 | 13× | pub async fn land( |
| 1199 | 13× | State(app): State<Shared>, |
| 1200 | 13× | viewer: Viewer, |
| 1201 | 13× | Path((owner, name, number)): Path<(String, String, i64)>, |
| 1202 | 13× | Form(f): Form<LandForm>, |
| 1203 | 13× | ) -> Result<Response, Error> { |
| 1204 | 13× | let shell = Shell::new(&app, &format!("/{owner}/{name}/proposal/{number}"), &viewer); |
| 1205 | 13× | let me = require(&viewer, &shell)?; |
| 1206 | 13× | csrf(&viewer, &f.csrf, &shell)?; |
| 1207 | 13× | let need = if f.over_checks.is_some() { Access::Maintain } else { Access::Write }; |
| 1208 | 13× | let (repo, row, _) = lookup_role(&app, &shell, &viewer, &owner, &name, need).await?; |
| 1209 | 12× | match land_as(&app, &repo, &row, &me.account, number, "web", false, f.over_checks.as_deref()).await { |
| 1210 | 10× | Ok(_) => Ok(back(&owner, &name, number, "conversation", Some("Landed.".into()), None)), |
| 1211 | 0× | Err(Landing::NotFound) => Err(Error::not_found(shell)), |
| 1212 | 2× | Err(Landing::Refused(m)) => Ok(back(&owner, &name, number, "conversation", None, Some(m))), |
| 1213 | | } |
| 1214 | 13× | } |
| 1215 | |
|
| 1216 | | #[derive(serde::Deserialize)] |
| 1217 | | pub struct AutoLandForm { |
| 1218 | | #[serde(rename = "_csrf")] |
| 1219 | | csrf: String, |
| 1220 | | |
| 1221 | | #[serde(default)] |
| 1222 | | on: String, |
| 1223 | | } |
| 1224 | |
|
| 1225 | |
|
| 1226 | |
|
| 1227 | 4× | pub async fn auto_land( |
| 1228 | 4× | State(app): State<Shared>, |
| 1229 | 4× | viewer: Viewer, |
| 1230 | 4× | Path((owner, name, number)): Path<(String, String, i64)>, |
| 1231 | 4× | Form(f): Form<AutoLandForm>, |
| 1232 | 4× | ) -> Result<Response, Error> { |
| 1233 | 4× | let shell = Shell::new(&app, &format!("/{owner}/{name}/proposal/{number}"), &viewer); |
| 1234 | 4× | let me = require(&viewer, &shell)?; |
| 1235 | 4× | csrf(&viewer, &f.csrf, &shell)?; |
| 1236 | 4× | let (_, row, _) = lookup_role(&app, &shell, &viewer, &owner, &name, Access::Write).await?; |
| 1237 | 4× | let p = pdb::get(&app.db, row.id, number) |
| 1238 | 4× | .await |
| 1239 | 4× | .map_err(|e| Error::from_db(shell.clone(), e))? |
| 1240 | 4× | .filter(|p| p.is_open()) |
| 1241 | 4× | .ok_or_else(|| Error::not_found(shell.clone()))?; |
| 1242 | 4× | let on = f.on == "1"; |
| 1243 | 4× | crate::autoland::set(&app, &row, &p, &me.account, on).await.map_err(|e| Error::from_db(shell.clone(), e))?; |
| 1244 | 4× | let note = if on { "It will land when its checks pass." } else { "It will not land by itself." }; |
| 1245 | 4× | Ok(back(&owner, &name, number, "conversation", Some(note.into()), None)) |
| 1246 | 4× | } |
| 1247 | |
|
| 1248 | |
|
| 1249 | | pub enum Landing { |
| 1250 | | NotFound, |
| 1251 | | Refused(String), |
| 1252 | | } |
| 1253 | |
|
| 1254 | |
|
| 1255 | |
|
| 1256 | |
|
| 1257 | |
|
| 1258 | |
|
| 1259 | |
|
| 1260 | |
|
| 1261 | |
|
| 1262 | |
|
| 1263 | | #[allow(clippy::too_many_arguments)] |
| 1264 | 20× | pub async fn land_as( |
| 1265 | 20× | app: &Shared, |
| 1266 | 20× | repo: &RepoName, |
| 1267 | 20× | row: &db::repos::RepoRow, |
| 1268 | 20× | me: &accounts::Account, |
| 1269 | 20× | number: i64, |
| 1270 | 20× | via: &str, |
| 1271 | 20× | as_hub: bool, |
| 1272 | 20× | over_checks: Option<&str>, |
| 1273 | 20× | ) -> Result<String, Landing> { |
| 1274 | 20× | let (owner, name) = (row.owner.clone(), row.name.clone()); |
| 1275 | 20× | let refused = |e: String| Landing::Refused(e); |
| 1276 | 20× | let p = pdb::get(&app.db, row.id, number).await.map_err(|e| refused(e.to_string()))?.ok_or(Landing::NotFound)?; |
| 1277 | 20× | let loaded = load(app, repo, p.clone()).await.map_err(|e| refused(e.to_string()))?; |
| 1278 | 20× | let v = verdict(app, &loaded, row.id).await.map_err(|e| refused(e.to_string()))?; |
| 1279 | 20× | if !p.is_open() { |
| 1280 | 1× | return Err(refused(format!("Cannot land: the proposal is {}", p.state))); |
| 1281 | 19× | } |
| 1282 | 19× | let reason = over_checks.map(str::trim); |
| 1283 | 19× | if reason == Some("") { |
| 1284 | 1× | return Err(refused("Landing over checks needs a reason: say why it can't wait for them".into())); |
| 1285 | 18× | } |
| 1286 | 18× | let blocking: Vec<&String> = v.blockers.iter().filter(|b| !(reason.is_some() && v.checks_blocker.as_ref() == Some(*b))).collect(); |
| 1287 | 18× | if !blocking.is_empty() { |
| 1288 | 1× | let list: Vec<&str> = blocking.iter().map(|b| b.as_str()).collect(); |
| 1289 | 1× | return Err(refused(format!("Cannot land: {}", list.join("; ")))); |
| 1290 | 17× | } |
| 1291 | | |
| 1292 | 17× | let over = reason.filter(|_| v.checks_blocker.is_some()); |
| 1293 | 17× | let via_owned = match over { |
| 1294 | 1× | Some(r) => format!("{via}, over checks: {r}"), |
| 1295 | 16× | None => via.to_string(), |
| 1296 | | }; |
| 1297 | 17× | let via = via_owned.as_str(); |
| 1298 | 17× | let target = p.target.clone(); |
| 1299 | 17× | let heads = loaded.heads.clone(); |
| 1300 | | |
| 1301 | | |
| 1302 | | |
| 1303 | | |
| 1304 | 17× | let signer = if as_hub { super::edit::hub_signer(app) } else { super::edit::signer_for(app, me.id).await }; |
| 1305 | 17× | let result = match signer { |
| 1306 | 8× | Ok(signer) => crate::repos::edits::move_bookmark(&app.repos, repo, target.clone(), heads.clone(), signer).await.map(|_| pl::state_ref(&heads).to_hex()), |
| 1307 | 9× | Err(why) => { |
| 1308 | 9× | app.repos |
| 1309 | 9× | .write(repo, move |r, _| { |
| 1310 | 9× | if r.current_policy()?.is_some() { |
| 1311 | 0× | return Err(crate::repos::RepoError::Oxy(oxy_core::repo::RepoError::Msg(format!( |
| 1312 | 0× | "this repository has a trust policy, so the landing must be signed by a key it authorises. Land from a client with oxy proposal land, or delegate to the hub. {why}" |
| 1313 | 0× | )))); |
| 1314 | 9× | } |
| 1315 | 9× | r.bookmark_set(&target, &heads)?; |
| 1316 | 9× | Ok(pl::state_ref(&heads).to_hex()) |
| 1317 | 9× | }) |
| 1318 | 9× | .await |
| 1319 | | } |
| 1320 | | }; |
| 1321 | 17× | let state = result.map_err(|e| refused(e.to_string()))?; |
| 1322 | 17× | pdb::set_landed(&app.db, p.id, &state, &me.username, via).await.map_err(|e| refused(e.to_string()))?; |
| 1323 | 17× | crate::flow::moot_after_landing(app, row, &p).await; |
| 1324 | 17× | let how = if v.approvals.is_empty() { format!("{via}, with no approval") } else { via.to_string() }; |
| 1325 | 17× | pdb::add_event(&app.db, p.id, &me.username, "landed", &how).await.ok(); |
| 1326 | 17× | crate::hooks::emit( |
| 1327 | 17× | app, |
| 1328 | 17× | row, |
| 1329 | 17× | "proposal.landed", |
| 1330 | 17× | &me.username, |
| 1331 | 17× | serde_json::json!({ "number": number, "target": p.target, "state": state }), |
| 1332 | 17× | ) |
| 1333 | 17× | .await; |
| 1334 | 17× | crate::notify::deliver( |
| 1335 | 17× | app, |
| 1336 | 17× | crate::notify::Event { |
| 1337 | 17× | kind: "proposal.landed", |
| 1338 | 17× | title: format!("{owner}/{name}#{number}: {} landed", p.title), |
| 1339 | 17× | url: format!("/{owner}/{name}/proposal/{number}"), |
| 1340 | 17× | actor: me, |
| 1341 | 17× | repo_id: row.id, |
| 1342 | 17× | thread: Some(("proposal", p.id)), |
| 1343 | 17× | mention_text: "", |
| 1344 | 17× | direct: p.author_id.into_iter().collect(), |
| 1345 | 17× | }, |
| 1346 | 17× | ) |
| 1347 | 17× | .await; |
| 1348 | 17× | if p.target == row.default_bookmark { |
| 1349 | 17× | let messages: Vec<(String, String)> = loaded.changes.iter().map(|c| (c.hash.clone(), format!("{}\n{}", c.title, c.body))).collect(); |
| 1350 | 17× | super::issues::close_from_messages(app, row, &messages).await; |
| 1351 | 0× | } |
| 1352 | 17× | accounts::audit(&app.db, Some(me), "proposal.landed", &format!("{owner}/{name}#{number}"), &how).await.ok(); |
| 1353 | 17× | if let (Some(r), Some(checks)) = (over, &v.checks_blocker) { |
| 1354 | 1× | accounts::audit(&app.db, Some(me), "proposal.land_over_checks", &format!("{owner}/{name}#{number}"), &format!("{r} ({checks})")) |
| 1355 | 1× | .await |
| 1356 | 1× | .ok(); |
| 1357 | 16× | } |
| 1358 | 17× | db::repos::record_push( |
| 1359 | 17× | &app.db, |
| 1360 | 17× | row.id, |
| 1361 | 17× | Some((me.id, me.username.as_str())), |
| 1362 | 17× | &[db::repos::PushOutcome { |
| 1363 | 17× | reference: p.target.clone(), |
| 1364 | 17× | ok: true, |
| 1365 | 17× | reason: format!("landed #{number} ({how})"), |
| 1366 | 17× | old_state: loaded.target_state.clone(), |
| 1367 | 17× | new_state: state.clone(), |
| 1368 | 17× | heads: loaded.heads.len() as i64, |
| 1369 | 17× | changes: loaded.hashes.len() as i64, |
| 1370 | 17× | }], |
| 1371 | 17× | ) |
| 1372 | 17× | .await |
| 1373 | 17× | .ok(); |
| 1374 | | |
| 1375 | 17× | settle_after_push(app, row, &p.target, &me.username).await; |
| 1376 | | |
| 1377 | | |
| 1378 | | |
| 1379 | 17× | crate::flow::on_push(app, row, &p.target, &state, &loaded.heads, &me.username).await; |
| 1380 | | |
| 1381 | | |
| 1382 | 17× | if p.target == row.default_bookmark { |
| 1383 | 17× | let body = (format!("proposal #{number}"), p.body.clone()); |
| 1384 | 17× | crate::web::issues::close_from_arrived(app, row, loaded.target_heads.clone(), loaded.heads.clone(), Some(body)).await; |
| 1385 | 0× | } |
| 1386 | | |
| 1387 | | |
| 1388 | | |
| 1389 | 17× | let heads = loaded.heads.clone(); |
| 1390 | 17× | let moved = vec![(p.target.clone(), state.clone(), heads.clone())]; |
| 1391 | 17× | crate::diffusion::after_push(app, row, &moved).await; |
| 1392 | 17× | if p.target == row.default_bookmark { |
| 1393 | 17× | let (app, row) = (app.clone(), row.clone()); |
| 1394 | 17× | tokio::spawn(async move { crate::diffusion::propagate(&app, &row, heads, false).await }); |
| 1395 | 0× | } |
| 1396 | 17× | Ok(state) |
| 1397 | 20× | } |
| 1398 | |
|
| 1399 | | #[derive(Deserialize)] |
| 1400 | | pub struct LabelsForm { |
| 1401 | | #[serde(rename = "_csrf")] |
| 1402 | | csrf_token: String, |
| 1403 | | #[serde(default)] |
| 1404 | | label: Vec<i64>, |
| 1405 | | } |
| 1406 | |
|
| 1407 | 0× | pub async fn set_labels( |
| 1408 | 0× | State(app): State<Shared>, |
| 1409 | 0× | viewer: Viewer, |
| 1410 | 0× | Path((owner, name, number)): Path<(String, String, i64)>, |
| 1411 | 0× | axum_extra::extract::Form(f): axum_extra::extract::Form<LabelsForm>, |
| 1412 | 0× | ) -> Result<Response, Error> { |
| 1413 | 0× | let shell = Shell::new(&app, &format!("/{owner}/{name}/proposal/{number}"), &viewer); |
| 1414 | 0× | require(&viewer, &shell)?; |
| 1415 | 0× | csrf(&viewer, &f.csrf_token, &shell)?; |
| 1416 | 0× | let (_, row, role) = lookup(&app, &shell, &viewer, &owner, &name).await?; |
| 1417 | 0× | if role < Role::Triage { |
| 1418 | 0× | return Err(Error::not_found(shell)); |
| 1419 | 0× | } |
| 1420 | 0× | let p = pdb::get(&app.db, row.id, number) |
| 1421 | 0× | .await |
| 1422 | 0× | .map_err(|e| Error::from_db(shell.clone(), e))? |
| 1423 | 0× | .ok_or_else(|| Error::not_found(shell.clone()))?; |
| 1424 | 0× | for l in db::issues::labels(&app.db, row.id).await.map_err(|e| Error::from_db(shell.clone(), e))? { |
| 1425 | 0× | db::issues::set_proposal_label(&app.db, p.id, l.id, f.label.contains(&l.id)).await.map_err(|e| Error::from_db(shell.clone(), e))?; |
| 1426 | | } |
| 1427 | 0× | Ok(back(&owner, &name, number, "conversation", None, None)) |
| 1428 | 0× | } |
| 1429 | |
|
| 1430 | |
|
| 1431 | |
|
| 1432 | 0× | pub async fn events( |
| 1433 | 0× | State(app): State<Shared>, |
| 1434 | 0× | viewer: Viewer, |
| 1435 | 0× | Path((owner, name, number)): Path<(String, String, i64)>, |
| 1436 | 0× | ) -> Result<axum::response::Sse<impl futures::Stream<Item = Result<axum::response::sse::Event, std::convert::Infallible>>>, Error> { |
| 1437 | | use futures::StreamExt; |
| 1438 | 0× | let shell = Shell::new(&app, &format!("/{owner}/{name}/proposal/{number}"), &viewer); |
| 1439 | 0× | let (_, row, _) = lookup(&app, &shell, &viewer, &owner, &name).await?; |
| 1440 | 0× | let rx = app.bus.subscribe(crate::bus::Topic::Proposals); |
| 1441 | 0× | let repo_id = row.id; |
| 1442 | 0× | let stream = tokio_stream::wrappers::BroadcastStream::new(rx).filter_map(move |item| async move { |
| 1443 | 0× | match item { |
| 1444 | 0× | Ok(crate::bus::Event::Proposal { repo, event: ev }) if repo == repo_id => { |
| 1445 | 0× | Some(Ok(axum::response::sse::Event::default().event(ev.kind.clone()).data(serde_json::to_string(&ev).unwrap_or_default()))) |
| 1446 | | } |
| 1447 | 0× | _ => None, |
| 1448 | | } |
| 1449 | 0× | }); |
| 1450 | 0× | Ok(axum::response::Sse::new(futures::StreamExt::take_until(stream, crate::shutdown::stopping())) |
| 1451 | 0× | .keep_alive(axum::response::sse::KeepAlive::default())) |
| 1452 | 0× | } |
| 1453 | |
|
| 1454 | |
|
| 1455 | |
|
| 1456 | 39× | pub async fn to_api(app: &Shared, owner: &str, name: &str, loaded: &Loaded, v: &Verdict, source_url: Option<String>) -> hub_api::Proposal { |
| 1457 | 39× | let p = &loaded.row; |
| 1458 | | hub_api::Proposal { |
| 1459 | 39× | number: p.number, |
| 1460 | 39× | title: p.title.clone(), |
| 1461 | 39× | body: p.body.clone(), |
| 1462 | 39× | author: p.author.clone(), |
| 1463 | 39× | state: ProposalState::parse(&p.state).unwrap_or(ProposalState::Open), |
| 1464 | 39× | target: p.target.clone(), |
| 1465 | 39× | source: match p.source_kind.as_str() { |
| 1466 | 39× | "fork" => { |
| 1467 | 0× | let (o, n) = source_url |
| 1468 | 0× | .as_deref() |
| 1469 | 0× | .and_then(|u| u.rsplit_once('/')) |
| 1470 | 0× | .and_then(|(b, n)| b.rsplit_once('/').map(|(_, o)| (o.to_string(), n.to_string()))) |
| 1471 | 0× | .unwrap_or_default(); |
| 1472 | 0× | ProposalSource::Fork { owner: o, name: n, bookmark: p.source_bookmark.clone() } |
| 1473 | | } |
| 1474 | 39× | "changes" => ProposalSource::Changes { hashes: p.source_changes() }, |
| 1475 | 39× | _ => ProposalSource::Bookmark { bookmark: p.source_bookmark.clone() }, |
| 1476 | | }, |
| 1477 | 39× | changes: loaded |
| 1478 | 39× | .changes |
| 1479 | 39× | .iter() |
| 1480 | 39× | .map(|c| hub_api::ChangeSummary { |
| 1481 | 41× | hash: c.hash.clone(), |
| 1482 | 41× | message: if c.body.is_empty() { c.title.clone() } else { format!("{}\n\n{}", c.title, c.body) }, |
| 1483 | 41× | author: hub_api::Author { |
| 1484 | 41× | name: c.author.name.clone(), |
| 1485 | 41× | email: c.author.email.clone(), |
| 1486 | 41× | key: c.author.key.clone(), |
| 1487 | 41× | account: c.author.account.clone(), |
| 1488 | 41× | note: hub_api::Author::note_for(&c.author.key, &c.author.account), |
| 1489 | 41× | }, |
| 1490 | 41× | when_ms: c.when_ms, |
| 1491 | 41× | deps: c.deps.clone(), |
| 1492 | 41× | head: c.head, |
| 1493 | 41× | via: c.via.as_ref().map(|v| hub_api::Via { |
| 1494 | 0× | name: v.name.clone(), |
| 1495 | 0× | key: v.key.clone(), |
| 1496 | 0× | scope: v.scope.clone(), |
| 1497 | 0× | expires_ms: v.expires_ms, |
| 1498 | 0× | revoked: v.revoked, |
| 1499 | 0× | }), |
| 1500 | 41× | signature: match &c.signature { |
| 1501 | 35× | view::SigView::Unsigned => hub_api::Signature::Unsigned, |
| 1502 | 6× | view::SigView::Valid { key, sealed, revoked, .. } => { |
| 1503 | 6× | hub_api::Signature::Valid { key: key.clone(), sealed: *sealed, revoked: *revoked } |
| 1504 | | } |
| 1505 | 0× | view::SigView::Invalid(why) => hub_api::Signature::Invalid { reason: why.clone() }, |
| 1506 | | }, |
| 1507 | 41× | }) |
| 1508 | 39× | .collect(), |
| 1509 | 51× | projected_heads: loaded.heads.iter().map(|h| h.to_hex()).collect(), |
| 1510 | 39× | projected_state: Some(loaded.state.clone()), |
| 1511 | 39× | conflicted: loaded.conflicted, |
| 1512 | 39× | approvals: v.approvals.clone(), |
| 1513 | 39× | landable: p.is_open() && v.blockers.is_empty(), |
| 1514 | 39× | blockers: v.blockers.clone(), |
| 1515 | 39× | created_ms: p.created_ms, |
| 1516 | 39× | updated_ms: p.updated_ms, |
| 1517 | 39× | url: format!("{}/{owner}/{name}/proposal/{}", app.config.base_url(), p.number), |
| 1518 | 39× | repository_url: format!("{}/{owner}/{name}", app.config.base_url()), |
| 1519 | 39× | source_url, |
| 1520 | 39× | landed: (p.state == "landed" && p.landed_ms > 0).then(|| hub_api::Landed { |
| 1521 | 7× | by: p.landed_by.clone(), |
| 1522 | 7× | via: p.landed_via.clone(), |
| 1523 | 7× | when_ms: p.landed_ms, |
| 1524 | 7× | }), |
| 1525 | 39× | auto_land: (p.is_open() && !p.auto_land_by.is_empty()).then(|| p.auto_land_by.clone()), |
| 1526 | 39× | requested_reviewers: pdb::review_requests(&app.db, p.id).await.unwrap_or_default(), |
| 1527 | 39× | labels: db::issues::proposal_labels(&app.db, p.id) |
| 1528 | 39× | .await |
| 1529 | 39× | .unwrap_or_default() |
| 1530 | 39× | .into_iter() |
| 1531 | 39× | .map(|l| hub_api::Label { name: l.name, colour: l.colour, description: l.description }) |
| 1532 | 39× | .collect(), |
| 1533 | | } |
| 1534 | 39× | } |
| 1535 | |
|
| 1536 | |
|
| 1537 | 7× | pub fn key(path: &str, line: impl filters::Num) -> (String, usize) { |
| 1538 | 7× | (path.to_string(), line.as_u64() as usize) |
| 1539 | 7× | } |
| 1540 | |
|
| 1541 | | #[allow(dead_code)] |
| 1542 | 0× | fn _unused(_: &diff::Line, _: &ConflictView, _: &Role) {} |
| 1543 | |
|
| 1544 | |
|
| 1545 | |
|
| 1546 | |
|
| 1547 | |
|
| 1548 | |
|
| 1549 | |
|
| 1550 | 5× | pub async fn request_reviewers( |
| 1551 | 5× | app: &Shared, |
| 1552 | 5× | row: &db::repos::RepoRow, |
| 1553 | 5× | p: &pdb::ProposalRow, |
| 1554 | 5× | by: &accounts::Account, |
| 1555 | 5× | names: &[String], |
| 1556 | 5× | ) -> Result<Vec<String>, String> { |
| 1557 | 5× | let mut found = Vec::new(); |
| 1558 | 5× | for name in names.iter().map(|n| n.trim().trim_start_matches('@')).filter(|n| !n.is_empty()) { |
| 1559 | 5× | let Some(a) = accounts::account_by_name(&app.db, name).await.ok().flatten() else { |
| 1560 | 1× | return Err(format!("There is no account {name}.")); |
| 1561 | | }; |
| 1562 | 4× | if Some(a.id) == p.author_id { |
| 1563 | 1× | return Err(format!("{name} wrote this proposal, and cannot review it.")); |
| 1564 | 3× | } |
| 1565 | 3× | let role = crate::auth::roles::role_for(&app.db, Some(&a), row).await.ok().flatten(); |
| 1566 | 3× | if !crate::auth::roles::allows(role, crate::auth::Access::Read) { |
| 1567 | 0× | return Err(format!("{name} cannot read this repository.")); |
| 1568 | 3× | } |
| 1569 | 3× | found.push(a); |
| 1570 | | } |
| 1571 | 3× | let mut asked = Vec::new(); |
| 1572 | 3× | for a in found { |
| 1573 | 3× | if !pdb::request_review(&app.db, p.id, a.id, &by.username).await.map_err(|e| e.to_string())? { |
| 1574 | 0× | continue; |
| 1575 | 3× | } |
| 1576 | 3× | pdb::add_event(&app.db, p.id, &by.username, "review requested", &a.username).await.ok(); |
| 1577 | 3× | crate::notify::deliver( |
| 1578 | 3× | app, |
| 1579 | 3× | crate::notify::Event { |
| 1580 | 3× | kind: "proposal.review_requested", |
| 1581 | 3× | title: format!("{}/{}#{}: {} (review requested from {})", row.owner, row.name, p.number, p.title, a.username), |
| 1582 | 3× | url: format!("/{}/{}/proposal/{}", row.owner, row.name, p.number), |
| 1583 | 3× | actor: by, |
| 1584 | 3× | repo_id: row.id, |
| 1585 | 3× | thread: None, |
| 1586 | 3× | mention_text: "", |
| 1587 | 3× | direct: vec![a.id], |
| 1588 | 3× | }, |
| 1589 | 3× | ) |
| 1590 | 3× | .await; |
| 1591 | 3× | asked.push(a.username); |
| 1592 | | } |
| 1593 | 3× | Ok(asked) |
| 1594 | 5× | } |
| 1595 | |
|
| 1596 | |
|
| 1597 | |
|
| 1598 | 4× | pub async fn reviewed(app: &Shared, row: &db::repos::RepoRow, p: &pdb::ProposalRow, by: &accounts::Account, verdict: &str) { |
| 1599 | 4× | pdb::unrequest_review(&app.db, p.id, by.id).await.ok(); |
| 1600 | 4× | let what = match verdict { |
| 1601 | 4× | "approve" => "approved", |
| 1602 | 2× | "changes" => "changes requested", |
| 1603 | 2× | _ => "reviewed", |
| 1604 | | }; |
| 1605 | 4× | crate::notify::deliver( |
| 1606 | 4× | app, |
| 1607 | 4× | crate::notify::Event { |
| 1608 | 4× | kind: "proposal.review", |
| 1609 | 4× | title: format!("{}/{}#{}: {} ({what} by {})", row.owner, row.name, p.number, p.title, by.username), |
| 1610 | 4× | url: format!("/{}/{}/proposal/{}", row.owner, row.name, p.number), |
| 1611 | 4× | actor: by, |
| 1612 | 4× | repo_id: row.id, |
| 1613 | 4× | thread: Some(("proposal", p.id)), |
| 1614 | 4× | mention_text: "", |
| 1615 | 4× | direct: p.author_id.into_iter().collect(), |
| 1616 | 4× | }, |
| 1617 | 4× | ) |
| 1618 | 4× | .await; |
| 1619 | 4× | } |
| 1620 | |
|
| 1621 | | #[derive(Deserialize)] |
| 1622 | | pub struct ReviewersForm { |
| 1623 | | #[serde(rename = "_csrf")] |
| 1624 | | csrf_token: String, |
| 1625 | | |
| 1626 | | action: String, |
| 1627 | | #[serde(default)] |
| 1628 | | username: Vec<String>, |
| 1629 | | } |
| 1630 | |
|
| 1631 | |
|
| 1632 | |
|
| 1633 | 2× | pub async fn reviewers( |
| 1634 | 2× | State(app): State<Shared>, |
| 1635 | 2× | viewer: Viewer, |
| 1636 | 2× | Path((owner, name, number)): Path<(String, String, i64)>, |
| 1637 | 2× | axum_extra::extract::Form(f): axum_extra::extract::Form<ReviewersForm>, |
| 1638 | 2× | ) -> Result<Response, Error> { |
| 1639 | 2× | let shell = Shell::new(&app, &format!("/{owner}/{name}/proposal/{number}"), &viewer); |
| 1640 | 2× | let me = require(&viewer, &shell)?; |
| 1641 | 2× | csrf(&viewer, &f.csrf_token, &shell)?; |
| 1642 | 2× | let (_, row, role) = lookup(&app, &shell, &viewer, &owner, &name).await?; |
| 1643 | 2× | let p = pdb::get(&app.db, row.id, number) |
| 1644 | 2× | .await |
| 1645 | 2× | .map_err(|e| Error::from_db(shell.clone(), e))? |
| 1646 | 2× | .ok_or_else(|| Error::not_found(shell.clone()))?; |
| 1647 | 2× | if Some(me.account.id) != p.author_id && role < Role::Write { |
| 1648 | 0× | return Err(Error::not_found(shell)); |
| 1649 | 2× | } |
| 1650 | 2× | let names: Vec<String> = f.username.iter().map(|n| n.trim().trim_start_matches('@').to_string()).filter(|n| !n.is_empty()).collect(); |
| 1651 | 2× | let current = pdb::review_requests(&app.db, p.id).await.map_err(|e| Error::from_db(shell.clone(), e))?; |
| 1652 | | |
| 1653 | 2× | let withdraw: Vec<String> = match f.action.as_str() { |
| 1654 | 2× | "remove" => names.clone(), |
| 1655 | 2× | "set" => current.iter().filter(|c| !names.iter().any(|n| n.eq_ignore_ascii_case(c))).cloned().collect(), |
| 1656 | 0× | _ => Vec::new(), |
| 1657 | | }; |
| 1658 | 2× | for who in &withdraw { |
| 1659 | 1× | if let Some(a) = accounts::account_by_name(&app.db, who).await.ok().flatten() { |
| 1660 | 1× | if pdb::unrequest_review(&app.db, p.id, a.id).await.map_err(|e| Error::from_db(shell.clone(), e))? { |
| 1661 | 1× | pdb::add_event(&app.db, p.id, &me.account.username, "review request withdrawn", &a.username).await.ok(); |
| 1662 | 0× | } |
| 1663 | 0× | } |
| 1664 | | } |
| 1665 | 2× | let ask: Vec<String> = match f.action.as_str() { |
| 1666 | 2× | "add" => names, |
| 1667 | 2× | "set" => names.into_iter().filter(|n| !current.iter().any(|c| c.eq_ignore_ascii_case(n))).collect(), |
| 1668 | 0× | _ => return Ok(back(&owner, &name, number, "conversation", None, None)), |
| 1669 | | }; |
| 1670 | 2× | if ask.is_empty() { |
| 1671 | 1× | return Ok(back(&owner, &name, number, "conversation", None, None)); |
| 1672 | 1× | } |
| 1673 | 1× | match request_reviewers(&app, &row, &p, &me.account, &ask).await { |
| 1674 | 1× | Ok(asked) if asked.is_empty() => Ok(back(&owner, &name, number, "conversation", Some("Already asked.".into()), None)), |
| 1675 | 1× | Ok(asked) => Ok(back(&owner, &name, number, "conversation", Some(format!("Asked {} to review.", asked.join(", "))), None)), |
| 1676 | 0× | Err(e) => Ok(back(&owner, &name, number, "conversation", None, Some(e))), |
| 1677 | | } |
| 1678 | 2× | } |
| 1679 | |
|
| 1680 | | #[derive(Deserialize)] |
| 1681 | | pub struct AssistantForm { |
| 1682 | | #[serde(rename = "_csrf")] |
| 1683 | | csrf_token: String, |
| 1684 | | assistant: String, |
| 1685 | | |
| 1686 | | #[serde(default)] |
| 1687 | | task: String, |
| 1688 | | } |
| 1689 | |
|
| 1690 | |
|
| 1691 | |
|
| 1692 | |
|
| 1693 | 4× | pub async fn assistant( |
| 1694 | 4× | State(app): State<Shared>, |
| 1695 | 4× | viewer: Viewer, |
| 1696 | 4× | Path((owner, name, number)): Path<(String, String, i64)>, |
| 1697 | 4× | Form(f): Form<AssistantForm>, |
| 1698 | 4× | ) -> Result<Response, Error> { |
| 1699 | 4× | let shell = Shell::new(&app, &format!("/{owner}/{name}/proposal/{number}"), &viewer); |
| 1700 | 4× | let me = require(&viewer, &shell)?; |
| 1701 | 3× | csrf(&viewer, &f.csrf_token, &shell)?; |
| 1702 | 3× | let (_, row, role) = lookup(&app, &shell, &viewer, &owner, &name).await?; |
| 1703 | 3× | super::writable(&row, &shell)?; |
| 1704 | 3× | let p = pdb::get(&app.db, row.id, number) |
| 1705 | 3× | .await |
| 1706 | 3× | .map_err(|e| Error::from_db(shell.clone(), e))? |
| 1707 | 3× | .ok_or_else(|| Error::not_found(shell.clone()))?; |
| 1708 | 3× | if Some(me.account.id) != p.author_id && role < Role::Write { |
| 1709 | 0× | return Err(Error::not_found(shell)); |
| 1710 | 3× | } |
| 1711 | 3× | if !p.is_open() { |
| 1712 | 0× | return Ok(back(&owner, &name, number, "conversation", None, Some("The proposal is not open.".into()))); |
| 1713 | 3× | } |
| 1714 | 3× | let Some(a) = crate::assistants::enabled_for_repo(&app.db, &row) |
| 1715 | 3× | .await |
| 1716 | 3× | .map_err(|e| Error::from_db(shell.clone(), e))? |
| 1717 | 3× | .into_iter() |
| 1718 | 3× | .find(|a| a.name.eq_ignore_ascii_case(f.assistant.trim())) |
| 1719 | | else { |
| 1720 | 1× | return Ok(back(&owner, &name, number, "conversation", None, Some(format!("No assistant called {} here.", f.assistant.trim())))); |
| 1721 | | }; |
| 1722 | 2× | let who = a.name.clone(); |
| 1723 | 2× | let summary = f.task == "summary"; |
| 1724 | 2× | let asked = if summary { |
| 1725 | 1× | crate::assistants::request_summary(&app, &row, &p, &me.account, a).await |
| 1726 | | } else { |
| 1727 | 1× | crate::assistants::request_review(&app, &row, &p, &me.account, a).await |
| 1728 | | }; |
| 1729 | 2× | match asked { |
| 1730 | 2× | Ok(()) => Ok(back( |
| 1731 | 2× | &owner, |
| 1732 | 2× | &name, |
| 1733 | 2× | number, |
| 1734 | 2× | "conversation", |
| 1735 | 2× | Some(if summary { |
| 1736 | 1× | format!("Asked {who} for a summary; its comment appears here when it comes.") |
| 1737 | | } else { |
| 1738 | 1× | format!("Asked {who} to review; its answer appears here when it comes.") |
| 1739 | | }), |
| 1740 | 2× | None, |
| 1741 | | )), |
| 1742 | 0× | Err(e) => Ok(back(&owner, &name, number, "conversation", None, Some(format!("Not asked: {e}.")))), |
| 1743 | | } |
| 1744 | 4× | } |
| 1745 | |
|
| 1746 | |
|
| 1747 | 78× | async fn assistant_names(app: &Shared, row: &db::repos::RepoRow) -> Vec<String> { |
| 1748 | 78× | crate::assistants::enabled_for_repo(&app.db, row).await.unwrap_or_default().into_iter().map(|a| a.name).collect() |
| 1749 | 78× | } |
| 1750 | |
|
| 1751 | |
|
| 1752 | |
|
| 1753 | 2× | async fn preview_diff( |
| 1754 | 2× | app: &Shared, |
| 1755 | 2× | repo: &RepoName, |
| 1756 | 2× | target: &str, |
| 1757 | 2× | source: &str, |
| 1758 | 2× | ) -> Result<(Vec<ChangeView>, Vec<oxy_core::repo::FileDiff>), crate::repos::RepoError> { |
| 1759 | 2× | let Some((fork, bookmark)) = parse_source(app, repo, source) else { return Ok((vec![], vec![])) }; |
| 1760 | 2× | let target = target.to_string(); |
| 1761 | 2× | let fork_dir = fork.as_ref().map(|f| app.repos.dir(f)); |
| 1762 | 2× | app.repos |
| 1763 | 2× | .read(repo, move |r, cache| { |
| 1764 | 2× | let projection = match &fork_dir { |
| 1765 | 0× | Some(dir) => { |
| 1766 | 0× | let fork_repo = oxy_core::repo::Repo::open(dir)?; |
| 1767 | 0× | let heads = fork_repo.bookmarks()?.into_iter().find(|b| b.name == bookmark).map(|b| b.heads).unwrap_or_default(); |
| 1768 | 0× | pl::project(r, cache, &target, Source::Fork { fork: &fork_repo, heads })? |
| 1769 | | } |
| 1770 | | None => { |
| 1771 | 2× | let heads = r.bookmarks()?.into_iter().find(|b| b.name == bookmark).map(|b| b.heads).unwrap_or_default(); |
| 1772 | 2× | pl::project(r, cache, &target, Source::Bookmark(heads))? |
| 1773 | | } |
| 1774 | | }; |
| 1775 | 2× | Ok((projection.changes, projection.files)) |
| 1776 | 2× | }) |
| 1777 | 2× | .await |
| 1778 | 2× | } |
| 1779 | |
|
| 1780 | |
|
| 1781 | |
|
| 1782 | |
|
| 1783 | 2× | pub async fn new_draft( |
| 1784 | 2× | State(app): State<Shared>, |
| 1785 | 2× | viewer: Viewer, |
| 1786 | 2× | Path((owner, name)): Path<(String, String)>, |
| 1787 | 2× | Form(f): Form<NewForm>, |
| 1788 | 2× | ) -> Result<Page<NewProposalPage>, Error> { |
| 1789 | 2× | let shell = Shell::new(&app, &format!("/{owner}/{name}/proposals/new"), &viewer); |
| 1790 | 2× | let me = require(&viewer, &shell)?; |
| 1791 | 2× | csrf(&viewer, &f.csrf_token, &shell)?; |
| 1792 | 2× | let (repo, row, role) = lookup(&app, &shell, &viewer, &owner, &name).await?; |
| 1793 | 2× | super::writable(&row, &shell)?; |
| 1794 | 2× | let bookmarks = |
| 1795 | 2× | app.repos.read(&repo, |r, _| Ok(r.bookmarks()?.into_iter().map(|b| b.name).collect::<Vec<_>>())).await.unwrap_or_default(); |
| 1796 | 2× | let (preview, conflicted) = preview_for(&app, &repo, &f.target, &f.source).await.unwrap_or((vec![], false)); |
| 1797 | 2× | let assistants = if preview.is_empty() { vec![] } else { assistant_names(&app, &row).await }; |
| 1798 | 2× | let mut page = NewProposalPage { |
| 1799 | 2× | shell, |
| 1800 | 2× | repo: RepoShell::new(&app, &row, "proposals").with_role(role), |
| 1801 | 2× | bookmarks, |
| 1802 | 2× | source: f.source.clone(), |
| 1803 | 2× | target: f.target.clone(), |
| 1804 | 2× | error: None, |
| 1805 | 2× | preview, |
| 1806 | 2× | conflicted, |
| 1807 | 2× | title: f.title.clone(), |
| 1808 | 2× | body: f.body.clone(), |
| 1809 | 2× | assistants, |
| 1810 | 2× | }; |
| 1811 | 2× | let assistant = crate::assistants::enabled_for_repo(&app.db, &row) |
| 1812 | 2× | .await |
| 1813 | 2× | .unwrap_or_default() |
| 1814 | 2× | .into_iter() |
| 1815 | 2× | .find(|a| a.name.eq_ignore_ascii_case(f.assistant.trim())); |
| 1816 | 2× | let Some(a) = assistant else { |
| 1817 | 0× | page.error = Some(format!("No assistant called {} here.", f.assistant.trim())); |
| 1818 | 0× | return Ok(Page(page)); |
| 1819 | | }; |
| 1820 | 2× | if page.preview.is_empty() { |
| 1821 | 0× | page.error = Some("Nothing to describe: the source adds nothing to the target.".into()); |
| 1822 | 0× | return Ok(Page(page)); |
| 1823 | 2× | } |
| 1824 | 2× | let (changes, diffs) = match preview_diff(&app, &repo, &f.target, &f.source).await { |
| 1825 | 2× | Ok(x) => x, |
| 1826 | 0× | Err(e) => { |
| 1827 | 0× | page.error = Some(e.to_string()); |
| 1828 | 0× | return Ok(Page(page)); |
| 1829 | | } |
| 1830 | | }; |
| 1831 | 2× | let d = |
| 1832 | 2× | crate::assistants::Draft { slot: -row.id, title: &f.title, target: &f.target, changes: &changes, diffs: &diffs, with_title: true }; |
| 1833 | 2× | match crate::assistants::draft_description(&app, &row, &me.account, &a, d).await { |
| 1834 | 2× | Ok(text) => { |
| 1835 | 2× | let (title, body) = crate::assistants::split_title(&text); |
| 1836 | 2× | page.body = body; |
| 1837 | | |
| 1838 | | |
| 1839 | 2× | let suggested = if page.preview.len() == 1 { page.preview[0].title.clone() } else { String::new() }; |
| 1840 | 2× | if let Some(t) = title.filter(|_| page.title.trim().is_empty() || page.title.trim() == suggested.trim()) { |
| 1841 | 0× | page.title = t; |
| 1842 | 2× | } |
| 1843 | | } |
| 1844 | 0× | Err(why) => page.error = Some(format!("{} did not answer: {why}.", a.name)), |
| 1845 | | } |
| 1846 | 2× | Ok(Page(page)) |
| 1847 | 2× | } |
| 1848 | |
|
| 1849 | | #[derive(Deserialize)] |
| 1850 | | pub struct DraftForm { |
| 1851 | | #[serde(rename = "_csrf")] |
| 1852 | | csrf_token: String, |
| 1853 | | assistant: String, |
| 1854 | | #[serde(default)] |
| 1855 | | title: String, |
| 1856 | | } |
| 1857 | |
|
| 1858 | |
|
| 1859 | |
|
| 1860 | |
|
| 1861 | 1× | pub async fn draft( |
| 1862 | 1× | State(app): State<Shared>, |
| 1863 | 1× | viewer: Viewer, |
| 1864 | 1× | Path((owner, name, number)): Path<(String, String, i64)>, |
| 1865 | 1× | Form(f): Form<DraftForm>, |
| 1866 | 1× | ) -> Result<Response, Error> { |
| 1867 | 1× | let shell = Shell::new(&app, &format!("/{owner}/{name}/proposal/{number}"), &viewer); |
| 1868 | 1× | let me = require(&viewer, &shell)?; |
| 1869 | 1× | csrf(&viewer, &f.csrf_token, &shell)?; |
| 1870 | 1× | let (repo, row, role) = lookup(&app, &shell, &viewer, &owner, &name).await?; |
| 1871 | 1× | super::writable(&row, &shell)?; |
| 1872 | 1× | let p = pdb::get(&app.db, row.id, number) |
| 1873 | 1× | .await |
| 1874 | 1× | .map_err(|e| Error::from_db(shell.clone(), e))? |
| 1875 | 1× | .ok_or_else(|| Error::not_found(shell.clone()))?; |
| 1876 | 1× | if Some(me.account.id) != p.author_id && role < Role::Maintain { |
| 1877 | 0× | return Err(Error::not_found(shell)); |
| 1878 | 1× | } |
| 1879 | 1× | let Some(a) = crate::assistants::enabled_for_repo(&app.db, &row) |
| 1880 | 1× | .await |
| 1881 | 1× | .map_err(|e| Error::from_db(shell.clone(), e))? |
| 1882 | 1× | .into_iter() |
| 1883 | 1× | .find(|a| a.name.eq_ignore_ascii_case(f.assistant.trim())) |
| 1884 | | else { |
| 1885 | 0× | return Ok(back(&owner, &name, number, "conversation", None, Some(format!("No assistant called {} here.", f.assistant.trim())))); |
| 1886 | | }; |
| 1887 | 1× | let loaded = crate::web::proposals::load(&app, &repo, p.clone()).await.map_err(|e| Error::from_repo(shell.clone(), e))?; |
| 1888 | 1× | let title = if f.title.trim().is_empty() { p.title.clone() } else { f.title.clone() }; |
| 1889 | 1× | let d = crate::assistants::Draft { |
| 1890 | 1× | slot: p.id, |
| 1891 | 1× | title: &title, |
| 1892 | 1× | target: &p.target, |
| 1893 | 1× | changes: &loaded.changes, |
| 1894 | 1× | diffs: &loaded.diffs, |
| 1895 | 1× | with_title: false, |
| 1896 | 1× | }; |
| 1897 | 1× | let draft = crate::assistants::draft_description(&app, &row, &me.account, &a, d).await; |
| 1898 | 1× | match draft { |
| 1899 | 1× | Ok(text) => { |
| 1900 | 1× | let mut page = detail(&app, shell, &viewer, &owner, &name, number, "conversation".into(), None, None).await?; |
| 1901 | 1× | page.0.draft = Some(text); |
| 1902 | 1× | Ok(page.into_response()) |
| 1903 | | } |
| 1904 | 0× | Err(why) => Ok(back(&owner, &name, number, "conversation", None, Some(format!("{} did not answer: {why}.", a.name)))), |
| 1905 | | } |
| 1906 | 1× | } |
| 1907 | |
|
| 1908 | |
|
| 1909 | |
|
| 1910 | |
|
| 1911 | |
|
| 1912 | |
|
| 1913 | | type DraftEvents = axum::response::Sse< |
| 1914 | | axum::response::sse::KeepAliveStream< |
| 1915 | | tokio_stream::wrappers::ReceiverStream<Result<axum::response::sse::Event, std::convert::Infallible>>, |
| 1916 | | >, |
| 1917 | | >; |
| 1918 | |
|
| 1919 | 2× | fn draft_events(rx: tokio::sync::mpsc::Receiver<Result<axum::response::sse::Event, std::convert::Infallible>>) -> DraftEvents { |
| 1920 | 2× | axum::response::Sse::new(tokio_stream::wrappers::ReceiverStream::new(rx)) |
| 1921 | 2× | .keep_alive(axum::response::sse::KeepAlive::new().interval(std::time::Duration::from_secs(15))) |
| 1922 | 2× | } |
| 1923 | |
|
| 1924 | 3× | fn draft_event(kind: &str, text: &str) -> Result<axum::response::sse::Event, std::convert::Infallible> { |
| 1925 | 3× | Ok(axum::response::sse::Event::default().event(kind).data(serde_json::to_string(text).unwrap_or_default())) |
| 1926 | 3× | } |
| 1927 | |
|
| 1928 | |
|
| 1929 | 1× | fn draft_refused(why: String) -> DraftEvents { |
| 1930 | 1× | let (tx, rx) = tokio::sync::mpsc::channel(1); |
| 1931 | 1× | let _ = tx.try_send(draft_event("error", &why)); |
| 1932 | 1× | draft_events(rx) |
| 1933 | 1× | } |
| 1934 | |
|
| 1935 | |
|
| 1936 | | struct DraftJob { |
| 1937 | | row: db::repos::RepoRow, |
| 1938 | | by: accounts::Account, |
| 1939 | | a: crate::assistants::Assistant, |
| 1940 | | slot: i64, |
| 1941 | | title: String, |
| 1942 | | target: String, |
| 1943 | | changes: Vec<ChangeView>, |
| 1944 | | diffs: Vec<oxy_core::repo::FileDiff>, |
| 1945 | | |
| 1946 | | with_title: bool, |
| 1947 | | } |
| 1948 | |
|
| 1949 | |
|
| 1950 | 1× | fn draft_in_background(app: Shared, job: DraftJob) -> DraftEvents { |
| 1951 | 1× | let (tx, rx) = tokio::sync::mpsc::channel(64); |
| 1952 | 1× | tokio::spawn(async move { |
| 1953 | 1× | let DraftJob { row, by, a, slot, title, target, changes, diffs, with_title } = job; |
| 1954 | 1× | let d = crate::assistants::Draft { slot, title: &title, target: &target, changes: &changes, diffs: &diffs, with_title }; |
| 1955 | 1× | let parts = tx.clone(); |
| 1956 | 1× | let result = crate::assistants::draft_description_streaming(&app, &row, &by, &a, d, move |p: &str| { |
| 1957 | | |
| 1958 | 1× | let _ = parts.try_send(draft_event("part", p)); |
| 1959 | 1× | }) |
| 1960 | 1× | .await; |
| 1961 | 1× | let last = match result { |
| 1962 | 0× | Ok(text) if with_title => { |
| 1963 | | |
| 1964 | 0× | let (t, body) = crate::assistants::split_title(&text); |
| 1965 | 0× | if let Some(t) = t { |
| 1966 | 0× | let _ = tx.send(draft_event("title", &t)).await; |
| 1967 | 0× | } |
| 1968 | 0× | draft_event("done", &body) |
| 1969 | | } |
| 1970 | 1× | Ok(text) => draft_event("done", text.trim()), |
| 1971 | 0× | Err(why) => draft_event("error", &format!("{} did not answer: {why}.", a.name)), |
| 1972 | | }; |
| 1973 | 1× | let _ = tx.send(last).await; |
| 1974 | 1× | }); |
| 1975 | 1× | draft_events(rx) |
| 1976 | 1× | } |
| 1977 | |
|
| 1978 | |
|
| 1979 | |
|
| 1980 | 2× | pub async fn draft_stream( |
| 1981 | 2× | State(app): State<Shared>, |
| 1982 | 2× | viewer: Viewer, |
| 1983 | 2× | Path((owner, name, number)): Path<(String, String, i64)>, |
| 1984 | 2× | Form(f): Form<DraftForm>, |
| 1985 | 2× | ) -> Result<DraftEvents, Error> { |
| 1986 | 2× | let shell = Shell::new(&app, &format!("/{owner}/{name}/proposal/{number}"), &viewer); |
| 1987 | 2× | let me = require(&viewer, &shell)?; |
| 1988 | 2× | csrf(&viewer, &f.csrf_token, &shell)?; |
| 1989 | 2× | let (repo, row, role) = lookup(&app, &shell, &viewer, &owner, &name).await?; |
| 1990 | 2× | super::writable(&row, &shell)?; |
| 1991 | 2× | let p = pdb::get(&app.db, row.id, number) |
| 1992 | 2× | .await |
| 1993 | 2× | .map_err(|e| Error::from_db(shell.clone(), e))? |
| 1994 | 2× | .ok_or_else(|| Error::not_found(shell.clone()))?; |
| 1995 | 2× | if Some(me.account.id) != p.author_id && role < Role::Maintain { |
| 1996 | 0× | return Err(Error::not_found(shell)); |
| 1997 | 2× | } |
| 1998 | 2× | let Some(a) = crate::assistants::enabled_for_repo(&app.db, &row) |
| 1999 | 2× | .await |
| 2000 | 2× | .map_err(|e| Error::from_db(shell.clone(), e))? |
| 2001 | 2× | .into_iter() |
| 2002 | 2× | .find(|a| a.name.eq_ignore_ascii_case(f.assistant.trim())) |
| 2003 | | else { |
| 2004 | 1× | return Ok(draft_refused(format!("No assistant called {} here.", f.assistant.trim()))); |
| 2005 | | }; |
| 2006 | 1× | let loaded = load(&app, &repo, p.clone()).await.map_err(|e| Error::from_repo(shell.clone(), e))?; |
| 2007 | 1× | let title = if f.title.trim().is_empty() { p.title.clone() } else { f.title.clone() }; |
| 2008 | 1× | let job = DraftJob { |
| 2009 | 1× | row, |
| 2010 | 1× | by: me.account.clone(), |
| 2011 | 1× | a, |
| 2012 | 1× | slot: p.id, |
| 2013 | 1× | title, |
| 2014 | 1× | target: p.target.clone(), |
| 2015 | 1× | changes: loaded.changes, |
| 2016 | 1× | diffs: loaded.diffs, |
| 2017 | 1× | with_title: false, |
| 2018 | 1× | }; |
| 2019 | 1× | Ok(draft_in_background(app.clone(), job)) |
| 2020 | 2× | } |
| 2021 | |
|
| 2022 | |
|
| 2023 | |
|
| 2024 | 0× | pub async fn new_draft_stream( |
| 2025 | 0× | State(app): State<Shared>, |
| 2026 | 0× | viewer: Viewer, |
| 2027 | 0× | Path((owner, name)): Path<(String, String)>, |
| 2028 | 0× | Form(f): Form<NewForm>, |
| 2029 | 0× | ) -> Result<DraftEvents, Error> { |
| 2030 | 0× | let shell = Shell::new(&app, &format!("/{owner}/{name}/proposals/new"), &viewer); |
| 2031 | 0× | let me = require(&viewer, &shell)?; |
| 2032 | 0× | csrf(&viewer, &f.csrf_token, &shell)?; |
| 2033 | 0× | let (repo, row, _role) = lookup(&app, &shell, &viewer, &owner, &name).await?; |
| 2034 | 0× | super::writable(&row, &shell)?; |
| 2035 | 0× | let Some(a) = crate::assistants::enabled_for_repo(&app.db, &row) |
| 2036 | 0× | .await |
| 2037 | 0× | .unwrap_or_default() |
| 2038 | 0× | .into_iter() |
| 2039 | 0× | .find(|a| a.name.eq_ignore_ascii_case(f.assistant.trim())) |
| 2040 | | else { |
| 2041 | 0× | return Ok(draft_refused(format!("No assistant called {} here.", f.assistant.trim()))); |
| 2042 | | }; |
| 2043 | 0× | let (changes, diffs) = match preview_diff(&app, &repo, &f.target, &f.source).await { |
| 2044 | 0× | Ok(x) => x, |
| 2045 | 0× | Err(e) => return Ok(draft_refused(e.to_string())), |
| 2046 | | }; |
| 2047 | 0× | if changes.is_empty() { |
| 2048 | 0× | return Ok(draft_refused("Nothing to describe: the source adds nothing to the target.".into())); |
| 2049 | 0× | } |
| 2050 | 0× | let job = DraftJob { |
| 2051 | 0× | slot: -row.id, |
| 2052 | 0× | row, |
| 2053 | 0× | by: me.account.clone(), |
| 2054 | 0× | a, |
| 2055 | 0× | title: f.title.clone(), |
| 2056 | 0× | target: f.target.clone(), |
| 2057 | 0× | changes, |
| 2058 | 0× | diffs, |
| 2059 | 0× | with_title: true, |
| 2060 | 0× | }; |
| 2061 | 0× | Ok(draft_in_background(app.clone(), job)) |
| 2062 | 0× | } |