comparing de63011a28a0fdb2a3b1b294f3c5bd482d84b6d1 and master on veryroundbird.house/core

+39 -187

appview/db/issues.go

···

       46
       46
        
       	}

     

       47
       47
        
       }

     

       48
       48
        
       

     

       49
       49
       +
       func (i *Issue) State() string {

     

       50
       50
       +
       	if i.Open {

     

       51
       51
       +
       		return "open"

     

       52
       52
       +
       	}

     

       53
       53
       +
       	return "closed"

     

       54
       54
       +
       }

     

       55
       55
       +
       

     

       49
       56
        
       type CommentListItem struct {

     

       50
       57
        
       	Self    *IssueComment

     

       51
       58
        
       	Replies []*IssueComment

     
···

       170
       177
        
       	return &comment, nil

     

       171
       178
        
       }

     

       172
       179
        
       

     

       173
       173
       -
       func NewIssue(tx *sql.Tx, issue *Issue) error {

     

       180
       180
       +
       func PutIssue(tx *sql.Tx, issue *Issue) error {

     

       174
       181
        
       	// ensure sequence exists

     

       175
       182
        
       	_, err := tx.Exec(`

     

       176
       183
        
       		insert or ignore into repo_issue_seqs (repo_at, next_issue_id)

     
···

       180
       187
        
       		return err

     

       181
       188
        
       	}

     

       182
       189
        
       

     

       183
       183
       -
       	// check if issue already exists

     

       184
       184
       -
       	var existingRowId, existingIssueId sql.NullInt64

     

       185
       185
       -
       	err = tx.QueryRow(`

     

       186
       186
       -
       		select rowid, issue_id from issues 

     

       187
       187
       -
       		where did = ? and rkey = ?

     

       188
       188
       -
       	`, issue.Did, issue.Rkey).Scan(&existingRowId, &existingIssueId)

     

       189
       189
       -
       

     

       190
       190
       +
       	issues, err := GetIssues(

     

       191
       191
       +
       		tx,

     

       192
       192
       +
       		FilterEq("did", issue.Did),

     

       193
       193
       +
       		FilterEq("rkey", issue.Rkey),

     

       194
       194
       +
       	)

     

       190
       195
        
       	switch {

     

       191
       191
       -
       	case err == sql.ErrNoRows:

     

       192
       192
       -
       		return createNewIssue(tx, issue)

     

       193
       193
       -
       

     

       194
       196
        
       	case err != nil:

     

       195
       197
        
       		return err

     

       196
       196
       -
       

     

       198
       198
       +
       	case len(issues) == 0:

     

       199
       199
       +
       		return createNewIssue(tx, issue)

     

       200
       200
       +
       	case len(issues) != 1: // should be unreachable

     

       201
       201
       +
       		return fmt.Errorf("invalid number of issues returned: %d", len(issues))

     

       197
       202
        
       	default:

     

       198
       198
       -
       		// Case 3: Issue exists - update it

     

       199
       199
       -
       		return updateIssue(tx, issue, existingRowId.Int64, int(existingIssueId.Int64))

     

       203
       203
       +
       		// if content is identical, do not edit

     

       204
       204
       +
       		existingIssue := issues[0]

     

       205
       205
       +
       		if existingIssue.Title == issue.Title && existingIssue.Body == issue.Body {

     

       206
       206
       +
       			return nil

     

       207
       207
       +
       		}

     

       208
       208
       +
       

     

       209
       209
       +
       		issue.Id = existingIssue.Id

     

       210
       210
       +
       		issue.IssueId = existingIssue.IssueId

     

       211
       211
       +
       		return updateIssue(tx, issue)

     

       200
       212
        
       	}

     

       201
       213
        
       }

     

       202
       214
        
       

     
···

       223
       235
        
       	return row.Scan(&issue.Id, &issue.IssueId)

     

       224
       236
        
       }

     

       225
       237
        
       

     

       226
       226
       -
       func updateIssue(tx *sql.Tx, issue *Issue, existingRowId int64, existingIssueId int) error {

     

       238
       238
       +
       func updateIssue(tx *sql.Tx, issue *Issue) error {

     

       227
       239
        
       	// update existing issue

     

       228
       240
        
       	_, err := tx.Exec(`

     

       229
       229
       -
       		update issues 

     

       230
       230
       -
       		set title = ?, body = ? 

     

       241
       241
       +
       		update issues

     

       242
       242
       +
       		set title = ?, body = ?, edited = ?

     

       231
       243
        
       		where did = ? and rkey = ?

     

       232
       232
       -
       	`, issue.Title, issue.Body, issue.Did, issue.Rkey)

     

       233
       233
       -
       	if err != nil {

     

       234
       234
       -
       		return err

     

       235
       235
       -
       	}

     

       236
       236
       -
       

     

       237
       237
       -
       	// set the values from existing record

     

       238
       238
       -
       	issue.Id = existingRowId

     

       239
       239
       -
       	issue.IssueId = existingIssueId

     

       240
       240
       -
       	return nil

     

       244
       244
       +
       	`, issue.Title, issue.Body, time.Now().Format(time.RFC3339), issue.Did, issue.Rkey)

     

       245
       245
       +
       	return err

     

       241
       246
        
       }

     

       242
       247
        
       

     

       243
       248
        
       func GetIssuesPaginated(e Execer, page pagination.Page, filters ...filter) ([]Issue, error) {

     
···

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

     

       355
       360
        
       	}

     

       356
       361
        
       

     

       357
       357
       -
       	for issueAt := range issueMap {

     

       358
       358
       -
       		i := issueMap[issueAt]

     

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

     

       360
       360
       -
       		i.Repo = r

     

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

     

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

     

       364
       364
       +
       			i.Repo = r

     

       365
       365
       +
       		} else {

     

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

     

       367
       367
       +
       			// TODO: foreign key where?

     

       368
       368
       +
       			delete(issueMap, issueAt)

     

       369
       369
       +
       		}

     

       361
       370
        
       	}

     

       362
       371
        
       

     

       363
       372
        
       	// collect comments

     
