comparing 792c658c3b86d4f3bc8f4dd9faad27e4cd5bbb29 and push-yqnqquktxqpx on veryroundbird.house/core

-157

appview/db/issues.go

···

       391
       391
        
       	return issues, nil

     

       392
       392
        
       }

     

       393
       393
        
       

     

       394
       394
       -
       func GetIssuesWithLimit(e Execer, limit int, filters ...filter) ([]Issue, error) {

     

       395
       395
       -
       	issues := make([]Issue, 0, limit)

     

       396
       396
       -
       

     

       397
       397
       -
       	var conditions []string

     

       398
       398
       -
       	var args []any

     

       399
       399
       -
       	for _, filter := range filters {

     

       400
       400
       -
       		conditions = append(conditions, filter.Condition())

     

       401
       401
       -
       		args = append(args, filter.Arg()...)

     

       402
       402
       -
       	}

     

       403
       403
       -
       

     

       404
       404
       -
       	whereClause := ""

     

       405
       405
       -
       	if conditions != nil {

     

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

     

       407
       407
       -
       	}

     

       408
       408
       -
       	limitClause := ""

     

       409
       409
       -
       	if limit != 0 {

     

       410
       410
       -
       		limitClause = fmt.Sprintf(" limit %d ", limit)

     

       411
       411
       -
       	}

     

       412
       412
       -
       

     

       413
       413
       -
       	query := fmt.Sprintf(

     

       414
       414
       -
       		`select

     

       415
       415
       -
       			i.id,

     

       416
       416
       -
       			i.owner_did,

     

       417
       417
       -
       			i.repo_at,

     

       418
       418
       -
       			i.issue_id,

     

       419
       419
       -
       			i.created,

     

       420
       420
       -
       			i.title,

     

       421
       421
       -
       			i.body,

     

       422
       422
       -
       			i.open

     

       423
       423
       -
       		from

     

       424
       424
       -
       		    issues i

     

       425
       425
       -
       		%s

     

       426
       426
       -
       		order by

     

       427
       427
       -
       			i.created desc

     

       428
       428
       -
       		%s`,

     

       429
       429
       -
       		whereClause, limitClause)

     

       430
       430
       -
       

     

       431
       431
       -
       	rows, err := e.Query(query, args...)

     

       432
       432
       -
       	if err != nil {

     

       433
       433
       -
       		return nil, err

     

       434
       434
       -
       	}

     

       435
       435
       -
       	defer rows.Close()

     

       436
       436
       -
       

     

       437
       437
       -
       	for rows.Next() {

     

       438
       438
       -
       		var issue Issue

     

       439
       439
       -
       		var issueCreatedAt string

     

       440
       440
       -
       		err := rows.Scan(

     

       441
       441
       -
       			&issue.Id,

     

       442
       442
       -
       			&issue.Did,

     

       443
       443
       -
       			&issue.RepoAt,

     

       444
       444
       -
       			&issue.IssueId,

     

       445
       445
       -
       			&issueCreatedAt,

     

       446
       446
       -
       			&issue.Title,

     

       447
       447
       -
       			&issue.Body,

     

       448
       448
       -
       			&issue.Open,

     

       449
       449
       -
       		)

     

       450
       450
       -
       		if err != nil {

     

       451
       451
       -
       			return nil, err

     

       452
       452
       -
       		}

     

       453
       453
       -
       

     

       454
       454
       -
       		issueCreatedTime, err := time.Parse(time.RFC3339, issueCreatedAt)

     

       455
       455
       -
       		if err != nil {

     

       456
       456
       -
       			return nil, err

     

       457
       457
       -
       		}

     

       458
       458
       -
       		issue.Created = issueCreatedTime

     

       459
       459
       -
       

     

       460
       460
       -
       		issues = append(issues, issue)

     

       461
       461
       -
       	}

     

       462
       462
       -
       

     

       463
       463
       -
       	if err := rows.Err(); err != nil {

     

       464
       464
       -
       		return nil, err

     

       465
       465
       -
       	}

     

       466
       466
       -
       

     

       467
       467
       -
       	return issues, nil

     

       468
       468
       -
       }

     

       469
       469
       -
       

     

       470
       394
        
       func GetIssues(e Execer, filters ...filter) ([]Issue, error) {

     

       471
       395
        
       	return GetIssuesPaginated(e, pagination.FirstPage(), filters...)

     

       472
       472
       -
       }

     

       473
       473
       -
       

     

       474
       474
       -
       // timeframe here is directly passed into the sql query filter, and any

     

       475
       475
       -
       // timeframe in the past should be negative; e.g.: "-3 months"

     

       476
       476
       -
       func GetIssuesByOwnerDid(e Execer, ownerDid string, timeframe string) ([]Issue, error) {

     

       477
       477
       -
       	var issues []Issue

     

       478
       478
       -
       

     

       479
       479
       -
       	rows, err := e.Query(

     

       480
       480
       -
       		`select

     

       481
       481
       -
       			i.id,

     

       482
       482
       -
       			i.owner_did,

     

       483
       483
       -
       			i.rkey,

     

       484
       484
       -
       			i.repo_at,

     

       485
       485
       -
       			i.issue_id,

     

       486
       486
       -
       			i.created,

     

       487
       487
       -
       			i.title,

     

       488
       488
       -
       			i.body,

     

       489
       489
       -
       			i.open,

     

       490
       490
       -
       			r.did,

     

       491
       491
       -
       			r.name,

     

       492
       492
       -
       			r.knot,

     

       493
       493
       -
       			r.rkey,

     

       494
       494
       -
       			r.created

     

       495
       495
       -
       		from

     

       496
       496
       -
       		    issues i

     

       497
       497
       -
       		join

     

       498
       498
       -
       			repos r on i.repo_at = r.at_uri

     

       499
       499
       -
       		where

     

       500
       500
       -
       			i.owner_did = ? and i.created >= date ('now', ?)

     

       501
       501
       -
       		order by

     

       502
       502
       -
       			i.created desc`,

     

       503
       503
       -
       		ownerDid, timeframe)

     

       504
       504
       -
       	if err != nil {

     

       505
       505
       -
       		return nil, err

     

       506
       506
       -
       	}

     

       507
       507
       -
       	defer rows.Close()

     

       508
       508
       -
       

     

       509
       509
       -
       	for rows.Next() {

     

       510
       510
       -
       		var issue Issue

     

       511
       511
       -
       		var issueCreatedAt, repoCreatedAt string

     

       512
       512
       -
       		var repo Repo

     

       513
       513
       -
       		err := rows.Scan(

     

       514
       514
       -
       			&issue.Id,

     

       515
       515
       -
       			&issue.Did,

     

       516
       516
       -
       			&issue.Rkey,

     

       517
       517
       -
       			&issue.RepoAt,

     

       518
       518
       -
       			&issue.IssueId,

     

       519
       519
       -
       			&issueCreatedAt,

     

       520
       520
       -
       			&issue.Title,

     

       521
       521
       -
       			&issue.Body,

     

       522
       522
       -
       			&issue.Open,

     

       523
       523
       -
       			&repo.Did,

     

       524
       524
       -
       			&repo.Name,

     

       525
       525
       -
       			&repo.Knot,

     

       526
       526
       -
       			&repo.Rkey,

     

       527
       527
       -
       			&repoCreatedAt,

     

       528
       528
       -
       		)

     

       529
       529
       -
       		if err != nil {

     

       530
       530
       -
       			return nil, err

     

       531
       531
       -
       		}

     

       532
       532
       -
       

     

       533
       533
       -
       		issueCreatedTime, err := time.Parse(time.RFC3339, issueCreatedAt)

     

       534
       534
       -
       		if err != nil {

     

       535
       535
       -
       			return nil, err

     

       536
       536
       -
       		}

     

       537
       537
       -
       		issue.Created = issueCreatedTime

     

       538
       538
       -
       

     

       539
       539
       -
       		repoCreatedTime, err := time.Parse(time.RFC3339, repoCreatedAt)

     

       540
       540
       -
       		if err != nil {

     

       541
       541
       -
       			return nil, err

     

       542
       542
       -
       		}

     

       543
       543
       -
       		repo.Created = repoCreatedTime

     

       544
       544
       -
       

     

       545
       545
       -
       		issues = append(issues, issue)

     

       546
       546
       -
       	}

     

       547
       547
       -
       

     

       548
       548
       -
       	if err := rows.Err(); err != nil {

     

       549
       549
       -
       		return nil, err

     

       550
       550
       -
       	}

     

       551
       551
       -
       

     

       552
       552
       -
       	return issues, nil

     

       553
       396
        
       }

     

       554
       397
        
       

     

       555
       398
        
       func GetIssue(e Execer, repoAt syntax.ATURI, issueId int) (*Issue, error) {

+7 -3

appview/db/profile.go

···

       132
       132
        
       		*items = append(*items, &pull)

     

       133
       133
        
       	}

     

       134
       134
        
       

     

       135
       135
       -
       	issues, err := GetIssuesByOwnerDid(e, forDid, timeframe)

     

       135
       135
       +
       	issues, err := GetIssues(

     

       136
       136
       +
       		e,

     

       137
       137
       +
       		FilterEq("did", forDid),

     

       138
       138
       +
       		FilterGte("created", time.Now().AddDate(0, -TimeframeMonths, 0)),

     

       139
       139
       +
       	)

     

       136
       140
        
       	if err != nil {

     

       137
       141
        
       		return nil, fmt.Errorf("error getting issues by owner did: %w", err)

     

       138
       142
        
       	}

     
···

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

     

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

     

       551
       555
        
       	case VanityStatOpenIssueCount:

     

       552
       552
       -
       		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`

     

       553
       557
        
       		args = append(args, did)

     

       554
       558
        
       	case VanityStatClosedIssueCount:

     

       555
       555
       -
       		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`

     

       556
       560
        
       		args = append(args, did)

     

       557
       561
        
       	case VanityStatRepositoryCount:

     

       558
       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>

appview/pages/templates/fragments/logotype.html

···

       1
       1
       +
       {{ define "fragments/logotype" }}

     

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

     

       3
       3
       +
           <span class="font-bold italic">tangled</span>

     

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

     

       5
       5
       +
             alpha

     

       6
       6
       +
           </span>

     

       7
       7
       +
         <span>

     

       8
       8
       +
       {{ end }}

+3 -6

appview/pages/templates/knots/index.html

···

       1
       1
        
       {{ define "title" }}knots{{ end }}

     

       2
       2
        
       

     

       3
       3
        
       {{ define "content" }}

     

       4
       4
       -
       <div class="px-6 py-4 flex items-end justify-start gap-4 align-bottom">

     

       4
       4
       +
       <div class="px-6 py-4 flex items-center justify-between gap-4 align-bottom">

     

       5
       5
        
         <h1 class="text-xl font-bold dark:text-white">Knots</h1>

     

       6
       6
       -
       

     

       7
       7
       -
         <span class="flex items-center gap-1 text-sm">

     

       6
       6
       +
         <span class="flex items-center gap-1">

     

       8
       7
        
             {{ i "book" "w-3 h-3" }}

     

       9
       9
       -
             <a href="https://tangled.sh/@tangled.sh/core/blob/master/docs/knot-hosting.md">

     

       10
       10
       -
                 docs

     

       11
       11
       -
             </a>

     

       8
       8
       +
             <a href="https://tangled.sh/@tangled.sh/core/blob/master/docs/knot-hosting.md">docs</a>

     

       12
       9
        
         </span>

     

       13
       10
        
       </div>

     

       14
       11

+4 -4

appview/pages/templates/layouts/base.html

···

       21
       21
        
                   <title>{{ block "title" . }}{{ end }} · tangled</title>

     

       22
       22
        
                   {{ block "extrameta" . }}{{ end }}

     

       23
       23
        
               </head>

     

       24
       24
       -
               <body class="min-h-screen grid grid-cols-1 grid-rows-[min-content_auto_min-content] md:grid-cols-12 gap-4 bg-slate-100 dark:bg-gray-900 dark:text-white transition-colors duration-200">

     

       24
       24
       +
               <body class="min-h-screen grid grid-cols-1 grid-rows-[min-content_auto_min-content] md:grid-cols-10 lg:grid-cols-12 gap-4 bg-slate-100 dark:bg-gray-900 dark:text-white transition-colors duration-200">

     

       25
       25
        
                 {{ block "topbarLayout" . }}

     

       26
       26
       -
                   <header class="px-1 col-span-1 md:col-start-3 md:col-span-8" style="z-index: 20;">

     

       26
       26
       +
                   <header class="px-1 col-span-1 md:col-start-2 md:col-span-8 lg:col-start-3" style="z-index: 20;">

     

       27
       27
        
       

     

       28
       28
        
                      {{ if .LoggedInUser }}

     

       29
       29
        
                       <div id="upgrade-banner"

     
