de505df5 Andy McCall 1 month ago ↶
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> ,
1ac84c62 Andy McCall 1 month ago ↶
33
q : String,
34
sort : String,
35
pager : super:: Pager,
36
labels : std:: collections:: HashMap< i64 , Vec< db:: issues:: Label> > ,
de505df5 Andy McCall 1 month ago ↶
37
}
38
1ac84c62 Andy McCall 1 month ago ↶
39
impl ProposalsPage {
40
fn labels_of ( & self , id : & i64 ) -> & [ db:: issues:: Label] {
41
self .labels.get ( id) .map ( Vec :: as_slice) .unwrap_or ( & [ ] )
42
}
43
}
44
de505df5 Andy McCall 1 month ago ↶
45
# [ derive ( Deserialize ) ]
46
pub struct ListQuery {
47
state : Option< String> ,
1ac84c62 Andy McCall 1 month ago ↶
48
q : Option< String> ,
49
sort : Option< String> ,
50
page : Option< usize > ,
de505df5 Andy McCall 1 month ago ↶
51
}
52
1ac84c62 Andy McCall 1 month ago ↶
53
54
pub const SORTS : & [ ( & str , & str ) ] = & [ ( " updated" , " recently updated" ) , ( " newest" , " newest" ) , ( " oldest" , " oldest" ) ] ;
55
de505df5 Andy McCall 1 month ago ↶
56
pub async fn list (
57
State( app ) : State< Shared> ,
58
viewer : Viewer,
59
Path( (owner , name ) ) : Path< ( String, String) > ,
60
Query( q) : Query< ListQuery> ,
61
) -> Result< Page< ProposalsPage> , Error> {
62
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposals" ) , & viewer) ;
63
let ( repo, row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
64
let all = pdb:: list( & app.db, row.id, & [ ] ) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
65
let counts = (
66
all.iter ( ) .filter ( | p | p.is_open ( ) ) .count ( ) ,
67
all.iter ( ) .filter ( | p | p.state = = " landed" ) .count ( ) ,
68
all.iter ( ) .filter ( | p | p.state = = " closed" ) .count ( ) ,
69
) ;
70
let filter = q.state.unwrap_or_else ( | | " open" .into ( ) ) ;
1ac84c62 Andy McCall 1 month ago ↶
71
let mut labels: std:: collections:: HashMap< i64 , Vec< db:: issues:: Label> > = std:: collections:: HashMap:: new( ) ;
72
for ( id, l) in db:: issues:: labels_by_proposal( & app.db, row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? {
73
labels.entry ( id) .or_default ( ) .push ( l) ;
74
}
75
76
let qtext = q.q.clone ( ) .unwrap_or_default ( ) ;
77
let ( mut authors, mut wanted, mut targets, mut words) = ( vec! [ ] , vec! [ ] , vec! [ ] , vec! [ ] ) ;
78
for tok in qtext.split_whitespace ( ) {
79
match tok.split_once ( ' :' ) {
80
Some ( ( " author" , v) ) => authors.push ( v.to_lowercase ( ) ) ,
81
Some ( ( " label" , v) ) => wanted.push ( v.to_lowercase ( ) ) ,
82
Some ( ( " target" , v) ) => targets.push ( v.to_string ( ) ) ,
83
_ => words.push ( tok.to_lowercase ( ) ) ,
84
}
85
}
86
let mut rows: Vec< pdb:: ProposalRow> = all
de505df5 Andy McCall 1 month ago ↶
87
.into_iter ( )
88
.filter ( | p | match filter.as_str ( ) {
89
" open" => p.is_open ( ) ,
90
" landed" => p.state = = " landed" ,
91
" closed" => p.state = = " closed" ,
92
_ => true ,
93
} )
1ac84c62 Andy McCall 1 month ago ↶
94
.filter ( | p | authors.is_empty ( ) | | authors.contains ( & p.author.to_lowercase ( ) ) )
95
.filter ( | p | targets.is_empty ( ) | | targets.contains ( & p.target) )
96
.filter ( | p | wanted.iter ( ) .all ( | w | labels.get ( & p.id) .is_some_and ( | ls | ls.iter ( ) .any ( | l | l.name.to_lowercase ( ) = = * w ) ) ) )
97
.filter ( | p | words.iter ( ) .all ( | w | p.title.to_lowercase ( ) .contains ( w) | | p.body.to_lowercase ( ) .contains ( w) ) )
de505df5 Andy McCall 1 month ago ↶
98
.collect ( ) ;
1ac84c62 Andy McCall 1 month ago ↶
99
let sort = q.sort.filter ( | s | SORTS .iter ( ) .any ( | ( k , _) | k = = s ) ) .unwrap_or_else ( | | " updated" .into ( ) ) ;
100
match sort.as_str ( ) {
101
" newest" => rows.sort_by_key ( | p | std:: cmp:: Reverse( p.number) ) ,
102
" oldest" => rows.sort_by_key ( | p | p.number ) ,
103
_ => rows.sort_by_key ( | p | std:: cmp:: Reverse( p.updated_ms) ) ,
104
}
105
let pager = super :: Pager:: new( rows.len ( ) , q.page, & [ ( " state" , & filter) , ( " q" , & qtext) , ( " sort" , & sort) ] ) ;
106
let rows = pager.slice ( rows) ;
de505df5 Andy McCall 1 month ago ↶
107
let bookmarks = app
108
.repos
109
.read ( & repo, | r , _| Ok ( r.bookmarks ( ) ? .into_iter ( ) .map ( | b | b.name ) .collect:: < Vec< _ > > ( ) ) )
110
.await
111
.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
1ac84c62 Andy McCall 1 month ago ↶
112
Ok ( Page( ProposalsPage {
113
shell,
114
repo: RepoShell:: new( & app, & row, " proposals" ) .with_role ( role) ,
115
rows,
116
filter,
117
counts,
118
bookmarks,
119
q: qtext,
120
sort,
121
pager,
122
labels,
123
} ) )
de505df5 Andy McCall 1 month ago ↶
124
}
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 ,
7d2eb590 Andy McCall 1 month ago ↶
140
141
title : String,
142
body : String,
143
144
assistants : Vec< String> ,
de505df5 Andy McCall 1 month ago ↶
145
}
146
147
# [ derive ( Deserialize ) ]
148
pub struct NewQuery {
149
source : Option< String> ,
150
target : Option< String> ,
151
}
152
153
0b20f1ec Andy McCall 1 month ago ↶
154
155
156
de505df5 Andy McCall 1 month ago ↶
157
fn parse_source ( app : & Shared, repo : & RepoName, source : & str ) -> Option< ( Option< RepoName> , String) > {
0b20f1ec Andy McCall 1 month ago ↶
158
let plain = | b : & str | ! b.is_empty ( ) & & ! b.chars ( ) .any ( | c | c.is_control ( ) | | c = = ' :' ) ;
de505df5 Andy McCall 1 month ago ↶
159
if let Some ( ( slug, bookmark) ) = source.split_once ( ' :' ) {
160
let fork = RepoName:: parse( slug) ? ;
0b20f1ec Andy McCall 1 month ago ↶
161
if ! plain ( bookmark) {
de505df5 Andy McCall 1 month ago ↶
162
return None ;
0b20f1ec Andy McCall 1 month ago ↶
163
}
164
if fork = = * repo {
165
return Some ( ( None , bookmark.to_string ( ) ) ) ;
de505df5 Andy McCall 1 month ago ↶
166
}
0b20f1ec Andy McCall 1 month ago ↶
167
if ! app.repos.exists ( & fork) {
168
return None ;
169
}
de505df5 Andy McCall 1 month ago ↶
170
return Some ( ( Some ( fork) , bookmark.to_string ( ) ) ) ;
171
}
0b20f1ec Andy McCall 1 month ago ↶
172
plain ( source) .then ( | | ( None , source.to_string ( ) ) )
de505df5 Andy McCall 1 month ago ↶
173
}
174
175
async fn preview_for (
176
app : & Shared,
177
repo : & RepoName,
178
target : & str ,
179
source : & str ,
180
) -> Result< ( Vec< ChangeView> , bool ) , crate:: repos:: RepoError> {
181
let Some ( ( fork, bookmark) ) = parse_source ( app, repo, source) else { return Ok ( ( vec! [ ] , false ) ) } ;
182
let target = target.to_string ( ) ;
183
let fork_dir = fork.as_ref ( ) .map ( | f | app.repos.dir ( f) ) ;
184
app.repos
185
.read ( repo, move | r, cache| {
186
let projection = match & fork_dir {
187
Some ( dir) => {
188
let fork_repo = oxy_core:: repo:: Repo:: open( dir) ? ;
189
let heads = fork_repo.bookmarks ( ) ? .into_iter ( ) .find ( | b | b.name = = bookmark ) .map ( | b | b.heads ) .unwrap_or_default ( ) ;
190
pl:: project( r, cache, & target, Source:: Fork { fork: & fork_repo, heads } ) ?
191
}
192
None => {
193
let heads = r.bookmarks ( ) ? .into_iter ( ) .find ( | b | b.name = = bookmark ) .map ( | b | b.heads ) .unwrap_or_default ( ) ;
194
pl:: project( r, cache, & target, Source:: Bookmark( heads) ) ?
195
}
196
} ;
197
Ok ( ( projection.changes, projection.conflicted) )
198
} )
199
.await
200
}
201
202
pub async fn new_form (
203
State( app ) : State< Shared> ,
204
viewer : Viewer,
205
Path( (owner , name ) ) : Path< ( String, String) > ,
206
Query( q) : Query< NewQuery> ,
207
) -> Result< Page< NewProposalPage> , Error> {
208
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposals/new" ) , & viewer) ;
209
require ( & viewer, & shell) ? ;
210
let ( repo, row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
211
let bookmarks = app
212
.repos
213
.read ( & repo, | r , _| Ok ( r.bookmarks ( ) ? .into_iter ( ) .map ( | b | b.name ) .collect:: < Vec< _ > > ( ) ) )
214
.await
215
.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
216
let target = q.target.unwrap_or_else ( | | row.default_bookmark.clone ( ) ) ;
217
let source = q.source.unwrap_or_default ( ) ;
218
let ( preview, conflicted) =
219
if source.is_empty ( ) { ( vec! [ ] , false ) } else { preview_for ( & app, & repo, & target, & source) .await.unwrap_or ( ( vec! [ ] , false ) ) } ;
7d2eb590 Andy McCall 1 month ago ↶
220
let assistants = if preview.is_empty ( ) { vec! [ ] } else { assistant_names ( & app, & row) .await } ;
de505df5 Andy McCall 1 month ago ↶
221
Ok ( Page( NewProposalPage {
222
shell,
223
repo: RepoShell:: new( & app, & row, " proposals" ) .with_role ( role) ,
224
bookmarks,
225
source,
226
target,
227
error: None ,
228
preview,
229
conflicted,
7d2eb590 Andy McCall 1 month ago ↶
230
title: String :: new( ) ,
231
body: String :: new( ) ,
232
assistants,
de505df5 Andy McCall 1 month ago ↶
233
} ) )
234
}
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> ,
7d2eb590 Andy McCall 1 month ago ↶
247
248
#[serde(default)]
249
assistant : String,
de505df5 Andy McCall 1 month ago ↶
250
}
251
b64e2537 Andy McCall 1 month ago ↶
252
253
# [ allow ( clippy::too_many_arguments ) ]
254
pub async fn open_proposal (
255
app : & Shared,
256
repo : & RepoName,
257
row : & db:: repos:: RepoRow,
258
me : & accounts:: Account,
259
title : & str ,
260
body : & str ,
261
target : & str ,
262
source : & str ,
263
draft : bool ,
264
) -> Result< pdb:: ProposalRow, String> {
265
if title.trim ( ) .is_empty ( ) {
266
return Err ( " Give the proposal a title." .into ( ) ) ;
de505df5 Andy McCall 1 month ago ↶
267
}
b64e2537 Andy McCall 1 month ago ↶
268
let bookmarks =
269
app.repos.read ( repo, | r , _| Ok ( r.bookmarks ( ) ? .into_iter ( ) .map ( | b | b.name ) .collect:: < Vec< _ > > ( ) ) ) .await.map_err ( | e | e.to_string ( ) ) ? ;
270
if ! bookmarks.iter ( ) .any ( | b | b = = target ) {
271
return Err ( " Pick a target bookmark of this repository." .into ( ) ) ;
de505df5 Andy McCall 1 month ago ↶
272
}
b64e2537 Andy McCall 1 month ago ↶
273
let Some ( ( fork, bookmark) ) = parse_source ( app, repo, source.trim ( ) ) else {
274
return Err ( " The source is a bookmark of this repository, or owner/name:bookmark of a fork." .into ( ) ) ;
de505df5 Andy McCall 1 month ago ↶
275
} ;
0b20f1ec Andy McCall 1 month ago ↶
276
if fork.is_none ( ) & & ! bookmarks.contains ( & bookmark) {
277
return Err ( format! ( " There is no bookmark {bookmark} in this repository." ) ) ;
278
}
b64e2537 Andy McCall 1 month ago ↶
279
if fork.is_none ( ) & & bookmark = = target {
280
return Err ( " The source and the target are the same bookmark." .into ( ) ) ;
de505df5 Andy McCall 1 month ago ↶
281
}
b64e2537 Andy McCall 1 month ago ↶
282
let ( preview, _ ) = preview_for ( app, repo, target, source.trim ( ) ) .await.map_err ( | e | e.to_string ( ) ) ? ;
de505df5 Andy McCall 1 month ago ↶
283
if preview.is_empty ( ) {
b64e2537 Andy McCall 1 month ago ↶
284
return Err ( " The source adds nothing to the target." .into ( ) ) ;
de505df5 Andy McCall 1 month ago ↶
285
}
286
let source_repo_id = match & fork {
b64e2537 Andy McCall 1 month ago ↶
287
Some ( fk) => db:: repos:: get( & app.db, & fk.owner, & fk.name) .await.map_err ( | e | e.to_string ( ) ) ? .map ( | r | r.id ) ,
de505df5 Andy McCall 1 month ago ↶
288
None => None ,
289
} ;
290
let created = pdb:: create(
291
& app.db,
292
pdb:: NewProposal {
293
repo_id: row.id,
b64e2537 Andy McCall 1 month ago ↶
294
title: title.trim ( ) ,
295
body: body.trim ( ) ,
296
author_id: Some ( me.id) ,
297
author: & me.username,
298
draft,
299
target,
de505df5 Andy McCall 1 month ago ↶
300
source_kind: if fork.is_some ( ) { " fork" } else { " bookmark" } ,
301
source_repo_id,
302
source_bookmark: & bookmark,
303
source_changes: " " ,
304
} ,
305
)
306
.await
b64e2537 Andy McCall 1 month ago ↶
307
.map_err ( | e | e.to_string ( ) ) ? ;
308
pdb:: add_event( & app.db, created.id, & me.username, " opened" , " " ) .await.ok ( ) ;
309
accounts:: audit( & app.db, Some ( me) , " proposal.opened" , & format! ( " {} #{} " , row.slug ( ) , created.number) , title) .await.ok ( ) ;
18e381ea Andy McCall 1 month ago ↶
310
db:: notify:: index( & app.db, " proposal" , row.id, created.id, created.number, & created.title, & created.body) .await.ok ( ) ;
b64e2537 Andy McCall 1 month ago ↶
311
let url = format! ( " /{} /proposal/{} " , row.slug ( ) , created.number) ;
18e381ea Andy McCall 1 month ago ↶
312
crate :: notify:: deliver(
b64e2537 Andy McCall 1 month ago ↶
313
app,
18e381ea Andy McCall 1 month ago ↶
314
crate :: notify:: Event {
315
kind: " proposal.opened" ,
b64e2537 Andy McCall 1 month ago ↶
316
title: format! ( " {} #{} : {} " , row.slug ( ) , created.number, created.title) ,
317
url,
318
actor: me,
18e381ea Andy McCall 1 month ago ↶
319
repo_id: row.id,
320
thread: Some ( ( " proposal" , created.id) ) ,
b64e2537 Andy McCall 1 month ago ↶
321
mention_text: body,
18e381ea Andy McCall 1 month ago ↶
322
direct: vec! [ ] ,
323
} ,
324
)
325
.await;
b64e2537 Andy McCall 1 month ago ↶
326
crate :: hooks:: emit(
327
app,
328
row,
329
" proposal.opened" ,
330
& me.username,
331
serde_json:: json! ( { " number" : created.number, " title" : created.title, " target" : target, " source" : source } ) ,
332
)
333
.await;
334
Ok ( created)
335
}
336
337
pub async fn create (
338
State( app ) : State< Shared> ,
339
viewer : Viewer,
340
Path( (owner , name ) ) : Path< ( String, String) > ,
341
Form( f) : Form< NewForm> ,
342
) -> Result< Response, Error> {
343
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposals/new" ) , & viewer) ;
344
let me = require ( & viewer, & shell) ? ;
345
csrf ( & viewer, & f.csrf_token, & shell) ? ;
346
let ( repo, row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
d0fbea2e Andy McCall 1 month ago ↶
347
super :: writable( & row, & shell) ? ;
b64e2537 Andy McCall 1 month ago ↶
348
match open_proposal ( & app, & repo, & row, & me.account, & f.title, & f.body, & f.target, & f.source, f.draft.is_some ( ) ) .await {
349
Ok ( created) => Ok ( Redirect:: to( & format! ( " /{owner} /{name} /proposal/{} " , created.number) ) .into_response ( ) ) ,
350
Err ( msg) => {
351
let bookmarks =
352
app.repos.read ( & repo, | r , _| Ok ( r.bookmarks ( ) ? .into_iter ( ) .map ( | b | b.name ) .collect:: < Vec< _ > > ( ) ) ) .await.unwrap_or_default ( ) ;
353
Ok ( Page( NewProposalPage {
354
shell,
355
repo: RepoShell:: new( & app, & row, " proposals" ) .with_role ( role) ,
356
bookmarks,
357
source: f.source.clone ( ) ,
358
target: f.target.clone ( ) ,
359
error: Some ( msg) ,
360
preview: vec! [ ] ,
361
conflicted: false ,
7d2eb590 Andy McCall 1 month ago ↶
362
title: f.title.clone ( ) ,
363
body: f.body.clone ( ) ,
364
assistants: vec! [ ] ,
b64e2537 Andy McCall 1 month ago ↶
365
} )
366
.into_response ( ) )
367
}
368
}
de505df5 Andy McCall 1 month ago ↶
369
}
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
a1b98695 Andy McCall 1 month ago ↶
380
381
382
pub struct Entry {
383
pub kind : & 'static str ,
384
pub index : usize ,
385
}
386
de505df5 Andy McCall 1 month ago ↶
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> ,
3f02e5ea Andy McCall 1 month ago ↶
399
pub target_heads : Vec< ChangeHash> ,
de505df5 Andy McCall 1 month ago ↶
400
pub state : String,
401
pub target_state : String,
402
pub conflicted : bool ,
403
pub conflicts : Vec< ConflictView> ,
404
pub files : Vec< FileRows> ,
9df855f2 Andy McCall 1 month ago ↶
405
406
pub diffs : Vec< oxy_core:: repo:: FileDiff> ,
407
pub bases : std:: collections:: BTreeMap< String, Vec< u8 > > ,
de505df5 Andy McCall 1 month ago ↶
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 ,
ac713df7 Andy McCall 24 days ago ↶
414
415
416
417
pub source_has_changes : bool ,
de505df5 Andy McCall 1 month ago ↶
418
}
419
420
421
pub async fn load ( app : & Shared, repo : & RepoName, row : pdb:: ProposalRow) -> Result< Loaded, crate:: repos:: RepoError> {
422
let fork_dir = match ( row.source_kind.as_str ( ) , row.source_repo_id) {
423
( " fork" , Some ( id) ) => {
424
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) )
425
}
426
_ => None ,
427
} ;
428
let r2 = row.clone ( ) ;
429
let loaded = app
430
.repos
431
.read ( repo, move | r, cache| {
432
let source = match ( r2.source_kind.as_str ( ) , & fork_dir) {
433
( " changes" , _ ) => Source:: Changes( r2.source_changes ( ) .iter ( ) .filter_map ( | h | ChangeHash:: from_hex( h) ) .collect ( ) ) ,
434
( " fork" , Some ( dir) ) => {
435
let fork_repo = oxy_core:: repo:: Repo:: open( dir) ? ;
436
let heads =
437
fork_repo.bookmarks ( ) ? .into_iter ( ) .find ( | b | b.name = = r2.source_bookmark ) .map ( | b | b.heads ) .unwrap_or_default ( ) ;
438
439
let fork_state = fork_repo.load_state ( & heads) ? ;
440
let missing: Vec< ChangeHash> = fork_state.changes ( ) .map ( | ( h , _) | * h) .filter ( | h | ! r.store ( ) .has ( h) ) .collect ( ) ;
441
if ! missing.is_empty ( ) {
442
r.import_bundle ( & fork_repo.bundle_for ( & missing) ? , r.current_policy ( ) ? .is_some ( ) ) ? ;
443
}
444
Source:: Changes( heads)
445
}
446
_ => {
447
let heads = r.bookmarks ( ) ? .into_iter ( ) .find ( | b | b.name = = r2.source_bookmark ) .map ( | b | b.heads ) .unwrap_or_default ( ) ;
448
Source:: Bookmark( heads)
449
}
450
} ;
ac713df7 Andy McCall 24 days ago ↶
451
let source_has_changes = match & source {
452
Source:: Changes( h) | Source:: Bookmark( h) | Source:: Fork { heads: h, .. } => ! h.is_empty ( ) ,
453
} ;
de505df5 Andy McCall 1 month ago ↶
454
let p: Projection = pl:: project( r, cache, & r2.target, source) ? ;
455
let target_loaded = cache.load ( r, & p.target_heads) ? ;
456
let files = render_files ( & p.files, & p.bases) ;
457
let mut atoms = HashMap:: new( ) ;
458
for f in & files {
459
for l in & f.lines {
460
if let Some ( n) = l.new_no {
461
if let Some ( ( h, i) ) = pl:: atom_at( & p.loaded, & f.path, n as usize ) {
462
atoms.insert ( ( f.path.clone ( ) , n as usize ) , ( h.to_hex ( ) , i) ) ;
463
}
464
}
465
}
466
}
467
let touched: Vec< String> = p.files.iter ( ) .map ( | f | f.path.clone ( ) ) .collect ( ) ;
468
let owners = pl:: owners_for( & target_loaded, & touched) ;
469
let sealing = pl:: sealing_keys( r, & p.hashes) ? .into_iter ( ) .map ( | k | k.to_hex ( ) ) .collect ( ) ;
470
let landed_already = ! p.hashes.is_empty ( ) & & p.hashes.iter ( ) .all ( | h | target_loaded.state.contains ( h) ) ;
0b20f1ec Andy McCall 1 month ago ↶
471
472
473
let ( changes, hashes) = if r2.state = = " landed" & & p.hashes.is_empty ( ) {
474
let hashes: Vec< ChangeHash> = r2.projected_changes ( ) .iter ( ) .filter_map ( | h | ChangeHash:: from_hex( h) ) .collect ( ) ;
475
let labels = HashMap:: new( ) ;
476
let changes = hashes
477
.iter ( )
478
.filter_map ( | h | Some ( view:: change_view_pub( r, h, & r.store ( ) .get_change_meta ( h) .ok ( ) ? , false , & labels) ) )
479
.collect ( ) ;
480
( changes, hashes)
481
} else {
482
( p.changes, p.hashes)
483
} ;
de505df5 Andy McCall 1 month ago ↶
484
Ok ( Loaded {
485
row: r2,
0b20f1ec Andy McCall 1 month ago ↶
486
changes,
487
hashes,
de505df5 Andy McCall 1 month ago ↶
488
heads: p.heads,
3f02e5ea Andy McCall 1 month ago ↶
489
target_heads: p.target_heads.clone ( ) ,
de505df5 Andy McCall 1 month ago ↶
490
state: p.state.to_hex ( ) ,
491
target_state: p.target_state.to_hex ( ) ,
492
conflicted: p.conflicted,
493
conflicts: p.conflicts,
494
files,
9df855f2 Andy McCall 1 month ago ↶
495
diffs: p.files.clone ( ) ,
496
bases: p.bases.clone ( ) ,
de505df5 Andy McCall 1 month ago ↶
497
atoms,
498
sealing_keys: sealing,
499
touched,
500
owners,
501
landed_already,
ac713df7 Andy McCall 24 days ago ↶
502
source_has_changes,
de505df5 Andy McCall 1 month ago ↶
503
} )
504
} )
505
.await? ;
ac713df7 Andy McCall 24 days ago ↶
506
507
508
509
510
let mut loaded = loaded;
511
if loaded.row.is_open ( )
512
& & loaded.source_has_changes
513
& & loaded.hashes.is_empty ( )
514
& & pdb:: set_landed( & app.db, loaded.row.id, & loaded.target_state, " " , " push" ) .await.is_ok ( )
515
{
516
loaded.row.state = " landed" .into ( ) ;
517
loaded.row.landed_via = " push" .into ( ) ;
518
loaded.row.landed_state = loaded.target_state.clone ( ) ;
519
return Ok ( loaded) ;
520
}
0b20f1ec Andy McCall 1 month ago ↶
521
522
523
524
if ! loaded.row.is_open ( ) {
525
return Ok ( loaded) ;
526
}
de505df5 Andy McCall 1 month ago ↶
527
let heads_csv = loaded.heads.iter ( ) .map ( | h | h.to_hex ( ) ) .collect:: < Vec< _ > > ( ) .join ( " ," ) ;
528
let changes_csv = loaded.hashes.iter ( ) .map ( | h | h.to_hex ( ) ) .collect:: < Vec< _ > > ( ) .join ( " ," ) ;
529
pdb:: set_projection( & app.db, loaded.row.id, & loaded.state, & heads_csv, & loaded.target_state, & changes_csv, loaded.conflicted)
530
.await
531
.ok ( ) ;
532
Ok ( loaded)
ac713df7 Andy McCall 24 days ago ↶
533
}
534
535
536
537
pub async fn settle_after_push ( app : & Shared, row : & db:: repos:: RepoRow, bookmark : & str , actor : & str ) {
538
let Some ( repo) = RepoName:: new( & row.owner, & row.name) else { return } ;
539
let Ok ( open) = pdb:: list( & app.db, row.id, & [ " open" , " draft" ] ) .await else { return } ;
540
for p in open.into_iter ( ) .filter ( | p | p.target = = bookmark ) {
541
let id = p.id;
542
if let Ok ( l) = load ( app, & repo, p) .await {
543
if l.row.state = = " landed" & & l.row.landed_by.is_empty ( ) {
544
pdb:: set_landed( & app.db, id, & l.target_state, actor, " push" ) .await.ok ( ) ;
545
}
546
}
547
}
de505df5 Andy McCall 1 month ago ↶
548
}
549
550
551
pub struct Verdict {
552
pub reviews : Vec< ReviewView> ,
553
pub approvals : Vec< Approval> ,
554
pub blockers : Vec< String> ,
555
pub depends_on : Vec< i64 > ,
556
pub requirements : pdb:: Requirements,
557
}
558
559
pub async fn verdict ( app : & Shared, loaded : & Loaded, repo_id : i64 ) -> Result< Verdict, sqlx:: Error> {
560
let rows = pdb:: reviews( & app.db, loaded.row.id) .await? ;
561
let links = accounts:: identity_accounts( & app.db) .await? ;
562
let sealed_accounts: Vec< String> = links.iter ( ) .filter ( | ( k , _) | loaded.sealing_keys.contains ( k) ) .map ( | ( _, u ) | u.clone ( ) ) .collect ( ) ;
563
564
let mut latest: BTreeMap< String, & pdb:: ReviewRow> = BTreeMap:: new( ) ;
7d2eb590 Andy McCall 1 month ago ↶
565
for r in rows.iter ( ) .filter ( | r | r.via.is_empty ( ) ) {
566
de505df5 Andy McCall 1 month ago ↶
567
latest.insert ( r.author.clone ( ) , r) ;
568
}
569
let mut approvals = Vec :: new( ) ;
570
for ( who, r) in & latest {
571
if r.verdict = = " approve" {
572
let sealed = sealed_accounts.contains ( who) ;
573
let key = links.iter ( ) .find ( | ( k , u ) | u = = who & & loaded.sealing_keys.contains ( k) ) .map ( | ( k , _) | k.clone ( ) ) ;
574
approvals.push ( Approval { account: who.clone ( ) , sealed, key } ) ;
575
}
576
}
577
let reviews = rows
578
.iter ( )
579
.map ( | r | ReviewView {
580
row: r.clone ( ) ,
581
body_html: render:: markdown:: render( & r.body, " /" , " /" ) ,
582
sealed: r.verdict = = " approve" & & sealed_accounts.contains ( & r.author) ,
583
} )
584
.collect ( ) ;
585
let requirements = pdb:: requirements( & app.db, repo_id) .await? ;
586
let mut blockers = Vec :: new( ) ;
0b20f1ec Andy McCall 1 month ago ↶
587
588
if ! loaded.row.is_open ( ) {
589
return Ok ( Verdict { reviews, approvals, blockers, depends_on: vec! [ ] , requirements } ) ;
590
}
de505df5 Andy McCall 1 month ago ↶
591
if loaded.row.state = = " draft" {
592
blockers.push ( " the proposal is a draft" .into ( ) ) ;
593
}
594
if loaded.hashes.is_empty ( ) {
595
blockers.push ( " the proposal adds no changes" .into ( ) ) ;
596
}
597
let sealed_count = approvals.iter ( ) .filter ( | a | a.sealed ) .count ( ) as i64 ;
598
if sealed_count < requirements.required_approvals {
599
blockers.push ( format! ( " {sealed_count} of {} required sealed approvals" , requirements.required_approvals) ) ;
600
}
601
if requirements.require_owners {
602
let missing: Vec< & String> = loaded.owners.iter ( ) .filter ( | o | ! approvals.iter ( ) .any ( | a | a.sealed & & & a.account = = * o ) ) .collect ( ) ;
603
if ! missing.is_empty ( ) {
604
blockers.push ( format! ( " code owners still to approve: {} " , missing.iter ( ) .map ( | s | s.as_str ( ) ) .collect:: < Vec< _ > > ( ) .join ( " , " ) ) ) ;
605
}
606
}
607
if loaded.conflicted & & ! requirements.allow_conflicts {
1e23d010 Andy McCall 1 month ago ↶
608
blockers.push ( format! (
609
" landing would carry conflicts, which this repository refuses: resolve them on the source (oxy merge {} there, fix the marked files, oxy commit, push)" ,
610
loaded.row.target
611
) ) ;
de505df5 Andy McCall 1 month ago ↶
612
}
b64e2537 Andy McCall 1 month ago ↶
613
let required = db:: hooks:: required_checks( & app.db, repo_id) .await? ;
614
if ! required.is_empty ( ) {
615
let checks = db:: hooks:: checks_for_state( & app.db, repo_id, & loaded.state) .await? ;
616
let missing: Vec< String> =
617
required.iter ( ) .filter ( | n | ! checks.iter ( ) .any ( | c | & c.name = = * n & & c.status = = " passed" ) ) .cloned ( ) .collect ( ) ;
618
if ! missing.is_empty ( ) {
619
blockers.push ( format! ( " required checks not passed on the projected state: {} " , missing.join ( " , " ) ) ) ;
620
}
621
}
de505df5 Andy McCall 1 month ago ↶
622
let requesting: Vec< & String> = latest.iter ( ) .filter ( | ( _, r ) | r.verdict = = " changes" ) .map ( | ( who , _) | who ) .collect ( ) ;
623
if ! requesting.is_empty ( ) {
624
blockers.push ( format! ( " changes requested by {} " , requesting.iter ( ) .map ( | s | s.as_str ( ) ) .collect:: < Vec< _ > > ( ) .join ( " , " ) ) ) ;
625
}
626
627
let mut depends_on = Vec :: new( ) ;
628
for other in pdb:: list( & app.db, repo_id, & [ " open" , " draft" ] ) .await? {
629
if other.id = = loaded.row.id | | other.number > loaded.row.number {
630
continue ;
631
}
632
let theirs = other.projected_changes ( ) ;
633
if ! theirs.is_empty ( ) & & theirs.iter ( ) .all ( | h | loaded.hashes.iter ( ) .any ( | m | m.to_hex ( ) = = * h ) ) {
634
depends_on.push ( other.number) ;
635
}
636
}
637
if ! depends_on.is_empty ( ) {
638
blockers.push ( format! ( " depends on {} " , depends_on.iter ( ) .map ( | n | format! ( " #{n} " ) ) .collect:: < Vec< _ > > ( ) .join ( " , " ) ) ) ;
639
}
640
Ok ( Verdict { reviews, approvals, blockers, depends_on, requirements } )
641
}
642
643
# [ derive ( Template ) ]
644
# [ template ( path = " proposal.html" ) ]
645
pub struct ProposalPage {
646
shell : Shell,
647
repo : RepoShell,
648
p : pdb:: ProposalRow,
38833ed7 Andy McCall 1 month ago ↶
649
650
closes : Vec< super:: chain:: Link> ,
a1b98695 Andy McCall 1 month ago ↶
651
652
project_choices : Option< Vec< db:: projects:: Project> > ,
653
654
timeline : Vec< Entry> ,
655
656
can_triage : bool ,
de505df5 Andy McCall 1 month ago ↶
657
body_html : String,
658
tab : String,
659
changes : Vec< ChangeView> ,
660
files : Vec< FileRows> ,
9df855f2 Andy McCall 1 month ago ↶
661
diffs : Vec< oxy_core:: repo:: FileDiff> ,
662
bases : std:: collections:: BTreeMap< String, Vec< u8 > > ,
663
664
ignore_ws : bool ,
de505df5 Andy McCall 1 month ago ↶
665
conflicts : Vec< ConflictView> ,
666
conflicted : bool ,
667
comments : Vec< CommentView> ,
668
669
placed : HashMap< ( String, usize ) , Vec< usize > > ,
670
outdated : Vec< usize > ,
671
reviews : Vec< ReviewView> ,
672
approvals : Vec< Approval> ,
673
blockers : Vec< String> ,
674
depends_on : Vec< i64 > ,
675
events : Vec< pdb:: EventRow> ,
676
owners : Vec< String> ,
677
requirements : pdb:: Requirements,
678
landed_already : bool ,
679
can_edit : bool ,
4f37afcc Andy McCall 1 month ago ↶
680
681
682
deletable_source : Option< String> ,
de505df5 Andy McCall 1 month ago ↶
683
can_land : bool ,
684
hub_can_land : bool ,
685
notice : Option< String> ,
686
error : Option< String> ,
687
heads : Vec< String> ,
688
state_hash : String,
689
source_label : String,
690
api_url : String,
18e381ea Andy McCall 1 month ago ↶
691
labels : Vec< db:: issues:: Label> ,
692
all_labels : Vec< db:: issues:: Label> ,
b64e2537 Andy McCall 1 month ago ↶
693
checks : Vec< db:: hooks:: Check> ,
694
required_checks : Vec< String> ,
e1ec9fbf Andy McCall 1 month ago ↶
695
696
projects : Vec< ( db:: projects:: Project, String) > ,
cc1cd197 Andy McCall 1 month ago ↶
697
698
requested : Vec< String> ,
8e96499f Andy McCall 1 month ago ↶
699
700
reviewable : Vec< String> ,
cc1cd197 Andy McCall 1 month ago ↶
701
702
can_request : bool ,
7d2eb590 Andy McCall 1 month ago ↶
703
704
assistants : Vec< String> ,
705
706
draft : Option< String> ,
de505df5 Andy McCall 1 month ago ↶
707
}
708
709
# [ derive ( Deserialize ) ]
710
pub struct DetailQuery {
711
tab : Option< String> ,
a1b98695 Andy McCall 1 month ago ↶
712
9df855f2 Andy McCall 1 month ago ↶
713
#[serde(default)]
a1b98695 Andy McCall 1 month ago ↶
714
notice : Option< String> ,
715
#[serde(default)]
716
error : Option< String> ,
717
#[serde(default)]
9df855f2 Andy McCall 1 month ago ↶
718
w : Option< String> ,
de505df5 Andy McCall 1 month ago ↶
719
}
720
721
722
723
# [ allow ( clippy::too_many_arguments ) ]
724
async fn detail (
725
app : & Shared,
726
shell : Shell,
727
viewer : & Viewer,
728
owner : & str ,
729
name : & str ,
730
number : i64 ,
731
tab : String,
732
notice : Option< String> ,
733
error : Option< String> ,
734
) -> Result< Page< ProposalPage> , Error> {
735
let ( repo, row, role) = lookup ( app, & shell, viewer, owner, name) .await? ;
736
let p = pdb:: get( & app.db, row.id, number)
737
.await
738
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
739
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
740
let loaded = load ( app, & repo, p) .await.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
741
742
if loaded.landed_already & & loaded.row.is_open ( ) {
743
pdb:: set_state( & app.db, loaded.row.id, " landed" , & loaded.target_state) .await.ok ( ) ;
744
pdb:: add_event( & app.db, loaded.row.id, " " , " landed" , " every change reached the target" ) .await.ok ( ) ;
745
}
746
let p = pdb:: get( & app.db, row.id, number) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? .unwrap_or ( loaded.row.clone ( ) ) ;
747
let v = verdict ( app, & loaded, row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
748
let comment_rows = pdb:: comments( & app.db, loaded.row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
749
let events = pdb:: events( & app.db, loaded.row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
750
751
let mut by_atom: HashMap< ( String, String, u32 ) , usize > = HashMap:: new( ) ;
752
for ( ( path, line) , ( h, i) ) in & loaded.atoms {
753
by_atom.insert ( ( path.clone ( ) , h.clone ( ) , * i) , * line) ;
754
}
755
let mut comments = Vec :: new( ) ;
756
let mut placed: HashMap< ( String, usize ) , Vec< usize > > = HashMap:: new( ) ;
757
let mut outdated = Vec :: new( ) ;
758
for ( idx, c) in comment_rows.into_iter ( ) .enumerate ( ) {
759
let line = if c.anchor_change.is_empty ( ) {
760
None
761
} else {
762
by_atom.get ( & ( c.path.clone ( ) , c.anchor_change.clone ( ) , c.anchor_index as u32 ) ) .copied ( )
763
} ;
764
if ! c.anchor_change.is_empty ( ) {
765
match line {
766
Some ( l) => placed.entry ( ( c.path.clone ( ) , l) ) .or_default ( ) .push ( idx) ,
767
None => outdated.push ( idx) ,
768
}
769
}
770
comments.push ( CommentView { body_html: render:: markdown:: render( & c.body, " /" , " /" ) , row: c, line } ) ;
771
}
772
let mut changes = loaded.changes.clone ( ) ;
773
super :: attribute( app, & mut changes.iter_mut ( ) .collect:: < Vec< _ > > ( ) ) .await;
774
let me = viewer.account ( ) ;
775
let can_edit = me.is_some_and ( | a | Some ( a.id) = = p.author_id | | role > = Role:: Maintain) ;
4f37afcc Andy McCall 1 month ago ↶
776
let deletable_source =
777
if p.state = = " landed" & & p.source_kind = = " bookmark" & & role > = Role:: Write & & p.source_bookmark ! = row.default_bookmark {
778
let b = p.source_bookmark.clone ( ) ;
779
app.repos
780
.read ( & repo, move | r, _ | Ok ( r.view ( ) ? .bookmarks.contains_key ( & b) ) )
781
.await
782
.unwrap_or ( false )
783
.then ( | | p.source_bookmark.clone ( ) )
784
} else {
785
None
786
} ;
de505df5 Andy McCall 1 month ago ↶
787
let can_land = role > = Role:: Write & & p.is_open ( ) & & v.blockers.is_empty ( ) ;
cc1cd197 Andy McCall 1 month ago ↶
788
let can_request = p.is_open ( ) & & me.is_some_and ( | a | Some ( a.id) = = p.author_id | | role > = Role:: Write) ;
8e96499f Andy McCall 1 month ago ↶
789
let requested = pdb:: review_requests( & app.db, p.id) .await.unwrap_or_default ( ) ;
790
let mut reviewable: Vec< String> = if can_request {
791
accounts:: assignable( & app.db, row.id, & row.owner) .await.unwrap_or_default ( ) .into_iter ( ) .filter ( | u | * u ! = p.author) .collect ( )
792
} else {
793
Vec :: new( )
794
} ;
795
for r in & requested {
796
if ! reviewable.iter ( ) .any ( | x | x.eq_ignore_ascii_case ( r) ) {
797
reviewable.push ( r.clone ( ) ) ;
798
}
799
}
7d2eb590 Andy McCall 1 month ago ↶
800
let assistants: Vec< String> = if ( can_request | | can_edit) & & p.is_open ( ) { assistant_names ( app, & row) .await } else { Vec :: new( ) } ;
14530604 Andy McCall 1 month ago ↶
801
let delegated = match viewer.account ( ) {
802
Some ( a) => super :: edit:: delegated_identity( app, a.id) .await.is_some ( ) ,
803
None => false ,
804
} ;
805
let hub_can_land = delegated | | app.repos.read ( & repo, | r , _| Ok ( r.current_policy ( ) ? .is_none ( ) ) ) .await.unwrap_or ( false ) ;
de505df5 Andy McCall 1 month ago ↶
806
let source_label = match p.source_kind.as_str ( ) {
807
" fork" => format! (
808
" fork {} " ,
809
db:: repos:: get_by_id( & app.db, p.source_repo_id.unwrap_or ( 0 ) )
810
.await
811
.ok ( )
812
.flatten ( )
813
.map ( | r | format! ( " {} :{} " , r.slug ( ) , p.source_bookmark) )
814
.unwrap_or_default ( )
815
) ,
816
" changes" => format! ( " {} changes" , p.source_changes ( ) .len ( ) ) ,
817
_ => p.source_bookmark.clone ( ) ,
818
} ;
e1ec9fbf Andy McCall 1 month ago ↶
819
let projects = super :: projects:: placements_for( app, viewer, & row, p.number) .await;
38833ed7 Andy McCall 1 month ago ↶
820
let texts: Vec< String> = std:: iter:: once( p.body.clone ( ) ) .chain ( changes.iter ( ) .map ( | c | format! ( " {} \n {} " , c.title, c.body) ) ) .collect ( ) ;
821
let closes = super :: chain:: issues_closed_by( app, & row, & texts.iter ( ) .map ( String :: as_str) .collect:: < Vec< _ > > ( ) ) .await;
a1b98695 Andy McCall 1 month ago ↶
822
let project_choices = super :: projects:: project_choices( app, viewer, & row, & projects) .await;
823
let mut dated: Vec< ( i64 , Entry) > = Vec :: new( ) ;
824
for ( index, c) in comments.iter ( ) .enumerate ( ) {
825
if c.row.anchor_change.is_empty ( ) {
826
dated.push ( ( c.row.created_ms, Entry { kind: " comment" , index } ) ) ;
827
}
828
}
829
for ( index, r) in v.reviews.iter ( ) .enumerate ( ) {
830
dated.push ( ( r.row.created_ms, Entry { kind: " review" , index } ) ) ;
831
}
832
for ( index, e) in events.iter ( ) .enumerate ( ) {
833
dated.push ( ( e.at_ms, Entry { kind: " event" , index } ) ) ;
834
}
835
dated.sort_by_key ( | ( at , _) | * at) ;
836
let timeline: Vec< Entry> = dated.into_iter ( ) .map ( | ( _, e ) | e ) .collect ( ) ;
de505df5 Andy McCall 1 month ago ↶
837
Ok ( Page( ProposalPage {
a1b98695 Andy McCall 1 month ago ↶
838
can_triage: role > = Role:: Triage,
839
timeline,
38833ed7 Andy McCall 1 month ago ↶
840
closes,
a1b98695 Andy McCall 1 month ago ↶
841
project_choices,
e1ec9fbf Andy McCall 1 month ago ↶
842
projects,
de505df5 Andy McCall 1 month ago ↶
843
shell,
844
repo: RepoShell:: new( app, & row, " proposals" ) .with_role ( role) ,
c79a1111 Andy McCall 1 month ago ↶
845
body_html: super :: issues:: markdown( app, & row, & row.default_bookmark, & p.body) .await,
de505df5 Andy McCall 1 month ago ↶
846
p,
847
tab,
848
changes,
849
files: loaded.files,
9df855f2 Andy McCall 1 month ago ↶
850
diffs: loaded.diffs,
851
bases: loaded.bases,
852
ignore_ws: false ,
de505df5 Andy McCall 1 month ago ↶
853
conflicts: loaded.conflicts,
854
conflicted: loaded.conflicted,
855
comments,
856
placed,
857
outdated,
858
reviews: v.reviews,
859
approvals: v.approvals,
860
blockers: v.blockers,
861
depends_on: v.depends_on,
862
events,
863
owners: loaded.owners,
864
requirements: v.requirements,
865
landed_already: loaded.landed_already,
866
can_edit,
4f37afcc Andy McCall 1 month ago ↶
867
deletable_source,
de505df5 Andy McCall 1 month ago ↶
868
can_land,
869
hub_can_land,
870
notice,
871
error,
872
heads: loaded.heads.iter ( ) .map ( | h | h.to_hex ( ) ) .collect ( ) ,
b64e2537 Andy McCall 1 month ago ↶
873
state_hash: loaded.state.clone ( ) ,
de505df5 Andy McCall 1 month ago ↶
874
source_label,
875
api_url: format! ( " {} /api/v1/repos/{owner} /{name} /proposals/{number} " , app.config.base_url ( ) ) ,
18e381ea Andy McCall 1 month ago ↶
876
labels: db:: issues:: proposal_labels( & app.db, loaded.row.id) .await.unwrap_or_default ( ) ,
877
all_labels: db:: issues:: labels( & app.db, row.id) .await.unwrap_or_default ( ) ,
b64e2537 Andy McCall 1 month ago ↶
878
checks: db:: hooks:: checks_for_state( & app.db, row.id, & loaded.state) .await.unwrap_or_default ( ) ,
879
required_checks: db:: hooks:: required_checks( & app.db, row.id) .await.unwrap_or_default ( ) ,
8e96499f Andy McCall 1 month ago ↶
880
requested,
881
reviewable,
7d2eb590 Andy McCall 1 month ago ↶
882
assistants,
883
draft: None ,
cc1cd197 Andy McCall 1 month ago ↶
884
can_request,
de505df5 Andy McCall 1 month ago ↶
885
} ) )
886
}
887
a1b98695 Andy McCall 1 month ago ↶
888
889
890
fn back ( owner : & str , name : & str , number : i64 , tab : & str , notice : Option< String> , error : Option< String> ) -> Response {
891
let mut url = format! ( " /{owner} /{name} /proposal/{number} ?tab={tab} " ) ;
892
if let Some ( n) = notice {
893
url.push_str ( & format! ( " ¬ice={} " , super :: settings:: urlencode( & n) ) ) ;
894
}
895
if let Some ( e) = error {
896
url.push_str ( & format! ( " &error={} " , super :: settings:: urlencode( & e) ) ) ;
897
}
898
Redirect:: to( & url) .into_response ( )
899
}
900
de505df5 Andy McCall 1 month ago ↶
901
pub async fn show (
902
State( app ) : State< Shared> ,
903
viewer : Viewer,
904
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
905
Query( q) : Query< DetailQuery> ,
906
) -> Result< Page< ProposalPage> , Error> {
907
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
a1b98695 Andy McCall 1 month ago ↶
908
let mut page =
909
detail ( & app, shell, & viewer, & owner, & name, number, q.tab.unwrap_or_else ( | | " conversation" .into ( ) ) , q.notice, q.error) .await? ;
9df855f2 Andy McCall 1 month ago ↶
910
if q.w.as_deref ( ) = = Some ( " 1" ) {
911
912
page.0. files =
913
super :: history:: render_files_with( & page.0. diffs, & page.0. bases, crate :: render:: diff:: Options { ignore_whitespace: true } ) ;
914
page.0. ignore_ws = true ;
915
}
916
Ok ( page)
de505df5 Andy McCall 1 month ago ↶
917
}
918
919
920
921
# [ derive ( Deserialize ) ]
922
pub struct CommentForm {
923
#[serde(rename = "_csrf")]
924
csrf_token : String,
925
body : String,
926
#[serde(default)]
927
path : String,
928
#[serde(default)]
929
line : Option< usize > ,
930
}
931
932
pub async fn comment (
933
State( app ) : State< Shared> ,
934
viewer : Viewer,
935
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
936
Form( f) : Form< CommentForm> ,
a1b98695 Andy McCall 1 month ago ↶
937
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
938
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
939
let me = require ( & viewer, & shell) ? ;
940
csrf ( & viewer, & f.csrf_token, & shell) ? ;
941
let ( repo, row, _ ) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
d0fbea2e Andy McCall 1 month ago ↶
942
super :: writable( & row, & shell) ? ;
de505df5 Andy McCall 1 month ago ↶
943
let p = pdb:: get( & app.db, row.id, number)
944
.await
945
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
946
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
947
if f.body.trim ( ) .is_empty ( ) {
a1b98695 Andy McCall 1 month ago ↶
948
return Ok ( back ( & owner, & name, number, " conversation" , None , Some ( " An empty comment says nothing." .into ( ) ) ) ) ;
de505df5 Andy McCall 1 month ago ↶
949
}
950
let anchor = match ( f.path.trim ( ) , f.line) {
951
( " " , _ ) | ( _ , None ) => None ,
952
( path, Some ( line) ) => {
953
let loaded = load ( & app, & repo, p.clone ( ) ) .await.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
954
loaded.atoms.get ( & ( path.to_string ( ) , line) ) .cloned ( )
955
}
956
} ;
957
let tab = if anchor.is_some ( ) { " files" } else { " conversation" } ;
958
pdb:: add_comment(
959
& app.db,
960
p.id,
961
Some ( me.account.id) ,
962
& me.account.username,
963
f.body.trim ( ) ,
964
f.path.trim ( ) ,
965
anchor.as_ref ( ) .map ( | ( h , i ) | ( h.as_str ( ) , * i as i64 ) ) ,
966
)
967
.await
968
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
a1b98695 Andy McCall 1 month ago ↶
969
Ok ( back ( & owner, & name, number, tab, None , None ) )
de505df5 Andy McCall 1 month ago ↶
970
}
971
972
# [ derive ( Deserialize ) ]
973
pub struct ReviewForm {
974
#[serde(rename = "_csrf")]
975
csrf_token : String,
976
verdict : String,
977
#[serde(default)]
978
body : String,
979
}
980
981
pub async fn review (
982
State( app ) : State< Shared> ,
983
viewer : Viewer,
984
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
985
Form( f) : Form< ReviewForm> ,
a1b98695 Andy McCall 1 month ago ↶
986
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
987
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
988
let me = require ( & viewer, & shell) ? ;
989
csrf ( & viewer, & f.csrf_token, & shell) ? ;
990
let ( _ , row, _ ) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
d0fbea2e Andy McCall 1 month ago ↶
991
super :: writable( & row, & shell) ? ;
de505df5 Andy McCall 1 month ago ↶
992
let p = pdb:: get( & app.db, row.id, number)
993
.await
994
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
995
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
996
if ! matches! ( f.verdict.as_str ( ) , " comment" | " changes" | " approve" ) {
997
return Err ( Error:: bad( shell, " a review is comment, changes or approve" ) ) ;
998
}
999
if f.verdict = = " approve" & & Some ( me.account.id) = = p.author_id {
a1b98695 Andy McCall 1 month ago ↶
1000
return Ok ( back ( & owner, & name, number, " conversation" , None , Some ( " You cannot approve your own proposal." .into ( ) ) ) ) ;
de505df5 Andy McCall 1 month ago ↶
1001
}
1002
pdb:: add_review( & app.db, p.id, me.account.id, & me.account.username, & f.verdict, f.body.trim ( ) )
1003
.await
1004
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
1005
pdb:: add_event( & app.db, p.id, & me.account.username, & format! ( " review.{} " , f.verdict) , " " ) .await.ok ( ) ;
cc1cd197 Andy McCall 1 month ago ↶
1006
reviewed ( & app, & row, & p, & me.account, & f.verdict) .await;
b64e2537 Andy McCall 1 month ago ↶
1007
crate :: hooks:: emit( & app, & row, " review" , & me.account.username, serde_json:: json! ( { " number" : number, " verdict" : f.verdict } ) ) .await;
de505df5 Andy McCall 1 month ago ↶
1008
let notice = if f.verdict = = " approve" {
1009
Some ( format! (
1010
" Approval recorded. It counts once you seal the changes: oxy seal --proposal {} /{owner} /{name} /proposal/{number} " ,
1011
app.config.base_url ( )
1012
) )
1013
} else {
1014
None
1015
} ;
a1b98695 Andy McCall 1 month ago ↶
1016
Ok ( back ( & owner, & name, number, " conversation" , notice, None ) )
de505df5 Andy McCall 1 month ago ↶
1017
}
1018
1019
# [ derive ( Deserialize ) ]
1020
pub struct EditForm {
1021
#[serde(rename = "_csrf")]
1022
csrf_token : String,
1023
title : String,
1024
#[serde(default)]
1025
body : String,
1026
target : String,
1027
}
1028
1029
pub async fn edit (
1030
State( app ) : State< Shared> ,
1031
viewer : Viewer,
1032
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1033
Form( f) : Form< EditForm> ,
a1b98695 Andy McCall 1 month ago ↶
1034
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
1035
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1036
let me = require ( & viewer, & shell) ? ;
1037
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1038
let ( _ , row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
1039
let p = pdb:: get( & app.db, row.id, number)
1040
.await
1041
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1042
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
1043
if Some ( me.account.id) ! = p.author_id & & role < Role:: Maintain {
1044
return Err ( Error:: not_found( shell) ) ;
1045
}
1046
let target = if crate :: repos:: names:: valid_segment( f.target.trim ( ) ) { f.target.trim ( ) } else { & p.target } ;
1047
pdb:: edit( & app.db, p.id, f.title.trim ( ) , f.body.trim ( ) , target) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
1048
pdb:: add_event( & app.db, p.id, & me.account.username, " edited" , " " ) .await.ok ( ) ;
a1b98695 Andy McCall 1 month ago ↶
1049
Ok ( back ( & owner, & name, number, " conversation" , Some ( " Saved." .into ( ) ) , None ) )
de505df5 Andy McCall 1 month ago ↶
1050
}
1051
1052
# [ derive ( Deserialize ) ]
1053
pub struct StateForm {
1054
#[serde(rename = "_csrf")]
1055
csrf_token : String,
1056
action : String,
1057
}
1058
1059
pub async fn state (
1060
State( app ) : State< Shared> ,
1061
viewer : Viewer,
1062
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1063
Form( f) : Form< StateForm> ,
a1b98695 Andy McCall 1 month ago ↶
1064
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
1065
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1066
let me = require ( & viewer, & shell) ? ;
1067
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1068
let ( _ , row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
1069
let p = pdb:: get( & app.db, row.id, number)
1070
.await
1071
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1072
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
1073
if Some ( me.account.id) ! = p.author_id & & role < Role:: Triage {
1074
return Err ( Error:: not_found( shell) ) ;
1075
}
1076
let new_state = match ( f.action.as_str ( ) , p.state.as_str ( ) ) {
1077
( " close" , " open" | " draft" ) => " closed" ,
1078
( " reopen" , " closed" ) => " open" ,
1079
( " ready" , " draft" ) => " open" ,
1080
( " draft" , " open" ) => " draft" ,
1081
_ => return Err ( Error:: bad( shell, " that transition is not possible" ) ) ,
1082
} ;
1083
pdb:: set_state( & app.db, p.id, new_state, " " ) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
1084
pdb:: add_event( & app.db, p.id, & me.account.username, new_state, " " ) .await.ok ( ) ;
b64e2537 Andy McCall 1 month ago ↶
1085
crate :: hooks:: emit( & app, & row, & format! ( " proposal.{new_state} " ) , & me.account.username, serde_json:: json! ( { " number" : number } ) ) .await;
a1b98695 Andy McCall 1 month ago ↶
1086
Ok ( back ( & owner, & name, number, " conversation" , None , None ) )
de505df5 Andy McCall 1 month ago ↶
1087
}
1088
1089
pub async fn resolve_comment (
1090
State( app ) : State< Shared> ,
1091
viewer : Viewer,
1092
Path( (owner , name , number , id ) ) : Path< ( String, String, i64 , i64 ) > ,
1093
Form( f) : Form< super:: session:: CsrfForm> ,
a1b98695 Andy McCall 1 month ago ↶
1094
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
1095
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1096
require ( & viewer, & shell) ? ;
1097
csrf ( & viewer, & f.csrf, & shell) ? ;
1098
let ( _ , row, _ ) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
1099
let p = pdb:: get( & app.db, row.id, number)
1100
.await
1101
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1102
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
1103
let current: Option< bool > = sqlx:: query_scalar( " SELECT resolved FROM proposal_comments WHERE id = ? AND proposal_id = ?" )
1104
.bind ( id)
1105
.bind ( p.id)
1106
.fetch_optional ( & app.db)
1107
.await
1108
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
1109
if let Some ( r) = current {
1110
pdb:: set_comment_resolved( & app.db, id, ! r) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
1111
}
a1b98695 Andy McCall 1 month ago ↶
1112
Ok ( back ( & owner, & name, number, " files" , None , None ) )
de505df5 Andy McCall 1 month ago ↶
1113
}
1114
1115
1116
1117
pub async fn land (
1118
State( app ) : State< Shared> ,
1119
viewer : Viewer,
1120
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1121
Form( f) : Form< super:: session:: CsrfForm> ,
a1b98695 Andy McCall 1 month ago ↶
1122
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
1123
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1124
let me = require ( & viewer, & shell) ? ;
1125
csrf ( & viewer, & f.csrf, & shell) ? ;
1126
let ( repo, row, _ ) = lookup_role ( & app, & shell, & viewer, & owner, & name, Access:: Write) .await? ;
0b20f1ec Andy McCall 1 month ago ↶
1127
match land_as ( & app, & repo, & row, & me.account, number, " web" ) .await {
a1b98695 Andy McCall 1 month ago ↶
1128
Ok ( _ ) => Ok ( back ( & owner, & name, number, " conversation" , Some ( " Landed." .into ( ) ) , None ) ) ,
1f1eb06a Andy McCall 1 month ago ↶
1129
Err ( Landing:: NotFound) => Err ( Error:: not_found( shell) ) ,
a1b98695 Andy McCall 1 month ago ↶
1130
Err ( Landing:: Refused( m) ) => Ok ( back ( & owner, & name, number, " conversation" , None , Some ( m) ) ) ,
1f1eb06a Andy McCall 1 month ago ↶
1131
}
1132
}
1133
1134
1135
pub enum Landing {
1136
NotFound,
1137
Refused( String ) ,
1138
}
1139
1140
1141
1142
0b20f1ec Andy McCall 1 month ago ↶
1143
1144
1f1eb06a Andy McCall 1 month ago ↶
1145
pub async fn land_as (
1146
app : & Shared,
1147
repo : & RepoName,
1148
row : & db:: repos:: RepoRow,
1149
me : & accounts:: Account,
1150
number : i64 ,
0b20f1ec Andy McCall 1 month ago ↶
1151
via : & str ,
1f1eb06a Andy McCall 1 month ago ↶
1152
) -> Result< String, Landing> {
1153
let ( owner, name) = ( row.owner.clone ( ) , row.name.clone ( ) ) ;
1154
let refused = | e : String| Landing:: Refused( e) ;
1155
let p = pdb:: get( & app.db, row.id, number) .await.map_err ( | e | refused ( e.to_string ( ) ) ) ? .ok_or ( Landing:: NotFound) ? ;
1156
let loaded = load ( app, repo, p.clone ( ) ) .await.map_err ( | e | refused ( e.to_string ( ) ) ) ? ;
1157
let v = verdict ( app, & loaded, row.id) .await.map_err ( | e | refused ( e.to_string ( ) ) ) ? ;
1158
if ! p.is_open ( ) {
1159
return Err ( refused ( format! ( " Cannot land: the proposal is {} " , p.state) ) ) ;
1160
}
1161
if ! v.blockers.is_empty ( ) {
1162
return Err ( refused ( format! ( " Cannot land: {} " , v.blockers.join ( " ; " ) ) ) ) ;
de505df5 Andy McCall 1 month ago ↶
1163
}
1164
let target = p.target.clone ( ) ;
1165
let heads = loaded.heads.clone ( ) ;
14530604 Andy McCall 1 month ago ↶
1166
1167
1168
1169
1f1eb06a Andy McCall 1 month ago ↶
1170
let result = match super :: edit:: signer_for( app, me.id) .await {
1171
Ok ( signer) => crate :: repos:: edits:: move_bookmark( & app.repos, repo, target.clone ( ) , heads.clone ( ) , signer) .await.map ( | _| pl:: state_ref( & heads) .to_hex ( ) ) ,
14530604 Andy McCall 1 month ago ↶
1172
Err ( why) => {
1173
app.repos
1f1eb06a Andy McCall 1 month ago ↶
1174
.write ( repo, move | r, _ | {
14530604 Andy McCall 1 month ago ↶
1175
if r.current_policy ( ) ? .is_some ( ) {
1176
return Err ( crate :: repos:: RepoError:: Oxy( oxy_core:: repo:: RepoError:: Msg( format! (
1177
" 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} "
1178
) ) ) ) ;
1179
}
1180
r.bookmark_set ( & target, & heads) ? ;
1181
Ok ( pl:: state_ref( & heads) .to_hex ( ) )
1182
} )
1183
.await
1184
}
1185
} ;
1f1eb06a Andy McCall 1 month ago ↶
1186
let state = result.map_err ( | e | refused ( e.to_string ( ) ) ) ? ;
0b20f1ec Andy McCall 1 month ago ↶
1187
pdb:: set_landed( & app.db, p.id, & state, & me.username, via) .await.map_err ( | e | refused ( e.to_string ( ) ) ) ? ;
1188
let how = if v.approvals.is_empty ( ) { format! ( " {via} , with no approval" ) } else { via.to_string ( ) } ;
1189
pdb:: add_event( & app.db, p.id, & me.username, " landed" , & how) .await.ok ( ) ;
1f1eb06a Andy McCall 1 month ago ↶
1190
crate :: hooks:: emit(
1191
app,
1192
row,
1193
" proposal.landed" ,
1194
& me.username,
1195
serde_json:: json! ( { " number" : number, " target" : p.target, " state" : state } ) ,
1196
)
1197
.await;
1198
crate :: notify:: deliver(
1199
app,
1200
crate :: notify:: Event {
1201
kind: " proposal.landed" ,
1202
title: format! ( " {owner} /{name} #{number} : {} landed" , p.title) ,
1203
url: format! ( " /{owner} /{name} /proposal/{number} " ) ,
1204
actor: me,
1205
repo_id: row.id,
1206
thread: Some ( ( " proposal" , p.id) ) ,
1207
mention_text: " " ,
1208
direct: p.author_id.into_iter ( ) .collect ( ) ,
1209
} ,
1210
)
1211
.await;
1212
if p.target = = row.default_bookmark {
1213
let messages: Vec< ( String, String) > = loaded.changes.iter ( ) .map ( | c | ( c.hash.clone ( ) , format! ( " {} \n {} " , c.title, c.body) ) ) .collect ( ) ;
1214
super :: issues:: close_from_messages( app, row, & messages) .await;
de505df5 Andy McCall 1 month ago ↶
1215
}
0b20f1ec Andy McCall 1 month ago ↶
1216
accounts:: audit( & app.db, Some ( me) , " proposal.landed" , & format! ( " {owner} /{name} #{number} " ) , & how) .await.ok ( ) ;
1f1eb06a Andy McCall 1 month ago ↶
1217
db:: repos:: record_push(
1218
& app.db,
1219
row.id,
1220
Some ( ( me.id, me.username.as_str ( ) ) ) ,
1221
& [ db:: repos:: PushOutcome {
1222
reference: p.target.clone ( ) ,
1223
ok: true ,
0b20f1ec Andy McCall 1 month ago ↶
1224
reason: format! ( " landed #{number} ({how} )" ) ,
1f1eb06a Andy McCall 1 month ago ↶
1225
old_state: loaded.target_state.clone ( ) ,
1226
new_state: state.clone ( ) ,
1227
heads: loaded.heads.len ( ) as i64 ,
1228
changes: loaded.hashes.len ( ) as i64 ,
1229
} ] ,
1230
)
1231
.await
1232
.ok ( ) ;
1233
Ok ( state)
de505df5 Andy McCall 1 month ago ↶
1234
}
1235
18e381ea Andy McCall 1 month ago ↶
1236
# [ derive ( Deserialize ) ]
1237
pub struct LabelsForm {
1238
#[serde(rename = "_csrf")]
1239
csrf_token : String,
1240
#[serde(default)]
1241
label : Vec< i64 > ,
1242
}
1243
1244
pub async fn set_labels (
1245
State( app ) : State< Shared> ,
1246
viewer : Viewer,
1247
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1248
axum_extra:: extract:: Form( f) : axum_extra:: extract:: Form< LabelsForm> ,
a1b98695 Andy McCall 1 month ago ↶
1249
) -> Result< Response, Error> {
18e381ea Andy McCall 1 month ago ↶
1250
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1251
require ( & viewer, & shell) ? ;
1252
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1253
let ( _ , row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
1254
if role < Role:: Triage {
1255
return Err ( Error:: not_found( shell) ) ;
1256
}
1257
let p = pdb:: get( & app.db, row.id, number)
1258
.await
1259
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1260
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
1261
for l in db:: issues:: labels( & app.db, row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? {
1262
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) ) ? ;
1263
}
a1b98695 Andy McCall 1 month ago ↶
1264
Ok ( back ( & owner, & name, number, " conversation" , None , None ) )
18e381ea Andy McCall 1 month ago ↶
1265
}
1266
b64e2537 Andy McCall 1 month ago ↶
1267
1268
1269
pub async fn events (
1270
State( app ) : State< Shared> ,
1271
viewer : Viewer,
1272
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1273
) -> Result< axum:: response:: Sse< impl futures:: Stream< Item = Result< axum:: response:: sse:: Event, std:: convert:: Infallible> > > , Error> {
1274
use futures:: StreamExt;
1275
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1276
let ( _ , row, _ ) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
1277
let rx = app.events.proposals.subscribe ( ) ;
1278
let repo_id = row.id;
1279
let stream = tokio_stream:: wrappers:: BroadcastStream:: new( rx) .filter_map ( move | item| async move {
1280
match item {
1281
Ok ( ( id, ev) ) if id = = repo_id => {
1282
Some ( Ok ( axum:: response:: sse:: Event:: default( ) .event ( ev.kind.clone ( ) ) .data ( serde_json:: to_string( & ev) .unwrap_or_default ( ) ) ) )
1283
}
1284
_ => None ,
1285
}
1286
} ) ;
1287
Ok ( axum:: response:: Sse:: new( stream) .keep_alive ( axum:: response:: sse:: KeepAlive:: default( ) ) )
1288
}
1289
de505df5 Andy McCall 1 month ago ↶
1290
1291
1292
pub async fn to_api ( app : & Shared, owner : & str , name : & str , loaded : & Loaded, v : & Verdict, source_url : Option< String> ) -> hub_api:: Proposal {
1293
let p = & loaded.row;
1294
hub_api:: Proposal {
1295
number: p.number,
1296
title: p.title.clone ( ) ,
1297
body: p.body.clone ( ) ,
1298
author: p.author.clone ( ) ,
1299
state: ProposalState:: parse( & p.state) .unwrap_or ( ProposalState:: Open) ,
1300
target: p.target.clone ( ) ,
1301
source: match p.source_kind.as_str ( ) {
1302
" fork" => {
1303
let ( o, n) = source_url
1304
.as_deref ( )
1305
.and_then ( | u | u.rsplit_once ( ' /' ) )
1306
.and_then ( | ( b , n ) | b.rsplit_once ( ' /' ) .map ( | ( _, o ) | ( o.to_string ( ) , n.to_string ( ) ) ) )
1307
.unwrap_or_default ( ) ;
1308
ProposalSource:: Fork { owner: o, name: n, bookmark: p.source_bookmark.clone ( ) }
1309
}
1310
" changes" => ProposalSource:: Changes { hashes: p.source_changes ( ) } ,
1311
_ => ProposalSource:: Bookmark { bookmark: p.source_bookmark.clone ( ) } ,
1312
} ,
1313
changes: loaded
1314
.changes
1315
.iter ( )
1316
.map ( | c | hub_api:: ChangeSummary {
1317
hash: c.hash.clone ( ) ,
1318
message: if c.body.is_empty ( ) { c.title.clone ( ) } else { format! ( " {} \n \n {} " , c.title, c.body) } ,
1319
author: hub_api:: Author {
1320
name: c.author.name.clone ( ) ,
1321
email: c.author.email.clone ( ) ,
1322
key: c.author.key.clone ( ) ,
1323
account: c.author.account.clone ( ) ,
760a7dd3 Andy McCall 1 month ago ↶
1324
note: hub_api:: Author:: note_for( & c.author.key, & c.author.account) ,
de505df5 Andy McCall 1 month ago ↶
1325
} ,
1326
when_ms: c.when_ms,
1327
deps: c.deps.clone ( ) ,
1328
head: c.head,
8933faff Andy McCall 1 month ago ↶
1329
via: c.via.as_ref ( ) .map ( | v | hub_api:: Via {
1330
name: v.name.clone ( ) ,
1331
key: v.key.clone ( ) ,
1332
scope: v.scope.clone ( ) ,
1333
expires_ms: v.expires_ms,
1334
revoked: v.revoked,
1335
} ) ,
de505df5 Andy McCall 1 month ago ↶
1336
signature: match & c.signature {
1337
view:: SigView:: Unsigned => hub_api:: Signature:: Unsigned,
1338
view:: SigView:: Valid { key, sealed, revoked, .. } => {
1339
hub_api:: Signature:: Valid { key: key.clone ( ) , sealed: * sealed, revoked: * revoked }
1340
}
1341
view:: SigView:: Invalid( why) => hub_api:: Signature:: Invalid { reason: why.clone ( ) } ,
1342
} ,
1343
} )
1344
.collect ( ) ,
1345
projected_heads: loaded.heads.iter ( ) .map ( | h | h.to_hex ( ) ) .collect ( ) ,
1346
projected_state: Some ( loaded.state.clone ( ) ) ,
1347
conflicted: loaded.conflicted,
1348
approvals: v.approvals.clone ( ) ,
1349
landable: p.is_open ( ) & & v.blockers.is_empty ( ) ,
1350
blockers: v.blockers.clone ( ) ,
1351
created_ms: p.created_ms,
1352
updated_ms: p.updated_ms,
1353
url: format! ( " {} /{owner} /{name} /proposal/{} " , app.config.base_url ( ) , p.number) ,
1354
repository_url: format! ( " {} /{owner} /{name} " , app.config.base_url ( ) ) ,
1355
source_url,
0b20f1ec Andy McCall 1 month ago ↶
1356
landed: ( p.state = = " landed" & & p.landed_ms > 0 ) .then ( | | hub_api:: Landed {
1357
by: p.landed_by.clone ( ) ,
1358
via: p.landed_via.clone ( ) ,
1359
when_ms: p.landed_ms,
1360
} ) ,
cc1cd197 Andy McCall 1 month ago ↶
1361
requested_reviewers: pdb:: review_requests( & app.db, p.id) .await.unwrap_or_default ( ) ,
2291f8cc Andy McCall 1 month ago ↶
1362
labels: db:: issues:: proposal_labels( & app.db, p.id)
1363
.await
1364
.unwrap_or_default ( )
1365
.into_iter ( )
1366
.map ( | l | hub_api:: Label { name: l.name, colour: l.colour, description: l.description } )
1367
.collect ( ) ,
de505df5 Andy McCall 1 month ago ↶
1368
}
1369
}
1370
1371
1372
pub fn key ( path : & str , line : impl filters:: Num) -> ( String, usize ) {
1373
( path.to_string ( ) , line.as_u64 ( ) as usize )
1374
}
1375
1376
# [ allow ( dead_code ) ]
1377
fn _unused ( _ : & diff:: Line, _ : & ConflictView, _ : & Role) { }
cc1cd197 Andy McCall 1 month ago ↶
1378
1379
1380
1381
1382
1383
1384
1385
pub async fn request_reviewers (
1386
app : & Shared,
1387
row : & db:: repos:: RepoRow,
1388
p : & pdb:: ProposalRow,
1389
by : & accounts:: Account,
1390
names : & [String],
1391
) -> Result< Vec< String> , String> {
1392
let mut found = Vec :: new( ) ;
1393
for name in names.iter ( ) .map ( | n | n.trim ( ) .trim_start_matches ( ' @' ) ) .filter ( | n | ! n.is_empty ( ) ) {
1394
let Some ( a) = accounts:: account_by_name( & app.db, name) .await.ok ( ) .flatten ( ) else {
1395
return Err ( format! ( " There is no account {name} ." ) ) ;
1396
} ;
1397
if Some ( a.id) = = p.author_id {
1398
return Err ( format! ( " {name} wrote this proposal, and cannot review it." ) ) ;
1399
}
1400
let role = crate :: auth:: roles:: role_for( & app.db, Some ( & a) , row) .await.ok ( ) .flatten ( ) ;
1401
if ! crate :: auth:: roles:: allows( role, crate :: auth:: Access:: Read) {
1402
return Err ( format! ( " {name} cannot read this repository." ) ) ;
1403
}
1404
found.push ( a) ;
1405
}
1406
let mut asked = Vec :: new( ) ;
1407
for a in found {
1408
if ! pdb:: request_review( & app.db, p.id, a.id, & by.username) .await.map_err ( | e | e.to_string ( ) ) ? {
1409
continue ;
1410
}
1411
pdb:: add_event( & app.db, p.id, & by.username, " review requested" , & a.username) .await.ok ( ) ;
1412
crate :: notify:: deliver(
1413
app,
1414
crate :: notify:: Event {
1415
kind: " proposal.review_requested" ,
1416
title: format! ( " {} /{} #{} : {} (review requested from {} )" , row.owner, row.name, p.number, p.title, a.username) ,
1417
url: format! ( " /{} /{} /proposal/{} " , row.owner, row.name, p.number) ,
1418
actor: by,
1419
repo_id: row.id,
1420
thread: None ,
1421
mention_text: " " ,
1422
direct: vec! [ a.id] ,
1423
} ,
1424
)
1425
.await;
1426
asked.push ( a.username) ;
1427
}
1428
Ok ( asked)
1429
}
1430
1431
1432
1433
pub async fn reviewed ( app : & Shared, row : & db:: repos:: RepoRow, p : & pdb:: ProposalRow, by : & accounts:: Account, verdict : & str ) {
1434
pdb:: unrequest_review( & app.db, p.id, by.id) .await.ok ( ) ;
1435
let what = match verdict {
1436
" approve" => " approved" ,
1437
" changes" => " changes requested" ,
1438
_ => " reviewed" ,
1439
} ;
1440
crate :: notify:: deliver(
1441
app,
1442
crate :: notify:: Event {
1443
kind: " proposal.review" ,
1444
title: format! ( " {} /{} #{} : {} ({what} by {} )" , row.owner, row.name, p.number, p.title, by.username) ,
1445
url: format! ( " /{} /{} /proposal/{} " , row.owner, row.name, p.number) ,
1446
actor: by,
1447
repo_id: row.id,
1448
thread: Some ( ( " proposal" , p.id) ) ,
1449
mention_text: " " ,
1450
direct: p.author_id.into_iter ( ) .collect ( ) ,
1451
} ,
1452
)
1453
.await;
1454
}
1455
1456
# [ derive ( Deserialize ) ]
1457
pub struct ReviewersForm {
1458
#[serde(rename = "_csrf")]
1459
csrf_token : String,
8e96499f Andy McCall 1 month ago ↶
1460
cc1cd197 Andy McCall 1 month ago ↶
1461
action : String,
8e96499f Andy McCall 1 month ago ↶
1462
#[serde(default)]
1463
username : Vec< String> ,
cc1cd197 Andy McCall 1 month ago ↶
1464
}
1465
1466
1467
1468
pub async fn reviewers (
1469
State( app ) : State< Shared> ,
1470
viewer : Viewer,
1471
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
8e96499f Andy McCall 1 month ago ↶
1472
axum_extra:: extract:: Form( f) : axum_extra:: extract:: Form< ReviewersForm> ,
cc1cd197 Andy McCall 1 month ago ↶
1473
) -> Result< Response, Error> {
1474
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1475
let me = require ( & viewer, & shell) ? ;
1476
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1477
let ( _ , row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
1478
let p = pdb:: get( & app.db, row.id, number)
1479
.await
1480
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1481
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
1482
if Some ( me.account.id) ! = p.author_id & & role < Role:: Write {
1483
return Err ( Error:: not_found( shell) ) ;
1484
}
8e96499f Andy McCall 1 month ago ↶
1485
let names: Vec< String> = f.username.iter ( ) .map ( | n | n.trim ( ) .trim_start_matches ( ' @' ) .to_string ( ) ) .filter ( | n | ! n.is_empty ( ) ) .collect ( ) ;
1486
let current = pdb:: review_requests( & app.db, p.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
1487
1488
let withdraw: Vec< String> = match f.action.as_str ( ) {
1489
" remove" => names.clone ( ) ,
1490
" set" => current.iter ( ) .filter ( | c | ! names.iter ( ) .any ( | n | n.eq_ignore_ascii_case ( c) ) ) .cloned ( ) .collect ( ) ,
1491
_ => Vec :: new( ) ,
1492
} ;
1493
for who in & withdraw {
1494
if let Some ( a) = accounts:: account_by_name( & app.db, who) .await.ok ( ) .flatten ( ) {
cc1cd197 Andy McCall 1 month ago ↶
1495
if pdb:: unrequest_review( & app.db, p.id, a.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? {
1496
pdb:: add_event( & app.db, p.id, & me.account.username, " review request withdrawn" , & a.username) .await.ok ( ) ;
1497
}
1498
}
8e96499f Andy McCall 1 month ago ↶
1499
}
1500
let ask: Vec< String> = match f.action.as_str ( ) {
1501
" add" => names,
1502
" set" => names.into_iter ( ) .filter ( | n | ! current.iter ( ) .any ( | c | c.eq_ignore_ascii_case ( n) ) ) .collect ( ) ,
1503
_ => return Ok ( back ( & owner, & name, number, " conversation" , None , None ) ) ,
1504
} ;
1505
if ask.is_empty ( ) {
cc1cd197 Andy McCall 1 month ago ↶
1506
return Ok ( back ( & owner, & name, number, " conversation" , None , None ) ) ;
1507
}
8e96499f Andy McCall 1 month ago ↶
1508
match request_reviewers ( & app, & row, & p, & me.account, & ask) .await {
cc1cd197 Andy McCall 1 month ago ↶
1509
Ok ( asked) if asked.is_empty ( ) => Ok ( back ( & owner, & name, number, " conversation" , Some ( " Already asked." .into ( ) ) , None ) ) ,
1510
Ok ( asked) => Ok ( back ( & owner, & name, number, " conversation" , Some ( format! ( " Asked {} to review." , asked.join ( " , " ) ) ) , None ) ) ,
1511
Err ( e) => Ok ( back ( & owner, & name, number, " conversation" , None , Some ( e) ) ) ,
7d2eb590 Andy McCall 1 month ago ↶
1512
}
1513
}
1514
1515
# [ derive ( Deserialize ) ]
1516
pub struct AssistantForm {
1517
#[serde(rename = "_csrf")]
1518
csrf_token : String,
1519
assistant : String,
1520
}
1521
1522
1523
1524
1525
pub async fn assistant (
1526
State( app ) : State< Shared> ,
1527
viewer : Viewer,
1528
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1529
Form( f) : Form< AssistantForm> ,
1530
) -> Result< Response, Error> {
1531
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1532
let me = require ( & viewer, & shell) ? ;
1533
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1534
let ( _ , row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
d0fbea2e Andy McCall 1 month ago ↶
1535
super :: writable( & row, & shell) ? ;
7d2eb590 Andy McCall 1 month ago ↶
1536
let p = pdb:: get( & app.db, row.id, number)
1537
.await
1538
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1539
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
1540
if Some ( me.account.id) ! = p.author_id & & role < Role:: Write {
1541
return Err ( Error:: not_found( shell) ) ;
1542
}
1543
if ! p.is_open ( ) {
1544
return Ok ( back ( & owner, & name, number, " conversation" , None , Some ( " The proposal is not open." .into ( ) ) ) ) ;
1545
}
1546
let Some ( a) = crate :: assistants:: enabled_for_repo( & app.db, & row)
1547
.await
1548
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1549
.into_iter ( )
1550
.find ( | a | a.name.eq_ignore_ascii_case ( f.assistant.trim ( ) ) )
1551
else {
1552
return Ok ( back ( & owner, & name, number, " conversation" , None , Some ( format! ( " No assistant called {} here." , f.assistant.trim ( ) ) ) ) ) ;
1553
} ;
1554
let who = a.name.clone ( ) ;
1555
match crate :: assistants:: request_review( & app, & row, & p, & me.account, a) .await {
1556
Ok ( ( ) ) => Ok ( back (
1557
& owner,
1558
& name,
1559
number,
1560
" conversation" ,
1561
Some ( format! ( " Asked {who} to review; its answer appears here when it comes." ) ) ,
1562
None ,
1563
) ) ,
1564
Err ( e) => Ok ( back ( & owner, & name, number, " conversation" , None , Some ( format! ( " Not asked: {e} ." ) ) ) ) ,
1565
}
1566
}
1567
1568
1569
async fn assistant_names ( app : & Shared, row : & db:: repos:: RepoRow) -> Vec< String> {
1570
crate :: assistants:: enabled_for_repo( & app.db, row) .await.unwrap_or_default ( ) .into_iter ( ) .map ( | a | a.name ) .collect ( )
1571
}
1572
1573
1574
1575
async fn preview_diff (
1576
app : & Shared,
1577
repo : & RepoName,
1578
target : & str ,
1579
source : & str ,
1580
) -> Result< ( Vec< ChangeView> , Vec< oxy_core:: repo:: FileDiff> ) , crate:: repos:: RepoError> {
1581
let Some ( ( fork, bookmark) ) = parse_source ( app, repo, source) else { return Ok ( ( vec! [ ] , vec! [ ] ) ) } ;
1582
let target = target.to_string ( ) ;
1583
let fork_dir = fork.as_ref ( ) .map ( | f | app.repos.dir ( f) ) ;
1584
app.repos
1585
.read ( repo, move | r, cache| {
1586
let projection = match & fork_dir {
1587
Some ( dir) => {
1588
let fork_repo = oxy_core:: repo:: Repo:: open( dir) ? ;
1589
let heads = fork_repo.bookmarks ( ) ? .into_iter ( ) .find ( | b | b.name = = bookmark ) .map ( | b | b.heads ) .unwrap_or_default ( ) ;
1590
pl:: project( r, cache, & target, Source:: Fork { fork: & fork_repo, heads } ) ?
1591
}
1592
None => {
1593
let heads = r.bookmarks ( ) ? .into_iter ( ) .find ( | b | b.name = = bookmark ) .map ( | b | b.heads ) .unwrap_or_default ( ) ;
1594
pl:: project( r, cache, & target, Source:: Bookmark( heads) ) ?
1595
}
1596
} ;
1597
Ok ( ( projection.changes, projection.files) )
1598
} )
1599
.await
1600
}
1601
1602
1603
1604
1605
pub async fn new_draft (
1606
State( app ) : State< Shared> ,
1607
viewer : Viewer,
1608
Path( (owner , name ) ) : Path< ( String, String) > ,
1609
Form( f) : Form< NewForm> ,
1610
) -> Result< Page< NewProposalPage> , Error> {
1611
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposals/new" ) , & viewer) ;
1612
let me = require ( & viewer, & shell) ? ;
1613
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1614
let ( repo, row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
d0fbea2e Andy McCall 1 month ago ↶
1615
super :: writable( & row, & shell) ? ;
7d2eb590 Andy McCall 1 month ago ↶
1616
let bookmarks =
1617
app.repos.read ( & repo, | r , _| Ok ( r.bookmarks ( ) ? .into_iter ( ) .map ( | b | b.name ) .collect:: < Vec< _ > > ( ) ) ) .await.unwrap_or_default ( ) ;
1618
let ( preview, conflicted) = preview_for ( & app, & repo, & f.target, & f.source) .await.unwrap_or ( ( vec! [ ] , false ) ) ;
1619
let assistants = if preview.is_empty ( ) { vec! [ ] } else { assistant_names ( & app, & row) .await } ;
1620
let mut page = NewProposalPage {
1621
shell,
1622
repo: RepoShell:: new( & app, & row, " proposals" ) .with_role ( role) ,
1623
bookmarks,
1624
source: f.source.clone ( ) ,
1625
target: f.target.clone ( ) ,
1626
error: None ,
1627
preview,
1628
conflicted,
1629
title: f.title.clone ( ) ,
1630
body: f.body.clone ( ) ,
1631
assistants,
1632
} ;
1633
let assistant = crate :: assistants:: enabled_for_repo( & app.db, & row)
1634
.await
1635
.unwrap_or_default ( )
1636
.into_iter ( )
1637
.find ( | a | a.name.eq_ignore_ascii_case ( f.assistant.trim ( ) ) ) ;
1638
let Some ( a) = assistant else {
1639
page.error = Some ( format! ( " No assistant called {} here." , f.assistant.trim ( ) ) ) ;
1640
return Ok ( Page( page) ) ;
1641
} ;
1642
if page.preview.is_empty ( ) {
1643
page.error = Some ( " Nothing to describe: the source adds nothing to the target." .into ( ) ) ;
1644
return Ok ( Page( page) ) ;
1645
}
1646
let ( changes, diffs) = match preview_diff ( & app, & repo, & f.target, & f.source) .await {
1647
Ok ( x) => x,
1648
Err ( e) => {
1649
page.error = Some ( e.to_string ( ) ) ;
1650
return Ok ( Page( page) ) ;
1651
}
1652
} ;
1653
let d = crate :: assistants:: Draft { slot: - row.id, title: & f.title, target: & f.target, changes: & changes, diffs: & diffs } ;
1654
match crate :: assistants:: draft_description( & app, & row, & me.account, & a, d) .await {
1655
Ok ( text) => page.body = text,
1656
Err ( why) => page.error = Some ( format! ( " {} did not answer: {why} ." , a.name) ) ,
1657
}
1658
Ok ( Page( page) )
1659
}
1660
1661
# [ derive ( Deserialize ) ]
1662
pub struct DraftForm {
1663
#[serde(rename = "_csrf")]
1664
csrf_token : String,
1665
assistant : String,
1666
#[serde(default)]
1667
title : String,
1668
}
1669
1670
1671
1672
1673
pub async fn draft (
1674
State( app ) : State< Shared> ,
1675
viewer : Viewer,
1676
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1677
Form( f) : Form< DraftForm> ,
1678
) -> Result< Response, Error> {
1679
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1680
let me = require ( & viewer, & shell) ? ;
1681
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1682
let ( repo, row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
d0fbea2e Andy McCall 1 month ago ↶
1683
super :: writable( & row, & shell) ? ;
7d2eb590 Andy McCall 1 month ago ↶
1684
let p = pdb:: get( & app.db, row.id, number)
1685
.await
1686
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1687
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
1688
if Some ( me.account.id) ! = p.author_id & & role < Role:: Maintain {
1689
return Err ( Error:: not_found( shell) ) ;
1690
}
1691
let Some ( a) = crate :: assistants:: enabled_for_repo( & app.db, & row)
1692
.await
1693
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1694
.into_iter ( )
1695
.find ( | a | a.name.eq_ignore_ascii_case ( f.assistant.trim ( ) ) )
1696
else {
1697
return Ok ( back ( & owner, & name, number, " conversation" , None , Some ( format! ( " No assistant called {} here." , f.assistant.trim ( ) ) ) ) ) ;
1698
} ;
1699
let loaded = crate :: web:: proposals:: load( & app, & repo, p.clone ( ) ) .await.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
1700
let title = if f.title.trim ( ) .is_empty ( ) { p.title.clone ( ) } else { f.title.clone ( ) } ;
1701
let d = crate :: assistants:: Draft { slot: p.id, title: & title, target: & p.target, changes: & loaded.changes, diffs: & loaded.diffs } ;
1702
let draft = crate :: assistants:: draft_description( & app, & row, & me.account, & a, d) .await;
1703
match draft {
1704
Ok ( text) => {
1705
let mut page = detail ( & app, shell, & viewer, & owner, & name, number, " conversation" .into ( ) , None , None ) .await? ;
1706
page.0. draft = Some ( text) ;
1707
Ok ( page.into_response ( ) )
1708
}
1709
Err ( why) => Ok ( back ( & owner, & name, number, " conversation" , None , Some ( format! ( " {} did not answer: {why} ." , a.name) ) ) ) ,
cc1cd197 Andy McCall 1 month ago ↶
1710
}
1711
}