···

       
648
       
 
       
		return

     

       
649
       
 
       
	}

     

       
650
       
 
       


     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
651
       
 
       
	ksClient, err := NewSignedClient(f.Knot, secret, s.config.Dev)

     

       
652
       
 
       
	if err != nil {

     

       
653
       
 
       
		log.Printf("failed to create signed client for %s: %s", f.Knot, err)

     
···

       
656
       
 
       
	}

     

       
657
       
 
       


     

       
658
       
 
       
	// Merge the pull request

     

       
659
       
-
       
	resp, err := ksClient.Merge([]byte(pull.LatestPatch()), f.OwnerDid(), f.RepoName, pull.TargetBranch, pull.Title, pull.Body, "", "")

     

       
660
       
 
       
	if err != nil {

     

       
661
       
 
       
		log.Printf("failed to merge pull request: %s", err)

     

       
662
       
 
       
		s.pages.Notice(w, "pull-merge-error", "Failed to merge pull request. Try again later.")

     

···

       
648
       
 
       
		return

     

       
649
       
 
       
	}

     

       
650
       
 
       


     

       
651
       
+
       
	ident, err := s.resolver.ResolveIdent(r.Context(), pull.OwnerDid)

     

       
652
       
+
       
	if err != nil {

     

       
653
       
+
       
		log.Printf("resolving identity: %s", err)

     

       
654
       
+
       
		w.WriteHeader(http.StatusNotFound)

     

       
655
       
+
       
		return

     

       
656
       
+
       
	}

     

       
657
       
+
       


     

       
658
       
+
       
	email, err := db.GetPrimaryEmail(s.db, pull.OwnerDid)

     

       
659
       
+
       
	if err != nil {

     

       
660
       
+
       
		log.Printf("failed to get primary email: %s", err)

     

       
661
       
+
       
	}

     

       
662
       
+
       


     

       
663
       
 
       
	ksClient, err := NewSignedClient(f.Knot, secret, s.config.Dev)

     

       
664
       
 
       
	if err != nil {

     

       
665
       
 
       
		log.Printf("failed to create signed client for %s: %s", f.Knot, err)

     
···

       
668
       
 
       
	}

     

       
669
       
 
       


     

       
670
       
 
       
	// Merge the pull request

     

       
671
       
+
       
	resp, err := ksClient.Merge([]byte(pull.LatestPatch()), f.OwnerDid(), f.RepoName, pull.TargetBranch, pull.Title, pull.Body, ident.Handle.String(), email.Address)

     

       
672
       
 
       
	if err != nil {

     

       
673
       
 
       
		log.Printf("failed to merge pull request: %s", err)

     

       
674
       
 
       
		s.pages.Notice(w, "pull-merge-error", "Failed to merge pull request. Try again later.")