···

       37
       37
        
                 {{ end }}

     

       38
       38
        
       

     

       39
       39
        
                 {{ block "mainLayout" . }}

     

       40
       40
       -
                   <div class="px-1 col-span-1 md:col-start-3 md:col-span-8 flex flex-col gap-4">

     

       40
       40
       +
                   <div class="px-1 col-span-1 md:col-start-2 md:col-span-8 lg:col-start-3 flex flex-col gap-4">

     

       41
       41
        
                     {{ block "contentLayout" . }}

     

       42
       42
        
                       <main class="col-span-1 md:col-span-8">

     

       43
       43
        
                         {{ block "content" . }}{{ end }}

     
···

       53
       53
        
                 {{ end }}

     

       54
       54
        
       

     

       55
       55
        
                 {{ block "footerLayout" . }}

     

       56
       56
       -
                   <footer class="px-1 col-span-1 md:col-start-3 md:col-span-8 mt-12">

     

       56
       56
       +
                   <footer class="px-1 col-span-1 md:col-start-2 md:col-span-8 lg:col-start-3 mt-12">

     

       57
       57
        
                     {{ template "layouts/fragments/footer" . }}

     

       58
       58
        
                   </footer>

     

       59
       59
        
                 {{ end }}

+1 -3

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

···

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

     

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

     

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

     

       5
       5
       -
                       <a href="/" hx-boost="true" class="flex gap-2 font-bold italic">

     

       6
       6
       -
                         tangled<sub>alpha</sub>

     

       7
       7
       -
                       </a>

     

       5
       5
       +
                     <a href="/" hx-boost="true" class="text-lg">{{ template "fragments/logotype" }}</a>

     

       8
       6
        
                   </div>

     

       9
       7
        
       

     

       10
       8
        
                   <div id="right-items" class="flex items-center gap-2">

+3 -3

appview/pages/templates/repo/tree.html

···

       25
       25
        
             <div class="flex flex-col md:flex-row md:justify-between gap-2">

     

       26
       26
        
               <div id="breadcrumbs" class="overflow-x-auto whitespace-nowrap text-gray-400 dark:text-gray-500">

     

       27
       27
        
                 {{ range .BreadCrumbs }}

     

       28
       28
       -
                   <a href="{{ index . 1}}" class="text-bold text-gray-500 dark:text-gray-400 {{ $linkstyle }}">{{ pathUnescape (index . 0) }}</a> /

     

       28
       28
       +
                   <a href="{{ index . 1 }}" class="text-bold text-gray-500 dark:text-gray-400 {{ $linkstyle }}">{{ pathUnescape (index . 0) }}</a> /

     

       29
       29
        
                 {{ end }}

     

       30
       30
        
               </div>

     

       31
       31
        
               <div id="dir-info" class="text-gray-500 dark:text-gray-400 text-xs md:text-sm flex flex-wrap items-center gap-1 md:gap-0">

     

       32
       32
        
                 {{ $stats := .TreeStats }}

     

       33
       33
        
       

     

       34
       34
       -
                 <span>at <a href="/{{ $.RepoInfo.FullName }}/tree/{{ $.Ref }}">{{ $.Ref }}</a></span>

     

       34
       34
       +
                 <span>at <a href="/{{ $.RepoInfo.FullName }}/tree/{{ pathEscape $.Ref }}">{{ $.Ref }}</a></span>

     

       35
       35
        
                 {{ if eq $stats.NumFolders 1 }}

     

       36
       36
        
                   <span class="select-none px-1 md:px-2 [&:before]:content-['·']"></span>

     

       37
       37
        
                   <span>{{ $stats.NumFolders }} folder</span>

     
···

       55
       55
        
           {{ range .Files }}

     

       56
       56
        
             <div class="grid grid-cols-12 gap-4 items-center py-1">

     

       57
       57
        
               <div class="col-span-8 md:col-span-4">

     

       58
       58
       -
                 {{ $link := printf "/%s/%s/%s/%s/%s" $.RepoInfo.FullName "tree" (urlquery $.Ref) $.TreePath .Name }}

     

       58
       58
       +
                 {{ $link := printf "/%s/%s/%s/%s/%s" $.RepoInfo.FullName "tree" (pathEscape $.Ref) $.TreePath .Name }}

     

       59
       59
        
                 {{ $icon := "folder" }}

     

       60
       60
        
                 {{ $iconStyle := "size-4 fill-current" }}

     

       61
       61

+3 -7

appview/pages/templates/spindles/index.html

···

       1
       1
        
       {{ define "title" }}spindles{{ end }}

     

       2
       2
        
       

     

       3
       3
        
       {{ define "content" }}

     

       4
       4
       -
       <div class="px-6 py-4 flex items-end justify-start gap-4 align-bottom">

     

       4
       4
       +
       <div class="px-6 py-4 flex items-center justify-between gap-4 align-bottom">

     

       5
       5
        
           <h1 class="text-xl font-bold dark:text-white">Spindles</h1>

     

       6
       6
       -
       

     

       7
       7
       -
       

     

       8
       8
       -
           <span class="flex items-center gap-1 text-sm">

     

       6
       6
       +
           <span class="flex items-center gap-1">

     

       9
       7
        
               {{ i "book" "w-3 h-3" }}

     

       10
       10
       -
               <a href="https://tangled.sh/@tangled.sh/core/blob/master/docs/spindle/hosting.md">

     

       11
       11
       -
                   docs

     

       12
       12
       -
               </a>

     

       8
       8
       +
               <a href="https://tangled.sh/@tangled.sh/core/blob/master/docs/spindle/hosting.md">docs</a>

     

       13
       9
        
           </span>

     

       14
       10
        
       </div>

     

       15
       11

+1 -1

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

···

       23
       23
        
       

     

       24
       24
        
               <figure class="w-full hidden md:block md:w-auto">

     

       25
       25
        
                   <a href="https://tangled.sh/@tangled.sh/core" class="block">

     

       26
       26
       -
                       <img src="https://assets.tangled.network/hero-repo.png" alt="Screenshot of the Tangled monorepo." class="max-w-md mx-auto md:max-w-none w-full md:w-[30vw] h-auto shadow-sm rounded hover:shadow-md transition-shadow" />

     

       26
       26
       +
                       <img src="https://assets.tangled.network/hero-repo.png" alt="Screenshot of the Tangled monorepo." class="max-w-md mx-auto md:max-w-none w-full md:w-[30vw] h-auto shadow-sm rounded" />

     

       27
       27
        
                   </a>

     

       28
       28
        
                   <figcaption class="text-sm text-gray-600 dark:text-gray-400 mt-2 text-center">

     

       29
       29
        
                       Monorepo for Tangled, built in the open with the community.

+3 -3

appview/pages/templates/timeline/home.html

···

       27
       27
        
       {{ define "feature" }}

     

       28
       28
        
           {{ $info := index . 0 }}

     

       29
       29
        
           {{ $bullets := index . 1 }}

     

       30
       30
       -
           <div class="flex flex-col items-top gap-6 md:flex-row md:gap-12">

     

       30
       30
       +
           <div class="flex flex-col items-center gap-6 md:flex-row md:items-top">

     

       31
       31
        
               <div class="flex-1">

     

       32
       32
        
                   <h2 class="text-2xl font-bold text-black dark:text-white mb-6">{{ $info.title }}</h2>

     

       33
       33
        
                   <ul class="leading-normal">

     
