comparing 8aab931c24affcd4e06e625447ef2d4a2cd790a5 and push-kyupnpkvqmsy on nel.pet/core

+1 -1

appview/db/label.go

···

       349
       349
        
       		defs[l.AtUri().String()] = &l

     

       350
       350
        
       	}

     

       351
       351
        
       

     

       352
       352
       -
       	return &models.LabelApplicationCtx{defs}, nil

     

       352
       352
       +
       	return &models.LabelApplicationCtx{Defs: defs}, nil

     

       353
       353
        
       }

+15 -15

appview/pages/funcmap.go

···

       141
       141
        
       		"relTimeFmt": humanize.Time,

     

       142
       142
        
       		"shortRelTimeFmt": func(t time.Time) string {

     

       143
       143
        
       			return humanize.CustomRelTime(t, time.Now(), "", "", []humanize.RelTimeMagnitude{

     

       144
       144
       -
       				{time.Second, "now", time.Second},

     

       145
       145
       -
       				{2 * time.Second, "1s %s", 1},

     

       146
       146
       -
       				{time.Minute, "%ds %s", time.Second},

     

       147
       147
       -
       				{2 * time.Minute, "1min %s", 1},

     

       148
       148
       -
       				{time.Hour, "%dmin %s", time.Minute},

     

       149
       149
       -
       				{2 * time.Hour, "1hr %s", 1},

     

       150
       150
       -
       				{humanize.Day, "%dhrs %s", time.Hour},

     

       151
       151
       -
       				{2 * humanize.Day, "1d %s", 1},

     

       152
       152
       -
       				{20 * humanize.Day, "%dd %s", humanize.Day},

     

       153
       153
       -
       				{8 * humanize.Week, "%dw %s", humanize.Week},

     

       154
       154
       -
       				{humanize.Year, "%dmo %s", humanize.Month},

     

       155
       155
       -
       				{18 * humanize.Month, "1y %s", 1},

     

       156
       156
       -
       				{2 * humanize.Year, "2y %s", 1},

     

       157
       157
       -
       				{humanize.LongTime, "%dy %s", humanize.Year},

     

       158
       158
       -
       				{math.MaxInt64, "a long while %s", 1},

     

       144
       144
       +
       				{D: time.Second, Format: "now", DivBy: time.Second},

     

       145
       145
       +
       				{D: 2 * time.Second, Format: "1s %s", DivBy: 1},

     

       146
       146
       +
       				{D: time.Minute, Format: "%ds %s", DivBy: time.Second},

     

       147
       147
       +
       				{D: 2 * time.Minute, Format: "1min %s", DivBy: 1},

     

       148
       148
       +
       				{D: time.Hour, Format: "%dmin %s", DivBy: time.Minute},

     

       149
       149
       +
       				{D: 2 * time.Hour, Format: "1hr %s", DivBy: 1},

     

       150
       150
       +
       				{D: humanize.Day, Format: "%dhrs %s", DivBy: time.Hour},

     

       151
       151
       +
       				{D: 2 * humanize.Day, Format: "1d %s", DivBy: 1},

     

       152
       152
       +
       				{D: 20 * humanize.Day, Format: "%dd %s", DivBy: humanize.Day},

     

       153
       153
       +
       				{D: 8 * humanize.Week, Format: "%dw %s", DivBy: humanize.Week},

     

       154
       154
       +
       				{D: humanize.Year, Format: "%dmo %s", DivBy: humanize.Month},

     

       155
       155
       +
       				{D: 18 * humanize.Month, Format: "1y %s", DivBy: 1},

     

       156
       156
       +
       				{D: 2 * humanize.Year, Format: "2y %s", DivBy: 1},

     

       157
       157
       +
       				{D: humanize.LongTime, Format: "%dy %s", DivBy: humanize.Year},

     

       158
       158
       +
       				{D: math.MaxInt64, Format: "a long while %s", DivBy: 1},

     

       159
       159
        
       			})

     

       160
       160
        
       		},

     

       161
       161
        
       		"longTimeFmt": func(t time.Time) string {

+30

appview/pages/funcmap_test.go

···

       1
       1
       +
       package pages

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"html/template"

     

       5
       5
       +
       	"tangled.org/core/appview/config"

     

       6
       6
       +
       	"tangled.org/core/idresolver"

     

       7
       7
       +
       	"testing"

     

       8
       8
       +
       )

     

       9
       9
       +
       

     

       10
       10
       +
       func TestPages_funcMap(t *testing.T) {

     

       11
       11
       +
       	tests := []struct {

     

       12
       12
       +
       		name string // description of this test case

     

       13
       13
       +
       		// Named input parameters for receiver constructor.

     

       14
       14
       +
       		config *config.Config

     

       15
       15
       +
       		res    *idresolver.Resolver

     

       16
       16
       +
       		want   template.FuncMap

     

       17
       17
       +
       	}{

     

       18
       18
       +
       		// TODO: Add test cases.

     

       19
       19
       +
       	}

     

       20
       20
       +
       	for _, tt := range tests {

     

       21
       21
       +
       		t.Run(tt.name, func(t *testing.T) {

     

       22
       22
       +
       			p := NewPages(tt.config, tt.res)

     

       23
       23
       +
       			got := p.funcMap()

     

       24
       24
       +
       			// TODO: update the condition below to compare got with tt.want.

     

       25
       25
       +
       			if true {

     

       26
       26
       +
       				t.Errorf("funcMap() = %v, want %v", got, tt.want)

     

       27
       27
       +
       			}

     

       28
       28
       +
       		})

     

       29
       29
       +
       	}

     

       30
       30
       +
       }

+1 -1

appview/reporesolver/resolver.go

···

       212
       212
        
       func (f *ResolvedRepo) RolesInRepo(u *oauth.User) repoinfo.RolesInRepo {

     

       213
       213
        
       	if u != nil {

     

       214
       214
        
       		r := f.rr.enforcer.GetPermissionsInRepo(u.Did, f.Knot, f.DidSlashRepo())

     

       215
       215
       -
       		return repoinfo.RolesInRepo{r}

     

       215
       215
       +
       		return repoinfo.RolesInRepo{Roles: r}

     

       216
       216
        
       	} else {

     

       217
       217
        
       		return repoinfo.RolesInRepo{}

     

       218
       218
        
       	}

.tangled/workflows/test.yml

···

       14
       14
        
           command: |

     

       15
       15
        
             mkdir -p appview/pages/static; touch appview/pages/static/x

     

       16
       16
        
       

     

       17
       17
       +
         - name: run linter

     

       18
       18
       +
           environment:

     

       19
       19
       +
             CGO_ENABLED: 1

     

       20
       20
       +
           command: |

     

       21
       21
       +
             go vet -v ./...

     

       22
       22
       +
       

     

       17
       23
        
         - name: run all tests

     

       18
       24
        
           environment:

     

       19
       25
        
             CGO_ENABLED: 1

+1 -1

knotserver/ingester.go

···

       151
       151
        
       		return fmt.Errorf("failed to construct absolute repo path: %w", err)

     

       152
       152
        
       	}

     

       153
       153
        
       

     

       154
       154
       -
       	gr, err := git.Open(repoPath, record.Source.Branch)

     

       154
       154
       +
       	gr, err := git.Open(repoPath, record.Source.Sha)

     

       155
       155
        
       	if err != nil {

     

       156
       156
        
       		return fmt.Errorf("failed to open git repository: %w", err)

     

       157
       157
        
       	}

+11

appview/db/star.go

···

       5
       5
        
       	"errors"

     

       6
       6
        
       	"fmt"

     

       7
       7
        
       	"log"

     

       8
       8
       +
       	"slices"

     

       8
       9
        
       	"strings"

     

       9
       10
        
       	"time"

     

       10
       11
        
       

     
···

       209
       210
        
       		stars = append(stars, s...)

     

       210
       211
        
       	}

     

       211
       212
        
       

     

       213
       213
       +
       	slices.SortFunc(stars, func(a, b models.Star) int {

     

       214
       214
       +
       		if a.Created.After(b.Created) {

     

       215
       215
       +
       			return -1

     

       216
       216
       +
       		}

     

       217
       217
       +
       		if b.Created.After(a.Created) {

     

       218
       218
       +
       			return 1

     

       219
       219
       +
       		}

     

       220
       220
       +
       		return 0

     

       221
       221
       +
       	})

     

       222
       222
       +
       

     

       212
       223
        
       	return stars, nil

     

       213
       224
        
       }

     

       214
       225

+40 -14

appview/repo/artifact.go

···

       4
       4
        
       	"context"

     

       5
       5
        
       	"encoding/json"

     

       6
       6
        
       	"fmt"

     

       7
       7
       +
       	"io"

     

       7
       8
        
       	"log"

     

       8
       9
        
       	"net/http"

     

       9
       10
        
       	"net/url"

     
···

       134
       135
        
       	})

     

       135
       136
        
       }

     

       136
       137
        
       

     

       137
       137
       -
       // TODO: proper statuses here on early exit

     

       138
       138
        
       func (rp *Repo) DownloadArtifact(w http.ResponseWriter, r *http.Request) {

     

       139
       139
       -
       	tagParam := chi.URLParam(r, "tag")

     

       140
       140
       -
       	filename := chi.URLParam(r, "file")

     

       141
       139
        
       	f, err := rp.repoResolver.Resolve(r)

     

       142
       140
        
       	if err != nil {

     

       143
       141
        
       		log.Println("failed to get repo and knot", err)

     

       142
       142
       +
       		http.Error(w, "failed to resolve repo", http.StatusInternalServerError)

     

       144
       143
        
       		return

     

       145
       144
        
       	}

     

       146
       145
        
       

     

       146
       146
       +
       	tagParam := chi.URLParam(r, "tag")

     

       147
       147
       +
       	filename := chi.URLParam(r, "file")

     

       148
       148
       +
       

     

       147
       149
        
       	tag, err := rp.resolveTag(r.Context(), f, tagParam)

     

       148
       150
        
       	if err != nil {

     

       149
       151
        
       		log.Println("failed to resolve tag", err)

     
···

       151
       153
        
       		return

     

       152
       154
        
       	}

     

       153
       155
        
       

     

       154
       154
       -
       	client, err := rp.oauth.AuthorizedClient(r)

     

       155
       155
       -
       	if err != nil {

     

       156
       156
       -
       		log.Println("failed to get authorized client", err)

     

       157
       157
       -
       		return

     

       158
       158
       -
       	}

     

       159
       159
       -
       

     

       160
       156
        
       	artifacts, err := db.GetArtifact(

     

       161
       157
        
       		rp.db,

     

       162
       158
        
       		db.FilterEq("repo_at", f.RepoAt()),

     
···

       165
       161
        
       	)

     

       166
       162
        
       	if err != nil {

     

       167
       163
        
       		log.Println("failed to get artifacts", err)

     

       164
       164
       +
       		http.Error(w, "failed to get artifact", http.StatusInternalServerError)

     

       168
       165
        
       		return

     

       169
       166
        
       	}

     

       167
       167
       +
       

     

       170
       168
        
       	if len(artifacts) != 1 {

     

       171
       171
       -
       		log.Printf("too many or too little artifacts found")

     

       169
       169
       +
       		log.Printf("too many or too few artifacts found")

     

       170
       170
       +
       		http.Error(w, "artifact not found", http.StatusNotFound)

     

       172
       171
        
       		return

     

       173
       172
        
       	}

     

       174
       173
        
       

     

       175
       174
        
       	artifact := artifacts[0]

     

       176
       175
        
       

     

       177
       177
       -
       	getBlobResp, err := client.SyncGetBlob(r.Context(), artifact.BlobCid.String(), artifact.Did)

     

       176
       176
       +
       	ownerPds := f.OwnerId.PDSEndpoint()

     

       177
       177
       +
       	url, _ := url.Parse(fmt.Sprintf("%s/xrpc/com.atproto.sync.getBlob", ownerPds))

     

       178
       178
       +
       	q := url.Query()

     

       179
       179
       +
       	q.Set("cid", artifact.BlobCid.String())

     

       180
       180
       +
       	q.Set("did", artifact.Did)

     

       181
       181
       +
       	url.RawQuery = q.Encode()

     

       182
       182
       +
       

     

       183
       183
       +
       	req, err := http.NewRequest(http.MethodGet, url.String(), nil)

     

       178
       184
        
       	if err != nil {

     

       179
       179
       -
       		log.Println("failed to get blob from pds", err)

     

       185
       185
       +
       		log.Println("failed to create request", err)

     

       186
       186
       +
       		http.Error(w, "failed to create request", http.StatusInternalServerError)

     

       180
       187
        
       		return

     

       181
       188
        
       	}

     

       189
       189
       +
       	req.Header.Set("Content-Type", "application/json")

     

       182
       190
        
       

     

       183
       183
       -
       	w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=%q", filename))

     

       184
       184
       -
       	w.Write(getBlobResp)

     

       191
       191
       +
       	resp, err := http.DefaultClient.Do(req)

     

       192
       192
       +
       	if err != nil {

     

       193
       193
       +
       		log.Println("failed to make request", err)

     

       194
       194
       +
       		http.Error(w, "failed to make request to PDS", http.StatusInternalServerError)

     

       195
       195
       +
       		return

     

       196
       196
       +
       	}

     

       197
       197
       +
       	defer resp.Body.Close()

     

       198
       198
       +
       

     

       199
       199
       +
       	// copy status code and relevant headers from upstream response

     

       200
       200
       +
       	w.WriteHeader(resp.StatusCode)

     

       201
       201
       +
       	for key, values := range resp.Header {

     

       202
       202
       +
       		for _, v := range values {

     

       203
       203
       +
       			w.Header().Add(key, v)

     

       204
       204
       +
       		}

     

       205
       205
       +
       	}

     

       206
       206
       +
       

     

       207
       207
       +
       	// stream the body directly to the client

     

       208
       208
       +
       	if _, err := io.Copy(w, resp.Body); err != nil {

     

       209
       209
       +
       		log.Println("error streaming response to client:", err)

     

       210
       210
       +
       	}

     

       185
       211
        
       }

     

       186
       212
        
       

     

       187
       213
        
       // TODO: proper statuses here on early exit

+2 -3

appview/repo/router.go

