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