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