···

       38
       38
        
               </div>

     

       39
       39
        
               <div class="flex-shrink-0 w-96 md:w-1/3">

     

       40
       40
        
                 <a href="{{ $info.image }}">

     

       41
       41
       -
                   <img src="{{ $info.image }}" alt="{{ $info.alt }}" class="w-full h-auto rounded" />

     

       41
       41
       +
                   <img src="{{ $info.image }}" alt="{{ $info.alt }}" class="w-full h-auto rounded shadow-sm" />

     

       42
       42
        
                 </a>

     

       43
       43
        
               </div>

     

       44
       44
        
           </div>

     

       45
       45
        
       {{ end }}

     

       46
       46
        
       

     

       47
       47
        
       {{ define "features" }}

     

       48
       48
       -
         <div class="prose dark:text-gray-200 space-y-12 px-6 py-4">

     

       48
       48
       +
         <div class="prose dark:text-gray-200 space-y-12 px-6 py-4 bg-white dark:bg-gray-800 rounded drop-shadow-sm">

     

       49
       49
        
           {{ template "feature" (list

     

       50
       50
        
               (dict

     

       51
       51
        
                   "title" "lightweight git repo hosting"

+2 -4

appview/pages/templates/user/completeSignup.html

···

       29
       29
        
               </head>

     

       30
       30
        
               <body class="flex items-center justify-center min-h-screen">

     

       31
       31
        
                   <main class="max-w-md px-6 -mt-4">

     

       32
       32
       -
                       <h1

     

       33
       33
       -
                           class="text-center text-2xl font-semibold italic dark:text-white"

     

       34
       34
       -
                       >

     

       35
       35
       -
                           tangled

     

       32
       32
       +
                       <h1 class="flex place-content-center text-2xl font-semibold italic dark:text-white" >

     

       33
       33
       +
                         {{ template "fragments/logotype" }}

     

       36
       34
        
                       </h1>

     

       37
       35
        
                       <h2 class="text-center text-xl italic dark:text-white">

     

       38
       36
        
                           tightly-knit social coding.

+2 -2

appview/pages/templates/user/login.html

···

       13
       13
        
               </head>

     

       14
       14
        
               <body class="flex items-center justify-center min-h-screen">

     

       15
       15
        
                   <main class="max-w-md px-6 -mt-4">

     

       16
       16
       -
                       <h1 class="text-center text-2xl font-semibold italic dark:text-white" >

     

       17
       17
       -
                           tangled

     

       16
       16
       +
                       <h1 class="flex place-content-center text-2xl font-semibold italic dark:text-white" >

     

       17
       17
       +
                         {{ template "fragments/logotype" }}

     

       18
       18
        
                       </h1>

     

       19
       19
        
                       <h2 class="text-center text-xl italic dark:text-white">

     

       20
       20
        
                           tightly-knit social coding.

+2 -2

appview/pages/templates/user/overview.html

···

       115
       115
        
             </summary>

     

       116
       116
        
             <div class="py-2 text-sm flex flex-col gap-3 mb-2">

     

       117
       117
        
               {{ range $items }}

     

       118
       118
       -
                 {{ $repoOwner := resolve .Metadata.Repo.Did }}

     

       119
       119
       -
                 {{ $repoName := .Metadata.Repo.Name }}

     

       118
       118
       +
                 {{ $repoOwner := resolve .Repo.Did }}

     

       119
       119
       +
                 {{ $repoName := .Repo.Name }}

     

       120
       120
        
                 {{ $repoUrl := printf "%s/%s" $repoOwner $repoName }}

     

       121
       121
        
       

     

       122
       122
        
                 <div class="flex gap-2 text-gray-600 dark:text-gray-300">

+3 -1

appview/pages/templates/user/signup.html

···

       13
       13
        
               </head>

     

       14
       14
        
               <body class="flex items-center justify-center min-h-screen">

     

       15
       15
        
                   <main class="max-w-md px-6 -mt-4">

     

       16
       16
       -
                       <h1 class="text-center text-2xl font-semibold italic dark:text-white" >tangled</h1>

     

       16
       16
       +
                       <h1 class="flex place-content-center text-2xl font-semibold italic dark:text-white" >

     

       17
       17
       +
                         {{ template "fragments/logotype" }}

     

       18
       18
       +
                       </h1>

     

       17
       19
        
                       <h2 class="text-center text-xl italic dark:text-white">tightly-knit social coding.</h2>

     

       18
       20
        
                       <form

     

       19
       21
        
                           class="mt-4 max-w-sm mx-auto"

+6 -1

appview/repo/feed.go

···

       9
       9
        
       	"time"

     

       10
       10
        
       

     

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

     

       12
       12
       +
       	"tangled.sh/tangled.sh/core/appview/pagination"

     

       12
       13
        
       	"tangled.sh/tangled.sh/core/appview/reporesolver"

     

       13
       14
        
       

     

       14
       15
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     
···

       23
       24
        
       		return nil, err

     

       24
       25
        
       	}

     

       25
       26
        
       

     

       26
       26
       -
       	issues, err := db.GetIssuesWithLimit(rp.db, feedLimitPerType, db.FilterEq("repo_at", f.RepoAt()))

     

       27
       27
       +
       	issues, err := db.GetIssuesPaginated(

     

       28
       28
       +
       		rp.db,

     

       29
       29
       +
       		pagination.Page{Limit: feedLimitPerType},

     

       30
       30
       +
       		db.FilterEq("repo_at", f.RepoAt()),

     

       31
       31
       +
       	)

     

       27
       32
        
       	if err != nil {

     

       28
       33
        
       		return nil, err

     

       29
       34
        
       	}

+16 -17

appview/repo/index.go

···

       5
       5
        
       	"fmt"

     

       6
       6
        
       	"log"

     

       7
       7
        
       	"net/http"

     

       8
       8
       +
       	"net/url"

     

       8
       9
        
       	"slices"

     

       9
       10
        
       	"sort"

     

       10
       11
        
       	"strings"

     
···

       31
       32
        
       

     

       32
       33
        
       func (rp *Repo) RepoIndex(w http.ResponseWriter, r *http.Request) {

     

       33
       34
        
       	ref := chi.URLParam(r, "ref")

     

       35
       35
       +
       	ref, _ = url.PathUnescape(ref)

     

       34
       36
        
       

     

       35
       37
        
       	f, err := rp.repoResolver.Resolve(r)

     

       36
       38
        
       	if err != nil {

     
···

       61
       63
        
       				RepoInfo:         repoInfo,

     

       62
       64
        
       			})

     

       63
       65
        
       			return

     

       64
       64
       -
       		} else {

     

       65
       65
       -
       			rp.pages.Error503(w)

     

       66
       66
       -
       			log.Println("failed to build index response", err)

     

       67
       67
       -
       			return

     

       68
       66
        
       		}

     

       67
       67
       +
       

     

       68
       68
       +
       		rp.pages.Error503(w)

     

       69
       69
       +
       		log.Println("failed to build index response", err)

     

       70
       70
       +
       		return

     

       69
       71
        
       	}

     

       70
       72
        
       

     

       71
       73
        
       	tagMap := make(map[string][]string)

     
···

       245
       247
        
       	// first get branches to determine the ref if not specified

     

       246
       248
        
       	branchesBytes, err := tangled.RepoBranches(ctx, xrpcc, "", 0, repo)

     

       247
       249
        
       	if err != nil {

     

       248
       248
       -
       		return nil, err

     

       250
       250
       +
       		return nil, fmt.Errorf("failed to call repoBranches: %w", err)

     

       249
       251
        
       	}

     

       250
       252
        
       

     

       251
       253
        
       	var branchesResp types.RepoBranchesResponse

     

       252
       254
        
       	if err := json.Unmarshal(branchesBytes, &branchesResp); err != nil {

     

       253
       253
       -
       		return nil, err

     

       255
       255
       +
       		return nil, fmt.Errorf("failed to unmarshal branches response: %w", err)

     

       254
       256
        
       	}

     

       255
       257
        
       

     

       256
       258
        
       	// if no ref specified, use default branch or first available

     

       257
       257
       -
       	if ref == "" && len(branchesResp.Branches) > 0 {

     

       259
       259
       +
       	if ref == "" {

     

       258
       260
        
       		for _, branch := range branchesResp.Branches {

     

       259
       261
        
       			if branch.IsDefault {

     

       260
       262
        
       				ref = branch.Name

     

       261
       263
        
       				break

     

       262
       264
        
       			}

     

       263
       265
        
       		}

     

       264
       264
       -
       		if ref == "" {

     

       265
       265
       -
       			ref = branchesResp.Branches[0].Name

     

       266
       266
       -
       		}

     

       267
       266
        
       	}

     

       268
       267
        
       

     

       269
       269
       -
       	// check if repo is empty

     

       270
       270
       -
       	if len(branchesResp.Branches) == 0 {

     

       268
       268
       +
       	// if ref is still empty, this means the default branch is not set

     

       269
       269
       +
       	if ref == "" {

     

       271
       270
        
       		return &types.RepoIndexResponse{

     

       272
       271
        
       			IsEmpty:  true,

     

       273
       272
        
       			Branches: branchesResp.Branches,

     
···

       292
       291
        
       		defer wg.Done()

     

       293
       292
        
       		tagsBytes, err := tangled.RepoTags(ctx, xrpcc, "", 0, repo)

     

       294
       293
        
       		if err != nil {

     

       295
       295
       -
       			errs = errors.Join(errs, err)

     

       294
       294
       +
       			errs = errors.Join(errs, fmt.Errorf("failed to call repoTags: %w", err))

     

       296
       295
        
       			return

     

       297
       296
        
       		}

     

       298
       297
        
       

     

       299
       298
        
       		if err := json.Unmarshal(tagsBytes, &tagsResp); err != nil {

     

       300
       300
       -
       			errs = errors.Join(errs, err)

     

       299
       299
       +
       			errs = errors.Join(errs, fmt.Errorf("failed to unmarshal repoTags: %w", err))

     

       301
       300
        
       		}

     

       302
       301
        
       	}()

     

       303
       302
        
       

     
···

       307
       306
        
       		defer wg.Done()

     

       308
       307
        
       		resp, err := tangled.RepoTree(ctx, xrpcc, "", ref, repo)

     

       309
       308
        
       		if err != nil {

     

       310
       310
       -
       			errs = errors.Join(errs, err)

     

       309
       309
       +
       			errs = errors.Join(errs, fmt.Errorf("failed to call repoTree: %w", err))

     

       311
       310
        
       			return

     

       312
       311
        
       		}

     

       313
       312
        
       		treeResp = resp

     
···

       319
       318
        
       		defer wg.Done()

     

       320
       319
        
       		logBytes, err := tangled.RepoLog(ctx, xrpcc, "", 50, "", ref, repo)

     

       321
       320
        
       		if err != nil {

     

       322
       322
       -
       			errs = errors.Join(errs, err)

     

       321
       321
       +
       			errs = errors.Join(errs, fmt.Errorf("failed to call repoLog: %w", err))

     

       323
       322
        
       			return

     

       324
       323
        
       		}

     

       325
       324
        
       

     

       326
       325
        
       		if err := json.Unmarshal(logBytes, &logResp); err != nil {

     

       327
       327
       -
       			errs = errors.Join(errs, err)

     

       326
       326
       +
       			errs = errors.Join(errs, fmt.Errorf("failed to unmarshal repoLog: %w", err))

     

       328
       327
        
       		}

     

       329
       328
        
       	}()

     

       330
       329

+98 -120

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"

     
···

       86
       85
        
       }

     

       87
       86
        
       

     

       88
       87
        
       func (rp *Repo) DownloadArchive(w http.ResponseWriter, r *http.Request) {

     

       89
       89
       -
       	refParam := chi.URLParam(r, "ref")

     

       88
       88
       +
       	ref := chi.URLParam(r, "ref")

     

       89
       89
       +
       	ref, _ = url.PathUnescape(ref)

     

       90
       90
       +
       

     

       90
       91
        
       	f, err := rp.repoResolver.Resolve(r)

     

       91
       92
        
       	if err != nil {

     

       92
       93
        
       		log.Println("failed to get repo and knot", err)

     
···

       103
       104
        
       	}

     

       104
       105
        
       

     

       105
       106
        
       	repo := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Name)

     

       106
       106
       -
       	archiveBytes, err := tangled.RepoArchive(r.Context(), xrpcc, "tar.gz", "", refParam, repo)

     

       107
       107
       -
       	if err != nil {

     

       108
       108
       -
       		if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       109
       109
       -
       			log.Println("failed to call XRPC repo.archive", xrpcerr)

     

       110
       110
       -
       			rp.pages.Error503(w)

     

       111
       111
       -
       			return

     

       112
       112
       -
       		}

     

       113
       113
       -
       		rp.pages.Error404(w)

     

       107
       107
       +
       	archiveBytes, err := tangled.RepoArchive(r.Context(), xrpcc, "tar.gz", "", ref, repo)

     

       108
       108
       +
       	if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       109
       109
       +
       		log.Println("failed to call XRPC repo.archive", xrpcerr)

     

       110
       110
       +
       		rp.pages.Error503(w)

     

       114
       111
        
       		return

     

       115
       112
        
       	}

     

       116
       113
        
       

     

       117
       117
       -
       	// Set headers for file download

     

       118
       118
       -
       	filename := fmt.Sprintf("%s-%s.tar.gz", f.Name, refParam)

     

       114
       114
       +
       	// Set headers for file download, just pass along whatever the knot specifies

     

       115
       115
       +
       	safeRefFilename := strings.ReplaceAll(plumbing.ReferenceName(ref).Short(), "/", "-")

     

       116
       116
       +
       	filename := fmt.Sprintf("%s-%s.tar.gz", f.Name, safeRefFilename)

     

       119
       117
        
       	w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=\"%s\"", filename))

     

       120
       118
        
       	w.Header().Set("Content-Type", "application/gzip")

     

       121
       119
        
       	w.Header().Set("Content-Length", fmt.Sprintf("%d", len(archiveBytes)))

     
···

       140
       138
        
       	}

     

       141
       139
        
       

     

       142
       140
        
       	ref := chi.URLParam(r, "ref")

     

       141
       141
       +
       	ref, _ = url.PathUnescape(ref)

     

       143
       142
        
       

     

       144
       143
        
       	scheme := "http"

     

       145
       144
        
       	if !rp.config.Core.Dev {

     
···

       160
       159
        
       

     

       161
       160
        
       	repo := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Name)

     

       162
       161
        
       	xrpcBytes, err := tangled.RepoLog(r.Context(), xrpcc, cursor, limit, "", ref, repo)

     

       163
       163
       -
       	if err != nil {

     

       164
       164
       -
       		if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       165
       165
       -
       			log.Println("failed to call XRPC repo.log", xrpcerr)

     

       166
       166
       -
       			rp.pages.Error503(w)

     

       167
       167
       -
       			return

     

       168
       168
       -
       		}

     

       169
       169
       -
       		rp.pages.Error404(w)

     

       162
       162
       +
       	if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       163
       163
       +
       		log.Println("failed to call XRPC repo.log", xrpcerr)

     

       164
       164
       +
       		rp.pages.Error503(w)

     

       170
       165
        
       		return

     

       171
       166
        
       	}

     

       172
       167
        
       

     
···

       178
       173
        
       	}

     

       179
       174
        
       

     

       180
       175
        
       	tagBytes, err := tangled.RepoTags(r.Context(), xrpcc, "", 0, repo)

     

       181
       181
       -
       	if err != nil {

     

       182
       182
       -
       		if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       183
       183
       -
       			log.Println("failed to call XRPC repo.tags", xrpcerr)

     

       184
       184
       -
       			rp.pages.Error503(w)

     

       185
       185
       -
       			return

     

       186
       186
       -
       		}

     

       176
       176
       +
       	if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       177
       177
       +
       		log.Println("failed to call XRPC repo.tags", xrpcerr)

     

       178
       178
       +
       		rp.pages.Error503(w)

     

       179
       179
       +
       		return

     

       187
       180
        
       	}

     

       188
       181
        
       

     

       189
       182
        
       	tagMap := make(map[string][]string)

     
···

       197
       190
        
       	}

     

       198
       191
        
       

     

       199
       192
        
       	branchBytes, err := tangled.RepoBranches(r.Context(), xrpcc, "", 0, repo)

     

       200
       200
       -
       	if err != nil {

     

       201
       201
       -
       		if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       202
       202
       -
       			log.Println("failed to call XRPC repo.branches", xrpcerr)

     

       203
       203
       -
       			rp.pages.Error503(w)

     

       204
       204
       -
       			return

     

       205
       205
       -
       		}

     

       193
       193
       +
       	if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       194
       194
       +
       		log.Println("failed to call XRPC repo.branches", xrpcerr)

     

       195
       195
       +
       		rp.pages.Error503(w)

     

       196
       196
       +
       		return

     

       206
       197
        
       	}

     

       207
       198
        
       

     

       208
       199
        
       	if branchBytes != nil {

     
···

       354
       345
        
       		return

     

       355
       346
        
       	}

     

       356
       347
        
       	ref := chi.URLParam(r, "ref")

     

       348
       348
       +
       	ref, _ = url.PathUnescape(ref)

     

       357
       349
        
       

     

       358
       350
        
       	var diffOpts types.DiffOpts

     

       359
       351
        
       	if d := r.URL.Query().Get("diff"); d == "split" {

     
···

       376
       368
        
       

     

       377
       369
        
       	repo := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Name)

     

       378
       370
        
       	xrpcBytes, err := tangled.RepoDiff(r.Context(), xrpcc, ref, repo)

     

       379
       379
       -
       	if err != nil {

     

       380
       380
       -
       		if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       381
       381
       -
       			log.Println("failed to call XRPC repo.diff", xrpcerr)

     

       382
       382
       -
       			rp.pages.Error503(w)

     

       383
       383
       -
       			return

     

       384
       384
       -
       		}

     

       385
       385
       -
       		rp.pages.Error404(w)

     

       371
       371
       +
       	if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       372
       372
       +
       		log.Println("failed to call XRPC repo.diff", xrpcerr)

     

       373
       373
       +
       		rp.pages.Error503(w)

     

       386
       374
        
       		return

     

       387
       375
        
       	}

     

       388
       376
        
       

     