···

       21
       21
        
       	r.Route("/tags", func(r chi.Router) {

     

       22
       22
        
       		r.Get("/", rp.RepoTags)

     

       23
       23
        
       		r.Route("/{tag}", func(r chi.Router) {

     

       24
       24
       -
       			r.Use(middleware.AuthMiddleware(rp.oauth))

     

       25
       25
       -
       			// require auth to download for now

     

       26
       24
        
       			r.Get("/download/{file}", rp.DownloadArtifact)

     

       27
       25
        
       

     

       28
       26
        
       			// require repo:push to upload or delete artifacts

     
···

       30
       28
        
       			// additionally: only the uploader can truly delete an artifact

     

       31
       29
        
       			// (record+blob will live on their pds)

     

       32
       30
        
       			r.Group(func(r chi.Router) {

     

       33
       33
       -
       				r.With(mw.RepoPermissionMiddleware("repo:push"))

     

       31
       31
       +
       				r.Use(middleware.AuthMiddleware(rp.oauth))

     

       32
       32
       +
       				r.Use(mw.RepoPermissionMiddleware("repo:push"))

     

       34
       33
        
       				r.Post("/upload", rp.AttachArtifact)

     

       35
       34
        
       				r.Delete("/{file}", rp.DeleteArtifact)

     

       36
       35
        
       			})

+36 -6

appview/pages/templates/repo/settings/general.html

···

       46
       46
        
       

     

       47
       47
        
       {{ define "defaultLabelSettings" }}

     

       48
       48
        
         <div class="flex flex-col gap-2">

     

       49
       49
       -
           <h2 class="text-sm pb-2 uppercase font-bold">Default Labels</h2>

     

       50
       50
       -
           <p class="text-gray-500 dark:text-gray-400">

     

       51
       51
       -
             Manage your issues and pulls by creating labels to categorize them. Only

     

       52
       52
       -
             repository owners may configure labels. You may choose to subscribe to

     

       53
       53
       -
             default labels, or create entirely custom labels.

     

       54
       54
       -
           </p>

     

       49
       49
       +
           <div class="grid grid-cols-1 md:grid-cols-3 gap-4 items-center">

     

       50
       50
       +
             <div class="col-span-1 md:col-span-2">

     

       51
       51
       +
               <h2 class="text-sm pb-2 uppercase font-bold">Default Labels</h2>

     

       52
       52
       +
               <p class="text-gray-500 dark:text-gray-400">

     

       53
       53
       +
                 Manage your issues and pulls by creating labels to categorize them. Only

     

       54
       54
       +
                 repository owners may configure labels. You may choose to subscribe to

     

       55
       55
       +
                 default labels, or create entirely custom labels.

     

       56
       56
       +
               <p>

     

       57
       57
       +
             </div>

     

       58
       58
       +
             <form class="col-span-1 md:col-span-1 md:justify-self-end">

     

       59
       59
       +
               {{ $title := "Unubscribe from all labels" }}

     

       60
       60
       +
               {{ $icon := "x" }}

     

       61
       61
       +
               {{ $text := "unsubscribe all" }}

     

       62
       62
       +
               {{ $action := "unsubscribe" }}

     

       63
       63
       +
               {{ if $.ShouldSubscribeAll }}

     

       64
       64
       +
                 {{ $title = "Subscribe to all labels" }}

     

       65
       65
       +
                 {{ $icon = "check-check" }}

     

       66
       66
       +
                 {{ $text = "subscribe all" }}

     

       67
       67
       +
                 {{ $action = "subscribe" }}

     

       68
       68
       +
               {{ end }}

     

       69
       69
       +
               {{ range .DefaultLabels }}

     

       70
       70
       +
                 <input type="hidden" name="label" value="{{ .AtUri.String }}">

     

       71
       71
       +
               {{ end }}

     

       72
       72
       +
               <button

     

       73
       73
       +
                 type="submit"

     

       74
       74
       +
                 title="{{$title}}" 

     

       75
       75
       +
                 class="btn flex items-center gap-2 group"

     

       76
       76
       +
                 hx-swap="none"

     

       77
       77
       +
                 hx-post="/{{ $.RepoInfo.FullName }}/settings/label/{{$action}}"

     

       78
       78
       +
                 {{ if not .RepoInfo.Roles.IsOwner }}disabled{{ end }}>

     

       79
       79
       +
                 {{ i $icon "size-4" }}

     

       80
       80
       +
                 {{ $text }}

     

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

     

       82
       82
       +
               </button>

     

       83
       83
       +
             </form>

     

       84
       84
       +
           </div>

     

       55
       85
        
           <div class="flex flex-col rounded border border-gray-200 dark:border-gray-700 divide-y divide-gray-200 dark:divide-gray-700 w-full">

     

       56
       86
        
             {{ range .DefaultLabels }}

     

       57
       87
        
               <div id="label-{{.Id}}" class="flex items-center justify-between p-2 pl-4">

+10 -33

appview/pages/templates/timeline/fragments/timeline.html

···

       82
       82
        
         {{ $event := index . 1 }}

     

       83
       83
        
         {{ $follow := $event.Follow }}

     

       84
       84
        
         {{ $profile := $event.Profile }}

     

       85
       85
       -
         {{ $stat := $event.FollowStats }}

     

       85
       85
       +
         {{ $followStats := $event.FollowStats }}

     

       86
       86
       +
         {{ $followStatus := $event.FollowStatus }}

     

       86
       87
        
       

     

       87
       88
        
         {{ $userHandle :=  resolve $follow.UserDid }}

     

       88
       89
        
         {{ $subjectHandle :=  resolve $follow.SubjectDid }}

     
···

       92
       93
        
             {{ template "user/fragments/picHandleLink" $subjectHandle }}

     

       93
       94
        
             <span class="text-gray-700 dark:text-gray-400 text-xs">{{ template "repo/fragments/time" $follow.FollowedAt }}</span>

     

       94
       95
        
         </div>

     

       95
       95
       -
         <div class="py-4 px-6 drop-shadow-sm rounded bg-white dark:bg-gray-800 flex flex-col md:flex-row md:items-center gap-4">

     

       96
       96
       -
           <div class="flex items-center gap-4 flex-1">

     

       97
       97
       -
             <div class="flex-shrink-0 max-h-full w-24 h-24">

     

       98
       98
       -
               <img alt="" class="object-cover rounded-full p-2" src="{{ fullAvatar $subjectHandle }}" />

     

       99
       99
       -
             </div>

     

       100
       100
       -
       

     

       101
       101
       -
             <div class="flex-1 min-h-0 justify-around flex flex-col">

     

       102
       102
       -
               <a href="/{{ $subjectHandle }}">

     

       103
       103
       -
                 <span class="font-bold dark:text-white overflow-hidden text-ellipsis whitespace-nowrap max-w-full">{{ $subjectHandle | truncateAt30 }}</span>

     

       104
       104
       -
               </a>

     

       105
       105
       -
               {{ with $profile }}

     

       106
       106
       -
                 {{ with .Description }}

     

       107
       107
       -
                   <p class="text-sm pb-2 md:pb-2">{{.}}</p>

     

       108
       108
       -
                 {{ end }}

     

       109
       109
       -
               {{ end }}

     

       110
       110
       -
               {{ with $stat }}

     

       111
       111
       -
                 <div class="text-sm flex items-center gap-2 my-2 overflow-hidden text-ellipsis whitespace-nowrap max-w-full">

     

       112
       112
       -
                   <span class="flex-shrink-0">{{ i "users" "size-4" }}</span>

     

       113
       113
       -
                   <span id="followers"><a href="/{{ $subjectHandle }}?tab=followers">{{ .Followers }} followers</a></span>

     

       114
       114
       -
                   <span class="select-none after:content-['·']"></span>

     

       115
       115
       -
                   <span id="following"><a href="/{{ $subjectHandle }}?tab=following">{{ .Following }} following</a></span>

     

       116
       116
       -
                 </div>

     

       117
       117
       -
               {{ end }}

     

       118
       118
       -
             </div>

     

       119
       119
       -
           </div>

     

       120
       120
       -
           

     

       121
       121
       -
           {{ if and $root.LoggedInUser (ne $event.FollowStatus.String "IsSelf") }}

     

       122
       122
       -
             <div class="flex-shrink-0 w-fit ml-auto">

     

       123
       123
       -
               {{ template "user/fragments/follow" (dict "UserDid" $follow.SubjectDid "FollowStatus" $event.FollowStatus) }}

     

       124
       124
       -
             </div>

     

       125
       125
       -
           {{ end }}

     

       126
       126
       -
         </div>

     

       96
       96
       +
         {{ template "user/fragments/followCard" 

     

       97
       97
       +
             (dict

     

       98
       98
       +
                 "LoggedInUser" $root.LoggedInUser

     

       99
       99
       +
                 "UserDid" $follow.SubjectDid

     

       100
       100
       +
                 "Profile" $profile

     

       101
       101
       +
                 "FollowStatus" $followStatus

     

       102
       102
       +
                 "FollowersCount" $followStats.Followers

     

       103
       103
       +
                 "FollowingCount" $followStats.Following) }}

     

       127
       104
        
       {{ end }}

+8 -1

appview/pages/templates/user/followers.html

···

       10
       10
        
         <p class="text-sm font-bold p-2 dark:text-white">ALL FOLLOWERS</p>

     

       11
       11
        
         <div id="followers" class="grid grid-cols-1 gap-4 mb-6">

     

       12
       12
        
           {{ range .Followers }}

     

       13
       13
       -
              {{ template "user/fragments/followCard" . }}

     

       13
       13
       +
              {{ template "user/fragments/followCard"

     

       14
       14
       +
                 (dict

     

       15
       15
       +
                     "LoggedInUser" $.LoggedInUser

     

       16
       16
       +
                     "UserDid" .UserDid

     

       17
       17
       +
                     "Profile" .Profile

     

       18
       18
       +
                     "FollowStatus" .FollowStatus

     

       19
       19
       +
                     "FollowersCount" .FollowersCount

     

       20
       20
       +
                     "FollowingCount" .FollowingCount) }}

     

       14
       21
        
           {{ else }}

     

       15
       22
        
               <p class="px-6 dark:text-white">This user does not have any followers yet.</p>

     

       16
       23
        
           {{ end }}

+8 -1

appview/pages/templates/user/following.html

···

       10
       10
        
         <p class="text-sm font-bold p-2 dark:text-white">ALL FOLLOWING</p>

     

       11
       11
        
         <div id="following" class="grid grid-cols-1 gap-4 mb-6">

     

       12
       12
        
           {{ range .Following }}

     

       13
       13
       -
              {{ template "user/fragments/followCard" . }}

     

       13
       13
       +
              {{ template "user/fragments/followCard"

     

       14
       14
       +
                 (dict

     

       15
       15
       +
                     "LoggedInUser" $.LoggedInUser

     

       16
       16
       +
                     "UserDid" .UserDid

     

       17
       17
       +
                     "Profile" .Profile

     

       18
       18
       +
                     "FollowStatus" .FollowStatus

     

       19
       19
       +
                     "FollowersCount" .FollowersCount

     

       20
       20
       +
                     "FollowingCount" .FollowingCount) }}

     

       14
       21
        
           {{ else }}

     

       15
       22
        
               <p class="px-6 dark:text-white">This user does not follow anyone yet.</p>

     

       16
       23
        
           {{ end }}

+6 -2

appview/pages/templates/user/fragments/follow.html

···

       1
       1
        
       {{ define "user/fragments/follow" }}

     

       2
       2
        
         <button id="{{ normalizeForHtmlId .UserDid }}"

     

       3
       3
       -
           class="btn mt-2 flex gap-2 items-center group"

     

       3
       3
       +
           class="btn w-full flex gap-2 items-center group"

     

       4
       4
        
       

     

       5
       5
        
           {{ if eq .FollowStatus.String "IsNotFollowing" }}

     

       6
       6
        
           hx-post="/follow?subject={{.UserDid}}"

     
···

       12
       12
        
           hx-target="#{{ normalizeForHtmlId .UserDid }}"

     

       13
       13
        
           hx-swap="outerHTML"

     

       14
       14
        
           >

     

       15
       15
       -
           {{ if eq .FollowStatus.String "IsNotFollowing" }}{{ i "user-round-plus" "w-4 h-4" }} follow{{ else }}{{ i "user-round-minus" "w-4 h-4" }} unfollow{{ end }}

     

       15
       15
       +
           {{ if eq .FollowStatus.String "IsNotFollowing" }}

     

       16
       16
       +
             {{ i "user-round-plus" "w-4 h-4" }} follow

     

       17
       17
       +
           {{ else }}

     

       18
       18
       +
             {{ i "user-round-minus" "w-4 h-4" }} unfollow

     

       19
       19
       +
           {{ end }}

     

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

     

       17
       21
        
         </button>

     

       18
       22
        
       {{ end }}

+10 -10

appview/pages/templates/user/fragments/repoCard.html

···

       14
       14
        
         {{ with $repo }}

     

       15
       15
        
           <div class="py-4 px-6 gap-1 flex flex-col drop-shadow-sm rounded bg-white dark:bg-gray-800 min-h-32">

     

       16
       16
        
             <div class="font-medium dark:text-white flex items-center justify-between">

     

       17
       17
       -
               <div class="flex items-center">

     

       18
       18
       -
               {{ if .Source }}

     

       19
       19
       -
                 {{ i "git-fork" "w-4 h-4 mr-1.5 shrink-0" }}

     

       20
       20
       -
               {{ else }}

     

       21
       21
       -
                 {{ i "book-marked" "w-4 h-4 mr-1.5 shrink-0" }}

     

       22
       22
       -
               {{ end }}

     

       23
       23
       -
       

     

       17
       17
       +
               <div class="flex items-center min-w-0 flex-1 mr-2">

     

       18
       18
       +
                 {{ if .Source }}

     

       19
       19
       +
                   {{ i "git-fork" "w-4 h-4 mr-1.5 shrink-0" }}

     

       20
       20
       +
                 {{ else }}

     

       21
       21
       +
                   {{ i "book-marked" "w-4 h-4 mr-1.5 shrink-0" }}

     

       22
       22
       +
                 {{ end }}

     

       24
       23
        
                 {{ $repoOwner := resolve .Did }}

     

       25
       24
        
                 {{- if $fullName -}}

     

       26
       26
       -
                   <a href="/{{ $repoOwner }}/{{ .Name }}" class="truncate">{{ $repoOwner }}/{{ .Name }}</a>

     

       25
       25
       +
                   <a href="/{{ $repoOwner }}/{{ .Name }}" class="truncate min-w-0">{{ $repoOwner }}/{{ .Name }}</a>

     

       27
       26
        
                 {{- else -}}

     

       28
       28
       -
                   <a href="/{{ $repoOwner }}/{{ .Name }}" class="truncate">{{ .Name }}</a>

     

       27
       27
       +
                   <a href="/{{ $repoOwner }}/{{ .Name }}" class="truncate min-w-0">{{ .Name }}</a>

     

       29
       28
        
                 {{- end -}}

     

       30
       29
        
               </div>

     

       31
       31
       -
               

     

       32
       30
        
               {{ if and $starButton $root.LoggedInUser }}

     

       31
       31
       +
               <div class="shrink-0">

     

       33
       32
        
                 {{ template "repo/fragments/repoStar" $starData }}

     

       33
       33
       +
               </div>

     

       34
       34
        
               {{ end }}

     

       35
       35
        
             </div>

     

       36
       36
        
             {{ with .Description }}

appview/models/repo.go

···

       10
       10
        
       )

     

       11
       11
        
       

     

       12
       12
        
       type Repo struct {

     

       13
       13
       +
       	Id          int64

     

       13
       14
        
       	Did         string

     

       14
       15
        
       	Name        string

     

       15
       16
        
       	Knot        string

+58 -3

appview/posthog/notifier.go appview/notify/posthog/notifier.go

···

       1
       1
       -
       package posthog_service

     

       1
       1
       +
       package posthog

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     
···

       98
       98
        
       	}

     

       99
       99
        
       }

     

       100
       100
        
       

     

       101
       101
       +
       func (n *posthogNotifier) NewPullClosed(ctx context.Context, pull *models.Pull) {

     

       102
       102
       +
       	err := n.client.Enqueue(posthog.Capture{

     

       103
       103
       +
       		DistinctId: pull.OwnerDid,

     

       104
       104
       +
       		Event:      "pull_closed",

     

       105
       105
       +
       		Properties: posthog.Properties{

     

       106
       106
       +
       			"repo_at": pull.RepoAt,

     

       107
       107
       +
       			"pull_id": pull.PullId,

     

       108
       108
       +
       		},

     

       109
       109
       +
       	})

     

       110
       110
       +
       	if err != nil {

     

       111
       111
       +
       		log.Println("failed to enqueue posthog event:", err)

     

       112
       112
       +
       	}

     

       113
       113
       +
       }

     

       114
       114
       +
       

     

       101
       115
        
       func (n *posthogNotifier) NewFollow(ctx context.Context, follow *models.Follow) {

     

       102
       116
        
       	err := n.client.Enqueue(posthog.Capture{

     

       103
       117
        
       		DistinctId: follow.UserDid,

     
···

       152
       166
        
       	}

     

       153
       167
        
       }

     

       154
       168
        
       

     

       155
       155
       -
       func (n *posthogNotifier) CreateString(ctx context.Context, string models.String) {

     

       169
       169
       +
       func (n *posthogNotifier) NewString(ctx context.Context, string *models.String) {

     

       156
       170
        
       	err := n.client.Enqueue(posthog.Capture{

     

       157
       171
        
       		DistinctId: string.Did.String(),

     

       158
       158
       -
       		Event:      "create_string",

     

       172
       172
       +
       		Event:      "new_string",

     

       159
       173
        
       		Properties: posthog.Properties{"rkey": string.Rkey},

     

       160
       174
        
       	})

     

       161
       175
        
       	if err != nil {

     

       162
       176
        
       		log.Println("failed to enqueue posthog event:", err)

     

       163
       177
        
       	}

     

       164
       178
        
       }

     

       179
       179
       +
       

     

       180
       180
       +
       func (n *posthogNotifier) NewIssueComment(ctx context.Context, comment *models.IssueComment) {

     

       181
       181
       +
       	err := n.client.Enqueue(posthog.Capture{

     

       182
       182
       +
       		DistinctId: comment.Did,

     

       183
       183
       +
       		Event:      "new_issue_comment",

     

       184
       184
       +
       		Properties: posthog.Properties{

     

       185
       185
       +
       			"issue_at": comment.IssueAt,

     

       186
       186
       +
       		},

     

       187
       187
       +
       	})

     

       188
       188
       +
       	if err != nil {

     

       189
       189
       +
       		log.Println("failed to enqueue posthog event:", err)

     

       190
       190
       +
       	}

     

       191
       191
       +
       }

     

       192
       192
       +
       

     

       193
       193
       +
       func (n *posthogNotifier) NewIssueClosed(ctx context.Context, issue *models.Issue) {

     

       194
       194
       +
       	err := n.client.Enqueue(posthog.Capture{

     

       195
       195
       +
       		DistinctId: issue.Did,

     

       196
       196
       +
       		Event:      "issue_closed",

     

       197
       197
       +
       		Properties: posthog.Properties{

     

       198
       198
       +
       			"repo_at":  issue.RepoAt.String(),

     

       199
       199
       +
       			"issue_id": issue.IssueId,

     

       200
       200
       +
       		},

     

       201
       201
       +
       	})

     

       202
       202
       +
       	if err != nil {

     

       203
       203
       +
       		log.Println("failed to enqueue posthog event:", err)

     

       204
       204
       +
       	}

     

       205
       205
       +
       }

     

       206
       206
       +
       

     

       207
       207
       +
       func (n *posthogNotifier) NewPullMerged(ctx context.Context, pull *models.Pull) {

     

       208
       208
       +
       	err := n.client.Enqueue(posthog.Capture{

     

       209
       209
       +
       		DistinctId: pull.OwnerDid,

     

       210
       210
       +
       		Event:      "pull_merged",

     

       211
       211
       +
       		Properties: posthog.Properties{

     

       212
       212
       +
       			"repo_at": pull.RepoAt,

     

       213
       213
       +
       			"pull_id": pull.PullId,

     

       214
       214
       +
       		},

     

       215
       215
       +
       	})

     

       216
       216
       +
       	if err != nil {

     

       217
       217
       +
       		log.Println("failed to enqueue posthog event:", err)

     

       218
       218
       +
       	}

     

       219
       219
       +
       }

+36 -6

appview/db/repos.go

···

       10
       10
        
       	"time"

     

       11
       11
        
       

     

       12
       12
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       13
       13
       +
       	securejoin "github.com/cyphar/filepath-securejoin"

     

       14
       14
       +
       	"tangled.org/core/api/tangled"

     

       13
       15
        
       	"tangled.org/core/appview/models"

     

       14
       16
        
       )

     

       15
       17
        
       

     

       18
       18
       +
       type Repo struct {

     

       19
       19
       +
       	Id          int64

     

       20
       20
       +
       	Did         string

     

       21
       21
       +
       	Name        string

     

       22
       22
       +
       	Knot        string

     

       23
       23
       +
       	Rkey        string

     

       24
       24
       +
       	Created     time.Time

     

       25
       25
       +
       	Description string

     

       26
       26
       +
       	Spindle     string

     

       27
       27
       +
       

     

       28
       28
       +
       	// optionally, populate this when querying for reverse mappings

     

       29
       29
       +
       	RepoStats *models.RepoStats

     

       30
       30
       +
       

     

       31
       31
       +
       	// optional

     

       32
       32
       +
       	Source string

     

       33
       33
       +
       }

     

       34
       34
       +
       

     

       35
       35
       +
       func (r Repo) RepoAt() syntax.ATURI {

     

       36
       36
       +
       	return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", r.Did, tangled.RepoNSID, r.Rkey))

     

       37
       37
       +
       }

     

       38
       38
       +
       

     

       39
       39
       +
       func (r Repo) DidSlashRepo() string {

     

       40
       40
       +
       	p, _ := securejoin.SecureJoin(r.Did, r.Name)

     

       41
       41
       +
       	return p

     

       42
       42
       +
       }

     

       43
       43
       +
       

     

       16
       44
        
       func GetRepos(e Execer, limit int, filters ...filter) ([]models.Repo, error) {

     

       17
       45
        
       	repoMap := make(map[syntax.ATURI]*models.Repo)

     

       18
       46
        
       

     
···

       35
       63
        
       

     

       36
       64
        
       	repoQuery := fmt.Sprintf(

     

       37
       65
        
       		`select

     

       66
       66
       +
       			id,

     

       38
       67
        
       			did,

     

       39
       68
        
       			name,

     

       40
       69
        
       			knot,

     
···

       63
       92
        
       		var description, source, spindle sql.NullString

     

       64
       93
        
       

     

       65
       94
        
       		err := rows.Scan(

     

       95
       95
       +
       			&repo.Id,

     

       66
       96
        
       			&repo.Did,

     

       67
       97
        
       			&repo.Name,

     

       68
       98
        
       			&repo.Knot,

     
···

       327
       357
        
       	var repo models.Repo

     

       328
       358
        
       	var nullableDescription sql.NullString

     

       329
       359
        
       

     

       330
       330
       -
       	row := e.QueryRow(`select did, name, knot, created, rkey, description from repos where at_uri = ?`, atUri)

     

       360
       360
       +
       	row := e.QueryRow(`select id, did, name, knot, created, rkey, description from repos where at_uri = ?`, atUri)

     

       331
       361
        
       

     

       332
       362
        
       	var createdAt string

     

       333
       333
       -
       	if err := row.Scan(&repo.Did, &repo.Name, &repo.Knot, &createdAt, &repo.Rkey, &nullableDescription); err != nil {

     

       363
       363
       +
       	if err := row.Scan(&repo.Id, &repo.Did, &repo.Name, &repo.Knot, &createdAt, &repo.Rkey, &nullableDescription); err != nil {

     

       334
       364
        
       		return nil, err

     

       335
       365
        
       	}

     

       336
       366
        
       	createdAtTime, _ := time.Parse(time.RFC3339, createdAt)

     
···

       386
       416
        
       	var repos []models.Repo

     

       387
       417
        
       

     

       388
       418
        
       	rows, err := e.Query(

     

       389
       389
       -
       		`select distinct r.did, r.name, r.knot, r.rkey, r.description, r.created, r.source

     

       419
       419
       +
       		`select distinct r.id, r.did, r.name, r.knot, r.rkey, r.description, r.created, r.source

     

       390
       420
        
       		from repos r

     

       391
       421
        
       		left join collaborators c on r.at_uri = c.repo_at

     

       392
       422
        
       		where (r.did = ? or c.subject_did = ?)

     
···

       406
       436
        
       		var nullableDescription sql.NullString

     

       407
       437
        
       		var nullableSource sql.NullString

     

       408
       438
        
       

     

       409
       409
       -
       		err := rows.Scan(&repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &nullableDescription, &createdAt, &nullableSource)

     

       439
       439
       +
       		err := rows.Scan(&repo.Id, &repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &nullableDescription, &createdAt, &nullableSource)

     

       410
       440
        
       		if err != nil {

     

       411
       441
        
       			return nil, err

     

       412
       442
        
       		}

     
···

       443
       473
        
       	var nullableSource sql.NullString

     

       444
       474
        
       

     

       445
       475
        
       	row := e.QueryRow(

     

       446
       446
       -
       		`select did, name, knot, rkey, description, created, source

     

       476
       476
       +
       		`select id, did, name, knot, rkey, description, created, source

     

       447
       477
        
       		from repos

     

       448
       478
        
       		where did = ? and name = ? and source is not null and source != ''`,

     

       449
       479
        
       		did, name,

     

       450
       480
        
       	)

     

       451
       481
        
       

     

       452
       452
       -
       	err := row.Scan(&repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &nullableDescription, &createdAt, &nullableSource)

     

       482
       482
       +
       	err := row.Scan(&repo.Id, &repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &nullableDescription, &createdAt, &nullableSource)

     

       453
       483
        
       	if err != nil {

     

       454
       484
        
       		return nil, err

     

       455
       485
        
       	}

+51

appview/settings/settings.go

···

       41
       41
        
       		{"Name": "profile", "Icon": "user"},

     

       42
       42
        
       		{"Name": "keys", "Icon": "key"},

     

       43
       43
        
       		{"Name": "emails", "Icon": "mail"},

     

       44
       44
       +
       		{"Name": "notifications", "Icon": "bell"},

     

       44
       45
        
       	}

     

       45
       46
        
       )

     

       46
       47
        
       

     
···

       68
       69
        
       		r.Post("/primary", s.emailsPrimary)

     

       69
       70
        
       	})

     

       70
       71
        
       

     

       72
       72
       +
       	r.Route("/notifications", func(r chi.Router) {

     

       73
       73
       +
       		r.Get("/", s.notificationsSettings)

     

       74
       74
       +
       		r.Put("/", s.updateNotificationPreferences)

     

       75
       75
       +
       	})

     

       76
       76
       +
       

     

       71
       77
        
       	return r

     

       72
       78
        
       }

     

       73
       79
        
       

     
