comparing c8bc5f33dfcb807f40a511888637ea7c491d67c3 and push-kyupnpkvqmsy on nel.pet/core

+5 -1

appview/issues/issues.go

···

       798
       798
        
       		return

     

       799
       799
        
       	}

     

       800
       800
        
       

     

       801
       801
       -
       	labelDefs, err := db.GetLabelDefinitions(rp.db, db.FilterIn("at_uri", f.Repo.Labels))

     

       801
       801
       +
       	labelDefs, err := db.GetLabelDefinitions(

     

       802
       802
       +
       		rp.db,

     

       803
       803
       +
       		db.FilterIn("at_uri", f.Repo.Labels),

     

       804
       804
       +
       		db.FilterContains("scope", tangled.RepoIssueNSID),

     

       805
       805
       +
       	)

     

       802
       806
        
       	if err != nil {

     

       803
       807
        
       		log.Println("failed to fetch labels", err)

     

       804
       808
        
       		rp.pages.Error503(w)

+1 -1

appview/pages/templates/repo/fragments/labelPanel.html

···

       1
       1
        
       {{ define "repo/fragments/labelPanel" }}

     

       2
       2
       -
         <div id="label-panel" class="flex flex-col gap-6">

     

       2
       2
       +
         <div id="label-panel" class="flex flex-col gap-6 px-6 md:px-0">

     

       3
       3
        
           {{ template "basicLabels" . }}

     

       4
       4
        
           {{ template "kvLabels" . }}

     

       5
       5
        
         </div>

+26

appview/pages/templates/repo/fragments/participants.html

···

       1
       1
       +
       {{ define "repo/fragments/participants" }}

     

       2
       2
       +
         {{ $all := . }}

     

       3
       3
       +
         {{ $ps := take $all 5 }}

     

       4
       4
       +
         <div class="px-6 md:px-0">

     

       5
       5
       +
           <div class="py-1 flex items-center text-sm">

     

       6
       6
       +
             <span class="font-bold text-gray-500 dark:text-gray-400 capitalize">Participants</span>

     

       7
       7
       +
             <span class="bg-gray-200 dark:bg-gray-700 rounded py-1/2 px-1 ml-1">{{ len $all }}</span>

     

       8
       8
       +
           </div>

     

       9
       9
       +
           <div class="flex items-center -space-x-3 mt-2">

     

       10
       10
       +
             {{ $c := "z-50 z-40 z-30 z-20 z-10" }}

     

       11
       11
       +
             {{ range $i, $p := $ps }}

     

       12
       12
       +
               <img

     

       13
       13
       +
                   src="{{ tinyAvatar . }}"

     

       14
       14
       +
                   alt=""

     

       15
       15
       +
                   class="rounded-full h-8 w-8 mr-1 border-2 border-gray-100 dark:border-gray-900 z-{{sub 5 $i}}0"

     

       16
       16
       +
               />

     

       17
       17
       +
             {{ end }}

     

       18
       18
       +
       

     

       19
       19
       +
             {{ if gt (len $all) 5 }}

     

       20
       20
       +
               <span class="pl-4 text-gray-500 dark:text-gray-400 text-sm">

     

       21
       21
       +
                 +{{ sub (len $all) 5 }}

     

       22
       22
       +
               </span>

     

       23
       23
       +
             {{ end }}

     

       24
       24
       +
           </div>

     

       25
       25
       +
         </div>

     

       26
       26
       +
       {{ end }}

+1 -27

appview/pages/templates/repo/issues/issue.html

···

       22
       22
        
                     "Defs" $.LabelDefs

     

       23
       23
        
                     "Subject" $.Issue.AtUri

     

       24
       24
        
                     "State" $.Issue.Labels) }}

     

       25
       25
       -
             {{ template "issueParticipants" . }}

     

       25
       25
       +
             {{ template "repo/fragments/participants" $.Issue.Participants }}

     

       26
       26
        
           </div>

     

       27
       27
        
         </div>

     

       28
       28
        
       {{ end }}

     
···

       122
       122
        
         </div>

     

       123
       123
        
       {{ end }}

     

       124
       124
        
       

     

       125
       125
       -
       {{ define "issueParticipants" }}

     

       126
       126
       -
         {{ $all := .Issue.Participants }}

     

       127
       127
       -
         {{ $ps := take $all 5 }}

     

       128
       128
       -
         <div>

     

       129
       129
       -
           <div class="py-1 flex items-center text-sm">

     

       130
       130
       -
             <span class="font-bold text-gray-500 dark:text-gray-400 capitalize">Participants</span>

     

       131
       131
       -
             <span class="bg-gray-200 dark:bg-gray-700 rounded py-1/2 px-1 ml-1">{{ len $all }}</span>

     

       132
       132
       -
           </div>

     

       133
       133
       -
           <div class="flex items-center -space-x-3 mt-2">

     

       134
       134
       -
             {{ $c := "z-50 z-40 z-30 z-20 z-10" }}

     

       135
       135
       -
             {{ range $i, $p := $ps }}

     

       136
       136
       -
               <img

     

       137
       137
       -
                   src="{{ tinyAvatar . }}"

     

       138
       138
       -
                   alt=""

     

       139
       139
       -
                   class="rounded-full h-8 w-8 mr-1 border-2 border-gray-100 dark:border-gray-900 z-{{sub 5 $i}}0"

     

       140
       140
       -
               />

     

       141
       141
       -
             {{ end }}

     

       142
       142
       -
       

     

       143
       143
       -
             {{ if gt (len $all) 5 }}

     

       144
       144
       -
               <span class="pl-4 text-gray-500 dark:text-gray-400 text-sm">

     

       145
       145
       -
                 +{{ sub (len $all) 5 }}

     

       146
       146
       -
               </span>

     

       147
       147
       -
             {{ end }}

     

       148
       148
       -
           </div>

     

       149
       149
       -
         </div>

     

       150
       150
       -
       {{ end }}

     

       151
       125
        
       

     

       152
       126
        
       {{ define "repoAfter" }}

     

       153
       127
        
         <div class="flex flex-col gap-4 mt-4">

+30 -12

appview/pages/templates/repo/pulls/pull.html

···

       9
       9
        
           {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }}

     

       10
       10
        
       {{ end }}

     

       11
       11
        
       

     

       12
       12
       +
       {{ define "repoContentLayout" }}

     

       13
       13
       +
         <div class="grid grid-cols-1 md:grid-cols-10 gap-4 w-full">

     

       14
       14
       +
           <div class="col-span-1 md:col-span-8">

     

       15
       15
       +
             <section class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto dark:text-white">

     

       16
       16
       +
               {{ block "repoContent" . }}{{ end }}

     

       17
       17
       +
             </section>

     

       18
       18
       +
             {{ block "repoAfter" . }}{{ end }}

     

       19
       19
       +
           </div>

     

       20
       20
       +
           <div class="col-span-1 md:col-span-2 flex flex-col gap-6">

     

       21
       21
       +
             {{ template "repo/fragments/labelPanel"

     

       22
       22
       +
               (dict "RepoInfo" $.RepoInfo

     

       23
       23
       +
                     "Defs" $.LabelDefs

     

       24
       24
       +
                     "Subject" $.Pull.PullAt

     

       25
       25
       +
                     "State" $.Pull.Labels) }}

     

       26
       26
       +
             {{ template "repo/fragments/participants" $.Pull.Participants }}

     

       27
       27
       +
           </div>

     

       28
       28
       +
         </div>

     

       29
       29
       +
       {{ end }}

     

       12
       30
        
       

     

       13
       31
        
       {{ define "repoContent" }}

     

       14
       32
        
         {{ template "repo/pulls/fragments/pullHeader" . }}

     