···

       434
       422
        
       	}

     

       435
       423
        
       

     

       436
       424
        
       	ref := chi.URLParam(r, "ref")

     

       437
       437
       -
       	treePath := chi.URLParam(r, "*")

     

       425
       425
       +
       	ref, _ = url.PathUnescape(ref)

     

       438
       426
        
       

     

       439
       427
        
       	// if the tree path has a trailing slash, let's strip it

     

       440
       428
        
       	// so we don't 404

     

       429
       429
       +
       	treePath := chi.URLParam(r, "*")

     

       430
       430
       +
       	treePath, _ = url.PathUnescape(treePath)

     

       441
       431
        
       	treePath = strings.TrimSuffix(treePath, "/")

     

       442
       432
        
       

     

       443
       433
        
       	scheme := "http"

     
···

       451
       441
        
       

     

       452
       442
        
       	repo := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Name)

     

       453
       443
        
       	xrpcResp, err := tangled.RepoTree(r.Context(), xrpcc, treePath, ref, repo)

     

       454
       454
       -
       	if err != nil {

     

       455
       455
       -
       		if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       456
       456
       -
       			log.Println("failed to call XRPC repo.tree", xrpcerr)

     

       457
       457
       -
       			rp.pages.Error503(w)

     

       458
       458
       -
       			return

     

       459
       459
       -
       		}

     

       460
       460
       -
       		rp.pages.Error404(w)

     

       444
       444
       +
       	if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       445
       445
       +
       		log.Println("failed to call XRPC repo.tree", xrpcerr)

     

       446
       446
       +
       		rp.pages.Error503(w)

     

       461
       447
        
       		return

     

       462
       448
        
       	}

     

       463
       449
        
       

     
···

       499
       485
        
       

     

       500
       486
        
       	// redirects tree paths trying to access a blob; in this case the result.Files is unpopulated,

     

       501
       487
        
       	// so we can safely redirect to the "parent" (which is the same file).

     

       502
       502
       -
       	unescapedTreePath, _ := url.PathUnescape(treePath)

     

       503
       503
       -
       	if len(result.Files) == 0 && result.Parent == unescapedTreePath {

     

       504
       504
       -
       		http.Redirect(w, r, fmt.Sprintf("/%s/blob/%s/%s", f.OwnerSlashRepo(), ref, result.Parent), http.StatusFound)

     

       488
       488
       +
       	if len(result.Files) == 0 && result.Parent == treePath {

     

       489
       489
       +
       		redirectTo := fmt.Sprintf("/%s/blob/%s/%s", f.OwnerSlashRepo(), url.PathEscape(ref), result.Parent)

     

       490
       490
       +
       		http.Redirect(w, r, redirectTo, http.StatusFound)

     

       505
       491
        
       		return

     

       506
       492
        
       	}

     

       507
       493
        
       

     

       508
       494
        
       	user := rp.oauth.GetUser(r)

     

       509
       495
        
       

     

       510
       496
        
       	var breadcrumbs [][]string

     

       511
       511
       -
       	breadcrumbs = append(breadcrumbs, []string{f.Name, fmt.Sprintf("/%s/tree/%s", f.OwnerSlashRepo(), ref)})

     

       497
       497
       +
       	breadcrumbs = append(breadcrumbs, []string{f.Name, fmt.Sprintf("/%s/tree/%s", f.OwnerSlashRepo(), url.PathEscape(ref))})

     

       512
       498
        
       	if treePath != "" {

     

       513
       499
        
       		for idx, elem := range strings.Split(treePath, "/") {

     

       514
       514
       -
       			breadcrumbs = append(breadcrumbs, []string{elem, fmt.Sprintf("%s/%s", breadcrumbs[idx][1], elem)})

     

       500
       500
       +
       			breadcrumbs = append(breadcrumbs, []string{elem, fmt.Sprintf("%s/%s", breadcrumbs[idx][1], url.PathEscape(elem))})

     

       515
       501
        
       		}

     

       516
       502
        
       	}

     

       517
       503
        
       

     
···

       544
       530
        
       

     

       545
       531
        
       	repo := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Name)

     

       546
       532
        
       	xrpcBytes, err := tangled.RepoTags(r.Context(), xrpcc, "", 0, repo)

     

       547
       547
       -
       	if err != nil {

     

       548
       548
       -
       		if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       549
       549
       -
       			log.Println("failed to call XRPC repo.tags", xrpcerr)

     

       550
       550
       -
       			rp.pages.Error503(w)

     

       551
       551
       -
       			return

     

       552
       552
       -
       		}

     

       553
       553
       -
       		rp.pages.Error404(w)

     

       533
       533
       +
       	if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       534
       534
       +
       		log.Println("failed to call XRPC repo.tags", xrpcerr)

     

       535
       535
       +
       		rp.pages.Error503(w)

     

       554
       536
        
       		return

     

       555
       537
        
       	}

     

       556
       538
        
       

     
···

       617
       599
        
       

     

       618
       600
        
       	repo := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Name)

     

       619
       601
        
       	xrpcBytes, err := tangled.RepoBranches(r.Context(), xrpcc, "", 0, repo)

     

       620
       620
       -
       	if err != nil {

     

       621
       621
       -
       		if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       622
       622
       -
       			log.Println("failed to call XRPC repo.branches", xrpcerr)

     

       623
       623
       -
       			rp.pages.Error503(w)

     

       624
       624
       -
       			return

     

       625
       625
       -
       		}

     

       626
       626
       -
       		rp.pages.Error404(w)

     

       602
       602
       +
       	if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       603
       603
       +
       		log.Println("failed to call XRPC repo.branches", xrpcerr)

     

       604
       604
       +
       		rp.pages.Error503(w)

     

       627
       605
        
       		return

     

       628
       606
        
       	}

     

       629
       607
        
       

     
···

       652
       630
        
       	}

     

       653
       631
        
       

     

       654
       632
        
       	ref := chi.URLParam(r, "ref")

     

       633
       633
       +
       	ref, _ = url.PathUnescape(ref)

     

       634
       634
       +
       

     

       655
       635
        
       	filePath := chi.URLParam(r, "*")

     

       636
       636
       +
       	filePath, _ = url.PathUnescape(filePath)

     

       656
       637
        
       

     

       657
       638
        
       	scheme := "http"

     

       658
       639
        
       	if !rp.config.Core.Dev {

     
···

       665
       646
        
       

     

       666
       647
        
       	repo := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Repo.Name)

     

       667
       648
        
       	resp, err := tangled.RepoBlob(r.Context(), xrpcc, filePath, false, ref, repo)

     

       668
       668
       -
       	if err != nil {

     

       669
       669
       -
       		if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       670
       670
       -
       			log.Println("failed to call XRPC repo.blob", xrpcerr)

     

       671
       671
       -
       			rp.pages.Error503(w)

     

       672
       672
       -
       			return

     

       673
       673
       -
       		}

     

       674
       674
       -
       		rp.pages.Error404(w)

     

       649
       649
       +
       	if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       650
       650
       +
       		log.Println("failed to call XRPC repo.blob", xrpcerr)

     

       651
       651
       +
       		rp.pages.Error503(w)

     

       675
       652
        
       		return

     

       676
       653
        
       	}

     

       677
       654
        
       

     

       678
       655
        
       	// Use XRPC response directly instead of converting to internal types

     

       679
       656
        
       

     

       680
       657
        
       	var breadcrumbs [][]string

     

       681
       681
       -
       	breadcrumbs = append(breadcrumbs, []string{f.Name, fmt.Sprintf("/%s/tree/%s", f.OwnerSlashRepo(), ref)})

     

       658
       658
       +
       	breadcrumbs = append(breadcrumbs, []string{f.Name, fmt.Sprintf("/%s/tree/%s", f.OwnerSlashRepo(), url.PathEscape(ref))})

     

       682
       659
        
       	if filePath != "" {

     

       683
       660
        
       		for idx, elem := range strings.Split(filePath, "/") {

     

       684
       684
       -
       			breadcrumbs = append(breadcrumbs, []string{elem, fmt.Sprintf("%s/%s", breadcrumbs[idx][1], elem)})

     

       661
       661
       +
       			breadcrumbs = append(breadcrumbs, []string{elem, fmt.Sprintf("%s/%s", breadcrumbs[idx][1], url.PathEscape(elem))})

     

       685
       662
        
       		}

     

       686
       663
        
       	}

     

       687
       664
        
       

     
···

       710
       687
        
       		}

     

       711
       688
        
       

     

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

     

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

     

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

     

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

     

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

     

       691
       691
       +
       

     

       692
       692
       +
       		baseURL := &url.URL{

     

       693
       693
       +
       			Scheme: scheme,

     

       694
       694
       +
       			Host:   f.Knot,

     

       695
       695
       +
       			Path:   "/xrpc/sh.tangled.repo.blob",

     

       696
       696
       +
       		}

     

       697
       697
       +
       		query := baseURL.Query()

     

       698
       698
       +
       		query.Set("repo", repoName)

     

       699
       699
       +
       		query.Set("ref", ref)

     

       700
       700
       +
       		query.Set("path", filePath)

     

       701
       701
       +
       		query.Set("raw", "true")

     

       702
       702
       +
       		baseURL.RawQuery = query.Encode()

     

       703
       703
       +
       		blobURL := baseURL.String()

     

       716
       704
        
       

     

       717
       705
        
       		contentSrc = blobURL

     

       718
       706
        
       		if !rp.config.Core.Dev {

     
···

       767
       755
        
       	}

     

       768
       756
        
       

     

       769
       757
        
       	ref := chi.URLParam(r, "ref")

     

       758
       758
       +
       	ref, _ = url.PathUnescape(ref)

     

       759
       759
       +
       

     

       770
       760
        
       	filePath := chi.URLParam(r, "*")

     

       761
       761
       +
       	filePath, _ = url.PathUnescape(filePath)

     

       771
       762
        
       

     

       772
       763
        
       	scheme := "http"

     

       773
       764
        
       	if !rp.config.Core.Dev {

     
···

       775
       766
        
       	}

     

       776
       767
        
       

     

       777
       768
        
       	repo := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Repo.Name)

     

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

     

       779
       779
       -
       		scheme, f.Knot, url.QueryEscape(repo), url.QueryEscape(ref), url.QueryEscape(filePath))

     

       769
       769
       +
       	baseURL := &url.URL{

     

       770
       770
       +
       		Scheme: scheme,

     

       771
       771
       +
       		Host:   f.Knot,

     

       772
       772
       +
       		Path:   "/xrpc/sh.tangled.repo.blob",

     

       773
       773
       +
       	}

     

       774
       774
       +
       	query := baseURL.Query()

     

       775
       775
       +
       	query.Set("repo", repo)

     

       776
       776
       +
       	query.Set("ref", ref)

     

       777
       777
       +
       	query.Set("path", filePath)

     

       778
       778
       +
       	query.Set("raw", "true")

     

       779
       779
       +
       	baseURL.RawQuery = query.Encode()

     

       780
       780
       +
       	blobURL := baseURL.String()

     

       780
       781
        
       

     

       781
       782
        
       	req, err := http.NewRequest("GET", blobURL, nil)

     

       782
       783
        
       	if err != nil {

     
···

       1365
       1366
        
       

     

       1366
       1367
        
       	repo := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Name)

     

       1367
       1368
        
       	xrpcBytes, err := tangled.RepoBranches(r.Context(), xrpcc, "", 0, repo)

     

       1368
       1368
       -
       	if err != nil {

     

       1369
       1369
       -
       		if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       1370
       1370
       -
       			log.Println("failed to call XRPC repo.branches", xrpcerr)

     

       1371
       1371
       -
       			rp.pages.Error503(w)

     

       1372
       1372
       -
       			return

     

       1373
       1373
       -
       		}

     

       1369
       1369
       +
       	if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       1370
       1370
       +
       		log.Println("failed to call XRPC repo.branches", xrpcerr)

     

       1374
       1371
        
       		rp.pages.Error503(w)

     

       1375
       1372
        
       		return

     

       1376
       1373
        
       	}

     
