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