···

       39
       57
        
           {{ with $item }}

     

       40
       58
        
           <details {{ if eq $idx $lastIdx }}open{{ end }}>

     

       41
       59
        
               <summary id="round-#{{ .RoundNumber }}" class="list-none cursor-pointer">

     

       42
       42
       -
                 <div class="flex flex-wrap gap-2 items-center">

     

       60
       60
       +
                 <div class="flex flex-wrap gap-2 items-stretch">

     

       43
       61
        
                   <!-- round number -->

     

       44
       62
        
                   <div class="rounded bg-white dark:bg-gray-800 drop-shadow-sm px-3 py-2 dark:text-white">

     

       45
       63
        
                     <span class="flex items-center">{{ i "hash" "w-4 h-4" }}{{ .RoundNumber }}</span>

     

       46
       64
        
                   </div>

     

       47
       65
        
                   <!-- round summary -->

     

       48
       48
       -
                   <div class="rounded drop-shadow-sm bg-white dark:bg-gray-800 p-2 text-gray-500 dark:text-gray-400">

     

       66
       66
       +
                   <div class="flex-1 rounded drop-shadow-sm bg-white dark:bg-gray-800 p-2 text-gray-500 dark:text-gray-400">

     

       49
       67
        
                     <span class="gap-1 flex items-center">

     

       50
       68
        
                       {{ $owner := resolve $.Pull.OwnerDid }}

     

       51
       69
        
                       {{ $re := "re" }}

     
···

       72
       90
        
                     <span class="hidden md:inline">diff</span>

     

       73
       91
        
                     {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}

     

       74
       92
        
                   </a>

     

       75
       75
       -
                   {{ if not (eq .RoundNumber 0) }}

     

       76
       76
       -
                   <a class="btn flex items-center gap-2 no-underline hover:no-underline p-2 group"

     

       77
       77
       -
                      hx-boost="true"

     

       78
       78
       -
                      href="/{{ $.RepoInfo.FullName }}/pulls/{{ $.Pull.PullId }}/round/{{.RoundNumber}}/interdiff">

     

       79
       79
       -
                     {{ i "chevrons-left-right-ellipsis" "w-4 h-4 rotate-90" }}

     

       80
       80
       -
                     <span class="hidden md:inline">interdiff</span>

     

       81
       81
       -
                     {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}

     

       82
       82
       -
                   </a>

     

       83
       83
       -
                   <span id="interdiff-error-{{.RoundNumber}}"></span>

     

       93
       93
       +
                   {{ if ne $idx 0 }}

     

       94
       94
       +
                     <a class="btn flex items-center gap-2 no-underline hover:no-underline p-2 group"

     

       95
       95
       +
                        hx-boost="true"

     

       96
       96
       +
                        href="/{{ $.RepoInfo.FullName }}/pulls/{{ $.Pull.PullId }}/round/{{.RoundNumber}}/interdiff">

     

       97
       97
       +
                       {{ i "chevrons-left-right-ellipsis" "w-4 h-4 rotate-90" }}

     

       98
       98
       +
                       <span class="hidden md:inline">interdiff</span>

     

       99
       99
       +
                       {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}

     

       100
       100
       +
                     </a>

     

       84
       101
        
                   {{ end }}

     

       102
       102
       +
                   <span id="interdiff-error-{{.RoundNumber}}"></span>

     

       85
       103
        
                 </div>

     

       86
       104
        
               </summary>

     

       87
       105
        
       

     
···

       146
       164
        
       

     

       147
       165
        
               <div class="md:pl-[3.5rem] flex flex-col gap-2 mt-2 relative">

     

       148
       166
        
                 {{ range $cidx, $c := .Comments }}

     

       149
       149
       -
                   <div id="comment-{{$c.ID}}" class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-2 px-4 relative w-full md:max-w-3/5 md:w-fit">

     

       167
       167
       +
                   <div id="comment-{{$c.ID}}" class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-2 px-4 relative w-full">

     

       150
       168
        
                     {{ if gt $cidx 0 }}

     

       151
       169
        
                     <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div>

     

       152
       170
        
                     {{ end }}

+7

appview/pages/templates/repo/pulls/pulls.html

···

       108
       108
        
                             <span class="before:content-['·']"></span>

     

       109
       109
        
                             {{ template "repo/pipelines/fragments/pipelineSymbol" $pipeline }}

     

       110
       110
        
                           {{ end }}

     

       111
       111
       +
       

     

       112
       112
       +
                           {{ $state := .Labels }}

     

       113
       113
       +
                           {{ range $k, $d := $.LabelDefs }}

     

       114
       114
       +
                             {{ range $v, $s := $state.GetValSet $d.AtUri.String }}

     

       115
       115
       +
                               {{ template "labels/fragments/label" (dict "def" $d "val" $v "withPrefix" true) }}

     

       116
       116
       +
                             {{ end }}

     

       117
       117
       +
                           {{ end }}

     

       111
       118
        
                       </div>

     

       112
       119
        
                     </div>

     

       113
       120
        
                     {{ if .StackId }}

+8 -48

appview/notify/db/db.go

···

       30
       30
        
       

     

       31
       31
        
       func (n *databaseNotifier) NewStar(ctx context.Context, star *models.Star) {

     

       32
       32
        
       	var err error

     

       33
       33
       -
       	repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(star.RepoAt)))

     

       33
       33
       +
       	repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(star.RepoAt)))

     

       34
       34
        
       	if err != nil {

     

       35
       35
        
       		log.Printf("NewStar: failed to get repos: %v", err)

     

       36
       36
        
       		return

     

       37
       37
        
       	}

     

       38
       38
       -
       	if len(repos) == 0 {

     

       39
       39
       -
       		log.Printf("NewStar: no repo found for %s", star.RepoAt)

     

       40
       40
       -
       		return

     

       41
       41
       -
       	}

     

       42
       42
       -
       	repo := repos[0]

     

       43
       38
        
       

     

       44
       39
        
       	// don't notify yourself

     

       45
       40
        
       	if repo.Did == star.StarredByDid {

     
···

       76
       71
        
       }

     

       77
       72
        
       

     

       78
       73
        
       func (n *databaseNotifier) NewIssue(ctx context.Context, issue *models.Issue) {

     

       79
       79
       -
       	repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(issue.RepoAt)))

     

       74
       74
       +
       	repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(issue.RepoAt)))

     

       80
       75
        
       	if err != nil {

     

       81
       76
        
       		log.Printf("NewIssue: failed to get repos: %v", err)

     

       82
       77
        
       		return

     

       83
       78
        
       	}

     

       84
       84
       -
       	if len(repos) == 0 {

     

       85
       85
       -
       		log.Printf("NewIssue: no repo found for %s", issue.RepoAt)

     

       86
       86
       -
       		return

     

       87
       87
       -
       	}

     

       88
       88
       -
       	repo := repos[0]

     

       89
       79
        
       

     

       90
       80
        
       	if repo.Did == issue.Did {

     

       91
       81
        
       		return

     
···

       129
       119
        
       	}

     

       130
       120
        
       	issue := issues[0]

     

       131
       121
        
       

     

       132
       132
       -
       	repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(issue.RepoAt)))

     

       122
       122
       +
       	repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(issue.RepoAt)))

     

       133
       123
        
       	if err != nil {

     

       134
       124
        
       		log.Printf("NewIssueComment: failed to get repos: %v", err)

     

       135
       125
        
       		return

     

       136
       126
        
       	}

     

       137
       137
       -
       	if len(repos) == 0 {

     

       138
       138
       -
       		log.Printf("NewIssueComment: no repo found for %s", issue.RepoAt)

     

       139
       139
       -
       		return

     

       140
       140
       -
       	}

     

       141
       141
       -
       	repo := repos[0]

     

       142
       127
        
       

     

       143
       128
        
       	recipients := make(map[string]bool)

     

       144
       129
        
       

     