···

       1472
       1469
        
       

     

       1473
       1470
        
       func (rp *Repo) SyncRepoFork(w http.ResponseWriter, r *http.Request) {

     

       1474
       1471
        
       	ref := chi.URLParam(r, "ref")

     

       1472
       1472
       +
       	ref, _ = url.PathUnescape(ref)

     

       1475
       1473
        
       

     

       1476
       1474
        
       	user := rp.oauth.GetUser(r)

     

       1477
       1475
        
       	f, err := rp.repoResolver.Resolve(r)

     
···

       1760
       1758
        
       

     

       1761
       1759
        
       	repo := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Name)

     

       1762
       1760
        
       	branchBytes, err := tangled.RepoBranches(r.Context(), xrpcc, "", 0, repo)

     

       1763
       1763
       -
       	if err != nil {

     

       1764
       1764
       -
       		if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       1765
       1765
       -
       			log.Println("failed to call XRPC repo.branches", xrpcerr)

     

       1766
       1766
       -
       			rp.pages.Error503(w)

     

       1767
       1767
       -
       			return

     

       1768
       1768
       -
       		}

     

       1769
       1769
       -
       		rp.pages.Notice(w, "compare-error", "Failed to produce comparison. Try again later.")

     

       1761
       1761
       +
       	if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       1762
       1762
       +
       		log.Println("failed to call XRPC repo.branches", xrpcerr)

     

       1763
       1763
       +
       		rp.pages.Error503(w)

     

       1770
       1764
        
       		return

     

       1771
       1765
        
       	}

     

       1772
       1766
        
       

     
···

       1801
       1795
        
       	}

     

       1802
       1796
        
       

     

       1803
       1797
        
       	tagBytes, err := tangled.RepoTags(r.Context(), xrpcc, "", 0, repo)

     

       1804
       1804
       -
       	if err != nil {

     

       1805
       1805
       -
       		if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       1806
       1806
       -
       			log.Println("failed to call XRPC repo.tags", xrpcerr)

     

       1807
       1807
       -
       			rp.pages.Error503(w)

     

       1808
       1808
       -
       			return

     

       1809
       1809
       -
       		}

     

       1810
       1810
       -
       		rp.pages.Notice(w, "compare-error", "Failed to produce comparison. Try again later.")

     

       1798
       1798
       +
       	if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       1799
       1799
       +
       		log.Println("failed to call XRPC repo.tags", xrpcerr)

     

       1800
       1800
       +
       		rp.pages.Error503(w)

     

       1811
       1801
        
       		return

     

       1812
       1802
        
       	}

     

       1813
       1803
        
       

     
···

       1878
       1868
        
       	repo := fmt.Sprintf("%s/%s", f.OwnerDid(), f.Name)

     

       1879
       1869
        
       

     

       1880
       1870
        
       	branchBytes, err := tangled.RepoBranches(r.Context(), xrpcc, "", 0, repo)

     

       1881
       1881
       -
       	if err != nil {

     

       1882
       1882
       -
       		if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       1883
       1883
       -
       			log.Println("failed to call XRPC repo.branches", xrpcerr)

     

       1884
       1884
       -
       			rp.pages.Error503(w)

     

       1885
       1885
       -
       			return

     

       1886
       1886
       -
       		}

     

       1887
       1887
       -
       		rp.pages.Notice(w, "compare-error", "Failed to produce comparison. Try again later.")

     

       1871
       1871
       +
       	if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       1872
       1872
       +
       		log.Println("failed to call XRPC repo.branches", xrpcerr)

     

       1873
       1873
       +
       		rp.pages.Error503(w)

     

       1888
       1874
        
       		return

     

       1889
       1875
        
       	}

     

       1890
       1876
        
       

     
···

       1896
       1882
        
       	}

     

       1897
       1883
        
       

     

       1898
       1884
        
       	tagBytes, err := tangled.RepoTags(r.Context(), xrpcc, "", 0, repo)

     

       1899
       1899
       -
       	if err != nil {

     

       1900
       1900
       -
       		if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       1901
       1901
       -
       			log.Println("failed to call XRPC repo.tags", xrpcerr)

     

       1902
       1902
       -
       			rp.pages.Error503(w)

     

       1903
       1903
       -
       			return

     

       1904
       1904
       -
       		}

     

       1905
       1905
       -
       		rp.pages.Notice(w, "compare-error", "Failed to produce comparison. Try again later.")

     

       1885
       1885
       +
       	if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       1886
       1886
       +
       		log.Println("failed to call XRPC repo.tags", xrpcerr)

     

       1887
       1887
       +
       		rp.pages.Error503(w)

     

       1906
       1888
        
       		return

     

       1907
       1889
        
       	}

     

       1908
       1890
        
       

     
···

       1914
       1896
        
       	}

     

       1915
       1897
        
       

     

       1916
       1898
        
       	compareBytes, err := tangled.RepoCompare(r.Context(), xrpcc, repo, base, head)

     

       1917
       1917
       -
       	if err != nil {

     

       1918
       1918
       -
       		if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       1919
       1919
       -
       			log.Println("failed to call XRPC repo.compare", xrpcerr)

     

       1920
       1920
       -
       			rp.pages.Error503(w)

     

       1921
       1921
       -
       			return

     

       1922
       1922
       -
       		}

     

       1923
       1923
       -
       		rp.pages.Notice(w, "compare-error", "Failed to produce comparison. Try again later.")

     

       1899
       1899
       +
       	if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil {

     

       1900
       1900
       +
       		log.Println("failed to call XRPC repo.compare", xrpcerr)

     

       1901
       1901
       +
       		rp.pages.Error503(w)

     

       1924
       1902
        
       		return

     

       1925
       1903
        
       	}

     

       1926
       1904

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

knotserver/xrpc/list_keys.go

···

       1
       1
        
       package xrpc

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       4
        
       	"net/http"

     

       6
       5
        
       	"strconv"

     

       7
       6
        
       

     
···

       46
       45
        
       		response.Cursor = &nextCursor

     

       47
       46
        
       	}

     

       48
       47
        
       

     

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

     

       50
       50
       -
       	if err := json.NewEncoder(w).Encode(response); err != nil {

     

       51
       51
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       52
       52
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       53
       53
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       54
       54
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       55
       55
       -
       		), http.StatusInternalServerError)

     

       56
       56
       -
       		return

     

       57
       57
       -
       	}

     

       48
       48
       +
       	writeJson(w, response)

     

       58
       49
        
       }

+1 -10

knotserver/xrpc/owner.go

···

       1
       1
        
       package xrpc

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       4
        
       	"net/http"

     

       6
       5
        
       

     

       7
       6
        
       	"tangled.sh/tangled.sh/core/api/tangled"

     
···

       19
       18
        
       		Owner: owner,

     

       20
       19
        
       	}

     

       21
       20
        
       

     

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

     

       23
       23
       -
       	if err := json.NewEncoder(w).Encode(response); err != nil {

     

       24
       24
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       25
       25
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       26
       26
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       27
       27
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       28
       28
       -
       		), http.StatusInternalServerError)

     

       29
       29
       -
       		return

     

       30
       30
       -
       	}

     

       21
       21
       +
       	writeJson(w, response)

     

       31
       22
        
       }

+8 -7

knotserver/xrpc/repo_archive.go

···

       13
       13
        
       )

     

       14
       14
        
       

     

       15
       15
        
       func (x *Xrpc) RepoArchive(w http.ResponseWriter, r *http.Request) {

     

       16
       16
       -
       	repo, repoPath, unescapedRef, err := x.parseStandardParams(r)

     

       16
       16
       +
       	repo := r.URL.Query().Get("repo")

     

       17
       17
       +
       	repoPath, err := x.parseRepoParam(repo)

     

       17
       18
        
       	if err != nil {

     

       18
       19
        
       		writeError(w, err.(xrpcerr.XrpcError), http.StatusBadRequest)

     

       19
       20
        
       		return

     

       20
       21
        
       	}

     

       22
       22
       +
       

     

       23
       23
       +
       	ref := r.URL.Query().Get("ref")

     

       24
       24
       +
       	// ref can be empty (git.Open handles this)

     

       21
       25
        
       

     

       22
       26
        
       	format := r.URL.Query().Get("format")

     

       23
       27
        
       	if format == "" {

     
···

       34
       38
        
       		return

     

       35
       39
        
       	}

     

       36
       40
        
       

     

       37
       37
       -
       	gr, err := git.Open(repoPath, unescapedRef)

     

       41
       41
       +
       	gr, err := git.Open(repoPath, ref)

     

       38
       42
        
       	if err != nil {

     

       39
       39
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       40
       40
       -
       			xrpcerr.WithTag("RefNotFound"),

     

       41
       41
       -
       			xrpcerr.WithMessage("repository or ref not found"),

     

       42
       42
       -
       		), http.StatusNotFound)

     

       43
       43
       +
       		writeError(w, xrpcerr.RefNotFoundError, http.StatusNotFound)

     

       43
       44
        
       		return

     

       44
       45
        
       	}

     

       45
       46
        
       

     

       46
       47
        
       	repoParts := strings.Split(repo, "/")

     

       47
       48
        
       	repoName := repoParts[len(repoParts)-1]

     

       48
       49
        
       

     

       49
       49
       -
       	safeRefFilename := strings.ReplaceAll(plumbing.ReferenceName(unescapedRef).Short(), "/", "-")

     

       50
       50
       +
       	safeRefFilename := strings.ReplaceAll(plumbing.ReferenceName(ref).Short(), "/", "-")

     

       50
       51
        
       

     

       51
       52
        
       	var archivePrefix string

     

       52
       53
        
       	if prefix != "" {

+8 -15

knotserver/xrpc/repo_blob.go

···

       3
       3
        
       import (

     

       4
       4
        
       	"crypto/sha256"

     

       5
       5
        
       	"encoding/base64"

     

       6
       6
       -
       	"encoding/json"

     

       7
       6
        
       	"fmt"

     

       8
       7
        
       	"net/http"

     

       9
       8
        
       	"path/filepath"

     
···

       16
       15
        
       )

     

       17
       16
        
       

     

       18
       17
        
       func (x *Xrpc) RepoBlob(w http.ResponseWriter, r *http.Request) {

     

       19
       19
       -
       	_, repoPath, ref, err := x.parseStandardParams(r)

     

       18
       18
       +
       	repo := r.URL.Query().Get("repo")

     

       19
       19
       +
       	repoPath, err := x.parseRepoParam(repo)

     

       20
       20
        
       	if err != nil {

     

       21
       21
        
       		writeError(w, err.(xrpcerr.XrpcError), http.StatusBadRequest)

     

       22
       22
        
       		return

     

       23
       23
        
       	}

     

       24
       24
        
       

     

       25
       25
       +
       	ref := r.URL.Query().Get("ref")

     

       26
       26
       +
       	// ref can be empty (git.Open handles this)

     

       27
       27
       +
       

     

       25
       28
        
       	treePath := r.URL.Query().Get("path")

     

       26
       29
        
       	if treePath == "" {

     

       27
       30
        
       		writeError(w, xrpcerr.NewXrpcError(

     
···

       35
       38
        
       

     

       36
       39
        
       	gr, err := git.Open(repoPath, ref)

     

       37
       40
        
       	if err != nil {

     

       38
       38
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       39
       39
       -
       			xrpcerr.WithTag("RefNotFound"),

     

       40
       40
       -
       			xrpcerr.WithMessage("repository or ref not found"),

     

       41
       41
       -
       		), http.StatusNotFound)

     

       41
       41
       +
       		writeError(w, xrpcerr.RefNotFoundError, http.StatusNotFound)

     

       42
       42
        
       		return

     

       43
       43
        
       	}

     

       44
       44
        
       

     
···

       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")

     
···

       122
       123
        
       		response.MimeType = &mimeType

     

       123
       124
        
       	}

     

       124
       125
        
       

     

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

     

       126
       126
       -
       	if err := json.NewEncoder(w).Encode(response); err != nil {

     

       127
       127
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       128
       128
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       129
       129
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       130
       130
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       131
       131
       -
       		), http.StatusInternalServerError)

     

       132
       132
       -
       		return

     

       133
       133
       -
       	}

     

       126
       126
       +
       	writeJson(w, response)

     

       134
       127
        
       }

     

       135
       128
        
       

     

       136
       129
        
       // isTextualMimeType returns true if the MIME type represents textual content

