notnite.com
1package state
2
3import (
4 "database/sql"
5 "encoding/json"
6 "errors"
7 "fmt"
8 "io"
9 "log"
10 "net/http"
11 "net/url"
12 "strconv"
13 "time"
14
15 "github.com/go-chi/chi/v5"
16 "tangled.sh/tangled.sh/core/api/tangled"
17 "tangled.sh/tangled.sh/core/appview/auth"
18 "tangled.sh/tangled.sh/core/appview/db"
19 "tangled.sh/tangled.sh/core/appview/pages"
20 "tangled.sh/tangled.sh/core/patchutil"
21 "tangled.sh/tangled.sh/core/types"
22
23 comatproto "github.com/bluesky-social/indigo/api/atproto"
24 "github.com/bluesky-social/indigo/atproto/syntax"
25 lexutil "github.com/bluesky-social/indigo/lex/util"
26)
27
28// htmx fragment
29func (s *State) PullActions(w http.ResponseWriter, r *http.Request) {
30 switch r.Method {
31 case http.MethodGet:
32 user := s.auth.GetUser(r)
33 f, err := fullyResolvedRepo(r)
34 if err != nil {
35 log.Println("failed to get repo and knot", err)
36 return
37 }
38
39 pull, ok := r.Context().Value("pull").(*db.Pull)
40 if !ok {
41 log.Println("failed to get pull")
42 s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.")
43 return
44 }
45
46 roundNumberStr := chi.URLParam(r, "round")
47 roundNumber, err := strconv.Atoi(roundNumberStr)
48 if err != nil {
49 roundNumber = pull.LastRoundNumber()
50 }
51 if roundNumber >= len(pull.Submissions) {
52 http.Error(w, "bad round id", http.StatusBadRequest)
53 log.Println("failed to parse round id", err)
54 return
55 }
56
57 mergeCheckResponse := s.mergeCheck(f, pull)
58 resubmitResult := pages.Unknown
59 if user.Did == pull.OwnerDid {
60 resubmitResult = s.resubmitCheck(f, pull)
61 }
62
63 s.pages.PullActionsFragment(w, pages.PullActionsParams{
64 LoggedInUser: user,
65 RepoInfo: f.RepoInfo(s, user),
66 Pull: pull,
67 RoundNumber: roundNumber,
68 MergeCheck: mergeCheckResponse,
69 ResubmitCheck: resubmitResult,
70 })
71 return
72 }
73}
74
75func (s *State) RepoSinglePull(w http.ResponseWriter, r *http.Request) {
76 user := s.auth.GetUser(r)
77 f, err := fullyResolvedRepo(r)
78 if err != nil {
79 log.Println("failed to get repo and knot", err)
80 return
81 }
82
83 pull, ok := r.Context().Value("pull").(*db.Pull)
84 if !ok {
85 log.Println("failed to get pull")
86 s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.")
87 return
88 }
89
90 totalIdents := 1
91 for _, submission := range pull.Submissions {
92 totalIdents += len(submission.Comments)
93 }
94
95 identsToResolve := make([]string, totalIdents)
96
97 // populate idents
98 identsToResolve[0] = pull.OwnerDid
99 idx := 1
100 for _, submission := range pull.Submissions {
101 for _, comment := range submission.Comments {
102 identsToResolve[idx] = comment.OwnerDid
103 idx += 1
104 }
105 }
106
107 resolvedIds := s.resolver.ResolveIdents(r.Context(), identsToResolve)
108 didHandleMap := make(map[string]string)
109 for _, identity := range resolvedIds {
110 if !identity.Handle.IsInvalidHandle() {
111 didHandleMap[identity.DID.String()] = fmt.Sprintf("@%s", identity.Handle.String())
112 } else {
113 didHandleMap[identity.DID.String()] = identity.DID.String()
114 }
115 }
116
117 mergeCheckResponse := s.mergeCheck(f, pull)
118 resubmitResult := pages.Unknown
119 if user != nil && user.Did == pull.OwnerDid {
120 resubmitResult = s.resubmitCheck(f, pull)
121 }
122
123 var pullSourceRepo *db.Repo
124 if pull.PullSource != nil {
125 if pull.PullSource.RepoAt != nil {
126 pullSourceRepo, err = db.GetRepoByAtUri(s.db, pull.PullSource.RepoAt.String())
127 if err != nil {
128 log.Printf("failed to get repo by at uri: %v", err)
129 return
130 }
131 }
132 }
133
134 s.pages.RepoSinglePull(w, pages.RepoSinglePullParams{
135 LoggedInUser: user,
136 RepoInfo: f.RepoInfo(s, user),
137 DidHandleMap: didHandleMap,
138 Pull: pull,
139 PullSourceRepo: pullSourceRepo,
140 MergeCheck: mergeCheckResponse,
141 ResubmitCheck: resubmitResult,
142 })
143}
144
145func (s *State) mergeCheck(f *FullyResolvedRepo, pull *db.Pull) types.MergeCheckResponse {
146 if pull.State == db.PullMerged {
147 return types.MergeCheckResponse{}
148 }
149
150 secret, err := db.GetRegistrationKey(s.db, f.Knot)
151 if err != nil {
152 log.Printf("failed to get registration key: %v", err)
153 return types.MergeCheckResponse{
154 Error: "failed to check merge status: this knot is unregistered",
155 }
156 }
157
158 ksClient, err := NewSignedClient(f.Knot, secret, s.config.Dev)
159 if err != nil {
160 log.Printf("failed to setup signed client for %s; ignoring: %v", f.Knot, err)
161 return types.MergeCheckResponse{
162 Error: "failed to check merge status",
163 }
164 }
165
166 resp, err := ksClient.MergeCheck([]byte(pull.LatestPatch()), f.OwnerDid(), f.RepoName, pull.TargetBranch)
167 if err != nil {
168 log.Println("failed to check for mergeability:", err)
169 return types.MergeCheckResponse{
170 Error: "failed to check merge status",
171 }
172 }
173 switch resp.StatusCode {
174 case 404:
175 return types.MergeCheckResponse{
176 Error: "failed to check merge status: this knot does not support PRs",
177 }
178 case 400:
179 return types.MergeCheckResponse{
180 Error: "failed to check merge status: does this knot support PRs?",
181 }
182 }
183
184 respBody, err := io.ReadAll(resp.Body)
185 if err != nil {
186 log.Println("failed to read merge check response body")
187 return types.MergeCheckResponse{
188 Error: "failed to check merge status: knot is not speaking the right language",
189 }
190 }
191 defer resp.Body.Close()
192
193 var mergeCheckResponse types.MergeCheckResponse
194 err = json.Unmarshal(respBody, &mergeCheckResponse)
195 if err != nil {
196 log.Println("failed to unmarshal merge check response", err)
197 return types.MergeCheckResponse{
198 Error: "failed to check merge status: knot is not speaking the right language",
199 }
200 }
201
202 return mergeCheckResponse
203}
204
205func (s *State) resubmitCheck(f *FullyResolvedRepo, pull *db.Pull) pages.ResubmitResult {
206 if pull.State == db.PullMerged || pull.PullSource == nil {
207 return pages.Unknown
208 }
209
210 var knot, ownerDid, repoName string
211
212 if pull.PullSource.RepoAt != nil {
213 // fork-based pulls
214 sourceRepo, err := db.GetRepoByAtUri(s.db, pull.PullSource.RepoAt.String())
215 if err != nil {
216 log.Println("failed to get source repo", err)
217 return pages.Unknown
218 }
219
220 knot = sourceRepo.Knot
221 ownerDid = sourceRepo.Did
222 repoName = sourceRepo.Name
223 } else {
224 // pulls within the same repo
225 knot = f.Knot
226 ownerDid = f.OwnerDid()
227 repoName = f.RepoName
228 }
229
230 us, err := NewUnsignedClient(knot, s.config.Dev)
231 if err != nil {
232 log.Printf("failed to setup client for %s; ignoring: %v", knot, err)
233 return pages.Unknown
234 }
235
236 resp, err := us.Branch(ownerDid, repoName, pull.PullSource.Branch)
237 if err != nil {
238 log.Println("failed to reach knotserver", err)
239 return pages.Unknown
240 }
241
242 body, err := io.ReadAll(resp.Body)
243 if err != nil {
244 log.Printf("error reading response body: %v", err)
245 return pages.Unknown
246 }
247 defer resp.Body.Close()
248
249 var result types.RepoBranchResponse
250 if err := json.Unmarshal(body, &result); err != nil {
251 log.Println("failed to parse response:", err)
252 return pages.Unknown
253 }
254
255 latestSubmission := pull.Submissions[pull.LastRoundNumber()]
256 if latestSubmission.SourceRev != result.Branch.Hash {
257 fmt.Println(latestSubmission.SourceRev, result.Branch.Hash)
258 return pages.ShouldResubmit
259 }
260
261 return pages.ShouldNotResubmit
262}
263
264func (s *State) RepoPullPatch(w http.ResponseWriter, r *http.Request) {
265 user := s.auth.GetUser(r)
266 f, err := fullyResolvedRepo(r)
267 if err != nil {
268 log.Println("failed to get repo and knot", err)
269 return
270 }
271
272 pull, ok := r.Context().Value("pull").(*db.Pull)
273 if !ok {
274 log.Println("failed to get pull")
275 s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.")
276 return
277 }
278
279 roundId := chi.URLParam(r, "round")
280 roundIdInt, err := strconv.Atoi(roundId)
281 if err != nil || roundIdInt >= len(pull.Submissions) {
282 http.Error(w, "bad round id", http.StatusBadRequest)
283 log.Println("failed to parse round id", err)
284 return
285 }
286
287 identsToResolve := []string{pull.OwnerDid}
288 resolvedIds := s.resolver.ResolveIdents(r.Context(), identsToResolve)
289 didHandleMap := make(map[string]string)
290 for _, identity := range resolvedIds {
291 if !identity.Handle.IsInvalidHandle() {
292 didHandleMap[identity.DID.String()] = fmt.Sprintf("@%s", identity.Handle.String())
293 } else {
294 didHandleMap[identity.DID.String()] = identity.DID.String()
295 }
296 }
297
298 s.pages.RepoPullPatchPage(w, pages.RepoPullPatchParams{
299 LoggedInUser: user,
300 DidHandleMap: didHandleMap,
301 RepoInfo: f.RepoInfo(s, user),
302 Pull: pull,
303 Round: roundIdInt,
304 Submission: pull.Submissions[roundIdInt],
305 Diff: pull.Submissions[roundIdInt].AsNiceDiff(pull.TargetBranch),
306 })
307
308}
309
310func (s *State) RepoPullPatchRaw(w http.ResponseWriter, r *http.Request) {
311 pull, ok := r.Context().Value("pull").(*db.Pull)
312 if !ok {
313 log.Println("failed to get pull")
314 s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.")
315 return
316 }
317
318 roundId := chi.URLParam(r, "round")
319 roundIdInt, err := strconv.Atoi(roundId)
320 if err != nil || roundIdInt >= len(pull.Submissions) {
321 http.Error(w, "bad round id", http.StatusBadRequest)
322 log.Println("failed to parse round id", err)
323 return
324 }
325
326 identsToResolve := []string{pull.OwnerDid}
327 resolvedIds := s.resolver.ResolveIdents(r.Context(), identsToResolve)
328 didHandleMap := make(map[string]string)
329 for _, identity := range resolvedIds {
330 if !identity.Handle.IsInvalidHandle() {
331 didHandleMap[identity.DID.String()] = fmt.Sprintf("@%s", identity.Handle.String())
332 } else {
333 didHandleMap[identity.DID.String()] = identity.DID.String()
334 }
335 }
336
337 w.Header().Set("Content-Type", "text/plain")
338 w.Write([]byte(pull.Submissions[roundIdInt].Patch))
339}
340
341func (s *State) RepoPulls(w http.ResponseWriter, r *http.Request) {
342 user := s.auth.GetUser(r)
343 params := r.URL.Query()
344
345 state := db.PullOpen
346 switch params.Get("state") {
347 case "closed":
348 state = db.PullClosed
349 case "merged":
350 state = db.PullMerged
351 }
352
353 f, err := fullyResolvedRepo(r)
354 if err != nil {
355 log.Println("failed to get repo and knot", err)
356 return
357 }
358
359 pulls, err := db.GetPulls(s.db, f.RepoAt, state)
360 if err != nil {
361 log.Println("failed to get pulls", err)
362 s.pages.Notice(w, "pulls", "Failed to load pulls. Try again later.")
363 return
364 }
365
366 for _, p := range pulls {
367 var pullSourceRepo *db.Repo
368 if p.PullSource != nil {
369 if p.PullSource.RepoAt != nil {
370 pullSourceRepo, err = db.GetRepoByAtUri(s.db, p.PullSource.RepoAt.String())
371 if err != nil {
372 log.Printf("failed to get repo by at uri: %v", err)
373 continue
374 } else {
375 p.PullSource.Repo = pullSourceRepo
376 }
377 }
378 }
379 }
380
381 identsToResolve := make([]string, len(pulls))
382 for i, pull := range pulls {
383 identsToResolve[i] = pull.OwnerDid
384 }
385 resolvedIds := s.resolver.ResolveIdents(r.Context(), identsToResolve)
386 didHandleMap := make(map[string]string)
387 for _, identity := range resolvedIds {
388 if !identity.Handle.IsInvalidHandle() {
389 didHandleMap[identity.DID.String()] = fmt.Sprintf("@%s", identity.Handle.String())
390 } else {
391 didHandleMap[identity.DID.String()] = identity.DID.String()
392 }
393 }
394
395 s.pages.RepoPulls(w, pages.RepoPullsParams{
396 LoggedInUser: s.auth.GetUser(r),
397 RepoInfo: f.RepoInfo(s, user),
398 Pulls: pulls,
399 DidHandleMap: didHandleMap,
400 FilteringBy: state,
401 })
402 return
403}
404
405func (s *State) PullComment(w http.ResponseWriter, r *http.Request) {
406 user := s.auth.GetUser(r)
407 f, err := fullyResolvedRepo(r)
408 if err != nil {
409 log.Println("failed to get repo and knot", err)
410 return
411 }
412
413 pull, ok := r.Context().Value("pull").(*db.Pull)
414 if !ok {
415 log.Println("failed to get pull")
416 s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.")
417 return
418 }
419
420 roundNumberStr := chi.URLParam(r, "round")
421 roundNumber, err := strconv.Atoi(roundNumberStr)
422 if err != nil || roundNumber >= len(pull.Submissions) {
423 http.Error(w, "bad round id", http.StatusBadRequest)
424 log.Println("failed to parse round id", err)
425 return
426 }
427
428 switch r.Method {
429 case http.MethodGet:
430 s.pages.PullNewCommentFragment(w, pages.PullNewCommentParams{
431 LoggedInUser: user,
432 RepoInfo: f.RepoInfo(s, user),
433 Pull: pull,
434 RoundNumber: roundNumber,
435 })
436 return
437 case http.MethodPost:
438 body := r.FormValue("body")
439 if body == "" {
440 s.pages.Notice(w, "pull", "Comment body is required")
441 return
442 }
443
444 // Start a transaction
445 tx, err := s.db.BeginTx(r.Context(), nil)
446 if err != nil {
447 log.Println("failed to start transaction", err)
448 s.pages.Notice(w, "pull-comment", "Failed to create comment.")
449 return
450 }
451 defer tx.Rollback()
452
453 createdAt := time.Now().Format(time.RFC3339)
454 ownerDid := user.Did
455
456 pullAt, err := db.GetPullAt(s.db, f.RepoAt, pull.PullId)
457 if err != nil {
458 log.Println("failed to get pull at", err)
459 s.pages.Notice(w, "pull-comment", "Failed to create comment.")
460 return
461 }
462
463 atUri := f.RepoAt.String()
464 client, _ := s.auth.AuthorizedClient(r)
465 atResp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{
466 Collection: tangled.RepoPullCommentNSID,
467 Repo: user.Did,
468 Rkey: s.TID(),
469 Record: &lexutil.LexiconTypeDecoder{
470 Val: &tangled.RepoPullComment{
471 Repo: &atUri,
472 Pull: pullAt,
473 Owner: &ownerDid,
474 Body: &body,
475 CreatedAt: &createdAt,
476 },
477 },
478 })
479 if err != nil {
480 log.Println("failed to create pull comment", err)
481 s.pages.Notice(w, "pull-comment", "Failed to create comment.")
482 return
483 }
484
485 // Create the pull comment in the database with the commentAt field
486 commentId, err := db.NewPullComment(tx, &db.PullComment{
487 OwnerDid: user.Did,
488 RepoAt: f.RepoAt.String(),
489 PullId: pull.PullId,
490 Body: body,
491 CommentAt: atResp.Uri,
492 SubmissionId: pull.Submissions[roundNumber].ID,
493 })
494 if err != nil {
495 log.Println("failed to create pull comment", err)
496 s.pages.Notice(w, "pull-comment", "Failed to create comment.")
497 return
498 }
499
500 // Commit the transaction
501 if err = tx.Commit(); err != nil {
502 log.Println("failed to commit transaction", err)
503 s.pages.Notice(w, "pull-comment", "Failed to create comment.")
504 return
505 }
506
507 s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d#comment-%d", f.OwnerSlashRepo(), pull.PullId, commentId))
508 return
509 }
510}
511
512func (s *State) NewPull(w http.ResponseWriter, r *http.Request) {
513 user := s.auth.GetUser(r)
514 f, err := fullyResolvedRepo(r)
515 if err != nil {
516 log.Println("failed to get repo and knot", err)
517 return
518 }
519
520 switch r.Method {
521 case http.MethodGet:
522 us, err := NewUnsignedClient(f.Knot, s.config.Dev)
523 if err != nil {
524 log.Printf("failed to create unsigned client for %s", f.Knot)
525 s.pages.Error503(w)
526 return
527 }
528
529 resp, err := us.Branches(f.OwnerDid(), f.RepoName)
530 if err != nil {
531 log.Println("failed to reach knotserver", err)
532 return
533 }
534
535 body, err := io.ReadAll(resp.Body)
536 if err != nil {
537 log.Printf("Error reading response body: %v", err)
538 return
539 }
540
541 var result types.RepoBranchesResponse
542 err = json.Unmarshal(body, &result)
543 if err != nil {
544 log.Println("failed to parse response:", err)
545 return
546 }
547
548 s.pages.RepoNewPull(w, pages.RepoNewPullParams{
549 LoggedInUser: user,
550 RepoInfo: f.RepoInfo(s, user),
551 Branches: result.Branches,
552 })
553 case http.MethodPost:
554 title := r.FormValue("title")
555 body := r.FormValue("body")
556 targetBranch := r.FormValue("targetBranch")
557 fromFork := r.FormValue("fork")
558 sourceBranch := r.FormValue("sourceBranch")
559 patch := r.FormValue("patch")
560
561 if targetBranch == "" {
562 s.pages.Notice(w, "pull", "Target branch is required.")
563 return
564 }
565
566 // Determine PR type based on input parameters
567 isPushAllowed := f.RepoInfo(s, user).Roles.IsPushAllowed()
568 isBranchBased := isPushAllowed && sourceBranch != "" && fromFork == ""
569 isForkBased := fromFork != "" && sourceBranch != ""
570 isPatchBased := patch != "" && !isBranchBased && !isForkBased
571
572 if isPatchBased && !patchutil.IsFormatPatch(patch) {
573 if title == "" {
574 s.pages.Notice(w, "pull", "Title is required for git-diff patches.")
575 return
576 }
577 }
578
579 // Validate we have at least one valid PR creation method
580 if !isBranchBased && !isPatchBased && !isForkBased {
581 s.pages.Notice(w, "pull", "Neither source branch nor patch supplied.")
582 return
583 }
584
585 // Can't mix branch-based and patch-based approaches
586 if isBranchBased && patch != "" {
587 s.pages.Notice(w, "pull", "Cannot select both patch and source branch.")
588 return
589 }
590
591 us, err := NewUnsignedClient(f.Knot, s.config.Dev)
592 if err != nil {
593 log.Printf("failed to create unsigned client to %s: %v", f.Knot, err)
594 s.pages.Notice(w, "pull", "Failed to create a pull request. Try again later.")
595 return
596 }
597
598 caps, err := us.Capabilities()
599 if err != nil {
600 log.Println("error fetching knot caps", f.Knot, err)
601 s.pages.Notice(w, "pull", "Failed to create a pull request. Try again later.")
602 return
603 }
604
605 // Handle the PR creation based on the type
606 if isBranchBased {
607 if !caps.PullRequests.BranchSubmissions {
608 s.pages.Notice(w, "pull", "This knot doesn't support branch-based pull requests. Try another way?")
609 return
610 }
611 s.handleBranchBasedPull(w, r, f, user, title, body, targetBranch, sourceBranch)
612 } else if isForkBased {
613 if !caps.PullRequests.ForkSubmissions {
614 s.pages.Notice(w, "pull", "This knot doesn't support fork-based pull requests. Try another way?")
615 return
616 }
617 s.handleForkBasedPull(w, r, f, user, fromFork, title, body, targetBranch, sourceBranch)
618 } else if isPatchBased {
619 if !caps.PullRequests.PatchSubmissions {
620 s.pages.Notice(w, "pull", "This knot doesn't support patch-based pull requests. Send your patch over email.")
621 return
622 }
623 s.handlePatchBasedPull(w, r, f, user, title, body, targetBranch, patch)
624 }
625 return
626 }
627}
628
629func (s *State) handleBranchBasedPull(w http.ResponseWriter, r *http.Request, f *FullyResolvedRepo, user *auth.User, title, body, targetBranch, sourceBranch string) {
630 pullSource := &db.PullSource{
631 Branch: sourceBranch,
632 }
633 recordPullSource := &tangled.RepoPull_Source{
634 Branch: sourceBranch,
635 }
636
637 // Generate a patch using /compare
638 ksClient, err := NewUnsignedClient(f.Knot, s.config.Dev)
639 if err != nil {
640 log.Printf("failed to create signed client for %s: %s", f.Knot, err)
641 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
642 return
643 }
644
645 comparison, err := ksClient.Compare(f.OwnerDid(), f.RepoName, targetBranch, sourceBranch)
646 if err != nil {
647 log.Println("failed to compare", err)
648 s.pages.Notice(w, "pull", err.Error())
649 return
650 }
651
652 sourceRev := comparison.Rev2
653 patch := comparison.Patch
654
655 if !patchutil.IsPatchValid(patch) {
656 s.pages.Notice(w, "pull", "Invalid patch format. Please provide a valid diff.")
657 return
658 }
659
660 s.createPullRequest(w, r, f, user, title, body, targetBranch, patch, sourceRev, pullSource, recordPullSource)
661}
662
663func (s *State) handlePatchBasedPull(w http.ResponseWriter, r *http.Request, f *FullyResolvedRepo, user *auth.User, title, body, targetBranch, patch string) {
664 if !patchutil.IsPatchValid(patch) {
665 s.pages.Notice(w, "pull", "Invalid patch format. Please provide a valid diff.")
666 return
667 }
668
669 s.createPullRequest(w, r, f, user, title, body, targetBranch, patch, "", nil, nil)
670}
671
672func (s *State) handleForkBasedPull(w http.ResponseWriter, r *http.Request, f *FullyResolvedRepo, user *auth.User, forkRepo string, title, body, targetBranch, sourceBranch string) {
673 fork, err := db.GetForkByDid(s.db, user.Did, forkRepo)
674 if errors.Is(err, sql.ErrNoRows) {
675 s.pages.Notice(w, "pull", "No such fork.")
676 return
677 } else if err != nil {
678 log.Println("failed to fetch fork:", err)
679 s.pages.Notice(w, "pull", "Failed to fetch fork.")
680 return
681 }
682
683 secret, err := db.GetRegistrationKey(s.db, fork.Knot)
684 if err != nil {
685 log.Println("failed to fetch registration key:", err)
686 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
687 return
688 }
689
690 sc, err := NewSignedClient(fork.Knot, secret, s.config.Dev)
691 if err != nil {
692 log.Println("failed to create signed client:", err)
693 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
694 return
695 }
696
697 us, err := NewUnsignedClient(fork.Knot, s.config.Dev)
698 if err != nil {
699 log.Println("failed to create unsigned client:", err)
700 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
701 return
702 }
703
704 resp, err := sc.NewHiddenRef(user.Did, fork.Name, sourceBranch, targetBranch)
705 if err != nil {
706 log.Println("failed to create hidden ref:", err, resp.StatusCode)
707 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
708 return
709 }
710
711 switch resp.StatusCode {
712 case 404:
713 case 400:
714 s.pages.Notice(w, "pull", "Branch based pull requests are not supported on this knot.")
715 return
716 }
717
718 hiddenRef := url.QueryEscape(fmt.Sprintf("hidden/%s/%s", sourceBranch, targetBranch))
719 // We're now comparing the sourceBranch (on the fork) against the hiddenRef which is tracking
720 // the targetBranch on the target repository. This code is a bit confusing, but here's an example:
721 // hiddenRef: hidden/feature-1/main (on repo-fork)
722 // targetBranch: main (on repo-1)
723 // sourceBranch: feature-1 (on repo-fork)
724 comparison, err := us.Compare(user.Did, fork.Name, hiddenRef, sourceBranch)
725 if err != nil {
726 log.Println("failed to compare across branches", err)
727 s.pages.Notice(w, "pull", err.Error())
728 return
729 }
730
731 sourceRev := comparison.Rev2
732 patch := comparison.Patch
733
734 if patchutil.IsPatchValid(patch) {
735 s.pages.Notice(w, "pull", "Invalid patch format. Please provide a valid diff.")
736 return
737 }
738
739 forkAtUri, err := syntax.ParseATURI(fork.AtUri)
740 if err != nil {
741 log.Println("failed to parse fork AT URI", err)
742 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
743 return
744 }
745
746 s.createPullRequest(w, r, f, user, title, body, targetBranch, patch, sourceRev, &db.PullSource{
747 Branch: sourceBranch,
748 RepoAt: &forkAtUri,
749 }, &tangled.RepoPull_Source{Branch: sourceBranch, Repo: &fork.AtUri})
750}
751
752func (s *State) createPullRequest(
753 w http.ResponseWriter,
754 r *http.Request,
755 f *FullyResolvedRepo,
756 user *auth.User,
757 title, body, targetBranch string,
758 patch string,
759 sourceRev string,
760 pullSource *db.PullSource,
761 recordPullSource *tangled.RepoPull_Source,
762) {
763 tx, err := s.db.BeginTx(r.Context(), nil)
764 if err != nil {
765 log.Println("failed to start tx")
766 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
767 return
768 }
769 defer tx.Rollback()
770
771 // We've already checked earlier if it's diff-based and title is empty,
772 // so if it's still empty now, it's intentionally skipped owing to format-patch.
773 if title == "" {
774 formatPatches, err := patchutil.ExtractPatches(patch)
775 if err != nil {
776 s.pages.Notice(w, "pull", fmt.Sprintf("Failed to extract patches: %v", err))
777 return
778 }
779 if len(formatPatches) == 0 {
780 s.pages.Notice(w, "pull", "No patches found in the supplied format-patch.")
781 return
782 }
783
784 title = formatPatches[0].Title
785 body = formatPatches[0].Body
786 }
787
788 rkey := s.TID()
789 initialSubmission := db.PullSubmission{
790 Patch: patch,
791 SourceRev: sourceRev,
792 }
793 err = db.NewPull(tx, &db.Pull{
794 Title: title,
795 Body: body,
796 TargetBranch: targetBranch,
797 OwnerDid: user.Did,
798 RepoAt: f.RepoAt,
799 Rkey: rkey,
800 Submissions: []*db.PullSubmission{
801 &initialSubmission,
802 },
803 PullSource: pullSource,
804 })
805 if err != nil {
806 log.Println("failed to create pull request", err)
807 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
808 return
809 }
810 client, _ := s.auth.AuthorizedClient(r)
811 pullId, err := db.NextPullId(s.db, f.RepoAt)
812 if err != nil {
813 log.Println("failed to get pull id", err)
814 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
815 return
816 }
817
818 atResp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{
819 Collection: tangled.RepoPullNSID,
820 Repo: user.Did,
821 Rkey: rkey,
822 Record: &lexutil.LexiconTypeDecoder{
823 Val: &tangled.RepoPull{
824 Title: title,
825 PullId: int64(pullId),
826 TargetRepo: string(f.RepoAt),
827 TargetBranch: targetBranch,
828 Patch: patch,
829 Source: recordPullSource,
830 },
831 },
832 })
833
834 err = db.SetPullAt(s.db, f.RepoAt, pullId, atResp.Uri)
835 if err != nil {
836 log.Println("failed to get pull id", err)
837 s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
838 return
839 }
840
841 s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pullId))
842}
843
844func (s *State) ValidatePatch(w http.ResponseWriter, r *http.Request) {
845 _, err := fullyResolvedRepo(r)
846 if err != nil {
847 log.Println("failed to get repo and knot", err)
848 return
849 }
850
851 patch := r.FormValue("patch")
852 if patch == "" {
853 s.pages.Notice(w, "patch-error", "Patch is required.")
854 return
855 }
856
857 if patch == "" || !patchutil.IsPatchValid(patch) {
858 s.pages.Notice(w, "patch-error", "Invalid patch format. Please provide a valid git diff or format-patch.")
859 return
860 }
861
862 if patchutil.IsFormatPatch(patch) {
863 s.pages.Notice(w, "patch-preview", "git-format-patch detected. Title and description are optional; if left out, they will be extracted from the first commit.")
864 } else {
865 s.pages.Notice(w, "patch-preview", "Regular git-diff detected. Please provide a title and description.")
866 }
867}
868
869func (s *State) PatchUploadFragment(w http.ResponseWriter, r *http.Request) {
870 user := s.auth.GetUser(r)
871 f, err := fullyResolvedRepo(r)
872 if err != nil {
873 log.Println("failed to get repo and knot", err)
874 return
875 }
876
877 s.pages.PullPatchUploadFragment(w, pages.PullPatchUploadParams{
878 RepoInfo: f.RepoInfo(s, user),
879 })
880}
881
882func (s *State) CompareBranchesFragment(w http.ResponseWriter, r *http.Request) {
883 user := s.auth.GetUser(r)
884 f, err := fullyResolvedRepo(r)
885 if err != nil {
886 log.Println("failed to get repo and knot", err)
887 return
888 }
889
890 us, err := NewUnsignedClient(f.Knot, s.config.Dev)
891 if err != nil {
892 log.Printf("failed to create unsigned client for %s", f.Knot)
893 s.pages.Error503(w)
894 return
895 }
896
897 resp, err := us.Branches(f.OwnerDid(), f.RepoName)
898 if err != nil {
899 log.Println("failed to reach knotserver", err)
900 return
901 }
902
903 body, err := io.ReadAll(resp.Body)
904 if err != nil {
905 log.Printf("Error reading response body: %v", err)
906 return
907 }
908
909 var result types.RepoBranchesResponse
910 err = json.Unmarshal(body, &result)
911 if err != nil {
912 log.Println("failed to parse response:", err)
913 return
914 }
915
916 s.pages.PullCompareBranchesFragment(w, pages.PullCompareBranchesParams{
917 RepoInfo: f.RepoInfo(s, user),
918 Branches: result.Branches,
919 })
920}
921
922func (s *State) CompareForksFragment(w http.ResponseWriter, r *http.Request) {
923 user := s.auth.GetUser(r)
924 f, err := fullyResolvedRepo(r)
925 if err != nil {
926 log.Println("failed to get repo and knot", err)
927 return
928 }
929
930 forks, err := db.GetForksByDid(s.db, user.Did)
931 if err != nil {
932 log.Println("failed to get forks", err)
933 return
934 }
935
936 s.pages.PullCompareForkFragment(w, pages.PullCompareForkParams{
937 RepoInfo: f.RepoInfo(s, user),
938 Forks: forks,
939 })
940}
941
942func (s *State) CompareForksBranchesFragment(w http.ResponseWriter, r *http.Request) {
943 user := s.auth.GetUser(r)
944
945 f, err := fullyResolvedRepo(r)
946 if err != nil {
947 log.Println("failed to get repo and knot", err)
948 return
949 }
950
951 forkVal := r.URL.Query().Get("fork")
952
953 // fork repo
954 repo, err := db.GetRepo(s.db, user.Did, forkVal)
955 if err != nil {
956 log.Println("failed to get repo", user.Did, forkVal)
957 return
958 }
959
960 sourceBranchesClient, err := NewUnsignedClient(repo.Knot, s.config.Dev)
961 if err != nil {
962 log.Printf("failed to create unsigned client for %s", repo.Knot)
963 s.pages.Error503(w)
964 return
965 }
966
967 sourceResp, err := sourceBranchesClient.Branches(user.Did, repo.Name)
968 if err != nil {
969 log.Println("failed to reach knotserver for source branches", err)
970 return
971 }
972
973 sourceBody, err := io.ReadAll(sourceResp.Body)
974 if err != nil {
975 log.Println("failed to read source response body", err)
976 return
977 }
978 defer sourceResp.Body.Close()
979
980 var sourceResult types.RepoBranchesResponse
981 err = json.Unmarshal(sourceBody, &sourceResult)
982 if err != nil {
983 log.Println("failed to parse source branches response:", err)
984 return
985 }
986
987 targetBranchesClient, err := NewUnsignedClient(f.Knot, s.config.Dev)
988 if err != nil {
989 log.Printf("failed to create unsigned client for target knot %s", f.Knot)
990 s.pages.Error503(w)
991 return
992 }
993
994 targetResp, err := targetBranchesClient.Branches(f.OwnerDid(), f.RepoName)
995 if err != nil {
996 log.Println("failed to reach knotserver for target branches", err)
997 return
998 }
999
1000 targetBody, err := io.ReadAll(targetResp.Body)
1001 if err != nil {
1002 log.Println("failed to read target response body", err)
1003 return
1004 }
1005 defer targetResp.Body.Close()
1006
1007 var targetResult types.RepoBranchesResponse
1008 err = json.Unmarshal(targetBody, &targetResult)
1009 if err != nil {
1010 log.Println("failed to parse target branches response:", err)
1011 return
1012 }
1013
1014 s.pages.PullCompareForkBranchesFragment(w, pages.PullCompareForkBranchesParams{
1015 RepoInfo: f.RepoInfo(s, user),
1016 SourceBranches: sourceResult.Branches,
1017 TargetBranches: targetResult.Branches,
1018 })
1019}
1020
1021func (s *State) ResubmitPull(w http.ResponseWriter, r *http.Request) {
1022 user := s.auth.GetUser(r)
1023 f, err := fullyResolvedRepo(r)
1024 if err != nil {
1025 log.Println("failed to get repo and knot", err)
1026 return
1027 }
1028
1029 pull, ok := r.Context().Value("pull").(*db.Pull)
1030 if !ok {
1031 log.Println("failed to get pull")
1032 s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.")
1033 return
1034 }
1035
1036 switch r.Method {
1037 case http.MethodGet:
1038 s.pages.PullResubmitFragment(w, pages.PullResubmitParams{
1039 RepoInfo: f.RepoInfo(s, user),
1040 Pull: pull,
1041 })
1042 return
1043 case http.MethodPost:
1044 if pull.IsPatchBased() {
1045 s.resubmitPatch(w, r)
1046 return
1047 } else if pull.IsBranchBased() {
1048 s.resubmitBranch(w, r)
1049 return
1050 } else if pull.IsForkBased() {
1051 s.resubmitFork(w, r)
1052 return
1053 }
1054 }
1055}
1056
1057func (s *State) resubmitPatch(w http.ResponseWriter, r *http.Request) {
1058 user := s.auth.GetUser(r)
1059
1060 pull, ok := r.Context().Value("pull").(*db.Pull)
1061 if !ok {
1062 log.Println("failed to get pull")
1063 s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.")
1064 return
1065 }
1066
1067 f, err := fullyResolvedRepo(r)
1068 if err != nil {
1069 log.Println("failed to get repo and knot", err)
1070 return
1071 }
1072
1073 if user.Did != pull.OwnerDid {
1074 log.Println("unauthorized user")
1075 w.WriteHeader(http.StatusUnauthorized)
1076 return
1077 }
1078
1079 patch := r.FormValue("patch")
1080
1081 if err = validateResubmittedPatch(pull, patch); err != nil {
1082 s.pages.Notice(w, "resubmit-error", err.Error())
1083 return
1084 }
1085
1086 tx, err := s.db.BeginTx(r.Context(), nil)
1087 if err != nil {
1088 log.Println("failed to start tx")
1089 s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")
1090 return
1091 }
1092 defer tx.Rollback()
1093
1094 err = db.ResubmitPull(tx, pull, patch, "")
1095 if err != nil {
1096 log.Println("failed to resubmit pull request", err)
1097 s.pages.Notice(w, "resubmit-error", "Failed to resubmit pull request. Try again later.")
1098 return
1099 }
1100 client, _ := s.auth.AuthorizedClient(r)
1101
1102 ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoPullNSID, user.Did, pull.Rkey)
1103 if err != nil {
1104 // failed to get record
1105 s.pages.Notice(w, "resubmit-error", "Failed to update pull, no record found on PDS.")
1106 return
1107 }
1108
1109 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{
1110 Collection: tangled.RepoPullNSID,
1111 Repo: user.Did,
1112 Rkey: pull.Rkey,
1113 SwapRecord: ex.Cid,
1114 Record: &lexutil.LexiconTypeDecoder{
1115 Val: &tangled.RepoPull{
1116 Title: pull.Title,
1117 PullId: int64(pull.PullId),
1118 TargetRepo: string(f.RepoAt),
1119 TargetBranch: pull.TargetBranch,
1120 Patch: patch, // new patch
1121 },
1122 },
1123 })
1124 if err != nil {
1125 log.Println("failed to update record", err)
1126 s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.")
1127 return
1128 }
1129
1130 if err = tx.Commit(); err != nil {
1131 log.Println("failed to commit transaction", err)
1132 s.pages.Notice(w, "resubmit-error", "Failed to resubmit pull.")
1133 return
1134 }
1135
1136 s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pull.PullId))
1137 return
1138}
1139
1140func (s *State) resubmitBranch(w http.ResponseWriter, r *http.Request) {
1141 user := s.auth.GetUser(r)
1142
1143 pull, ok := r.Context().Value("pull").(*db.Pull)
1144 if !ok {
1145 log.Println("failed to get pull")
1146 s.pages.Notice(w, "resubmit-error", "Failed to edit patch. Try again later.")
1147 return
1148 }
1149
1150 f, err := fullyResolvedRepo(r)
1151 if err != nil {
1152 log.Println("failed to get repo and knot", err)
1153 return
1154 }
1155
1156 if user.Did != pull.OwnerDid {
1157 log.Println("unauthorized user")
1158 w.WriteHeader(http.StatusUnauthorized)
1159 return
1160 }
1161
1162 if !f.RepoInfo(s, user).Roles.IsPushAllowed() {
1163 log.Println("unauthorized user")
1164 w.WriteHeader(http.StatusUnauthorized)
1165 return
1166 }
1167
1168 ksClient, err := NewUnsignedClient(f.Knot, s.config.Dev)
1169 if err != nil {
1170 log.Printf("failed to create client for %s: %s", f.Knot, err)
1171 s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")
1172 return
1173 }
1174
1175 comparison, err := ksClient.Compare(f.OwnerDid(), f.RepoName, pull.TargetBranch, pull.PullSource.Branch)
1176 if err != nil {
1177 log.Printf("compare request failed: %s", err)
1178 s.pages.Notice(w, "resubmit-error", err.Error())
1179 return
1180 }
1181
1182 sourceRev := comparison.Rev2
1183 patch := comparison.Patch
1184
1185 if err = validateResubmittedPatch(pull, patch); err != nil {
1186 s.pages.Notice(w, "resubmit-error", err.Error())
1187 return
1188 }
1189
1190 if sourceRev == pull.Submissions[pull.LastRoundNumber()].SourceRev {
1191 s.pages.Notice(w, "resubmit-error", "This branch has not changed since the last submission.")
1192 return
1193 }
1194
1195 tx, err := s.db.BeginTx(r.Context(), nil)
1196 if err != nil {
1197 log.Println("failed to start tx")
1198 s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")
1199 return
1200 }
1201 defer tx.Rollback()
1202
1203 err = db.ResubmitPull(tx, pull, patch, sourceRev)
1204 if err != nil {
1205 log.Println("failed to create pull request", err)
1206 s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")
1207 return
1208 }
1209 client, _ := s.auth.AuthorizedClient(r)
1210
1211 ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoPullNSID, user.Did, pull.Rkey)
1212 if err != nil {
1213 // failed to get record
1214 s.pages.Notice(w, "resubmit-error", "Failed to update pull, no record found on PDS.")
1215 return
1216 }
1217
1218 recordPullSource := &tangled.RepoPull_Source{
1219 Branch: pull.PullSource.Branch,
1220 }
1221 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{
1222 Collection: tangled.RepoPullNSID,
1223 Repo: user.Did,
1224 Rkey: pull.Rkey,
1225 SwapRecord: ex.Cid,
1226 Record: &lexutil.LexiconTypeDecoder{
1227 Val: &tangled.RepoPull{
1228 Title: pull.Title,
1229 PullId: int64(pull.PullId),
1230 TargetRepo: string(f.RepoAt),
1231 TargetBranch: pull.TargetBranch,
1232 Patch: patch, // new patch
1233 Source: recordPullSource,
1234 },
1235 },
1236 })
1237 if err != nil {
1238 log.Println("failed to update record", err)
1239 s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.")
1240 return
1241 }
1242
1243 if err = tx.Commit(); err != nil {
1244 log.Println("failed to commit transaction", err)
1245 s.pages.Notice(w, "resubmit-error", "Failed to resubmit pull.")
1246 return
1247 }
1248
1249 s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pull.PullId))
1250 return
1251}
1252
1253func (s *State) resubmitFork(w http.ResponseWriter, r *http.Request) {
1254 user := s.auth.GetUser(r)
1255
1256 pull, ok := r.Context().Value("pull").(*db.Pull)
1257 if !ok {
1258 log.Println("failed to get pull")
1259 s.pages.Notice(w, "resubmit-error", "Failed to edit patch. Try again later.")
1260 return
1261 }
1262
1263 f, err := fullyResolvedRepo(r)
1264 if err != nil {
1265 log.Println("failed to get repo and knot", err)
1266 return
1267 }
1268
1269 if user.Did != pull.OwnerDid {
1270 log.Println("unauthorized user")
1271 w.WriteHeader(http.StatusUnauthorized)
1272 return
1273 }
1274
1275 forkRepo, err := db.GetRepoByAtUri(s.db, pull.PullSource.RepoAt.String())
1276 if err != nil {
1277 log.Println("failed to get source repo", err)
1278 s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")
1279 return
1280 }
1281
1282 // extract patch by performing compare
1283 ksClient, err := NewUnsignedClient(forkRepo.Knot, s.config.Dev)
1284 if err != nil {
1285 log.Printf("failed to create client for %s: %s", forkRepo.Knot, err)
1286 s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")
1287 return
1288 }
1289
1290 secret, err := db.GetRegistrationKey(s.db, forkRepo.Knot)
1291 if err != nil {
1292 log.Printf("failed to get registration key for %s: %s", forkRepo.Knot, err)
1293 s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")
1294 return
1295 }
1296
1297 // update the hidden tracking branch to latest
1298 signedClient, err := NewSignedClient(forkRepo.Knot, secret, s.config.Dev)
1299 if err != nil {
1300 log.Printf("failed to create signed client for %s: %s", forkRepo.Knot, err)
1301 s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")
1302 return
1303 }
1304
1305 resp, err := signedClient.NewHiddenRef(forkRepo.Did, forkRepo.Name, pull.PullSource.Branch, pull.TargetBranch)
1306 if err != nil || resp.StatusCode != http.StatusNoContent {
1307 log.Printf("failed to update tracking branch: %s", err)
1308 s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")
1309 return
1310 }
1311
1312 hiddenRef := url.QueryEscape(fmt.Sprintf("hidden/%s/%s", pull.PullSource.Branch, pull.TargetBranch))
1313 comparison, err := ksClient.Compare(forkRepo.Did, forkRepo.Name, hiddenRef, pull.PullSource.Branch)
1314 if err != nil {
1315 log.Printf("failed to compare branches: %s", err)
1316 s.pages.Notice(w, "resubmit-error", err.Error())
1317 return
1318 }
1319
1320 sourceRev := comparison.Rev2
1321 patch := comparison.Patch
1322
1323 if err = validateResubmittedPatch(pull, patch); err != nil {
1324 s.pages.Notice(w, "resubmit-error", err.Error())
1325 return
1326 }
1327
1328 if sourceRev == pull.Submissions[pull.LastRoundNumber()].SourceRev {
1329 s.pages.Notice(w, "resubmit-error", "This branch has not changed since the last submission.")
1330 return
1331 }
1332
1333 tx, err := s.db.BeginTx(r.Context(), nil)
1334 if err != nil {
1335 log.Println("failed to start tx")
1336 s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")
1337 return
1338 }
1339 defer tx.Rollback()
1340
1341 err = db.ResubmitPull(tx, pull, patch, sourceRev)
1342 if err != nil {
1343 log.Println("failed to create pull request", err)
1344 s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")
1345 return
1346 }
1347 client, _ := s.auth.AuthorizedClient(r)
1348
1349 ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoPullNSID, user.Did, pull.Rkey)
1350 if err != nil {
1351 // failed to get record
1352 s.pages.Notice(w, "resubmit-error", "Failed to update pull, no record found on PDS.")
1353 return
1354 }
1355
1356 repoAt := pull.PullSource.RepoAt.String()
1357 recordPullSource := &tangled.RepoPull_Source{
1358 Branch: pull.PullSource.Branch,
1359 Repo: &repoAt,
1360 }
1361 _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{
1362 Collection: tangled.RepoPullNSID,
1363 Repo: user.Did,
1364 Rkey: pull.Rkey,
1365 SwapRecord: ex.Cid,
1366 Record: &lexutil.LexiconTypeDecoder{
1367 Val: &tangled.RepoPull{
1368 Title: pull.Title,
1369 PullId: int64(pull.PullId),
1370 TargetRepo: string(f.RepoAt),
1371 TargetBranch: pull.TargetBranch,
1372 Patch: patch, // new patch
1373 Source: recordPullSource,
1374 },
1375 },
1376 })
1377 if err != nil {
1378 log.Println("failed to update record", err)
1379 s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.")
1380 return
1381 }
1382
1383 if err = tx.Commit(); err != nil {
1384 log.Println("failed to commit transaction", err)
1385 s.pages.Notice(w, "resubmit-error", "Failed to resubmit pull.")
1386 return
1387 }
1388
1389 s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pull.PullId))
1390 return
1391}
1392
1393// validate a resubmission against a pull request
1394func validateResubmittedPatch(pull *db.Pull, patch string) error {
1395 if patch == "" {
1396 return fmt.Errorf("Patch is empty.")
1397 }
1398
1399 if patch == pull.LatestPatch() {
1400 return fmt.Errorf("Patch is identical to previous submission.")
1401 }
1402
1403 if !patchutil.IsPatchValid(patch) {
1404 return fmt.Errorf("Invalid patch format. Please provide a valid diff.")
1405 }
1406
1407 return nil
1408}
1409
1410func (s *State) MergePull(w http.ResponseWriter, r *http.Request) {
1411 f, err := fullyResolvedRepo(r)
1412 if err != nil {
1413 log.Println("failed to resolve repo:", err)
1414 s.pages.Notice(w, "pull-merge-error", "Failed to merge pull request. Try again later.")
1415 return
1416 }
1417
1418 pull, ok := r.Context().Value("pull").(*db.Pull)
1419 if !ok {
1420 log.Println("failed to get pull")
1421 s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.")
1422 return
1423 }
1424
1425 secret, err := db.GetRegistrationKey(s.db, f.Knot)
1426 if err != nil {
1427 log.Printf("no registration key found for domain %s: %s\n", f.Knot, err)
1428 s.pages.Notice(w, "pull-merge-error", "Failed to merge pull request. Try again later.")
1429 return
1430 }
1431
1432 ident, err := s.resolver.ResolveIdent(r.Context(), pull.OwnerDid)
1433 if err != nil {
1434 log.Printf("resolving identity: %s", err)
1435 w.WriteHeader(http.StatusNotFound)
1436 return
1437 }
1438
1439 email, err := db.GetPrimaryEmail(s.db, pull.OwnerDid)
1440 if err != nil {
1441 log.Printf("failed to get primary email: %s", err)
1442 }
1443
1444 ksClient, err := NewSignedClient(f.Knot, secret, s.config.Dev)
1445 if err != nil {
1446 log.Printf("failed to create signed client for %s: %s", f.Knot, err)
1447 s.pages.Notice(w, "pull-merge-error", "Failed to merge pull request. Try again later.")
1448 return
1449 }
1450
1451 // Merge the pull request
1452 resp, err := ksClient.Merge([]byte(pull.LatestPatch()), f.OwnerDid(), f.RepoName, pull.TargetBranch, pull.Title, pull.Body, ident.Handle.String(), email.Address)
1453 if err != nil {
1454 log.Printf("failed to merge pull request: %s", err)
1455 s.pages.Notice(w, "pull-merge-error", "Failed to merge pull request. Try again later.")
1456 return
1457 }
1458
1459 if resp.StatusCode == http.StatusOK {
1460 err := db.MergePull(s.db, f.RepoAt, pull.PullId)
1461 if err != nil {
1462 log.Printf("failed to update pull request status in database: %s", err)
1463 s.pages.Notice(w, "pull-merge-error", "Failed to merge pull request. Try again later.")
1464 return
1465 }
1466 s.pages.HxLocation(w, fmt.Sprintf("/@%s/%s/pulls/%d", f.OwnerHandle(), f.RepoName, pull.PullId))
1467 } else {
1468 log.Printf("knotserver returned non-OK status code for merge: %d", resp.StatusCode)
1469 s.pages.Notice(w, "pull-merge-error", "Failed to merge pull request. Try again later.")
1470 }
1471}
1472
1473func (s *State) ClosePull(w http.ResponseWriter, r *http.Request) {
1474 user := s.auth.GetUser(r)
1475
1476 f, err := fullyResolvedRepo(r)
1477 if err != nil {
1478 log.Println("malformed middleware")
1479 return
1480 }
1481
1482 pull, ok := r.Context().Value("pull").(*db.Pull)
1483 if !ok {
1484 log.Println("failed to get pull")
1485 s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.")
1486 return
1487 }
1488
1489 // auth filter: only owner or collaborators can close
1490 roles := RolesInRepo(s, user, f)
1491 isCollaborator := roles.IsCollaborator()
1492 isPullAuthor := user.Did == pull.OwnerDid
1493 isCloseAllowed := isCollaborator || isPullAuthor
1494 if !isCloseAllowed {
1495 log.Println("failed to close pull")
1496 s.pages.Notice(w, "pull-close", "You are unauthorized to close this pull.")
1497 return
1498 }
1499
1500 // Start a transaction
1501 tx, err := s.db.BeginTx(r.Context(), nil)
1502 if err != nil {
1503 log.Println("failed to start transaction", err)
1504 s.pages.Notice(w, "pull-close", "Failed to close pull.")
1505 return
1506 }
1507
1508 // Close the pull in the database
1509 err = db.ClosePull(tx, f.RepoAt, pull.PullId)
1510 if err != nil {
1511 log.Println("failed to close pull", err)
1512 s.pages.Notice(w, "pull-close", "Failed to close pull.")
1513 return
1514 }
1515
1516 // Commit the transaction
1517 if err = tx.Commit(); err != nil {
1518 log.Println("failed to commit transaction", err)
1519 s.pages.Notice(w, "pull-close", "Failed to close pull.")
1520 return
1521 }
1522
1523 s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pull.PullId))
1524 return
1525}
1526
1527func (s *State) ReopenPull(w http.ResponseWriter, r *http.Request) {
1528 user := s.auth.GetUser(r)
1529
1530 f, err := fullyResolvedRepo(r)
1531 if err != nil {
1532 log.Println("failed to resolve repo", err)
1533 s.pages.Notice(w, "pull-reopen", "Failed to reopen pull.")
1534 return
1535 }
1536
1537 pull, ok := r.Context().Value("pull").(*db.Pull)
1538 if !ok {
1539 log.Println("failed to get pull")
1540 s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.")
1541 return
1542 }
1543
1544 // auth filter: only owner or collaborators can close
1545 roles := RolesInRepo(s, user, f)
1546 isCollaborator := roles.IsCollaborator()
1547 isPullAuthor := user.Did == pull.OwnerDid
1548 isCloseAllowed := isCollaborator || isPullAuthor
1549 if !isCloseAllowed {
1550 log.Println("failed to close pull")
1551 s.pages.Notice(w, "pull-close", "You are unauthorized to close this pull.")
1552 return
1553 }
1554
1555 // Start a transaction
1556 tx, err := s.db.BeginTx(r.Context(), nil)
1557 if err != nil {
1558 log.Println("failed to start transaction", err)
1559 s.pages.Notice(w, "pull-reopen", "Failed to reopen pull.")
1560 return
1561 }
1562
1563 // Reopen the pull in the database
1564 err = db.ReopenPull(tx, f.RepoAt, pull.PullId)
1565 if err != nil {
1566 log.Println("failed to reopen pull", err)
1567 s.pages.Notice(w, "pull-reopen", "Failed to reopen pull.")
1568 return
1569 }
1570
1571 // Commit the transaction
1572 if err = tx.Commit(); err != nil {
1573 log.Println("failed to commit transaction", err)
1574 s.pages.Notice(w, "pull-reopen", "Failed to reopen pull.")
1575 return
1576 }
1577
1578 s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pull.PullId))
1579 return
1580}