comparing 06f79a0a3b0971c014812d38b6889bc10b5311d3 and push-nupxprsykpzq on veryroundbird.house/core

+8 -4

appview/db/issues.go

···

       359
       359
        
       		repoMap[string(repos[i].RepoAt())] = &repos[i]

     

       360
       360
        
       	}

     

       361
       361
        
       

     

       362
       362
       -
       	for issueAt := range issueMap {

     

       363
       363
       -
       		i := issueMap[issueAt]

     

       364
       364
       -
       		r := repoMap[string(i.RepoAt)]

     

       365
       365
       -
       		i.Repo = r

     

       362
       362
       +
       	for issueAt, i := range issueMap {

     

       363
       363
       +
       		if r, ok := repoMap[string(i.RepoAt)]; ok {

     

       364
       364
       +
       			i.Repo = r

     

       365
       365
       +
       		} else {

     

       366
       366
       +
       			// do not show up the issue if the repo is deleted

     

       367
       367
       +
       			// TODO: foreign key where?

     

       368
       368
       +
       			delete(issueMap, issueAt)

     

       369
       369
       +
       		}

     

       366
       370
        
       	}

     

       367
       371
        
       

     

       368
       372
        
       	// collect comments

+2 -2

appview/db/profile.go

···

       553
       553
        
       		query = `select count(id) from pulls where owner_did = ? and state = ?`

     

       554
       554
        
       		args = append(args, did, PullOpen)

     

       555
       555
        
       	case VanityStatOpenIssueCount:

     

       556
       556
       -
       		query = `select count(id) from issues where owner_did = ? and open = 1`

     

       556
       556
       +
       		query = `select count(id) from issues where did = ? and open = 1`

     

       557
       557
        
       		args = append(args, did)

     

       558
       558
        
       	case VanityStatClosedIssueCount:

     

       559
       559
       -
       		query = `select count(id) from issues where owner_did = ? and open = 0`

     

       559
       559
       +
       		query = `select count(id) from issues where did = ? and open = 0`

     

       560
       560
        
       		args = append(args, did)

     

       561
       561
        
       	case VanityStatRepositoryCount:

     

       562
       562
        
       		query = `select count(id) from repos where did = ?`

+1 -1

appview/pages/markup/markdown.go

···

       235
       235
        
       	repoName := fmt.Sprintf("%s/%s", rctx.RepoInfo.OwnerDid, rctx.RepoInfo.Name)

     

       236
       236
        
       

     

       237
       237
        
       	query := fmt.Sprintf("repo=%s&ref=%s&path=%s&raw=true",

     

       238
       238
       -
       		repoName, url.PathEscape(rctx.RepoInfo.Ref), actualPath)

     

       238
       238
       +
       		url.PathEscape(repoName), url.PathEscape(rctx.RepoInfo.Ref), actualPath)

     

       239
       239
        
       

     

       240
       240
        
       	parsedURL := &url.URL{

     

       241
       241
        
       		Scheme:   scheme,

+1 -1

appview/pages/templates/banner.html

···

       30
       30
        
           <div class="mx-6">

     

       31
       31
        
             These services may not be fully accessible until upgraded.

     

       32
       32
        
             <a class="underline text-red-800 dark:text-red-200"

     

       33
       33
       -
               href="https://tangled.sh/@tangled.sh/core/tree/master/docs/migrations/">

     

       33
       33
       +
               href="https://tangled.sh/@tangled.sh/core/tree/master/docs/migrations.md">

     

       34
       34
        
               Click to read the upgrade guide</a>.

     

       35
       35
        
           </div>

     

       36
       36
        
         </details>

+1 -2

appview/repo/repo.go

···

       11
       11
        
       	"log/slog"

     

       12
       12
        
       	"net/http"

     

       13
       13
        
       	"net/url"

     

       14
       14
       -
       	"path"

     

       15
       14
        
       	"path/filepath"

     

       16
       15
        
       	"slices"

     

       17
       16
        
       	"strconv"

     
···

       710
       709
        
       		}

     

       711
       710
        
       

     

       712
       711
        
       		// fetch the raw binary content using sh.tangled.repo.blob xrpc

     

       713
       713
       -
       		repoName := path.Join("%s/%s", f.OwnerDid(), f.Name)

     

       712
       712
       +
       		repoName := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Name)

     

       714
       713
        
       		blobURL := fmt.Sprintf("%s://%s/xrpc/sh.tangled.repo.blob?repo=%s&ref=%s&path=%s&raw=true",

     

       715
       714
        
       			scheme, f.Knot, url.QueryEscape(repoName), url.QueryEscape(ref), url.QueryEscape(filePath))

     

       716
       715

