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 25 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 25 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 25 days ago ↶
502
source_has_changes,
de505df5 Andy McCall 1 month ago ↶
503
} )
504
} )
505
.await? ;
ac713df7 Andy McCall 25 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 25 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 24 days ago ↶
542
let number = p.number;
ac713df7 Andy McCall 25 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 24 days ago ↶
546
} else if l.row.is_open ( ) & & ! l.hashes.is_empty ( ) & & crate :: flow:: enabled( app, row) {
547
548
549
5d90e0e0 Andy McCall 21 days ago
550
let ran: i64 = sqlx:: query_scalar( " SELECT COUNT(*) FROM flow_runs WHERE repo_id = $1 AND state = $2" )
d943160d Andy McCall 24 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 25 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 19 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 19 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 19 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 19 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 19 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 21 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 19 days ago ↶
712
can_land_over_checks : bool ,
de505df5 Andy McCall 1 month ago ↶
713
hub_can_land : bool ,
714
notice : Option< String> ,
715
error : Option< String> ,
716
heads : Vec< String> ,
717
state_hash : String,
718
source_label : String,
719
api_url : String,
18e381ea Andy McCall 1 month ago ↶
720
labels : Vec< db:: issues:: Label> ,
721
all_labels : Vec< db:: issues:: Label> ,
b64e2537 Andy McCall 1 month ago ↶
722
checks : Vec< db:: hooks:: Check> ,
723
required_checks : Vec< String> ,
e1ec9fbf Andy McCall 1 month ago ↶
724
725
projects : Vec< ( db:: projects:: Project, String) > ,
cc1cd197 Andy McCall 1 month ago ↶
726
727
requested : Vec< String> ,
8e96499f Andy McCall 1 month ago ↶
728
729
reviewable : Vec< String> ,
cc1cd197 Andy McCall 1 month ago ↶
730
731
can_request : bool ,
7d2eb590 Andy McCall 1 month ago ↶
732
733
assistants : Vec< String> ,
734
735
draft : Option< String> ,
de505df5 Andy McCall 1 month ago ↶
736
}
737
738
# [ derive ( Deserialize ) ]
739
pub struct DetailQuery {
740
tab : Option< String> ,
a1b98695 Andy McCall 1 month ago ↶
741
9df855f2 Andy McCall 1 month ago ↶
742
#[serde(default)]
a1b98695 Andy McCall 1 month ago ↶
743
notice : Option< String> ,
744
#[serde(default)]
745
error : Option< String> ,
746
#[serde(default)]
9df855f2 Andy McCall 1 month ago ↶
747
w : Option< String> ,
b5a0a69b Andy McCall 21 days ago ↶
748
749
#[serde(default)]
750
fragment : Option< String> ,
de505df5 Andy McCall 1 month ago ↶
751
}
752
753
754
755
# [ allow ( clippy::too_many_arguments ) ]
756
async fn detail (
757
app : & Shared,
758
shell : Shell,
759
viewer : & Viewer,
760
owner : & str ,
761
name : & str ,
762
number : i64 ,
763
tab : String,
764
notice : Option< String> ,
765
error : Option< String> ,
766
) -> Result< Page< ProposalPage> , Error> {
767
let ( repo, row, role) = lookup ( app, & shell, viewer, owner, name) .await? ;
768
let p = pdb:: get( & app.db, row.id, number)
769
.await
770
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
771
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
b5a0a69b Andy McCall 21 days ago ↶
772
let p_id = p.id;
de505df5 Andy McCall 1 month ago ↶
773
let loaded = load ( app, & repo, p) .await.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
774
775
if loaded.landed_already & & loaded.row.is_open ( ) {
776
pdb:: set_state( & app.db, loaded.row.id, " landed" , & loaded.target_state) .await.ok ( ) ;
777
pdb:: add_event( & app.db, loaded.row.id, " " , " landed" , " every change reached the target" ) .await.ok ( ) ;
778
}
779
let p = pdb:: get( & app.db, row.id, number) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? .unwrap_or ( loaded.row.clone ( ) ) ;
780
let v = verdict ( app, & loaded, row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
781
let comment_rows = pdb:: comments( & app.db, loaded.row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
782
let events = pdb:: events( & app.db, loaded.row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
783
784
let mut by_atom: HashMap< ( String, String, u32 ) , usize > = HashMap:: new( ) ;
785
for ( ( path, line) , ( h, i) ) in & loaded.atoms {
786
by_atom.insert ( ( path.clone ( ) , h.clone ( ) , * i) , * line) ;
787
}
788
let mut comments = Vec :: new( ) ;
789
let mut placed: HashMap< ( String, usize ) , Vec< usize > > = HashMap:: new( ) ;
790
let mut outdated = Vec :: new( ) ;
791
for ( idx, c) in comment_rows.into_iter ( ) .enumerate ( ) {
792
let line = if c.anchor_change.is_empty ( ) {
793
None
794
} else {
795
by_atom.get ( & ( c.path.clone ( ) , c.anchor_change.clone ( ) , c.anchor_index as u32 ) ) .copied ( )
796
} ;
797
if ! c.anchor_change.is_empty ( ) {
798
match line {
799
Some ( l) => placed.entry ( ( c.path.clone ( ) , l) ) .or_default ( ) .push ( idx) ,
800
None => outdated.push ( idx) ,
801
}
802
}
803
comments.push ( CommentView { body_html: render:: markdown:: render( & c.body, " /" , " /" ) , row: c, line } ) ;
804
}
805
let mut changes = loaded.changes.clone ( ) ;
806
super :: attribute( app, & mut changes.iter_mut ( ) .collect:: < Vec< _ > > ( ) ) .await;
807
let me = viewer.account ( ) ;
808
let can_edit = me.is_some_and ( | a | Some ( a.id) = = p.author_id | | role > = Role:: Maintain) ;
4f37afcc Andy McCall 1 month ago ↶
809
let deletable_source =
810
if p.state = = " landed" & & p.source_kind = = " bookmark" & & role > = Role:: Write & & p.source_bookmark ! = row.default_bookmark {
811
let b = p.source_bookmark.clone ( ) ;
812
app.repos
813
.read ( & repo, move | r, _ | Ok ( r.view ( ) ? .bookmarks.contains_key ( & b) ) )
814
.await
815
.unwrap_or ( false )
816
.then ( | | p.source_bookmark.clone ( ) )
817
} else {
818
None
819
} ;
de505df5 Andy McCall 1 month ago ↶
820
let can_land = role > = Role:: Write & & p.is_open ( ) & & v.blockers.is_empty ( ) ;
2a8b6216 Andy McCall 19 days ago ↶
821
822
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 ↶
823
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 ↶
824
let requested = pdb:: review_requests( & app.db, p.id) .await.unwrap_or_default ( ) ;
825
let mut reviewable: Vec< String> = if can_request {
826
accounts:: assignable( & app.db, row.id, & row.owner) .await.unwrap_or_default ( ) .into_iter ( ) .filter ( | u | * u ! = p.author) .collect ( )
827
} else {
828
Vec :: new( )
829
} ;
830
for r in & requested {
831
if ! reviewable.iter ( ) .any ( | x | x.eq_ignore_ascii_case ( r) ) {
832
reviewable.push ( r.clone ( ) ) ;
833
}
834
}
7d2eb590 Andy McCall 1 month ago ↶
835
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 ↶
836
let delegated = match viewer.account ( ) {
837
Some ( a) => super :: edit:: delegated_identity( app, a.id) .await.is_some ( ) ,
838
None => false ,
839
} ;
840
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 ↶
841
let source_label = match p.source_kind.as_str ( ) {
842
" fork" => format! (
843
" fork {} " ,
844
db:: repos:: get_by_id( & app.db, p.source_repo_id.unwrap_or ( 0 ) )
845
.await
846
.ok ( )
847
.flatten ( )
848
.map ( | r | format! ( " {} :{} " , r.slug ( ) , p.source_bookmark) )
849
.unwrap_or_default ( )
850
) ,
851
" changes" => format! ( " {} changes" , p.source_changes ( ) .len ( ) ) ,
852
_ => p.source_bookmark.clone ( ) ,
853
} ;
e1ec9fbf Andy McCall 1 month ago ↶
854
let projects = super :: projects:: placements_for( app, viewer, & row, p.number) .await;
38833ed7 Andy McCall 1 month ago ↶
855
let texts: Vec< String> = std:: iter:: once( p.body.clone ( ) ) .chain ( changes.iter ( ) .map ( | c | format! ( " {} \n {} " , c.title, c.body) ) ) .collect ( ) ;
856
let closes = super :: chain:: issues_closed_by( app, & row, & texts.iter ( ) .map ( String :: as_str) .collect:: < Vec< _ > > ( ) ) .await;
a1b98695 Andy McCall 1 month ago ↶
857
let project_choices = super :: projects:: project_choices( app, viewer, & row, & projects) .await;
858
let mut dated: Vec< ( i64 , Entry) > = Vec :: new( ) ;
859
for ( index, c) in comments.iter ( ) .enumerate ( ) {
860
if c.row.anchor_change.is_empty ( ) {
861
dated.push ( ( c.row.created_ms, Entry { kind: " comment" , index } ) ) ;
862
}
863
}
864
for ( index, r) in v.reviews.iter ( ) .enumerate ( ) {
865
dated.push ( ( r.row.created_ms, Entry { kind: " review" , index } ) ) ;
866
}
867
for ( index, e) in events.iter ( ) .enumerate ( ) {
868
dated.push ( ( e.at_ms, Entry { kind: " event" , index } ) ) ;
869
}
870
dated.sort_by_key ( | ( at , _) | * at) ;
871
let timeline: Vec< Entry> = dated.into_iter ( ) .map ( | ( _, e ) | e ) .collect ( ) ;
b5a0a69b Andy McCall 21 days ago ↶
872
let pending = app.assistant_gate.lock ( ) .unwrap_or_else ( | e | e.into_inner ( ) ) .answering ( p_id) ;
de505df5 Andy McCall 1 month ago ↶
873
Ok ( Page( ProposalPage {
b5a0a69b Andy McCall 21 days ago ↶
874
live_topic: crate :: events:: topic:: proposal( row.id, number) ,
875
repo_topic: crate :: events:: topic:: repo( row.id) ,
876
pending,
a1b98695 Andy McCall 1 month ago ↶
877
can_triage: role > = Role:: Triage,
878
timeline,
38833ed7 Andy McCall 1 month ago ↶
879
closes,
a1b98695 Andy McCall 1 month ago ↶
880
project_choices,
e1ec9fbf Andy McCall 1 month ago ↶
881
projects,
de505df5 Andy McCall 1 month ago ↶
882
shell,
ffb67a81 Andy McCall 23 days ago
883
repo: RepoShell:: new( app, & row, " proposals" ) .with_role ( role) .with_sky ( app, & row) .await,
c79a1111 Andy McCall 1 month ago ↶
884
body_html: super :: issues:: markdown( app, & row, & row.default_bookmark, & p.body) .await,
de505df5 Andy McCall 1 month ago ↶
885
p,
886
tab,
887
changes,
888
files: loaded.files,
9df855f2 Andy McCall 1 month ago ↶
889
diffs: loaded.diffs,
890
bases: loaded.bases,
891
ignore_ws: false ,
de505df5 Andy McCall 1 month ago ↶
892
conflicts: loaded.conflicts,
893
conflicted: loaded.conflicted,
894
comments,
895
placed,
896
outdated,
897
reviews: v.reviews,
898
approvals: v.approvals,
899
blockers: v.blockers,
900
depends_on: v.depends_on,
901
events,
902
owners: loaded.owners,
903
requirements: v.requirements,
904
landed_already: loaded.landed_already,
905
can_edit,
4f37afcc Andy McCall 1 month ago ↶
906
deletable_source,
de505df5 Andy McCall 1 month ago ↶
907
can_land,
2a8b6216 Andy McCall 19 days ago ↶
908
can_land_over_checks,
de505df5 Andy McCall 1 month ago ↶
909
hub_can_land,
910
notice,
911
error,
912
heads: loaded.heads.iter ( ) .map ( | h | h.to_hex ( ) ) .collect ( ) ,
b64e2537 Andy McCall 1 month ago ↶
913
state_hash: loaded.state.clone ( ) ,
de505df5 Andy McCall 1 month ago ↶
914
source_label,
915
api_url: format! ( " {} /api/v1/repos/{owner} /{name} /proposals/{number} " , app.config.base_url ( ) ) ,
18e381ea Andy McCall 1 month ago ↶
916
labels: db:: issues:: proposal_labels( & app.db, loaded.row.id) .await.unwrap_or_default ( ) ,
917
all_labels: db:: issues:: labels( & app.db, row.id) .await.unwrap_or_default ( ) ,
b64e2537 Andy McCall 1 month ago ↶
918
checks: db:: hooks:: checks_for_state( & app.db, row.id, & loaded.state) .await.unwrap_or_default ( ) ,
919
required_checks: db:: hooks:: required_checks( & app.db, row.id) .await.unwrap_or_default ( ) ,
8e96499f Andy McCall 1 month ago ↶
920
requested,
921
reviewable,
7d2eb590 Andy McCall 1 month ago ↶
922
assistants,
923
draft: None ,
cc1cd197 Andy McCall 1 month ago ↶
924
can_request,
de505df5 Andy McCall 1 month ago ↶
925
} ) )
926
}
927
a1b98695 Andy McCall 1 month ago ↶
928
929
930
fn back ( owner : & str , name : & str , number : i64 , tab : & str , notice : Option< String> , error : Option< String> ) -> Response {
931
let mut url = format! ( " /{owner} /{name} /proposal/{number} ?tab={tab} " ) ;
932
if let Some ( n) = notice {
933
url.push_str ( & format! ( " ¬ice={} " , super :: settings:: urlencode( & n) ) ) ;
934
}
935
if let Some ( e) = error {
936
url.push_str ( & format! ( " &error={} " , super :: settings:: urlencode( & e) ) ) ;
937
}
938
Redirect:: to( & url) .into_response ( )
939
}
940
de505df5 Andy McCall 1 month ago ↶
941
pub async fn show (
942
State( app ) : State< Shared> ,
943
viewer : Viewer,
944
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
945
Query( q) : Query< DetailQuery> ,
b5a0a69b Andy McCall 21 days ago ↶
946
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
947
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
a1b98695 Andy McCall 1 month ago ↶
948
let mut page =
949
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 ↶
950
if q.w.as_deref ( ) = = Some ( " 1" ) {
951
952
page.0. files =
953
super :: history:: render_files_with( & page.0. diffs, & page.0. bases, crate :: render:: diff:: Options { ignore_whitespace: true } ) ;
954
page.0. ignore_ws = true ;
b5a0a69b Andy McCall 21 days ago ↶
955
}
956
957
958
if let Some ( name) = q.fragment.as_deref ( ) {
959
let html = page.0. render ( ) .map_err ( | e | Error:: bad( page.0. shell.clone ( ) , e.to_string ( ) ) ) ? ;
960
return Ok ( match super :: fragment( & html, name) {
961
Some ( part) => ( [ ( axum:: http:: header:: CACHE_CONTROL , " no-store" ) ] , axum:: response:: Html( part) ) .into_response ( ) ,
962
None => ( axum:: http:: StatusCode:: NOT_FOUND , " no such fragment" ) .into_response ( ) ,
963
} ) ;
9df855f2 Andy McCall 1 month ago ↶
964
}
b5a0a69b Andy McCall 21 days ago ↶
965
Ok ( page.into_response ( ) )
de505df5 Andy McCall 1 month ago ↶
966
}
967
968
969
970
# [ derive ( Deserialize ) ]
971
pub struct CommentForm {
972
#[serde(rename = "_csrf")]
973
csrf_token : String,
974
body : String,
975
#[serde(default)]
976
path : String,
977
#[serde(default)]
978
line : Option< usize > ,
979
}
980
981
pub async fn comment (
982
State( app ) : State< Shared> ,
983
viewer : Viewer,
984
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
985
Form( f) : Form< CommentForm> ,
a1b98695 Andy McCall 1 month ago ↶
986
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
987
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
988
let me = require ( & viewer, & shell) ? ;
989
csrf ( & viewer, & f.csrf_token, & shell) ? ;
990
let ( repo, row, _ ) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
d0fbea2e Andy McCall 1 month ago ↶
991
super :: writable( & row, & shell) ? ;
de505df5 Andy McCall 1 month ago ↶
992
let p = pdb:: get( & app.db, row.id, number)
993
.await
994
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
995
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
996
if f.body.trim ( ) .is_empty ( ) {
a1b98695 Andy McCall 1 month ago ↶
997
return Ok ( back ( & owner, & name, number, " conversation" , None , Some ( " An empty comment says nothing." .into ( ) ) ) ) ;
de505df5 Andy McCall 1 month ago ↶
998
}
999
let anchor = match ( f.path.trim ( ) , f.line) {
1000
( " " , _ ) | ( _ , None ) => None ,
1001
( path, Some ( line) ) => {
1002
let loaded = load ( & app, & repo, p.clone ( ) ) .await.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
1003
loaded.atoms.get ( & ( path.to_string ( ) , line) ) .cloned ( )
1004
}
1005
} ;
1006
let tab = if anchor.is_some ( ) { " files" } else { " conversation" } ;
1007
pdb:: add_comment(
1008
& app.db,
1009
p.id,
1010
Some ( me.account.id) ,
1011
& me.account.username,
1012
f.body.trim ( ) ,
1013
f.path.trim ( ) ,
1014
anchor.as_ref ( ) .map ( | ( h , i ) | ( h.as_str ( ) , * i as i64 ) ) ,
1015
)
1016
.await
1017
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
b5a0a69b Andy McCall 21 days ago ↶
1018
app.events.live.publish ( & crate :: events:: topic:: proposal( row.id, number) , " comment" ) ;
a1b98695 Andy McCall 1 month ago ↶
1019
Ok ( back ( & owner, & name, number, tab, None , None ) )
de505df5 Andy McCall 1 month ago ↶
1020
}
1021
1022
# [ derive ( Deserialize ) ]
1023
pub struct ReviewForm {
1024
#[serde(rename = "_csrf")]
1025
csrf_token : String,
1026
verdict : String,
1027
#[serde(default)]
1028
body : String,
1029
}
1030
1031
pub async fn review (
1032
State( app ) : State< Shared> ,
1033
viewer : Viewer,
1034
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1035
Form( f) : Form< ReviewForm> ,
a1b98695 Andy McCall 1 month ago ↶
1036
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
1037
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1038
let me = require ( & viewer, & shell) ? ;
1039
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1040
let ( _ , row, _ ) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
d0fbea2e Andy McCall 1 month ago ↶
1041
super :: writable( & row, & shell) ? ;
de505df5 Andy McCall 1 month ago ↶
1042
let p = pdb:: get( & app.db, row.id, number)
1043
.await
1044
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1045
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
1046
if ! matches! ( f.verdict.as_str ( ) , " comment" | " changes" | " approve" ) {
1047
return Err ( Error:: bad( shell, " a review is comment, changes or approve" ) ) ;
1048
}
1049
if f.verdict = = " approve" & & Some ( me.account.id) = = p.author_id {
a1b98695 Andy McCall 1 month ago ↶
1050
return Ok ( back ( & owner, & name, number, " conversation" , None , Some ( " You cannot approve your own proposal." .into ( ) ) ) ) ;
de505df5 Andy McCall 1 month ago ↶
1051
}
1052
pdb:: add_review( & app.db, p.id, me.account.id, & me.account.username, & f.verdict, f.body.trim ( ) )
1053
.await
1054
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
1055
pdb:: add_event( & app.db, p.id, & me.account.username, & format! ( " review.{} " , f.verdict) , " " ) .await.ok ( ) ;
cc1cd197 Andy McCall 1 month ago ↶
1056
reviewed ( & app, & row, & p, & me.account, & f.verdict) .await;
b64e2537 Andy McCall 1 month ago ↶
1057
crate :: hooks:: emit( & app, & row, " review" , & me.account.username, serde_json:: json! ( { " number" : number, " verdict" : f.verdict } ) ) .await;
de505df5 Andy McCall 1 month ago ↶
1058
let notice = if f.verdict = = " approve" {
1059
Some ( format! (
1060
" Approval recorded. It counts once you seal the changes: oxy seal --proposal {} /{owner} /{name} /proposal/{number} " ,
1061
app.config.base_url ( )
1062
) )
1063
} else {
1064
None
1065
} ;
a1b98695 Andy McCall 1 month ago ↶
1066
Ok ( back ( & owner, & name, number, " conversation" , notice, None ) )
de505df5 Andy McCall 1 month ago ↶
1067
}
1068
1069
# [ derive ( Deserialize ) ]
1070
pub struct EditForm {
1071
#[serde(rename = "_csrf")]
1072
csrf_token : String,
1073
title : String,
1074
#[serde(default)]
1075
body : String,
1076
target : String,
1077
}
1078
1079
pub async fn edit (
1080
State( app ) : State< Shared> ,
1081
viewer : Viewer,
1082
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1083
Form( f) : Form< EditForm> ,
a1b98695 Andy McCall 1 month ago ↶
1084
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
1085
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1086
let me = require ( & viewer, & shell) ? ;
1087
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1088
let ( _ , row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
1089
let p = pdb:: get( & app.db, row.id, number)
1090
.await
1091
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1092
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
1093
if Some ( me.account.id) ! = p.author_id & & role < Role:: Maintain {
1094
return Err ( Error:: not_found( shell) ) ;
1095
}
1096
let target = if crate :: repos:: names:: valid_segment( f.target.trim ( ) ) { f.target.trim ( ) } else { & p.target } ;
1097
pdb:: edit( & app.db, p.id, f.title.trim ( ) , f.body.trim ( ) , target) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
1098
pdb:: add_event( & app.db, p.id, & me.account.username, " edited" , " " ) .await.ok ( ) ;
a1b98695 Andy McCall 1 month ago ↶
1099
Ok ( back ( & owner, & name, number, " conversation" , Some ( " Saved." .into ( ) ) , None ) )
de505df5 Andy McCall 1 month ago ↶
1100
}
1101
1102
# [ derive ( Deserialize ) ]
1103
pub struct StateForm {
1104
#[serde(rename = "_csrf")]
1105
csrf_token : String,
1106
action : String,
1107
}
1108
1109
pub async fn state (
1110
State( app ) : State< Shared> ,
1111
viewer : Viewer,
1112
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1113
Form( f) : Form< StateForm> ,
a1b98695 Andy McCall 1 month ago ↶
1114
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
1115
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1116
let me = require ( & viewer, & shell) ? ;
1117
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1118
let ( _ , row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
1119
let p = pdb:: get( & app.db, row.id, number)
1120
.await
1121
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1122
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
1123
if Some ( me.account.id) ! = p.author_id & & role < Role:: Triage {
1124
return Err ( Error:: not_found( shell) ) ;
1125
}
1126
let new_state = match ( f.action.as_str ( ) , p.state.as_str ( ) ) {
1127
( " close" , " open" | " draft" ) => " closed" ,
1128
( " reopen" , " closed" ) => " open" ,
1129
( " ready" , " draft" ) => " open" ,
1130
( " draft" , " open" ) => " draft" ,
1131
_ => return Err ( Error:: bad( shell, " that transition is not possible" ) ) ,
1132
} ;
1133
pdb:: set_state( & app.db, p.id, new_state, " " ) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
1134
pdb:: add_event( & app.db, p.id, & me.account.username, new_state, " " ) .await.ok ( ) ;
b64e2537 Andy McCall 1 month ago ↶
1135
crate :: hooks:: emit( & app, & row, & format! ( " proposal.{new_state} " ) , & me.account.username, serde_json:: json! ( { " number" : number } ) ) .await;
a1b98695 Andy McCall 1 month ago ↶
1136
Ok ( back ( & owner, & name, number, " conversation" , None , None ) )
de505df5 Andy McCall 1 month ago ↶
1137
}
1138
1139
pub async fn resolve_comment (
1140
State( app ) : State< Shared> ,
1141
viewer : Viewer,
1142
Path( (owner , name , number , id ) ) : Path< ( String, String, i64 , i64 ) > ,
1143
Form( f) : Form< super:: session:: CsrfForm> ,
a1b98695 Andy McCall 1 month ago ↶
1144
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
1145
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1146
require ( & viewer, & shell) ? ;
1147
csrf ( & viewer, & f.csrf, & shell) ? ;
1148
let ( _ , row, _ ) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
1149
let p = pdb:: get( & app.db, row.id, number)
1150
.await
1151
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1152
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
5d90e0e0 Andy McCall 21 days ago
1153
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 ↶
1154
.bind ( id)
1155
.bind ( p.id)
1156
.fetch_optional ( & app.db)
1157
.await
1158
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
1159
if let Some ( r) = current {
1160
pdb:: set_comment_resolved( & app.db, id, ! r) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
1161
}
a1b98695 Andy McCall 1 month ago ↶
1162
Ok ( back ( & owner, & name, number, " files" , None , None ) )
de505df5 Andy McCall 1 month ago ↶
1163
}
1164
1165
1166
2a8b6216 Andy McCall 19 days ago ↶
1167
# [ derive ( serde::Deserialize ) ]
1168
pub struct LandForm {
1169
#[serde(rename = "_csrf")]
1170
csrf : String,
1171
1172
#[serde(default)]
1173
over_checks : Option< String> ,
1174
}
1175
de505df5 Andy McCall 1 month ago ↶
1176
pub async fn land (
1177
State( app ) : State< Shared> ,
1178
viewer : Viewer,
1179
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
2a8b6216 Andy McCall 19 days ago ↶
1180
Form( f) : Form< LandForm> ,
a1b98695 Andy McCall 1 month ago ↶
1181
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
1182
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1183
let me = require ( & viewer, & shell) ? ;
1184
csrf ( & viewer, & f.csrf, & shell) ? ;
2a8b6216 Andy McCall 19 days ago ↶
1185
let need = if f.over_checks.is_some ( ) { Access:: Maintain } else { Access:: Write } ;
1186
let ( repo, row, _ ) = lookup_role ( & app, & shell, & viewer, & owner, & name, need) .await? ;
1187
match land_as ( & app, & repo, & row, & me.account, number, " web" , false , f.over_checks.as_deref ( ) ) .await {
a1b98695 Andy McCall 1 month ago ↶
1188
Ok ( _ ) => Ok ( back ( & owner, & name, number, " conversation" , Some ( " Landed." .into ( ) ) , None ) ) ,
1f1eb06a Andy McCall 1 month ago ↶
1189
Err ( Landing:: NotFound) => Err ( Error:: not_found( shell) ) ,
a1b98695 Andy McCall 1 month ago ↶
1190
Err ( Landing:: Refused( m) ) => Ok ( back ( & owner, & name, number, " conversation" , None , Some ( m) ) ) ,
1f1eb06a Andy McCall 1 month ago ↶
1191
}
1192
}
1193
1194
1195
pub enum Landing {
1196
NotFound,
1197
Refused( String ) ,
1198
}
1199
1200
1201
1202
0b20f1ec Andy McCall 1 month ago ↶
1203
f4d6ef41 Andy McCall 24 days ago ↶
1204
2a8b6216 Andy McCall 19 days ago ↶
1205
1206
1207
1208
1209
# [ allow ( clippy::too_many_arguments ) ]
1f1eb06a Andy McCall 1 month ago ↶
1210
pub async fn land_as (
1211
app : & Shared,
1212
repo : & RepoName,
1213
row : & db:: repos:: RepoRow,
1214
me : & accounts:: Account,
1215
number : i64 ,
0b20f1ec Andy McCall 1 month ago ↶
1216
via : & str ,
f4d6ef41 Andy McCall 24 days ago ↶
1217
as_hub : bool ,
2a8b6216 Andy McCall 19 days ago ↶
1218
over_checks : Option< & str > ,
1f1eb06a Andy McCall 1 month ago ↶
1219
) -> Result< String, Landing> {
1220
let ( owner, name) = ( row.owner.clone ( ) , row.name.clone ( ) ) ;
1221
let refused = | e : String| Landing:: Refused( e) ;
1222
let p = pdb:: get( & app.db, row.id, number) .await.map_err ( | e | refused ( e.to_string ( ) ) ) ? .ok_or ( Landing:: NotFound) ? ;
1223
let loaded = load ( app, repo, p.clone ( ) ) .await.map_err ( | e | refused ( e.to_string ( ) ) ) ? ;
1224
let v = verdict ( app, & loaded, row.id) .await.map_err ( | e | refused ( e.to_string ( ) ) ) ? ;
1225
if ! p.is_open ( ) {
1226
return Err ( refused ( format! ( " Cannot land: the proposal is {} " , p.state) ) ) ;
2a8b6216 Andy McCall 19 days ago ↶
1227
}
1228
let reason = over_checks.map ( str :: trim) ;
1229
if reason = = Some ( " " ) {
1230
return Err ( refused ( " Landing over checks needs a reason: say why it can't wait for them" .into ( ) ) ) ;
1f1eb06a Andy McCall 1 month ago ↶
1231
}
2a8b6216 Andy McCall 19 days ago ↶
1232
let blocking: Vec< & String> = v.blockers.iter ( ) .filter ( | b | ! ( reason.is_some ( ) & & v.checks_blocker.as_ref ( ) = = Some ( * b) ) ) .collect ( ) ;
1233
if ! blocking.is_empty ( ) {
1234
let list: Vec< & str > = blocking.iter ( ) .map ( | b | b.as_str ( ) ) .collect ( ) ;
1235
return Err ( refused ( format! ( " Cannot land: {} " , list.join ( " ; " ) ) ) ) ;
de505df5 Andy McCall 1 month ago ↶
1236
}
2a8b6216 Andy McCall 19 days ago ↶
1237
1238
let over = reason.filter ( | _| v.checks_blocker.is_some ( ) ) ;
1239
let via_owned = match over {
1240
Some ( r) => format! ( " {via} , over checks: {r} " ) ,
1241
None => via.to_string ( ) ,
1242
} ;
1243
let via = via_owned.as_str ( ) ;
de505df5 Andy McCall 1 month ago ↶
1244
let target = p.target.clone ( ) ;
1245
let heads = loaded.heads.clone ( ) ;
14530604 Andy McCall 1 month ago ↶
1246
1247
1248
1249
f4d6ef41 Andy McCall 24 days ago ↶
1250
let signer = if as_hub { super :: edit:: hub_signer( app) } else { super :: edit:: signer_for( app, me.id) .await } ;
1251
let result = match signer {
1f1eb06a Andy McCall 1 month ago ↶
1252
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 ↶
1253
Err ( why) => {
1254
app.repos
1f1eb06a Andy McCall 1 month ago ↶
1255
.write ( repo, move | r, _ | {
14530604 Andy McCall 1 month ago ↶
1256
if r.current_policy ( ) ? .is_some ( ) {
1257
return Err ( crate :: repos:: RepoError:: Oxy( oxy_core:: repo:: RepoError:: Msg( format! (
1258
" 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} "
1259
) ) ) ) ;
1260
}
1261
r.bookmark_set ( & target, & heads) ? ;
1262
Ok ( pl:: state_ref( & heads) .to_hex ( ) )
1263
} )
1264
.await
1265
}
1266
} ;
1f1eb06a Andy McCall 1 month ago ↶
1267
let state = result.map_err ( | e | refused ( e.to_string ( ) ) ) ? ;
0b20f1ec Andy McCall 1 month ago ↶
1268
pdb:: set_landed( & app.db, p.id, & state, & me.username, via) .await.map_err ( | e | refused ( e.to_string ( ) ) ) ? ;
1269
let how = if v.approvals.is_empty ( ) { format! ( " {via} , with no approval" ) } else { via.to_string ( ) } ;
1270
pdb:: add_event( & app.db, p.id, & me.username, " landed" , & how) .await.ok ( ) ;
1f1eb06a Andy McCall 1 month ago ↶
1271
crate :: hooks:: emit(
1272
app,
1273
row,
1274
" proposal.landed" ,
1275
& me.username,
1276
serde_json:: json! ( { " number" : number, " target" : p.target, " state" : state } ) ,
1277
)
1278
.await;
1279
crate :: notify:: deliver(
1280
app,
1281
crate :: notify:: Event {
1282
kind: " proposal.landed" ,
1283
title: format! ( " {owner} /{name} #{number} : {} landed" , p.title) ,
1284
url: format! ( " /{owner} /{name} /proposal/{number} " ) ,
1285
actor: me,
1286
repo_id: row.id,
1287
thread: Some ( ( " proposal" , p.id) ) ,
1288
mention_text: " " ,
1289
direct: p.author_id.into_iter ( ) .collect ( ) ,
1290
} ,
1291
)
1292
.await;
1293
if p.target = = row.default_bookmark {
1294
let messages: Vec< ( String, String) > = loaded.changes.iter ( ) .map ( | c | ( c.hash.clone ( ) , format! ( " {} \n {} " , c.title, c.body) ) ) .collect ( ) ;
1295
super :: issues:: close_from_messages( app, row, & messages) .await;
de505df5 Andy McCall 1 month ago ↶
1296
}
0b20f1ec Andy McCall 1 month ago ↶
1297
accounts:: audit( & app.db, Some ( me) , " proposal.landed" , & format! ( " {owner} /{name} #{number} " ) , & how) .await.ok ( ) ;
2a8b6216 Andy McCall 19 days ago ↶
1298
if let ( Some ( r) , Some ( checks) ) = ( over, & v.checks_blocker) {
1299
accounts:: audit( & app.db, Some ( me) , " proposal.land_over_checks" , & format! ( " {owner} /{name} #{number} " ) , & format! ( " {r} ({checks} )" ) )
1300
.await
1301
.ok ( ) ;
1302
}
1f1eb06a Andy McCall 1 month ago ↶
1303
db:: repos:: record_push(
1304
& app.db,
1305
row.id,
1306
Some ( ( me.id, me.username.as_str ( ) ) ) ,
1307
& [ db:: repos:: PushOutcome {
1308
reference: p.target.clone ( ) ,
1309
ok: true ,
0b20f1ec Andy McCall 1 month ago ↶
1310
reason: format! ( " landed #{number} ({how} )" ) ,
1f1eb06a Andy McCall 1 month ago ↶
1311
old_state: loaded.target_state.clone ( ) ,
1312
new_state: state.clone ( ) ,
1313
heads: loaded.heads.len ( ) as i64 ,
1314
changes: loaded.hashes.len ( ) as i64 ,
1315
} ] ,
1316
)
1317
.await
1318
.ok ( ) ;
d943160d Andy McCall 24 days ago ↶
1319
1320
settle_after_push ( app, row, & p.target, & me.username) .await;
f7bcee49 Andy McCall 23 days ago ↶
1321
1322
1323
1324
crate :: flow:: on_push( app, row, & p.target, & state, & loaded.heads, & me.username) .await;
acc85ac0 Andy McCall 24 days ago ↶
1325
1326
1327
if p.target = = row.default_bookmark {
1328
let body = ( format! ( " proposal #{number} " ) , p.body.clone ( ) ) ;
1329
crate :: web:: issues:: close_from_arrived( app, row, loaded.target_heads.clone ( ) , loaded.heads.clone ( ) , Some ( body) ) .await;
1330
}
757195ad Andy McCall 24 days ago ↶
1331
1332
1333
1334
let heads = loaded.heads.clone ( ) ;
1335
let moved = vec! [ ( p.target.clone ( ) , state.clone ( ) , heads.clone ( ) ) ] ;
1336
crate :: diffusion:: after_push( app, row, & moved) .await;
1337
if p.target = = row.default_bookmark {
1338
let ( app, row) = ( app.clone ( ) , row.clone ( ) ) ;
1339
tokio:: spawn( async move { crate :: diffusion:: propagate( & app, & row, heads, false ) .await } ) ;
1340
}
1f1eb06a Andy McCall 1 month ago ↶
1341
Ok ( state)
de505df5 Andy McCall 1 month ago ↶
1342
}
1343
18e381ea Andy McCall 1 month ago ↶
1344
# [ derive ( Deserialize ) ]
1345
pub struct LabelsForm {
1346
#[serde(rename = "_csrf")]
1347
csrf_token : String,
1348
#[serde(default)]
1349
label : Vec< i64 > ,
1350
}
1351
1352
pub async fn set_labels (
1353
State( app ) : State< Shared> ,
1354
viewer : Viewer,
1355
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1356
axum_extra:: extract:: Form( f) : axum_extra:: extract:: Form< LabelsForm> ,
a1b98695 Andy McCall 1 month ago ↶
1357
) -> Result< Response, Error> {
18e381ea Andy McCall 1 month ago ↶
1358
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1359
require ( & viewer, & shell) ? ;
1360
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1361
let ( _ , row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
1362
if role < Role:: Triage {
1363
return Err ( Error:: not_found( shell) ) ;
1364
}
1365
let p = pdb:: get( & app.db, row.id, number)
1366
.await
1367
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1368
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
1369
for l in db:: issues:: labels( & app.db, row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? {
1370
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) ) ? ;
1371
}
a1b98695 Andy McCall 1 month ago ↶
1372
Ok ( back ( & owner, & name, number, " conversation" , None , None ) )
18e381ea Andy McCall 1 month ago ↶
1373
}
1374
b64e2537 Andy McCall 1 month ago ↶
1375
1376
1377
pub async fn events (
1378
State( app ) : State< Shared> ,
1379
viewer : Viewer,
1380
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1381
) -> Result< axum:: response:: Sse< impl futures:: Stream< Item = Result< axum:: response:: sse:: Event, std:: convert:: Infallible> > > , Error> {
1382
use futures:: StreamExt;
1383
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1384
let ( _ , row, _ ) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
1385
let rx = app.events.proposals.subscribe ( ) ;
1386
let repo_id = row.id;
1387
let stream = tokio_stream:: wrappers:: BroadcastStream:: new( rx) .filter_map ( move | item| async move {
1388
match item {
1389
Ok ( ( id, ev) ) if id = = repo_id => {
1390
Some ( Ok ( axum:: response:: sse:: Event:: default( ) .event ( ev.kind.clone ( ) ) .data ( serde_json:: to_string( & ev) .unwrap_or_default ( ) ) ) )
1391
}
1392
_ => None ,
1393
}
1394
} ) ;
c92a9949 Andy McCall 21 days ago ↶
1395
Ok ( axum:: response:: Sse:: new( futures:: StreamExt:: take_until( stream, crate :: shutdown:: stopping( ) ) )
1396
.keep_alive ( axum:: response:: sse:: KeepAlive:: default( ) ) )
b64e2537 Andy McCall 1 month ago ↶
1397
}
1398
de505df5 Andy McCall 1 month ago ↶
1399
1400
1401
pub async fn to_api ( app : & Shared, owner : & str , name : & str , loaded : & Loaded, v : & Verdict, source_url : Option< String> ) -> hub_api:: Proposal {
1402
let p = & loaded.row;
1403
hub_api:: Proposal {
1404
number: p.number,
1405
title: p.title.clone ( ) ,
1406
body: p.body.clone ( ) ,
1407
author: p.author.clone ( ) ,
1408
state: ProposalState:: parse( & p.state) .unwrap_or ( ProposalState:: Open) ,
1409
target: p.target.clone ( ) ,
1410
source: match p.source_kind.as_str ( ) {
1411
" fork" => {
1412
let ( o, n) = source_url
1413
.as_deref ( )
1414
.and_then ( | u | u.rsplit_once ( ' /' ) )
1415
.and_then ( | ( b , n ) | b.rsplit_once ( ' /' ) .map ( | ( _, o ) | ( o.to_string ( ) , n.to_string ( ) ) ) )
1416
.unwrap_or_default ( ) ;
1417
ProposalSource:: Fork { owner: o, name: n, bookmark: p.source_bookmark.clone ( ) }
1418
}
1419
" changes" => ProposalSource:: Changes { hashes: p.source_changes ( ) } ,
1420
_ => ProposalSource:: Bookmark { bookmark: p.source_bookmark.clone ( ) } ,
1421
} ,
1422
changes: loaded
1423
.changes
1424
.iter ( )
1425
.map ( | c | hub_api:: ChangeSummary {
1426
hash: c.hash.clone ( ) ,
1427
message: if c.body.is_empty ( ) { c.title.clone ( ) } else { format! ( " {} \n \n {} " , c.title, c.body) } ,
1428
author: hub_api:: Author {
1429
name: c.author.name.clone ( ) ,
1430
email: c.author.email.clone ( ) ,
1431
key: c.author.key.clone ( ) ,
1432
account: c.author.account.clone ( ) ,
760a7dd3 Andy McCall 1 month ago ↶
1433
note: hub_api:: Author:: note_for( & c.author.key, & c.author.account) ,
de505df5 Andy McCall 1 month ago ↶
1434
} ,
1435
when_ms: c.when_ms,
1436
deps: c.deps.clone ( ) ,
1437
head: c.head,
8933faff Andy McCall 1 month ago ↶
1438
via: c.via.as_ref ( ) .map ( | v | hub_api:: Via {
1439
name: v.name.clone ( ) ,
1440
key: v.key.clone ( ) ,
1441
scope: v.scope.clone ( ) ,
1442
expires_ms: v.expires_ms,
1443
revoked: v.revoked,
1444
} ) ,
de505df5 Andy McCall 1 month ago ↶
1445
signature: match & c.signature {
1446
view:: SigView:: Unsigned => hub_api:: Signature:: Unsigned,
1447
view:: SigView:: Valid { key, sealed, revoked, .. } => {
1448
hub_api:: Signature:: Valid { key: key.clone ( ) , sealed: * sealed, revoked: * revoked }
1449
}
1450
view:: SigView:: Invalid( why) => hub_api:: Signature:: Invalid { reason: why.clone ( ) } ,
1451
} ,
1452
} )
1453
.collect ( ) ,
1454
projected_heads: loaded.heads.iter ( ) .map ( | h | h.to_hex ( ) ) .collect ( ) ,
1455
projected_state: Some ( loaded.state.clone ( ) ) ,
1456
conflicted: loaded.conflicted,
1457
approvals: v.approvals.clone ( ) ,
1458
landable: p.is_open ( ) & & v.blockers.is_empty ( ) ,
1459
blockers: v.blockers.clone ( ) ,
1460
created_ms: p.created_ms,
1461
updated_ms: p.updated_ms,
1462
url: format! ( " {} /{owner} /{name} /proposal/{} " , app.config.base_url ( ) , p.number) ,
1463
repository_url: format! ( " {} /{owner} /{name} " , app.config.base_url ( ) ) ,
1464
source_url,
0b20f1ec Andy McCall 1 month ago ↶
1465
landed: ( p.state = = " landed" & & p.landed_ms > 0 ) .then ( | | hub_api:: Landed {
1466
by: p.landed_by.clone ( ) ,
1467
via: p.landed_via.clone ( ) ,
1468
when_ms: p.landed_ms,
1469
} ) ,
cc1cd197 Andy McCall 1 month ago ↶
1470
requested_reviewers: pdb:: review_requests( & app.db, p.id) .await.unwrap_or_default ( ) ,
2291f8cc Andy McCall 1 month ago ↶
1471
labels: db:: issues:: proposal_labels( & app.db, p.id)
1472
.await
1473
.unwrap_or_default ( )
1474
.into_iter ( )
1475
.map ( | l | hub_api:: Label { name: l.name, colour: l.colour, description: l.description } )
1476
.collect ( ) ,
de505df5 Andy McCall 1 month ago ↶
1477
}
1478
}
1479
1480
1481
pub fn key ( path : & str , line : impl filters:: Num) -> ( String, usize ) {
1482
( path.to_string ( ) , line.as_u64 ( ) as usize )
1483
}
1484
1485
# [ allow ( dead_code ) ]
1486
fn _unused ( _ : & diff:: Line, _ : & ConflictView, _ : & Role) { }
cc1cd197 Andy McCall 1 month ago ↶
1487
1488
1489
1490
1491
1492
1493
1494
pub async fn request_reviewers (
1495
app : & Shared,
1496
row : & db:: repos:: RepoRow,
1497
p : & pdb:: ProposalRow,
1498
by : & accounts:: Account,
1499
names : & [String],
1500
) -> Result< Vec< String> , String> {
1501
let mut found = Vec :: new( ) ;
1502
for name in names.iter ( ) .map ( | n | n.trim ( ) .trim_start_matches ( ' @' ) ) .filter ( | n | ! n.is_empty ( ) ) {
1503
let Some ( a) = accounts:: account_by_name( & app.db, name) .await.ok ( ) .flatten ( ) else {
1504
return Err ( format! ( " There is no account {name} ." ) ) ;
1505
} ;
1506
if Some ( a.id) = = p.author_id {
1507
return Err ( format! ( " {name} wrote this proposal, and cannot review it." ) ) ;
1508
}
1509
let role = crate :: auth:: roles:: role_for( & app.db, Some ( & a) , row) .await.ok ( ) .flatten ( ) ;
1510
if ! crate :: auth:: roles:: allows( role, crate :: auth:: Access:: Read) {
1511
return Err ( format! ( " {name} cannot read this repository." ) ) ;
1512
}
1513
found.push ( a) ;
1514
}
1515
let mut asked = Vec :: new( ) ;
1516
for a in found {
1517
if ! pdb:: request_review( & app.db, p.id, a.id, & by.username) .await.map_err ( | e | e.to_string ( ) ) ? {
1518
continue ;
1519
}
1520
pdb:: add_event( & app.db, p.id, & by.username, " review requested" , & a.username) .await.ok ( ) ;
1521
crate :: notify:: deliver(
1522
app,
1523
crate :: notify:: Event {
1524
kind: " proposal.review_requested" ,
1525
title: format! ( " {} /{} #{} : {} (review requested from {} )" , row.owner, row.name, p.number, p.title, a.username) ,
1526
url: format! ( " /{} /{} /proposal/{} " , row.owner, row.name, p.number) ,
1527
actor: by,
1528
repo_id: row.id,
1529
thread: None ,
1530
mention_text: " " ,
1531
direct: vec! [ a.id] ,
1532
} ,
1533
)
1534
.await;
1535
asked.push ( a.username) ;
1536
}
1537
Ok ( asked)
1538
}
1539
1540
1541
1542
pub async fn reviewed ( app : & Shared, row : & db:: repos:: RepoRow, p : & pdb:: ProposalRow, by : & accounts:: Account, verdict : & str ) {
1543
pdb:: unrequest_review( & app.db, p.id, by.id) .await.ok ( ) ;
1544
let what = match verdict {
1545
" approve" => " approved" ,
1546
" changes" => " changes requested" ,
1547
_ => " reviewed" ,
1548
} ;
1549
crate :: notify:: deliver(
1550
app,
1551
crate :: notify:: Event {
1552
kind: " proposal.review" ,
1553
title: format! ( " {} /{} #{} : {} ({what} by {} )" , row.owner, row.name, p.number, p.title, by.username) ,
1554
url: format! ( " /{} /{} /proposal/{} " , row.owner, row.name, p.number) ,
1555
actor: by,
1556
repo_id: row.id,
1557
thread: Some ( ( " proposal" , p.id) ) ,
1558
mention_text: " " ,
1559
direct: p.author_id.into_iter ( ) .collect ( ) ,
1560
} ,
1561
)
1562
.await;
1563
}
1564
1565
# [ derive ( Deserialize ) ]
1566
pub struct ReviewersForm {
1567
#[serde(rename = "_csrf")]
1568
csrf_token : String,
8e96499f Andy McCall 1 month ago ↶
1569
cc1cd197 Andy McCall 1 month ago ↶
1570
action : String,
8e96499f Andy McCall 1 month ago ↶
1571
#[serde(default)]
1572
username : Vec< String> ,
cc1cd197 Andy McCall 1 month ago ↶
1573
}
1574
1575
1576
1577
pub async fn reviewers (
1578
State( app ) : State< Shared> ,
1579
viewer : Viewer,
1580
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
8e96499f Andy McCall 1 month ago ↶
1581
axum_extra:: extract:: Form( f) : axum_extra:: extract:: Form< ReviewersForm> ,
cc1cd197 Andy McCall 1 month ago ↶
1582
) -> Result< Response, Error> {
1583
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1584
let me = require ( & viewer, & shell) ? ;
1585
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1586
let ( _ , row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
1587
let p = pdb:: get( & app.db, row.id, number)
1588
.await
1589
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1590
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
1591
if Some ( me.account.id) ! = p.author_id & & role < Role:: Write {
1592
return Err ( Error:: not_found( shell) ) ;
1593
}
8e96499f Andy McCall 1 month ago ↶
1594
let names: Vec< String> = f.username.iter ( ) .map ( | n | n.trim ( ) .trim_start_matches ( ' @' ) .to_string ( ) ) .filter ( | n | ! n.is_empty ( ) ) .collect ( ) ;
1595
let current = pdb:: review_requests( & app.db, p.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
1596
1597
let withdraw: Vec< String> = match f.action.as_str ( ) {
1598
" remove" => names.clone ( ) ,
1599
" set" => current.iter ( ) .filter ( | c | ! names.iter ( ) .any ( | n | n.eq_ignore_ascii_case ( c) ) ) .cloned ( ) .collect ( ) ,
1600
_ => Vec :: new( ) ,
1601
} ;
1602
for who in & withdraw {
1603
if let Some ( a) = accounts:: account_by_name( & app.db, who) .await.ok ( ) .flatten ( ) {
cc1cd197 Andy McCall 1 month ago ↶
1604
if pdb:: unrequest_review( & app.db, p.id, a.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? {
1605
pdb:: add_event( & app.db, p.id, & me.account.username, " review request withdrawn" , & a.username) .await.ok ( ) ;
1606
}
1607
}
8e96499f Andy McCall 1 month ago ↶
1608
}
1609
let ask: Vec< String> = match f.action.as_str ( ) {
1610
" add" => names,
1611
" set" => names.into_iter ( ) .filter ( | n | ! current.iter ( ) .any ( | c | c.eq_ignore_ascii_case ( n) ) ) .collect ( ) ,
1612
_ => return Ok ( back ( & owner, & name, number, " conversation" , None , None ) ) ,
1613
} ;
1614
if ask.is_empty ( ) {
cc1cd197 Andy McCall 1 month ago ↶
1615
return Ok ( back ( & owner, & name, number, " conversation" , None , None ) ) ;
1616
}
8e96499f Andy McCall 1 month ago ↶
1617
match request_reviewers ( & app, & row, & p, & me.account, & ask) .await {
cc1cd197 Andy McCall 1 month ago ↶
1618
Ok ( asked) if asked.is_empty ( ) => Ok ( back ( & owner, & name, number, " conversation" , Some ( " Already asked." .into ( ) ) , None ) ) ,
1619
Ok ( asked) => Ok ( back ( & owner, & name, number, " conversation" , Some ( format! ( " Asked {} to review." , asked.join ( " , " ) ) ) , None ) ) ,
1620
Err ( e) => Ok ( back ( & owner, & name, number, " conversation" , None , Some ( e) ) ) ,
7d2eb590 Andy McCall 1 month ago ↶
1621
}
1622
}
1623
1624
# [ derive ( Deserialize ) ]
1625
pub struct AssistantForm {
1626
#[serde(rename = "_csrf")]
1627
csrf_token : String,
1628
assistant : String,
ffb67a81 Andy McCall 23 days ago
1629
1630
#[serde(default)]
1631
task : String,
7d2eb590 Andy McCall 1 month ago ↶
1632
}
1633
1634
1635
1636
1637
pub async fn assistant (
1638
State( app ) : State< Shared> ,
1639
viewer : Viewer,
1640
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1641
Form( f) : Form< AssistantForm> ,
1642
) -> Result< Response, Error> {
1643
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1644
let me = require ( & viewer, & shell) ? ;
1645
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1646
let ( _ , row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
d0fbea2e Andy McCall 1 month ago ↶
1647
super :: writable( & row, & shell) ? ;
7d2eb590 Andy McCall 1 month ago ↶
1648
let p = pdb:: get( & app.db, row.id, number)
1649
.await
1650
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1651
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
1652
if Some ( me.account.id) ! = p.author_id & & role < Role:: Write {
1653
return Err ( Error:: not_found( shell) ) ;
1654
}
1655
if ! p.is_open ( ) {
1656
return Ok ( back ( & owner, & name, number, " conversation" , None , Some ( " The proposal is not open." .into ( ) ) ) ) ;
1657
}
1658
let Some ( a) = crate :: assistants:: enabled_for_repo( & app.db, & row)
1659
.await
1660
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1661
.into_iter ( )
1662
.find ( | a | a.name.eq_ignore_ascii_case ( f.assistant.trim ( ) ) )
1663
else {
1664
return Ok ( back ( & owner, & name, number, " conversation" , None , Some ( format! ( " No assistant called {} here." , f.assistant.trim ( ) ) ) ) ) ;
1665
} ;
1666
let who = a.name.clone ( ) ;
ffb67a81 Andy McCall 23 days ago
1667
let summary = f.task = = " summary" ;
1668
let asked = if summary {
1669
crate :: assistants:: request_summary( & app, & row, & p, & me.account, a) .await
1670
} else {
1671
crate :: assistants:: request_review( & app, & row, & p, & me.account, a) .await
1672
} ;
1673
match asked {
7d2eb590 Andy McCall 1 month ago ↶
1674
Ok ( ( ) ) => Ok ( back (
1675
& owner,
1676
& name,
1677
number,
1678
" conversation" ,
ffb67a81 Andy McCall 23 days ago
1679
Some ( if summary {
1680
format! ( " Asked {who} for a summary; its comment appears here when it comes." )
1681
} else {
1682
format! ( " Asked {who} to review; its answer appears here when it comes." )
1683
} ) ,
7d2eb590 Andy McCall 1 month ago ↶
1684
None ,
1685
) ) ,
1686
Err ( e) => Ok ( back ( & owner, & name, number, " conversation" , None , Some ( format! ( " Not asked: {e} ." ) ) ) ) ,
1687
}
1688
}
1689
1690
1691
async fn assistant_names ( app : & Shared, row : & db:: repos:: RepoRow) -> Vec< String> {
1692
crate :: assistants:: enabled_for_repo( & app.db, row) .await.unwrap_or_default ( ) .into_iter ( ) .map ( | a | a.name ) .collect ( )
1693
}
1694
1695
1696
1697
async fn preview_diff (
1698
app : & Shared,
1699
repo : & RepoName,
1700
target : & str ,
1701
source : & str ,
1702
) -> Result< ( Vec< ChangeView> , Vec< oxy_core:: repo:: FileDiff> ) , crate:: repos:: RepoError> {
1703
let Some ( ( fork, bookmark) ) = parse_source ( app, repo, source) else { return Ok ( ( vec! [ ] , vec! [ ] ) ) } ;
1704
let target = target.to_string ( ) ;
1705
let fork_dir = fork.as_ref ( ) .map ( | f | app.repos.dir ( f) ) ;
1706
app.repos
1707
.read ( repo, move | r, cache| {
1708
let projection = match & fork_dir {
1709
Some ( dir) => {
1710
let fork_repo = oxy_core:: repo:: Repo:: open( dir) ? ;
1711
let heads = fork_repo.bookmarks ( ) ? .into_iter ( ) .find ( | b | b.name = = bookmark ) .map ( | b | b.heads ) .unwrap_or_default ( ) ;
1712
pl:: project( r, cache, & target, Source:: Fork { fork: & fork_repo, heads } ) ?
1713
}
1714
None => {
1715
let heads = r.bookmarks ( ) ? .into_iter ( ) .find ( | b | b.name = = bookmark ) .map ( | b | b.heads ) .unwrap_or_default ( ) ;
1716
pl:: project( r, cache, & target, Source:: Bookmark( heads) ) ?
1717
}
1718
} ;
1719
Ok ( ( projection.changes, projection.files) )
1720
} )
1721
.await
1722
}
1723
1724
1725
1726
1727
pub async fn new_draft (
1728
State( app ) : State< Shared> ,
1729
viewer : Viewer,
1730
Path( (owner , name ) ) : Path< ( String, String) > ,
1731
Form( f) : Form< NewForm> ,
1732
) -> Result< Page< NewProposalPage> , Error> {
1733
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposals/new" ) , & viewer) ;
1734
let me = require ( & viewer, & shell) ? ;
1735
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1736
let ( repo, row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
d0fbea2e Andy McCall 1 month ago ↶
1737
super :: writable( & row, & shell) ? ;
7d2eb590 Andy McCall 1 month ago ↶
1738
let bookmarks =
1739
app.repos.read ( & repo, | r , _| Ok ( r.bookmarks ( ) ? .into_iter ( ) .map ( | b | b.name ) .collect:: < Vec< _ > > ( ) ) ) .await.unwrap_or_default ( ) ;
1740
let ( preview, conflicted) = preview_for ( & app, & repo, & f.target, & f.source) .await.unwrap_or ( ( vec! [ ] , false ) ) ;
1741
let assistants = if preview.is_empty ( ) { vec! [ ] } else { assistant_names ( & app, & row) .await } ;
1742
let mut page = NewProposalPage {
1743
shell,
1744
repo: RepoShell:: new( & app, & row, " proposals" ) .with_role ( role) ,
1745
bookmarks,
1746
source: f.source.clone ( ) ,
1747
target: f.target.clone ( ) ,
1748
error: None ,
1749
preview,
1750
conflicted,
1751
title: f.title.clone ( ) ,
1752
body: f.body.clone ( ) ,
1753
assistants,
1754
} ;
1755
let assistant = crate :: assistants:: enabled_for_repo( & app.db, & row)
1756
.await
1757
.unwrap_or_default ( )
1758
.into_iter ( )
1759
.find ( | a | a.name.eq_ignore_ascii_case ( f.assistant.trim ( ) ) ) ;
1760
let Some ( a) = assistant else {
1761
page.error = Some ( format! ( " No assistant called {} here." , f.assistant.trim ( ) ) ) ;
1762
return Ok ( Page( page) ) ;
1763
} ;
1764
if page.preview.is_empty ( ) {
1765
page.error = Some ( " Nothing to describe: the source adds nothing to the target." .into ( ) ) ;
1766
return Ok ( Page( page) ) ;
1767
}
1768
let ( changes, diffs) = match preview_diff ( & app, & repo, & f.target, & f.source) .await {
1769
Ok ( x) => x,
1770
Err ( e) => {
1771
page.error = Some ( e.to_string ( ) ) ;
1772
return Ok ( Page( page) ) ;
1773
}
1774
} ;
1775
let d = crate :: assistants:: Draft { slot: - row.id, title: & f.title, target: & f.target, changes: & changes, diffs: & diffs } ;
1776
match crate :: assistants:: draft_description( & app, & row, & me.account, & a, d) .await {
1777
Ok ( text) => page.body = text,
1778
Err ( why) => page.error = Some ( format! ( " {} did not answer: {why} ." , a.name) ) ,
1779
}
1780
Ok ( Page( page) )
1781
}
1782
1783
# [ derive ( Deserialize ) ]
1784
pub struct DraftForm {
1785
#[serde(rename = "_csrf")]
1786
csrf_token : String,
1787
assistant : String,
1788
#[serde(default)]
1789
title : String,
1790
}
1791
1792
1793
1794
1795
pub async fn draft (
1796
State( app ) : State< Shared> ,
1797
viewer : Viewer,
1798
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1799
Form( f) : Form< DraftForm> ,
1800
) -> Result< Response, Error> {
1801
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1802
let me = require ( & viewer, & shell) ? ;
1803
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1804
let ( repo, row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
d0fbea2e Andy McCall 1 month ago ↶
1805
super :: writable( & row, & shell) ? ;
7d2eb590 Andy McCall 1 month ago ↶
1806
let p = pdb:: get( & app.db, row.id, number)
1807
.await
1808
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1809
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
1810
if Some ( me.account.id) ! = p.author_id & & role < Role:: Maintain {
1811
return Err ( Error:: not_found( shell) ) ;
1812
}
1813
let Some ( a) = crate :: assistants:: enabled_for_repo( & app.db, & row)
1814
.await
1815
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1816
.into_iter ( )
1817
.find ( | a | a.name.eq_ignore_ascii_case ( f.assistant.trim ( ) ) )
1818
else {
1819
return Ok ( back ( & owner, & name, number, " conversation" , None , Some ( format! ( " No assistant called {} here." , f.assistant.trim ( ) ) ) ) ) ;
1820
} ;
1821
let loaded = crate :: web:: proposals:: load( & app, & repo, p.clone ( ) ) .await.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
1822
let title = if f.title.trim ( ) .is_empty ( ) { p.title.clone ( ) } else { f.title.clone ( ) } ;
1823
let d = crate :: assistants:: Draft { slot: p.id, title: & title, target: & p.target, changes: & loaded.changes, diffs: & loaded.diffs } ;
1824
let draft = crate :: assistants:: draft_description( & app, & row, & me.account, & a, d) .await;
1825
match draft {
1826
Ok ( text) => {
1827
let mut page = detail ( & app, shell, & viewer, & owner, & name, number, " conversation" .into ( ) , None , None ) .await? ;
1828
page.0. draft = Some ( text) ;
1829
Ok ( page.into_response ( ) )
1830
}
1831
Err ( why) => Ok ( back ( & owner, & name, number, " conversation" , None , Some ( format! ( " {} did not answer: {why} ." , a.name) ) ) ) ,
cc1cd197 Andy McCall 1 month ago ↶
1832
}
1833
}
119fd17d Andy McCall 20 days ago ↶
1834
1835
1836
1837
1838
1839
1840
type DraftEvents = axum:: response:: Sse<
1841
axum:: response:: sse:: KeepAliveStream<
1842
tokio_stream:: wrappers:: ReceiverStream< Result< axum:: response:: sse:: Event, std:: convert:: Infallible> > ,
1843
> ,
1844
> ;
1845
1846
fn draft_events ( rx : tokio:: sync:: mpsc:: Receiver< Result< axum:: response:: sse:: Event, std:: convert:: Infallible> > ) -> DraftEvents {
1847
axum:: response:: Sse:: new( tokio_stream:: wrappers:: ReceiverStream:: new( rx) )
1848
.keep_alive ( axum:: response:: sse:: KeepAlive:: new( ) .interval ( std:: time:: Duration:: from_secs( 15 ) ) )
1849
}
1850
1851
fn draft_event ( kind : & str , text : & str ) -> Result< axum:: response:: sse:: Event, std:: convert:: Infallible> {
1852
Ok ( axum:: response:: sse:: Event:: default( ) .event ( kind) .data ( serde_json:: to_string( text) .unwrap_or_default ( ) ) )
1853
}
1854
1855
1856
fn draft_refused ( why : String) -> DraftEvents {
1857
let ( tx, rx) = tokio:: sync:: mpsc:: channel( 1 ) ;
1858
let _ = tx.try_send ( draft_event ( " error" , & why) ) ;
1859
draft_events ( rx)
1860
}
1861
1862
1863
struct DraftJob {
1864
row : db:: repos:: RepoRow,
1865
by : accounts:: Account,
1866
a : crate:: assistants:: Assistant,
1867
slot : i64 ,
1868
title : String,
1869
target : String,
1870
changes : Vec< ChangeView> ,
1871
diffs : Vec< oxy_core:: repo:: FileDiff> ,
1872
}
1873
1874
1875
fn draft_in_background ( app : Shared, job : DraftJob) -> DraftEvents {
1876
let ( tx, rx) = tokio:: sync:: mpsc:: channel( 64 ) ;
1877
tokio:: spawn( async move {
1878
let DraftJob { row, by, a, slot, title, target, changes, diffs } = job;
1879
let d = crate :: assistants:: Draft { slot, title: & title, target: & target, changes: & changes, diffs: & diffs } ;
1880
let parts = tx.clone ( ) ;
1881
let result = crate :: assistants:: draft_description_streaming( & app, & row, & by, & a, d, move | p: & str | {
1882
1883
let _ = parts.try_send ( draft_event ( " part" , p) ) ;
1884
} )
1885
.await;
1886
let last = match result {
1887
Ok ( text) => draft_event ( " done" , text.trim ( ) ) ,
1888
Err ( why) => draft_event ( " error" , & format! ( " {} did not answer: {why} ." , a.name) ) ,
1889
} ;
1890
let _ = tx.send ( last) .await;
1891
} ) ;
1892
draft_events ( rx)
1893
}
1894
1895
1896
1897
pub async fn draft_stream (
1898
State( app ) : State< Shared> ,
1899
viewer : Viewer,
1900
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1901
Form( f) : Form< DraftForm> ,
1902
) -> Result< DraftEvents, Error> {
1903
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1904
let me = require ( & viewer, & shell) ? ;
1905
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1906
let ( repo, row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
1907
super :: writable( & row, & shell) ? ;
1908
let p = pdb:: get( & app.db, row.id, number)
1909
.await
1910
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1911
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
1912
if Some ( me.account.id) ! = p.author_id & & role < Role:: Maintain {
1913
return Err ( Error:: not_found( shell) ) ;
1914
}
1915
let Some ( a) = crate :: assistants:: enabled_for_repo( & app.db, & row)
1916
.await
1917
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1918
.into_iter ( )
1919
.find ( | a | a.name.eq_ignore_ascii_case ( f.assistant.trim ( ) ) )
1920
else {
1921
return Ok ( draft_refused ( format! ( " No assistant called {} here." , f.assistant.trim ( ) ) ) ) ;
1922
} ;
1923
let loaded = load ( & app, & repo, p.clone ( ) ) .await.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
1924
let title = if f.title.trim ( ) .is_empty ( ) { p.title.clone ( ) } else { f.title.clone ( ) } ;
1925
let job = DraftJob {
1926
row,
1927
by: me.account.clone ( ) ,
1928
a,
1929
slot: p.id,
1930
title,
1931
target: p.target.clone ( ) ,
1932
changes: loaded.changes,
1933
diffs: loaded.diffs,
1934
} ;
1935
Ok ( draft_in_background ( app.clone ( ) , job) )
1936
}
1937
1938
1939
1940
pub async fn new_draft_stream (
1941
State( app ) : State< Shared> ,
1942
viewer : Viewer,
1943
Path( (owner , name ) ) : Path< ( String, String) > ,
1944
Form( f) : Form< NewForm> ,
1945
) -> Result< DraftEvents, Error> {
1946
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposals/new" ) , & viewer) ;
1947
let me = require ( & viewer, & shell) ? ;
1948
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1949
let ( repo, row, _role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
1950
super :: writable( & row, & shell) ? ;
1951
let Some ( a) = crate :: assistants:: enabled_for_repo( & app.db, & row)
1952
.await
1953
.unwrap_or_default ( )
1954
.into_iter ( )
1955
.find ( | a | a.name.eq_ignore_ascii_case ( f.assistant.trim ( ) ) )
1956
else {
1957
return Ok ( draft_refused ( format! ( " No assistant called {} here." , f.assistant.trim ( ) ) ) ) ;
1958
} ;
1959
let ( changes, diffs) = match preview_diff ( & app, & repo, & f.target, & f.source) .await {
1960
Ok ( x) => x,
1961
Err ( e) => return Ok ( draft_refused ( e.to_string ( ) ) ) ,
1962
} ;
1963
if changes.is_empty ( ) {
1964
return Ok ( draft_refused ( " Nothing to describe: the source adds nothing to the target." .into ( ) ) ) ;
1965
}
1966
let job = DraftJob { slot: - row.id, row, by: me.account.clone ( ) , a, title: f.title.clone ( ) , target: f.target.clone ( ) , changes, diffs } ;
1967
Ok ( draft_in_background ( app.clone ( ) , job) )
1968
}