+5 -16

knotserver/xrpc/repo_branch.go

···

       1
       1
        
       package xrpc

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       4
        
       	"net/http"

     

       6
       5
        
       	"net/url"

     

       6
       6
       +
       	"time"

     

       7
       7
        
       

     

       8
       8
        
       	"tangled.sh/tangled.sh/core/api/tangled"

     

       9
       9
        
       	"tangled.sh/tangled.sh/core/knotserver/git"

     
···

       31
       31
        
       

     

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

     

       33
       33
        
       	if err != nil {

     

       34
       34
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       35
       35
       -
       			xrpcerr.WithTag("RepoNotFound"),

     

       36
       36
       -
       			xrpcerr.WithMessage("repository not found"),

     

       37
       37
       -
       		), http.StatusNotFound)

     

       34
       34
       +
       		writeError(w, xrpcerr.RepoNotFoundError, http.StatusNoContent)

     

       38
       35
        
       		return

     

       39
       36
        
       	}

     

       40
       37
        
       

     
···

       70
       67
        
       		Name:      ref.Name().Short(),

     

       71
       68
        
       		Hash:      ref.Hash().String(),

     

       72
       69
        
       		ShortHash: &[]string{ref.Hash().String()[:7]}[0],

     

       73
       73
       -
       		When:      commit.Author.When.Format("2006-01-02T15:04:05.000Z"),

     

       70
       70
       +
       		When:      commit.Author.When.Format(time.RFC3339),

     

       74
       71
        
       		IsDefault: &isDefault,

     

       75
       72
        
       	}

     

       76
       73
        
       

     
···

       81
       78
        
       	response.Author = &tangled.RepoBranch_Signature{

     

       82
       79
        
       		Name:  commit.Author.Name,

     

       83
       80
        
       		Email: commit.Author.Email,

     

       84
       84
       -
       		When:  commit.Author.When.Format("2006-01-02T15:04:05.000Z"),

     

       81
       81
       +
       		When:  commit.Author.When.Format(time.RFC3339),

     

       85
       82
        
       	}

     

       86
       83
        
       

     

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

     

       88
       88
       -
       	if err := json.NewEncoder(w).Encode(response); err != nil {

     

       89
       89
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       90
       90
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       91
       91
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       92
       92
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       93
       93
       -
       		), http.StatusInternalServerError)

     

       94
       94
       -
       		return

     

       95
       95
       -
       	}

     

       84
       84
       +
       	writeJson(w, response)

     

       96
       85
        
       }

+11 -25

knotserver/xrpc/repo_branches.go

···

       1
       1
        
       package xrpc

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       4
        
       	"net/http"

     

       6
       5
        
       	"strconv"

     

       7
       6
        
       

     
···

       20
       19
        
       

     

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

     

       22
       21
        
       

     

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

     

       22
       22
       +
       	// limit := 50 // default

     

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

     

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

     

       25
       25
       +
       	// 		limit = l

     

       26
       26
       +
       	// 	}

     

       27
       27
       +
       	// }

     

       28
       28
       +
       

     

       29
       29
       +
       	limit := 500

     

       29
       30
        
       

     

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

     

       31
       32
        
       	if err != nil {

     

       32
       32
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       33
       33
       -
       			xrpcerr.WithTag("RepoNotFound"),

     

       34
       34
       -
       			xrpcerr.WithMessage("repository not found"),

     

       35
       35
       -
       		), http.StatusNotFound)

     

       33
       33
       +
       		writeError(w, xrpcerr.RepoNotFoundError, http.StatusNoContent)

     

       36
       34
        
       		return

     

       37
       35
        
       	}

     

       38
       36
        
       

     
···

       45
       43
        
       		}

     

       46
       44
        
       	}

     

       47
       45
        
       

     

       48
       48
       -
       	end := offset + limit

     

       49
       49
       -
       	if end > len(branches) {

     

       50
       50
       -
       		end = len(branches)

     

       51
       51
       -
       	}

     

       46
       46
       +
       	end := min(offset+limit, len(branches))

     

       52
       47
        
       

     

       53
       48
        
       	paginatedBranches := branches[offset:end]

     

       54
       49
        
       

     
···

       57
       52
        
       		Branches: paginatedBranches,

     

       58
       53
        
       	}

     

       59
       54
        
       

     

       60
       60
       -
       	// Write JSON response directly

     

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

     

       62
       62
       -
       	if err := json.NewEncoder(w).Encode(response); err != nil {

     

       63
       63
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       64
       64
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       65
       65
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       66
       66
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       67
       67
       -
       		), http.StatusInternalServerError)

     

       68
       68
       -
       		return

     

       69
       69
       -
       	}

     

       55
       55
       +
       	writeJson(w, response)

     

       70
       56
        
       }

+7 -23

knotserver/xrpc/repo_compare.go

···

       1
       1
        
       package xrpc

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       4
        
       	"fmt"

     

       6
       5
        
       	"net/http"

     

       7
       7
       -
       	"net/url"

     

       8
       6
        
       

     

       9
       7
        
       	"tangled.sh/tangled.sh/core/knotserver/git"

     

       10
       8
        
       	"tangled.sh/tangled.sh/core/types"

     
···

       19
       17
        
       		return

     

       20
       18
        
       	}

     

       21
       19
        
       

     

       22
       22
       -
       	rev1Param := r.URL.Query().Get("rev1")

     

       23
       23
       -
       	if rev1Param == "" {

     

       20
       20
       +
       	rev1 := r.URL.Query().Get("rev1")

     

       21
       21
       +
       	if rev1 == "" {

     

       24
       22
        
       		writeError(w, xrpcerr.NewXrpcError(

     

       25
       23
        
       			xrpcerr.WithTag("InvalidRequest"),

     

       26
       24
        
       			xrpcerr.WithMessage("missing rev1 parameter"),

     
···

       28
       26
        
       		return

     

       29
       27
        
       	}

     

       30
       28
        
       

     

       31
       31
       -
       	rev2Param := r.URL.Query().Get("rev2")

     

       32
       32
       -
       	if rev2Param == "" {

     

       29
       29
       +
       	rev2 := r.URL.Query().Get("rev2")

     

       30
       30
       +
       	if rev2 == "" {

     

       33
       31
        
       		writeError(w, xrpcerr.NewXrpcError(

     

       34
       32
        
       			xrpcerr.WithTag("InvalidRequest"),

     

       35
       33
        
       			xrpcerr.WithMessage("missing rev2 parameter"),

     
···

       37
       35
        
       		return

     

       38
       36
        
       	}

     

       39
       37
        
       

     

       40
       40
       -
       	rev1, _ := url.PathUnescape(rev1Param)

     

       41
       41
       -
       	rev2, _ := url.PathUnescape(rev2Param)

     

       42
       42
       -
       

     

       43
       38
        
       	gr, err := git.PlainOpen(repoPath)

     

       44
       39
        
       	if err != nil {

     

       45
       45
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       46
       46
       -
       			xrpcerr.WithTag("RepoNotFound"),

     

       47
       47
       -
       			xrpcerr.WithMessage("repository not found"),

     

       48
       48
       -
       		), http.StatusNotFound)

     

       40
       40
       +
       		writeError(w, xrpcerr.RepoNotFoundError, http.StatusNoContent)

     

       49
       41
        
       		return

     

       50
       42
        
       	}

     

       51
       43
        
       

     
···

       79
       71
        
       		return

     

       80
       72
        
       	}

     

       81
       73
        
       

     

       82
       82
       -
       	resp := types.RepoFormatPatchResponse{

     

       74
       74
       +
       	response := types.RepoFormatPatchResponse{

     

       83
       75
        
       		Rev1:        commit1.Hash.String(),

     

       84
       76
        
       		Rev2:        commit2.Hash.String(),

     

       85
       77
        
       		FormatPatch: formatPatch,

     

       86
       78
        
       		Patch:       rawPatch,

     

       87
       79
        
       	}

     

       88
       80
        
       

     

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

     

       90
       90
       -
       	if err := json.NewEncoder(w).Encode(resp); err != nil {

     

       91
       91
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       92
       92
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       93
       93
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       94
       94
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       95
       95
       -
       		), http.StatusInternalServerError)

     

       96
       96
       -
       		return

     

       97
       97
       -
       	}

     

       81
       81
       +
       	writeJson(w, response)

     

       98
       82
        
       }

+6 -30

knotserver/xrpc/repo_diff.go

···

       1
       1
        
       package xrpc

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       4
        
       	"net/http"

     

       6
       6
       -
       	"net/url"

     

       7
       5
        
       

     

       8
       6
        
       	"tangled.sh/tangled.sh/core/knotserver/git"

     

       9
       7
        
       	"tangled.sh/tangled.sh/core/types"

     
···

       18
       16
        
       		return

     

       19
       17
        
       	}

     

       20
       18
        
       

     

       21
       21
       -
       	refParam := r.URL.Query().Get("ref")

     

       22
       22
       -
       	if refParam == "" {

     

       23
       23
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       24
       24
       -
       			xrpcerr.WithTag("InvalidRequest"),

     

       25
       25
       -
       			xrpcerr.WithMessage("missing ref parameter"),

     

       26
       26
       -
       		), http.StatusBadRequest)

     

       27
       27
       -
       		return

     

       28
       28
       -
       	}

     

       29
       29
       -
       

     

       30
       30
       -
       	ref, _ := url.QueryUnescape(refParam)

     

       19
       19
       +
       	ref := r.URL.Query().Get("ref")

     

       20
       20
       +
       	// ref can be empty (git.Open handles this)

     

       31
       21
        
       

     

       32
       22
        
       	gr, err := git.Open(repoPath, ref)

     

       33
       23
        
       	if err != nil {

     

       34
       34
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       35
       35
       -
       			xrpcerr.WithTag("RefNotFound"),

     

       36
       36
       -
       			xrpcerr.WithMessage("repository or ref not found"),

     

       37
       37
       -
       		), http.StatusNotFound)

     

       24
       24
       +
       		writeError(w, xrpcerr.RefNotFoundError, http.StatusNotFound)

     

       38
       25
        
       		return

     

       39
       26
        
       	}

     

       40
       27
        
       

     

       41
       28
        
       	diff, err := gr.Diff()

     

       42
       29
        
       	if err != nil {

     

       43
       30
        
       		x.Logger.Error("getting diff", "error", err.Error())

     

       44
       44
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       45
       45
       -
       			xrpcerr.WithTag("RefNotFound"),

     

       46
       46
       -
       			xrpcerr.WithMessage("failed to generate diff"),

     

       47
       47
       -
       		), http.StatusInternalServerError)

     

       31
       31
       +
       		writeError(w, xrpcerr.RefNotFoundError, http.StatusInternalServerError)

     

       48
       32
        
       		return

     

       49
       33
        
       	}

     

       50
       34
        
       

     

       51
       51
       -
       	resp := types.RepoCommitResponse{

     

       35
       35
       +
       	response := types.RepoCommitResponse{

     

       52
       36
        
       		Ref:  ref,

     

       53
       37
        
       		Diff: diff,

     

       54
       38
        
       	}

     

       55
       39
        
       

     

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

     

       57
       57
       -
       	if err := json.NewEncoder(w).Encode(resp); err != nil {

     

       58
       58
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       59
       59
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       60
       60
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       61
       61
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       62
       62
       -
       		), http.StatusInternalServerError)

     

       63
       63
       -
       		return

     

       64
       64
       -
       	}

     

       40
       40
       +
       	writeJson(w, response)

     

       65
       41
        
       }

+4 -19

knotserver/xrpc/repo_get_default_branch.go

···

       1
       1
        
       package xrpc

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       4
        
       	"net/http"

     

       5
       5
       +
       	"time"

     

       6
       6
        
       

     

       7
       7
        
       	"tangled.sh/tangled.sh/core/api/tangled"

     

       8
       8
        
       	"tangled.sh/tangled.sh/core/knotserver/git"

     
