julien.rbrt.fr
+79
-20
api/tangled/cbor_gen.go
+79
-20
api/tangled/cbor_gen.go
···
7934
}
7935
7936
cw := cbg.NewCborWriter(w)
7937
-
fieldCount := 9
7938
7939
if t.Body == nil {
7940
fieldCount--
7941
}
7942
7943
if t.Mentions == nil {
7944
fieldCount--
7945
}
7946
···
8008
}
8009
8010
// t.Patch (string) (string)
8011
-
if len("patch") > 1000000 {
8012
-
return xerrors.Errorf("Value in field \"patch\" was too long")
8013
-
}
8014
8015
-
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("patch"))); err != nil {
8016
-
return err
8017
-
}
8018
-
if _, err := cw.WriteString(string("patch")); err != nil {
8019
-
return err
8020
-
}
8021
8022
-
if len(t.Patch) > 1000000 {
8023
-
return xerrors.Errorf("Value in field t.Patch was too long")
8024
-
}
8025
8026
-
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(t.Patch))); err != nil {
8027
-
return err
8028
-
}
8029
-
if _, err := cw.WriteString(string(t.Patch)); err != nil {
8030
-
return err
8031
}
8032
8033
// t.Title (string) (string)
···
8147
return err
8148
}
8149
8150
// t.References ([]string) (slice)
8151
if t.References != nil {
8152
···
8262
case "patch":
8263
8264
{
8265
-
sval, err := cbg.ReadStringWithMax(cr, 1000000)
8266
if err != nil {
8267
return err
8268
}
8269
8270
-
t.Patch = string(sval)
8271
}
8272
// t.Title (string) (string)
8273
case "title":
···
8370
}
8371
8372
t.CreatedAt = string(sval)
8373
}
8374
// t.References ([]string) (slice)
8375
case "references":
···
7934
}
7935
7936
cw := cbg.NewCborWriter(w)
7937
+
fieldCount := 10
7938
7939
if t.Body == nil {
7940
fieldCount--
7941
}
7942
7943
if t.Mentions == nil {
7944
+
fieldCount--
7945
+
}
7946
+
7947
+
if t.Patch == nil {
7948
fieldCount--
7949
}
7950
···
8012
}
8013
8014
// t.Patch (string) (string)
8015
+
if t.Patch != nil {
8016
8017
+
if len("patch") > 1000000 {
8018
+
return xerrors.Errorf("Value in field \"patch\" was too long")
8019
+
}
8020
8021
+
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("patch"))); err != nil {
8022
+
return err
8023
+
}
8024
+
if _, err := cw.WriteString(string("patch")); err != nil {
8025
+
return err
8026
+
}
8027
+
8028
+
if t.Patch == nil {
8029
+
if _, err := cw.Write(cbg.CborNull); err != nil {
8030
+
return err
8031
+
}
8032
+
} else {
8033
+
if len(*t.Patch) > 1000000 {
8034
+
return xerrors.Errorf("Value in field t.Patch was too long")
8035
+
}
8036
8037
+
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len(*t.Patch))); err != nil {
8038
+
return err
8039
+
}
8040
+
if _, err := cw.WriteString(string(*t.Patch)); err != nil {
8041
+
return err
8042
+
}
8043
+
}
8044
}
8045
8046
// t.Title (string) (string)
···
8160
return err
8161
}
8162
8163
+
// t.PatchBlob (util.LexBlob) (struct)
8164
+
if len("patchBlob") > 1000000 {
8165
+
return xerrors.Errorf("Value in field \"patchBlob\" was too long")
8166
+
}
8167
+
8168
+
if err := cw.WriteMajorTypeHeader(cbg.MajTextString, uint64(len("patchBlob"))); err != nil {
8169
+
return err
8170
+
}
8171
+
if _, err := cw.WriteString(string("patchBlob")); err != nil {
8172
+
return err
8173
+
}
8174
+
8175
+
if err := t.PatchBlob.MarshalCBOR(cw); err != nil {
8176
+
return err
8177
+
}
8178
+
8179
// t.References ([]string) (slice)
8180
if t.References != nil {
8181
···
8291
case "patch":
8292
8293
{
8294
+
b, err := cr.ReadByte()
8295
if err != nil {
8296
return err
8297
}
8298
+
if b != cbg.CborNull[0] {
8299
+
if err := cr.UnreadByte(); err != nil {
8300
+
return err
8301
+
}
8302
8303
+
sval, err := cbg.ReadStringWithMax(cr, 1000000)
8304
+
if err != nil {
8305
+
return err
8306
+
}
8307
+
8308
+
t.Patch = (*string)(&sval)
8309
+
}
8310
}
8311
// t.Title (string) (string)
8312
case "title":
···
8409
}
8410
8411
t.CreatedAt = string(sval)
8412
+
}
8413
+
// t.PatchBlob (util.LexBlob) (struct)
8414
+
case "patchBlob":
8415
+
8416
+
{
8417
+
8418
+
b, err := cr.ReadByte()
8419
+
if err != nil {
8420
+
return err
8421
+
}
8422
+
if b != cbg.CborNull[0] {
8423
+
if err := cr.UnreadByte(); err != nil {
8424
+
return err
8425
+
}
8426
+
t.PatchBlob = new(util.LexBlob)
8427
+
if err := t.PatchBlob.UnmarshalCBOR(cr); err != nil {
8428
+
return xerrors.Errorf("unmarshaling t.PatchBlob pointer: %w", err)
8429
+
}
8430
+
}
8431
+
8432
}
8433
// t.References ([]string) (slice)
8434
case "references":
+51
api/tangled/repolistRepos.go
+51
api/tangled/repolistRepos.go
···
···
1
+
// Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT.
2
+
3
+
package tangled
4
+
5
+
// schema: sh.tangled.repo.listRepos
6
+
7
+
import (
8
+
"context"
9
+
10
+
"github.com/bluesky-social/indigo/lex/util"
11
+
)
12
+
13
+
const (
14
+
RepoListReposNSID = "sh.tangled.repo.listRepos"
15
+
)
16
+
17
+
// RepoListRepos_Output is the output of a sh.tangled.repo.listRepos call.
18
+
type RepoListRepos_Output struct {
19
+
Users []*RepoListRepos_User `json:"users" cborgen:"users"`
20
+
}
21
+
22
+
// RepoListRepos_RepoEntry is a "repoEntry" in the sh.tangled.repo.listRepos schema.
23
+
type RepoListRepos_RepoEntry struct {
24
+
// defaultBranch: Default branch of the repository
25
+
DefaultBranch *string `json:"defaultBranch,omitempty" cborgen:"defaultBranch,omitempty"`
26
+
// did: DID of the repository owner
27
+
Did string `json:"did" cborgen:"did"`
28
+
// fullPath: Full path to the repository
29
+
FullPath string `json:"fullPath" cborgen:"fullPath"`
30
+
// name: Repository name
31
+
Name string `json:"name" cborgen:"name"`
32
+
}
33
+
34
+
// RepoListRepos_User is a "user" in the sh.tangled.repo.listRepos schema.
35
+
type RepoListRepos_User struct {
36
+
// did: DID of the user
37
+
Did string `json:"did" cborgen:"did"`
38
+
Repos []*RepoListRepos_RepoEntry `json:"repos" cborgen:"repos"`
39
+
}
40
+
41
+
// RepoListRepos calls the XRPC method "sh.tangled.repo.listRepos".
42
+
func RepoListRepos(ctx context.Context, c util.LexClient) (*RepoListRepos_Output, error) {
43
+
var out RepoListRepos_Output
44
+
45
+
params := map[string]interface{}{}
46
+
if err := c.LexDo(ctx, util.Query, "", "sh.tangled.repo.listRepos", params, nil, &out); err != nil {
47
+
return nil, err
48
+
}
49
+
50
+
return &out, nil
51
+
}
+12
-9
api/tangled/repopull.go
+12
-9
api/tangled/repopull.go
···
17
} //
18
// RECORDTYPE: RepoPull
19
type RepoPull struct {
20
-
LexiconTypeID string `json:"$type,const=sh.tangled.repo.pull" cborgen:"$type,const=sh.tangled.repo.pull"`
21
-
Body *string `json:"body,omitempty" cborgen:"body,omitempty"`
22
-
CreatedAt string `json:"createdAt" cborgen:"createdAt"`
23
-
Mentions []string `json:"mentions,omitempty" cborgen:"mentions,omitempty"`
24
-
Patch string `json:"patch" cborgen:"patch"`
25
-
References []string `json:"references,omitempty" cborgen:"references,omitempty"`
26
-
Source *RepoPull_Source `json:"source,omitempty" cborgen:"source,omitempty"`
27
-
Target *RepoPull_Target `json:"target" cborgen:"target"`
28
-
Title string `json:"title" cborgen:"title"`
29
}
30
31
// RepoPull_Source is a "source" in the sh.tangled.repo.pull schema.
···
17
} //
18
// RECORDTYPE: RepoPull
19
type RepoPull struct {
20
+
LexiconTypeID string `json:"$type,const=sh.tangled.repo.pull" cborgen:"$type,const=sh.tangled.repo.pull"`
21
+
Body *string `json:"body,omitempty" cborgen:"body,omitempty"`
22
+
CreatedAt string `json:"createdAt" cborgen:"createdAt"`
23
+
Mentions []string `json:"mentions,omitempty" cborgen:"mentions,omitempty"`
24
+
// patch: (deprecated) use patchBlob instead
25
+
Patch *string `json:"patch,omitempty" cborgen:"patch,omitempty"`
26
+
// patchBlob: patch content
27
+
PatchBlob *util.LexBlob `json:"patchBlob" cborgen:"patchBlob"`
28
+
References []string `json:"references,omitempty" cborgen:"references,omitempty"`
29
+
Source *RepoPull_Source `json:"source,omitempty" cborgen:"source,omitempty"`
30
+
Target *RepoPull_Target `json:"target" cborgen:"target"`
31
+
Title string `json:"title" cborgen:"title"`
32
}
33
34
// RepoPull_Source is a "source" in the sh.tangled.repo.pull schema.
+18
-11
appview/db/profile.go
+18
-11
appview/db/profile.go
···
20
timeline := models.ProfileTimeline{
21
ByMonth: make([]models.ByMonth, TimeframeMonths),
22
}
23
-
currentMonth := time.Now().Month()
24
timeframe := fmt.Sprintf("-%d months", TimeframeMonths)
25
26
pulls, err := GetPullsByOwnerDid(e, forDid, timeframe)
···
30
31
// group pulls by month
32
for _, pull := range pulls {
33
-
pullMonth := pull.Created.Month()
34
35
-
if currentMonth-pullMonth >= TimeframeMonths {
36
// shouldn't happen; but times are weird
37
continue
38
}
39
40
-
idx := currentMonth - pullMonth
41
items := &timeline.ByMonth[idx].PullEvents.Items
42
43
*items = append(*items, &pull)
···
53
}
54
55
for _, issue := range issues {
56
-
issueMonth := issue.Created.Month()
57
58
-
if currentMonth-issueMonth >= TimeframeMonths {
59
// shouldn't happen; but times are weird
60
continue
61
}
62
63
-
idx := currentMonth - issueMonth
64
items := &timeline.ByMonth[idx].IssueEvents.Items
65
66
*items = append(*items, &issue)
···
77
if repo.Source != "" {
78
sourceRepo, err = GetRepoByAtUri(e, repo.Source)
79
if err != nil {
80
-
return nil, err
81
}
82
}
83
84
-
repoMonth := repo.Created.Month()
85
86
-
if currentMonth-repoMonth >= TimeframeMonths {
87
// shouldn't happen; but times are weird
88
continue
89
}
90
91
-
idx := currentMonth - repoMonth
92
93
items := &timeline.ByMonth[idx].RepoEvents
94
*items = append(*items, models.RepoEvent{
···
98
}
99
100
return &timeline, nil
101
}
102
103
func UpsertProfile(tx *sql.Tx, profile *models.Profile) error {
···
20
timeline := models.ProfileTimeline{
21
ByMonth: make([]models.ByMonth, TimeframeMonths),
22
}
23
+
now := time.Now()
24
timeframe := fmt.Sprintf("-%d months", TimeframeMonths)
25
26
pulls, err := GetPullsByOwnerDid(e, forDid, timeframe)
···
30
31
// group pulls by month
32
for _, pull := range pulls {
33
+
monthsAgo := monthsBetween(pull.Created, now)
34
35
+
if monthsAgo >= TimeframeMonths {
36
// shouldn't happen; but times are weird
37
continue
38
}
39
40
+
idx := monthsAgo
41
items := &timeline.ByMonth[idx].PullEvents.Items
42
43
*items = append(*items, &pull)
···
53
}
54
55
for _, issue := range issues {
56
+
monthsAgo := monthsBetween(issue.Created, now)
57
58
+
if monthsAgo >= TimeframeMonths {
59
// shouldn't happen; but times are weird
60
continue
61
}
62
63
+
idx := monthsAgo
64
items := &timeline.ByMonth[idx].IssueEvents.Items
65
66
*items = append(*items, &issue)
···
77
if repo.Source != "" {
78
sourceRepo, err = GetRepoByAtUri(e, repo.Source)
79
if err != nil {
80
+
// the source repo was not found, skip this bit
81
+
log.Println("profile", "err", err)
82
}
83
}
84
85
+
monthsAgo := monthsBetween(repo.Created, now)
86
87
+
if monthsAgo >= TimeframeMonths {
88
// shouldn't happen; but times are weird
89
continue
90
}
91
92
+
idx := monthsAgo
93
94
items := &timeline.ByMonth[idx].RepoEvents
95
*items = append(*items, models.RepoEvent{
···
99
}
100
101
return &timeline, nil
102
+
}
103
+
104
+
func monthsBetween(from, to time.Time) int {
105
+
years := to.Year() - from.Year()
106
+
months := int(to.Month() - from.Month())
107
+
return years*12 + months
108
}
109
110
func UpsertProfile(tx *sql.Tx, profile *models.Profile) error {
+1
-1
appview/db/punchcard.go
+1
-1
appview/db/punchcard.go
-5
appview/knots/knots.go
-5
appview/knots/knots.go
···
666
k.Pages.Notice(w, noticeId, "Failed to remove member, identity resolution failed.")
667
return
668
}
669
-
if memberId.Handle.IsInvalidHandle() {
670
-
l.Error("failed to resolve member identity to handle")
671
-
k.Pages.Notice(w, noticeId, "Failed to remove member, identity resolution failed.")
672
-
return
673
-
}
674
675
// remove from enforcer
676
err = k.Enforcer.RemoveKnotMember(domain, memberId.DID.String())
+4
appview/middleware/middleware.go
+4
appview/middleware/middleware.go
···
223
)
224
if err != nil {
225
log.Println("failed to resolve repo", "err", err)
226
mw.pages.ErrorKnot404(w)
227
return
228
}
···
240
f, err := mw.repoResolver.Resolve(r)
241
if err != nil {
242
log.Println("failed to fully resolve repo", err)
243
mw.pages.ErrorKnot404(w)
244
return
245
}
···
288
f, err := mw.repoResolver.Resolve(r)
289
if err != nil {
290
log.Println("failed to fully resolve repo", err)
291
mw.pages.ErrorKnot404(w)
292
return
293
}
···
324
f, err := mw.repoResolver.Resolve(r)
325
if err != nil {
326
log.Println("failed to fully resolve repo", err)
327
mw.pages.ErrorKnot404(w)
328
return
329
}
···
223
)
224
if err != nil {
225
log.Println("failed to resolve repo", "err", err)
226
+
w.WriteHeader(http.StatusNotFound)
227
mw.pages.ErrorKnot404(w)
228
return
229
}
···
241
f, err := mw.repoResolver.Resolve(r)
242
if err != nil {
243
log.Println("failed to fully resolve repo", err)
244
+
w.WriteHeader(http.StatusNotFound)
245
mw.pages.ErrorKnot404(w)
246
return
247
}
···
290
f, err := mw.repoResolver.Resolve(r)
291
if err != nil {
292
log.Println("failed to fully resolve repo", err)
293
+
w.WriteHeader(http.StatusNotFound)
294
mw.pages.ErrorKnot404(w)
295
return
296
}
···
327
f, err := mw.repoResolver.Resolve(r)
328
if err != nil {
329
log.Println("failed to fully resolve repo", err)
330
+
w.WriteHeader(http.StatusNotFound)
331
mw.pages.ErrorKnot404(w)
332
return
333
}
+1
-1
appview/models/pull.go
+1
-1
appview/models/pull.go
···
83
Repo *Repo
84
}
85
86
+
// NOTE: This method does not include patch blob in returned atproto record
87
func (p Pull) AsRecord() tangled.RepoPull {
88
var source *tangled.RepoPull_Source
89
if p.PullSource != nil {
···
114
Repo: p.RepoAt.String(),
115
Branch: p.TargetBranch,
116
},
117
Source: source,
118
}
119
return record
+1
-5
appview/pages/markup/extension/atlink.go
+1
-5
appview/pages/markup/extension/atlink.go
···
35
return KindAt
36
}
37
38
-
var atRegexp = regexp.MustCompile(`(^|\s|\()(@)([a-zA-Z0-9.-]+)(\b)`)
39
var markdownLinkRegexp = regexp.MustCompile(`(?ms)\[.*\]\(.*\)`)
40
41
type atParser struct{}
···
54
line, segment := block.PeekLine()
55
m := atRegexp.FindSubmatchIndex(line)
56
if m == nil {
57
-
return nil
58
-
}
59
-
60
-
if !util.IsSpaceRune(block.PrecendingCharacter()) {
61
return nil
62
}
63
···
35
return KindAt
36
}
37
38
+
var atRegexp = regexp.MustCompile(`(^|\s|\()(@)([a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\b)`)
39
var markdownLinkRegexp = regexp.MustCompile(`(?ms)\[.*\]\(.*\)`)
40
41
type atParser struct{}
···
54
line, segment := block.PeekLine()
55
m := atRegexp.FindSubmatchIndex(line)
56
if m == nil {
57
return nil
58
}
59
+121
appview/pages/markup/markdown_test.go
+121
appview/pages/markup/markdown_test.go
···
···
1
+
package markup
2
+
3
+
import (
4
+
"bytes"
5
+
"testing"
6
+
)
7
+
8
+
func TestAtExtension_Rendering(t *testing.T) {
9
+
tests := []struct {
10
+
name string
11
+
markdown string
12
+
expected string
13
+
}{
14
+
{
15
+
name: "renders simple at mention",
16
+
markdown: "Hello @user.tngl.sh!",
17
+
expected: `<p>Hello <a href="/user.tngl.sh" class="mention">@user.tngl.sh</a>!</p>`,
18
+
},
19
+
{
20
+
name: "renders multiple at mentions",
21
+
markdown: "Hi @alice.tngl.sh and @bob.example.com",
22
+
expected: `<p>Hi <a href="/alice.tngl.sh" class="mention">@alice.tngl.sh</a> and <a href="/bob.example.com" class="mention">@bob.example.com</a></p>`,
23
+
},
24
+
{
25
+
name: "renders at mention in parentheses",
26
+
markdown: "Check this out (@user.tngl.sh)",
27
+
expected: `<p>Check this out (<a href="/user.tngl.sh" class="mention">@user.tngl.sh</a>)</p>`,
28
+
},
29
+
{
30
+
name: "does not render email",
31
+
markdown: "Contact me at test@example.com",
32
+
expected: `<p>Contact me at <a href="mailto:test@example.com">test@example.com</a></p>`,
33
+
},
34
+
{
35
+
name: "renders at mention with hyphen",
36
+
markdown: "Follow @user-name.tngl.sh",
37
+
expected: `<p>Follow <a href="/user-name.tngl.sh" class="mention">@user-name.tngl.sh</a></p>`,
38
+
},
39
+
{
40
+
name: "renders at mention with numbers",
41
+
markdown: "@user123.test456.social",
42
+
expected: `<p><a href="/user123.test456.social" class="mention">@user123.test456.social</a></p>`,
43
+
},
44
+
{
45
+
name: "at mention at start of line",
46
+
markdown: "@user.tngl.sh is cool",
47
+
expected: `<p><a href="/user.tngl.sh" class="mention">@user.tngl.sh</a> is cool</p>`,
48
+
},
49
+
}
50
+
51
+
for _, tt := range tests {
52
+
t.Run(tt.name, func(t *testing.T) {
53
+
md := NewMarkdown()
54
+
55
+
var buf bytes.Buffer
56
+
if err := md.Convert([]byte(tt.markdown), &buf); err != nil {
57
+
t.Fatalf("failed to convert markdown: %v", err)
58
+
}
59
+
60
+
result := buf.String()
61
+
if result != tt.expected+"\n" {
62
+
t.Errorf("expected:\n%s\ngot:\n%s", tt.expected, result)
63
+
}
64
+
})
65
+
}
66
+
}
67
+
68
+
func TestAtExtension_WithOtherMarkdown(t *testing.T) {
69
+
tests := []struct {
70
+
name string
71
+
markdown string
72
+
contains string
73
+
}{
74
+
{
75
+
name: "at mention with bold",
76
+
markdown: "**Hello @user.tngl.sh**",
77
+
contains: `<strong>Hello <a href="/user.tngl.sh" class="mention">@user.tngl.sh</a></strong>`,
78
+
},
79
+
{
80
+
name: "at mention with italic",
81
+
markdown: "*Check @user.tngl.sh*",
82
+
contains: `<em>Check <a href="/user.tngl.sh" class="mention">@user.tngl.sh</a></em>`,
83
+
},
84
+
{
85
+
name: "at mention in list",
86
+
markdown: "- Item 1\n- @user.tngl.sh\n- Item 3",
87
+
contains: `<a href="/user.tngl.sh" class="mention">@user.tngl.sh</a>`,
88
+
},
89
+
{
90
+
name: "at mention in link",
91
+
markdown: "[@regnault.dev](https://regnault.dev)",
92
+
contains: `<a href="https://regnault.dev">@regnault.dev</a>`,
93
+
},
94
+
{
95
+
name: "at mention in link again",
96
+
markdown: "[check out @regnault.dev](https://regnault.dev)",
97
+
contains: `<a href="https://regnault.dev">check out @regnault.dev</a>`,
98
+
},
99
+
{
100
+
name: "at mention in link again, multiline",
101
+
markdown: "[\ncheck out @regnault.dev](https://regnault.dev)",
102
+
contains: "<a href=\"https://regnault.dev\">\ncheck out @regnault.dev</a>",
103
+
},
104
+
}
105
+
106
+
for _, tt := range tests {
107
+
t.Run(tt.name, func(t *testing.T) {
108
+
md := NewMarkdown()
109
+
110
+
var buf bytes.Buffer
111
+
if err := md.Convert([]byte(tt.markdown), &buf); err != nil {
112
+
t.Fatalf("failed to convert markdown: %v", err)
113
+
}
114
+
115
+
result := buf.String()
116
+
if !bytes.Contains([]byte(result), []byte(tt.contains)) {
117
+
t.Errorf("expected output to contain:\n%s\ngot:\n%s", tt.contains, result)
118
+
}
119
+
})
120
+
}
121
+
}
+1
-1
appview/pages/templates/knots/index.html
+1
-1
appview/pages/templates/knots/index.html
+1
-1
appview/pages/templates/repo/fragments/diff.html
+1
-1
appview/pages/templates/repo/fragments/diff.html
···
17
{{ else }}
18
{{ range $idx, $hunk := $diff }}
19
{{ with $hunk }}
20
-
<details open id="file-{{ .Name.New }}" class="group border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm" tabindex="{{ add $idx 1 }}">
21
<summary class="list-none cursor-pointer sticky top-0">
22
<div id="diff-file-header" class="rounded cursor-pointer bg-white dark:bg-gray-800 flex justify-between">
23
<div id="left-side-items" class="p-2 flex gap-2 items-center overflow-x-auto">
···
17
{{ else }}
18
{{ range $idx, $hunk := $diff }}
19
{{ with $hunk }}
20
+
<details open id="file-{{ .Id }}" class="group border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm" tabindex="{{ add $idx 1 }}">
21
<summary class="list-none cursor-pointer sticky top-0">
22
<div id="diff-file-header" class="rounded cursor-pointer bg-white dark:bg-gray-800 flex justify-between">
23
<div id="left-side-items" class="p-2 flex gap-2 items-center overflow-x-auto">
+35
-35
appview/pages/templates/repo/fragments/splitDiff.html
+35
-35
appview/pages/templates/repo/fragments/splitDiff.html
···
3
{{- $lineNrStyle := "min-w-[3.5rem] flex-shrink-0 select-none text-right bg-white dark:bg-gray-800" -}}
4
{{- $linkStyle := "text-gray-400 dark:text-gray-500 hover:underline" -}}
5
{{- $lineNrSepStyle := "pr-2 border-r border-gray-200 dark:border-gray-700" -}}
6
-
{{- $containerStyle := "flex min-w-full items-center target:border target:rounded-sm target:border-yellow-200 target:dark:border-yellow-700 scroll-mt-20" -}}
7
{{- $emptyStyle := "bg-gray-200/30 dark:bg-gray-700/30" -}}
8
{{- $addStyle := "bg-green-100 dark:bg-green-800/30 text-green-700 dark:text-green-400" -}}
9
{{- $delStyle := "bg-red-100 dark:bg-red-800/30 text-red-700 dark:text-red-400 " -}}
10
{{- $ctxStyle := "bg-white dark:bg-gray-800 text-gray-500 dark:text-gray-400" -}}
11
{{- $opStyle := "w-5 flex-shrink-0 select-none text-center" -}}
12
<div class="grid grid-cols-2 divide-x divide-gray-200 dark:divide-gray-700">
13
-
<pre class="overflow-x-auto col-span-1"><div class="overflow-x-auto"><div class="min-w-full inline-block">{{- range .TextFragments -}}<div class="bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400 select-none text-center">···</div>
14
{{- range .LeftLines -}}
15
{{- if .IsEmpty -}}
16
-
<div class="{{ $emptyStyle }} {{ $containerStyle }}">
17
-
<div class="{{$lineNrStyle}} {{$lineNrSepStyle}}"><span aria-hidden="true" class="invisible">{{.LineNumber}}</span></div>
18
-
<div class="{{ $opStyle }}"><span aria-hidden="true" class="invisible">{{ .Op.String }}</span></div>
19
-
<div class="px-2 invisible" aria-hidden="true">{{ .Content }}</div>
20
-
</div>
21
{{- else if eq .Op.String "-" -}}
22
-
<div class="{{ $delStyle }} {{ $containerStyle }}" id="{{$name}}-O{{.LineNumber}}">
23
-
<div class="{{ $lineNrStyle }} {{ $lineNrSepStyle }}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{.LineNumber}}">{{ .LineNumber }}</a></div>
24
-
<div class="{{ $opStyle }}">{{ .Op.String }}</div>
25
-
<div class="px-2">{{ .Content }}</div>
26
-
</div>
27
{{- else if eq .Op.String " " -}}
28
-
<div class="{{ $ctxStyle }} {{ $containerStyle }}" id="{{$name}}-O{{.LineNumber}}">
29
-
<div class="{{ $lineNrStyle }} {{ $lineNrSepStyle }}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{.LineNumber}}">{{ .LineNumber }}</a></div>
30
-
<div class="{{ $opStyle }}">{{ .Op.String }}</div>
31
-
<div class="px-2">{{ .Content }}</div>
32
-
</div>
33
{{- end -}}
34
{{- end -}}
35
-
{{- end -}}</div></div></pre>
36
37
-
<pre class="overflow-x-auto col-span-1"><div class="overflow-x-auto"><div class="min-w-full inline-block">{{- range .TextFragments -}}<div class="bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400 select-none text-center">···</div>
38
{{- range .RightLines -}}
39
{{- if .IsEmpty -}}
40
-
<div class="{{ $emptyStyle }} {{ $containerStyle }}">
41
-
<div class="{{$lineNrStyle}} {{$lineNrSepStyle}}"><span aria-hidden="true" class="invisible">{{.LineNumber}}</span></div>
42
-
<div class="{{ $opStyle }}"><span aria-hidden="true" class="invisible">{{ .Op.String }}</span></div>
43
-
<div class="px-2 invisible" aria-hidden="true">{{ .Content }}</div>
44
-
</div>
45
{{- else if eq .Op.String "+" -}}
46
-
<div class="{{ $addStyle }} {{ $containerStyle }}" id="{{$name}}-N{{.LineNumber}}">
47
-
<div class="{{$lineNrStyle}} {{$lineNrSepStyle}}"><a class="{{$linkStyle}}" href="#{{$name}}-N{{.LineNumber}}">{{ .LineNumber }}</a></div>
48
-
<div class="{{ $opStyle }}">{{ .Op.String }}</div>
49
-
<div class="px-2" >{{ .Content }}</div>
50
-
</div>
51
{{- else if eq .Op.String " " -}}
52
-
<div class="{{ $ctxStyle }} {{ $containerStyle }}" id="{{$name}}-N{{.LineNumber}}">
53
-
<div class="{{$lineNrStyle}} {{$lineNrSepStyle}}"><a class="{{$linkStyle}}" href="#{{$name}}-N{{.LineNumber}}">{{ .LineNumber }}</a></div>
54
-
<div class="{{ $opStyle }}">{{ .Op.String }}</div>
55
-
<div class="px-2">{{ .Content }}</div>
56
-
</div>
57
{{- end -}}
58
{{- end -}}
59
-
{{- end -}}</div></div></pre>
60
</div>
61
{{ end }}
···
3
{{- $lineNrStyle := "min-w-[3.5rem] flex-shrink-0 select-none text-right bg-white dark:bg-gray-800" -}}
4
{{- $linkStyle := "text-gray-400 dark:text-gray-500 hover:underline" -}}
5
{{- $lineNrSepStyle := "pr-2 border-r border-gray-200 dark:border-gray-700" -}}
6
+
{{- $containerStyle := "inline-flex w-full items-center target:border target:rounded-sm target:border-yellow-200 target:dark:border-yellow-700 scroll-mt-20" -}}
7
{{- $emptyStyle := "bg-gray-200/30 dark:bg-gray-700/30" -}}
8
{{- $addStyle := "bg-green-100 dark:bg-green-800/30 text-green-700 dark:text-green-400" -}}
9
{{- $delStyle := "bg-red-100 dark:bg-red-800/30 text-red-700 dark:text-red-400 " -}}
10
{{- $ctxStyle := "bg-white dark:bg-gray-800 text-gray-500 dark:text-gray-400" -}}
11
{{- $opStyle := "w-5 flex-shrink-0 select-none text-center" -}}
12
<div class="grid grid-cols-2 divide-x divide-gray-200 dark:divide-gray-700">
13
+
<div class="overflow-x-auto col-span-1 font-mono leading-normal"><div class="overflow-x-auto"><div class="inline-flex flex-col min-w-full">{{- range .TextFragments -}}<span class="block bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400 select-none text-center">···</span>
14
{{- range .LeftLines -}}
15
{{- if .IsEmpty -}}
16
+
<span class="{{ $emptyStyle }} {{ $containerStyle }}">
17
+
<span class="{{$lineNrStyle}} {{$lineNrSepStyle}}"><span aria-hidden="true" class="invisible">{{.LineNumber}}</span></span>
18
+
<span class="{{ $opStyle }}"><span aria-hidden="true" class="invisible">{{ .Op.String }}</span></span>
19
+
<span class="px-2 invisible" aria-hidden="true">{{ .Content }}</span>
20
+
</span>
21
{{- else if eq .Op.String "-" -}}
22
+
<span class="{{ $delStyle }} {{ $containerStyle }}" id="{{$name}}-O{{.LineNumber}}">
23
+
<span class="{{ $lineNrStyle }} {{ $lineNrSepStyle }}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{.LineNumber}}">{{ .LineNumber }}</a></span>
24
+
<span class="{{ $opStyle }}">{{ .Op.String }}</span>
25
+
<span class="px-2 whitespace-pre">{{ .Content }}</span>
26
+
</span>
27
{{- else if eq .Op.String " " -}}
28
+
<span class="{{ $ctxStyle }} {{ $containerStyle }}" id="{{$name}}-O{{.LineNumber}}">
29
+
<span class="{{ $lineNrStyle }} {{ $lineNrSepStyle }}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{.LineNumber}}">{{ .LineNumber }}</a></span>
30
+
<span class="{{ $opStyle }}">{{ .Op.String }}</span>
31
+
<span class="px-2 whitespace-pre">{{ .Content }}</span>
32
+
</span>
33
{{- end -}}
34
{{- end -}}
35
+
{{- end -}}</div></div></div>
36
37
+
<div class="overflow-x-auto col-span-1 font-mono leading-normal"><div class="overflow-x-auto"><div class="inline-flex flex-col min-w-full">{{- range .TextFragments -}}<span class="block bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400 select-none text-center">···</span>
38
{{- range .RightLines -}}
39
{{- if .IsEmpty -}}
40
+
<span class="{{ $emptyStyle }} {{ $containerStyle }}">
41
+
<span class="{{$lineNrStyle}} {{$lineNrSepStyle}}"><span aria-hidden="true" class="invisible">{{.LineNumber}}</span></span>
42
+
<span class="{{ $opStyle }}"><span aria-hidden="true" class="invisible">{{ .Op.String }}</span></span>
43
+
<span class="px-2 invisible" aria-hidden="true">{{ .Content }}</span>
44
+
</span>
45
{{- else if eq .Op.String "+" -}}
46
+
<span class="{{ $addStyle }} {{ $containerStyle }}" id="{{$name}}-N{{.LineNumber}}">
47
+
<span class="{{$lineNrStyle}} {{$lineNrSepStyle}}"><a class="{{$linkStyle}}" href="#{{$name}}-N{{.LineNumber}}">{{ .LineNumber }}</a></span>
48
+
<span class="{{ $opStyle }}">{{ .Op.String }}</span>
49
+
<span class="px-2 whitespace-pre">{{ .Content }}</span>
50
+
</span>
51
{{- else if eq .Op.String " " -}}
52
+
<span class="{{ $ctxStyle }} {{ $containerStyle }}" id="{{$name}}-N{{.LineNumber}}">
53
+
<span class="{{$lineNrStyle}} {{$lineNrSepStyle}}"><a class="{{$linkStyle}}" href="#{{$name}}-N{{.LineNumber}}">{{ .LineNumber }}</a> </span>
54
+
<span class="{{ $opStyle }}">{{ .Op.String }}</span>
55
+
<span class="px-2 whitespace-pre">{{ .Content }}</span>
56
+
</span>
57
{{- end -}}
58
{{- end -}}
59
+
{{- end -}}</div></div></div>
60
</div>
61
{{ end }}
+21
-22
appview/pages/templates/repo/fragments/unifiedDiff.html
+21
-22
appview/pages/templates/repo/fragments/unifiedDiff.html
···
1
{{ define "repo/fragments/unifiedDiff" }}
2
{{ $name := .Id }}
3
-
<pre class="overflow-x-auto"><div class="overflow-x-auto"><div class="min-w-full inline-block">{{- range .TextFragments -}}<div class="bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400 select-none text-center">···</div>
4
{{- $oldStart := .OldPosition -}}
5
{{- $newStart := .NewPosition -}}
6
{{- $lineNrStyle := "min-w-[3.5rem] flex-shrink-0 select-none text-right bg-white dark:bg-gray-800 target:bg-yellow-200 target:dark:bg-yellow-600" -}}
7
{{- $linkStyle := "text-gray-400 dark:text-gray-500 hover:underline" -}}
8
{{- $lineNrSepStyle1 := "" -}}
9
{{- $lineNrSepStyle2 := "pr-2 border-r border-gray-200 dark:border-gray-700" -}}
10
-
{{- $containerStyle := "flex min-w-full items-center target:border target:rounded-sm target:border-yellow-200 target:dark:border-yellow-700 scroll-mt-20" -}}
11
{{- $addStyle := "bg-green-100 dark:bg-green-800/30 text-green-700 dark:text-green-400 " -}}
12
{{- $delStyle := "bg-red-100 dark:bg-red-800/30 text-red-700 dark:text-red-400 " -}}
13
{{- $ctxStyle := "bg-white dark:bg-gray-800 text-gray-500 dark:text-gray-400" -}}
14
{{- $opStyle := "w-5 flex-shrink-0 select-none text-center" -}}
15
{{- range .Lines -}}
16
{{- if eq .Op.String "+" -}}
17
-
<div class="{{ $addStyle }} {{ $containerStyle }}" id="{{$name}}-N{{$newStart}}">
18
-
<div class="{{$lineNrStyle}} {{$lineNrSepStyle1}}"><span aria-hidden="true" class="invisible">{{$newStart}}</span></div>
19
-
<div class="{{$lineNrStyle}} {{$lineNrSepStyle2}}"><a class="{{$linkStyle}}" href="#{{$name}}-N{{$newStart}}">{{ $newStart }}</a></div>
20
-
<div class="{{ $opStyle }}">{{ .Op.String }}</div>
21
-
<div class="px-2">{{ .Line }}</div>
22
-
</div>
23
{{- $newStart = add64 $newStart 1 -}}
24
{{- end -}}
25
{{- if eq .Op.String "-" -}}
26
-
<div class="{{ $delStyle }} {{ $containerStyle }}" id="{{$name}}-O{{$oldStart}}">
27
-
<div class="{{$lineNrStyle}} {{$lineNrSepStyle1}}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{$oldStart}}">{{ $oldStart }}</a></div>
28
-
<div class="{{$lineNrStyle}} {{$lineNrSepStyle2}}"><span aria-hidden="true" class="invisible">{{$oldStart}}</span></div>
29
-
<div class="{{ $opStyle }}">{{ .Op.String }}</div>
30
-
<div class="px-2">{{ .Line }}</div>
31
-
</div>
32
{{- $oldStart = add64 $oldStart 1 -}}
33
{{- end -}}
34
{{- if eq .Op.String " " -}}
35
-
<div class="{{ $ctxStyle }} {{ $containerStyle }}" id="{{$name}}-O{{$oldStart}}-N{{$newStart}}">
36
-
<div class="{{$lineNrStyle}} {{$lineNrSepStyle1}}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{$oldStart}}-N{{$newStart}}">{{ $oldStart }}</a></div>
37
-
<div class="{{$lineNrStyle}} {{$lineNrSepStyle2}}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{$oldStart}}-N{{$newStart}}">{{ $newStart }}</a></div>
38
-
<div class="{{ $opStyle }}">{{ .Op.String }}</div>
39
-
<div class="px-2">{{ .Line }}</div>
40
-
</div>
41
{{- $newStart = add64 $newStart 1 -}}
42
{{- $oldStart = add64 $oldStart 1 -}}
43
{{- end -}}
44
{{- end -}}
45
-
{{- end -}}</div></div></pre>
46
{{ end }}
47
-
···
1
{{ define "repo/fragments/unifiedDiff" }}
2
{{ $name := .Id }}
3
+
<div class="overflow-x-auto font-mono leading-normal"><div class="overflow-x-auto"><div class="inline-flex flex-col min-w-full">{{- range .TextFragments -}}<span class="block bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400 select-none text-center">···</span>
4
{{- $oldStart := .OldPosition -}}
5
{{- $newStart := .NewPosition -}}
6
{{- $lineNrStyle := "min-w-[3.5rem] flex-shrink-0 select-none text-right bg-white dark:bg-gray-800 target:bg-yellow-200 target:dark:bg-yellow-600" -}}
7
{{- $linkStyle := "text-gray-400 dark:text-gray-500 hover:underline" -}}
8
{{- $lineNrSepStyle1 := "" -}}
9
{{- $lineNrSepStyle2 := "pr-2 border-r border-gray-200 dark:border-gray-700" -}}
10
+
{{- $containerStyle := "inline-flex w-full items-center target:border target:rounded-sm target:border-yellow-200 target:dark:border-yellow-700 scroll-mt-20" -}}
11
{{- $addStyle := "bg-green-100 dark:bg-green-800/30 text-green-700 dark:text-green-400 " -}}
12
{{- $delStyle := "bg-red-100 dark:bg-red-800/30 text-red-700 dark:text-red-400 " -}}
13
{{- $ctxStyle := "bg-white dark:bg-gray-800 text-gray-500 dark:text-gray-400" -}}
14
{{- $opStyle := "w-5 flex-shrink-0 select-none text-center" -}}
15
{{- range .Lines -}}
16
{{- if eq .Op.String "+" -}}
17
+
<span class="{{ $addStyle }} {{ $containerStyle }}" id="{{$name}}-N{{$newStart}}">
18
+
<span class="{{$lineNrStyle}} {{$lineNrSepStyle1}}"><span aria-hidden="true" class="invisible">{{$newStart}}</span></span>
19
+
<span class="{{$lineNrStyle}} {{$lineNrSepStyle2}}"><a class="{{$linkStyle}}" href="#{{$name}}-N{{$newStart}}">{{ $newStart }}</a></span>
20
+
<span class="{{ $opStyle }}">{{ .Op.String }}</span>
21
+
<span class="px-2 whitespace-pre">{{ .Line }}</span>
22
+
</span>
23
{{- $newStart = add64 $newStart 1 -}}
24
{{- end -}}
25
{{- if eq .Op.String "-" -}}
26
+
<span class="{{ $delStyle }} {{ $containerStyle }}" id="{{$name}}-O{{$oldStart}}">
27
+
<span class="{{$lineNrStyle}} {{$lineNrSepStyle1}}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{$oldStart}}">{{ $oldStart }}</a></span>
28
+
<span class="{{$lineNrStyle}} {{$lineNrSepStyle2}}"><span aria-hidden="true" class="invisible">{{$oldStart}}</span></span>
29
+
<span class="{{ $opStyle }}">{{ .Op.String }}</span>
30
+
<span class="px-2 whitespace-pre">{{ .Line }}</span>
31
+
</span>
32
{{- $oldStart = add64 $oldStart 1 -}}
33
{{- end -}}
34
{{- if eq .Op.String " " -}}
35
+
<span class="{{ $ctxStyle }} {{ $containerStyle }}" id="{{$name}}-O{{$oldStart}}-N{{$newStart}}">
36
+
<span class="{{$lineNrStyle}} {{$lineNrSepStyle1}}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{$oldStart}}-N{{$newStart}}">{{ $oldStart }}</a></span>
37
+
<span class="{{$lineNrStyle}} {{$lineNrSepStyle2}}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{$oldStart}}-N{{$newStart}}">{{ $newStart }}</a></span>
38
+
<span class="{{ $opStyle }}">{{ .Op.String }}</span>
39
+
<span class="px-2 whitespace-pre">{{ .Line }}</span>
40
+
</span>
41
{{- $newStart = add64 $newStart 1 -}}
42
{{- $oldStart = add64 $oldStart 1 -}}
43
{{- end -}}
44
{{- end -}}
45
+
{{- end -}}</div></div></div>
46
{{ end }}
+1
-1
appview/pages/templates/repo/pipelines/pipelines.html
+1
-1
appview/pages/templates/repo/pipelines/pipelines.html
···
23
</p>
24
<p>
25
<span class="{{ $bullet }}">2</span>Configure your CI/CD
26
-
<a href="https://tangled.org/@tangled.org/core/blob/master/docs/spindle/pipeline.md" class="underline">pipeline</a>.
27
</p>
28
<p><span class="{{ $bullet }}">3</span>Trigger a workflow with a push or a pull-request!</p>
29
</div>
+1
-1
appview/pages/templates/repo/settings/pipelines.html
+1
-1
appview/pages/templates/repo/settings/pipelines.html
···
22
<p class="text-gray-500 dark:text-gray-400">
23
Choose a spindle to execute your workflows on. Only repository owners
24
can configure spindles. Spindles can be selfhosted,
25
-
<a class="text-gray-500 dark:text-gray-400 underline" href="https://tangled.org/@tangled.org/core/blob/master/docs/spindle/hosting.md">
26
click to learn more.
27
</a>
28
</p>
···
22
<p class="text-gray-500 dark:text-gray-400">
23
Choose a spindle to execute your workflows on. Only repository owners
24
can configure spindles. Spindles can be selfhosted,
25
+
<a class="text-gray-500 dark:text-gray-400 underline" href="https://docs.tangled.org/spindles.html#self-hosting-guide">
26
click to learn more.
27
</a>
28
</p>
+1
-1
appview/pages/templates/spindles/index.html
+1
-1
appview/pages/templates/spindles/index.html
+48
-36
appview/pulls/pulls.go
+48
-36
appview/pulls/pulls.go
···
1241
return
1242
}
1243
1244
_, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{
1245
Collection: tangled.RepoPullNSID,
1246
Repo: user.Did,
···
1252
Repo: string(repo.RepoAt()),
1253
Branch: targetBranch,
1254
},
1255
-
Patch: patch,
1256
Source: recordPullSource,
1257
CreatedAt: time.Now().Format(time.RFC3339),
1258
},
···
1328
// apply all record creations at once
1329
var writes []*comatproto.RepoApplyWrites_Input_Writes_Elem
1330
for _, p := range stack {
1331
record := p.AsRecord()
1332
-
write := comatproto.RepoApplyWrites_Input_Writes_Elem{
1333
RepoApplyWrites_Create: &comatproto.RepoApplyWrites_Create{
1334
Collection: tangled.RepoPullNSID,
1335
Rkey: &p.Rkey,
···
1337
Val: &record,
1338
},
1339
},
1340
-
}
1341
-
writes = append(writes, &write)
1342
}
1343
_, err = comatproto.RepoApplyWrites(r.Context(), client, &comatproto.RepoApplyWrites_Input{
1344
Repo: user.Did,
···
1871
return
1872
}
1873
1874
-
var recordPullSource *tangled.RepoPull_Source
1875
-
if pull.IsBranchBased() {
1876
-
recordPullSource = &tangled.RepoPull_Source{
1877
-
Branch: pull.PullSource.Branch,
1878
-
Sha: sourceRev,
1879
-
}
1880
}
1881
-
if pull.IsForkBased() {
1882
-
repoAt := pull.PullSource.RepoAt.String()
1883
-
recordPullSource = &tangled.RepoPull_Source{
1884
-
Branch: pull.PullSource.Branch,
1885
-
Repo: &repoAt,
1886
-
Sha: sourceRev,
1887
-
}
1888
-
}
1889
1890
_, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{
1891
Collection: tangled.RepoPullNSID,
···
1893
Rkey: pull.Rkey,
1894
SwapRecord: ex.Cid,
1895
Record: &lexutil.LexiconTypeDecoder{
1896
-
Val: &tangled.RepoPull{
1897
-
Title: pull.Title,
1898
-
Target: &tangled.RepoPull_Target{
1899
-
Repo: string(repo.RepoAt()),
1900
-
Branch: pull.TargetBranch,
1901
-
},
1902
-
Patch: patch, // new patch
1903
-
Source: recordPullSource,
1904
-
CreatedAt: time.Now().Format(time.RFC3339),
1905
-
},
1906
},
1907
})
1908
if err != nil {
···
1988
}
1989
defer tx.Rollback()
1990
1991
// pds updates to make
1992
var writes []*comatproto.RepoApplyWrites_Input_Writes_Elem
1993
···
2021
return
2022
}
2023
2024
record := p.AsRecord()
2025
writes = append(writes, &comatproto.RepoApplyWrites_Input_Writes_Elem{
2026
RepoApplyWrites_Create: &comatproto.RepoApplyWrites_Create{
2027
Collection: tangled.RepoPullNSID,
···
2056
return
2057
}
2058
2059
record := np.AsRecord()
2060
-
2061
writes = append(writes, &comatproto.RepoApplyWrites_Input_Writes_Elem{
2062
RepoApplyWrites_Update: &comatproto.RepoApplyWrites_Update{
2063
Collection: tangled.RepoPullNSID,
···
2091
if err != nil {
2092
log.Println("failed to resubmit pull", err)
2093
s.pages.Notice(w, "pull-resubmit-error", "Failed to resubmit pull request. Try again later.")
2094
-
return
2095
-
}
2096
-
2097
-
client, err := s.oauth.AuthorizedClient(r)
2098
-
if err != nil {
2099
-
log.Println("failed to authorize client")
2100
-
s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")
2101
return
2102
}
2103
···
1241
return
1242
}
1243
1244
+
blob, err := comatproto.RepoUploadBlob(r.Context(), client, strings.NewReader(patch))
1245
+
if err != nil {
1246
+
log.Println("failed to upload patch", err)
1247
+
s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
1248
+
return
1249
+
}
1250
+
1251
_, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{
1252
Collection: tangled.RepoPullNSID,
1253
Repo: user.Did,
···
1259
Repo: string(repo.RepoAt()),
1260
Branch: targetBranch,
1261
},
1262
+
PatchBlob: blob.Blob,
1263
Source: recordPullSource,
1264
CreatedAt: time.Now().Format(time.RFC3339),
1265
},
···
1335
// apply all record creations at once
1336
var writes []*comatproto.RepoApplyWrites_Input_Writes_Elem
1337
for _, p := range stack {
1338
+
blob, err := comatproto.RepoUploadBlob(r.Context(), client, strings.NewReader(p.LatestPatch()))
1339
+
if err != nil {
1340
+
log.Println("failed to upload patch blob", err)
1341
+
s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
1342
+
return
1343
+
}
1344
+
1345
record := p.AsRecord()
1346
+
record.PatchBlob = blob.Blob
1347
+
writes = append(writes, &comatproto.RepoApplyWrites_Input_Writes_Elem{
1348
RepoApplyWrites_Create: &comatproto.RepoApplyWrites_Create{
1349
Collection: tangled.RepoPullNSID,
1350
Rkey: &p.Rkey,
···
1352
Val: &record,
1353
},
1354
},
1355
+
})
1356
}
1357
_, err = comatproto.RepoApplyWrites(r.Context(), client, &comatproto.RepoApplyWrites_Input{
1358
Repo: user.Did,
···
1885
return
1886
}
1887
1888
+
blob, err := comatproto.RepoUploadBlob(r.Context(), client, strings.NewReader(patch))
1889
+
if err != nil {
1890
+
log.Println("failed to upload patch blob", err)
1891
+
s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.")
1892
+
return
1893
}
1894
+
record := pull.AsRecord()
1895
+
record.PatchBlob = blob.Blob
1896
+
record.CreatedAt = time.Now().Format(time.RFC3339)
1897
1898
_, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{
1899
Collection: tangled.RepoPullNSID,
···
1901
Rkey: pull.Rkey,
1902
SwapRecord: ex.Cid,
1903
Record: &lexutil.LexiconTypeDecoder{
1904
+
Val: &record,
1905
},
1906
})
1907
if err != nil {
···
1987
}
1988
defer tx.Rollback()
1989
1990
+
client, err := s.oauth.AuthorizedClient(r)
1991
+
if err != nil {
1992
+
log.Println("failed to authorize client")
1993
+
s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")
1994
+
return
1995
+
}
1996
+
1997
// pds updates to make
1998
var writes []*comatproto.RepoApplyWrites_Input_Writes_Elem
1999
···
2027
return
2028
}
2029
2030
+
blob, err := comatproto.RepoUploadBlob(r.Context(), client, strings.NewReader(patch))
2031
+
if err != nil {
2032
+
log.Println("failed to upload patch blob", err)
2033
+
s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.")
2034
+
return
2035
+
}
2036
record := p.AsRecord()
2037
+
record.PatchBlob = blob.Blob
2038
writes = append(writes, &comatproto.RepoApplyWrites_Input_Writes_Elem{
2039
RepoApplyWrites_Create: &comatproto.RepoApplyWrites_Create{
2040
Collection: tangled.RepoPullNSID,
···
2069
return
2070
}
2071
2072
+
blob, err := comatproto.RepoUploadBlob(r.Context(), client, strings.NewReader(patch))
2073
+
if err != nil {
2074
+
log.Println("failed to upload patch blob", err)
2075
+
s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.")
2076
+
return
2077
+
}
2078
record := np.AsRecord()
2079
+
record.PatchBlob = blob.Blob
2080
writes = append(writes, &comatproto.RepoApplyWrites_Input_Writes_Elem{
2081
RepoApplyWrites_Update: &comatproto.RepoApplyWrites_Update{
2082
Collection: tangled.RepoPullNSID,
···
2110
if err != nil {
2111
log.Println("failed to resubmit pull", err)
2112
s.pages.Notice(w, "pull-resubmit-error", "Failed to resubmit pull request. Try again later.")
2113
return
2114
}
2115
+1
appview/repo/archive.go
+1
appview/repo/archive.go
-5
appview/spindles/spindles.go
-5
appview/spindles/spindles.go
···
653
s.Pages.Notice(w, noticeId, "Failed to remove member, identity resolution failed.")
654
return
655
}
656
-
if memberId.Handle.IsInvalidHandle() {
657
-
l.Error("failed to resolve member identity to handle")
658
-
s.Pages.Notice(w, noticeId, "Failed to remove member, identity resolution failed.")
659
-
return
660
-
}
661
662
tx, err := s.Db.Begin()
663
if err != nil {
+6
-4
appview/state/profile.go
+6
-4
appview/state/profile.go
···
163
}
164
165
// populate commit counts in the timeline, using the punchcard
166
-
currentMonth := time.Now().Month()
167
for _, p := range profile.Punchcard.Punches {
168
-
idx := currentMonth - p.Date.Month()
169
-
if int(idx) < len(timeline.ByMonth) {
170
-
timeline.ByMonth[idx].Commits += p.Count
171
}
172
}
173
···
163
}
164
165
// populate commit counts in the timeline, using the punchcard
166
+
now := time.Now()
167
for _, p := range profile.Punchcard.Punches {
168
+
years := now.Year() - p.Date.Year()
169
+
months := int(now.Month() - p.Date.Month())
170
+
monthsAgo := years*12 + months
171
+
if monthsAgo >= 0 && monthsAgo < len(timeline.ByMonth) {
172
+
timeline.ByMonth[monthsAgo].Commits += p.Count
173
}
174
}
175
+2
appview/state/router.go
+2
appview/state/router.go
···
109
})
110
111
r.NotFound(func(w http.ResponseWriter, r *http.Request) {
112
+
w.WriteHeader(http.StatusNotFound)
113
s.pages.Error404(w)
114
})
115
···
183
r.Get("/brand", s.Brand)
184
185
r.NotFound(func(w http.ResponseWriter, r *http.Request) {
186
+
w.WriteHeader(http.StatusNotFound)
187
s.pages.Error404(w)
188
})
189
return r
+66
-67
docs/DOCS.md
+66
-67
docs/DOCS.md
···
1
---
2
-
title: Tangled Documentation
3
author: The Tangled Contributors
4
date: 21 Sun, Dec 2025
5
---
···
8
9
Tangled is a decentralized code hosting and collaboration
10
platform. Every component of Tangled is open-source and
11
-
selfhostable. [tangled.org](https://tangled.org) also
12
provides hosting and CI services that are free to use.
13
14
There are several models for decentralized code
15
collaboration platforms, ranging from ActivityPub’s
16
(Forgejo) federated model, to Radicle’s entirely P2P model.
17
Our approach attempts to be the best of both worlds by
18
-
adopting atproto—a protocol for building decentralized
19
social applications with a central identity
20
21
Our approach to this is the idea of “knots”. Knots are
···
26
default, Tangled provides managed knots where you can host
27
your repositories for free.
28
29
-
The "appview" at tangled.org acts as a consolidated “view”
30
into the whole network, allowing users to access, clone and
31
contribute to repositories hosted across different knots
32
seamlessly.
33
34
-
# Quick Start Guide
35
36
-
## Login or Sign up
37
38
-
You can [login](https://tangled.org) by using your AT
39
account. If you are unclear on what that means, simply head
40
to the [signup](https://tangled.org/signup) page and create
41
an account. By doing so, you will be choosing Tangled as
42
your account provider (you will be granted a handle of the
43
form `user.tngl.sh`).
44
45
-
In the AT network, users are free to choose their account
46
provider (known as a "Personal Data Service", or PDS), and
47
login to applications that support AT accounts.
48
49
-
You can think of it as "one account for all of the
50
-
atmosphere"!
51
52
If you already have an AT account (you may have one if you
53
signed up to Bluesky, for example), you can login with the
54
same handle on Tangled (so just use `user.bsky.social` on
55
the login page).
56
57
-
## Add an SSH Key
58
59
Once you are logged in, you can start creating repositories
60
and pushing code. Tangled supports pushing git repositories
···
87
paste your public key, give it a descriptive name, and hit
88
save.
89
90
-
## Create a Repository
91
92
Once your SSH key is added, create your first repository:
93
···
98
4. Choose a knotserver to host this repository on
99
5. Hit create
100
101
-
"Knots" are selfhostable, lightweight git servers that can
102
host your repository. Unlike traditional code forges, your
103
code can live on any server. Read the [Knots](TODO) section
104
for more.
···
125
are hosted by tangled.org. If you use a custom knot, refer
126
to the [Knots](TODO) section.
127
128
-
## Push Your First Repository
129
130
-
Initialize a new git repository:
131
132
```bash
133
mkdir my-project
···
165
cd /path/to/your/existing/repo
166
```
167
168
-
You can inspect your existing git remote like so:
169
170
```bash
171
git remote -v
···
197
origin git@tangled.org:user.tngl.sh/my-project (push)
198
```
199
200
-
Push all your branches and tags to tangled:
201
202
```bash
203
git push -u origin --all
···
232
```
233
234
You also need to re-add the original URL as a push
235
-
destination (git replaces the push URL when you use `--add`
236
the first time):
237
238
```bash
···
249
```
250
251
Notice that there's one fetch URL (the primary remote) and
252
-
two push URLs. Now, whenever you push, git will
253
automatically push to both remotes:
254
255
```bash
···
301
## Docker
302
303
Refer to
304
-
[@tangled.org/knot-docker](https://tangled.sh/@tangled.sh/knot-docker).
305
Note that this is community maintained.
306
307
## Manual setup
···
372
```
373
KNOT_REPO_SCAN_PATH=/home/git
374
KNOT_SERVER_HOSTNAME=knot.example.com
375
-
APPVIEW_ENDPOINT=https://tangled.sh
376
KNOT_SERVER_OWNER=did:plc:foobar
377
KNOT_SERVER_INTERNAL_LISTEN_ADDR=127.0.0.1:5444
378
KNOT_SERVER_LISTEN_ADDR=127.0.0.1:5555
···
603
- `nixery`: This uses an instance of
604
[Nixery](https://nixery.dev) to run steps, which allows
605
you to add [dependencies](#dependencies) from
606
-
[Nixpkgs](https://github.com/NixOS/nixpkgs). You can
607
search for packages on https://search.nixos.org, and
608
there's a pretty good chance the package(s) you're looking
609
for will be there.
···
630
default, the depth is set to 1, meaning only the most
631
recent commit will be fetched, which is the commit that
632
triggered the workflow.
633
-
- `submodules`: If you use [git
634
-
submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules)
635
in your repository, setting this field to `true` will
636
recursively fetch all submodules. This is `false` by
637
default.
···
657
Say you want to fetch Node.js and Go from `nixpkgs`, and a
658
package called `my_pkg` you've made from your own registry
659
at your repository at
660
-
`https://tangled.sh/@example.com/my_pkg`. You can define
661
those dependencies like so:
662
663
```yaml
···
779
780
If you want another example of a workflow, you can look at
781
the one [Tangled uses to build the
782
-
project](https://tangled.sh/@tangled.sh/core/blob/master/.tangled/workflows/build.yml).
783
784
## Self-hosting guide
785
···
836
837
## Architecture
838
839
-
Spindle is a small CI runner service. Here's a high level overview of how it operates:
840
841
-
* listens for [`sh.tangled.spindle.member`](/lexicons/spindle/member.json) and
842
[`sh.tangled.repo`](/lexicons/repo.json) records on the Jetstream.
843
-
* when a new repo record comes through (typically when you add a spindle to a
844
repo from the settings), spindle then resolves the underlying knot and
845
subscribes to repo events (see:
846
[`sh.tangled.pipeline`](/lexicons/pipeline.json)).
847
-
* the spindle engine then handles execution of the pipeline, with results and
848
-
logs beamed on the spindle event stream over wss
849
850
### The engine
851
852
At present, the only supported backend is Docker (and Podman, if Docker
853
-
compatibility is enabled, so that `/run/docker.sock` is created). Spindle
854
executes each step in the pipeline in a fresh container, with state persisted
855
across steps within the `/tangled/workspace` directory.
856
···
858
[Nixery](https://nixery.dev), which is handy for caching layers for frequently
859
used packages.
860
861
-
The pipeline manifest is [specified here](/docs/spindle/pipeline.md).
862
863
## Secrets with openbao
864
865
-
This document covers setting up Spindle to use OpenBao for secrets
866
management via OpenBao Proxy instead of the default SQLite backend.
867
868
### Overview
869
870
Spindle now uses OpenBao Proxy for secrets management. The proxy handles
871
-
authentication automatically using AppRole credentials, while Spindle
872
connects to the local proxy instead of directly to the OpenBao server.
873
874
This approach provides better security, automatic token renewal, and
···
876
877
### Installation
878
879
-
Install OpenBao from nixpkgs:
880
881
```bash
882
nix shell nixpkgs#openbao # for a local server
···
1029
}
1030
}
1031
1032
-
# Proxy listener for Spindle
1033
listener "tcp" {
1034
address = "127.0.0.1:8201"
1035
tls_disable = true
···
1062
1063
#### Configure spindle
1064
1065
-
Set these environment variables for Spindle:
1066
1067
```bash
1068
export SPINDLE_SERVER_SECRETS_PROVIDER=openbao
···
1070
export SPINDLE_SERVER_SECRETS_OPENBAO_MOUNT=spindle
1071
```
1072
1073
-
On startup, the spindle will now connect to the local proxy,
1074
which handles all authentication automatically.
1075
1076
### Production setup for proxy
···
1099
# List all secrets
1100
bao kv list spindle/
1101
1102
-
# Add a test secret via Spindle API, then check it exists
1103
bao kv list spindle/repos/
1104
1105
# Get a specific secret
···
1112
port 8200 or 8201)
1113
- The proxy authenticates with OpenBao using AppRole
1114
credentials
1115
-
- All Spindle requests go through the proxy, which injects
1116
authentication tokens
1117
- Secrets are stored at
1118
`spindle/repos/{sanitized_repo_path}/{secret_key}`
···
1131
and the policy has the necessary permissions.
1132
1133
**404 route errors**: The spindle KV mount probably doesn't
1134
-
exist - run the mount creation step again.
1135
1136
**Proxy authentication failures**: Check the proxy logs and
1137
verify the role-id and secret-id files are readable and
···
1159
secret_id="$(cat /tmp/openbao/secret-id)"
1160
```
1161
1162
-
# Migrating knots & spindles
1163
1164
Sometimes, non-backwards compatible changes are made to the
1165
knot/spindle XRPC APIs. If you host a knot or a spindle, you
···
1172
1173
## Upgrading from v1.8.x
1174
1175
-
After v1.8.2, the HTTP API for knot and spindles have been
1176
deprecated and replaced with XRPC. Repositories on outdated
1177
knots will not be viewable from the appview. Upgrading is
1178
straightforward however.
1179
1180
For knots:
1181
1182
-
- Upgrade to latest tag (v1.9.0 or above)
1183
- Head to the [knot dashboard](https://tangled.org/settings/knots) and
1184
hit the "retry" button to verify your knot
1185
1186
For spindles:
1187
1188
-
- Upgrade to latest tag (v1.9.0 or above)
1189
- Head to the [spindle
1190
dashboard](https://tangled.org/settings/spindles) and hit the
1191
"retry" button to verify your spindle
···
1227
# Hacking on Tangled
1228
1229
We highly recommend [installing
1230
-
nix](https://nixos.org/download/) (the package manager)
1231
-
before working on the codebase. The nix flake provides a lot
1232
of helpers to get started and most importantly, builds and
1233
dev shells are entirely deterministic.
1234
···
1238
nix develop
1239
```
1240
1241
-
Non-nix users can look at the `devShell` attribute in the
1242
`flake.nix` file to determine necessary dependencies.
1243
1244
## Running the appview
1245
1246
-
The nix flake also exposes a few `app` attributes (run `nix
1247
flake show` to see a full list of what the flake provides),
1248
one of the apps runs the appview with the `air`
1249
live-reloader:
···
1258
nix run .#watch-tailwind
1259
```
1260
1261
-
To authenticate with the appview, you will need redis and
1262
-
OAUTH JWKs to be setup:
1263
1264
```
1265
-
# oauth jwks should already be setup by the nix devshell:
1266
echo $TANGLED_OAUTH_CLIENT_SECRET
1267
z42ty4RT1ovnTopY8B8ekz9NuziF2CuMkZ7rbRFpAR9jBqMc
1268
···
1280
# the secret key from above
1281
export TANGLED_OAUTH_CLIENT_SECRET="z42tuP..."
1282
1283
-
# run redis in at a new shell to store oauth sessions
1284
redis-server
1285
```
1286
1287
## Running knots and spindles
1288
1289
An end-to-end knot setup requires setting up a machine with
1290
-
`sshd`, `AuthorizedKeysCommand`, and git user, which is
1291
-
quite cumbersome. So the nix flake provides a
1292
`nixosConfiguration` to do so.
1293
1294
<details>
1295
-
<summary><strong>MacOS users will have to setup a Nix Builder first</strong></summary>
1296
1297
In order to build Tangled's dev VM on macOS, you will
1298
first need to set up a Linux Nix builder. The recommended
···
1303
you are using Apple Silicon).
1304
1305
> IMPORTANT: You must build `darwin.linux-builder` somewhere other than inside
1306
-
> the tangled repo so that it doesn't conflict with the other VM. For example,
1307
> you can do
1308
>
1309
> ```shell
···
1316
> avoid subtle problems.
1317
1318
Alternatively, you can use any other method to set up a
1319
-
Linux machine with `nix` installed that you can `sudo ssh`
1320
into (in other words, root user on your Mac has to be able
1321
to ssh into the Linux machine without entering a password)
1322
and that has the same architecture as your Mac. See
···
1347
with `ssh` exposed on port 2222.
1348
1349
Once the services are running, head to
1350
-
http://localhost:3000/settings/knots and hit verify. It should
1351
verify the ownership of the services instantly if everything
1352
went smoothly.
1353
···
1371
1372
The above VM should already be running a spindle on
1373
`localhost:6555`. Head to http://localhost:3000/settings/spindles and
1374
-
hit verify. You can then configure each repository to use
1375
this spindle and run CI jobs.
1376
1377
Of interest when debugging spindles:
1378
1379
```
1380
-
# service logs from journald:
1381
journalctl -xeu spindle
1382
1383
# CI job logs from disk:
1384
ls /var/log/spindle
1385
1386
-
# debugging spindle db:
1387
sqlite3 /var/lib/spindle/spindle.db
1388
1389
# litecli has a nicer REPL interface:
···
1432
1433
### General notes
1434
1435
-
- PRs get merged "as-is" (fast-forward) -- like applying a patch-series
1436
-
using `git am`. At present, there is no squashing -- so please author
1437
your commits as they would appear on `master`, following the above
1438
guidelines.
1439
- If there is a lot of nesting, for example "appview:
···
1454
## Code formatting
1455
1456
We use a variety of tools to format our code, and multiplex them with
1457
-
[`treefmt`](https://treefmt.com): all you need to do to format your changes
1458
is run `nix run .#fmt` (or just `treefmt` if you're in the devshell).
1459
1460
## Proposals for bigger changes
···
1482
We'll use the issue thread to discuss and refine the idea before moving
1483
forward.
1484
1485
-
## Developer certificate of origin (DCO)
1486
1487
We require all contributors to certify that they have the right to
1488
submit the code they're contributing. To do this, we follow the
···
1
---
2
+
title: Tangled docs
3
author: The Tangled Contributors
4
date: 21 Sun, Dec 2025
5
---
···
8
9
Tangled is a decentralized code hosting and collaboration
10
platform. Every component of Tangled is open-source and
11
+
self-hostable. [tangled.org](https://tangled.org) also
12
provides hosting and CI services that are free to use.
13
14
There are several models for decentralized code
15
collaboration platforms, ranging from ActivityPub’s
16
(Forgejo) federated model, to Radicle’s entirely P2P model.
17
Our approach attempts to be the best of both worlds by
18
+
adopting the AT Protocol—a protocol for building decentralized
19
social applications with a central identity
20
21
Our approach to this is the idea of “knots”. Knots are
···
26
default, Tangled provides managed knots where you can host
27
your repositories for free.
28
29
+
The appview at tangled.org acts as a consolidated "view"
30
into the whole network, allowing users to access, clone and
31
contribute to repositories hosted across different knots
32
seamlessly.
33
34
+
# Quick start guide
35
36
+
## Login or sign up
37
38
+
You can [login](https://tangled.org) by using your AT Protocol
39
account. If you are unclear on what that means, simply head
40
to the [signup](https://tangled.org/signup) page and create
41
an account. By doing so, you will be choosing Tangled as
42
your account provider (you will be granted a handle of the
43
form `user.tngl.sh`).
44
45
+
In the AT Protocol network, users are free to choose their account
46
provider (known as a "Personal Data Service", or PDS), and
47
login to applications that support AT accounts.
48
49
+
You can think of it as "one account for all of the atmosphere"!
50
51
If you already have an AT account (you may have one if you
52
signed up to Bluesky, for example), you can login with the
53
same handle on Tangled (so just use `user.bsky.social` on
54
the login page).
55
56
+
## Add an SSH key
57
58
Once you are logged in, you can start creating repositories
59
and pushing code. Tangled supports pushing git repositories
···
86
paste your public key, give it a descriptive name, and hit
87
save.
88
89
+
## Create a repository
90
91
Once your SSH key is added, create your first repository:
92
···
97
4. Choose a knotserver to host this repository on
98
5. Hit create
99
100
+
Knots are self-hostable, lightweight Git servers that can
101
host your repository. Unlike traditional code forges, your
102
code can live on any server. Read the [Knots](TODO) section
103
for more.
···
124
are hosted by tangled.org. If you use a custom knot, refer
125
to the [Knots](TODO) section.
126
127
+
## Push your first repository
128
129
+
Initialize a new Git repository:
130
131
```bash
132
mkdir my-project
···
164
cd /path/to/your/existing/repo
165
```
166
167
+
You can inspect your existing Git remote like so:
168
169
```bash
170
git remote -v
···
196
origin git@tangled.org:user.tngl.sh/my-project (push)
197
```
198
199
+
Push all your branches and tags to Tangled:
200
201
```bash
202
git push -u origin --all
···
231
```
232
233
You also need to re-add the original URL as a push
234
+
destination (Git replaces the push URL when you use `--add`
235
the first time):
236
237
```bash
···
248
```
249
250
Notice that there's one fetch URL (the primary remote) and
251
+
two push URLs. Now, whenever you push, Git will
252
automatically push to both remotes:
253
254
```bash
···
300
## Docker
301
302
Refer to
303
+
[@tangled.org/knot-docker](https://tangled.org/@tangled.org/knot-docker).
304
Note that this is community maintained.
305
306
## Manual setup
···
371
```
372
KNOT_REPO_SCAN_PATH=/home/git
373
KNOT_SERVER_HOSTNAME=knot.example.com
374
+
APPVIEW_ENDPOINT=https://tangled.org
375
KNOT_SERVER_OWNER=did:plc:foobar
376
KNOT_SERVER_INTERNAL_LISTEN_ADDR=127.0.0.1:5444
377
KNOT_SERVER_LISTEN_ADDR=127.0.0.1:5555
···
602
- `nixery`: This uses an instance of
603
[Nixery](https://nixery.dev) to run steps, which allows
604
you to add [dependencies](#dependencies) from
605
+
Nixpkgs (https://github.com/NixOS/nixpkgs). You can
606
search for packages on https://search.nixos.org, and
607
there's a pretty good chance the package(s) you're looking
608
for will be there.
···
629
default, the depth is set to 1, meaning only the most
630
recent commit will be fetched, which is the commit that
631
triggered the workflow.
632
+
- `submodules`: If you use Git submodules
633
+
(https://git-scm.com/book/en/v2/Git-Tools-Submodules)
634
in your repository, setting this field to `true` will
635
recursively fetch all submodules. This is `false` by
636
default.
···
656
Say you want to fetch Node.js and Go from `nixpkgs`, and a
657
package called `my_pkg` you've made from your own registry
658
at your repository at
659
+
`https://tangled.org/@example.com/my_pkg`. You can define
660
those dependencies like so:
661
662
```yaml
···
778
779
If you want another example of a workflow, you can look at
780
the one [Tangled uses to build the
781
+
project](https://tangled.org/@tangled.org/core/blob/master/.tangled/workflows/build.yml).
782
783
## Self-hosting guide
784
···
835
836
## Architecture
837
838
+
Spindle is a small CI runner service. Here's a high-level overview of how it operates:
839
840
+
* Listens for [`sh.tangled.spindle.member`](/lexicons/spindle/member.json) and
841
[`sh.tangled.repo`](/lexicons/repo.json) records on the Jetstream.
842
+
* When a new repo record comes through (typically when you add a spindle to a
843
repo from the settings), spindle then resolves the underlying knot and
844
subscribes to repo events (see:
845
[`sh.tangled.pipeline`](/lexicons/pipeline.json)).
846
+
* The spindle engine then handles execution of the pipeline, with results and
847
+
logs beamed on the spindle event stream over WebSocket
848
849
### The engine
850
851
At present, the only supported backend is Docker (and Podman, if Docker
852
+
compatibility is enabled, so that `/run/docker.sock` is created). spindle
853
executes each step in the pipeline in a fresh container, with state persisted
854
across steps within the `/tangled/workspace` directory.
855
···
857
[Nixery](https://nixery.dev), which is handy for caching layers for frequently
858
used packages.
859
860
+
The pipeline manifest is [specified here](https://docs.tangled.org/spindles.html#pipelines).
861
862
## Secrets with openbao
863
864
+
This document covers setting up spindle to use OpenBao for secrets
865
management via OpenBao Proxy instead of the default SQLite backend.
866
867
### Overview
868
869
Spindle now uses OpenBao Proxy for secrets management. The proxy handles
870
+
authentication automatically using AppRole credentials, while spindle
871
connects to the local proxy instead of directly to the OpenBao server.
872
873
This approach provides better security, automatic token renewal, and
···
875
876
### Installation
877
878
+
Install OpenBao from Nixpkgs:
879
880
```bash
881
nix shell nixpkgs#openbao # for a local server
···
1028
}
1029
}
1030
1031
+
# Proxy listener for spindle
1032
listener "tcp" {
1033
address = "127.0.0.1:8201"
1034
tls_disable = true
···
1061
1062
#### Configure spindle
1063
1064
+
Set these environment variables for spindle:
1065
1066
```bash
1067
export SPINDLE_SERVER_SECRETS_PROVIDER=openbao
···
1069
export SPINDLE_SERVER_SECRETS_OPENBAO_MOUNT=spindle
1070
```
1071
1072
+
On startup, spindle will now connect to the local proxy,
1073
which handles all authentication automatically.
1074
1075
### Production setup for proxy
···
1098
# List all secrets
1099
bao kv list spindle/
1100
1101
+
# Add a test secret via the spindle API, then check it exists
1102
bao kv list spindle/repos/
1103
1104
# Get a specific secret
···
1111
port 8200 or 8201)
1112
- The proxy authenticates with OpenBao using AppRole
1113
credentials
1114
+
- All spindle requests go through the proxy, which injects
1115
authentication tokens
1116
- Secrets are stored at
1117
`spindle/repos/{sanitized_repo_path}/{secret_key}`
···
1130
and the policy has the necessary permissions.
1131
1132
**404 route errors**: The spindle KV mount probably doesn't
1133
+
exist—run the mount creation step again.
1134
1135
**Proxy authentication failures**: Check the proxy logs and
1136
verify the role-id and secret-id files are readable and
···
1158
secret_id="$(cat /tmp/openbao/secret-id)"
1159
```
1160
1161
+
# Migrating knots and spindles
1162
1163
Sometimes, non-backwards compatible changes are made to the
1164
knot/spindle XRPC APIs. If you host a knot or a spindle, you
···
1171
1172
## Upgrading from v1.8.x
1173
1174
+
After v1.8.2, the HTTP API for knots and spindles has been
1175
deprecated and replaced with XRPC. Repositories on outdated
1176
knots will not be viewable from the appview. Upgrading is
1177
straightforward however.
1178
1179
For knots:
1180
1181
+
- Upgrade to the latest tag (v1.9.0 or above)
1182
- Head to the [knot dashboard](https://tangled.org/settings/knots) and
1183
hit the "retry" button to verify your knot
1184
1185
For spindles:
1186
1187
+
- Upgrade to the latest tag (v1.9.0 or above)
1188
- Head to the [spindle
1189
dashboard](https://tangled.org/settings/spindles) and hit the
1190
"retry" button to verify your spindle
···
1226
# Hacking on Tangled
1227
1228
We highly recommend [installing
1229
+
Nix](https://nixos.org/download/) (the package manager)
1230
+
before working on the codebase. The Nix flake provides a lot
1231
of helpers to get started and most importantly, builds and
1232
dev shells are entirely deterministic.
1233
···
1237
nix develop
1238
```
1239
1240
+
Non-Nix users can look at the `devShell` attribute in the
1241
`flake.nix` file to determine necessary dependencies.
1242
1243
## Running the appview
1244
1245
+
The Nix flake also exposes a few `app` attributes (run `nix
1246
flake show` to see a full list of what the flake provides),
1247
one of the apps runs the appview with the `air`
1248
live-reloader:
···
1257
nix run .#watch-tailwind
1258
```
1259
1260
+
To authenticate with the appview, you will need Redis and
1261
+
OAuth JWKs to be set up:
1262
1263
```
1264
+
# OAuth JWKs should already be set up by the Nix devshell:
1265
echo $TANGLED_OAUTH_CLIENT_SECRET
1266
z42ty4RT1ovnTopY8B8ekz9NuziF2CuMkZ7rbRFpAR9jBqMc
1267
···
1279
# the secret key from above
1280
export TANGLED_OAUTH_CLIENT_SECRET="z42tuP..."
1281
1282
+
# Run Redis in a new shell to store OAuth sessions
1283
redis-server
1284
```
1285
1286
## Running knots and spindles
1287
1288
An end-to-end knot setup requires setting up a machine with
1289
+
`sshd`, `AuthorizedKeysCommand`, and a Git user, which is
1290
+
quite cumbersome. So the Nix flake provides a
1291
`nixosConfiguration` to do so.
1292
1293
<details>
1294
+
<summary><strong>macOS users will have to set up a Nix Builder first</strong></summary>
1295
1296
In order to build Tangled's dev VM on macOS, you will
1297
first need to set up a Linux Nix builder. The recommended
···
1302
you are using Apple Silicon).
1303
1304
> IMPORTANT: You must build `darwin.linux-builder` somewhere other than inside
1305
+
> the Tangled repo so that it doesn't conflict with the other VM. For example,
1306
> you can do
1307
>
1308
> ```shell
···
1315
> avoid subtle problems.
1316
1317
Alternatively, you can use any other method to set up a
1318
+
Linux machine with Nix installed that you can `sudo ssh`
1319
into (in other words, root user on your Mac has to be able
1320
to ssh into the Linux machine without entering a password)
1321
and that has the same architecture as your Mac. See
···
1346
with `ssh` exposed on port 2222.
1347
1348
Once the services are running, head to
1349
+
http://localhost:3000/settings/knots and hit "Verify". It should
1350
verify the ownership of the services instantly if everything
1351
went smoothly.
1352
···
1370
1371
The above VM should already be running a spindle on
1372
`localhost:6555`. Head to http://localhost:3000/settings/spindles and
1373
+
hit "Verify". You can then configure each repository to use
1374
this spindle and run CI jobs.
1375
1376
Of interest when debugging spindles:
1377
1378
```
1379
+
# Service logs from journald:
1380
journalctl -xeu spindle
1381
1382
# CI job logs from disk:
1383
ls /var/log/spindle
1384
1385
+
# Debugging spindle database:
1386
sqlite3 /var/lib/spindle/spindle.db
1387
1388
# litecli has a nicer REPL interface:
···
1431
1432
### General notes
1433
1434
+
- PRs get merged "as-is" (fast-forward)—like applying a patch-series
1435
+
using `git am`. At present, there is no squashing—so please author
1436
your commits as they would appear on `master`, following the above
1437
guidelines.
1438
- If there is a lot of nesting, for example "appview:
···
1453
## Code formatting
1454
1455
We use a variety of tools to format our code, and multiplex them with
1456
+
[`treefmt`](https://treefmt.com). All you need to do to format your changes
1457
is run `nix run .#fmt` (or just `treefmt` if you're in the devshell).
1458
1459
## Proposals for bigger changes
···
1481
We'll use the issue thread to discuss and refine the idea before moving
1482
forward.
1483
1484
+
## Developer Certificate of Origin (DCO)
1485
1486
We require all contributors to certify that they have the right to
1487
submit the code they're contributing. To do this, we follow the
+46
-21
docs/template.html
+46
-21
docs/template.html
···
20
<meta name="description" content="$description-meta$" />
21
$endif$
22
23
-
<title>$pagetitle$ - Tangled docs</title>
24
25
<style>
26
$styles.css()$
···
37
<link rel="preload" href="/static/fonts/InterVariable.woff2" as="font" type="font/woff2" crossorigin />
38
39
</head>
40
-
<body class="bg-white dark:bg-gray-900 min-h-screen">
41
$for(include-before)$
42
$include-before$
43
$endfor$
44
$if(toc)$
45
-
<!-- mobile topbar toc -->
46
-
<details id="mobile-$idprefix$TOC" role="doc-toc" class="md:hidden bg-gray-50 dark:bg-gray-800 border-b border-gray-200 dark:border-gray-700 z-50 space-y-4 group px-6 py-4">
47
-
<summary class="cursor-pointer list-none text-sm font-semibold select-none flex gap-2 justify-between items-center dark:text-white">
48
-
$if(toc-title)$$toc-title$$else$Table of Contents$endif$
49
-
<span class="group-open:hidden inline">${ menu.svg() }</span>
50
-
<span class="hidden group-open:inline">${ x.svg() }</span>
51
-
</summary>
52
-
${ table-of-contents:toc.html() }
53
-
</details>
54
55
-
<!-- desktop sidebar toc -->
56
-
<nav id="$idprefix$TOC" role="doc-toc" class="hidden md:block fixed left-0 top-0 w-80 h-screen bg-gray-50 dark:bg-gray-800 border-r border-gray-200 dark:border-gray-700 overflow-y-auto p-4 z-50">
57
-
$if(toc-title)$
58
-
<h2 id="$idprefix$toc-title" class="text-lg font-semibold mb-4 text-gray-900">$toc-title$</h2>
59
-
$endif$
60
-
${ table-of-contents:toc.html() }
61
-
</nav>
62
$endif$
63
64
-
<div class="min-h-screen flex-1 flex flex-col $if(toc)$md:ml-80$endif$">
65
-
<main class="flex-1 max-w-4xl w-full mx-auto p-6">
66
$if(top)$
67
$-- only print title block if this is NOT the top page
68
$else$
···
76
<p class="text-sm text-gray-500 dark:text-gray-400">$author$</p>
77
$endfor$
78
$if(date)$
79
-
<p class="text-sm text-gray-500 dark:text-gray-400">$date$</p>
80
$endif$
81
$if(abstract)$
82
<div class="mt-6 p-4 bg-gray-50 rounded-lg">
···
20
<meta name="description" content="$description-meta$" />
21
$endif$
22
23
+
<title>$pagetitle$</title>
24
25
<style>
26
$styles.css()$
···
37
<link rel="preload" href="/static/fonts/InterVariable.woff2" as="font" type="font/woff2" crossorigin />
38
39
</head>
40
+
<body class="bg-white dark:bg-gray-900 min-h-screen flex flex-col min-h-screen">
41
$for(include-before)$
42
$include-before$
43
$endfor$
44
+
45
$if(toc)$
46
+
<!-- mobile TOC trigger -->
47
+
<div class="md:hidden px-6 py-4 border-b border-gray-200 dark:border-gray-700">
48
+
<button
49
+
type="button"
50
+
popovertarget="mobile-toc-popover"
51
+
popovertargetaction="toggle"
52
+
class="w-full flex gap-2 items-center text-sm font-semibold dark:text-white"
53
+
>
54
+
${ menu.svg() }
55
+
$if(toc-title)$$toc-title$$else$Table of Contents$endif$
56
+
</button>
57
+
</div>
58
+
59
+
<div
60
+
id="mobile-toc-popover"
61
+
popover
62
+
class="mobile-toc-popover
63
+
bg-white dark:bg-gray-800
64
+
border-b border-gray-200 dark:border-gray-700
65
+
h-full overflow-y-auto
66
+
px-6 py-4 fixed inset-x-0 top-0 w-fit max-w-4/5 m-0"
67
+
>
68
+
<button
69
+
type="button"
70
+
popovertarget="mobile-toc-popover"
71
+
popovertargetaction="toggle"
72
+
class="w-full flex gap-2 items-center text-sm font-semibold dark:text-white mb-4">
73
+
${ x.svg() }
74
+
$if(toc-title)$$toc-title$$else$Table of Contents$endif$
75
+
</button>
76
+
${ table-of-contents:toc.html() }
77
+
</div>
78
+
79
80
+
<!-- desktop sidebar toc -->
81
+
<nav id="$idprefix$TOC" role="doc-toc" class="hidden md:block fixed left-0 top-0 w-80 h-screen bg-gray-50 dark:bg-gray-800 border-r border-gray-200 dark:border-gray-700 overflow-y-auto p-4 z-50">
82
+
$if(toc-title)$
83
+
<h2 id="$idprefix$toc-title" class="text-lg font-semibold mb-4 text-gray-900">$toc-title$</h2>
84
+
$endif$
85
+
${ table-of-contents:toc.html() }
86
+
</nav>
87
$endif$
88
89
+
<div class="$if(toc)$md:ml-80$endif$ flex-1 flex flex-col">
90
+
<main class="max-w-4xl w-full mx-auto p-6 flex-1">
91
$if(top)$
92
$-- only print title block if this is NOT the top page
93
$else$
···
101
<p class="text-sm text-gray-500 dark:text-gray-400">$author$</p>
102
$endfor$
103
$if(date)$
104
+
<p class="text-sm text-gray-500 dark:text-gray-400">Updated on $date$</p>
105
$endif$
106
$if(abstract)$
107
<div class="mt-6 p-4 bg-gray-50 rounded-lg">
+1
-1
flake.nix
+1
-1
flake.nix
+1
input.css
+1
input.css
+103
knotserver/xrpc/list_repos.go
+103
knotserver/xrpc/list_repos.go
···
···
1
+
package xrpc
2
+
3
+
import (
4
+
"net/http"
5
+
"os"
6
+
"path/filepath"
7
+
"strings"
8
+
9
+
securejoin "github.com/cyphar/filepath-securejoin"
10
+
"tangled.org/core/api/tangled"
11
+
"tangled.org/core/knotserver/git"
12
+
xrpcerr "tangled.org/core/xrpc/errors"
13
+
)
14
+
15
+
// ListRepos lists all users (DIDs) and their repositories by scanning the repository directory
16
+
func (x *Xrpc) ListRepos(w http.ResponseWriter, r *http.Request) {
17
+
scanPath := x.Config.Repo.ScanPath
18
+
19
+
didEntries, err := os.ReadDir(scanPath)
20
+
if err != nil {
21
+
x.Logger.Error("failed to read scan path", "error", err, "path", scanPath)
22
+
writeError(w, xrpcerr.GenericError(err), http.StatusInternalServerError)
23
+
return
24
+
}
25
+
26
+
var users []*tangled.RepoListRepos_User
27
+
28
+
for _, didEntry := range didEntries {
29
+
if !didEntry.IsDir() {
30
+
continue
31
+
}
32
+
33
+
did := didEntry.Name()
34
+
35
+
// Validate DID format (basic check)
36
+
if !strings.HasPrefix(did, "did:") {
37
+
continue
38
+
}
39
+
40
+
didPath, err := securejoin.SecureJoin(scanPath, did)
41
+
if err != nil {
42
+
x.Logger.Warn("failed to join path for did", "did", did, "error", err)
43
+
continue
44
+
}
45
+
46
+
// Read repositories for this DID
47
+
repoEntries, err := os.ReadDir(didPath)
48
+
if err != nil {
49
+
x.Logger.Warn("failed to read did directory", "did", did, "error", err)
50
+
continue
51
+
}
52
+
53
+
var repos []*tangled.RepoListRepos_RepoEntry
54
+
55
+
for _, repoEntry := range repoEntries {
56
+
if !repoEntry.IsDir() {
57
+
continue
58
+
}
59
+
60
+
repoName := repoEntry.Name()
61
+
62
+
// Check if it's a valid git repository
63
+
repoPath, err := securejoin.SecureJoin(didPath, repoName)
64
+
if err != nil {
65
+
continue
66
+
}
67
+
68
+
repo, err := git.PlainOpen(repoPath)
69
+
if err != nil {
70
+
// Not a valid git repository, skip
71
+
continue
72
+
}
73
+
74
+
// Get default branch
75
+
defaultBranch := "master"
76
+
branch, err := repo.FindMainBranch()
77
+
if err == nil {
78
+
defaultBranch = branch
79
+
}
80
+
81
+
repos = append(repos, &tangled.RepoListRepos_RepoEntry{
82
+
Name: repoName,
83
+
Did: did,
84
+
FullPath: filepath.Join(did, repoName),
85
+
DefaultBranch: &defaultBranch,
86
+
})
87
+
}
88
+
89
+
// Only add user if they have repositories
90
+
if len(repos) > 0 {
91
+
users = append(users, &tangled.RepoListRepos_User{
92
+
Did: did,
93
+
Repos: repos,
94
+
})
95
+
}
96
+
}
97
+
98
+
response := tangled.RepoListRepos_Output{
99
+
Users: users,
100
+
}
101
+
102
+
writeJson(w, response)
103
+
}
+1
knotserver/xrpc/xrpc.go
+1
knotserver/xrpc/xrpc.go
+8
-2
lexicons/pulls/pull.json
+8
-2
lexicons/pulls/pull.json
···
12
"required": [
13
"target",
14
"title",
15
+
"patchBlob",
16
"createdAt"
17
],
18
"properties": {
···
27
"type": "string"
28
},
29
"patch": {
30
+
"type": "string",
31
+
"description": "(deprecated) use patchBlob instead"
32
+
},
33
+
"patchBlob": {
34
+
"type": "blob",
35
+
"accept": "text/x-patch",
36
+
"description": "patch content"
37
},
38
"source": {
39
"type": "ref",
+71
lexicons/repo/listRepos.json
+71
lexicons/repo/listRepos.json
···
···
1
+
{
2
+
"lexicon": 1,
3
+
"id": "sh.tangled.repo.listRepos",
4
+
"defs": {
5
+
"main": {
6
+
"type": "query",
7
+
"description": "Lists all users (DIDs) and their repositories",
8
+
"parameters": {
9
+
"type": "params",
10
+
"properties": {}
11
+
},
12
+
"output": {
13
+
"encoding": "application/json",
14
+
"schema": {
15
+
"type": "object",
16
+
"required": ["users"],
17
+
"properties": {
18
+
"users": {
19
+
"type": "array",
20
+
"items": {
21
+
"type": "ref",
22
+
"ref": "#user"
23
+
}
24
+
}
25
+
}
26
+
}
27
+
}
28
+
},
29
+
"user": {
30
+
"type": "object",
31
+
"required": ["did", "repos"],
32
+
"properties": {
33
+
"did": {
34
+
"type": "string",
35
+
"format": "did",
36
+
"description": "DID of the user"
37
+
},
38
+
"repos": {
39
+
"type": "array",
40
+
"items": {
41
+
"type": "ref",
42
+
"ref": "#repoEntry"
43
+
}
44
+
}
45
+
}
46
+
},
47
+
"repoEntry": {
48
+
"type": "object",
49
+
"required": ["name", "did", "fullPath"],
50
+
"properties": {
51
+
"name": {
52
+
"type": "string",
53
+
"description": "Repository name"
54
+
},
55
+
"did": {
56
+
"type": "string",
57
+
"format": "did",
58
+
"description": "DID of the repository owner"
59
+
},
60
+
"fullPath": {
61
+
"type": "string",
62
+
"description": "Full path to the repository"
63
+
},
64
+
"defaultBranch": {
65
+
"type": "string",
66
+
"description": "Default branch of the repository"
67
+
}
68
+
}
69
+
}
70
+
}
71
+
}
+1
-1
nix/vm.nix
+1
-1
nix/vm.nix
+3
-3
readme.md
+3
-3
readme.md
···
10
11
## docs
12
13
+
- [knot hosting guide](https://docs.tangled.org/knot-self-hosting-guide.html#knot-self-hosting-guide)
14
+
- [contributing guide](https://docs.tangled.org/contribution-guide.html#contribution-guide) **please read before opening a PR!**
15
+
- [hacking on tangled](https://docs.tangled.org/hacking-on-tangled.html#hacking-on-tangled)
16
17
## security
18
+1
-1
spindle/motd
+1
-1
spindle/motd
+21
-3
spindle/server.go
+21
-3
spindle/server.go
···
8
"log/slog"
9
"maps"
10
"net/http"
11
12
"github.com/go-chi/chi/v5"
13
"tangled.org/core/api/tangled"
···
30
)
31
32
//go:embed motd
33
-
var motd []byte
34
35
const (
36
rbacDomain = "thisserver"
···
47
cfg *config.Config
48
ks *eventconsumer.Consumer
49
res *idresolver.Resolver
50
-
vault secrets.Manager
51
}
52
53
// New creates a new Spindle server with the provided configuration and engines.
···
128
cfg: cfg,
129
res: resolver,
130
vault: vault,
131
}
132
133
err = e.AddSpindle(rbacDomain)
···
201
return s.e
202
}
203
204
// Start starts the Spindle server (blocking).
205
func (s *Spindle) Start(ctx context.Context) error {
206
// starts a job queue runner in the background
···
246
mux := chi.NewRouter()
247
248
mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
249
-
w.Write(motd)
250
})
251
mux.HandleFunc("/events", s.Events)
252
mux.HandleFunc("/logs/{knot}/{rkey}/{name}", s.Logs)
···
8
"log/slog"
9
"maps"
10
"net/http"
11
+
"sync"
12
13
"github.com/go-chi/chi/v5"
14
"tangled.org/core/api/tangled"
···
31
)
32
33
//go:embed motd
34
+
var defaultMotd []byte
35
36
const (
37
rbacDomain = "thisserver"
···
48
cfg *config.Config
49
ks *eventconsumer.Consumer
50
res *idresolver.Resolver
51
+
vault secrets.Manager
52
+
motd []byte
53
+
motdMu sync.RWMutex
54
}
55
56
// New creates a new Spindle server with the provided configuration and engines.
···
131
cfg: cfg,
132
res: resolver,
133
vault: vault,
134
+
motd: defaultMotd,
135
}
136
137
err = e.AddSpindle(rbacDomain)
···
205
return s.e
206
}
207
208
+
// SetMotdContent sets custom MOTD content, replacing the embedded default.
209
+
func (s *Spindle) SetMotdContent(content []byte) {
210
+
s.motdMu.Lock()
211
+
defer s.motdMu.Unlock()
212
+
s.motd = content
213
+
}
214
+
215
+
// GetMotdContent returns the current MOTD content.
216
+
func (s *Spindle) GetMotdContent() []byte {
217
+
s.motdMu.RLock()
218
+
defer s.motdMu.RUnlock()
219
+
return s.motd
220
+
}
221
+
222
// Start starts the Spindle server (blocking).
223
func (s *Spindle) Start(ctx context.Context) error {
224
// starts a job queue runner in the background
···
264
mux := chi.NewRouter()
265
266
mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
267
+
w.Write(s.GetMotdContent())
268
})
269
mux.HandleFunc("/events", s.Events)
270
mux.HandleFunc("/logs/{knot}/{rkey}/{name}", s.Logs)
+3
types/diff.go
+3
types/diff.go
+112
types/diff_test.go
+112
types/diff_test.go
···
···
1
+
package types
2
+
3
+
import "testing"
4
+
5
+
func TestDiffId(t *testing.T) {
6
+
tests := []struct {
7
+
name string
8
+
diff Diff
9
+
expected string
10
+
}{
11
+
{
12
+
name: "regular file uses new name",
13
+
diff: Diff{
14
+
Name: struct {
15
+
Old string `json:"old"`
16
+
New string `json:"new"`
17
+
}{Old: "", New: "src/main.go"},
18
+
},
19
+
expected: "src/main.go",
20
+
},
21
+
{
22
+
name: "new file uses new name",
23
+
diff: Diff{
24
+
Name: struct {
25
+
Old string `json:"old"`
26
+
New string `json:"new"`
27
+
}{Old: "", New: "src/new.go"},
28
+
IsNew: true,
29
+
},
30
+
expected: "src/new.go",
31
+
},
32
+
{
33
+
name: "deleted file uses old name",
34
+
diff: Diff{
35
+
Name: struct {
36
+
Old string `json:"old"`
37
+
New string `json:"new"`
38
+
}{Old: "src/deleted.go", New: ""},
39
+
IsDelete: true,
40
+
},
41
+
expected: "src/deleted.go",
42
+
},
43
+
{
44
+
name: "renamed file uses new name",
45
+
diff: Diff{
46
+
Name: struct {
47
+
Old string `json:"old"`
48
+
New string `json:"new"`
49
+
}{Old: "src/old.go", New: "src/renamed.go"},
50
+
IsRename: true,
51
+
},
52
+
expected: "src/renamed.go",
53
+
},
54
+
}
55
+
56
+
for _, tt := range tests {
57
+
t.Run(tt.name, func(t *testing.T) {
58
+
if got := tt.diff.Id(); got != tt.expected {
59
+
t.Errorf("Diff.Id() = %q, want %q", got, tt.expected)
60
+
}
61
+
})
62
+
}
63
+
}
64
+
65
+
func TestChangedFilesMatchesDiffId(t *testing.T) {
66
+
// ChangedFiles() must return values matching each Diff's Id()
67
+
// so that sidebar links point to the correct anchors.
68
+
// Tests existing, deleted, new, and renamed files.
69
+
nd := NiceDiff{
70
+
Diff: []Diff{
71
+
{
72
+
Name: struct {
73
+
Old string `json:"old"`
74
+
New string `json:"new"`
75
+
}{Old: "", New: "src/modified.go"},
76
+
},
77
+
{
78
+
Name: struct {
79
+
Old string `json:"old"`
80
+
New string `json:"new"`
81
+
}{Old: "src/deleted.go", New: ""},
82
+
IsDelete: true,
83
+
},
84
+
{
85
+
Name: struct {
86
+
Old string `json:"old"`
87
+
New string `json:"new"`
88
+
}{Old: "", New: "src/new.go"},
89
+
IsNew: true,
90
+
},
91
+
{
92
+
Name: struct {
93
+
Old string `json:"old"`
94
+
New string `json:"new"`
95
+
}{Old: "src/old.go", New: "src/renamed.go"},
96
+
IsRename: true,
97
+
},
98
+
},
99
+
}
100
+
101
+
changedFiles := nd.ChangedFiles()
102
+
103
+
if len(changedFiles) != len(nd.Diff) {
104
+
t.Fatalf("ChangedFiles() returned %d items, want %d", len(changedFiles), len(nd.Diff))
105
+
}
106
+
107
+
for i, diff := range nd.Diff {
108
+
if changedFiles[i] != diff.Id() {
109
+
t.Errorf("ChangedFiles()[%d] = %q, but Diff.Id() = %q", i, changedFiles[i], diff.Id())
110
+
}
111
+
}
112
+
}