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