···

       17
       17
        
       		return

     

       18
       18
        
       	}

     

       19
       19
        
       

     

       20
       20
       -
       	gr, err := git.Open(repoPath, "")

     

       21
       21
       -
       	if err != nil {

     

       22
       22
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       23
       23
       -
       			xrpcerr.WithTag("RepoNotFound"),

     

       24
       24
       -
       			xrpcerr.WithMessage("repository not found"),

     

       25
       25
       -
       		), http.StatusNotFound)

     

       26
       26
       -
       		return

     

       27
       27
       -
       	}

     

       20
       20
       +
       	gr, err := git.PlainOpen(repoPath)

     

       28
       21
        
       

     

       29
       22
        
       	branch, err := gr.FindMainBranch()

     

       30
       23
        
       	if err != nil {

     
···

       39
       32
        
       	response := tangled.RepoGetDefaultBranch_Output{

     

       40
       33
        
       		Name: branch,

     

       41
       34
        
       		Hash: "",

     

       42
       42
       -
       		When: "1970-01-01T00:00:00.000Z",

     

       35
       35
       +
       		When: time.UnixMicro(0).Format(time.RFC3339),

     

       43
       36
        
       	}

     

       44
       37
        
       

     

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

     

       46
       46
       -
       	if err := json.NewEncoder(w).Encode(response); err != nil {

     

       47
       47
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       48
       48
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       49
       49
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       50
       50
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       51
       51
       -
       		), http.StatusInternalServerError)

     

       52
       52
       -
       		return

     

       53
       53
       -
       	}

     

       38
       38
       +
       	writeJson(w, response)

     

       54
       39
        
       }

+4 -21

knotserver/xrpc/repo_languages.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     

       5
       5
       -
       	"encoding/json"

     

       6
       5
        
       	"math"

     

       7
       6
        
       	"net/http"

     

       8
       8
       -
       	"net/url"

     

       9
       7
        
       	"time"

     

       10
       8
        
       

     

       11
       9
        
       	"tangled.sh/tangled.sh/core/api/tangled"

     
···

       14
       12
        
       )

     

       15
       13
        
       

     

       16
       14
        
       func (x *Xrpc) RepoLanguages(w http.ResponseWriter, r *http.Request) {

     

       17
       17
       -
       	refParam := r.URL.Query().Get("ref")

     

       18
       18
       -
       	if refParam == "" {

     

       19
       19
       -
       		refParam = "HEAD" // default

     

       20
       20
       -
       	}

     

       21
       21
       -
       	ref, _ := url.PathUnescape(refParam)

     

       22
       22
       -
       

     

       23
       15
        
       	repo := r.URL.Query().Get("repo")

     

       24
       16
        
       	repoPath, err := x.parseRepoParam(repo)

     

       25
       17
        
       	if err != nil {

     
···

       27
       19
        
       		return

     

       28
       20
        
       	}

     

       29
       21
        
       

     

       22
       22
       +
       	ref := r.URL.Query().Get("ref")

     

       23
       23
       +
       

     

       30
       24
        
       	gr, err := git.Open(repoPath, ref)

     

       31
       25
        
       	if err != nil {

     

       32
       26
        
       		x.Logger.Error("opening repo", "error", err.Error())

     

       33
       33
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       34
       34
       -
       			xrpcerr.WithTag("RefNotFound"),

     

       35
       35
       -
       			xrpcerr.WithMessage("repository or ref not found"),

     

       36
       36
       -
       		), http.StatusNotFound)

     

       27
       27
       +
       		writeError(w, xrpcerr.RefNotFoundError, http.StatusNotFound)

     

       37
       28
        
       		return

     

       38
       29
        
       	}

     

       39
       30
        
       

     
···

       81
       72
        
       		response.TotalFiles = &totalFiles

     

       82
       73
        
       	}

     

       83
       74
        
       

     

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

     

       85
       85
       -
       	if err := json.NewEncoder(w).Encode(response); err != nil {

     

       86
       86
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       87
       87
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       88
       88
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       89
       89
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       90
       90
       -
       		), http.StatusInternalServerError)

     

       91
       91
       -
       		return

     

       92
       92
       -
       	}

     

       75
       75
       +
       	writeJson(w, response)

     

       93
       76
        
       }

+14 -34

knotserver/xrpc/repo_log.go

···

       1
       1
        
       package xrpc

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       4
        
       	"net/http"

     

       6
       6
       -
       	"net/url"

     

       7
       5
        
       	"strconv"

     

       8
       6
        
       

     

       9
       7
        
       	"tangled.sh/tangled.sh/core/knotserver/git"

     
···

       19
       17
        
       		return

     

       20
       18
        
       	}

     

       21
       19
        
       

     

       22
       22
       -
       	refParam := r.URL.Query().Get("ref")

     

       23
       23
       -
       	if refParam == "" {

     

       24
       24
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       25
       25
       -
       			xrpcerr.WithTag("InvalidRequest"),

     

       26
       26
       -
       			xrpcerr.WithMessage("missing ref parameter"),

     

       27
       27
       -
       		), http.StatusBadRequest)

     

       28
       28
       -
       		return

     

       29
       29
       -
       	}

     

       20
       20
       +
       	ref := r.URL.Query().Get("ref")

     

       30
       21
        
       

     

       31
       22
        
       	path := r.URL.Query().Get("path")

     

       32
       23
        
       	cursor := r.URL.Query().Get("cursor")

     
···

       38
       29
        
       		}

     

       39
       30
        
       	}

     

       40
       31
        
       

     

       41
       41
       -
       	ref, err := url.QueryUnescape(refParam)

     

       42
       42
       -
       	if err != nil {

     

       43
       43
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       44
       44
       -
       			xrpcerr.WithTag("InvalidRequest"),

     

       45
       45
       -
       			xrpcerr.WithMessage("invalid ref parameter"),

     

       46
       46
       -
       		), http.StatusBadRequest)

     

       47
       47
       -
       		return

     

       48
       48
       -
       	}

     

       49
       49
       -
       

     

       50
       32
        
       	gr, err := git.Open(repoPath, ref)

     

       51
       33
        
       	if err != nil {

     

       52
       52
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       53
       53
       -
       			xrpcerr.WithTag("RefNotFound"),

     

       54
       54
       -
       			xrpcerr.WithMessage("repository or ref not found"),

     

       55
       55
       -
       		), http.StatusNotFound)

     

       34
       34
       +
       		writeError(w, xrpcerr.RefNotFoundError, http.StatusNotFound)

     

       56
       35
        
       		return

     

       57
       36
        
       	}

     

       58
       37
        
       

     
···

       73
       52
        
       		return

     

       74
       53
        
       	}

     

       75
       54
        
       

     

       55
       55
       +
       	total, err := gr.TotalCommits()

     

       56
       56
       +
       	if err != nil {

     

       57
       57
       +
       		x.Logger.Error("fetching total commits", "error", err.Error())

     

       58
       58
       +
       		writeError(w, xrpcerr.NewXrpcError(

     

       59
       59
       +
       			xrpcerr.WithTag("InternalServerError"),

     

       60
       60
       +
       			xrpcerr.WithMessage("failed to fetch total commits"),

     

       61
       61
       +
       		), http.StatusNotFound)

     

       62
       62
       +
       		return

     

       63
       63
       +
       	}

     

       64
       64
       +
       

     

       76
       65
        
       	// Create response using existing types.RepoLogResponse

     

       77
       66
        
       	response := types.RepoLogResponse{

     

       78
       67
        
       		Commits: commits,

     

       79
       68
        
       		Ref:     ref,

     

       80
       69
        
       		Page:    (offset / limit) + 1,

     

       81
       70
        
       		PerPage: limit,

     

       82
       82
       -
       		Total:   len(commits), // This is not accurate for pagination, but matches existing behavior

     

       71
       71
       +
       		Total:   total,

     

       83
       72
        
       	}

     

       84
       73
        
       

     

       85
       74
        
       	if path != "" {

     
···

       88
       77
        
       

     

       89
       78
        
       	response.Log = true

     

       90
       79
        
       

     

       91
       91
       -
       	// Write JSON response directly

     

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

     

       93
       93
       -
       	if err := json.NewEncoder(w).Encode(response); err != nil {

     

       94
       94
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       95
       95
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       96
       96
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       97
       97
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       98
       98
       -
       		), http.StatusInternalServerError)

     

       99
       99
       -
       		return

     

       100
       100
       -
       	}

     

       80
       80
       +
       	writeJson(w, response)

     

       101
       81
        
       }

+3 -16

knotserver/xrpc/repo_tags.go

···

       1
       1
        
       package xrpc

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       4
        
       	"net/http"

     

       6
       5
        
       	"strconv"

     

       7
       6
        
       

     
···

       30
       29
        
       		}

     

       31
       30
        
       	}

     

       32
       31
        
       

     

       33
       33
       -
       	gr, err := git.Open(repoPath, "")

     

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

     

       34
       33
        
       	if err != nil {

     

       35
       34
        
       		x.Logger.Error("failed to open", "error", err)

     

       36
       36
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       37
       37
       -
       			xrpcerr.WithTag("RepoNotFound"),

     

       38
       38
       -
       			xrpcerr.WithMessage("repository not found"),

     

       39
       39
       -
       		), http.StatusNotFound)

     

       35
       35
       +
       		writeError(w, xrpcerr.RepoNotFoundError, http.StatusNoContent)

     

       40
       36
        
       		return

     

       41
       37
        
       	}

     

       42
       38
        
       

     
···

       86
       82
        
       		Tags: paginatedTags,

     

       87
       83
        
       	}

     

       88
       84
        
       

     

       89
       89
       -
       	// Write JSON response directly

     

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

     

       91
       91
       -
       	if err := json.NewEncoder(w).Encode(response); err != nil {

     

       92
       92
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       93
       93
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       94
       94
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       95
       95
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       96
       96
       -
       		), http.StatusInternalServerError)

     

       97
       97
       -
       		return

     

       98
       98
       -
       	}

     

       85
       85
       +
       	writeJson(w, response)

     

       99
       86
        
       }

+6 -33

knotserver/xrpc/repo_tree.go

···

       1
       1
        
       package xrpc

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       4
        
       	"net/http"

     

       6
       6
       -
       	"net/url"

     

       7
       5
        
       	"path/filepath"

     

       6
       6
       +
       	"time"

     

       8
       7
        
       

     

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

     

       10
       9
        
       	"tangled.sh/tangled.sh/core/knotserver/git"

     
···

       21
       20
        
       		return

     

       22
       21
        
       	}

     

       23
       22
        
       

     

       24
       24
       -
       	refParam := r.URL.Query().Get("ref")

     

       25
       25
       -
       	if refParam == "" {

     

       26
       26
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       27
       27
       -
       			xrpcerr.WithTag("InvalidRequest"),

     

       28
       28
       -
       			xrpcerr.WithMessage("missing ref parameter"),

     

       29
       29
       -
       		), http.StatusBadRequest)

     

       30
       30
       -
       		return

     

       31
       31
       -
       	}

     

       23
       23
       +
       	ref := r.URL.Query().Get("ref")

     

       24
       24
       +
       	// ref can be empty (git.Open handles this)

     

       32
       25
        
       

     

       33
       26
        
       	path := r.URL.Query().Get("path")

     

       34
       27
        
       	// path can be empty (defaults to root)

     

       35
       28
        
       

     

       36
       36
       -
       	ref, err := url.QueryUnescape(refParam)

     

       37
       37
       -
       	if err != nil {

     

       38
       38
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       39
       39
       -
       			xrpcerr.WithTag("InvalidRequest"),

     

       40
       40
       -
       			xrpcerr.WithMessage("invalid ref parameter"),

     

       41
       41
       -
       		), http.StatusBadRequest)

     

       42
       42
       -
       		return

     

       43
       43
       -
       	}

     

       44
       44
       -
       

     

       45
       29
        
       	gr, err := git.Open(repoPath, ref)

     

       46
       30
        
       	if err != nil {

     

       47
       31
        
       		x.Logger.Error("failed to open git repository", "error", err, "path", repoPath, "ref", ref)

     

       48
       48
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       49
       49
       -
       			xrpcerr.WithTag("RefNotFound"),

     

       50
       50
       -
       			xrpcerr.WithMessage("repository or ref not found"),

     

       51
       51
       -
       		), http.StatusNotFound)

     

       32
       32
       +
       		writeError(w, xrpcerr.RefNotFoundError, http.StatusNotFound)

     

       52
       33
        
       		return

     

       53
       34
        
       	}

     

       54
       35
        
       

     
