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