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