···

       211
       196
        
       }

     

       212
       197
        
       

     

       213
       198
        
       func (n *databaseNotifier) NewPull(ctx context.Context, pull *models.Pull) {

     

       214
       214
       -
       	repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(pull.RepoAt)))

     

       199
       199
       +
       	repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(pull.RepoAt)))

     

       215
       200
        
       	if err != nil {

     

       216
       201
        
       		log.Printf("NewPull: failed to get repos: %v", err)

     

       217
       202
        
       		return

     

       218
       203
        
       	}

     

       219
       219
       -
       	if len(repos) == 0 {

     

       220
       220
       -
       		log.Printf("NewPull: no repo found for %s", pull.RepoAt)

     

       221
       221
       -
       		return

     

       222
       222
       -
       	}

     

       223
       223
       -
       	repo := repos[0]

     

       224
       204
        
       

     

       225
       205
        
       	if repo.Did == pull.OwnerDid {

     

       226
       206
        
       		return

     
···

       266
       246
        
       	}

     

       267
       247
        
       	pull := pulls[0]

     

       268
       248
        
       

     

       269
       269
       -
       	repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", comment.RepoAt))

     

       249
       249
       +
       	repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", comment.RepoAt))

     

       270
       250
        
       	if err != nil {

     

       271
       251
        
       		log.Printf("NewPullComment: failed to get repos: %v", err)

     

       272
       252
        
       		return

     

       273
       253
        
       	}

     

       274
       274
       -
       	if len(repos) == 0 {

     

       275
       275
       -
       		log.Printf("NewPullComment: no repo found for %s", comment.RepoAt)

     

       276
       276
       -
       		return

     

       277
       277
       -
       	}

     

       278
       278
       -
       	repo := repos[0]

     

       279
       254
        
       

     

       280
       255
        
       	recipients := make(map[string]bool)

     

       281
       256
        
       

     
···

       335
       310
        
       

     

       336
       311
        
       func (n *databaseNotifier) NewIssueClosed(ctx context.Context, issue *models.Issue) {

     

       337
       312
        
       	// Get repo details

     

       338
       338
       -
       	repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(issue.RepoAt)))

     

       313
       313
       +
       	repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(issue.RepoAt)))

     

       339
       314
        
       	if err != nil {

     

       340
       315
        
       		log.Printf("NewIssueClosed: failed to get repos: %v", err)

     

       341
       316
        
       		return

     

       342
       317
        
       	}

     

       343
       343
       -
       	if len(repos) == 0 {

     

       344
       344
       -
       		log.Printf("NewIssueClosed: no repo found for %s", issue.RepoAt)

     

       345
       345
       -
       		return

     

       346
       346
       -
       	}

     

       347
       347
       -
       	repo := repos[0]

     

       348
       318
        
       

     

       349
       319
        
       	// Don't notify yourself

     

       350
       320
        
       	if repo.Did == issue.Did {

     
···

       380
       350
        
       

     

       381
       351
        
       func (n *databaseNotifier) NewPullMerged(ctx context.Context, pull *models.Pull) {

     

       382
       352
        
       	// Get repo details

     

       383
       383
       -
       	repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(pull.RepoAt)))

     

       353
       353
       +
       	repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(pull.RepoAt)))

     

       384
       354
        
       	if err != nil {

     

       385
       355
        
       		log.Printf("NewPullMerged: failed to get repos: %v", err)

     

       386
       356
        
       		return

     

       387
       357
        
       	}

     

       388
       388
       -
       	if len(repos) == 0 {

     

       389
       389
       -
       		log.Printf("NewPullMerged: no repo found for %s", pull.RepoAt)

     

       390
       390
       -
       		return

     

       391
       391
       -
       	}

     

       392
       392
       -
       	repo := repos[0]

     

       393
       358
        
       

     

       394
       359
        
       	// Don't notify yourself

     

       395
       360
        
       	if repo.Did == pull.OwnerDid {

     
···

       425
       390
        
       

     

       426
       391
        
       func (n *databaseNotifier) NewPullClosed(ctx context.Context, pull *models.Pull) {

     

       427
       392
        
       	// Get repo details

     

       428
       428
       -
       	repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(pull.RepoAt)))

     

       393
       393
       +
       	repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(pull.RepoAt)))

     

       429
       394
        
       	if err != nil {

     

       430
       395
        
       		log.Printf("NewPullClosed: failed to get repos: %v", err)

     

       431
       396
        
       		return

     

       432
       397
        
       	}

     

       433
       433
       -
       	if len(repos) == 0 {

     

       434
       434
       -
       		log.Printf("NewPullClosed: no repo found for %s", pull.RepoAt)

     

       435
       435
       -
       		return

     

       436
       436
       -
       	}

     

       437
       437
       -
       	repo := repos[0]

     

       438
       398
        
       

     

       439
       399
        
       	// Don't notify yourself

     

       440
       400
        
       	if repo.Did == pull.OwnerDid {

+29 -1

appview/models/notifications.go

···

       1
       1
        
       package models

     

       2
       2
        
       

     

       3
       3
       -
       import "time"

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"time"

     

       5
       5
       +
       )

     

       4
       6
        
       

     

       5
       7
        
       type NotificationType string

     

       6
       8
        
       

     