+10 -9

appview/state/profile.go

···

       17
       17
        
       	"github.com/gorilla/feeds"

     

       18
       18
        
       	"tangled.sh/tangled.sh/core/api/tangled"

     

       19
       19
        
       	"tangled.sh/tangled.sh/core/appview/db"

     

       20
       20
       -
       	// "tangled.sh/tangled.sh/core/appview/oauth"

     

       21
       20
        
       	"tangled.sh/tangled.sh/core/appview/pages"

     

       22
       21
        
       )

     

       23
       22
        
       

     
···

       284
       283
        
       	l = l.With("profileDid", profile.UserDid, "profileHandle", profile.UserHandle)

     

       285
       284
        
       

     

       286
       285
        
       	loggedInUser := s.oauth.GetUser(r)

     

       286
       286
       +
       	params := FollowsPageParams{

     

       287
       287
       +
       		Card: profile,

     

       288
       288
       +
       	}

     

       287
       289
        
       

     

       288
       290
        
       	follows, err := fetchFollows(s.db, profile.UserDid)

     

       289
       291
        
       	if err != nil {

     

       290
       292
        
       		l.Error("failed to fetch follows", "err", err)

     

       291
       291
       -
       		return nil, err

     

       293
       293
       +
       		return &params, err

     

       292
       294
        
       	}

     

       293
       295
        
       

     

       294
       296
        
       	if len(follows) == 0 {

     

       295
       295
       -
       		return nil, nil

     

       297
       297
       +
       		return &params, nil

     

       296
       298
        
       	}

     

       297
       299
        
       

     

       298
       300
        
       	followDids := make([]string, 0, len(follows))

     
···

       303
       305
        
       	profiles, err := db.GetProfiles(s.db, db.FilterIn("did", followDids))

     

       304
       306
        
       	if err != nil {

     

       305
       307
        
       		l.Error("failed to get profiles", "followDids", followDids, "err", err)

     

       306
       306
       -
       		return nil, err

     

       308
       308
       +
       		return &params, err

     

       307
       309
        
       	}

     

       308
       310
        
       

     

       309
       311
        
       	followStatsMap, err := db.GetFollowerFollowingCounts(s.db, followDids)

     
