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