···

       32
       34
        
       	PullId  *int64

     

       33
       35
        
       }

     

       34
       36
        
       

     

       37
       37
       +
       // lucide icon that represents this notification

     

       38
       38
       +
       func (n *Notification) Icon() string {

     

       39
       39
       +
       	switch n.Type {

     

       40
       40
       +
       	case NotificationTypeRepoStarred:

     

       41
       41
       +
       		return "star"

     

       42
       42
       +
       	case NotificationTypeIssueCreated:

     

       43
       43
       +
       		return "circle-dot"

     

       44
       44
       +
       	case NotificationTypeIssueCommented:

     

       45
       45
       +
       		return "message-square"

     

       46
       46
       +
       	case NotificationTypeIssueClosed:

     

       47
       47
       +
       		return "ban"

     

       48
       48
       +
       	case NotificationTypePullCreated:

     

       49
       49
       +
       		return "git-pull-request-create"

     

       50
       50
       +
       	case NotificationTypePullCommented:

     

       51
       51
       +
       		return "message-square"

     

       52
       52
       +
       	case NotificationTypePullMerged:

     

       53
       53
       +
       		return "git-merge"

     

       54
       54
       +
       	case NotificationTypePullClosed:

     

       55
       55
       +
       		return "git-pull-request-closed"

     

       56
       56
       +
       	case NotificationTypeFollowed:

     

       57
       57
       +
       		return "user-plus"

     

       58
       58
       +
       	default:

     

       59
       59
       +
       		return ""

     

       60
       60
       +
       	}

     

       61
       61
       +
       }

     

       62
       62
       +
       

     

       35
       63
        
       type NotificationWithEntity struct {

     

       36
       64
        
       	*Notification

     

       37
       65
        
       	Repo  *Repo

+1 -1

appview/pagination/page.go

···

       8
       8
        
       func FirstPage() Page {

     

       9
       9
        
       	return Page{

     

       10
       10
        
       		Offset: 0,

     

       11
       11
       -
       		Limit:  10,

     

       11
       11
       +
       		Limit:  30,

     

       12
       12
        
       	}

     

       13
       13
        
       }

     

       14
       14

+1 -1

nix/pkgs/knot-unwrapped.nix

···

       4
       4
        
         sqlite-lib,

     

       5
       5
        
         src,

     

       6
       6
        
       }: let

     

       7
       7
       -
         version = "1.9.0-alpha";

     

       7
       7
       +
         version = "1.9.1-alpha";

     

       8
       8
        
       in

     

       9
       9
        
         buildGoApplication {

     

       10
       10
        
           pname = "knot";

+1 -1

appview/pages/templates/layouts/fragments/footer.html

···

       23
       23
        
                 <a href="https://blog.tangled.org" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ i "book-open" $iconStyle }} blog</a>

     

       24
       24
        
                 <a href="https://tangled.org/@tangled.org/core/tree/master/docs" class="{{ $linkStyle }}">{{ i "book" $iconStyle }} docs</a>

     

       25
       25
        
                 <a href="https://tangled.org/@tangled.org/core" class="{{ $linkStyle }}">{{ i "code" $iconStyle }} source</a>

     

       26
       26
       -
                 <a href="https://tangled.org/@tangled.org/core" class="{{ $linkStyle }}">{{ i "paintbrush" $iconStyle }} brand</a>

     

       26
       26
       +
                 <a href="https://tangled.org/brand" class="{{ $linkStyle }}">{{ i "paintbrush" $iconStyle }} brand</a>

     

       27
       27
        
               </div>

     

       28
       28
        
       

     

       29
       29
        
               <div class="flex flex-col gap-1">

+1 -1

appview/signup/signup.go

···

       133
       133
        
       		noticeId := "signup-msg"

     

       134
       134
        
       

     

       135
       135
        
       		if err := s.validateCaptcha(cfToken, r); err != nil {

     

       136
       136
       -
       			s.l.Warn("turnstile validation failed", "error", err)

     

       136
       136
       +
       			s.l.Warn("turnstile validation failed", "error", err, "email", emailId)

     

       137
       137
        
       			s.pages.Notice(w, noticeId, "Captcha validation failed.")

     

       138
       138
        
       			return

     

       139
       139
        
       		}

+1 -1

appview/pages/templates/repo/fragments/cloneDropdown.html

···

       1
       1
        
       {{ define "repo/fragments/cloneDropdown" }}

     

       2
       2
        
           {{ $knot := .RepoInfo.Knot }}

     

       3
       3
        
           {{ if eq $knot "knot1.tangled.sh" }}

     

       4
       4
       -
               {{ $knot = "tangled.sh" }}

     

       4
       4
       +
               {{ $knot = "tangled.org" }}

     

       5
       5
        
           {{ end }}

     

       6
       6
        
       

     

       7
       7
        
           <details id="clone-dropdown" class="relative inline-block text-left group">

+1 -1

docs/spindle/pipeline.md