···

       316
       318
        
       		following, err := db.GetFollowing(s.db, loggedInUser.Did)

     

       317
       319
        
       		if err != nil {

     

       318
       320
        
       			l.Error("failed to get follow list", "err", err, "loggedInUser", loggedInUser.Did)

     

       319
       319
       -
       			return nil, err

     

       321
       321
       +
       			return &params, err

     

       320
       322
        
       		}

     

       321
       323
        
       		loggedInUserFollowing = make(map[string]struct{}, len(following))

     

       322
       324
        
       		for _, follow := range following {

     
···

       350
       352
        
       		}

     

       351
       353
        
       	}

     

       352
       354
        
       

     

       353
       353
       -
       	return &FollowsPageParams{

     

       354
       354
       -
       		Follows: followCards,

     

       355
       355
       -
       		Card:    profile,

     

       356
       356
       -
       	}, nil

     

       355
       355
       +
       	params.Follows = followCards

     

       356
       356
       +
       

     

       357
       357
       +
       	return &params, nil

     

       357
       358
        
       }

     

       358
       359
        
       

     

       359
       360
        
       func (s *State) followersPage(w http.ResponseWriter, r *http.Request) {

-35

docs/migrations/knot-1.7.0.md

···

       1
       1
       -
       # Upgrading from v1.7.0

     

       2
       2
       -
       

     

       3
       3
       -
       After v1.7.0, knot secrets have been deprecated. You no

     

       4
       4
       -
       longer need a secret from the appview to run a knot. All

     

       5
       5
       -
       authorized commands to knots are managed via [Inter-Service

     

       6
       6
       -
       Authentication](https://atproto.com/specs/xrpc#inter-service-authentication-jwt).

     

       7
       7
       -
       Knots will be read-only until upgraded.

     

       8
       8
       -
       

     

       9
       9
       -
       Upgrading is quite easy, in essence:

     

       10
       10
       -
       

     

       11
       11
       -
       - `KNOT_SERVER_SECRET` is no more, you can remove this

     

       12
       12
       -
         environment variable entirely

     

       13
       13
       -
       - `KNOT_SERVER_OWNER` is now required on boot, set this to

     

       14
       14
       -
         your DID. You can find your DID in the

     

       15
       15
       -
         [settings](https://tangled.sh/settings) page.

     

       16
       16
       -
       - Restart your knot once you have replaced the environment

     

       17
       17
       -
         variable

     

       18
       18
       -
       - Head to the [knot dashboard](https://tangled.sh/knots) and

     

       19
       19
       -
         hit the "retry" button to verify your knot. This simply

     

       20
       20
       -
         writes a `sh.tangled.knot` record to your PDS.

     

       21
       21
       -
       

     

       22
       22
       -
       ## Nix

     

       23
       23
       -
       

     

       24
       24
       -
       If you use the nix module, simply bump the flake to the

     

       25
       25
       -
       latest revision, and change your config block like so:

     

       26
       26
       -
       

     

       27
       27
       -
       ```diff

     

       28
       28
       -
        services.tangled-knot = {

     

       29
       29
       -
          enable = true;

     

       30
       30
       -
          server = {

     

       31
       31
       -
       -    secretFile = /path/to/secret;

     

       32
       32
       -
       +    owner = "did:plc:foo";

     

       33
       33
       -
          };

     

       34
       34
       -
        };

     

       35
       35
       -
       ```

+60

docs/migrations.md

···

       1
       1
       +
       # Migrations

     

       2
       2
       +
       

     

       3
       3
       +
       This document is laid out in reverse-chronological order.

     

       4
       4
       +
       Newer migration guides are listed first, and older guides

     

       5
       5
       +
       are further down the page.

     

       6
       6
       +
       

     

       7
       7
       +
       ## Upgrading from v1.8.x

     

       8
       8
       +
       

     

       9
       9
       +
       After v1.8.2, the HTTP API for knot and spindles have been

     

       10
       10
       +
       deprecated and replaced with XRPC. Repositories on outdated

     

       11
       11
       +
       knots will not be viewable from the appview. Upgrading is

     

       12
       12
       +
       straightforward however.

     

       13
       13
       +
       

     

       14
       14
       +
       For knots:

     

       15
       15
       +
       

     

       16
       16
       +
       - Upgrade to latest tag (v1.9.0 or above)

     

       17
       17
       +
       - Head to the [knot dashboard](https://tangled.sh/knots) and

     

       18
       18
       +
         hit the "retry" button to verify your knot

     

       19
       19
       +
       

     

       20
       20
       +
       For spindles:

     

       21
       21
       +
       

     

       22
       22
       +
       - Upgrade to latest tag (v1.9.0 or above)

     

       23
       23
       +
       - Head to the [spindle

     

       24
       24
       +
         dashboard](https://tangled.sh/spindles) and hit the

     

       25
       25
       +
         "retry" button to verify your spindle

     

       26
       26
       +
       

     

       27
       27
       +
       ## Upgrading from v1.7.x

     

       28
       28
       +
       

     

       29
       29
       +
       After v1.7.0, knot secrets have been deprecated. You no

     

       30
       30
       +
       longer need a secret from the appview to run a knot. All

     

       31
       31
       +
       authorized commands to knots are managed via [Inter-Service

     

       32
       32
       +
       Authentication](https://atproto.com/specs/xrpc#inter-service-authentication-jwt).

     

       33
       33
       +
       Knots will be read-only until upgraded.

     

       34
       34
       +
       

     

       35
       35
       +
       Upgrading is quite easy, in essence:

     

       36
       36
       +
       

     

       37
       37
       +
       - `KNOT_SERVER_SECRET` is no more, you can remove this

     

       38
       38
       +
         environment variable entirely

     

       39
       39
       +
       - `KNOT_SERVER_OWNER` is now required on boot, set this to

     

       40
       40
       +
         your DID. You can find your DID in the

     

       41
       41
       +
         [settings](https://tangled.sh/settings) page.

     

       42
       42
       +
       - Restart your knot once you have replaced the environment

     

       43
       43
       +
         variable

     

       44
       44
       +
       - Head to the [knot dashboard](https://tangled.sh/knots) and

     

       45
       45
       +
         hit the "retry" button to verify your knot. This simply

     

       46
       46
       +
         writes a `sh.tangled.knot` record to your PDS.

     

       47
       47
       +
       

     

       48
       48
       +
       If you use the nix module, simply bump the flake to the

     

       49
       49
       +
       latest revision, and change your config block like so:

     

       50
       50
       +
       

     

       51
       51
       +
       ```diff

     

       52
       52
       +
        services.tangled-knot = {

     

       53
       53
       +
          enable = true;

     

       54
       54
       +
          server = {

     

       55
       55
       +
       -    secretFile = /path/to/secret;

     

       56
       56
       +
       +    owner = "did:plc:foo";

     

       57
       57
       +
          };

     

       58
       58
       +
        };

     

       59
       59
       +
       ```

     

       60
       60
       +

+1

knotserver/xrpc/repo_blob.go

···

       69
       69
        
       				return

     

       70
       70
        
       			}

     

       71
       71
        
       			w.Header().Set("ETag", eTag)

     

       72
       72
       +
       			w.Header().Set("Content-Type", mimeType)

     

       72
       73
        
       

     

       73
       74
        
       		case strings.HasPrefix(mimeType, "text/"):

     

       74
       75
        
       			w.Header().Set("Cache-Control", "public, no-cache")

+8 -6

knotserver/xrpc/repo_branches.go

···

       20
       20
        
       

     

       21
       21
        
       	cursor := r.URL.Query().Get("cursor")

     

       22
       22
        
       

     

       23
       23
       -
       	limit := 50 // default

     

       24
       24
       -
       	if limitStr := r.URL.Query().Get("limit"); limitStr != "" {

     

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

     

       26
       26
       -
       			limit = l

     

       27
       27
       -
       		}

     

       28
       28
       -
       	}

     

       23
       23
       +
       	// limit := 50 // default

     

       24
       24
       +
       	// if limitStr := r.URL.Query().Get("limit"); limitStr != "" {

     

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

     

       26
       26
       +
       	// 		limit = l

     

       27
       27
       +
       	// 	}

     

       28
       28
       +
       	// }

     

       29
       29
       +
       

     

       30
       30
       +
       	limit := 500

     

       29
       31
        
       

     

       30
       32
        
       	gr, err := git.PlainOpen(repoPath)

     

       31
       33
        
       	if err != nil {

+2 -3

nix/pkgs/knot-unwrapped.nix

···

       4
       4
        
         sqlite-lib,

     

       5
       5
        
         src,

     

       6
       6
        
       }: let

     

       7
       7
       -
         version = "1.8.1-alpha";

     

       7
       7
       +
         version = "1.9.0-alpha";

     

       8
       8
        
       in

     

       9
       9
        
         buildGoApplication {

     

       10
       10
        
           pname = "knot";

     

       11
       11
       -
           version = "1.8.1";

     

       12
       12
       -
           inherit src modules;

     

       11
       11
       +
           inherit src version modules;

     

       13
       12
        
       

     

       14
       13
        
           doCheck = false;

     

       15
       14

Compare changes