···

       386
       395
        
       	return issues, nil

     

       387
       396
        
       }

     

       388
       397
        
       

     

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

     

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

     

       391
       391
       -
       

     

       392
       392
       -
       	var conditions []string

     

       393
       393
       -
       	var args []any

     

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

     

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

     

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

     

       397
       397
       -
       	}

     

       398
       398
       -
       

     

       399
       399
       -
       	whereClause := ""

     

       400
       400
       -
       	if conditions != nil {

     

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

     

       402
       402
       -
       	}

     

       403
       403
       -
       	limitClause := ""

     

       404
       404
       -
       	if limit != 0 {

     

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

     

       406
       406
       -
       	}

     

       407
       407
       -
       

     

       408
       408
       -
       	query := fmt.Sprintf(

     

       409
       409
       -
       		`select

     

       410
       410
       -
       			i.id,

     

       411
       411
       -
       			i.owner_did,

     

       412
       412
       -
       			i.repo_at,

     

       413
       413
       -
       			i.issue_id,

     

       414
       414
       -
       			i.created,

     

       415
       415
       -
       			i.title,

     

       416
       416
       -
       			i.body,

     

       417
       417
       -
       			i.open

     

       418
       418
       -
       		from

     

       419
       419
       -
       		    issues i

     

       420
       420
       -
       		%s

     

       421
       421
       -
       		order by

     

       422
       422
       -
       			i.created desc

     

       423
       423
       -
       		%s`,

     

       424
       424
       -
       		whereClause, limitClause)

     

       425
       425
       -
       

     

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

     

       427
       427
       -
       	if err != nil {

     

       428
       428
       -
       		return nil, err

     

       429
       429
       -
       	}

     

       430
       430
       -
       	defer rows.Close()

     

       431
       431
       -
       

     

       432
       432
       -
       	for rows.Next() {

     

       433
       433
       -
       		var issue Issue

     

       434
       434
       -
       		var issueCreatedAt string

     

       435
       435
       -
       		err := rows.Scan(

     

       436
       436
       -
       			&issue.Id,

     

       437
       437
       -
       			&issue.Did,

     

       438
       438
       -
       			&issue.RepoAt,

     

       439
       439
       -
       			&issue.IssueId,

     

       440
       440
       -
       			&issueCreatedAt,

     

       441
       441
       -
       			&issue.Title,

     

       442
       442
       -
       			&issue.Body,

     

       443
       443
       -
       			&issue.Open,

     

       444
       444
       -
       		)

     

       445
       445
       -
       		if err != nil {

     

       446
       446
       -
       			return nil, err

     

       447
       447
       -
       		}

     

       448
       448
       -
       

     

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

     

       450
       450
       -
       		if err != nil {

     

       451
       451
       -
       			return nil, err

     

       452
       452
       -
       		}

     

       453
       453
       -
       		issue.Created = issueCreatedTime

     

       454
       454
       -
       

     

       455
       455
       -
       		issues = append(issues, issue)

     

       456
       456
       -
       	}

     

       457
       457
       -
       

     

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

     

       459
       459
       -
       		return nil, err

     

       460
       460
       -
       	}

     

       461
       461
       -
       

     

       462
       462
       -
       	return issues, nil

     

       463
       463
       -
       }

     

       464
       464
       -
       

     

       465
       398
        
       func GetIssues(e Execer, filters ...filter) ([]Issue, error) {

     

       466
       399
        
       	return GetIssuesPaginated(e, pagination.FirstPage(), filters...)

     

       467
       467
       -
       }

     

       468
       468
       -
       

     

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

     

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

     

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

     

       472
       472
       -
       	var issues []Issue

     

       473
       473
       -
       

     

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

     

       475
       475
       -
       		`select

     

       476
       476
       -
       			i.id,

     

       477
       477
       -
       			i.owner_did,

     

       478
       478
       -
       			i.rkey,

     

       479
       479
       -
       			i.repo_at,

     

       480
       480
       -
       			i.issue_id,

     

       481
       481
       -
       			i.created,

     

       482
       482
       -
       			i.title,

     

       483
       483
       -
       			i.body,

     

       484
       484
       -
       			i.open,

     

       485
       485
       -
       			r.did,

     

       486
       486
       -
       			r.name,

     

       487
       487
       -
       			r.knot,

     

       488
       488
       -
       			r.rkey,

     

       489
       489
       -
       			r.created

     

       490
       490
       -
       		from

     

       491
       491
       -
       		    issues i

     

       492
       492
       -
       		join

     

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

     

       494
       494
       -
       		where

     

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

     

       496
       496
       -
       		order by

     

       497
       497
       -
       			i.created desc`,

     

       498
       498
       -
       		ownerDid, timeframe)

     

       499
       499
       -
       	if err != nil {

     

       500
       500
       -
       		return nil, err

     

       501
       501
       -
       	}

     

       502
       502
       -
       	defer rows.Close()

     

       503
       503
       -
       

     

       504
       504
       -
       	for rows.Next() {

     

       505
       505
       -
       		var issue Issue

     

       506
       506
       -
       		var issueCreatedAt, repoCreatedAt string

     

       507
       507
       -
       		var repo Repo

     

       508
       508
       -
       		err := rows.Scan(

     

       509
       509
       -
       			&issue.Id,

     

       510
       510
       -
       			&issue.Did,

     

       511
       511
       -
       			&issue.Rkey,

     

       512
       512
       -
       			&issue.RepoAt,

     

       513
       513
       -
       			&issue.IssueId,

     

       514
       514
       -
       			&issueCreatedAt,

     

       515
       515
       -
       			&issue.Title,

     

       516
       516
       -
       			&issue.Body,

     

       517
       517
       -
       			&issue.Open,

     

       518
       518
       -
       			&repo.Did,

     

       519
       519
       -
       			&repo.Name,

     

       520
       520
       -
       			&repo.Knot,

     

       521
       521
       -
       			&repo.Rkey,

     

       522
       522
       -
       			&repoCreatedAt,

     

       523
       523
       -
       		)

     

       524
       524
       -
       		if err != nil {

     

       525
       525
       -
       			return nil, err

     

       526
       526
       -
       		}

     

       527
       527
       -
       

     

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

     

       529
       529
       -
       		if err != nil {

     

       530
       530
       -
       			return nil, err

     

       531
       531
       -
       		}

     

       532
       532
       -
       		issue.Created = issueCreatedTime

     

       533
       533
       -
       

     

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

     

       535
       535
       -
       		if err != nil {

     

       536
       536
       -
       			return nil, err

     

       537
       537
       -
       		}

     

       538
       538
       -
       		repo.Created = repoCreatedTime

     

       539
       539
       -
       

     

       540
       540
       -
       		issues = append(issues, issue)

     

       541
       541
       -
       	}

     

       542
       542
       -
       

     

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

     

       544
       544
       -
       		return nil, err

     

       545
       545
       -
       	}

     

       546
       546
       -
       

     

       547
       547
       -
       	return issues, nil

     

       548
       400
        
       }

     

       549
       401
        
       

     

       550
       402
        
       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 = ?`

+7 -12

appview/ingester.go

···

       5
       5
        
       	"encoding/json"

     

       6
       6
        
       	"fmt"

     

       7
       7
        
       	"log/slog"

     

       8
       8
       -
       	"strings"

     

       9
       8
        
       

     

       10
       9
        
       	"time"

     

       11
       10
        
       

     
···

       16
       15
        
       	"tangled.sh/tangled.sh/core/api/tangled"

     

       17
       16
        
       	"tangled.sh/tangled.sh/core/appview/config"

     

       18
       17
        
       	"tangled.sh/tangled.sh/core/appview/db"

     

       19
       19
       -
       	"tangled.sh/tangled.sh/core/appview/pages/markup"

     

       20
       18
        
       	"tangled.sh/tangled.sh/core/appview/serververify"

     

       19
       19
       +
       	"tangled.sh/tangled.sh/core/appview/validator"

     

       21
       20
        
       	"tangled.sh/tangled.sh/core/idresolver"

     

       22
       21
        
       	"tangled.sh/tangled.sh/core/rbac"

     

       23
       22
        
       )

     
···

       28
       27
        
       	IdResolver *idresolver.Resolver

     

       29
       28
        
       	Config     *config.Config

     

       30
       29
        
       	Logger     *slog.Logger

     

       30
       30
       +
       	Validator  *validator.Validator

     

       31
       31
        
       }

     

       32
       32
        
       

     

       33
       33
        
       type processFunc func(ctx context.Context, e *models.Event) error

     
···

       802
       802
        
       

     

       803
       803
        
       		issue := db.IssueFromRecord(did, rkey, record)

     

       804
       804
        
       

     

       805
       805
       -
       		sanitizer := markup.NewSanitizer()

     

       806
       806
       -
       		if st := strings.TrimSpace(sanitizer.SanitizeDescription(issue.Title)); st == "" {

     

       807
       807
       -
       			return fmt.Errorf("title is empty after HTML sanitization")

     

       808
       808
       -
       		}

     

       809
       809
       -
       		if sb := strings.TrimSpace(sanitizer.SanitizeDefault(issue.Body)); sb == "" {

     

       810
       810
       -
       			return fmt.Errorf("body is empty after HTML sanitization")

     

       805
       805
       +
       		if err := i.Validator.ValidateIssue(&issue); err != nil {

     

       806
       806
       +
       			return fmt.Errorf("failed to validate issue: %w", err)

     

       811
       807
        
       		}

     

       812
       808
        
       

     

       813
       809
        
       		tx, err := ddb.BeginTx(ctx, nil)

     
···

       817
       813
        
       		}

     

       818
       814
        
       		defer tx.Rollback()

     

       819
       815
        
       

     

       820
       820
       -
       		err = db.NewIssue(tx, &issue)

     

       816
       816
       +
       		err = db.PutIssue(tx, &issue)

     

       821
       817
        
       		if err != nil {

     

       822
       818
        
       			l.Error("failed to create issue", "err", err)

     

       823
       819
        
       			return err

     
···

       875
       871
        
       			return fmt.Errorf("failed to parse comment from record: %w", err)

     

       876
       872
        
       		}

     

       877
       873
        
       

     

       878
       878
       -
       		sanitizer := markup.NewSanitizer()

     

       879
       879
       -
       		if sb := strings.TrimSpace(sanitizer.SanitizeDefault(comment.Body)); sb == "" {

     

       880
       880
       -
       			return fmt.Errorf("body is empty after HTML sanitization")

     

       874
       874
       +
       		if err := i.Validator.ValidateIssueComment(comment); err != nil {

     

       875
       875
       +
       			return fmt.Errorf("failed to validate comment: %w", err)

     

       881
       876
        
       		}

     

       882
       877
        
       

     

       883
       878
        
       		_, err = db.AddIssueComment(ddb, *comment)

+155 -37

appview/issues/issues.go

···

       9
       9
        
       	"log/slog"

     

       10
       10
        
       	"net/http"

     

       11
       11
        
       	"slices"

     

       12
       12
       -
       	"strings"

     

       13
       12
        
       	"time"

     

       14
       13
        
       

     

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

     
···

       23
       22
        
       	"tangled.sh/tangled.sh/core/appview/notify"

     

       24
       23
        
       	"tangled.sh/tangled.sh/core/appview/oauth"

     

       25
       24
        
       	"tangled.sh/tangled.sh/core/appview/pages"

     

       26
       26
       -
       	"tangled.sh/tangled.sh/core/appview/pages/markup"

     

       27
       25
        
       	"tangled.sh/tangled.sh/core/appview/pagination"

     

       28
       26
        
       	"tangled.sh/tangled.sh/core/appview/reporesolver"

     

       29
       27
        
       	"tangled.sh/tangled.sh/core/appview/validator"

     
···

       53
       51
        
       	db *db.DB,

     

       54
       52
        
       	config *config.Config,

     

       55
       53
        
       	notifier notify.Notifier,

     

       54
       54
       +
       	validator *validator.Validator,

     

       56
       55
        
       ) *Issues {

     

       57
       56
        
       	return &Issues{

     

       58
       57
        
       		oauth:        oauth,

     
···

       102
       101
        
       		Reactions:            reactionCountMap,

     

       103
       102
        
       		UserReacted:          userReactions,

     

       104
       103
        
       	})

     

       104
       104
       +
       }

     

       105
       105
        
       

     

       106
       106
       +
       func (rp *Issues) EditIssue(w http.ResponseWriter, r *http.Request) {

     

       107
       107
       +
       	l := rp.logger.With("handler", "EditIssue")

     

       108
       108
       +
       	user := rp.oauth.GetUser(r)

     

       109
       109
       +
       	f, err := rp.repoResolver.Resolve(r)

     

       110
       110
       +
       	if err != nil {

     

       111
       111
       +
       		log.Println("failed to get repo and knot", err)

     

       112
       112
       +
       		return

     

       113
       113
       +
       	}

     

       114
       114
       +
       

     

       115
       115
       +
       	issue, ok := r.Context().Value("issue").(*db.Issue)

     

       116
       116
       +
       	if !ok {

     

       117
       117
       +
       		l.Error("failed to get issue")

     

       118
       118
       +
       		rp.pages.Error404(w)

     

       119
       119
       +
       		return

     

       120
       120
       +
       	}

     

       121
       121
       +
       

     

       122
       122
       +
       	switch r.Method {

     

       123
       123
       +
       	case http.MethodGet:

     

       124
       124
       +
       		rp.pages.EditIssueFragment(w, pages.EditIssueParams{

     

       125
       125
       +
       			LoggedInUser: user,

     

       126
       126
       +
       			RepoInfo:     f.RepoInfo(user),

     

       127
       127
       +
       			Issue:        issue,

     

       128
       128
       +
       		})

     

       129
       129
       +
       	case http.MethodPost:

     

       130
       130
       +
       		noticeId := "issues"

     

       131
       131
       +
       		newIssue := issue

     

       132
       132
       +
       		newIssue.Title = r.FormValue("title")

     

       133
       133
       +
       		newIssue.Body = r.FormValue("body")

     

       134
       134
       +
       

     

       135
       135
       +
       		if err := rp.validator.ValidateIssue(newIssue); err != nil {

     

       136
       136
       +
       			l.Error("validation error", "err", err)

     

       137
       137
       +
       			rp.pages.Notice(w, noticeId, fmt.Sprintf("Failed to edit issue: %s", err))

     

       138
       138
       +
       			return

     

       139
       139
       +
       		}

     

       140
       140
       +
       

     

       141
       141
       +
       		newRecord := newIssue.AsRecord()

     

       142
       142
       +
       

     

       143
       143
       +
       		// edit an atproto record

     

       144
       144
       +
       		client, err := rp.oauth.AuthorizedClient(r)

     

       145
       145
       +
       		if err != nil {

     

       146
       146
       +
       			l.Error("failed to get authorized client", "err", err)

     

       147
       147
       +
       			rp.pages.Notice(w, noticeId, "Failed to edit issue.")

     

       148
       148
       +
       			return

     

       149
       149
       +
       		}

     

       150
       150
       +
       

     

       151
       151
       +
       		ex, err := client.RepoGetRecord(r.Context(), "", tangled.RepoIssueNSID, user.Did, newIssue.Rkey)

     

       152
       152
       +
       		if err != nil {

     

       153
       153
       +
       			l.Error("failed to get record", "err", err)

     

       154
       154
       +
       			rp.pages.Notice(w, noticeId, "Failed to edit issue, no record found on PDS.")

     

       155
       155
       +
       			return

     

       156
       156
       +
       		}

     

       157
       157
       +
       

     

       158
       158
       +
       		_, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{

     

       159
       159
       +
       			Collection: tangled.RepoIssueNSID,

     

       160
       160
       +
       			Repo:       user.Did,

     

       161
       161
       +
       			Rkey:       newIssue.Rkey,

     

       162
       162
       +
       			SwapRecord: ex.Cid,

     

       163
       163
       +
       			Record: &lexutil.LexiconTypeDecoder{

     

       164
       164
       +
       				Val: &newRecord,

     

       165
       165
       +
       			},

     

       166
       166
       +
       		})

     

       167
       167
       +
       		if err != nil {

     

       168
       168
       +
       			l.Error("failed to edit record on PDS", "err", err)

     

       169
       169
       +
       			rp.pages.Notice(w, noticeId, "Failed to edit issue on PDS.")

     

       170
       170
       +
       			return

     

       171
       171
       +
       		}

     

       172
       172
       +
       

     

       173
       173
       +
       		// modify on DB -- TODO: transact this cleverly

     

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

     

       175
       175
       +
       		if err != nil {

     

       176
       176
       +
       			l.Error("failed to edit issue on DB", "err", err)

     

       177
       177
       +
       			rp.pages.Notice(w, noticeId, "Failed to edit issue.")

     

       178
       178
       +
       			return

     

       179
       179
       +
       		}

     

       180
       180
       +
       		defer tx.Rollback()

     

       181
       181
       +
       

     

       182
       182
       +
       		err = db.PutIssue(tx, newIssue)

     

       183
       183
       +
       		if err != nil {

     

       184
       184
       +
       			log.Println("failed to edit issue", err)

     

       185
       185
       +
       			rp.pages.Notice(w, "issues", "Failed to edit issue.")

     

       186
       186
       +
       			return

     

       187
       187
       +
       		}

     

       188
       188
       +
       

     

       189
       189
       +
       		if err = tx.Commit(); err != nil {

     

       190
       190
       +
       			l.Error("failed to edit issue", "err", err)

     

       191
       191
       +
       			rp.pages.Notice(w, "issues", "Failed to cedit issue.")

     

       192
       192
       +
       			return

     

       193
       193
       +
       		}

     

       194
       194
       +
       

     

       195
       195
       +
       		rp.pages.HxRefresh(w)

     

       196
       196
       +
       	}

     

       197
       197
       +
       }

     

       198
       198
       +
       

     

       199
       199
       +
       func (rp *Issues) DeleteIssue(w http.ResponseWriter, r *http.Request) {

     

       200
       200
       +
       	l := rp.logger.With("handler", "DeleteIssue")

     

       201
       201
       +
       	noticeId := "issue-actions-error"

     

       202
       202
       +
       

     

       203
       203
       +
       	user := rp.oauth.GetUser(r)

     

       204
       204
       +
       

     

       205
       205
       +
       	f, err := rp.repoResolver.Resolve(r)

     

       206
       206
       +
       	if err != nil {

     

       207
       207
       +
       		l.Error("failed to get repo and knot", "err", err)

     

       208
       208
       +
       		return

     

       209
       209
       +
       	}

     

       210
       210
       +
       

     

       211
       211
       +
       	issue, ok := r.Context().Value("issue").(*db.Issue)

     

       212
       212
       +
       	if !ok {

     

       213
       213
       +
       		l.Error("failed to get issue")

     

       214
       214
       +
       		rp.pages.Notice(w, noticeId, "Failed to delete issue.")

     

       215
       215
       +
       		return

     

       216
       216
       +
       	}

     

       217
       217
       +
       	l = l.With("did", issue.Did, "rkey", issue.Rkey)

     

       218
       218
       +
       

     

       219
       219
       +
       	// delete from PDS

     

       220
       220
       +
       	client, err := rp.oauth.AuthorizedClient(r)

     

       221
       221
       +
       	if err != nil {

     

       222
       222
       +
       		log.Println("failed to get authorized client", err)

     

       223
       223
       +
       		rp.pages.Notice(w, "issue-comment", "Failed to delete comment.")

     

       224
       224
       +
       		return

     

       225
       225
       +
       	}

     

       226
       226
       +
       	_, err = client.RepoDeleteRecord(r.Context(), &comatproto.RepoDeleteRecord_Input{

     

       227
       227
       +
       		Collection: tangled.RepoIssueNSID,

     

       228
       228
       +
       		Repo:       issue.Did,

     

       229
       229
       +
       		Rkey:       issue.Rkey,

     

       230
       230
       +
       	})

     

       231
       231
       +
       	if err != nil {

     

       232
       232
       +
       		// TODO: transact this better

     

       233
       233
       +
       		l.Error("failed to delete issue from PDS", "err", err)

     

       234
       234
       +
       		rp.pages.Notice(w, noticeId, "Failed to delete issue.")

     

       235
       235
       +
       		return

     

       236
       236
       +
       	}

     

       237
       237
       +
       

     

       238
       238
       +
       	// delete from db

     

       239
       239
       +
       	if err := db.DeleteIssues(rp.db, db.FilterEq("id", issue.Id)); err != nil {

     

       240
       240
       +
       		l.Error("failed to delete issue", "err", err)

     

       241
       241
       +
       		rp.pages.Notice(w, noticeId, "Failed to delete issue.")

     

       242
       242
       +
       		return

     

       243
       243
       +
       	}

     

       244
       244
       +
       

     

       245
       245
       +
       	// return to all issues page

     

       246
       246
       +
       	rp.pages.HxRedirect(w, "/"+f.RepoInfo(user).FullName()+"/issues")

     

       106
       247
        
       }

     

       107
       248
        
       

     

       108
       249
        
       func (rp *Issues) CloseIssue(w http.ResponseWriter, r *http.Request) {

     
···

       220
       361
        
       	replyToUri := r.FormValue("reply-to")

     

       221
       362
        
       	var replyTo *string

     

       222
       363
        
       	if replyToUri != "" {

     

       223
       223
       -
       		uri, err := syntax.ParseATURI(replyToUri)

     

       224
       224
       -
       		if err != nil {

     

       225
       225
       -
       			l.Error("failed to get parse replyTo", "err", err, "replyTo", replyToUri)

     

       226
       226
       -
       			rp.pages.Notice(w, "issue-comment", "Failed to create comment.")

     

       227
       227
       -
       			return

     

       228
       228
       -
       		}

     

       229
       229
       -
       		if uri.Collection() != tangled.RepoIssueCommentNSID {

     

       230
       230
       -
       			l.Error("invalid replyTo collection", "collection", uri.Collection())

     

       231
       231
       -
       			rp.pages.Notice(w, "issue-comment", "Failed to create comment.")

     

       232
       232
       -
       			return

     

       233
       233
       -
       		}

     

       234
       234
       -
       		u := uri.String()

     

       235
       235
       -
       		replyTo = &u

     

       364
       364
       +
       		replyTo = &replyToUri

     

       236
       365
        
       	}

     

       237
       366
        
       

     

       238
       367
        
       	comment := db.IssueComment{

     
···

       579
       708
        
       			return

     

       580
       709
        
       		}

     

       581
       710
        
       		_, err = client.RepoDeleteRecord(r.Context(), &comatproto.RepoDeleteRecord_Input{

     

       582
       582
       -
       			Collection: tangled.GraphFollowNSID,

     

       711
       711
       +
       			Collection: tangled.RepoIssueCommentNSID,

     

       583
       712
        
       			Repo:       user.Did,

     

       584
       713
        
       			Rkey:       comment.Rkey,

     

       585
       714
        
       		})

     
···

       669
       798
        
       			RepoInfo:     f.RepoInfo(user),

     

       670
       799
        
       		})

     

       671
       800
        
       	case http.MethodPost:

     

       672
       672
       -
       		title := r.FormValue("title")

     

       673
       673
       -
       		body := r.FormValue("body")

     

       674
       674
       -
       

     

       675
       675
       -
       		if title == "" || body == "" {

     

       676
       676
       -
       			rp.pages.Notice(w, "issues", "Title and body are required")

     

       677
       677
       -
       			return

     

       678
       678
       -
       		}

     

       679
       679
       -
       

     

       680
       680
       -
       		sanitizer := markup.NewSanitizer()

     

       681
       681
       -
       		if st := strings.TrimSpace(sanitizer.SanitizeDescription(title)); st == "" {

     

       682
       682
       -
       			rp.pages.Notice(w, "issues", "Title is empty after HTML sanitization")

     

       683
       683
       -
       			return

     

       684
       684
       -
       		}

     

       685
       685
       -
       		if sb := strings.TrimSpace(sanitizer.SanitizeDefault(body)); sb == "" {

     

       686
       686
       -
       			rp.pages.Notice(w, "issues", "Body is empty after HTML sanitization")

     

       687
       687
       -
       			return

     

       688
       688
       -
       		}

     

       689
       689
       -
       

     

       690
       801
        
       		issue := &db.Issue{

     

       691
       802
        
       			RepoAt:  f.RepoAt(),

     

       692
       803
        
       			Rkey:    tid.TID(),

     

       693
       693
       -
       			Title:   title,

     

       694
       694
       -
       			Body:    body,

     

       804
       804
       +
       			Title:   r.FormValue("title"),

     

       805
       805
       +
       			Body:    r.FormValue("body"),

     

       695
       806
        
       			Did:     user.Did,

     

       696
       807
        
       			Created: time.Now(),

     

       697
       808
        
       		}

     

       809
       809
       +
       

     

       810
       810
       +
       		if err := rp.validator.ValidateIssue(issue); err != nil {

     

       811
       811
       +
       			l.Error("validation error", "err", err)

     

       812
       812
       +
       			rp.pages.Notice(w, "issues", fmt.Sprintf("Failed to create issue: %s", err))

     

       813
       813
       +
       			return

     

       814
       814
       +
       		}

     

       815
       815
       +
       

     

       698
       816
        
       		record := issue.AsRecord()

     

       699
       817
        
       

     

       700
       818
        
       		// create an atproto record

     
···

       738
       856
        
       		}

     

       739
       857
        
       		defer rollback()

     

       740
       858
        
       

     

       741
       741
       -
       		err = db.NewIssue(tx, issue)

     

       859
       859
       +
       		err = db.PutIssue(tx, issue)

     

       742
       860
        
       		if err != nil {

     

       743
       861
        
       			log.Println("failed to create issue", err)

     

       744
       862
        
       			rp.pages.Notice(w, "issues", "Failed to create issue.")

appview/issues/router.go

···

       29
       29
        
       					r.Get("/reply", i.ReplyIssueComment)

     

       30
       30
        
       					r.Get("/replyPlaceholder", i.ReplyIssueCommentPlaceholder)

     

       31
       31
        
       				})

     

       32
       32
       +
       				r.Get("/edit", i.EditIssue)

     

       33
       33
       +
       				r.Post("/edit", i.EditIssue)

     

       34
       34
       +
       				r.Delete("/", i.DeleteIssue)

     

       32
       35
        
       				r.Post("/close", i.CloseIssue)

     

       33
       36
        
       				r.Post("/reopen", i.ReopenIssue)

     

       34
       37
        
       			})

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

+19 -40

appview/pages/pages.go

···

       117
       117
        
       	return fragmentPaths, nil

     

       118
       118
        
       }

     

       119
       119
        
       

     

       120
       120
       -
       func (p *Pages) fragments() (*template.Template, error) {

     

       121
       121
       -
       	fragmentPaths, err := p.fragmentPaths()

     

       122
       122
       -
       	if err != nil {

     

       123
       123
       -
       		return nil, err

     

       124
       124
       -
       	}

     

       125
       125
       -
       

     

       126
       126
       -
       	funcs := p.funcMap()

     

       127
       127
       -
       

     

       128
       128
       -
       	// parse all fragments together

     

       129
       129
       -
       	allFragments := template.New("").Funcs(funcs)

     

       130
       130
       -
       	for _, f := range fragmentPaths {

     

       131
       131
       -
       		name := p.pathToName(f)

     

       132
       132
       -
       

     

       133
       133
       -
       		pf, err := template.New(name).

     

       134
       134
       -
       			Funcs(funcs).

     

       135
       135
       -
       			ParseFS(p.embedFS, f)

     

       136
       136
       -
       		if err != nil {

     

       137
       137
       -
       			return nil, err

     

       138
       138
       -
       		}

     

       139
       139
       -
       

     

       140
       140
       -
       		allFragments, err = allFragments.AddParseTree(name, pf.Tree)

     

       141
       141
       -
       		if err != nil {

     

       142
       142
       -
       			return nil, err

     

       143
       143
       -
       		}

     

       144
       144
       -
       	}

     

       145
       145
       -
       

     

       146
       146
       -
       	return allFragments, nil

     

       147
       147
       -
       }

     

       148
       148
       -
       

     

       149
       120
        
       // parse without memoization

     

       150
       121
        
       func (p *Pages) rawParse(stack ...string) (*template.Template, error) {

     

       151
       122
        
       	paths, err := p.fragmentPaths()

     
···

       915
       886
        
       	OrderedReactionKinds []db.ReactionKind

     

       916
       887
        
       	Reactions            map[db.ReactionKind]int

     

       917
       888
        
       	UserReacted          map[db.ReactionKind]bool

     

       889
       889
       +
       }

     

       918
       890
        
       

     

       919
       919
       -
       	State string

     

       891
       891
       +
       func (p *Pages) RepoSingleIssue(w io.Writer, params RepoSingleIssueParams) error {

     

       892
       892
       +
       	params.Active = "issues"

     

       893
       893
       +
       	return p.executeRepo("repo/issues/issue", w, params)

     

       894
       894
       +
       }

     

       895
       895
       +
       

     

       896
       896
       +
       type EditIssueParams struct {

     

       897
       897
       +
       	LoggedInUser *oauth.User

     

       898
       898
       +
       	RepoInfo     repoinfo.RepoInfo

     

       899
       899
       +
       	Issue        *db.Issue

     

       900
       900
       +
       	Action       string

     

       901
       901
       +
       }

     

       902
       902
       +
       

     

       903
       903
       +
       func (p *Pages) EditIssueFragment(w io.Writer, params EditIssueParams) error {

     

       904
       904
       +
       	params.Action = "edit"

     

       905
       905
       +
       	return p.executePlain("repo/issues/fragments/putIssue", w, params)

     

       920
       906
        
       }

     

       921
       907
        
       

     

       922
       908
        
       type ThreadReactionFragmentParams struct {

     
···

       930
       916
        
       	return p.executePlain("repo/fragments/reaction", w, params)

     

       931
       917
        
       }

     

       932
       918
        
       

     

       933
       933
       -
       func (p *Pages) RepoSingleIssue(w io.Writer, params RepoSingleIssueParams) error {

     

       934
       934
       -
       	params.Active = "issues"

     

       935
       935
       -
       	if params.Issue.Open {

     

       936
       936
       -
       		params.State = "open"

     

       937
       937
       -
       	} else {

     

       938
       938
       -
       		params.State = "closed"

     

       939
       939
       -
       	}

     

       940
       940
       -
       	return p.executeRepo("repo/issues/issue", w, params)

     

       941
       941
       -
       }

     

       942
       942
       -
       

     

       943
       919
        
       type RepoNewIssueParams struct {

     

       944
       920
        
       	LoggedInUser *oauth.User

     

       945
       921
        
       	RepoInfo     repoinfo.RepoInfo

     

       922
       922
       +
       	Issue        *db.Issue // existing issue if any -- passed when editing

     

       946
       923
        
       	Active       string

     

       924
       924
       +
       	Action       string

     

       947
       925
        
       }

     

       948
       926
        
       

     

       949
       927
        
       func (p *Pages) RepoNewIssue(w io.Writer, params RepoNewIssueParams) error {

     

       950
       928
        
       	params.Active = "issues"

     

       929
       929
       +
       	params.Action = "create"

     

       951
       930
        
       	return p.executeRepo("repo/issues/new", w, params)

     

       952
       931
        
       }

     

       953
       932

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

+2 -2

appview/pages/templates/layouts/repobase.html

···

       42
       42
        
           </section>

     

       43
       43
        
       

     

       44
       44
        
           <section

     

       45
       45
       -
               class="w-full flex flex-col drop-shadow-sm"

     

       45
       45
       +
               class="w-full flex flex-col"

     

       46
       46
        
           >

     

       47
       47
        
               <nav class="w-full pl-4 overflow-auto">

     

       48
       48
        
                   <div class="flex z-60">

     
···

       81
       81
        
                   </div>

     

       82
       82
        
               </nav>

     

       83
       83
        
               <section

     

       84
       84
       -
                   class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white"

     

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

     

       85
       85
        
               >

     

       86
       86
        
                   {{ block "repoContent" . }}{{ end }}

     

       87
       87
        
               </section>

+58

appview/pages/templates/repo/issues/fragments/commentList.html

···

       1
       1
       +
       {{ define "repo/issues/fragments/commentList" }}

     

       2
       2
       +
         <div class="flex flex-col gap-8">

     

       3
       3
       +
           {{ range $item := .CommentList }}

     

       4
       4
       +
             {{ template "commentListing" (list $ .) }}

     

       5
       5
       +
           {{ end }}

     

       6
       6
       +
         <div>

     

       7
       7
       +
       {{ end }}

     

       8
       8
       +
       

     

       9
       9
       +
       {{ define "commentListing" }}

     

       10
       10
       +
         {{ $root := index . 0 }}

     

       11
       11
       +
         {{ $comment := index . 1 }}

     

       12
       12
       +
         {{ $params :=

     

       13
       13
       +
               (dict

     

       14
       14
       +
                 "RepoInfo" $root.RepoInfo

     

       15
       15
       +
                 "LoggedInUser" $root.LoggedInUser

     

       16
       16
       +
                 "Issue" $root.Issue

     

       17
       17
       +
                 "Comment" $comment.Self) }}

     

       18
       18
       +
       

     

       19
       19
       +
         <div class="rounded border border-gray-300 dark:border-gray-700 w-full overflow-hidden shadow-sm">

     

       20
       20
       +
           {{ template "topLevelComment" $params }}

     

       21
       21
       +
       

     

       22
       22
       +
           <div class="relative ml-4 border-l border-gray-300 dark:border-gray-700">

     

       23
       23
       +
             {{ range $index, $reply := $comment.Replies }}

     

       24
       24
       +
               <div class="relative ">

     

       25
       25
       +
                 <!-- Horizontal connector -->

     

       26
       26
       +
                 <div class="absolute left-0 top-6 w-4 h-px bg-gray-300 dark:bg-gray-700"></div>

     

       27
       27
       +
       

     

       28
       28
       +
                 <div class="pl-2">

     

       29
       29
       +
                   {{

     

       30
       30
       +
                     template "replyComment"

     

       31
       31
       +
                     (dict

     

       32
       32
       +
                       "RepoInfo" $root.RepoInfo

     

       33
       33
       +
                       "LoggedInUser" $root.LoggedInUser

     

       34
       34
       +
                       "Issue" $root.Issue

     

       35
       35
       +
                       "Comment" $reply)

     

       36
       36
       +
                   }}

     

       37
       37
       +
                 </div>

     

       38
       38
       +
               </div>

     

       39
       39
       +
             {{ end }}

     

       40
       40
       +
           </div>

     

       41
       41
       +
       

     

       42
       42
       +
           {{ template "repo/issues/fragments/replyIssueCommentPlaceholder" $params }}

     

       43
       43
       +
         </div>

     

       44
       44
       +
       {{ end }}

     

       45
       45
       +
       

     

       46
       46
       +
       {{ define "topLevelComment" }}

     

       47
       47
       +
       <div class="rounded px-6 py-4 bg-white dark:bg-gray-800">

     

       48
       48
       +
         {{ template "repo/issues/fragments/issueCommentHeader" . }}

     

       49
       49
       +
         {{ template "repo/issues/fragments/issueCommentBody" . }}

     

       50
       50
       +
       </div>

     

       51
       51
       +
       {{ end }}

     

       52
       52
       +
       

     

       53
       53
       +
       {{ define "replyComment" }}

     

       54
       54
       +
       <div class="p-4 w-full mx-auto overflow-hidden">

     

       55
       55
       +
         {{ template "repo/issues/fragments/issueCommentHeader" . }}

     

       56
       56
       +
         {{ template "repo/issues/fragments/issueCommentBody" . }}

     

       57
       57
       +
       </div>

     

       58
       58
       +
       {{ end }}

+2 -2

appview/pages/templates/repo/issues/fragments/issueCommentActions.html

···

       11
       11
        
       {{ define "edit" }}

     

       12
       12
        
         <a

     

       13
       13
        
           class="text-gray-500 dark:text-gray-400 flex gap-1 items-center group"

     

       14
       14
       -
           hx-get="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.Id }}/comment/{{ .Comment.Id }}/edit"

     

       14
       14
       +
           hx-get="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment/{{ .Comment.Id }}/edit"

     

       15
       15
        
           hx-swap="outerHTML"

     

       16
       16
        
           hx-target="#comment-body-{{.Comment.Id}}">

     

       17
       17
        
           {{ i "pencil" "size-3" }}

     
···

       22
       22
        
       {{ define "delete" }}

     

       23
       23
        
         <a

     

       24
       24
        
           class="text-gray-500 dark:text-gray-400 flex gap-1 items-center group"

     

       25
       25
       -
           hx-delete="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.Id }}/comment/{{ .Comment.Id }}/"

     

       25
       25
       +
           hx-delete="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment/{{ .Comment.Id }}/"

     

       26
       26
        
           hx-confirm="Are you sure you want to delete your comment?"

     

       27
       27
        
           hx-swap="outerHTML"

     

       28
       28
        
           hx-target="#comment-body-{{.Comment.Id}}"

+6 -6

appview/pages/templates/repo/issues/fragments/issueCommentHeader.html

···

       5
       5
        
           {{ template "timestamp" . }}

     

       6
       6
        
           {{ $isCommentOwner := and .LoggedInUser (eq .LoggedInUser.Did .Comment.Did) }}

     

       7
       7
        
           {{ if and $isCommentOwner (not .Comment.Deleted) }}

     

       8
       8
       -
             {{ template "edit" . }}

     

       9
       9
       -
             {{ template "delete" . }}

     

       8
       8
       +
             {{ template "editIssueComment" . }}

     

       9
       9
       +
             {{ template "deleteIssueComment" . }}

     

       10
       10
        
           {{ end }}

     

       11
       11
        
         </div>

     

       12
       12
        
       {{ end }}

     
···

       32
       32
        
         </a>

     

       33
       33
        
       {{ end }}

     

       34
       34
        
       

     

       35
       35
       -
       {{ define "edit" }}

     

       35
       35
       +
       {{ define "editIssueComment" }}

     

       36
       36
        
         <a

     

       37
       37
        
           class="text-gray-500 dark:text-gray-400 flex gap-1 items-center group"

     

       38
       38
       -
           hx-get="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.Id }}/comment/{{ .Comment.Id }}/edit"

     

       38
       38
       +
           hx-get="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment/{{ .Comment.Id }}/edit"

     

       39
       39
        
           hx-swap="outerHTML"

     

       40
       40
        
           hx-target="#comment-body-{{.Comment.Id}}">

     

       41
       41
        
           {{ i "pencil" "size-3" }}

     

       42
       42
        
         </a>

     

       43
       43
        
       {{ end }}

     

       44
       44
        
       

     

       45
       45
       -
       {{ define "delete" }}

     

       45
       45
       +
       {{ define "deleteIssueComment" }}

     

       46
       46
        
         <a

     

       47
       47
        
           class="text-gray-500 dark:text-gray-400 flex gap-1 items-center group"

     

       48
       48
       -
           hx-delete="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.Id }}/comment/{{ .Comment.Id }}/"

     

       48
       48
       +
           hx-delete="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment/{{ .Comment.Id }}/"

     

       49
       49
        
           hx-confirm="Are you sure you want to delete your comment?"

     

       50
       50
        
           hx-swap="outerHTML"

     

       51
       51
        
           hx-target="#comment-body-{{.Comment.Id}}"

+2 -2

appview/pages/templates/repo/issues/fragments/newComment.html

···

       38
       38
        
               {{ $isIssueAuthor := and .LoggedInUser (eq .LoggedInUser.Did .Issue.Did) }}

     

       39
       39
        
               {{ $isRepoCollaborator := .RepoInfo.Roles.IsCollaborator }}

     

       40
       40
        
               {{ $isRepoOwner := .RepoInfo.Roles.IsOwner }}

     

       41
       41
       -
               {{ if and (or $isIssueAuthor $isRepoCollaborator $isRepoOwner) (eq .State "open") }}

     

       41
       41
       +
               {{ if and (or $isIssueAuthor $isRepoCollaborator $isRepoOwner) .Issue.Open }}

     

       42
       42
        
               <button

     

       43
       43
        
                   id="close-button"

     

       44
       44
        
                   type="button"

     
···

       84
       84
        
                       }

     

       85
       85
        
                   });

     

       86
       86
        
               </script>

     

       87
       87
       -
               {{ else if and (or $isIssueAuthor $isRepoCollaborator $isRepoOwner) (eq .State "closed") }}

     

       87
       87
       +
               {{ else if and (or $isIssueAuthor $isRepoCollaborator $isRepoOwner) (not .Issue.Open) }}

     

       88
       88
        
               <button

     

       89
       89
        
                   type="button"

     

       90
       90
        
                   class="btn flex items-center gap-2"

+57

appview/pages/templates/repo/issues/fragments/putIssue.html

···

       1
       1
       +
       {{ define "repo/issues/fragments/putIssue" }}

     

       2
       2
       +
       <!-- this form is used for new and edit, .Issue is passed when editing -->

     

       3
       3
       +
       <form

     

       4
       4
       +
         {{ if eq .Action "edit" }}

     

       5
       5
       +
           hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/edit"

     

       6
       6
       +
         {{ else }}

     

       7
       7
       +
           hx-post="/{{ .RepoInfo.FullName }}/issues/new"

     

       8
       8
       +
         {{ end }}

     

       9
       9
       +
         hx-swap="none"

     

       10
       10
       +
         hx-indicator="#spinner">

     

       11
       11
       +
         <div class="flex flex-col gap-2">

     

       12
       12
       +
           <div>

     

       13
       13
       +
             <label for="title">title</label>

     

       14
       14
       +
             <input type="text" name="title" id="title" class="w-full" value="{{ if .Issue }}{{ .Issue.Title }}{{ end }}" />

     

       15
       15
       +
           </div>

     

       16
       16
       +
           <div>

     

       17
       17
       +
             <label for="body">body</label>

     

       18
       18
       +
             <textarea

     

       19
       19
       +
               name="body"

     

       20
       20
       +
               id="body"

     

       21
       21
       +
               rows="6"

     

       22
       22
       +
               class="w-full resize-y"

     

       23
       23
       +
               placeholder="Describe your issue. Markdown is supported."

     

       24
       24
       +
               >{{ if .Issue }}{{ .Issue.Body }}{{ end }}</textarea>

     

       25
       25
       +
           </div>

     

       26
       26
       +
           <div class="flex justify-between">

     

       27
       27
       +
             <div id="issues" class="error"></div>

     

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

     

       29
       29
       +
               <a 

     

       30
       30
       +
                 class="btn flex items-center gap-2 no-underline hover:no-underline"

     

       31
       31
       +
                 type="button"

     

       32
       32
       +
                 {{ if .Issue }}

     

       33
       33
       +
                   href="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}"

     

       34
       34
       +
                 {{ else }}

     

       35
       35
       +
                   href="/{{ .RepoInfo.FullName }}/issues"

     

       36
       36
       +
                 {{ end }}

     

       37
       37
       +
                 >

     

       38
       38
       +
                 {{ i "x" "w-4 h-4" }}

     

       39
       39
       +
                 cancel

     

       40
       40
       +
               </a>

     

       41
       41
       +
               <button type="submit" class="btn-create flex items-center gap-2">

     

       42
       42
       +
                 {{ if eq .Action "edit" }}

     

       43
       43
       +
                   {{ i "pencil" "w-4 h-4" }}

     

       44
       44
       +
                   {{ .Action }} issue

     

       45
       45
       +
                 {{ else }}

     

       46
       46
       +
                   {{ i "circle-plus" "w-4 h-4" }}

     

       47
       47
       +
                   {{ .Action }} issue

     

       48
       48
       +
                 {{ end }}

     

       49
       49
       +
                 <span id="spinner" class="group">

     

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

     

       51
       51
       +
                 </span>

     

       52
       52
       +
               </button>

     

       53
       53
       +
             </div>

     

       54
       54
       +
           </div>

     

       55
       55
       +
         </div>

     

       56
       56
       +
       </form>

     

       57
       57
       +
       {{ end }}

+6 -2

appview/pages/templates/repo/issues/fragments/replyComment.html

···

       4
       4
        
             id="reply-form-{{ .Comment.Id }}"

     

       5
       5
        
             hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment"

     

       6
       6
        
             hx-on::after-request="if(event.detail.successful) this.reset()"

     

       7
       7
       +
             hx-disabled-elt="#reply-{{ .Comment.Id }}"

     

       7
       8
        
         >

     

       8
       9
        
             {{ template "user/fragments/picHandleLink" .LoggedInUser.Did }}

     

       9
       10
        
             <textarea

     
···

       12
       13
        
               class="w-full p-2"

     

       13
       14
        
               placeholder="Leave a reply..."

     

       14
       15
        
               autofocus

     

       15
       15
       -
               rows="3"></textarea>

     

       16
       16
       +
               rows="3"

     

       17
       17
       +
               hx-trigger="keydown[ctrlKey&&key=='Enter']"

     

       18
       18
       +
               hx-target="#reply-form-{{ .Comment.Id }}"

     

       19
       19
       +
               hx-get="#"

     

       20
       20
       +
               hx-on:htmx:before-request="event.preventDefault(); document.getElementById('reply-form-{{ .Comment.Id }}').requestSubmit()"></textarea>

     

       16
       21
        
       

     

       17
       22
        
             <input

     

       18
       23
        
                 type="text"

     
···

       48
       53
        
         <button

     

       49
       54
        
             id="reply-{{ .Comment.Id }}"

     

       50
       55
        
             type="submit"

     

       51
       51
       -
             hx-disabled-elt="#reply-{{ .Comment.Id }}"

     

       52
       56
        
             class="btn-create flex items-center gap-2 no-underline hover:no-underline">

     

       53
       57
        
             {{ i "reply" "w-4 h-4 inline group-[.htmx-request]:hidden" }}

     

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

+20

appview/pages/templates/repo/issues/fragments/replyIssueCommentPlaceholder.html

···

       1
       1
       +
       {{ define "repo/issues/fragments/replyIssueCommentPlaceholder" }}

     

       2
       2
       +
         <div class="p-2 border-t flex gap-2 items-center border-gray-300 dark:border-gray-700">

     

       3
       3
       +
           {{ if .LoggedInUser }}

     

       4
       4
       +
             <img

     

       5
       5
       +
                 src="{{ tinyAvatar .LoggedInUser.Did }}"

     

       6
       6
       +
                 alt=""

     

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

     

       8
       8
       +
             />

     

       9
       9
       +
           {{ end }}

     

       10
       10
       +
           <input

     

       11
       11
       +
             class="w-full py-2 border-none focus:outline-none"

     

       12
       12
       +
             placeholder="Leave a reply..."

     

       13
       13
       +
             hx-get="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment/{{ .Comment.Id }}/reply"

     

       14
       14
       +
             hx-trigger="focus"

     

       15
       15
       +
             hx-target="closest div"

     

       16
       16
       +
             hx-swap="outerHTML"

     

       17
       17
       +
             >

     

       18
       18
       +
           </input>

     

       19
       19
       +
         </div>

     

       20
       20
       +
       {{ end }}

+85 -44

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

···

       9
       9
        
       {{ end }}

     

       10
       10
        
       

     

       11
       11
        
       {{ define "repoContent" }}

     

       12
       12
       -
           <header class="pb-4">

     

       13
       13
       -
             <h1 class="text-2xl">

     

       14
       14
       -
             {{ .Issue.Title | description }}

     

       15
       15
       -
             <span class="text-gray-500 dark:text-gray-400">#{{ .Issue.IssueId }}</span>

     

       16
       16
       -
             </h1>

     

       17
       17
       -
           </header>

     

       12
       12
       +
       <section id="issue-{{ .Issue.IssueId }}">

     

       13
       13
       +
         {{ template "issueHeader" .Issue }}

     

       14
       14
       +
         {{ template "issueInfo" . }}

     

       15
       15
       +
         {{ if .Issue.Body }}

     

       16
       16
       +
           <article id="body" class="mt-4 prose dark:prose-invert">{{ .Issue.Body | markdown }}</article>

     

       17
       17
       +
         {{ end }}

     

       18
       18
       +
         {{ template "issueReactions" . }}

     

       19
       19
       +
       </section>

     

       20
       20
       +
       {{ end }}

     

       21
       21
       +
       

     

       22
       22
       +
       {{ define "issueHeader" }}

     

       23
       23
       +
         <header class="pb-2">

     

       24
       24
       +
           <h1 class="text-2xl">

     

       25
       25
       +
             {{ .Title | description }}

     

       26
       26
       +
             <span class="text-gray-500 dark:text-gray-400">#{{ .IssueId }}</span>

     

       27
       27
       +
           </h1>

     

       28
       28
       +
         </header>

     

       29
       29
       +
       {{ end }}

     

       30
       30
       +
       

     

       31
       31
       +
       {{ define "issueInfo" }}

     

       32
       32
       +
         {{ $bgColor := "bg-gray-800 dark:bg-gray-700" }}

     

       33
       33
       +
         {{ $icon := "ban" }}

     

       34
       34
       +
         {{ if eq .Issue.State "open" }}

     

       35
       35
       +
             {{ $bgColor = "bg-green-600 dark:bg-green-700" }}

     

       36
       36
       +
             {{ $icon = "circle-dot" }}

     

       37
       37
       +
         {{ end }}

     

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

     

       39
       39
       +
           <div id="state"

     

       40
       40
       +
             class="inline-flex items-center rounded px-3 py-1 {{ $bgColor }}">

     

       41
       41
       +
             {{ i $icon "w-4 h-4 mr-1.5 text-white" }}

     

       42
       42
       +
             <span class="text-white">{{ .Issue.State }}</span>

     

       43
       43
       +
           </div>

     

       44
       44
       +
           <span class="text-gray-500 dark:text-gray-400 text-sm flex flex-wrap items-center gap-1">

     

       45
       45
       +
             opened by

     

       46
       46
       +
             {{ template "user/fragments/picHandleLink" .Issue.Did }}

     

       47
       47
       +
             <span class="select-none before:content-['\00B7']"></span>

     

       48
       48
       +
             {{ if .Issue.Edited }}

     

       49
       49
       +
               edited {{ template "repo/fragments/time" .Issue.Edited }}

     

       50
       50
       +
             {{ else }}

     

       51
       51
       +
               {{ template "repo/fragments/time" .Issue.Created }}

     

       52
       52
       +
             {{ end }}

     

       53
       53
       +
           </span>

     

       18
       54
        
       

     

       19
       19
       -
           {{ $bgColor := "bg-gray-800 dark:bg-gray-700" }}

     

       20
       20
       -
           {{ $icon := "ban" }}

     

       21
       21
       -
           {{ if eq .State "open" }}

     

       22
       22
       -
               {{ $bgColor = "bg-green-600 dark:bg-green-700" }}

     

       23
       23
       -
               {{ $icon = "circle-dot" }}

     

       55
       55
       +
           {{ if and .LoggedInUser (eq .LoggedInUser.Did .Issue.Did) }}

     

       56
       56
       +
             {{ template "issueActions" . }}

     

       24
       57
        
           {{ end }}

     

       58
       58
       +
         </div>

     

       59
       59
       +
         <div id="issue-actions-error" class="error"></div>

     

       60
       60
       +
       {{ end }}

     

       25
       61
        
       

     

       26
       26
       -
           <section class="mt-2">

     

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

     

       28
       28
       -
                   <div id="state"

     

       29
       29
       -
                       class="inline-flex items-center rounded px-3 py-1 {{ $bgColor }}">

     

       30
       30
       -
                       {{ i $icon "w-4 h-4 mr-1.5 text-white" }}

     

       31
       31
       -
                       <span class="text-white">{{ .State }}</span>

     

       32
       32
       -
                   </div>

     

       33
       33
       -
                   <span class="text-gray-500 dark:text-gray-400 text-sm flex flex-wrap items-center gap-1">

     

       34
       34
       -
                       opened by

     

       35
       35
       -
                       {{ template "user/fragments/picHandleLink" .Issue.Did }}

     

       36
       36
       -
                      <span class="select-none before:content-['\00B7']"></span>

     

       37
       37
       -
                       {{ template "repo/fragments/time" .Issue.Created }}

     

       38
       38
       -
                   </span>

     

       39
       39
       -
               </div>

     

       62
       62
       +
       {{ define "issueActions" }}

     

       63
       63
       +
         {{ template "editIssue" . }}

     

       64
       64
       +
         {{ template "deleteIssue" . }}

     

       65
       65
       +
       {{ end }}

     

       66
       66
       +
       

     

       67
       67
       +
       {{ define "editIssue" }}

     

       68
       68
       +
         <a

     

       69
       69
       +
           class="text-gray-500 dark:text-gray-400 flex gap-1 items-center group"

     

       70
       70
       +
           hx-get="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/edit"

     

       71
       71
       +
           hx-swap="innerHTML"

     

       72
       72
       +
           hx-target="#issue-{{.Issue.IssueId}}">

     

       73
       73
       +
           {{ i "pencil" "size-3" }}

     

       74
       74
       +
         </a>

     

       75
       75
       +
       {{ end }}

     

       40
       76
        
       

     

       41
       41
       -
               {{ if .Issue.Body }}

     

       42
       42
       -
                   <article id="body" class="mt-8 prose dark:prose-invert">

     

       43
       43
       -
                       {{ .Issue.Body | markdown }}

     

       44
       44
       -
                   </article>

     

       45
       45
       -
               {{ end }}

     

       77
       77
       +
       {{ define "deleteIssue" }}

     

       78
       78
       +
         <a

     

       79
       79
       +
           class="text-gray-500 dark:text-gray-400 flex gap-1 items-center group"

     

       80
       80
       +
           hx-delete="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/"

     

       81
       81
       +
           hx-confirm="Are you sure you want to delete your issue?"

     

       82
       82
       +
           hx-swap="none">

     

       83
       83
       +
           {{ i "trash-2" "size-3" }}

     

       84
       84
       +
           {{ i "loader-circle" "size-3 animate-spin hidden group-[.htmx-request]:inline" }}

     

       85
       85
       +
         </a>

     

       86
       86
       +
       {{ end }}

     

       46
       87
        
       

     

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

     

       48
       48
       -
                   {{ template "repo/fragments/reactionsPopUp" .OrderedReactionKinds }}

     

       49
       49
       -
                   {{ range $kind := .OrderedReactionKinds }}

     

       50
       50
       -
                       {{

     

       51
       51
       -
                           template "repo/fragments/reaction"

     

       52
       52
       -
                           (dict

     

       53
       53
       -
                               "Kind"      $kind

     

       54
       54
       -
                               "Count"     (index $.Reactions $kind)

     

       55
       55
       -
                               "IsReacted" (index $.UserReacted $kind)

     

       56
       56
       -
                               "ThreadAt"  $.Issue.AtUri)

     

       57
       57
       -
                       }}

     

       58
       58
       -
                   {{ end }}

     

       59
       59
       -
               </div>

     

       60
       60
       -
           </section>

     

       88
       88
       +
       {{ define "issueReactions" }}

     

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

     

       90
       90
       +
             {{ template "repo/fragments/reactionsPopUp" .OrderedReactionKinds }}

     

       91
       91
       +
             {{ range $kind := .OrderedReactionKinds }}

     

       92
       92
       +
                 {{

     

       93
       93
       +
                     template "repo/fragments/reaction"

     

       94
       94
       +
                     (dict

     

       95
       95
       +
                         "Kind"      $kind

     

       96
       96
       +
                         "Count"     (index $.Reactions $kind)

     

       97
       97
       +
                         "IsReacted" (index $.UserReacted $kind)

     

       98
       98
       +
                         "ThreadAt"  $.Issue.AtUri)

     

       99
       99
       +
                 }}

     

       100
       100
       +
             {{ end }}

     

       101
       101
       +
         </div>

     

       61
       102
        
       {{ end }}

     

       62
       103
        
       

     

       63
       104
        
       {{ define "repoAfter" }}

+1 -33

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

···

       1
       1
        
       {{ define "title" }}new issue &middot; {{ .RepoInfo.FullName }}{{ end }}

     

       2
       2
        
       

     

       3
       3
        
       {{ define "repoContent" }}

     

       4
       4
       -
           <form

     

       5
       5
       -
               hx-post="/{{ .RepoInfo.FullName }}/issues/new"

     

       6
       6
       -
               class="space-y-6"

     

       7
       7
       -
               hx-swap="none"

     

       8
       8
       -
               hx-indicator="#spinner"

     

       9
       9
       -
           >

     

       10
       10
       -
               <div class="flex flex-col gap-4">

     

       11
       11
       -
                   <div>

     

       12
       12
       -
                       <label for="title">title</label>

     

       13
       13
       -
                       <input type="text" name="title" id="title" class="w-full" />

     

       14
       14
       -
                   </div>

     

       15
       15
       -
                   <div>

     

       16
       16
       -
                       <label for="body">body</label>

     

       17
       17
       -
                       <textarea

     

       18
       18
       -
                           name="body"

     

       19
       19
       -
                           id="body"

     

       20
       20
       -
                           rows="6"

     

       21
       21
       -
                           class="w-full resize-y"

     

       22
       22
       -
                           placeholder="Describe your issue. Markdown is supported."

     

       23
       23
       -
                       ></textarea>

     

       24
       24
       -
                   </div>

     

       25
       25
       -
                   <div>

     

       26
       26
       -
                       <button type="submit" class="btn-create flex items-center gap-2">

     

       27
       27
       -
                           {{ i "circle-plus" "w-4 h-4" }}

     

       28
       28
       -
                           create issue

     

       29
       29
       -
                           <span id="spinner" class="group">

     

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

     

       31
       31
       -
                           </span>

     

       32
       32
       -
                       </button>

     

       33
       33
       -
                   </div>

     

       34
       34
       -
               </div>

     

       35
       35
       -
               <div id="issues" class="error"></div>

     

       36
       36
       -
           </form>

     

       4
       4
       +
         {{ template "repo/issues/fragments/putIssue" . }}

     

       37
       5
        
       {{ end }}

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

+1 -2

appview/repo/repo.go

···

       11
       11
        
       	"log/slog"

     

       12
       12
        
       	"net/http"

     

       13
       13
        
       	"net/url"

     

       14
       14
       -
       	"path"

     

       15
       14
        
       	"path/filepath"

     

       16
       15
        
       	"slices"

     

       17
       16
        
       	"strconv"

     
···

       710
       709
        
       		}

     

       711
       710
        
       

     

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

     

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

     

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

     

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

     

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

     

       716
       715

+10 -9

appview/state/profile.go

···

       17
       17
        
       	"github.com/gorilla/feeds"

     

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

     

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

     

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

     

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

     

       22
       21
        
       )

     

       23
       22
        
       

     
···

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

     

       285
       284
        
       

     

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

     

       286
       286
       +
       	params := FollowsPageParams{

     

       287
       287
       +
       		Card: profile,

     

       288
       288
       +
       	}

     

       287
       289
        
       

     

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

     

       289
       291
        
       	if err != nil {

     

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

     

       291
       291
       -
       		return nil, err

     

       293
       293
       +
       		return &params, err

     

       292
       294
        
       	}

     

       293
       295
        
       

     

       294
       296
        
       	if len(follows) == 0 {

     

       295
       295
       -
       		return nil, nil

     

       297
       297
       +
       		return &params, nil

     

       296
       298
        
       	}

     

       297
       299
        
       

     

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

     
···

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

     

       304
       306
        
       	if err != nil {

     

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

     

       306
       306
       -
       		return nil, err

     

       308
       308
       +
       		return &params, err

     

       307
       309
        
       	}

     

       308
       310
        
       

     

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

     
···

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

     

       317
       319
        
       		if err != nil {

     

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

     

       319
       319
       -
       			return nil, err

     

       321
       321
       +
       			return &params, err

     

       320
       322
        
       		}

     

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

     

       322
       324
        
       		for _, follow := range following {

     
···

       350
       352
        
       		}

     

       351
       353
        
       	}

     

       352
       354
        
       

     

       353
       353
       -
       	return &FollowsPageParams{

     

       354
       354
       -
       		Follows: followCards,

     

       355
       355
       -
       		Card:    profile,

     

       356
       356
       -
       	}, nil

     

       355
       355
       +
       	params.Follows = followCards

     

       356
       356
       +
       

     

       357
       357
       +
       	return &params, nil

     

       357
       358
        
       }

     

       358
       359
        
       

     

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

+1 -1

appview/state/router.go

···

       232
       232
        
       }

     

       233
       233
        
       

     

       234
       234
        
       func (s *State) IssuesRouter(mw *middleware.Middleware) http.Handler {

     

       235
       235
       -
       	issues := issues.New(s.oauth, s.repoResolver, s.pages, s.idResolver, s.db, s.config, s.notifier)

     

       235
       235
       +
       	issues := issues.New(s.oauth, s.repoResolver, s.pages, s.idResolver, s.db, s.config, s.notifier, s.validator)

     

       236
       236
        
       	return issues.Router(mw)

     

       237
       237
        
       }

     

       238
       238

+5 -2

appview/state/state.go

···

       28
       28
        
       	"tangled.sh/tangled.sh/core/appview/pages"

     

       29
       29
        
       	posthogService "tangled.sh/tangled.sh/core/appview/posthog"

     

       30
       30
        
       	"tangled.sh/tangled.sh/core/appview/reporesolver"

     

       31
       31
       +
       	"tangled.sh/tangled.sh/core/appview/validator"

     

       31
       32
        
       	xrpcclient "tangled.sh/tangled.sh/core/appview/xrpcclient"

     

       32
       33
        
       	"tangled.sh/tangled.sh/core/eventconsumer"

     

       33
       34
        
       	"tangled.sh/tangled.sh/core/idresolver"

     
···

       53
       54
        
       	knotstream    *eventconsumer.Consumer

     

       54
       55
        
       	spindlestream *eventconsumer.Consumer

     

       55
       56
        
       	logger        *slog.Logger

     

       57
       57
       +
       	validator     *validator.Validator

     

       56
       58
        
       }

     

       57
       59
        
       

     

       58
       60
        
       func Make(ctx context.Context, config *config.Config) (*State, error) {

     
···

       73
       75
        
       	}

     

       74
       76
        
       

     

       75
       77
        
       	pgs := pages.NewPages(config, res)

     

       76
       76
       -
       

     

       77
       78
        
       	cache := cache.New(config.Redis.Addr)

     

       78
       79
        
       	sess := session.New(cache)

     

       79
       79
       -
       

     

       80
       80
        
       	oauth := oauth.NewOAuth(config, sess)

     

       81
       81
       +
       	validator := validator.New(d)

     

       81
       82
        
       

     

       82
       83
        
       	posthog, err := posthog.NewWithConfig(config.Posthog.ApiKey, posthog.Config{Endpoint: config.Posthog.Endpoint})

     

       83
       84
        
       	if err != nil {

     
···

       121
       122
        
       		IdResolver: res,

     

       122
       123
        
       		Config:     config,

     

       123
       124
        
       		Logger:     tlog.New("ingester"),

     

       125
       125
       +
       		Validator:  validator,

     

       124
       126
        
       	}

     

       125
       127
        
       	err = jc.StartJetstream(ctx, ingester.Ingest())

     

       126
       128
        
       	if err != nil {

     
···

       160
       162
        
       		knotstream,

     

       161
       163
        
       		spindlestream,

     

       162
       164
        
       		slog.Default(),

     

       165
       165
       +
       		validator,

     

       163
       166
        
       	}

     

       164
       167
        
       

     

       165
       168
        
       	return state, nil

+53

appview/validator/issue.go

···

       1
       1
       +
       package validator

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"fmt"

     

       5
       5
       +
       	"strings"

     

       6
       6
       +
       

     

       7
       7
       +
       	"tangled.sh/tangled.sh/core/appview/db"

     

       8
       8
       +
       )

     

       9
       9
       +
       

     

       10
       10
       +
       func (v *Validator) ValidateIssueComment(comment *db.IssueComment) error {

     

       11
       11
       +
       	// if comments have parents, only ingest ones that are 1 level deep

     

       12
       12
       +
       	if comment.ReplyTo != nil {

     

       13
       13
       +
       		parents, err := db.GetIssueComments(v.db, db.FilterEq("at_uri", *comment.ReplyTo))

     

       14
       14
       +
       		if err != nil {

     

       15
       15
       +
       			return fmt.Errorf("failed to fetch parent comment: %w", err)

     

       16
       16
       +
       		}

     

       17
       17
       +
       		if len(parents) != 1 {

     

       18
       18
       +
       			return fmt.Errorf("incorrect number of parent comments returned: %d", len(parents))

     

       19
       19
       +
       		}

     

       20
       20
       +
       

     

       21
       21
       +
       		// depth check

     

       22
       22
       +
       		parent := parents[0]

     

       23
       23
       +
       		if parent.ReplyTo != nil {

     

       24
       24
       +
       			return fmt.Errorf("incorrect depth, this comment is replying at depth >1")

     

       25
       25
       +
       		}

     

       26
       26
       +
       	}

     

       27
       27
       +
       

     

       28
       28
       +
       	if sb := strings.TrimSpace(v.sanitizer.SanitizeDefault(comment.Body)); sb == "" {

     

       29
       29
       +
       		return fmt.Errorf("body is empty after HTML sanitization")

     

       30
       30
       +
       	}

     

       31
       31
       +
       

     

       32
       32
       +
       	return nil

     

       33
       33
       +
       }

     

       34
       34
       +
       

     

       35
       35
       +
       func (v *Validator) ValidateIssue(issue *db.Issue) error {

     

       36
       36
       +
       	if issue.Title == "" {

     

       37
       37
       +
       		return fmt.Errorf("issue title is empty")

     

       38
       38
       +
       	}

     

       39
       39
       +
       

     

       40
       40
       +
       	if issue.Body == "" {

     

       41
       41
       +
       		return fmt.Errorf("issue body is empty")

     

       42
       42
       +
       	}

     

       43
       43
       +
       

     

       44
       44
       +
       	if st := strings.TrimSpace(v.sanitizer.SanitizeDescription(issue.Title)); st == "" {

     

       45
       45
       +
       		return fmt.Errorf("title is empty after HTML sanitization")

     

       46
       46
       +
       	}

     

       47
       47
       +
       

     

       48
       48
       +
       	if sb := strings.TrimSpace(v.sanitizer.SanitizeDefault(issue.Body)); sb == "" {

     

       49
       49
       +
       		return fmt.Errorf("body is empty after HTML sanitization")

     

       50
       50
       +
       	}

     

       51
       51
       +
       

     

       52
       52
       +
       	return nil

     

       53
       53
       +
       }

+18

appview/validator/validator.go

···

       1
       1
       +
       package validator

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"tangled.sh/tangled.sh/core/appview/db"

     

       5
       5
       +
       	"tangled.sh/tangled.sh/core/appview/pages/markup"

     

       6
       6
       +
       )

     

       7
       7
       +
       

     

       8
       8
       +
       type Validator struct {

     

       9
       9
       +
       	db        *db.DB

     

       10
       10
       +
       	sanitizer markup.Sanitizer

     

       11
       11
       +
       }

     

       12
       12
       +
       

     

       13
       13
       +
       func New(db *db.DB) *Validator {

     

       14
       14
       +
       	return &Validator{

     

       15
       15
       +
       		db:        db,

     

       16
       16
       +
       		sanitizer: markup.NewSanitizer(),

     

       17
       17
       +
       	}

     

       18
       18
       +
       }

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

input.css

···

       90
       90
        
               }

     

       91
       91
        
       

     

       92
       92
        
               label {

     

       93
       93
       -
                   @apply block mb-2 text-gray-900 text-sm font-bold py-2 uppercase dark:text-gray-100;

     

       93
       93
       +
                   @apply block text-gray-900 text-sm font-bold py-2 uppercase dark:text-gray-100;

     

       94
       94
        
               }

     

       95
       95
        
               input {

     

       96
       96
        
                   @apply border border-gray-400 block rounded bg-gray-50 focus:ring-black p-3 dark:bg-gray-800 dark:border-gray-600 dark:text-white dark:focus:ring-gray-400;

knotserver/xrpc/repo_blob.go

···

       69
       69
        
       				return

     

       70
       70
        
       			}

     

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

     

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

     

       72
       73
        
       

     

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

     

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

+8 -6

knotserver/xrpc/repo_branches.go

···

       20
       20
        
       

     

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

     

       22
       22
        
       

     

       23
       23
       -
       	limit := 50 // default

     

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

     

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

     

       26
       26
       -
       			limit = l

     

       27
       27
       -
       		}

     

       28
       28
       -
       	}

     

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

     

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

     

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

     

       26
       26
       +
       	// 		limit = l

     

       27
       27
       +
       	// 	}

     

       28
       28
       +
       	// }

     

       29
       29
       +
       

     

       30
       30
       +
       	limit := 500

     

       29
       31
        
       

     

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

     

       31
       33
        
       	if err != nil {

+11 -1

knotserver/xrpc/repo_log.go

···

       73
       73
        
       		return

     

       74
       74
        
       	}

     

       75
       75
        
       

     

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

     

       77
       77
       +
       	if err != nil {

     

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

     

       79
       79
       +
       		writeError(w, xrpcerr.NewXrpcError(

     

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

     

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

     

       82
       82
       +
       		), http.StatusNotFound)

     

       83
       83
       +
       		return

     

       84
       84
       +
       	}

     

       85
       85
       +
       

     

       76
       86
        
       	// Create response using existing types.RepoLogResponse

     

       77
       87
        
       	response := types.RepoLogResponse{

     

       78
       88
        
       		Commits: commits,

     

       79
       89
        
       		Ref:     ref,

     

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

     

       81
       91
        
       		PerPage: limit,

     

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

     

       92
       92
       +
       		Total:   total,

     

       83
       93
        
       	}

     

       84
       94
        
       

     

       85
       95
        
       	if path != "" {

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

Compare changes