···

       21
       21
        
         - `manual`: The workflow can be triggered manually.

     

       22
       22
        
       - `branch`: This is a **required** field that defines which branches the workflow should run for. If used with the `push` event, commits to the branch(es) listed here will trigger the workflow. If used with the `pull_request` event, updates to pull requests targeting the branch(es) listed here will trigger the workflow. This field has no effect with the `manual` event.

     

       23
       23
        
       

     

       24
       24
       -
       For example, if you'd like define a workflow that runs when commits are pushed to the `main` and `develop` branches, or when pull requests that target the `main` branch are updated, or manually, you can do so with:

     

       24
       24
       +
       For example, if you'd like to define a workflow that runs when commits are pushed to the `main` and `develop` branches, or when pull requests that target the `main` branch are updated, or manually, you can do so with:

     

       25
       25
        
       

     

       26
       26
        
       ```yaml

     

       27
       27
        
       when:

+1 -1

knotserver/config/config.go

···

       41
       41
        
       	Repo            Repo   `env:",prefix=KNOT_REPO_"`

     

       42
       42
        
       	Server          Server `env:",prefix=KNOT_SERVER_"`

     

       43
       43
        
       	Git             Git    `env:",prefix=KNOT_GIT_"`

     

       44
       44
       -
       	AppViewEndpoint string `env:"APPVIEW_ENDPOINT, default=https://tangled.sh"`

     

       44
       44
       +
       	AppViewEndpoint string `env:"APPVIEW_ENDPOINT, default=https://tangled.org"`

     

       45
       45
        
       }

     

       46
       46
        
       

     

       47
       47
        
       func Load(ctx context.Context) (*Config, error) {

+3

appview/pages/templates/layouts/base.html

···

       14
       14
        
                   <link rel="preconnect" href="https://avatar.tangled.sh" />

     

       15
       15
        
                   <link rel="preconnect" href="https://camo.tangled.sh" />

     

       16
       16
        
       

     

       17
       17
       +
                   <!-- pwa manifest -->

     

       18
       18
       +
                   <link rel="manifest" href="/pwa-manifest.json" />

     

       19
       19
       +
       

     

       17
       20
        
                   <!-- preload main font -->

     

       18
       21
        
                   <link rel="preload" href="/static/fonts/InterVariable.woff2" as="font" type="font/woff2" crossorigin />

     

       19
       22

+1

appview/pages/templates/user/completeSignup.html

···

       20
       20
        
                       content="complete your signup for tangled"

     

       21
       21
        
                   />

     

       22
       22
        
                   <script src="/static/htmx.min.js"></script>

     

       23
       23
       +
                   <link rel="manifest" href="/pwa-manifest.json" />

     

       23
       24
        
                   <link

     

       24
       25
        
                       rel="stylesheet"

     

       25
       26
        
                       href="/static/tw.css?{{ cssContentHash }}"

+1

appview/pages/templates/user/login.html

···

       8
       8
        
                   <meta property="og:url" content="https://tangled.org/login" />

     

       9
       9
        
                   <meta property="og:description" content="login to for tangled" />

     

       10
       10
        
                   <script src="/static/htmx.min.js"></script>

     

       11
       11
       +
                   <link rel="manifest" href="/pwa-manifest.json" />

     

       11
       12
        
                   <link rel="stylesheet" href="/static/tw.css?{{ cssContentHash }}" type="text/css" />

     

       12
       13
        
                   <title>login &middot; tangled</title>

     

       13
       14
        
               </head>

+1

appview/pages/templates/user/signup.html

···

       8
       8
        
                   <meta property="og:url" content="https://tangled.org/signup" />

     

       9
       9
        
                   <meta property="og:description" content="sign up for tangled" />

     

       10
       10
        
                   <script src="/static/htmx.min.js"></script>

     

       11
       11
       +
                   <link rel="manifest" href="/pwa-manifest.json" />

     

       11
       12
        
                   <link rel="stylesheet" href="/static/tw.css?{{ cssContentHash }}" type="text/css" />

     

       12
       13
        
                   <title>sign up &middot; tangled</title>

     

       13
       14

+1

appview/state/router.go

···

       37
       37
        
       	router.Use(middleware.TryRefreshSession())

     

       38
       38
        
       	router.Get("/favicon.svg", s.Favicon)

     

       39
       39
        
       	router.Get("/favicon.ico", s.Favicon)

     

       40
       40
       +
       	router.Get("/pwa-manifest.json", s.PWAManifest)

     

       40
       41
        
       

     

       41
       42
        
       	userRouter := s.UserRouter(&middleware)

     

       42
       43
        
       	standardRouter := s.StandardRouter(&middleware)

+23

appview/state/state.go

···

       198
       198
        
       	s.pages.Favicon(w)

     

       199
       199
        
       }

     

       200
       200
        
       

     

       201
       201
       +
       // https://developer.mozilla.org/en-US/docs/Web/Progressive_web_apps/Manifest

     

       202
       202
       +
       const manifestJson = `{

     

       203
       203
       +
         "name": "tangled",

     

       204
       204
       +
         "description": "tightly-knit social coding.",

     

       205
       205
       +
         "icons": [

     

       206
       206
       +
           {

     

       207
       207
       +
             "src": "/favicon.svg",

     

       208
       208
       +
             "sizes": "144x144"

     

       209
       209
       +
           }

     

       210
       210
       +
         ],

     

       211
       211
       +
         "start_url": "/",

     

       212
       212
       +
         "id": "org.tangled",

     

       213
       213
       +
       

     

       214
       214
       +
         "display": "standalone",

     

       215
       215
       +
         "background_color": "#111827",

     

       216
       216
       +
         "theme_color": "#111827"

     

       217
       217
       +
       }`

     

       218
       218
       +
       

     

       219
       219
       +
       func (p *State) PWAManifest(w http.ResponseWriter, r *http.Request) {

     

       220
       220
       +
       	w.Header().Set("Content-Type", "application/json")

     

       221
       221
       +
       	w.Write([]byte(manifestJson))

     

       222
       222
       +
       }

     

       223
       223
       +
       

     

       201
       224
        
       func (s *State) TermsOfService(w http.ResponseWriter, r *http.Request) {

     

       202
       225
        
       	user := s.oauth.GetUser(r)

     

       203
       226
        
       	s.pages.TermsOfService(w, pages.TermsOfServiceParams{

+34

appview/db/language.go

···

       1
       1
        
       package db

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       +
       	"database/sql"

     

       4
       5
        
       	"fmt"

     

       5
       6
        
       	"strings"

     

       6
       7
        
       

     

       8
       8
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       7
       9
        
       	"tangled.org/core/appview/models"

     

       8
       10
        
       )

     

       9
       11
        
       

     
···

       82
       84
        
       

     

       83
       85
        
       	return nil

     

       84
       86
        
       }

     

       87
       87
       +
       

     

       88
       88
       +
       func DeleteRepoLanguages(e Execer, filters ...filter) error {

     

       89
       89
       +
       	var conditions []string

     

       90
       90
       +
       	var args []any

     

       91
       91
       +
       	for _, filter := range filters {

     

       92
       92
       +
       		conditions = append(conditions, filter.Condition())

     

       93
       93
       +
       		args = append(args, filter.Arg()...)

     

       94
       94
       +
       	}

     

       95
       95
       +
       

     

       96
       96
       +
       	whereClause := ""

     

       97
       97
       +
       	if conditions != nil {

     

       98
       98
       +
       		whereClause = " where " + strings.Join(conditions, " and ")

     

       99
       99
       +
       	}

     

       100
       100
       +
       

     

       101
       101
       +
       	query := fmt.Sprintf(`delete from repo_languages %s`, whereClause)

     

       102
       102
       +
       

     

       103
       103
       +
       	_, err := e.Exec(query, args...)

     

       104
       104
       +
       	return err

     

       105
       105
       +
       }

     

       106
       106
       +
       

     

       107
       107
       +
       func UpdateRepoLanguages(tx *sql.Tx, repoAt syntax.ATURI, ref string, langs []models.RepoLanguage) error {

     

       108
       108
       +
       	err := DeleteRepoLanguages(

     

       109
       109
       +
       		tx,

     

       110
       110
       +
       		FilterEq("repo_at", repoAt),

     

       111
       111
       +
       		FilterEq("ref", ref),

     

       112
       112
       +
       	)

     

       113
       113
       +
       	if err != nil {

     

       114
       114
       +
       		return fmt.Errorf("failed to delete existing languages: %w", err)

     

       115
       115
       +
       	}

     

       116
       116
       +
       

     

       117
       117
       +
       	return InsertRepoLanguages(tx, langs)

     

       118
       118
       +
       }

+12 -1

appview/repo/index.go

···

       200
       200
        
       			})

     

       201
       201
        
       		}

     

       202
       202
        
       

     

       203
       203
       +
       		tx, err := rp.db.Begin()

     

       204
       204
       +
       		if err != nil {

     

       205
       205
       +
       			return nil, err

     

       206
       206
       +
       		}

     

       207
       207
       +
       		defer tx.Rollback()

     

       208
       208
       +
       

     

       203
       209
        
       		// update appview's cache

     

       204
       204
       -
       		err = db.InsertRepoLanguages(rp.db, langs)

     

       210
       210
       +
       		err = db.UpdateRepoLanguages(tx, f.RepoAt(), currentRef, langs)

     

       205
       211
        
       		if err != nil {

     

       206
       212
        
       			// non-fatal

     

       207
       213
        
       			log.Println("failed to cache lang results", err)

     

       208
       214
        
       		}

     

       215
       215
       +
       

     

       216
       216
       +
       		err = tx.Commit()

     

       217
       217
       +
       		if err != nil {

     

       218
       218
       +
       			return nil, err

     

       219
       219
       +
       		}

     

       209
       220
        
       	}

     

       210
       221
        
       

     

       211
       222
        
       	var total int64

+14 -1

appview/state/knotstream.go

···

       172
       172
        
       		})

     

       173
       173
        
       	}

     

       174
       174
        
       

     

       175
       175
       -
       	return db.InsertRepoLanguages(d, langs)

     

       175
       175
       +
       	tx, err := d.Begin()

     

       176
       176
       +
       	if err != nil {

     

       177
       177
       +
       		return err

     

       178
       178
       +
       	}

     

       179
       179
       +
       	defer tx.Rollback()

     

       180
       180
       +
       

     

       181
       181
       +
       	// update appview's cache

     

       182
       182
       +
       	err = db.UpdateRepoLanguages(tx, repo.RepoAt(), ref.Short(), langs)

     

       183
       183
       +
       	if err != nil {

     

       184
       184
       +
       		fmt.Printf("failed; %s\n", err)

     

       185
       185
       +
       		// non-fatal

     

       186
       186
       +
       	}

     

       187
       187
       +
       

     

       188
       188
       +
       	return tx.Commit()

     

       176
       189
        
       }

     

       177
       190
        
       

     

       178
       191
        
       func ingestPipeline(d *db.DB, source ec.Source, msg ec.Message) error {

+202 -1

api/tangled/cbor_gen.go

···

       7420
       7420
        
       	}

     

       7421
       7421
        
       

     

       7422
       7422
        
       	cw := cbg.NewCborWriter(w)

     

       7423
       7423
       -
       	fieldCount := 7

     

       7423
       7423
       +
       	fieldCount := 8

     

       7424
       7424
        
       

     

       7425
       7425
        
       	if t.Body == nil {

     

       7426
       7426
        
       		fieldCount--

     
···

       7430
       7430
        
       		fieldCount--

     

       7431
       7431
        
       	}

     

       7432
       7432
        
       

     

       7433
       7433
       +
       	if t.StackInfo == nil {

     

       7434
       7434
       +
       		fieldCount--

     

       7435
       7435
       +
       	}

     

       7436
       7436
       +
       

     

       7433
       7437
        
       	if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil {

     

       7434
       7438
        
       		return err

     

       7435
       7439
        
       	}

     
···

       7588
       7592
        
       	if _, err := cw.WriteString(string(t.CreatedAt)); err != nil {

     

       7589
       7593
        
       		return err

     

       7590
       7594
        
       	}

     

       7595
       7595
       +
       

     

       7596
       7596
       +
       	// t.StackInfo (tangled.RepoPull_StackInfo) (struct)

     

       7597
       7597
       +
       	if t.StackInfo != nil {

     

       7598
       7598
       +
       

     

       7599
       7599
       +
       		if len("stackInfo") > 1000000 {

     

       7600
       7600
       +
       			return xerrors.Errorf("Value in field \"stackInfo\" was too long")

     

       7601
       7601
       +
       		}

     

       7602
       7602
       +
       

     

       7603
       7603
       +
       		if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("stackInfo"))); err != nil {

     

       7604
       7604
       +
       			return err

     

       7605
       7605
       +
       		}

     

       7606
       7606
       +
       		if _, err := cw.WriteString(string("stackInfo")); err != nil {

     

       7607
       7607
       +
       			return err

     

       7608
       7608
       +
       		}

     

       7609
       7609
       +
       

     

       7610
       7610
       +
       		if err := t.StackInfo.MarshalCBOR(cw); err != nil {

     

       7611
       7611
       +
       			return err

     

       7612
       7612
       +
       		}

     

       7613
       7613
       +
       	}

     

       7591
       7614
        
       	return nil

     

       7592
       7615
        
       }

     

       7593
       7616
        
       

     
···

       7737
       7760
        
       

     

       7738
       7761
        
       				t.CreatedAt = string(sval)

     

       7739
       7762
        
       			}

     

       7763
       7763
       +
       			// t.StackInfo (tangled.RepoPull_StackInfo) (struct)

     

       7764
       7764
       +
       		case "stackInfo":

     

       7765
       7765
       +
       

     

       7766
       7766
       +
       			{

     

       7767
       7767
       +
       

     

       7768
       7768
       +
       				b, err := cr.ReadByte()

     

       7769
       7769
       +
       				if err != nil {

     

       7770
       7770
       +
       					return err

     

       7771
       7771
       +
       				}

     

       7772
       7772
       +
       				if b != cbg.CborNull[0] {

     

       7773
       7773
       +
       					if err := cr.UnreadByte(); err != nil {

     

       7774
       7774
       +
       						return err

     

       7775
       7775
       +
       					}

     

       7776
       7776
       +
       					t.StackInfo = new(RepoPull_StackInfo)

     

       7777
       7777
       +
       					if err := t.StackInfo.UnmarshalCBOR(cr); err != nil {

     

       7778
       7778
       +
       						return xerrors.Errorf("unmarshaling t.StackInfo pointer: %w", err)

     

       7779
       7779
       +
       					}

     

       7780
       7780
       +
       				}

     

       7781
       7781
       +
       

     

       7782
       7782
       +
       			}

     

       7740
       7783
        
       

     

       7741
       7784
        
       		default:

     

       7742
       7785
        
       			// Field doesn't exist on this type, so ignore it

     
···

       7946
       7989
        
       

     

       7947
       7990
        
       	return nil

     

       7948
       7991
        
       }

     

       7992
       7992
       +
       func (t *RepoPull_StackInfo) MarshalCBOR(w io.Writer) error {

     

       7993
       7993
       +
       	if t == nil {

     

       7994
       7994
       +
       		_, err := w.Write(cbg.CborNull)

     

       7995
       7995
       +
       		return err

     

       7996
       7996
       +
       	}

     

       7997
       7997
       +
       

     

       7998
       7998
       +
       	cw := cbg.NewCborWriter(w)

     

       7999
       7999
       +
       	fieldCount := 2

     

       8000
       8000
       +
       

     

       8001
       8001
       +
       	if t.Parent == nil {

     

       8002
       8002
       +
       		fieldCount--

     

       8003
       8003
       +
       	}

     

       8004
       8004
       +
       

     

       8005
       8005
       +
       	if _, err := cw.Write(cbg.CborEncodeMajorType(cbg.MajMap, uint64(fieldCount))); err != nil {

     

       8006
       8006
       +
       		return err

     

       8007
       8007
       +
       	}

     

       8008
       8008
       +
       

     

       8009
       8009
       +
       	// t.Parent (string) (string)

     

       8010
       8010
       +
       	if t.Parent != nil {

     

       8011
       8011
       +
       

     

       8012
       8012
       +
       		if len("parent") > 1000000 {

     

       8013
       8013
       +
       			return xerrors.Errorf("Value in field \"parent\" was too long")

     

       8014
       8014
       +
       		}

     

       8015
       8015
       +
       

     

       8016
       8016
       +
       		if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("parent"))); err != nil {

     

       8017
       8017
       +
       			return err

     

       8018
       8018
       +
       		}

     

       8019
       8019
       +
       		if _, err := cw.WriteString(string("parent")); err != nil {

     

       8020
       8020
       +
       			return err

     

       8021
       8021
       +
       		}

     

       8022
       8022
       +
       

     

       8023
       8023
       +
       		if t.Parent == nil {

     

       8024
       8024
       +
       			if _, err := cw.Write(cbg.CborNull); err != nil {

     

       8025
       8025
       +
       				return err

     

       8026
       8026
       +
       			}

     

       8027
       8027
       +
       		} else {

     

       8028
       8028
       +
       			if len(*t.Parent) > 1000000 {

     

       8029
       8029
       +
       				return xerrors.Errorf("Value in field t.Parent was too long")

     

       8030
       8030
       +
       			}

     

       8031
       8031
       +
       

     

       8032
       8032
       +
       			if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Parent))); err != nil {

     

       8033
       8033
       +
       				return err

     

       8034
       8034
       +
       			}

     

       8035
       8035
       +
       			if _, err := cw.WriteString(string(*t.Parent)); err != nil {

     

       8036
       8036
       +
       				return err

     

       8037
       8037
       +
       			}

     

       8038
       8038
       +
       		}

     

       8039
       8039
       +
       	}

     

       8040
       8040
       +
       

     

       8041
       8041
       +
       	// t.ChangeId (string) (string)

     

       8042
       8042
       +
       	if len("changeId") > 1000000 {

     

       8043
       8043
       +
       		return xerrors.Errorf("Value in field \"changeId\" was too long")

     

       8044
       8044
       +
       	}

     

       8045
       8045
       +
       

     

       8046
       8046
       +
       	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("changeId"))); err != nil {

     

       8047
       8047
       +
       		return err

     

       8048
       8048
       +
       	}

     

       8049
       8049
       +
       	if _, err := cw.WriteString(string("changeId")); err != nil {

     

       8050
       8050
       +
       		return err

     

       8051
       8051
       +
       	}

     

       8052
       8052
       +
       

     

       8053
       8053
       +
       	if len(t.ChangeId) > 1000000 {

     

       8054
       8054
       +
       		return xerrors.Errorf("Value in field t.ChangeId was too long")

     

       8055
       8055
       +
       	}

     

       8056
       8056
       +
       

     

       8057
       8057
       +
       	if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.ChangeId))); err != nil {

     

       8058
       8058
       +
       		return err

     

       8059
       8059
       +
       	}

     

       8060
       8060
       +
       	if _, err := cw.WriteString(string(t.ChangeId)); err != nil {

     

       8061
       8061
       +
       		return err

     

       8062
       8062
       +
       	}

     

       8063
       8063
       +
       	return nil

     

       8064
       8064
       +
       }

     

       8065
       8065
       +
       

     

       8066
       8066
       +
       func (t *RepoPull_StackInfo) UnmarshalCBOR(r io.Reader) (err error) {

     

       8067
       8067
       +
       	*t = RepoPull_StackInfo{}

     

       8068
       8068
       +
       

     

       8069
       8069
       +
       	cr := cbg.NewCborReader(r)

     

       8070
       8070
       +
       

     

       8071
       8071
       +
       	maj, extra, err := cr.ReadHeader()

     

       8072
       8072
       +
       	if err != nil {

     

       8073
       8073
       +
       		return err

     

       8074
       8074
       +
       	}

     

       8075
       8075
       +
       	defer func() {

     

       8076
       8076
       +
       		if err == io.EOF {

     

       8077
       8077
       +
       			err = io.ErrUnexpectedEOF

     

       8078
       8078
       +
       		}

     

       8079
       8079
       +
       	}()

     

       8080
       8080
       +
       

     

       8081
       8081
       +
       	if maj != cbg.MajMap {

     

       8082
       8082
       +
       		return fmt.Errorf("cbor input should be of type map")

     

       8083
       8083
       +
       	}

     

       8084
       8084
       +
       

     

       8085
       8085
       +
       	if extra > cbg.MaxLength {

     

       8086
       8086
       +
       		return fmt.Errorf("RepoPull_StackInfo: map struct too large (%d)", extra)

     

       8087
       8087
       +
       	}

     

       8088
       8088
       +
       

     

       8089
       8089
       +
       	n := extra

     

       8090
       8090
       +
       

     

       8091
       8091
       +
       	nameBuf := make([]byte, 8)

     

       8092
       8092
       +
       	for i := uint64(0); i < n; i++ {

     

       8093
       8093
       +
       		nameLen, ok, err := cbg.ReadFullStringIntoBuf(cr, nameBuf, 1000000)

     

       8094
       8094
       +
       		if err != nil {

     

       8095
       8095
       +
       			return err

     

       8096
       8096
       +
       		}

     

       8097
       8097
       +
       

     

       8098
       8098
       +
       		if !ok {

     

       8099
       8099
       +
       			// Field doesn't exist on this type, so ignore it

     

       8100
       8100
       +
       			if err := cbg.ScanForLinks(cr, func(cid.Cid) {}); err != nil {

     

       8101
       8101
       +
       				return err

     

       8102
       8102
       +
       			}

     

       8103
       8103
       +
       			continue

     

       8104
       8104
       +
       		}

     

       8105
       8105
       +
       

     

       8106
       8106
       +
       		switch string(nameBuf[:nameLen]) {

     

       8107
       8107
       +
       		// t.Parent (string) (string)

     

       8108
       8108
       +
       		case "parent":

     

       8109
       8109
       +
       

     

       8110
       8110
       +
       			{

     

       8111
       8111
       +
       				b, err := cr.ReadByte()

     

       8112
       8112
       +
       				if err != nil {

     

       8113
       8113
       +
       					return err

     

       8114
       8114
       +
       				}

     

       8115
       8115
       +
       				if b != cbg.CborNull[0] {

     

       8116
       8116
       +
       					if err := cr.UnreadByte(); err != nil {

     

       8117
       8117
       +
       						return err

     

       8118
       8118
       +
       					}

     

       8119
       8119
       +
       

     

       8120
       8120
       +
       					sval, err := cbg.ReadStringWithMax(cr, 1000000)

     

       8121
       8121
       +
       					if err != nil {

     

       8122
       8122
       +
       						return err

     

       8123
       8123
       +
       					}

     

       8124
       8124
       +
       

     

       8125
       8125
       +
       					t.Parent = (*string)(&sval)

     

       8126
       8126
       +
       				}

     

       8127
       8127
       +
       			}

     

       8128
       8128
       +
       			// t.ChangeId (string) (string)

     

       8129
       8129
       +
       		case "changeId":

     

       8130
       8130
       +
       

     

       8131
       8131
       +
       			{

     

       8132
       8132
       +
       				sval, err := cbg.ReadStringWithMax(cr, 1000000)

     

       8133
       8133
       +
       				if err != nil {

     

       8134
       8134
       +
       					return err

     

       8135
       8135
       +
       				}

     

       8136
       8136
       +
       

     

       8137
       8137
       +
       				t.ChangeId = string(sval)

     

       8138
       8138
       +
       			}

     

       8139
       8139
       +
       

     

       8140
       8140
       +
       		default:

     

       8141
       8141
       +
       			// Field doesn't exist on this type, so ignore it

     

       8142
       8142
       +
       			if err := cbg.ScanForLinks(r, func(cid.Cid) {}); err != nil {

     

       8143
       8143
       +
       				return err

     

       8144
       8144
       +
       			}

     

       8145
       8145
       +
       		}

     

       8146
       8146
       +
       	}

     

       8147
       8147
       +
       

     

       8148
       8148
       +
       	return nil

     

       8149
       8149
       +
       }

     

       7949
       8150
        
       func (t *RepoPull_Source) MarshalCBOR(w io.Writer) error {

     

       7950
       8151
        
       	if t == nil {

     

       7951
       8152
        
       		_, err := w.Write(cbg.CborNull)

+16 -7

api/tangled/repopull.go

···

       17
       17
        
       } //

     

       18
       18
        
       // RECORDTYPE: RepoPull

     

       19
       19
        
       type RepoPull struct {

     

       20
       20
       -
       	LexiconTypeID string           `json:"$type,const=sh.tangled.repo.pull" cborgen:"$type,const=sh.tangled.repo.pull"`

     

       21
       21
       -
       	Body          *string          `json:"body,omitempty" cborgen:"body,omitempty"`

     

       22
       22
       -
       	CreatedAt     string           `json:"createdAt" cborgen:"createdAt"`

     

       23
       23
       -
       	Patch         string           `json:"patch" cborgen:"patch"`

     

       24
       24
       -
       	Source        *RepoPull_Source `json:"source,omitempty" cborgen:"source,omitempty"`

     

       25
       25
       -
       	Target        *RepoPull_Target `json:"target" cborgen:"target"`

     

       26
       26
       -
       	Title         string           `json:"title" cborgen:"title"`

     

       20
       20
       +
       	LexiconTypeID string              `json:"$type,const=sh.tangled.repo.pull" cborgen:"$type,const=sh.tangled.repo.pull"`

     

       21
       21
       +
       	Body          *string             `json:"body,omitempty" cborgen:"body,omitempty"`

     

       22
       22
       +
       	CreatedAt     string              `json:"createdAt" cborgen:"createdAt"`

     

       23
       23
       +
       	Patch         string              `json:"patch" cborgen:"patch"`

     

       24
       24
       +
       	Source        *RepoPull_Source    `json:"source,omitempty" cborgen:"source,omitempty"`

     

       25
       25
       +
       	StackInfo     *RepoPull_StackInfo `json:"stackInfo,omitempty" cborgen:"stackInfo,omitempty"`

     

       26
       26
       +
       	Target        *RepoPull_Target    `json:"target" cborgen:"target"`

     

       27
       27
       +
       	Title         string              `json:"title" cborgen:"title"`

     

       27
       28
        
       }

     

       28
       29
        
       

     

       29
       30
        
       // RepoPull_Source is a "source" in the sh.tangled.repo.pull schema.

     
···

       33
       34
        
       	Sha    string  `json:"sha" cborgen:"sha"`

     

       34
       35
        
       }

     

       35
       36
        
       

     

       37
       37
       +
       // RepoPull_StackInfo is a "stackInfo" in the sh.tangled.repo.pull schema.

     

       38
       38
       +
       type RepoPull_StackInfo struct {

     

       39
       39
       +
       	// changeId: Change ID of this commit/change.

     

       40
       40
       +
       	ChangeId string `json:"changeId" cborgen:"changeId"`

     

       41
       41
       +
       	// parent: AT-URI of the PR for the parent commit/change in the change stack.

     

       42
       42
       +
       	Parent *string `json:"parent,omitempty" cborgen:"parent,omitempty"`

     

       43
       43
       +
       }

     

       44
       44
       +
       

     

       36
       45
        
       // RepoPull_Target is a "target" in the sh.tangled.repo.pull schema.

     

       37
       46
        
       type RepoPull_Target struct {

     

       38
       47
        
       	Branch string `json:"branch" cborgen:"branch"`

+7

appview/db/db.go

···

       1094
       1094
        
       	})

     

       1095
       1095
        
       	conn.ExecContext(ctx, "pragma foreign_keys = on;")

     

       1096
       1096
        
       

     

       1097
       1097
       +
       	runMigration(conn, "add-parent-at-for-stacks-to-pulls", func(tx *sql.Tx) error {

     

       1098
       1098
       +
       		_, err := tx.Exec(`

     

       1099
       1099
       +
       			alter table pulls add column parent_at text;

     

       1100
       1100
       +
       		`)

     

       1101
       1101
       +
       		return err

     

       1102
       1102
       +
       	})

     

       1103
       1103
       +
       

     

       1097
       1104
        
       	return &DB{db}, nil

     

       1098
       1105
        
       }

     

       1099
       1106

+1

cmd/gen.go

···

       49
       49
        
       		tangled.RepoIssueState{},

     

       50
       50
        
       		tangled.RepoPull{},

     

       51
       51
        
       		tangled.RepoPullComment{},

     

       52
       52
       +
       		tangled.RepoPull_StackInfo{},

     

       52
       53
        
       		tangled.RepoPull_Source{},

     

       53
       54
        
       		tangled.RepoPullStatus{},

     

       54
       55
        
       		tangled.RepoPull_Target{},

+96

lexicons/pulls/round.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "lexicon": 1,

     

       3
       3
       +
         "id": "sh.tangled.repo.pull.round",

     

       4
       4
       +
         "needsCbor": true,

     

       5
       5
       +
         "needsType": true,

     

       6
       6
       +
         "defs": {

     

       7
       7
       +
           "main": {

     

       8
       8
       +
             "type": "record",

     

       9
       9
       +
             "key": "tid",

     

       10
       10
       +
             "record": {

     

       11
       11
       +
               "type": "object",

     

       12
       12
       +
               "required": [

     

       13
       13
       +
                 "pull",

     

       14
       14
       +
                 "patch",

     

       15
       15
       +
                 "sourceInfo",

     

       16
       16
       +
                 "createdAt"

     

       17
       17
       +
               ],

     

       18
       18
       +
               "properties": {

     

       19
       19
       +
                 "pull": {

     

       20
       20
       +
                   "type": "string",

     

       21
       21
       +
                   "format": "at-uri"

     

       22
       22
       +
                 },

     

       23
       23
       +
                 "prevRound": {

     

       24
       24
       +
                   "type": "ref",

     

       25
       25
       +
                   "ref": "com.atproto.repo.strongRef"

     

       26
       26
       +
                 },

     

       27
       27
       +
                 "patch": {

     

       28
       28
       +
                   "type": "string",

     

       29
       29
       +
                   "description": "A patch describing this change. Either gotten directly from the user (patch-based PR) or from the knot based on a commit from another repo. The source of the patch and it's potential details are described by sourceInfo"

     

       30
       30
       +
                 },

     

       31
       31
       +
                 "sourceInfo": {

     

       32
       32
       +
                   "type": "union",

     

       33
       33
       +
                   "refs": [

     

       34
       34
       +
                     "#patchSourceInfo",

     

       35
       35
       +
                     "#commitSourceInfo"

     

       36
       36
       +
                   ]

     

       37
       37
       +
                 },

     

       38
       38
       +
                 "stackInfo": {

     

       39
       39
       +
                   "type": "ref",

     

       40
       40
       +
                   "ref": "#stackInfo"

     

       41
       41
       +
                 },

     

       42
       42
       +
                 "comment": {

     

       43
       43
       +
                   "type": "string"

     

       44
       44
       +
                 },

     

       45
       45
       +
                 "createdAt": {

     

       46
       46
       +
                   "type": "string",

     

       47
       47
       +
                   "format": "datetime"

     

       48
       48
       +
                 }

     

       49
       49
       +
               }

     

       50
       50
       +
             }

     

       51
       51
       +
           },

     

       52
       52
       +
           "patchSourceInfo": {

     

       53
       53
       +
             "type": "object",

     

       54
       54
       +
             "properties": {}

     

       55
       55
       +
           },

     

       56
       56
       +
           "commitSourceInfo": {

     

       57
       57
       +
             "type": "object",

     

       58
       58
       +
             "required": [

     

       59
       59
       +
               "repo",

     

       60
       60
       +
               "branch",

     

       61
       61
       +
               "sha"

     

       62
       62
       +
             ],

     

       63
       63
       +
             "properties": {

     

       64
       64
       +
               "repo": {

     

       65
       65
       +
                 "type": "string",

     

       66
       66
       +
                 "format": "uri"

     

       67
       67
       +
               },

     

       68
       68
       +
               "branch": {

     

       69
       69
       +
                 "type": "string"

     

       70
       70
       +
               },

     

       71
       71
       +
               "sha": {

     

       72
       72
       +
                 "type": "string",

     

       73
       73
       +
                 "minLength": 40,

     

       74
       74
       +
                 "maxLength": 40

     

       75
       75
       +
               }

     

       76
       76
       +
             }

     

       77
       77
       +
           },

     

       78
       78
       +
           "stackInfo": {

     

       79
       79
       +
             "type": "object",

     

       80
       80
       +
             "required": [

     

       81
       81
       +
               "changeId"

     

       82
       82
       +
             ],

     

       83
       83
       +
             "properties": {

     

       84
       84
       +
               "changeId": {

     

       85
       85
       +
                 "type": "string",

     

       86
       86
       +
                 "description": "Change ID of this commit/change."

     

       87
       87
       +
               },

     

       88
       88
       +
               "parent": {

     

       89
       89
       +
                 "type": "string",

     

       90
       90
       +
                 "description": "AT-URI of the PR for the parent commit/change in the change stack.",

     

       91
       91
       +
                 "format": "at-uri"

     

       92
       92
       +
               }

     

       93
       93
       +
             }

     

       94
       94
       +
           }

     

       95
       95
       +
         }

     

       96
       96
       +
       }

Compare changes