···

       77
       58
        
       			entry.Last_commit = &tangled.RepoTree_LastCommit{

     

       78
       59
        
       				Hash:    file.LastCommit.Hash.String(),

     

       79
       60
        
       				Message: file.LastCommit.Message,

     

       80
       80
       -
       				When:    file.LastCommit.When.Format("2006-01-02T15:04:05.000Z"),

     

       61
       61
       +
       				When:    file.LastCommit.When.Format(time.RFC3339),

     

       81
       62
        
       			}

     

       82
       63
        
       		}

     

       83
       64
        
       

     
···

       104
       85
        
       		Files:  treeEntries,

     

       105
       86
        
       	}

     

       106
       87
        
       

     

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

     

       108
       108
       -
       	if err := json.NewEncoder(w).Encode(response); err != nil {

     

       109
       109
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       110
       110
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       111
       111
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       112
       112
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       113
       113
       -
       		), http.StatusInternalServerError)

     

       114
       114
       -
       		return

     

       115
       115
       -
       	}

     

       88
       88
       +
       	writeJson(w, response)

     

       116
       89
        
       }

+1 -11

knotserver/xrpc/version.go

···

       1
       1
        
       package xrpc

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       4
        
       	"fmt"

     

       6
       5
        
       	"net/http"

     

       7
       6
        
       	"runtime/debug"

     

       8
       7
        
       

     

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

     

       10
       10
       -
       	xrpcerr "tangled.sh/tangled.sh/core/xrpc/errors"

     

       11
       9
        
       )

     

       12
       10
        
       

     

       13
       11
        
       // version is set during build time.

     
···

       58
       56
        
       		Version: version,

     

       59
       57
        
       	}

     

       60
       58
        
       

     

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

     

       62
       62
       -
       	if err := json.NewEncoder(w).Encode(response); err != nil {

     

       63
       63
       -
       		x.Logger.Error("failed to encode response", "error", err)

     

       64
       64
       -
       		writeError(w, xrpcerr.NewXrpcError(

     

       65
       65
       -
       			xrpcerr.WithTag("InternalServerError"),

     

       66
       66
       -
       			xrpcerr.WithMessage("failed to encode response"),

     

       67
       67
       -
       		), http.StatusInternalServerError)

     

       68
       68
       -
       		return

     

       69
       69
       -
       	}

     

       59
       59
       +
       	writeJson(w, response)

     

       70
       60
        
       }

+14 -35

knotserver/xrpc/xrpc.go

···

       4
       4
        
       	"encoding/json"

     

       5
       5
        
       	"log/slog"

     

       6
       6
        
       	"net/http"

     

       7
       7
       -
       	"net/url"

     

       8
       7
        
       	"strings"

     

       9
       8
        
       

     

       10
       9
        
       	securejoin "github.com/cyphar/filepath-securejoin"

     
···

       88
       87
        
       	}

     

       89
       88
        
       

     

       90
       89
        
       	// Parse repo string (did/repoName format)

     

       91
       91
       -
       	parts := strings.Split(repo, "/")

     

       92
       92
       -
       	if len(parts) < 2 {

     

       90
       90
       +
       	parts := strings.SplitN(repo, "/", 2)

     

       91
       91
       +
       	if len(parts) != 2 {

     

       93
       92
        
       		return "", xrpcerr.NewXrpcError(

     

       94
       93
        
       			xrpcerr.WithTag("InvalidRequest"),

     

       95
       94
        
       			xrpcerr.WithMessage("invalid repo format, expected 'did/repoName'"),

     

       96
       95
        
       		)

     

       97
       96
        
       	}

     

       98
       97
        
       

     

       99
       99
       -
       	did := strings.Join(parts[:len(parts)-1], "/")

     

       100
       100
       -
       	repoName := parts[len(parts)-1]

     

       98
       98
       +
       	did := parts[0]

     

       99
       99
       +
       	repoName := parts[1]

     

       101
       100
        
       

     

       102
       101
        
       	// Construct repository path using the same logic as didPath

     

       103
       102
        
       	didRepoPath, err := securejoin.SecureJoin(did, repoName)

     

       104
       103
        
       	if err != nil {

     

       105
       105
       -
       		return "", xrpcerr.NewXrpcError(

     

       106
       106
       -
       			xrpcerr.WithTag("RepoNotFound"),

     

       107
       107
       -
       			xrpcerr.WithMessage("failed to access repository"),

     

       108
       108
       -
       		)

     

       104
       104
       +
       		return "", xrpcerr.RepoNotFoundError

     

       109
       105
        
       	}

     

       110
       106
        
       

     

       111
       107
        
       	repoPath, err := securejoin.SecureJoin(x.Config.Repo.ScanPath, didRepoPath)

     

       112
       108
        
       	if err != nil {

     

       113
       113
       -
       		return "", xrpcerr.NewXrpcError(

     

       114
       114
       -
       			xrpcerr.WithTag("RepoNotFound"),

     

       115
       115
       -
       			xrpcerr.WithMessage("failed to access repository"),

     

       116
       116
       -
       		)

     

       109
       109
       +
       		return "", xrpcerr.RepoNotFoundError

     

       117
       110
        
       	}

     

       118
       111
        
       

     

       119
       112
        
       	return repoPath, nil

     

       120
       113
        
       }

     

       121
       114
        
       

     

       122
       122
       -
       // parseStandardParams parses common query parameters used by most handlers

     

       123
       123
       -
       func (x *Xrpc) parseStandardParams(r *http.Request) (repo, repoPath, ref string, err error) {

     

       124
       124
       -
       	// Parse repo parameter

     

       125
       125
       -
       	repo = r.URL.Query().Get("repo")

     

       126
       126
       -
       	repoPath, err = x.parseRepoParam(repo)

     

       127
       127
       -
       	if err != nil {

     

       128
       128
       -
       		return "", "", "", err

     

       129
       129
       -
       	}

     

       130
       130
       -
       

     

       131
       131
       -
       	// Parse and unescape ref parameter

     

       132
       132
       -
       	refParam := r.URL.Query().Get("ref")

     

       133
       133
       -
       	if refParam == "" {

     

       134
       134
       -
       		return "", "", "", xrpcerr.NewXrpcError(

     

       135
       135
       -
       			xrpcerr.WithTag("InvalidRequest"),

     

       136
       136
       -
       			xrpcerr.WithMessage("missing ref parameter"),

     

       137
       137
       -
       		)

     

       138
       138
       -
       	}

     

       139
       139
       -
       

     

       140
       140
       -
       	ref, _ = url.QueryUnescape(refParam)

     

       141
       141
       -
       	return repo, repoPath, ref, nil

     

       142
       142
       -
       }

     

       143
       143
       -
       

     

       144
       115
        
       func writeError(w http.ResponseWriter, e xrpcerr.XrpcError, status int) {

     

       145
       116
        
       	w.Header().Set("Content-Type", "application/json")

     

       146
       117
        
       	w.WriteHeader(status)

     

       147
       118
        
       	json.NewEncoder(w).Encode(e)

     

       148
       119
        
       }

     

       120
       120
       +
       

     

       121
       121
       +
       func writeJson(w http.ResponseWriter, response any) {

     

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

     

       123
       123
       +
       	if err := json.NewEncoder(w).Encode(response); err != nil {

     

       124
       124
       +
       		writeError(w, xrpcerr.GenericError(err), http.StatusInternalServerError)

     

       125
       125
       +
       		return

     

       126
       126
       +
       	}

     

       127
       127
       +
       }

+8 -2

nix/gomod2nix.toml

···

       425
       425
        
         [mod."github.com/whyrusleeping/cbor-gen"]

     

       426
       426
        
           version = "v0.3.1"

     

       427
       427
        
           hash = "sha256-PAd8M2Z8t6rVRBII+Rg8Bz+QaJIwbW64bfyqsv31kgc="

     

       428
       428
       +
         [mod."github.com/wyatt915/goldmark-treeblood"]

     

       429
       429
       +
           version = "v0.0.0-20250825231212-5dcbdb2f4b57"

     

       430
       430
       +
           hash = "sha256-IZEsUXTBTsNgWoD7vqRUc9aFCCHNjzk1IUmI9O+NCnM="

     

       431
       431
       +
         [mod."github.com/wyatt915/treeblood"]

     

       432
       432
       +
           version = "v0.1.15"

     

       433
       433
       +
           hash = "sha256-hb99exdkoY2Qv8WdDxhwgPXGbEYimUr6wFtPXEvcO9g="

     

       428
       434
        
         [mod."github.com/yuin/goldmark"]

     

       429
       429
       -
           version = "v1.4.15"

     

       430
       430
       -
           hash = "sha256-MvSOT6dwf5hVYkIg4MnqMpsy5ZtWZ7amAE7Zo9HkEa0="

     

       435
       435
       +
           version = "v1.7.12"

     

       436
       436
       +
           hash = "sha256-thLYBS4woL2X5qRdo7vP+xCvjlGRDU0jXtDCUt6vvWM="

     

       431
       437
        
         [mod."github.com/yuin/goldmark-highlighting/v2"]

     

       432
       438
        
           version = "v2.0.0-20230729083705-37449abec8cc"

     

       433
       439
        
           hash = "sha256-HpiwU7jIeDUAg2zOpTIiviQir8dpRPuXYh2nqFFccpg="

+15 -17

nix/pkgs/knot-unwrapped.nix

···

       3
       3
        
         modules,

     

       4
       4
        
         sqlite-lib,

     

       5
       5
        
         src,

     

       6
       6
       -
       }:

     

       7
       7
       -
       let

     

       8
       8
       -
         version = "1.8.1-alpha";

     

       6
       6
       +
       }: let

     

       7
       7
       +
         version = "1.9.0-alpha";

     

       9
       8
        
       in

     

       10
       10
       -
       buildGoApplication {

     

       11
       11
       -
         pname = "knot";

     

       12
       12
       -
         version = "1.8.1";

     

       13
       13
       -
         inherit src modules;

     

       9
       9
       +
         buildGoApplication {

     

       10
       10
       +
           pname = "knot";

     

       11
       11
       +
           inherit src version modules;

     

       14
       12
        
       

     

       15
       15
       -
         doCheck = false;

     

       13
       13
       +
           doCheck = false;

     

       16
       14
        
       

     

       17
       17
       -
         subPackages = ["cmd/knot"];

     

       18
       18
       -
         tags = ["libsqlite3"];

     

       15
       15
       +
           subPackages = ["cmd/knot"];

     

       16
       16
       +
           tags = ["libsqlite3"];

     

       19
       17
        
       

     

       20
       20
       -
         ldflags = [

     

       21
       21
       -
           "-X tangled.sh/tangled.sh/core/knotserver/xrpc.version=${version}"

     

       22
       22
       -
         ];

     

       18
       18
       +
           ldflags = [

     

       19
       19
       +
             "-X tangled.sh/tangled.sh/core/knotserver/xrpc.version=${version}"

     

       20
       20
       +
           ];

     

       23
       21
        
       

     

       24
       24
       -
         env.CGO_CFLAGS = "-I ${sqlite-lib}/include ";

     

       25
       25
       -
         env.CGO_LDFLAGS = "-L ${sqlite-lib}/lib";

     

       26
       26
       -
         CGO_ENABLED = 1;

     

       27
       27
       -
       }

     

       22
       22
       +
           env.CGO_CFLAGS = "-I ${sqlite-lib}/include ";

     

       23
       23
       +
           env.CGO_LDFLAGS = "-L ${sqlite-lib}/lib";

     

       24
       24
       +
           CGO_ENABLED = 1;

     

       25
       25
       +
         }

+10

xrpc/errors/errors.go

···

       56
       56
        
       	WithMessage("owner not set for this service"),

     

       57
       57
        
       )

     

       58
       58
        
       

     

       59
       59
       +
       var RepoNotFoundError = NewXrpcError(

     

       60
       60
       +
       	WithTag("RepoNotFound"),

     

       61
       61
       +
       	WithMessage("failed to access repository"),

     

       62
       62
       +
       )

     

       63
       63
       +
       

     

       64
       64
       +
       var RefNotFoundError = NewXrpcError(

     

       65
       65
       +
       	WithTag("RefNotFound"),

     

       66
       66
       +
       	WithMessage("failed to access ref"),

     

       67
       67
       +
       )

     

       68
       68
       +
       

     

       59
       69
        
       var AuthError = func(err error) XrpcError {

     

       60
       70
        
       	return NewXrpcError(

     

       61
       71
        
       		WithTag("Auth"),

Compare changes