···

       81
       87
        
       	})

     

       82
       88
        
       }

     

       83
       89
        
       

     

       90
       90
       +
       func (s *Settings) notificationsSettings(w http.ResponseWriter, r *http.Request) {

     

       91
       91
       +
       	user := s.OAuth.GetUser(r)

     

       92
       92
       +
       	did := s.OAuth.GetDid(r)

     

       93
       93
       +
       

     

       94
       94
       +
       	prefs, err := s.Db.GetNotificationPreferences(r.Context(), did)

     

       95
       95
       +
       	if err != nil {

     

       96
       96
       +
       		log.Printf("failed to get notification preferences: %s", err)

     

       97
       97
       +
       		s.Pages.Notice(w, "settings-notifications-error", "Unable to load notification preferences.")

     

       98
       98
       +
       		return

     

       99
       99
       +
       	}

     

       100
       100
       +
       

     

       101
       101
       +
       	s.Pages.UserNotificationSettings(w, pages.UserNotificationSettingsParams{

     

       102
       102
       +
       		LoggedInUser: user,

     

       103
       103
       +
       		Preferences:  prefs,

     

       104
       104
       +
       		Tabs:         settingsTabs,

     

       105
       105
       +
       		Tab:          "notifications",

     

       106
       106
       +
       	})

     

       107
       107
       +
       }

     

       108
       108
       +
       

     

       109
       109
       +
       func (s *Settings) updateNotificationPreferences(w http.ResponseWriter, r *http.Request) {

     

       110
       110
       +
       	did := s.OAuth.GetDid(r)

     

       111
       111
       +
       

     

       112
       112
       +
       	prefs := &models.NotificationPreferences{

     

       113
       113
       +
       		UserDid:            did,

     

       114
       114
       +
       		RepoStarred:        r.FormValue("repo_starred") == "on",

     

       115
       115
       +
       		IssueCreated:       r.FormValue("issue_created") == "on",

     

       116
       116
       +
       		IssueCommented:     r.FormValue("issue_commented") == "on",

     

       117
       117
       +
       		IssueClosed:        r.FormValue("issue_closed") == "on",

     

       118
       118
       +
       		PullCreated:        r.FormValue("pull_created") == "on",

     

       119
       119
       +
       		PullCommented:      r.FormValue("pull_commented") == "on",

     

       120
       120
       +
       		PullMerged:         r.FormValue("pull_merged") == "on",

     

       121
       121
       +
       		Followed:           r.FormValue("followed") == "on",

     

       122
       122
       +
       		EmailNotifications: r.FormValue("email_notifications") == "on",

     

       123
       123
       +
       	}

     

       124
       124
       +
       

     

       125
       125
       +
       	err := s.Db.UpdateNotificationPreferences(r.Context(), prefs)

     

       126
       126
       +
       	if err != nil {

     

       127
       127
       +
       		log.Printf("failed to update notification preferences: %s", err)

     

       128
       128
       +
       		s.Pages.Notice(w, "settings-notifications-error", "Unable to save notification preferences.")

     

       129
       129
       +
       		return

     

       130
       130
       +
       	}

     

       131
       131
       +
       

     

       132
       132
       +
       	s.Pages.Notice(w, "settings-notifications-success", "Notification preferences saved successfully.")

     

       133
       133
       +
       }

     

       134
       134
       +
       

     

       84
       135
        
       func (s *Settings) keysSettings(w http.ResponseWriter, r *http.Request) {

     

       85
       136
        
       	user := s.OAuth.GetUser(r)

     

       86
       137
        
       	pubKeys, err := db.GetPublicKeysForDid(s.Db, user.Did)

+4 -11

appview/pages/templates/errors/500.html

···

       5
       5
        
           <div class="bg-white dark:bg-gray-800 rounded-lg drop-shadow-sm p-8 max-w-lg mx-auto">

     

       6
       6
        
               <div class="mb-6">

     

       7
       7
        
                   <div class="w-16 h-16 mx-auto mb-4 rounded-full bg-red-100 dark:bg-red-900/30 flex items-center justify-center">

     

       8
       8
       -
                       {{ i "alert-triangle" "w-8 h-8 text-red-500 dark:text-red-400" }}

     

       8
       8
       +
                       {{ i "triangle-alert" "w-8 h-8 text-red-500 dark:text-red-400" }}

     

       9
       9
        
                   </div>

     

       10
       10
        
               </div>

     

       11
       11
        
       

     
···

       14
       14
        
                       500 &mdash; internal server error

     

       15
       15
        
                   </h1>

     

       16
       16
        
                   <p class="text-gray-600 dark:text-gray-300">

     

       17
       17
       -
                       Something went wrong on our end. We've been notified and are working to fix the issue.

     

       18
       18
       -
                   </p>

     

       19
       19
       -
                   <div class="bg-yellow-50 dark:bg-yellow-900/20 border border-yellow-200 dark:border-yellow-800 rounded p-3 text-sm text-yellow-800 dark:text-yellow-200">

     

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

     

       21
       21
       -
                           {{ i "info" "w-4 h-4" }}

     

       22
       22
       -
                           <span class="font-medium">we're on it!</span>

     

       23
       23
       -
                       </div>

     

       24
       24
       -
                       <p class="mt-1">Our team has been automatically notified about this error.</p>

     

       25
       25
       -
                   </div>

     

       17
       17
       +
                       We encountered an error while processing your request. Please try again later.

     

       18
       18
       +
                    </p>

     

       26
       19
        
                   <div class="flex flex-col sm:flex-row gap-3 justify-center items-center mt-6">

     

       27
       20
        
                       <button onclick="location.reload()" class="btn-create gap-2">

     

       28
       21
        
                           {{ i "refresh-cw" "w-4 h-4" }}

     

       29
       22
        
                           try again

     

       30
       23
        
                       </button>

     

       31
       24
        
                       <a href="/" class="btn no-underline hover:no-underline gap-2">

     

       32
       32
       -
                           {{ i "home" "w-4 h-4" }}

     

       25
       25
       +
                           {{ i "arrow-left" "w-4 h-4" }}

     

       33
       26
        
                           back to home

     

       34
       27
        
                       </a>

     

       35
       28
        
                   </div>

+173

appview/pages/templates/user/settings/notifications.html

···

       1
       1
       +
       {{ define "title" }}{{ .Tab }} settings{{ end }}

     

       2
       2
       +
       

     

       3
       3
       +
       {{ define "content" }}

     

       4
       4
       +
         <div class="p-6">

     

       5
       5
       +
           <p class="text-xl font-bold dark:text-white">Settings</p>

     

       6
       6
       +
         </div>

     

       7
       7
       +
         <div class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white">

     

       8
       8
       +
           <section class="w-full grid grid-cols-1 md:grid-cols-4 gap-6">

     

       9
       9
       +
             <div class="col-span-1">

     

       10
       10
       +
               {{ template "user/settings/fragments/sidebar" . }}

     

       11
       11
       +
             </div>

     

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

     

       13
       13
       +
               {{ template "notificationSettings" . }}

     

       14
       14
       +
             </div>

     

       15
       15
       +
           </section>

     

       16
       16
       +
         </div>

     

       17
       17
       +
       {{ end }}

     

       18
       18
       +
       

     

       19
       19
       +
       {{ define "notificationSettings" }}

     

       20
       20
       +
         <div class="grid grid-cols-1 md:grid-cols-3 gap-4 items-center">

     

       21
       21
       +
           <div class="col-span-1 md:col-span-2">

     

       22
       22
       +
             <h2 class="text-sm pb-2 uppercase font-bold">Notification Preferences</h2>

     

       23
       23
       +
             <p class="text-gray-500 dark:text-gray-400">

     

       24
       24
       +
               Choose which notifications you want to receive when activity happens on your repositories and profile.

     

       25
       25
       +
             </p>

     

       26
       26
       +
           </div>

     

       27
       27
       +
         </div>

     

       28
       28
       +
       

     

       29
       29
       +
         <form hx-put="/settings/notifications" hx-swap="none" class="flex flex-col gap-6">

     

       30
       30
       +
       

     

       31
       31
       +
           <div class="flex flex-col rounded border border-gray-200 dark:border-gray-700 divide-y divide-gray-200 dark:divide-gray-700 w-full">

     

       32
       32
       +
             <div class="flex items-center justify-between p-2">

     

       33
       33
       +
               <div class="flex items-center gap-2">

     

       34
       34
       +
                 <div class="flex flex-col gap-1">

     

       35
       35
       +
                   <span class="font-bold">Repository starred</span>

     

       36
       36
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       37
       37
       +
                     <span>When someone stars your repository.</span>

     

       38
       38
       +
                   </div>

     

       39
       39
       +
                 </div>

     

       40
       40
       +
               </div>

     

       41
       41
       +
               <label class="flex items-center gap-2">

     

       42
       42
       +
                 <input type="checkbox" name="repo_starred" {{if .Preferences.RepoStarred}}checked{{end}}>

     

       43
       43
       +
               </label>

     

       44
       44
       +
             </div>

     

       45
       45
       +
       

     

       46
       46
       +
             <div class="flex items-center justify-between p-2">

     

       47
       47
       +
               <div class="flex items-center gap-2">

     

       48
       48
       +
                 <div class="flex flex-col gap-1">

     

       49
       49
       +
                   <span class="font-bold">New issues</span>

     

       50
       50
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       51
       51
       +
                     <span>When someone creates an issue on your repository.</span>

     

       52
       52
       +
                   </div>

     

       53
       53
       +
                 </div>

     

       54
       54
       +
               </div>

     

       55
       55
       +
               <label class="flex items-center gap-2">

     

       56
       56
       +
                 <input type="checkbox" name="issue_created" {{if .Preferences.IssueCreated}}checked{{end}}>

     

       57
       57
       +
               </label>

     

       58
       58
       +
             </div>

     

       59
       59
       +
       

     

       60
       60
       +
             <div class="flex items-center justify-between p-2">

     

       61
       61
       +
               <div class="flex items-center gap-2">

     

       62
       62
       +
                 <div class="flex flex-col gap-1">

     

       63
       63
       +
                   <span class="font-bold">Issue comments</span>

     

       64
       64
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       65
       65
       +
                     <span>When someone comments on an issue you're involved with.</span>

     

       66
       66
       +
                   </div>

     

       67
       67
       +
                 </div>

     

       68
       68
       +
               </div>

     

       69
       69
       +
               <label class="flex items-center gap-2">

     

       70
       70
       +
                 <input type="checkbox" name="issue_commented" {{if .Preferences.IssueCommented}}checked{{end}}>

     

       71
       71
       +
               </label>

     

       72
       72
       +
             </div>

     

       73
       73
       +
       

     

       74
       74
       +
             <div class="flex items-center justify-between p-2">

     

       75
       75
       +
               <div class="flex items-center gap-2">

     

       76
       76
       +
                 <div class="flex flex-col gap-1">

     

       77
       77
       +
                   <span class="font-bold">Issue closed</span>

     

       78
       78
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       79
       79
       +
                     <span>When an issue on your repository is closed.</span>

     

       80
       80
       +
                   </div>

     

       81
       81
       +
                 </div>

     

       82
       82
       +
               </div>

     

       83
       83
       +
               <label class="flex items-center gap-2">

     

       84
       84
       +
                 <input type="checkbox" name="issue_closed" {{if .Preferences.IssueClosed}}checked{{end}}>

     

       85
       85
       +
               </label>

     

       86
       86
       +
             </div>

     

       87
       87
       +
       

     

       88
       88
       +
             <div class="flex items-center justify-between p-2">

     

       89
       89
       +
               <div class="flex items-center gap-2">

     

       90
       90
       +
                 <div class="flex flex-col gap-1">

     

       91
       91
       +
                   <span class="font-bold">New pull requests</span>

     

       92
       92
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       93
       93
       +
                     <span>When someone creates a pull request on your repository.</span>

     

       94
       94
       +
                   </div>

     

       95
       95
       +
                 </div>

     

       96
       96
       +
               </div>

     

       97
       97
       +
               <label class="flex items-center gap-2">

     

       98
       98
       +
                 <input type="checkbox" name="pull_created" {{if .Preferences.PullCreated}}checked{{end}}>

     

       99
       99
       +
               </label>

     

       100
       100
       +
             </div>

     

       101
       101
       +
       

     

       102
       102
       +
             <div class="flex items-center justify-between p-2">

     

       103
       103
       +
               <div class="flex items-center gap-2">

     

       104
       104
       +
                 <div class="flex flex-col gap-1">

     

       105
       105
       +
                   <span class="font-bold">Pull request comments</span>

     

       106
       106
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       107
       107
       +
                     <span>When someone comments on a pull request you're involved with.</span>

     

       108
       108
       +
                   </div>

     

       109
       109
       +
                 </div>

     

       110
       110
       +
               </div>

     

       111
       111
       +
               <label class="flex items-center gap-2">

     

       112
       112
       +
                 <input type="checkbox" name="pull_commented" {{if .Preferences.PullCommented}}checked{{end}}>

     

       113
       113
       +
               </label>

     

       114
       114
       +
             </div>

     

       115
       115
       +
       

     

       116
       116
       +
             <div class="flex items-center justify-between p-2">

     

       117
       117
       +
               <div class="flex items-center gap-2">

     

       118
       118
       +
                 <div class="flex flex-col gap-1">

     

       119
       119
       +
                   <span class="font-bold">Pull request merged</span>

     

       120
       120
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       121
       121
       +
                     <span>When your pull request is merged.</span>

     

       122
       122
       +
                   </div>

     

       123
       123
       +
                 </div>

     

       124
       124
       +
               </div>

     

       125
       125
       +
               <label class="flex items-center gap-2">

     

       126
       126
       +
                 <input type="checkbox" name="pull_merged" {{if .Preferences.PullMerged}}checked{{end}}>

     

       127
       127
       +
               </label>

     

       128
       128
       +
             </div>

     

       129
       129
       +
       

     

       130
       130
       +
             <div class="flex items-center justify-between p-2">

     

       131
       131
       +
               <div class="flex items-center gap-2">

     

       132
       132
       +
                 <div class="flex flex-col gap-1">

     

       133
       133
       +
                   <span class="font-bold">New followers</span>

     

       134
       134
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       135
       135
       +
                     <span>When someone follows you.</span>

     

       136
       136
       +
                   </div>

     

       137
       137
       +
                 </div>

     

       138
       138
       +
               </div>

     

       139
       139
       +
               <label class="flex items-center gap-2">

     

       140
       140
       +
                 <input type="checkbox" name="followed" {{if .Preferences.Followed}}checked{{end}}>

     

       141
       141
       +
               </label>

     

       142
       142
       +
             </div>

     

       143
       143
       +
       

     

       144
       144
       +
             <div class="flex items-center justify-between p-2">

     

       145
       145
       +
               <div class="flex items-center gap-2">

     

       146
       146
       +
                 <div class="flex flex-col gap-1">

     

       147
       147
       +
                   <span class="font-bold">Email notifications</span>

     

       148
       148
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       149
       149
       +
                     <span>Receive notifications via email in addition to in-app notifications.</span>

     

       150
       150
       +
                   </div>

     

       151
       151
       +
                 </div>

     

       152
       152
       +
               </div>

     

       153
       153
       +
               <label class="flex items-center gap-2">

     

       154
       154
       +
                 <input type="checkbox" name="email_notifications" {{if .Preferences.EmailNotifications}}checked{{end}}>

     

       155
       155
       +
               </label>

     

       156
       156
       +
             </div>

     

       157
       157
       +
           </div>

     

       158
       158
       +
       

     

       159
       159
       +
           <div class="flex justify-end pt-2">

     

       160
       160
       +
             <button

     

       161
       161
       +
               type="submit"

     

       162
       162
       +
               class="btn-create flex items-center gap-2 group"

     

       163
       163
       +
             >

     

       164
       164
       +
               {{ i "save" "w-4 h-4" }}

     

       165
       165
       +
               save

     

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

     

       167
       167
       +
             </button>

     

       168
       168
       +
           </div>

     

       169
       169
       +
           <div id="settings-notifications-success"></div>

     

       170
       170
       +
       

     

       171
       171
       +
           <div id="settings-notifications-error" class="error"></div>

     

       172
       172
       +
         </form>

     

       173
       173
       +
       {{ end }}

+13 -4

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

···

       2
       2
        
           <nav class="space-x-4 px-6 py-2 rounded-b bg-white dark:bg-gray-800 dark:text-white drop-shadow-sm">

     

       3
       3
        
               <div class="flex justify-between p-0 items-center">

     

       4
       4
        
                   <div id="left-items">

     

       5
       5
       -
                     <a href="/" hx-boost="true" class="text-2xl no-underline hover:no-underline">

     

       6
       6
       -
                       {{ template "fragments/logotypeSmall" }}

     

       5
       5
       +
                     <a href="/" hx-boost="true" class="text-2xl no-underline hover:no-underline flex items-center gap-2">

     

       6
       6
       +
                       {{ template "fragments/dolly/logo" "size-8 text-black dark:text-white" }}

     

       7
       7
       +
                       <span class="font-bold text-xl not-italic hidden md:inline">tangled</span>

     

       8
       8
       +
                       <span class="font-normal not-italic text-xs rounded bg-gray-100 dark:bg-gray-700 px-1 hidden md:inline">

     

       9
       9
       +
                         alpha

     

       10
       10
       +
                       </span>

     

       7
       11
        
                     </a>

     

       8
       12
        
                   </div>

     

       9
       13
        
       

     
···

       27
       31
        
       {{ define "newButton" }}

     

       28
       32
        
       <details class="relative inline-block text-left nav-dropdown">

     

       29
       33
        
           <summary class="btn-create py-0 cursor-pointer list-none flex items-center gap-2">

     

       30
       30
       -
             {{ i "plus" "w-4 h-4" }} new

     

       34
       34
       +
             {{ i "plus" "w-4 h-4" }} <span class="hidden md:inline">new</span>

     

       31
       35
        
           </summary>

     

       32
       36
        
           <div class="absolute flex flex-col right-0 mt-4 p-4 rounded w-48 bg-white dark:bg-gray-800 dark:text-white border border-gray-200 dark:border-gray-700">

     

       33
       37
        
               <a href="/repo/new" class="flex items-center gap-2">

     
···

       48
       52
        
               class="cursor-pointer list-none flex items-center gap-1"

     

       49
       53
        
           >

     

       50
       54
        
               {{ $user := didOrHandle .Did .Handle }}

     

       51
       51
       -
               {{ template "user/fragments/picHandle" $user }}

     

       55
       55
       +
               <img

     

       56
       56
       +
                   src="{{ tinyAvatar $user }}"

     

       57
       57
       +
                   alt=""

     

       58
       58
       +
                   class="rounded-full h-6 w-6 border border-gray-300 dark:border-gray-700"

     

       59
       59
       +
               />

     

       60
       60
       +
               <span class="hidden md:inline">{{ $user | resolve | truncateAt30 }}</span>

     

       52
       61
        
           </summary>

     

       53
       62
        
           <div

     

       54
       63
        
               class="absolute flex flex-col right-0 mt-4 p-4 rounded w-48 bg-white dark:bg-gray-800 dark:text-white border border-gray-200 dark:border-gray-700"

+2 -2

appview/pages/templates/strings/put.html

···

       3
       3
        
       {{ define "content" }}

     

       4
       4
        
         <div class="px-6 py-2 mb-4">

     

       5
       5
        
           {{ if eq .Action "new" }}

     

       6
       6
       -
             <p class="text-xl font-bold dark:text-white">Create a new string</p>

     

       7
       7
       -
             <p class="">Store and share code snippets with ease.</p>

     

       6
       6
       +
             <p class="text-xl font-bold dark:text-white mb-1">Create a new string</p>

     

       7
       7
       +
             <p class="text-gray-600 dark:text-gray-400 mb-1">Store and share code snippets with ease.</p>

     

       8
       8
        
           {{ else }}

     

       9
       9
        
             <p class="text-xl font-bold dark:text-white">Edit string</p>

     

       10
       10
        
           {{ end }}

-33

knotserver/git/git.go

···

       120
       120
        
       	return g.r.CommitObject(h)

     

       121
       121
        
       }

     

       122
       122
        
       

     

       123
       123
       -
       func (g *GitRepo) LastCommit() (*object.Commit, error) {

     

       124
       124
       -
       	c, err := g.r.CommitObject(g.h)

     

       125
       125
       -
       	if err != nil {

     

       126
       126
       -
       		return nil, fmt.Errorf("last commit: %w", err)

     

       127
       127
       -
       	}

     

       128
       128
       -
       	return c, nil

     

       129
       129
       -
       }

     

       130
       130
       -
       

     

       131
       123
        
       func (g *GitRepo) FileContentN(path string, cap int64) ([]byte, error) {

     

       132
       124
        
       	c, err := g.r.CommitObject(g.h)

     

       133
       125
        
       	if err != nil {

     
···

       162
       154
        
       	return buf.Bytes(), nil

     

       163
       155
        
       }

     

       164
       156
        
       

     

       165
       165
       -
       func (g *GitRepo) FileContent(path string) (string, error) {

     

       166
       166
       -
       	c, err := g.r.CommitObject(g.h)

     

       167
       167
       -
       	if err != nil {

     

       168
       168
       -
       		return "", fmt.Errorf("commit object: %w", err)

     

       169
       169
       -
       	}

     

       170
       170
       -
       

     

       171
       171
       -
       	tree, err := c.Tree()

     

       172
       172
       -
       	if err != nil {

     

       173
       173
       -
       		return "", fmt.Errorf("file tree: %w", err)

     

       174
       174
       -
       	}

     

       175
       175
       -
       

     

       176
       176
       -
       	file, err := tree.File(path)

     

       177
       177
       -
       	if err != nil {

     

       178
       178
       -
       		return "", err

     

       179
       179
       -
       	}

     

       180
       180
       -
       

     

       181
       181
       -
       	isbin, _ := file.IsBinary()

     

       182
       182
       -
       

     

       183
       183
       -
       	if !isbin {

     

       184
       184
       -
       		return file.Contents()

     

       185
       185
       -
       	} else {

     

       186
       186
       -
       		return "", ErrBinaryFile

     

       187
       187
       -
       	}

     

       188
       188
       -
       }

     

       189
       189
       -
       

     

       190
       157
        
       func (g *GitRepo) RawContent(path string) ([]byte, error) {

     

       191
       158
        
       	c, err := g.r.CommitObject(g.h)

     

       192
       159
        
       	if err != nil {

-4

knotserver/http_util.go

···

       16
       16
        
       	w.WriteHeader(status)

     

       17
       17
        
       	json.NewEncoder(w).Encode(map[string]string{"error": msg})

     

       18
       18
        
       }

     

       19
       19
       -
       

     

       20
       20
       -
       func notFound(w http.ResponseWriter) {

     

       21
       21
       -
       	writeError(w, "not found", http.StatusNotFound)

     

       22
       22
       -
       }

+15 -1

appview/validator/label.go

···

       95
       95
        
       	return nil

     

       96
       96
        
       }

     

       97
       97
        
       

     

       98
       98
       -
       func (v *Validator) ValidateLabelOp(labelDef *models.LabelDefinition, labelOp *models.LabelOp) error {

     

       98
       98
       +
       func (v *Validator) ValidateLabelOp(labelDef *models.LabelDefinition, repo *models.Repo, labelOp *models.LabelOp) error {

     

       99
       99
        
       	if labelDef == nil {

     

       100
       100
        
       		return fmt.Errorf("label definition is required")

     

       101
       101
        
       	}

     

       102
       102
       +
       	if repo == nil {

     

       103
       103
       +
       		return fmt.Errorf("repo is required")

     

       104
       104
       +
       	}

     

       102
       105
        
       	if labelOp == nil {

     

       103
       106
        
       		return fmt.Errorf("label operation is required")

     

       104
       107
        
       	}

     

       105
       108
        
       

     

       109
       109
       +
       	// validate permissions: only collaborators can apply labels currently

     

       110
       110
       +
       	//

     

       111
       111
       +
       	// TODO: introduce a repo:triage permission

     

       112
       112
       +
       	ok, err := v.enforcer.IsPushAllowed(labelOp.Did, repo.Knot, repo.DidSlashRepo())

     

       113
       113
       +
       	if err != nil {

     

       114
       114
       +
       		return fmt.Errorf("failed to enforce permissions: %w", err)

     

       115
       115
       +
       	}

     

       116
       116
       +
       	if !ok {

     

       117
       117
       +
       		return fmt.Errorf("unauhtorized label operation")

     

       118
       118
       +
       	}

     

       119
       119
       +
       

     

       106
       120
        
       	expectedKey := labelDef.AtUri().String()

     

       107
       121
        
       	if labelOp.OperandKey != expectedKey {

     

       108
       122
        
       		return fmt.Errorf("operand key %q does not match label definition URI %q", labelOp.OperandKey, expectedKey)

+4 -1

appview/validator/validator.go

···

       4
       4
        
       	"tangled.org/core/appview/db"

     

       5
       5
        
       	"tangled.org/core/appview/pages/markup"

     

       6
       6
        
       	"tangled.org/core/idresolver"

     

       7
       7
       +
       	"tangled.org/core/rbac"

     

       7
       8
        
       )

     

       8
       9
        
       

     

       9
       10
        
       type Validator struct {

     

       10
       11
        
       	db        *db.DB

     

       11
       12
        
       	sanitizer markup.Sanitizer

     

       12
       13
        
       	resolver  *idresolver.Resolver

     

       14
       14
       +
       	enforcer  *rbac.Enforcer

     

       13
       15
        
       }

     

       14
       16
        
       

     

       15
       15
       -
       func New(db *db.DB, res *idresolver.Resolver) *Validator {

     

       17
       17
       +
       func New(db *db.DB, res *idresolver.Resolver, enforcer *rbac.Enforcer) *Validator {

     

       16
       18
        
       	return &Validator{

     

       17
       19
        
       		db:        db,

     

       18
       20
        
       		sanitizer: markup.NewSanitizer(),

     

       19
       21
        
       		resolver:  res,

     

       22
       22
       +
       		enforcer:  enforcer,

     

       20
       23
        
       	}

     

       21
       24
        
       }

+3 -3

appview/labels/labels.go

···

       162
       162
        
       		}

     

       163
       163
        
       	}

     

       164
       164
        
       

     

       165
       165
       -
       	// reduce the opset

     

       166
       166
       -
       	labelOps = models.ReduceLabelOps(labelOps)

     

       167
       167
       -
       

     

       168
       165
        
       	for i := range labelOps {

     

       169
       166
        
       		def := actx.Defs[labelOps[i].OperandKey]

     

       170
       167
        
       		if err := l.validator.ValidateLabelOp(def, repo, &labelOps[i]); err != nil {

     
···

       173
       170
        
       		}

     

       174
       171
        
       	}

     

       175
       172
        
       

     

       173
       173
       +
       	// reduce the opset

     

       174
       174
       +
       	labelOps = models.ReduceLabelOps(labelOps)

     

       175
       175
       +
       

     

       176
       176
        
       	// next, apply all ops introduced in this request and filter out ones that are no-ops

     

       177
       177
        
       	validLabelOps := labelOps[:0]

     

       178
       178
        
       	for _, op := range labelOps {

+1 -3

knotserver/git/tag.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"fmt"

     

       5
       5
       -
       	"slices"

     

       6
       5
        
       	"strconv"

     

       7
       6
        
       	"strings"

     

       8
       7
        
       	"time"

     
···

       35
       34
        
       	outFormat.WriteString("")

     

       36
       35
        
       	outFormat.WriteString(recordSeparator)

     

       37
       36
        
       

     

       38
       38
       -
       	output, err := g.forEachRef(outFormat.String(), "refs/tags")

     

       37
       37
       +
       	output, err := g.forEachRef(outFormat.String(), "--sort=-creatordate", "refs/tags")

     

       39
       38
        
       	if err != nil {

     

       40
       39
        
       		return nil, fmt.Errorf("failed to get tags: %w", err)

     

       41
       40
        
       	}

     
···

       94
       93
        
       		tags = append(tags, tag)

     

       95
       94
        
       	}

     

       96
       95
        
       

     

       97
       97
       -
       	slices.Reverse(tags)

     

       98
       96
        
       	return tags, nil

     

       99
       97
        
       }

+1 -1

knotserver/xrpc/repo_blob.go

···

       44
       44
        
       

     

       45
       45
        
       	contents, err := gr.RawContent(treePath)

     

       46
       46
        
       	if err != nil {

     

       47
       47
       -
       		x.Logger.Error("file content", "error", err.Error())

     

       47
       47
       +
       		x.Logger.Error("file content", "error", err.Error(), "treePath", treePath)

     

       48
       48
        
       		writeError(w, xrpcerr.NewXrpcError(

     

       49
       49
        
       			xrpcerr.WithTag("FileNotFound"),

     

       50
       50
        
       			xrpcerr.WithMessage("file not found at the specified path"),

+10

api/tangled/repotree.go

···

       31
       31
        
       	Files  []*RepoTree_TreeEntry `json:"files" cborgen:"files"`

     

       32
       32
        
       	// parent: The parent path in the tree

     

       33
       33
        
       	Parent *string `json:"parent,omitempty" cborgen:"parent,omitempty"`

     

       34
       34
       +
       	// readme: Readme for this file tree

     

       35
       35
       +
       	Readme *RepoTree_Readme `json:"readme,omitempty" cborgen:"readme,omitempty"`

     

       34
       36
        
       	// ref: The git reference used

     

       35
       37
        
       	Ref string `json:"ref" cborgen:"ref"`

     

       36
       38
        
       }

     

       37
       39
        
       

     

       40
       40
       +
       // RepoTree_Readme is a "readme" in the sh.tangled.repo.tree schema.

     

       41
       41
       +
       type RepoTree_Readme struct {

     

       42
       42
       +
       	// contents: Contents of the readme file

     

       43
       43
       +
       	Contents string `json:"contents" cborgen:"contents"`

     

       44
       44
       +
       	// filename: Name of the readme file

     

       45
       45
       +
       	Filename string `json:"filename" cborgen:"filename"`

     

       46
       46
       +
       }

     

       47
       47
       +
       

     

       38
       48
        
       // RepoTree_TreeEntry is a "treeEntry" in the sh.tangled.repo.tree schema.

     

       39
       49
        
       type RepoTree_TreeEntry struct {

     

       40
       50
        
       	// is_file: Whether this entry is a file

+15 -17

appview/pages/markup/format.go

···

       1
       1
        
       package markup

     

       2
       2
        
       

     

       3
       3
       -
       import "strings"

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"regexp"

     

       5
       5
       +
       )

     

       4
       6
        
       

     

       5
       7
        
       type Format string

     

       6
       8
        
       

     
···

       10
       12
        
       )

     

       11
       13
        
       

     

       12
       14
        
       var FileTypes map[Format][]string = map[Format][]string{

     

       13
       13
       -
       	FormatMarkdown: []string{".md", ".markdown", ".mdown", ".mkdn", ".mkd"},

     

       15
       15
       +
       	FormatMarkdown: {".md", ".markdown", ".mdown", ".mkdn", ".mkd"},

     

       16
       16
       +
       }

     

       17
       17
       +
       

     

       18
       18
       +
       var FileTypePatterns = map[Format]*regexp.Regexp{

     

       19
       19
       +
       	FormatMarkdown: regexp.MustCompile(`(?i)\.(md|markdown|mdown|mkdn|mkd)$`),

     

       14
       20
        
       }

     

       15
       21
        
       

     

       16
       16
       -
       // ReadmeFilenames contains the list of common README filenames to search for,

     

       17
       17
       -
       // in order of preference. Only includes well-supported formats.

     

       18
       18
       -
       var ReadmeFilenames = []string{

     

       19
       19
       -
       	"README.md", "readme.md",

     

       20
       20
       -
       	"README",

     

       21
       21
       -
       	"readme",

     

       22
       22
       -
       	"README.markdown",

     

       23
       23
       -
       	"readme.markdown",

     

       24
       24
       -
       	"README.txt",

     

       25
       25
       -
       	"readme.txt",

     

       22
       22
       +
       var ReadmePattern = regexp.MustCompile(`(?i)^readme(\.(md|markdown|txt))?$`)

     

       23
       23
       +
       

     

       24
       24
       +
       func IsReadmeFile(filename string) bool {

     

       25
       25
       +
       	return ReadmePattern.MatchString(filename)

     

       26
       26
        
       }

     

       27
       27
        
       

     

       28
       28
        
       func GetFormat(filename string) Format {

     

       29
       29
       -
       	for format, extensions := range FileTypes {

     

       30
       30
       -
       		for _, extension := range extensions {

     

       31
       31
       -
       			if strings.HasSuffix(filename, extension) {

     

       32
       32
       -
       				return format

     

       33
       33
       -
       			}

     

       29
       29
       +
       	for format, pattern := range FileTypePatterns {

     

       30
       30
       +
       		if pattern.MatchString(filename) {

     

       31
       31
       +
       			return format

     

       34
       32
        
       		}

     

       35
       33
        
       	}

     

       36
       34
        
       	// default format

+2 -2

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

···

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

     

       2
       2
        
       <div class="mt-4 rounded bg-white dark:bg-gray-800 drop-shadow-sm w-full mx-auto overflow-hidden">

     

       3
       3
        
           {{- if .ReadmeFileName -}}

     

       4
       4
       -
           <div class="px-4 py-2 bg-gray-50 dark:bg-gray-700 border-b border-gray-200 dark:border-gray-600 flex items-center gap-2">

     

       4
       4
       +
           <div class="px-4 py-2 border-b border-gray-200 dark:border-gray-600 flex items-center gap-2">

     

       5
       5
        
               {{ i "file-text" "w-4 h-4" "text-gray-600 dark:text-gray-400" }}

     

       6
       6
        
               <span class="font-mono text-sm text-gray-800 dark:text-gray-200">{{ .ReadmeFileName }}</span>

     

       7
       7
        
           </div>

     

       8
       8
        
           {{- end -}}

     

       9
       9
        
           <section

     

       10
       10
       -
               class="p-6 overflow-auto {{ if not .Raw }}

     

       10
       10
       +
               class="px-6 pb-6 overflow-auto {{ if not .Raw }}

     

       11
       11
        
               prose dark:prose-invert dark:[&_pre]:bg-gray-900

     

       12
       12
        
               dark:[&_code]:text-gray-300 dark:[&_pre_code]:bg-gray-900

     

       13
       13
        
               dark:[&_pre]:border dark:[&_pre]:border-gray-700

+24

knotserver/xrpc/repo_tree.go

···

       4
       4
        
       	"net/http"

     

       5
       5
        
       	"path/filepath"

     

       6
       6
        
       	"time"

     

       7
       7
       +
       	"unicode/utf8"

     

       7
       8
        
       

     

       8
       9
        
       	"tangled.org/core/api/tangled"

     

       10
       10
       +
       	"tangled.org/core/appview/pages/markup"

     

       9
       11
        
       	"tangled.org/core/knotserver/git"

     

       10
       12
        
       	xrpcerr "tangled.org/core/xrpc/errors"

     

       11
       13
        
       )

     
···

       43
       45
        
       		return

     

       44
       46
        
       	}

     

       45
       47
        
       

     

       48
       48
       +
       	// if any of these files are a readme candidate, pass along its blob contents too

     

       49
       49
       +
       	var readmeFileName string

     

       50
       50
       +
       	var readmeContents string

     

       51
       51
       +
       	for _, file := range files {

     

       52
       52
       +
       		if markup.IsReadmeFile(file.Name) {

     

       53
       53
       +
       			contents, err := gr.RawContent(filepath.Join(path, file.Name))

     

       54
       54
       +
       			if err != nil {

     

       55
       55
       +
       				x.Logger.Error("failed to read contents of file", "path", path, "file", file.Name)

     

       56
       56
       +
       			}

     

       57
       57
       +
       

     

       58
       58
       +
       			if utf8.Valid(contents) {

     

       59
       59
       +
       				readmeFileName = file.Name

     

       60
       60
       +
       				readmeContents = string(contents)

     

       61
       61
       +
       				break

     

       62
       62
       +
       			}

     

       63
       63
       +
       		}

     

       64
       64
       +
       	}

     

       65
       65
       +
       

     

       46
       66
        
       	// convert NiceTree -> tangled.RepoTree_TreeEntry

     

       47
       67
        
       	treeEntries := make([]*tangled.RepoTree_TreeEntry, len(files))

     

       48
       68
        
       	for i, file := range files {

     
···

       83
       103
        
       		Parent: parentPtr,

     

       84
       104
        
       		Dotdot: dotdotPtr,

     

       85
       105
        
       		Files:  treeEntries,

     

       106
       106
       +
       		Readme: &tangled.RepoTree_Readme{

     

       107
       107
       +
       			Filename: readmeFileName,

     

       108
       108
       +
       			Contents: readmeContents,

     

       109
       109
       +
       		},

     

       86
       110
        
       	}

     

       87
       111
        
       

     

       88
       112
        
       	writeJson(w, response)

+19

lexicons/repo/tree.json

···

       41
       41
        
                     "type": "string",

     

       42
       42
        
                     "description": "Parent directory path"

     

       43
       43
        
                   },

     

       44
       44
       +
                   "readme": {

     

       45
       45
       +
                     "type": "ref",

     

       46
       46
       +
                     "ref": "#readme",

     

       47
       47
       +
                     "description": "Readme for this file tree"

     

       48
       48
       +
                   },

     

       44
       49
        
                   "files": {

     

       45
       50
        
                     "type": "array",

     

       46
       51
        
                     "items": {

     
···

       70
       75
        
               }

     

       71
       76
        
             ]

     

       72
       77
        
           },

     

       78
       78
       +
           "readme": {

     

       79
       79
       +
             "type": "object",

     

       80
       80
       +
             "required": ["filename", "contents"],

     

       81
       81
       +
             "properties": {

     

       82
       82
       +
               "filename": {

     

       83
       83
       +
                 "type": "string",

     

       84
       84
       +
                 "description": "Name of the readme file"

     

       85
       85
       +
               },

     

       86
       86
       +
               "contents": {

     

       87
       87
       +
                 "type": "string",

     

       88
       88
       +
                 "description": "Contents of the readme file"

     

       89
       89
       +
               }

     

       90
       90
       +
             }

     

       91
       91
       +
           },

     

       73
       92
        
           "treeEntry": {

     

       74
       93
        
             "type": "object",

     

       75
       94
        
             "required": ["name", "mode", "size", "is_file", "is_subtree"],

+7 -5

types/repo.go

···

       41
       41
        
       }

     

       42
       42
        
       

     

       43
       43
        
       type RepoTreeResponse struct {

     

       44
       44
       -
       	Ref         string     `json:"ref,omitempty"`

     

       45
       45
       -
       	Parent      string     `json:"parent,omitempty"`

     

       46
       46
       -
       	Description string     `json:"description,omitempty"`

     

       47
       47
       -
       	DotDot      string     `json:"dotdot,omitempty"`

     

       48
       48
       -
       	Files       []NiceTree `json:"files,omitempty"`

     

       44
       44
       +
       	Ref            string     `json:"ref,omitempty"`

     

       45
       45
       +
       	Parent         string     `json:"parent,omitempty"`

     

       46
       46
       +
       	Description    string     `json:"description,omitempty"`

     

       47
       47
       +
       	DotDot         string     `json:"dotdot,omitempty"`

     

       48
       48
       +
       	Files          []NiceTree `json:"files,omitempty"`

     

       49
       49
       +
       	ReadmeFileName string     `json:"readme_filename,omitempty"`

     

       50
       50
       +
       	Readme         string     `json:"readme_contents,omitempty"`

     

       49
       51
        
       }

     

       50
       52
        
       

     

       51
       53
        
       type TagReference struct {

+224

appview/pages/templates/brand/brand.html

···

       1
       1
       +
       {{ define "title" }}brand{{ end }}

     

       2
       2
       +
       

     

       3
       3
       +
       {{ define "content" }}

     

       4
       4
       +
       <div class="grid grid-cols-10">

     

       5
       5
       +
         <header class="col-span-full md:col-span-10 px-6 py-2 mb-4">

     

       6
       6
       +
           <h1 class="text-2xl font-bold dark:text-white mb-1">Brand</h1>

     

       7
       7
       +
           <p class="text-gray-600 dark:text-gray-400 mb-1">

     

       8
       8
       +
           Assets and guidelines for using Tangled's logo and brand elements.

     

       9
       9
       +
           </p>

     

       10
       10
       +
         </header>

     

       11
       11
       +
       

     

       12
       12
       +
         <main class="col-span-full md:col-span-10 bg-white dark:bg-gray-800 drop-shadow-sm rounded p-6 md:px-10">

     

       13
       13
       +
           <div class="space-y-16">

     

       14
       14
       +
       

     

       15
       15
       +
             <!-- Introduction Section -->

     

       16
       16
       +
             <section>

     

       17
       17
       +
               <p class="text-gray-600 dark:text-gray-400 mb-2">

     

       18
       18
       +
               Tangled's logo and mascot is <strong>Dolly</strong>, the first ever <em>cloned</em> mammal. Please

     

       19
       19
       +
               follow the below guidelines when using Dolly and the logotype.

     

       20
       20
       +
               </p>

     

       21
       21
       +
               <p class="text-gray-600 dark:text-gray-400 mb-2">

     

       22
       22
       +
               All assets are served as SVGs, and can be downloaded by right-clicking and clicking "Save image as".

     

       23
       23
       +
               </p>

     

       24
       24
       +
             </section>

     

       25
       25
       +
       

     

       26
       26
       +
             <!-- Black Logotype Section -->

     

       27
       27
       +
             <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center">

     

       28
       28
       +
               <div class="order-2 lg:order-1">

     

       29
       29
       +
                 <div class="border border-gray-200 dark:border-gray-700 p-8 sm:p-16 bg-gray-50 dark:bg-gray-100 rounded">

     

       30
       30
       +
                   <img src="https://assets.tangled.network/tangled_logotype_black_on_trans.svg"

     

       31
       31
       +
                        alt="Tangled logo - black version"

     

       32
       32
       +
                        class="w-full max-w-sm mx-auto" />

     

       33
       33
       +
                 </div>

     

       34
       34
       +
               </div>

     

       35
       35
       +
               <div class="order-1 lg:order-2">

     

       36
       36
       +
                 <h2 class="text-xl font-semibold dark:text-white mb-3">Black logotype</h2>

     

       37
       37
       +
                 <p class="text-gray-600 dark:text-gray-400 mb-4">For use on light-colored backgrounds.</p>

     

       38
       38
       +
                 <p class="text-gray-700 dark:text-gray-300">

     

       39
       39
       +
                 This is the preferred version of the logotype, featuring dark text and elements, ideal for light

     

       40
       40
       +
                 backgrounds and designs.

     

       41
       41
       +
                 </p>

     

       42
       42
       +
               </div>

     

       43
       43
       +
             </section>

     

       44
       44
       +
       

     

       45
       45
       +
             <!-- White Logotype Section -->

     

       46
       46
       +
             <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center">

     

       47
       47
       +
               <div class="order-2 lg:order-1">

     

       48
       48
       +
                 <div class="bg-black p-8 sm:p-16 rounded">

     

       49
       49
       +
                   <img src="https://assets.tangled.network/tangled_logotype_white_on_trans.svg"

     

       50
       50
       +
                        alt="Tangled logo - white version"

     

       51
       51
       +
                        class="w-full max-w-sm mx-auto" />

     

       52
       52
       +
                 </div>

     

       53
       53
       +
               </div>

     

       54
       54
       +
               <div class="order-1 lg:order-2">

     

       55
       55
       +
                 <h2 class="text-xl font-semibold dark:text-white mb-3">White logotype</h2>

     

       56
       56
       +
                 <p class="text-gray-600 dark:text-gray-400 mb-4">For use on dark-colored backgrounds.</p>

     

       57
       57
       +
                 <p class="text-gray-700 dark:text-gray-300">

     

       58
       58
       +
                   This version features white text and elements, ideal for dark backgrounds

     

       59
       59
       +
                   and inverted designs.

     

       60
       60
       +
                 </p>

     

       61
       61
       +
               </div>

     

       62
       62
       +
             </section>

     

       63
       63
       +
       

     

       64
       64
       +
             <!-- Mark Only Section -->

     

       65
       65
       +
             <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center">

     

       66
       66
       +
               <div class="order-2 lg:order-1">

     

       67
       67
       +
                 <div class="grid grid-cols-2 gap-2">

     

       68
       68
       +
                   <!-- Black mark on light background -->

     

       69
       69
       +
                   <div class="border border-gray-200 dark:border-gray-700 bg-gray-50 dark:bg-gray-100 p-8 sm:p-12 rounded">

     

       70
       70
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_black_on_trans.svg"

     

       71
       71
       +
                          alt="Dolly face - black version"

     

       72
       72
       +
                          class="w-full max-w-16 mx-auto" />

     

       73
       73
       +
                   </div>

     

       74
       74
       +
                   <!-- White mark on dark background -->

     

       75
       75
       +
                   <div class="bg-black p-8 sm:p-12 rounded">

     

       76
       76
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_white_on_trans.svg"

     

       77
       77
       +
                          alt="Dolly face - white version"

     

       78
       78
       +
                          class="w-full max-w-16 mx-auto" />

     

       79
       79
       +
                   </div>

     

       80
       80
       +
                 </div>

     

       81
       81
       +
               </div>

     

       82
       82
       +
               <div class="order-1 lg:order-2">

     

       83
       83
       +
                 <h2 class="text-xl font-semibold dark:text-white mb-3">Mark only</h2>

     

       84
       84
       +
                 <p class="text-gray-600 dark:text-gray-400 mb-4">

     

       85
       85
       +
                   When a smaller 1:1 logo or icon is needed, Dolly's face may be used on its own.

     

       86
       86
       +
                 </p>

     

       87
       87
       +
                 <p class="text-gray-700 dark:text-gray-300 mb-4">

     

       88
       88
       +
                   <strong class="font-semibold">Note</strong>: for situations where the background

     

       89
       89
       +
                   is unknown, use the black version for ideal contrast in most environments.

     

       90
       90
       +
                 </p>

     

       91
       91
       +
               </div>

     

       92
       92
       +
             </section>

     

       93
       93
       +
       

     

       94
       94
       +
             <!-- Colored Backgrounds Section -->

     

       95
       95
       +
             <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center">

     

       96
       96
       +
               <div class="order-2 lg:order-1">

     

       97
       97
       +
                 <div class="grid grid-cols-2 gap-2">

     

       98
       98
       +
                   <!-- Pastel Green background -->

     

       99
       99
       +
                   <div class="bg-green-500 p-8 sm:p-12 rounded">

     

       100
       100
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_white_on_trans.svg"

     

       101
       101
       +
                          alt="Tangled logo on pastel green background"

     

       102
       102
       +
                          class="w-full max-w-16 mx-auto" />

     

       103
       103
       +
                   </div>

     

       104
       104
       +
                   <!-- Pastel Blue background -->

     

       105
       105
       +
                   <div class="bg-blue-500 p-8 sm:p-12 rounded">

     

       106
       106
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_white_on_trans.svg"

     

       107
       107
       +
                          alt="Tangled logo on pastel blue background"

     

       108
       108
       +
                          class="w-full max-w-16 mx-auto" />

     

       109
       109
       +
                   </div>

     

       110
       110
       +
                   <!-- Pastel Yellow background -->

     

       111
       111
       +
                   <div class="bg-yellow-500 p-8 sm:p-12 rounded">

     

       112
       112
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_white_on_trans.svg"

     

       113
       113
       +
                          alt="Tangled logo on pastel yellow background"

     

       114
       114
       +
                          class="w-full max-w-16 mx-auto" />

     

       115
       115
       +
                   </div>

     

       116
       116
       +
                   <!-- Pastel Red background -->

     

       117
       117
       +
                   <div class="bg-red-500 p-8 sm:p-12 rounded">

     

       118
       118
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_white_on_trans.svg"

     

       119
       119
       +
                          alt="Tangled logo on pastel red background"

     

       120
       120
       +
                          class="w-full max-w-16 mx-auto" />

     

       121
       121
       +
                   </div>

     

       122
       122
       +
                 </div>

     

       123
       123
       +
               </div>

     

       124
       124
       +
               <div class="order-1 lg:order-2">

     

       125
       125
       +
                 <h2 class="text-xl font-semibold dark:text-white mb-3">Colored backgrounds</h2>

     

       126
       126
       +
                 <p class="text-gray-600 dark:text-gray-400 mb-4">

     

       127
       127
       +
                   White logo mark on colored backgrounds.

     

       128
       128
       +
                 </p>

     

       129
       129
       +
                 <p class="text-gray-700 dark:text-gray-300 mb-4">

     

       130
       130
       +
                   The white logo mark provides contrast on colored backgrounds.

     

       131
       131
       +
                   Perfect for more fun design contexts.

     

       132
       132
       +
                 </p>

     

       133
       133
       +
               </div>

     

       134
       134
       +
             </section>

     

       135
       135
       +
       

     

       136
       136
       +
             <!-- Black Logo on Pastel Backgrounds Section -->

     

       137
       137
       +
             <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center">

     

       138
       138
       +
               <div class="order-2 lg:order-1">

     

       139
       139
       +
                 <div class="grid grid-cols-2 gap-2">

     

       140
       140
       +
                   <!-- Pastel Green background -->

     

       141
       141
       +
                   <div class="bg-green-200 p-8 sm:p-12 rounded">

     

       142
       142
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_black_on_trans.svg"

     

       143
       143
       +
                          alt="Tangled logo on pastel green background"

     

       144
       144
       +
                          class="w-full max-w-16 mx-auto" />

     

       145
       145
       +
                   </div>

     

       146
       146
       +
                   <!-- Pastel Blue background -->

     

       147
       147
       +
                   <div class="bg-blue-200 p-8 sm:p-12 rounded">

     

       148
       148
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_black_on_trans.svg"

     

       149
       149
       +
                          alt="Tangled logo on pastel blue background"

     

       150
       150
       +
                          class="w-full max-w-16 mx-auto" />

     

       151
       151
       +
                   </div>

     

       152
       152
       +
                   <!-- Pastel Yellow background -->

     

       153
       153
       +
                   <div class="bg-yellow-200 p-8 sm:p-12 rounded">

     

       154
       154
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_black_on_trans.svg"

     

       155
       155
       +
                          alt="Tangled logo on pastel yellow background"

     

       156
       156
       +
                          class="w-full max-w-16 mx-auto" />

     

       157
       157
       +
                   </div>

     

       158
       158
       +
                   <!-- Pastel Pink background -->

     

       159
       159
       +
                   <div class="bg-pink-200 p-8 sm:p-12 rounded">

     

       160
       160
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_black_on_trans.svg"

     

       161
       161
       +
                          alt="Tangled logo on pastel pink background"

     

       162
       162
       +
                          class="w-full max-w-16 mx-auto" />

     

       163
       163
       +
                   </div>

     

       164
       164
       +
                 </div>

     

       165
       165
       +
               </div>

     

       166
       166
       +
               <div class="order-1 lg:order-2">

     

       167
       167
       +
                 <h2 class="text-xl font-semibold dark:text-white mb-3">Lighter backgrounds</h2>

     

       168
       168
       +
                 <p class="text-gray-600 dark:text-gray-400 mb-4">

     

       169
       169
       +
                   Dark logo mark on lighter, pastel backgrounds.

     

       170
       170
       +
                 </p>

     

       171
       171
       +
                 <p class="text-gray-700 dark:text-gray-300 mb-4">

     

       172
       172
       +
                   The dark logo mark works beautifully on pastel backgrounds,

     

       173
       173
       +
                   providing crisp contrast.

     

       174
       174
       +
                 </p>

     

       175
       175
       +
               </div>

     

       176
       176
       +
             </section>

     

       177
       177
       +
       

     

       178
       178
       +
             <!-- Recoloring Section -->

     

       179
       179
       +
             <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center">

     

       180
       180
       +
               <div class="order-2 lg:order-1">

     

       181
       181
       +
                 <div class="bg-yellow-100 border border-yellow-200 p-8 sm:p-16 rounded">

     

       182
       182
       +
                   <img src="https://assets.tangled.network/tangled_logotype_black_on_trans.svg"

     

       183
       183
       +
                        alt="Recolored Tangled logotype in gray/sand color"

     

       184
       184
       +
                        class="w-full max-w-sm mx-auto opacity-60 sepia contrast-75 saturate-50" />

     

       185
       185
       +
                 </div>

     

       186
       186
       +
               </div>

     

       187
       187
       +
               <div class="order-1 lg:order-2">

     

       188
       188
       +
                 <h2 class="text-xl font-semibold dark:text-white mb-3">Recoloring</h2>

     

       189
       189
       +
                 <p class="text-gray-600 dark:text-gray-400 mb-4">

     

       190
       190
       +
                   Custom coloring of the logotype is permitted.

     

       191
       191
       +
                 </p>

     

       192
       192
       +
                 <p class="text-gray-700 dark:text-gray-300 mb-4">

     

       193
       193
       +
                   Recoloring the logotype is allowed as long as readability is maintained.

     

       194
       194
       +
                 </p>

     

       195
       195
       +
                 <p class="text-gray-700 dark:text-gray-300 text-sm">

     

       196
       196
       +
                   <strong>Example:</strong> Gray/sand colored logotype on a light yellow/tan background.

     

       197
       197
       +
                 </p>

     

       198
       198
       +
               </div>

     

       199
       199
       +
             </section>

     

       200
       200
       +
       

     

       201
       201
       +
             <!-- Silhouette Section -->

     

       202
       202
       +
             <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center">

     

       203
       203
       +
               <div class="order-2 lg:order-1">

     

       204
       204
       +
                 <div class="border border-gray-200 dark:border-gray-700 p-8 sm:p-16 bg-gray-50 dark:bg-gray-100 rounded">

     

       205
       205
       +
                   <img src="https://assets.tangled.network/tangled_dolly_silhouette.svg"

     

       206
       206
       +
                        alt="Dolly silhouette"

     

       207
       207
       +
                        class="w-full max-w-32 mx-auto" />

     

       208
       208
       +
                 </div>

     

       209
       209
       +
               </div>

     

       210
       210
       +
               <div class="order-1 lg:order-2">

     

       211
       211
       +
                 <h2 class="text-xl font-semibold dark:text-white mb-3">Dolly silhouette</h2>

     

       212
       212
       +
                 <p class="text-gray-600 dark:text-gray-400 mb-4">A minimalist version of Dolly.</p>

     

       213
       213
       +
                 <p class="text-gray-700 dark:text-gray-300">

     

       214
       214
       +
                   The silhouette can be used where a subtle brand presence is needed,

     

       215
       215
       +
                   or as a background element. Works on any background color with proper contrast.

     

       216
       216
       +
                   For example, we use this as the site's favicon.

     

       217
       217
       +
                 </p>

     

       218
       218
       +
               </div>

     

       219
       219
       +
             </section>

     

       220
       220
       +
       

     

       221
       221
       +
           </div>

     

       222
       222
       +
         </main>

     

       223
       223
       +
       </div>

     

       224
       224
       +
       {{ end }}

+13 -6

appview/pages/templates/legal/privacy.html

···

       1
       1
        
       {{ define "title" }}privacy policy{{ end }}

     

       2
       2
        
       

     

       3
       3
        
       {{ define "content" }}

     

       4
       4
       -
       <div class="max-w-4xl mx-auto px-4 py-8">

     

       5
       5
       -
           <div class="bg-white dark:bg-gray-800 rounded-lg shadow-sm p-8">

     

       6
       6
       -
               <div class="prose prose-gray dark:prose-invert max-w-none">

     

       7
       7
       -
                   {{ .Content }}

     

       8
       8
       -
               </div>

     

       4
       4
       +
       <div class="grid grid-cols-10">

     

       5
       5
       +
         <header class="col-span-full md:col-span-10 px-6 py-2 mb-4">

     

       6
       6
       +
           <h1 class="text-2xl font-bold dark:text-white mb-1">Privacy Policy</h1>

     

       7
       7
       +
           <p class="text-gray-600 dark:text-gray-400 mb-1">

     

       8
       8
       +
             Learn how we collect, use, and protect your personal information.

     

       9
       9
       +
           </p>

     

       10
       10
       +
         </header>

     

       11
       11
       +
       

     

       12
       12
       +
         <main class="col-span-full md:col-span-10 bg-white dark:bg-gray-800 drop-shadow-sm rounded p-6 md:px-10">

     

       13
       13
       +
           <div class="prose prose-gray dark:prose-invert max-w-none">

     

       14
       14
       +
             {{ .Content }}

     

       9
       15
        
           </div>

     

       16
       16
       +
         </main>

     

       10
       17
        
       </div>

     

       11
       11
       -
       {{ end }}
     

       18
       18
       +
       {{ end }}

+13 -6

appview/pages/templates/legal/terms.html

···

       1
       1
        
       {{ define "title" }}terms of service{{ end }}

     

       2
       2
        
       

     

       3
       3
        
       {{ define "content" }}

     

       4
       4
       -
       <div class="max-w-4xl mx-auto px-4 py-8">

     

       5
       5
       -
           <div class="bg-white dark:bg-gray-800 rounded-lg shadow-sm p-8">

     

       6
       6
       -
               <div class="prose prose-gray dark:prose-invert max-w-none">

     

       7
       7
       -
                   {{ .Content }}

     

       8
       8
       -
               </div>

     

       4
       4
       +
       <div class="grid grid-cols-10">

     

       5
       5
       +
         <header class="col-span-full md:col-span-10 px-6 py-2 mb-4">

     

       6
       6
       +
           <h1 class="text-2xl font-bold dark:text-white mb-1">Terms of Service</h1>

     

       7
       7
       +
           <p class="text-gray-600 dark:text-gray-400 mb-1">

     

       8
       8
       +
           A few things you should know.

     

       9
       9
       +
           </p>

     

       10
       10
       +
         </header>

     

       11
       11
       +
       

     

       12
       12
       +
         <main class="col-span-full md:col-span-10 bg-white dark:bg-gray-800 drop-shadow-sm rounded p-6 md:px-10">

     

       13
       13
       +
           <div class="prose prose-gray dark:prose-invert max-w-none">

     

       14
       14
       +
             {{ .Content }}

     

       9
       15
        
           </div>

     

       16
       16
       +
         </main>

     

       10
       17
        
       </div>

     

       11
       11
       -
       {{ end }}
     

       18
       18
       +
       {{ end }}

+4 -2

appview/config/config.go

···

       72
       72
        
       }

     

       73
       73
        
       

     

       74
       74
        
       type Cloudflare struct {

     

       75
       75
       -
       	ApiToken string `env:"API_TOKEN"`

     

       76
       76
       -
       	ZoneId   string `env:"ZONE_ID"`

     

       75
       75
       +
       	ApiToken           string `env:"API_TOKEN"`

     

       76
       76
       +
       	ZoneId             string `env:"ZONE_ID"`

     

       77
       77
       +
       	TurnstileSiteKey   string `env:"TURNSTILE_SITE_KEY"`

     

       78
       78
       +
       	TurnstileSecretKey string `env:"TURNSTILE_SECRET_KEY"`

     

       77
       79
        
       }

     

       78
       80
        
       

     

       79
       81
        
       func (cfg RedisConfig) ToURL() string {

+13 -9

appview/db/email.go

···

       71
       71
        
       	return did, nil

     

       72
       72
        
       }

     

       73
       73
        
       

     

       74
       74
       -
       func GetEmailToDid(e Execer, ems []string, isVerifiedFilter bool) (map[string]string, error) {

     

       75
       75
       -
       	if len(ems) == 0 {

     

       74
       74
       +
       func GetEmailToDid(e Execer, emails []string, isVerifiedFilter bool) (map[string]string, error) {

     

       75
       75
       +
       	if len(emails) == 0 {

     

       76
       76
        
       		return make(map[string]string), nil

     

       77
       77
        
       	}

     

       78
       78
        
       

     
···

       81
       81
        
       		verifiedFilter = 1

     

       82
       82
        
       	}

     

       83
       83
        
       

     

       84
       84
       +
       	assoc := make(map[string]string)

     

       85
       85
       +
       

     

       84
       86
        
       	// Create placeholders for the IN clause

     

       85
       85
       -
       	placeholders := make([]string, len(ems))

     

       86
       86
       -
       	args := make([]any, len(ems)+1)

     

       87
       87
       +
       	placeholders := make([]string, 0, len(emails))

     

       88
       88
       +
       	args := make([]any, 1, len(emails)+1)

     

       87
       89
        
       

     

       88
       90
        
       	args[0] = verifiedFilter

     

       89
       89
       -
       	for i, em := range ems {

     

       90
       90
       -
       		placeholders[i] = "?"

     

       91
       91
       -
       		args[i+1] = em

     

       91
       91
       +
       	for _, email := range emails {

     

       92
       92
       +
       		if strings.HasPrefix(email, "did:") {

     

       93
       93
       +
       			assoc[email] = email

     

       94
       94
       +
       			continue

     

       95
       95
       +
       		}

     

       96
       96
       +
       		placeholders = append(placeholders, "?")

     

       97
       97
       +
       		args = append(args, email)

     

       92
       98
        
       	}

     

       93
       99
        
       

     

       94
       100
        
       	query := `

     
···

       105
       111
        
       	}

     

       106
       112
        
       	defer rows.Close()

     

       107
       113
        
       

     

       108
       108
       -
       	assoc := make(map[string]string)

     

       109
       109
       -
       

     

       110
       114
        
       	for rows.Next() {

     

       111
       115
        
       		var email, did string

     

       112
       116
        
       		if err := rows.Scan(&email, &did); err != nil {

appview/pages/templates/repo/fork.html

···

       6
       6
        
       </div>

     

       7
       7
        
       <div class="p-6 bg-white dark:bg-gray-800 drop-shadow-sm rounded">

     

       8
       8
        
         <form hx-post="/{{ .RepoInfo.FullName }}/fork" class="space-y-12" hx-swap="none" hx-indicator="#spinner">

     

       9
       9
       +
       

     

       10
       10
       +
           <fieldset class="space-y-3">

     

       11
       11
       +
             <legend for="repo_name" class="dark:text-white">Repository name</legend>

     

       12
       12
       +
             <input type="text" id="repo_name" name="repo_name" value="{{ .RepoInfo.Name }}"

     

       13
       13
       +
               class="w-full p-2 border rounded bg-gray-100 dark:bg-gray-700 dark:text-white dark:border-gray-600" />

     

       14
       14
       +
           </fieldset>

     

       15
       15
       +
       

     

       9
       16
        
           <fieldset class="space-y-3">

     

       10
       17
        
             <legend class="dark:text-white">Select a knot to fork into</legend>

     

       11
       18
        
             <div class="space-y-2">

+11 -7

appview/repo/repo.go

···

       2129
       2129
        
       		}

     

       2130
       2130
        
       

     

       2131
       2131
        
       		// choose a name for a fork

     

       2132
       2132
       -
       		forkName := f.Name

     

       2132
       2132
       +
       		forkName := r.FormValue("repo_name")

     

       2133
       2133
       +
       		if forkName == "" {

     

       2134
       2134
       +
       			rp.pages.Notice(w, "repo", "Repository name cannot be empty.")

     

       2135
       2135
       +
       			return

     

       2136
       2136
       +
       		}

     

       2137
       2137
       +
       

     

       2133
       2138
        
       		// this check is *only* to see if the forked repo name already exists

     

       2134
       2139
        
       		// in the user's account.

     

       2135
       2140
        
       		existingRepo, err := db.GetRepo(

     

       2136
       2141
        
       			rp.db,

     

       2137
       2142
        
       			db.FilterEq("did", user.Did),

     

       2138
       2138
       -
       			db.FilterEq("name", f.Name),

     

       2143
       2143
       +
       			db.FilterEq("name", forkName),

     

       2139
       2144
        
       		)

     

       2140
       2145
        
       		if err != nil {

     

       2141
       2141
       -
       			if errors.Is(err, sql.ErrNoRows) {

     

       2142
       2142
       -
       				// no existing repo with this name found, we can use the name as is

     

       2143
       2143
       -
       			} else {

     

       2146
       2146
       +
       			if !errors.Is(err, sql.ErrNoRows) {

     

       2144
       2147
        
       				log.Println("error fetching existing repo from db", "err", err)

     

       2145
       2148
        
       				rp.pages.Notice(w, "repo", "Failed to fork this repository. Try again later.")

     

       2146
       2149
        
       				return

     

       2147
       2150
        
       			}

     

       2148
       2151
        
       		} else if existingRepo != nil {

     

       2149
       2149
       -
       			// repo with this name already exists, append random string

     

       2150
       2150
       -
       			forkName = fmt.Sprintf("%s-%s", forkName, randomString(3))

     

       2152
       2152
       +
       			// repo with this name already exists

     

       2153
       2153
       +
       			rp.pages.Notice(w, "repo", "A repository with this name already exists.")

     

       2154
       2154
       +
       			return

     

       2151
       2155
        
       		}

     

       2152
       2156
        
       		l = l.With("forkName", forkName)

     

       2153
       2157

+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 }}

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 {

+18 -13

appview/db/notifications.go

···

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     

       5
       5
        
       	"database/sql"

     

       6
       6
       +
       	"errors"

     

       6
       7
        
       	"fmt"

     

       8
       8
       +
       	"strings"

     

       7
       9
        
       	"time"

     

       8
       10
        
       

     

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

     
···

       248
       250
        
       	return GetNotificationsPaginated(e, pagination.FirstPage(), filters...)

     

       249
       251
        
       }

     

       250
       252
        
       

     

       251
       251
       -
       func (d *DB) GetUnreadNotificationCount(ctx context.Context, userDID string) (int, error) {

     

       252
       252
       -
       	recipientFilter := FilterEq("recipient_did", userDID)

     

       253
       253
       -
       	readFilter := FilterEq("read", 0)

     

       253
       253
       +
       func CountNotifications(e Execer, filters ...filter) (int64, error) {

     

       254
       254
       +
       	var conditions []string

     

       255
       255
       +
       	var args []any

     

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

     

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

     

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

     

       259
       259
       +
       	}

     

       254
       260
        
       

     

       255
       255
       -
       	query := fmt.Sprintf(`

     

       256
       256
       -
       		SELECT COUNT(*)

     

       257
       257
       -
       		FROM notifications

     

       258
       258
       -
       		WHERE %s AND %s

     

       259
       259
       -
       	`, recipientFilter.Condition(), readFilter.Condition())

     

       261
       261
       +
       	whereClause := ""

     

       262
       262
       +
       	if conditions != nil {

     

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

     

       264
       264
       +
       	}

     

       260
       265
        
       

     

       261
       261
       -
       	args := append(recipientFilter.Arg(), readFilter.Arg()...)

     

       266
       266
       +
       	query := fmt.Sprintf(`select count(1) from notifications %s`, whereClause)

     

       267
       267
       +
       	var count int64

     

       268
       268
       +
       	err := e.QueryRow(query, args...).Scan(&count)

     

       262
       269
        
       

     

       263
       263
       -
       	var count int

     

       264
       264
       -
       	err := d.DB.QueryRowContext(ctx, query, args...).Scan(&count)

     

       265
       265
       -
       	if err != nil {

     

       266
       266
       -
       		return 0, fmt.Errorf("failed to get unread count: %w", err)

     

       270
       270
       +
       	if !errors.Is(err, sql.ErrNoRows) && err != nil {

     

       271
       271
       +
       		return 0, err

     

       267
       272
        
       	}

     

       268
       273
        
       

     

       269
       274
        
       	return count, nil

+29 -36

appview/notifications/notifications.go

···

       1
       1
        
       package notifications

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       +
       	"fmt"

     

       4
       5
        
       	"log"

     

       5
       6
        
       	"net/http"

     

       6
       7
        
       	"strconv"

     
···

       32
       33
        
       

     

       33
       34
        
       	r.Use(middleware.AuthMiddleware(n.oauth))

     

       34
       35
        
       

     

       35
       35
       -
       	r.Get("/", n.notificationsPage)

     

       36
       36
       +
       	r.With(middleware.Paginate).Get("/", n.notificationsPage)

     

       36
       37
        
       

     

       37
       38
        
       	r.Get("/count", n.getUnreadCount)

     

       38
       39
        
       	r.Post("/{id}/read", n.markRead)

     
···

       45
       46
        
       func (n *Notifications) notificationsPage(w http.ResponseWriter, r *http.Request) {

     

       46
       47
        
       	userDid := n.oauth.GetDid(r)

     

       47
       48
        
       

     

       48
       48
       -
       	limitStr := r.URL.Query().Get("limit")

     

       49
       49
       -
       	offsetStr := r.URL.Query().Get("offset")

     

       50
       50
       -
       

     

       51
       51
       -
       	limit := 20 // default

     

       52
       52
       -
       	if limitStr != "" {

     

       53
       53
       -
       		if l, err := strconv.Atoi(limitStr); err == nil && l > 0 && l <= 100 {

     

       54
       54
       -
       			limit = l

     

       55
       55
       -
       		}

     

       49
       49
       +
       	page, ok := r.Context().Value("page").(pagination.Page)

     

       50
       50
       +
       	if !ok {

     

       51
       51
       +
       		log.Println("failed to get page")

     

       52
       52
       +
       		page = pagination.FirstPage()

     

       56
       53
        
       	}

     

       57
       54
        
       

     

       58
       58
       -
       	offset := 0 // default

     

       59
       59
       -
       	if offsetStr != "" {

     

       60
       60
       -
       		if o, err := strconv.Atoi(offsetStr); err == nil && o >= 0 {

     

       61
       61
       -
       			offset = o

     

       62
       62
       -
       		}

     

       55
       55
       +
       	total, err := db.CountNotifications(

     

       56
       56
       +
       		n.db,

     

       57
       57
       +
       		db.FilterEq("recipient_did", userDid),

     

       58
       58
       +
       	)

     

       59
       59
       +
       	if err != nil {

     

       60
       60
       +
       		log.Println("failed to get total notifications:", err)

     

       61
       61
       +
       		n.pages.Error500(w)

     

       62
       62
       +
       		return

     

       63
       63
        
       	}

     

       64
       64
        
       

     

       65
       65
       -
       	page := pagination.Page{Limit: limit + 1, Offset: offset}

     

       66
       66
       -
       	notifications, err := db.GetNotificationsWithEntities(n.db, page, db.FilterEq("recipient_did", userDid))

     

       65
       65
       +
       	notifications, err := db.GetNotificationsWithEntities(

     

       66
       66
       +
       		n.db,

     

       67
       67
       +
       		page,

     

       68
       68
       +
       		db.FilterEq("recipient_did", userDid),

     

       69
       69
       +
       	)

     

       67
       70
        
       	if err != nil {

     

       68
       71
        
       		log.Println("failed to get notifications:", err)

     

       69
       72
        
       		n.pages.Error500(w)

     

       70
       73
        
       		return

     

       71
       74
        
       	}

     

       72
       75
        
       

     

       73
       73
       -
       	hasMore := len(notifications) > limit

     

       74
       74
       -
       	if hasMore {

     

       75
       75
       -
       		notifications = notifications[:limit]

     

       76
       76
       -
       	}

     

       77
       77
       -
       

     

       78
       76
        
       	err = n.db.MarkAllNotificationsRead(r.Context(), userDid)

     

       79
       77
        
       	if err != nil {

     

       80
       78
        
       		log.Println("failed to mark notifications as read:", err)

     
···

       88
       86
        
       		return

     

       89
       87
        
       	}

     

       90
       88
        
       

     

       91
       91
       -
       	params := pages.NotificationsParams{

     

       89
       89
       +
       	fmt.Println(n.pages.Notifications(w, pages.NotificationsParams{

     

       92
       90
        
       		LoggedInUser:  user,

     

       93
       91
        
       		Notifications: notifications,

     

       94
       92
        
       		UnreadCount:   unreadCount,

     

       95
       95
       -
       		HasMore:       hasMore,

     

       96
       96
       -
       		NextOffset:    offset + limit,

     

       97
       97
       -
       		Limit:         limit,

     

       98
       98
       -
       	}

     

       99
       99
       -
       

     

       100
       100
       -
       	err = n.pages.Notifications(w, params)

     

       101
       101
       -
       	if err != nil {

     

       102
       102
       -
       		log.Println("failed to load notifs:", err)

     

       103
       103
       -
       		n.pages.Error500(w)

     

       104
       104
       -
       		return

     

       105
       105
       -
       	}

     

       93
       93
       +
       		Page:          page,

     

       94
       94
       +
       		Total:         total,

     

       95
       95
       +
       	}))

     

       106
       96
        
       }

     

       107
       97
        
       

     

       108
       98
        
       func (n *Notifications) getUnreadCount(w http.ResponseWriter, r *http.Request) {

     

       109
       109
       -
       	userDid := n.oauth.GetDid(r)

     

       110
       110
       -
       

     

       111
       111
       -
       	count, err := n.db.GetUnreadNotificationCount(r.Context(), userDid)

     

       99
       99
       +
       	user := n.oauth.GetUser(r)

     

       100
       100
       +
       	count, err := db.CountNotifications(

     

       101
       101
       +
       		n.db,

     

       102
       102
       +
       		db.FilterEq("recipient_did", user.Did),

     

       103
       103
       +
       		db.FilterEq("read", 0),

     

       104
       104
       +
       	)

     

       112
       105
        
       	if err != nil {

     

       113
       106
        
       		http.Error(w, "Failed to get unread count", http.StatusInternalServerError)

     

       114
       107
        
       		return

+3 -4

appview/pages/pages.go

···

       326
       326
        
       	LoggedInUser  *oauth.User

     

       327
       327
        
       	Notifications []*models.NotificationWithEntity

     

       328
       328
        
       	UnreadCount   int

     

       329
       329
       -
       	HasMore       bool

     

       330
       330
       -
       	NextOffset    int

     

       331
       331
       -
       	Limit         int

     

       329
       329
       +
       	Page          pagination.Page

     

       330
       330
       +
       	Total         int64

     

       332
       331
        
       }

     

       333
       332
        
       

     

       334
       333
        
       func (p *Pages) Notifications(w io.Writer, params NotificationsParams) error {

     
···

       344
       343
        
       }

     

       345
       344
        
       

     

       346
       345
        
       type NotificationCountParams struct {

     

       347
       347
       -
       	Count int

     

       346
       346
       +
       	Count int64

     

       348
       347
        
       }

     

       349
       348
        
       

     

       350
       349
        
       func (p *Pages) NotificationCount(w io.Writer, params NotificationCountParams) error {

+48 -15

appview/pages/templates/notifications/list.html

···

       11
       11
        
           </div>

     

       12
       12
        
         </div>

     

       13
       13
        
       

     

       14
       14
       -
           {{if .Notifications}}

     

       15
       15
       -
             <div class="flex flex-col gap-2" id="notifications-list">

     

       16
       16
       -
               {{range .Notifications}}

     

       17
       17
       -
                 {{template "notifications/fragments/item" .}}

     

       18
       18
       -
               {{end}}

     

       19
       19
       -
             </div>

     

       14
       14
       +
         {{if .Notifications}}

     

       15
       15
       +
           <div class="flex flex-col gap-2" id="notifications-list">

     

       16
       16
       +
             {{range .Notifications}}

     

       17
       17
       +
               {{template "notifications/fragments/item" .}}

     

       18
       18
       +
             {{end}}

     

       19
       19
       +
           </div>

     

       20
       20
        
       

     

       21
       21
       -
           {{else}}

     

       22
       22
       -
             <div class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white">

     

       23
       23
       -
               <div class="text-center py-12">

     

       24
       24
       -
                 <div class="w-16 h-16 mx-auto mb-4 text-gray-300 dark:text-gray-600">

     

       25
       25
       -
                   {{ i "bell-off" "w-16 h-16" }}

     

       26
       26
       -
                 </div>

     

       27
       27
       -
                 <h3 class="text-lg font-medium text-gray-900 dark:text-white mb-2">No notifications</h3>

     

       28
       28
       -
                 <p class="text-gray-600 dark:text-gray-400">When you receive notifications, they'll appear here.</p>

     

       21
       21
       +
         {{else}}

     

       22
       22
       +
           <div class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white">

     

       23
       23
       +
             <div class="text-center py-12">

     

       24
       24
       +
               <div class="w-16 h-16 mx-auto mb-4 text-gray-300 dark:text-gray-600">

     

       25
       25
       +
                 {{ i "bell-off" "w-16 h-16" }}

     

       29
       26
        
               </div>

     

       27
       27
       +
               <h3 class="text-lg font-medium text-gray-900 dark:text-white mb-2">No notifications</h3>

     

       28
       28
       +
               <p class="text-gray-600 dark:text-gray-400">When you receive notifications, they'll appear here.</p>

     

       30
       29
        
             </div>

     

       31
       31
       -
           {{end}}

     

       30
       30
       +
           </div>

     

       31
       31
       +
         {{end}}

     

       32
       32
       +
       

     

       33
       33
       +
         {{ template "pagination" . }}

     

       34
       34
       +
       {{ end }}

     

       35
       35
       +
       

     

       36
       36
       +
       {{ define "pagination" }}

     

       37
       37
       +
         <div class="flex justify-end mt-4 gap-2">

     

       38
       38
       +
             {{ if gt .Page.Offset 0 }}

     

       39
       39
       +
                {{ $prev := .Page.Previous }}

     

       40
       40
       +
                 <a

     

       41
       41
       +
                     class="btn flex items-center gap-2 no-underline hover:no-underline dark:text-white dark:hover:bg-gray-700"

     

       42
       42
       +
                     hx-boost="true"

     

       43
       43
       +
                     href = "/notifications?offset={{ $prev.Offset }}&limit={{ $prev.Limit }}"

     

       44
       44
       +
                 >

     

       45
       45
       +
                     {{ i "chevron-left" "w-4 h-4" }}

     

       46
       46
       +
                     previous

     

       47
       47
       +
                 </a>

     

       48
       48
       +
             {{ else }}

     

       49
       49
       +
                 <div></div>

     

       50
       50
       +
             {{ end }}

     

       51
       51
       +
       

     

       52
       52
       +
             {{ $next := .Page.Next }}

     

       53
       53
       +
             {{ if lt $next.Offset .Total }}

     

       54
       54
       +
                {{ $next := .Page.Next }}

     

       55
       55
       +
                 <a

     

       56
       56
       +
                     class="btn flex items-center gap-2 no-underline hover:no-underline dark:text-white dark:hover:bg-gray-700"

     

       57
       57
       +
                     hx-boost="true"

     

       58
       58
       +
                     href = "/notifications?offset={{ $next.Offset }}&limit={{ $next.Limit }}"

     

       59
       59
       +
                 >

     

       60
       60
       +
                     next

     

       61
       61
       +
                     {{ i "chevron-right" "w-4 h-4" }}

     

       62
       62
       +
                 </a>

     

       63
       63
       +
             {{ end }}

     

       64
       64
       +
         </div>

     

       32
       65
        
       {{ end }}

+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

+27 -208

appview/pages/templates/notifications/fragments/item.html

···

       1
       1
        
       {{define "notifications/fragments/item"}}

     

       2
       2
       -
         <div 

     

       3
       3
       -
           class="

     

       4
       4
       -
             w-full mx-auto rounded drop-shadow-sm dark:text-white bg-white dark:bg-gray-800 px-2 md:px-6 py-4 transition-colors 

     

       5
       5
       -
             {{if not .Read}}bg-blue-50 dark:bg-blue-900/20 border border-blue-500 dark:border-sky-800{{end}}

     

       6
       6
       -
             flex gap-2 items-center

     

       7
       7
       -
             "

     

       8
       8
       -
           >

     

       2
       2
       +
         <a href="{{ template "notificationUrl" . }}" class="block no-underline hover:no-underline">

     

       3
       3
       +
           <div 

     

       4
       4
       +
             class="

     

       5
       5
       +
               w-full mx-auto rounded drop-shadow-sm dark:text-white bg-white dark:bg-gray-800 px-2 md:px-6 py-4 transition-colors 

     

       6
       6
       +
               {{if not .Read}}bg-blue-50 dark:bg-blue-800/20 border border-blue-500 dark:border-sky-800{{end}}

     

       7
       7
       +
               flex gap-2 items-center

     

       8
       8
       +
               ">

     

       9
       9
       +
             {{ template "notificationIcon" . }}

     

       10
       10
       +
             <div class="flex-1 w-full flex flex-col gap-1">

     

       11
       11
       +
               <span>{{ template "notificationHeader" . }}</span>

     

       12
       12
       +
               <span class="text-sm text-gray-500 dark:text-gray-400">{{ template "notificationSummary" . }}</span>

     

       13
       13
       +
             </div>

     

       9
       14
        
       

     

       10
       10
       -
           {{ template "notificationIcon" . }}

     

       11
       11
       -
           <div class="flex-1 w-full flex flex-col gap-1">

     

       12
       12
       -
             <span>{{ template "notificationHeader" . }}</span>

     

       13
       13
       -
             <span class="text-sm text-gray-500 dark:text-gray-400">{{ template "notificationSummary" . }}</span>

     

       14
       15
        
           </div>

     

       15
       15
       -
       

     

       16
       16
       -
         </div>

     

       16
       16
       +
         </a>

     

       17
       17
        
       {{end}}

     

       18
       18
        
       

     

       19
       19
        
       {{ define "notificationIcon" }}

     
···

       64
       64
        
         {{ end }}

     

       65
       65
        
       {{ end }}

     

       66
       66
        
       

     

       67
       67
       -
       {{define "issueNotification"}}

     

       68
       68
       -
       {{$url := printf "/%s/%s/issues/%d" (resolve .Repo.Did) .Repo.Name .Issue.IssueId}}

     

       69
       69
       -
       <a

     

       70
       70
       -
         href="{{$url}}"

     

       71
       71
       -
         class="block no-underline hover:no-underline text-inherit -m-3 p-3"

     

       72
       72
       -
       >

     

       73
       73
       -
         <div class="flex items-center justify-between">

     

       74
       74
       -
           <div class="min-w-0 flex-1">

     

       75
       75
       -
             <!-- First line: icon + actor action -->

     

       76
       76
       -
             <div class="flex items-center gap-2 text-gray-900 dark:text-white">

     

       77
       77
       -
               {{if eq .Type "issue_created"}}

     

       78
       78
       -
                 <span class="text-green-600 dark:text-green-500">

     

       79
       79
       -
                   {{ i "circle-dot" "w-4 h-4" }}

     

       80
       80
       -
                 </span>

     

       81
       81
       -
               {{else if eq .Type "issue_commented"}}

     

       82
       82
       -
                 <span class="text-gray-500 dark:text-gray-400">

     

       83
       83
       -
                   {{ i "message-circle" "w-4 h-4" }}

     

       84
       84
       -
                 </span>

     

       85
       85
       -
               {{else if eq .Type "issue_closed"}}

     

       86
       86
       -
                 <span class="text-gray-500 dark:text-gray-400">

     

       87
       87
       -
                   {{ i "ban" "w-4 h-4" }}

     

       88
       88
       -
                 </span>

     

       89
       89
       -
               {{end}}

     

       90
       90
       -
               {{template "user/fragments/picHandle" .ActorDid}}

     

       91
       91
       -
               {{if eq .Type "issue_created"}}

     

       92
       92
       -
                 <span class="text-gray-500 dark:text-gray-400">opened issue</span>

     

       93
       93
       -
               {{else if eq .Type "issue_commented"}}

     

       94
       94
       -
                 <span class="text-gray-500 dark:text-gray-400">commented on issue</span>

     

       95
       95
       -
               {{else if eq .Type "issue_closed"}}

     

       96
       96
       -
                 <span class="text-gray-500 dark:text-gray-400">closed issue</span>

     

       97
       97
       -
               {{end}}

     

       98
       98
       -
               {{if not .Read}}

     

       99
       99
       -
                 <div class="w-2 h-2 bg-blue-500 rounded-full flex-shrink-0 ml-1"></div>

     

       100
       100
       -
               {{end}}

     

       101
       101
       -
             </div>

     

       102
       102
       -
       

     

       103
       103
       -
             <div class="text-sm text-gray-600 dark:text-gray-400 mt-0.5 ml-6 flex items-center gap-1">

     

       104
       104
       -
               <span class="text-gray-500 dark:text-gray-400">#{{.Issue.IssueId}}</span>

     

       105
       105
       -
               <span class="text-gray-900 dark:text-white truncate">{{.Issue.Title}}</span>

     

       106
       106
       -
               <span>on</span>

     

       107
       107
       -
               <span class="font-medium text-gray-900 dark:text-white">{{resolve .Repo.Did}}/{{.Repo.Name}}</span>

     

       108
       108
       -
             </div>

     

       109
       109
       -
           </div>

     

       110
       110
       -
       

     

       111
       111
       -
           <div class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0 ml-2">

     

       112
       112
       -
             {{ template "repo/fragments/time" .Created }}

     

       113
       113
       -
           </div>

     

       114
       114
       -
         </div>

     

       115
       115
       -
       </a>

     

       116
       116
       -
       {{end}}

     

       117
       117
       -
       

     

       118
       118
       -
       {{define "pullNotification"}}

     

       119
       119
       -
       {{$url := printf "/%s/%s/pulls/%d" (resolve .Repo.Did) .Repo.Name .Pull.PullId}}

     

       120
       120
       -
       <a

     

       121
       121
       -
         href="{{$url}}"

     

       122
       122
       -
         class="block no-underline hover:no-underline text-inherit -m-3 p-3"

     

       123
       123
       -
       >

     

       124
       124
       -
         <div class="flex items-center justify-between">

     

       125
       125
       -
           <div class="min-w-0 flex-1">

     

       126
       126
       -
             <div class="flex items-center gap-2 text-gray-900 dark:text-white">

     

       127
       127
       -
               {{if eq .Type "pull_created"}}

     

       128
       128
       -
                 <span class="text-green-600 dark:text-green-500">

     

       129
       129
       -
                   {{ i "git-pull-request-create" "w-4 h-4" }}

     

       130
       130
       -
                 </span>

     

       131
       131
       -
               {{else if eq .Type "pull_commented"}}

     

       132
       132
       -
                 <span class="text-gray-500 dark:text-gray-400">

     

       133
       133
       -
                   {{ i "message-circle" "w-4 h-4" }}

     

       134
       134
       -
                 </span>

     

       135
       135
       -
               {{else if eq .Type "pull_merged"}}

     

       136
       136
       -
                 <span class="text-purple-600 dark:text-purple-500">

     

       137
       137
       -
                   {{ i "git-merge" "w-4 h-4" }}

     

       138
       138
       -
                 </span>

     

       139
       139
       -
               {{else if eq .Type "pull_closed"}}

     

       140
       140
       -
                 <span class="text-red-600 dark:text-red-500">

     

       141
       141
       -
                   {{ i "git-pull-request-closed" "w-4 h-4" }}

     

       142
       142
       -
                 </span>

     

       143
       143
       -
               {{end}}

     

       144
       144
       -
               {{template "user/fragments/picHandle" (resolve .ActorDid)}}

     

       145
       145
       -
               {{if eq .Type "pull_created"}}

     

       146
       146
       -
                 <span class="text-gray-500 dark:text-gray-400">opened pull request</span>

     

       147
       147
       -
               {{else if eq .Type "pull_commented"}}

     

       148
       148
       -
                 <span class="text-gray-500 dark:text-gray-400">commented on pull request</span>

     

       149
       149
       -
               {{else if eq .Type "pull_merged"}}

     

       150
       150
       -
                 <span class="text-gray-500 dark:text-gray-400">merged pull request</span>

     

       151
       151
       -
               {{else if eq .Type "pull_closed"}}

     

       152
       152
       -
                 <span class="text-gray-500 dark:text-gray-400">closed pull request</span>

     

       153
       153
       -
               {{end}}

     

       154
       154
       -
               {{if not .Read}}

     

       155
       155
       -
                 <div class="w-2 h-2 bg-blue-500 rounded-full flex-shrink-0 ml-1"></div>

     

       156
       156
       -
               {{end}}

     

       157
       157
       -
             </div>

     

       158
       158
       -
       

     

       159
       159
       -
             <div class="text-sm text-gray-600 dark:text-gray-400 mt-0.5 ml-6 flex items-center gap-1">

     

       160
       160
       -
               <span class="text-gray-500 dark:text-gray-400">#{{.Pull.PullId}}</span>

     

       161
       161
       -
               <span class="text-gray-900 dark:text-white truncate">{{.Pull.Title}}</span>

     

       162
       162
       -
               <span>on</span>

     

       163
       163
       -
               <span class="font-medium text-gray-900 dark:text-white">{{resolve .Repo.Did}}/{{.Repo.Name}}</span>

     

       164
       164
       -
             </div>

     

       165
       165
       -
           </div>

     

       166
       166
       -
       

     

       167
       167
       -
           <div class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0 ml-2">

     

       168
       168
       -
             {{ template "repo/fragments/time" .Created }}

     

       169
       169
       -
           </div>

     

       170
       170
       -
         </div>

     

       171
       171
       -
       </a>

     

       172
       172
       -
       {{end}}

     

       173
       173
       -
       

     

       174
       174
       -
       {{define "repoNotification"}}

     

       175
       175
       -
       {{$url := printf "/%s/%s" (resolve .Repo.Did) .Repo.Name}}

     

       176
       176
       -
       <a

     

       177
       177
       -
         href="{{$url}}"

     

       178
       178
       -
         class="block no-underline hover:no-underline text-inherit -m-3 p-3"

     

       179
       179
       -
       >

     

       180
       180
       -
         <div class="flex items-center justify-between">

     

       181
       181
       -
           <div class="flex items-center gap-2 min-w-0 flex-1">

     

       182
       182
       -
             <span class="text-yellow-500 dark:text-yellow-400">

     

       183
       183
       -
               {{ i "star" "w-4 h-4" }}

     

       184
       184
       -
             </span>

     

       185
       185
       -
       

     

       186
       186
       -
             <div class="min-w-0 flex-1">

     

       187
       187
       -
               <!-- Single line for stars: actor action subject -->

     

       188
       188
       -
               <div class="flex items-center gap-1 text-gray-900 dark:text-white">

     

       189
       189
       -
                 {{template "user/fragments/picHandle" (resolve .ActorDid)}}

     

       190
       190
       -
                 <span class="text-gray-500 dark:text-gray-400">starred</span>

     

       191
       191
       -
                 <span class="font-medium">{{resolve .Repo.Did}}/{{.Repo.Name}}</span>

     

       192
       192
       -
                 {{if not .Read}}

     

       193
       193
       -
                   <div class="w-2 h-2 bg-blue-500 rounded-full flex-shrink-0 ml-1"></div>

     

       194
       194
       -
                 {{end}}

     

       195
       195
       -
               </div>

     

       196
       196
       -
             </div>

     

       197
       197
       -
           </div>

     

       198
       198
       -
       

     

       199
       199
       -
           <div class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0 ml-2">

     

       200
       200
       -
             {{ template "repo/fragments/time" .Created }}

     

       201
       201
       -
           </div>

     

       202
       202
       -
         </div>

     

       203
       203
       -
       </a>

     

       204
       204
       -
       {{end}}

     

       205
       205
       -
       

     

       206
       206
       -
       {{define "followNotification"}}

     

       207
       207
       -
       {{$url := printf "/%s" (resolve .ActorDid)}}

     

       208
       208
       -
       <a

     

       209
       209
       -
         href="{{$url}}"

     

       210
       210
       -
         class="block no-underline hover:no-underline text-inherit -m-3 p-3"

     

       211
       211
       -
       >

     

       212
       212
       -
         <div class="flex items-center justify-between">

     

       213
       213
       -
           <div class="flex items-center gap-2 min-w-0 flex-1">

     

       214
       214
       -
             <span class="text-blue-600 dark:text-blue-400">

     

       215
       215
       -
               {{ i "user-plus" "w-4 h-4" }}

     

       216
       216
       -
             </span>

     

       217
       217
       -
       

     

       218
       218
       -
             <div class="min-w-0 flex-1">

     

       219
       219
       -
               <div class="flex items-center gap-1 text-gray-900 dark:text-white">

     

       220
       220
       -
                 {{template "user/fragments/picHandle" (resolve .ActorDid)}}

     

       221
       221
       -
                 <span class="text-gray-500 dark:text-gray-400">followed you</span>

     

       222
       222
       -
                 {{if not .Read}}

     

       223
       223
       -
                   <div class="w-2 h-2 bg-blue-500 rounded-full flex-shrink-0 ml-1"></div>

     

       224
       224
       -
                 {{end}}

     

       225
       225
       -
               </div>

     

       226
       226
       -
             </div>

     

       227
       227
       -
           </div>

     

       228
       228
       -
       

     

       229
       229
       -
           <div class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0 ml-2">

     

       230
       230
       -
             {{ template "repo/fragments/time" .Created }}

     

       231
       231
       -
           </div>

     

       232
       232
       -
         </div>

     

       233
       233
       -
       </a>

     

       234
       234
       -
       {{end}}

     

       235
       235
       -
       

     

       236
       236
       -
       {{define "genericNotification"}}

     

       237
       237
       -
       <a

     

       238
       238
       -
         href="#"

     

       239
       239
       -
         class="block no-underline hover:no-underline text-inherit -m-3 p-3"

     

       240
       240
       -
       >

     

       241
       241
       -
         <div class="flex items-center justify-between">

     

       242
       242
       -
           <div class="flex items-center gap-2 min-w-0 flex-1">

     

       243
       243
       -
             <span class="{{if not .Read}}text-blue-600 dark:text-blue-400{{else}}text-gray-500 dark:text-gray-400{{end}}">

     

       244
       244
       -
               {{ i "bell" "w-4 h-4" }}

     

       245
       245
       -
             </span>

     

       246
       246
       -
       

     

       247
       247
       -
             <div class="min-w-0 flex-1">

     

       248
       248
       -
               <div class="flex items-center gap-1 text-gray-900 dark:text-white">

     

       249
       249
       -
                 <span>New notification</span>

     

       250
       250
       -
                 {{if not .Read}}

     

       251
       251
       -
                   <div class="w-2 h-2 bg-blue-500 rounded-full flex-shrink-0 ml-1"></div>

     

       252
       252
       -
                 {{end}}

     

       253
       253
       -
               </div>

     

       254
       254
       -
             </div>

     

       255
       255
       -
           </div>

     

       67
       67
       +
       {{ define "notificationUrl" }}

     

       68
       68
       +
         {{ $url := "" }}

     

       69
       69
       +
         {{ if eq .Type "repo_starred" }}

     

       70
       70
       +
           {{$url = printf "/%s/%s" (resolve .Repo.Did) .Repo.Name}}

     

       71
       71
       +
         {{ else if .Issue }}

     

       72
       72
       +
           {{$url = printf "/%s/%s/issues/%d" (resolve .Repo.Did) .Repo.Name .Issue.IssueId}}

     

       73
       73
       +
         {{ else if .Pull }}

     

       74
       74
       +
           {{$url = printf "/%s/%s/pulls/%d" (resolve .Repo.Did) .Repo.Name .Pull.PullId}}

     

       75
       75
       +
         {{ else if eq .Type "followed" }}

     

       76
       76
       +
           {{$url = printf "/%s" (resolve .ActorDid)}}

     

       77
       77
       +
         {{ else }}

     

       78
       78
       +
         {{ end }}

     

       256
       79
        
       

     

       257
       257
       -
           <div class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0 ml-2">

     

       258
       258
       -
             {{ template "repo/fragments/time" .Created }}

     

       259
       259
       -
           </div>

     

       260
       260
       -
         </div>

     

       261
       261
       -
       </a>

     

       262
       262
       -
       {{end}}

     

       80
       80
       +
         {{ $url }}

     

       81
       81
       +
       {{ end }}

+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/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) {

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

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 }}"

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

+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
       +
       }

+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"`

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

appview/models/pull.go

···

       70
       70
        
       	// stacking

     

       71
       71
        
       	StackId        string // nullable string

     

       72
       72
        
       	ChangeId       string // nullable string

     

       73
       73
       +
       	ParentAt       *syntax.ATURI

     

       73
       74
        
       	ParentChangeId string // nullable string

     

       74
       75
        
       

     

       75
       76
        
       	// meta

     
···

       99
       100
        
       		},

     

       100
       101
        
       		Patch:  p.LatestPatch(),

     

       101
       102
        
       		Source: source,

     

       103
       103
       +
       		StackInfo: &tangled.RepoPull_StackInfo{

     

       104
       104
       +
       			ChangeId: p.ChangeId,

     

       105
       105
       +
       			Parent: (*string)(p.ParentAt),

     

       106
       106
       +
       		},

     

       102
       107
        
       	}

     

       103
       108
        
       	return record

     

       104
       109
        
       }

+24 -2

appview/pulls/pulls.go

···

       29
       29
        
       

     

       30
       30
        
       	"github.com/bluekeyes/go-gitdiff/gitdiff"

     

       31
       31
        
       	comatproto "github.com/bluesky-social/indigo/api/atproto"

     

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

     

       32
       33
        
       	lexutil "github.com/bluesky-social/indigo/lex/util"

     

       33
       34
        
       	indigoxrpc "github.com/bluesky-social/indigo/xrpc"

     

       34
       35
        
       	"github.com/go-chi/chi/v5"

     
···

       1836
       1837
        
       	newStack, err := newStack(f, user, targetBranch, patch, pull.PullSource, stackId)

     

       1837
       1838
        
       	if err != nil {

     

       1838
       1839
        
       		log.Println("failed to create resubmitted stack", err)

     

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

     

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

     

       1840
       1841
        
       		return

     

       1841
       1842
        
       	}

     

       1842
       1843
        
       

     

       1843
       1844
        
       	// find the diff between the stacks, first, map them by changeId

     

       1845
       1845
       +
       

     

       1844
       1846
        
       	origById := make(map[string]*models.Pull)

     

       1845
       1847
        
       	newById := make(map[string]*models.Pull)

     

       1848
       1848
       +
       	chIdToAtUri := make(map[string]*syntax.ATURI)

     

       1849
       1849
       +
       

     

       1846
       1850
        
       	for _, p := range origStack {

     

       1847
       1851
        
       		origById[p.ChangeId] = p

     

       1852
       1852
       +
       

     

       1853
       1853
       +
       		// build map from change id to existing at uris (ignore error as it shouldnt be possible here)

     

       1854
       1854
       +
       		pAtUri, _ := syntax.ParseATURI(fmt.Sprintf("at://%s/%s/%s", user.Did, tangled.RepoPullNSID, p.Rkey))

     

       1855
       1855
       +
       		chIdToAtUri[p.ChangeId] = &pAtUri

     

       1848
       1856
        
       	}

     

       1849
       1857
        
       	for _, p := range newStack {

     

       1858
       1858
       +
       		// if change id has already been given a PR use its at uri instead of the newly created (and thus incorrect)

     

       1859
       1859
       +
       		// one made by newStack

     

       1860
       1860
       +
       		if ppAt, ok := chIdToAtUri[p.ParentChangeId]; ok {

     

       1861
       1861
       +
       			p.ParentAt = ppAt

     

       1862
       1862
       +
       		}

     

       1863
       1863
       +
       

     

       1850
       1864
        
       		newById[p.ChangeId] = p

     

       1851
       1865
        
       	}

     

       1852
       1866
        
       

     
···

       1894
       1908
        
       			// we still need to update the hash in submission.Patch and submission.SourceRev

     

       1895
       1909
        
       			if patchutil.Equal(newFiles, origFiles) &&

     

       1896
       1910
        
       				origHeader.Title == newHeader.Title &&

     

       1897
       1897
       -
       				origHeader.Body == newHeader.Body {

     

       1911
       1911
       +
       				origHeader.Body == newHeader.Body &&

     

       1912
       1912
       +
       				op.ParentChangeId == np.ParentChangeId {

     

       1898
       1913
        
       				unchanged[op.ChangeId] = struct{}{}

     

       1899
       1914
        
       			} else {

     

       1900
       1915
        
       				updated[op.ChangeId] = struct{}{}

     
···

       1978
       1993
        
       

     

       1979
       1994
        
       		record := op.AsRecord()

     

       1980
       1995
        
       		record.Patch = submission.Patch

     

       1996
       1996
       +
       		record.StackInfo.Parent = (*string)(np.ParentAt)

     

       1981
       1997
        
       

     

       1982
       1998
        
       		writes = append(writes, &comatproto.RepoApplyWrites_Input_Writes_Elem{

     

       1983
       1999
        
       			RepoApplyWrites_Update: &comatproto.RepoApplyWrites_Update{

     
···

       2343
       2359
        
       	// the stack is identified by a UUID

     

       2344
       2360
        
       	var stack models.Stack

     

       2345
       2361
        
       	parentChangeId := ""

     

       2362
       2362
       +
       	var parentAt *syntax.ATURI = nil

     

       2346
       2363
        
       	for _, fp := range formatPatches {

     

       2347
       2364
        
       		//  all patches must have a jj change-id

     

       2348
       2365
        
       		changeId, err := fp.ChangeId()

     
···

       2373
       2390
        
       

     

       2374
       2391
        
       			StackId:        stackId,

     

       2375
       2392
        
       			ChangeId:       changeId,

     

       2393
       2393
       +
       			ParentAt:       parentAt,

     

       2376
       2394
        
       			ParentChangeId: parentChangeId,

     

       2377
       2395
        
       		}

     

       2378
       2396
        
       

     

       2379
       2397
        
       		stack = append(stack, &pull)

     

       2380
       2398
        
       

     

       2381
       2399
        
       		parentChangeId = changeId

     

       2400
       2400
       +
       		// this is a bit of an ugly way to create the ATURI but its the best we can do with the data flow here

     

       2401
       2401
       +
       		// (igore error as it shouldnt be possible here)

     

       2402
       2402
       +
       		parsedParentAt, _ := syntax.ParseATURI(fmt.Sprintf("at://%s/%s/%s", user.Did, tangled.RepoPullNSID, pull.Rkey));

     

       2403
       2403
       +
       		parentAt = &parsedParentAt

     

       2382
       2404
        
       	}

     

       2383
       2405
        
       

     

       2384
       2406
        
       	return stack, nil

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