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