comparing 94a4299d06303ab35cde5d7da47f0ff018df883e and master on notnite.com/core

+83 -38

appview/db/issues.go

···

       5
       5
        
       	"time"

     

       6
       6
        
       

     

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

     

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

     

       8
       9
        
       )

     

       9
       10
        
       

     

       10
       11
        
       type Issue struct {

     
···

       12
       13
        
       	OwnerDid string

     

       13
       14
        
       	IssueId  int

     

       14
       15
        
       	IssueAt  string

     

       15
       15
       -
       	Created  *time.Time

     

       16
       16
       +
       	Created  time.Time

     

       16
       17
        
       	Title    string

     

       17
       18
        
       	Body     string

     

       18
       19
        
       	Open     bool

     

       20
       20
       +
       

     

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

     

       22
       22
       +
       	// like comment counts, parent repo etc.

     

       19
       23
        
       	Metadata *IssueMetadata

     

       20
       24
        
       }

     

       21
       25
        
       

     

       22
       26
        
       type IssueMetadata struct {

     

       23
       27
        
       	CommentCount int

     

       28
       28
       +
       	Repo         *Repo

     

       24
       29
        
       	// labels, assignee etc.

     

       25
       30
        
       }

     

       26
       31
        
       

     
···

       98
       103
        
       	return ownerDid, err

     

       99
       104
        
       }

     

       100
       105
        
       

     

       101
       101
       -
       func GetIssues(e Execer, repoAt syntax.ATURI, isOpen bool) ([]Issue, error) {

     

       106
       106
       +
       func GetIssues(e Execer, repoAt syntax.ATURI, isOpen bool, page pagination.Page) ([]Issue, error) {

     

       102
       107
        
       	var issues []Issue

     

       103
       108
        
       	openValue := 0

     

       104
       109
        
       	if isOpen {

     
···

       106
       111
        
       	}

     

       107
       112
        
       

     

       108
       113
        
       	rows, err := e.Query(

     

       109
       109
       -
       		`select

     

       110
       110
       -
       			i.owner_did,

     

       111
       111
       -
       			i.issue_id,

     

       112
       112
       -
       			i.created,

     

       113
       113
       -
       			i.title,

     

       114
       114
       -
       			i.body,

     

       115
       115
       -
       			i.open,

     

       116
       116
       -
       			count(c.id)

     

       117
       117
       -
       		from

     

       118
       118
       -
       		    issues i

     

       119
       119
       -
       		left join

     

       120
       120
       -
       			comments c on i.repo_at = c.repo_at and i.issue_id = c.issue_id

     

       121
       121
       -
       		where

     

       122
       122
       -
       		    i.repo_at = ? and i.open = ?

     

       123
       123
       -
       		group by

     

       124
       124
       -
       			i.id, i.owner_did, i.issue_id, i.created, i.title, i.body, i.open

     

       125
       125
       -
       		order by

     

       126
       126
       -
       			i.created desc`,

     

       127
       127
       -
       		repoAt, openValue)

     

       114
       114
       +
       		`

     

       115
       115
       +
       		with numbered_issue as (

     

       116
       116
       +
       			select

     

       117
       117
       +
       				i.owner_did,

     

       118
       118
       +
       				i.issue_id,

     

       119
       119
       +
       				i.created,

     

       120
       120
       +
       				i.title,

     

       121
       121
       +
       				i.body,

     

       122
       122
       +
       				i.open,

     

       123
       123
       +
       				count(c.id) as comment_count,

     

       124
       124
       +
       				row_number() over (order by i.created desc) as row_num

     

       125
       125
       +
       			from

     

       126
       126
       +
       				issues i

     

       127
       127
       +
       			left join

     

       128
       128
       +
       				comments c on i.repo_at = c.repo_at and i.issue_id = c.issue_id

     

       129
       129
       +
       			where

     

       130
       130
       +
       				i.repo_at = ? and i.open = ?

     

       131
       131
       +
       			group by

     

       132
       132
       +
       				i.id, i.owner_did, i.issue_id, i.created, i.title, i.body, i.open

     

       133
       133
       +
       		)

     

       134
       134
       +
       		select

     

       135
       135
       +
       			owner_did,

     

       136
       136
       +
       			issue_id,

     

       137
       137
       +
       			created,

     

       138
       138
       +
       			title,

     

       139
       139
       +
       			body,

     

       140
       140
       +
       			open,

     

       141
       141
       +
       			comment_count

     

       142
       142
       +
       		from 

     

       143
       143
       +
       			numbered_issue

     

       144
       144
       +
       		where 

     

       145
       145
       +
       			row_num between ? and ?`,

     

       146
       146
       +
       		repoAt, openValue, page.Offset+1, page.Offset+page.Limit)

     

       128
       147
        
       	if err != nil {

     

       129
       148
        
       		return nil, err

     

       130
       149
        
       	}

     
···

       143
       162
        
       		if err != nil {

     

       144
       163
        
       			return nil, err

     

       145
       164
        
       		}

     

       146
       146
       -
       		issue.Created = &createdTime

     

       165
       165
       +
       		issue.Created = createdTime

     

       147
       166
        
       		issue.Metadata = &metadata

     

       148
       167
        
       

     

       149
       168
        
       		issues = append(issues, issue)

     
···

       156
       175
        
       	return issues, nil

     

       157
       176
        
       }

     

       158
       177
        
       

     

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

     

       178
       178
       +
       // timeframe here is directly passed into the sql query filter, and any

     

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

     

       180
       180
       +
       func GetIssuesByOwnerDid(e Execer, ownerDid string, timeframe string) ([]Issue, error) {

     

       160
       181
        
       	var issues []Issue

     

       161
       182
        
       

     

       162
       183
        
       	rows, err := e.Query(

     
···

       168
       189
        
       			i.title,

     

       169
       190
        
       			i.body,

     

       170
       191
        
       			i.open,

     

       171
       171
       -
       			count(c.id)

     

       192
       192
       +
       			r.did,

     

       193
       193
       +
       			r.name,

     

       194
       194
       +
       			r.knot,

     

       195
       195
       +
       			r.rkey,

     

       196
       196
       +
       			r.created

     

       172
       197
        
       		from

     

       173
       198
        
       		    issues i

     

       174
       174
       -
       		left join

     

       175
       175
       -
       			comments c on i.repo_at = c.repo_at and i.issue_id = c.issue_id

     

       199
       199
       +
       		join

     

       200
       200
       +
       			repos r on i.repo_at = r.at_uri

     

       176
       201
        
       		where

     

       177
       177
       -
       		    i.owner_did = ?

     

       178
       178
       -
       		group by

     

       179
       179
       -
       			i.id, i.owner_did, i.repo_at, i.issue_id, i.created, i.title, i.body, i.open

     

       202
       202
       +
       			i.owner_did = ? and i.created >= date ('now', ?)

     

       180
       203
        
       		order by

     

       181
       204
        
       			i.created desc`,

     

       182
       182
       -
       		ownerDid)

     

       205
       205
       +
       		ownerDid, timeframe)

     

       183
       206
        
       	if err != nil {

     

       184
       207
        
       		return nil, err

     

       185
       208
        
       	}

     
···

       187
       210
        
       

     

       188
       211
        
       	for rows.Next() {

     

       189
       212
        
       		var issue Issue

     

       190
       190
       -
       		var createdAt string

     

       191
       191
       -
       		var metadata IssueMetadata

     

       192
       192
       -
       		err := rows.Scan(&issue.OwnerDid, &issue.RepoAt, &issue.IssueId, &createdAt, &issue.Title, &issue.Body, &issue.Open, &metadata.CommentCount)

     

       213
       213
       +
       		var issueCreatedAt, repoCreatedAt string

     

       214
       214
       +
       		var repo Repo

     

       215
       215
       +
       		err := rows.Scan(

     

       216
       216
       +
       			&issue.OwnerDid,

     

       217
       217
       +
       			&issue.RepoAt,

     

       218
       218
       +
       			&issue.IssueId,

     

       219
       219
       +
       			&issueCreatedAt,

     

       220
       220
       +
       			&issue.Title,

     

       221
       221
       +
       			&issue.Body,

     

       222
       222
       +
       			&issue.Open,

     

       223
       223
       +
       			&repo.Did,

     

       224
       224
       +
       			&repo.Name,

     

       225
       225
       +
       			&repo.Knot,

     

       226
       226
       +
       			&repo.Rkey,

     

       227
       227
       +
       			&repoCreatedAt,

     

       228
       228
       +
       		)

     

       193
       229
        
       		if err != nil {

     

       194
       230
        
       			return nil, err

     

       195
       231
        
       		}

     

       196
       232
        
       

     

       197
       197
       -
       		createdTime, err := time.Parse(time.RFC3339, createdAt)

     

       233
       233
       +
       		issueCreatedTime, err := time.Parse(time.RFC3339, issueCreatedAt)

     

       198
       234
        
       		if err != nil {

     

       199
       235
        
       			return nil, err

     

       200
       236
        
       		}

     

       201
       201
       -
       		issue.Created = &createdTime

     

       202
       202
       -
       		issue.Metadata = &metadata

     

       237
       237
       +
       		issue.Created = issueCreatedTime

     

       238
       238
       +
       

     

       239
       239
       +
       		repoCreatedTime, err := time.Parse(time.RFC3339, repoCreatedAt)

     

       240
       240
       +
       		if err != nil {

     

       241
       241
       +
       			return nil, err

     

       242
       242
       +
       		}

     

       243
       243
       +
       		repo.Created = repoCreatedTime

     

       244
       244
       +
       

     

       245
       245
       +
       		issue.Metadata = &IssueMetadata{

     

       246
       246
       +
       			Repo: &repo,

     

       247
       247
       +
       		}

     

       203
       248
        
       

     

       204
       249
        
       		issues = append(issues, issue)

     

       205
       250
        
       	}

     
···

       226
       271
        
       	if err != nil {

     

       227
       272
        
       		return nil, err

     

       228
       273
        
       	}

     

       229
       229
       -
       	issue.Created = &createdTime

     

       274
       274
       +
       	issue.Created = createdTime

     

       230
       275
        
       

     

       231
       276
        
       	return &issue, nil

     

       232
       277
        
       }

     
···

       246
       291
        
       	if err != nil {

     

       247
       292
        
       		return nil, nil, err

     

       248
       293
        
       	}

     

       249
       249
       -
       	issue.Created = &createdTime

     

       294
       294
       +
       	issue.Created = createdTime

     

       250
       295
        
       

     

       251
       296
        
       	comments, err := GetComments(e, repoAt, issueId)

     

       252
       297
        
       	if err != nil {

+119 -53

appview/db/profile.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"fmt"

     

       5
       5
       -
       	"log"

     

       6
       6
       -
       	"sort"

     

       7
       5
        
       	"time"

     

       8
       6
        
       )

     

       9
       7
        
       

     

       10
       10
       -
       type ProfileTimelineEvent struct {

     

       11
       11
       -
       	EventAt time.Time

     

       12
       12
       -
       	Type    string

     

       13
       13
       -
       	*Issue

     

       14
       14
       -
       	*Pull

     

       15
       15
       -
       	*Repo

     

       8
       8
       +
       type RepoEvent struct {

     

       9
       9
       +
       	Repo   *Repo

     

       10
       10
       +
       	Source *Repo

     

       11
       11
       +
       }

     

       12
       12
       +
       

     

       13
       13
       +
       type ProfileTimeline struct {

     

       14
       14
       +
       	ByMonth []ByMonth

     

       15
       15
       +
       }

     

       16
       16
       +
       

     

       17
       17
       +
       type ByMonth struct {

     

       18
       18
       +
       	RepoEvents  []RepoEvent

     

       19
       19
       +
       	IssueEvents IssueEvents

     

       20
       20
       +
       	PullEvents  PullEvents

     

       21
       21
       +
       }

     

       22
       22
       +
       

     

       23
       23
       +
       func (b ByMonth) IsEmpty() bool {

     

       24
       24
       +
       	return len(b.RepoEvents) == 0 &&

     

       25
       25
       +
       		len(b.IssueEvents.Items) == 0 &&

     

       26
       26
       +
       		len(b.PullEvents.Items) == 0

     

       27
       27
       +
       }

     

       16
       28
        
       

     

       17
       17
       -
       	// optional: populate only if Repo is a fork

     

       18
       18
       -
       	Source *Repo

     

       29
       29
       +
       type IssueEvents struct {

     

       30
       30
       +
       	Items []*Issue

     

       19
       31
        
       }

     

       20
       32
        
       

     

       21
       21
       -
       func MakeProfileTimeline(e Execer, forDid string) ([]ProfileTimelineEvent, error) {

     

       22
       22
       -
       	timeline := []ProfileTimelineEvent{}

     

       23
       23
       -
       	limit := 30

     

       33
       33
       +
       type IssueEventStats struct {

     

       34
       34
       +
       	Open   int

     

       35
       35
       +
       	Closed int

     

       36
       36
       +
       }

     

       24
       37
        
       

     

       25
       25
       -
       	pulls, err := GetPullsByOwnerDid(e, forDid)

     

       38
       38
       +
       func (i IssueEvents) Stats() IssueEventStats {

     

       39
       39
       +
       	var open, closed int

     

       40
       40
       +
       	for _, issue := range i.Items {

     

       41
       41
       +
       		if issue.Open {

     

       42
       42
       +
       			open += 1

     

       43
       43
       +
       		} else {

     

       44
       44
       +
       			closed += 1

     

       45
       45
       +
       		}

     

       46
       46
       +
       	}

     

       47
       47
       +
       

     

       48
       48
       +
       	return IssueEventStats{

     

       49
       49
       +
       		Open:   open,

     

       50
       50
       +
       		Closed: closed,

     

       51
       51
       +
       	}

     

       52
       52
       +
       }

     

       53
       53
       +
       

     

       54
       54
       +
       type PullEvents struct {

     

       55
       55
       +
       	Items []*Pull

     

       56
       56
       +
       }

     

       57
       57
       +
       

     

       58
       58
       +
       func (p PullEvents) Stats() PullEventStats {

     

       59
       59
       +
       	var open, merged, closed int

     

       60
       60
       +
       	for _, pull := range p.Items {

     

       61
       61
       +
       		switch pull.State {

     

       62
       62
       +
       		case PullOpen:

     

       63
       63
       +
       			open += 1

     

       64
       64
       +
       		case PullMerged:

     

       65
       65
       +
       			merged += 1

     

       66
       66
       +
       		case PullClosed:

     

       67
       67
       +
       			closed += 1

     

       68
       68
       +
       		}

     

       69
       69
       +
       	}

     

       70
       70
       +
       

     

       71
       71
       +
       	return PullEventStats{

     

       72
       72
       +
       		Open:   open,

     

       73
       73
       +
       		Merged: merged,

     

       74
       74
       +
       		Closed: closed,

     

       75
       75
       +
       	}

     

       76
       76
       +
       }

     

       77
       77
       +
       

     

       78
       78
       +
       type PullEventStats struct {

     

       79
       79
       +
       	Closed int

     

       80
       80
       +
       	Open   int

     

       81
       81
       +
       	Merged int

     

       82
       82
       +
       }

     

       83
       83
       +
       

     

       84
       84
       +
       const TimeframeMonths = 3

     

       85
       85
       +
       

     

       86
       86
       +
       func MakeProfileTimeline(e Execer, forDid string) (*ProfileTimeline, error) {

     

       87
       87
       +
       	timeline := ProfileTimeline{

     

       88
       88
       +
       		ByMonth: make([]ByMonth, TimeframeMonths),

     

       89
       89
       +
       	}

     

       90
       90
       +
       	currentMonth := time.Now().Month()

     

       91
       91
       +
       	timeframe := fmt.Sprintf("-%d months", TimeframeMonths)

     

       92
       92
       +
       

     

       93
       93
       +
       	pulls, err := GetPullsByOwnerDid(e, forDid, timeframe)

     

       26
       94
        
       	if err != nil {

     

       27
       27
       -
       		return timeline, fmt.Errorf("error getting pulls by owner did: %w", err)

     

       95
       95
       +
       		return nil, fmt.Errorf("error getting pulls by owner did: %w", err)

     

       28
       96
        
       	}

     

       29
       97
        
       

     

       98
       98
       +
       	// group pulls by month

     

       30
       99
        
       	for _, pull := range pulls {

     

       31
       31
       -
       		repo, err := GetRepoByAtUri(e, string(pull.RepoAt))

     

       32
       32
       -
       		if err != nil {

     

       33
       33
       -
       			return timeline, fmt.Errorf("error getting repo by at uri: %w", err)

     

       100
       100
       +
       		pullMonth := pull.Created.Month()

     

       101
       101
       +
       

     

       102
       102
       +
       		if currentMonth-pullMonth > TimeframeMonths {

     

       103
       103
       +
       			// shouldn't happen; but times are weird

     

       104
       104
       +
       			continue

     

       34
       105
        
       		}

     

       35
       106
        
       

     

       36
       36
       -
       		timeline = append(timeline, ProfileTimelineEvent{

     

       37
       37
       -
       			EventAt: pull.Created,

     

       38
       38
       -
       			Type:    "pull",

     

       39
       39
       -
       			Pull:    &pull,

     

       40
       40
       -
       			Repo:    repo,

     

       41
       41
       -
       		})

     

       107
       107
       +
       		idx := currentMonth - pullMonth

     

       108
       108
       +
       		items := &timeline.ByMonth[idx].PullEvents.Items

     

       109
       109
       +
       

     

       110
       110
       +
       		*items = append(*items, &pull)

     

       42
       111
        
       	}

     

       43
       112
        
       

     

       44
       44
       -
       	issues, err := GetIssuesByOwnerDid(e, forDid)

     

       113
       113
       +
       	issues, err := GetIssuesByOwnerDid(e, forDid, timeframe)

     

       45
       114
        
       	if err != nil {

     

       46
       46
       -
       		return timeline, fmt.Errorf("error getting issues by owner did: %w", err)

     

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

     

       47
       116
        
       	}

     

       48
       117
        
       

     

       49
       118
        
       	for _, issue := range issues {

     

       50
       50
       -
       		repo, err := GetRepoByAtUri(e, string(issue.RepoAt))

     

       51
       51
       -
       		if err != nil {

     

       52
       52
       -
       			return timeline, fmt.Errorf("error getting repo by at uri: %w", err)

     

       119
       119
       +
       		issueMonth := issue.Created.Month()

     

       120
       120
       +
       

     

       121
       121
       +
       		if currentMonth-issueMonth > TimeframeMonths {

     

       122
       122
       +
       			// shouldn't happen; but times are weird

     

       123
       123
       +
       			continue

     

       53
       124
        
       		}

     

       54
       125
        
       

     

       55
       55
       -
       		timeline = append(timeline, ProfileTimelineEvent{

     

       56
       56
       -
       			EventAt: *issue.Created,

     

       57
       57
       -
       			Type:    "issue",

     

       58
       58
       -
       			Issue:   &issue,

     

       59
       59
       -
       			Repo:    repo,

     

       60
       60
       -
       		})

     

       126
       126
       +
       		idx := currentMonth - issueMonth

     

       127
       127
       +
       		items := &timeline.ByMonth[idx].IssueEvents.Items

     

       128
       128
       +
       

     

       129
       129
       +
       		*items = append(*items, &issue)

     

       61
       130
        
       	}

     

       62
       131
        
       

     

       63
       132
        
       	repos, err := GetAllReposByDid(e, forDid)

     

       64
       133
        
       	if err != nil {

     

       65
       65
       -
       		return timeline, fmt.Errorf("error getting all repos by did: %w", err)

     

       134
       134
       +
       		return nil, fmt.Errorf("error getting all repos by did: %w", err)

     

       66
       135
        
       	}

     

       67
       67
       -
       

     

       68
       68
       -
       	log.Println(repos)

     

       69
       136
        
       

     

       70
       137
        
       	for _, repo := range repos {

     

       138
       138
       +
       		// TODO: get this in the original query; requires COALESCE because nullable

     

       71
       139
        
       		var sourceRepo *Repo

     

       72
       72
       -
       		log.Println("name", repo.Name)

     

       73
       140
        
       		if repo.Source != "" {

     

       74
       74
       -
       			log.Println("source", repo.Source)

     

       75
       141
        
       			sourceRepo, err = GetRepoByAtUri(e, repo.Source)

     

       76
       142
        
       			if err != nil {

     

       77
       143
        
       				return nil, err

     

       78
       144
        
       			}

     

       79
       145
        
       		}

     

       80
       146
        
       

     

       81
       81
       -
       		timeline = append(timeline, ProfileTimelineEvent{

     

       82
       82
       -
       			EventAt: repo.Created,

     

       83
       83
       -
       			Type:    "repo",

     

       84
       84
       -
       			Repo:    &repo,

     

       85
       85
       -
       			Source:  sourceRepo,

     

       86
       86
       -
       		})

     

       87
       87
       -
       	}

     

       147
       147
       +
       		repoMonth := repo.Created.Month()

     

       148
       148
       +
       

     

       149
       149
       +
       		if currentMonth-repoMonth > TimeframeMonths {

     

       150
       150
       +
       			// shouldn't happen; but times are weird

     

       151
       151
       +
       			continue

     

       152
       152
       +
       		}

     

       88
       153
        
       

     

       89
       89
       -
       	sort.Slice(timeline, func(i, j int) bool {

     

       90
       90
       -
       		return timeline[i].EventAt.After(timeline[j].EventAt)

     

       91
       91
       -
       	})

     

       154
       154
       +
       		idx := currentMonth - repoMonth

     

       92
       155
        
       

     

       93
       93
       -
       	if len(timeline) > limit {

     

       94
       94
       -
       		timeline = timeline[:limit]

     

       156
       156
       +
       		items := &timeline.ByMonth[idx].RepoEvents

     

       157
       157
       +
       		*items = append(*items, RepoEvent{

     

       158
       158
       +
       			Repo:   &repo,

     

       159
       159
       +
       			Source: sourceRepo,

     

       160
       160
       +
       		})

     

       95
       161
        
       	}

     

       96
       162
        
       

     

       97
       97
       -
       	return timeline, nil

     

       163
       163
       +
       	return &timeline, nil

     

       98
       164
        
       }

+201 -26

appview/db/pulls.go

···

       4
       4
        
       	"database/sql"

     

       5
       5
        
       	"fmt"

     

       6
       6
        
       	"log"

     

       7
       7
       +
       	"sort"

     

       7
       8
        
       	"strings"

     

       8
       9
        
       	"time"

     

       9
       10
        
       

     

       10
       11
        
       	"github.com/bluekeyes/go-gitdiff/gitdiff"

     

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

     

       13
       13
       +
       	"tangled.sh/tangled.sh/core/patchutil"

     

       12
       14
        
       	"tangled.sh/tangled.sh/core/types"

     

       13
       15
        
       )

     

       14
       16
        
       

     
···

       64
       66
        
       	// meta

     

       65
       67
        
       	Created    time.Time

     

       66
       68
        
       	PullSource *PullSource

     

       69
       69
       +
       

     

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

     

       71
       71
       +
       	Repo *Repo

     

       67
       72
        
       }

     

       68
       73
        
       

     

       69
       74
        
       type PullSource struct {

     
···

       119
       124
        
       	return len(p.Submissions) - 1

     

       120
       125
        
       }

     

       121
       126
        
       

     

       122
       122
       -
       func (p *Pull) IsSameRepoBranch() bool {

     

       127
       127
       +
       func (p *Pull) IsPatchBased() bool {

     

       128
       128
       +
       	return p.PullSource == nil

     

       129
       129
       +
       }

     

       130
       130
       +
       

     

       131
       131
       +
       func (p *Pull) IsBranchBased() bool {

     

       123
       132
        
       	if p.PullSource != nil {

     

       124
       133
        
       		if p.PullSource.RepoAt != nil {

     

       125
       134
        
       			return p.PullSource.RepoAt == &p.RepoAt

     
···

       131
       140
        
       	return false

     

       132
       141
        
       }

     

       133
       142
        
       

     

       134
       134
       -
       func (p *Pull) IsPatch() bool {

     

       135
       135
       -
       	return p.PullSource == nil

     

       143
       143
       +
       func (p *Pull) IsForkBased() bool {

     

       144
       144
       +
       	if p.PullSource != nil {

     

       145
       145
       +
       		if p.PullSource.RepoAt != nil {

     

       146
       146
       +
       			// make sure repos are different

     

       147
       147
       +
       			return p.PullSource.RepoAt != &p.RepoAt

     

       148
       148
       +
       		}

     

       149
       149
       +
       	}

     

       150
       150
       +
       	return false

     

       136
       151
        
       }

     

       137
       152
        
       

     

       138
       138
       -
       func (s PullSubmission) AsNiceDiff(targetBranch string) types.NiceDiff {

     

       153
       153
       +
       func (s PullSubmission) AsDiff(targetBranch string) ([]*gitdiff.File, error) {

     

       139
       154
        
       	patch := s.Patch

     

       140
       155
        
       

     

       141
       141
       -
       	diffs, _, err := gitdiff.Parse(strings.NewReader(patch))

     

       156
       156
       +
       	// if format-patch; then extract each patch

     

       157
       157
       +
       	var diffs []*gitdiff.File

     

       158
       158
       +
       	if patchutil.IsFormatPatch(patch) {

     

       159
       159
       +
       		patches, err := patchutil.ExtractPatches(patch)

     

       160
       160
       +
       		if err != nil {

     

       161
       161
       +
       			return nil, err

     

       162
       162
       +
       		}

     

       163
       163
       +
       		var ps [][]*gitdiff.File

     

       164
       164
       +
       		for _, p := range patches {

     

       165
       165
       +
       			ps = append(ps, p.Files)

     

       166
       166
       +
       		}

     

       167
       167
       +
       

     

       168
       168
       +
       		diffs = patchutil.CombineDiff(ps...)

     

       169
       169
       +
       	} else {

     

       170
       170
       +
       		d, _, err := gitdiff.Parse(strings.NewReader(patch))

     

       171
       171
       +
       		if err != nil {

     

       172
       172
       +
       			return nil, err

     

       173
       173
       +
       		}

     

       174
       174
       +
       		diffs = d

     

       175
       175
       +
       	}

     

       176
       176
       +
       

     

       177
       177
       +
       	return diffs, nil

     

       178
       178
       +
       }

     

       179
       179
       +
       

     

       180
       180
       +
       func (s PullSubmission) AsNiceDiff(targetBranch string) types.NiceDiff {

     

       181
       181
       +
       	diffs, err := s.AsDiff(targetBranch)

     

       142
       182
        
       	if err != nil {

     

       143
       183
        
       		log.Println(err)

     

       144
       184
        
       	}

     
···

       176
       216
        
       	return nd

     

       177
       217
        
       }

     

       178
       218
        
       

     

       219
       219
       +
       func (s PullSubmission) IsFormatPatch() bool {

     

       220
       220
       +
       	return patchutil.IsFormatPatch(s.Patch)

     

       221
       221
       +
       }

     

       222
       222
       +
       

     

       223
       223
       +
       func (s PullSubmission) AsFormatPatch() []patchutil.FormatPatch {

     

       224
       224
       +
       	patches, err := patchutil.ExtractPatches(s.Patch)

     

       225
       225
       +
       	if err != nil {

     

       226
       226
       +
       		log.Println("error extracting patches from submission:", err)

     

       227
       227
       +
       		return []patchutil.FormatPatch{}

     

       228
       228
       +
       	}

     

       229
       229
       +
       

     

       230
       230
       +
       	return patches

     

       231
       231
       +
       }

     

       232
       232
       +
       

     

       179
       233
        
       func NewPull(tx *sql.Tx, pull *Pull) error {

     

       180
       234
        
       	defer tx.Rollback()

     

       181
       235
        
       

     
···

       261
       315
        
       	return pullId - 1, err

     

       262
       316
        
       }

     

       263
       317
        
       

     

       264
       264
       -
       func GetPulls(e Execer, repoAt syntax.ATURI, state PullState) ([]Pull, error) {

     

       265
       265
       -
       	var pulls []Pull

     

       318
       318
       +
       func GetPulls(e Execer, repoAt syntax.ATURI, state PullState) ([]*Pull, error) {

     

       319
       319
       +
       	pulls := make(map[int]*Pull)

     

       266
       320
        
       

     

       267
       321
        
       	rows, err := e.Query(`

     

       268
       322
        
       		select

     
···

       280
       334
        
       		from

     

       281
       335
        
       			pulls

     

       282
       336
        
       		where

     

       283
       283
       -
       			repo_at = ? and state = ?

     

       284
       284
       -
       		order by

     

       285
       285
       -
       			created desc`, repoAt, state)

     

       337
       337
       +
       			repo_at = ? and state = ?`, repoAt, state)

     

       286
       338
        
       	if err != nil {

     

       287
       339
        
       		return nil, err

     

       288
       340
        
       	}

     
···

       328
       380
        
       			}

     

       329
       381
        
       		}

     

       330
       382
        
       

     

       331
       331
       -
       		pulls = append(pulls, pull)

     

       383
       383
       +
       		pulls[pull.PullId] = &pull

     

       384
       384
       +
       	}

     

       385
       385
       +
       

     

       386
       386
       +
       	// get latest round no. for each pull

     

       387
       387
       +
       	inClause := strings.TrimSuffix(strings.Repeat("?, ", len(pulls)), ", ")

     

       388
       388
       +
       	submissionsQuery := fmt.Sprintf(`

     

       389
       389
       +
       		select

     

       390
       390
       +
       			id, pull_id, round_number

     

       391
       391
       +
       		from

     

       392
       392
       +
       			pull_submissions

     

       393
       393
       +
       		where

     

       394
       394
       +
       			repo_at = ? and pull_id in (%s)

     

       395
       395
       +
       	`, inClause)

     

       396
       396
       +
       

     

       397
       397
       +
       	args := make([]any, len(pulls)+1)

     

       398
       398
       +
       	args[0] = repoAt.String()

     

       399
       399
       +
       	idx := 1

     

       400
       400
       +
       	for _, p := range pulls {

     

       401
       401
       +
       		args[idx] = p.PullId

     

       402
       402
       +
       		idx += 1

     

       403
       403
       +
       	}

     

       404
       404
       +
       	submissionsRows, err := e.Query(submissionsQuery, args...)

     

       405
       405
       +
       	if err != nil {

     

       406
       406
       +
       		return nil, err

     

       407
       407
       +
       	}

     

       408
       408
       +
       	defer submissionsRows.Close()

     

       409
       409
       +
       

     

       410
       410
       +
       	for submissionsRows.Next() {

     

       411
       411
       +
       		var s PullSubmission

     

       412
       412
       +
       		err := submissionsRows.Scan(

     

       413
       413
       +
       			&s.ID,

     

       414
       414
       +
       			&s.PullId,

     

       415
       415
       +
       			&s.RoundNumber,

     

       416
       416
       +
       		)

     

       417
       417
       +
       		if err != nil {

     

       418
       418
       +
       			return nil, err

     

       419
       419
       +
       		}

     

       420
       420
       +
       

     

       421
       421
       +
       		if p, ok := pulls[s.PullId]; ok {

     

       422
       422
       +
       			p.Submissions = make([]*PullSubmission, s.RoundNumber+1)

     

       423
       423
       +
       			p.Submissions[s.RoundNumber] = &s

     

       424
       424
       +
       		}

     

       425
       425
       +
       	}

     

       426
       426
       +
       	if err := rows.Err(); err != nil {

     

       427
       427
       +
       		return nil, err

     

       332
       428
        
       	}

     

       333
       429
        
       

     

       430
       430
       +
       	// get comment count on latest submission on each pull

     

       431
       431
       +
       	inClause = strings.TrimSuffix(strings.Repeat("?, ", len(pulls)), ", ")

     

       432
       432
       +
       	commentsQuery := fmt.Sprintf(`

     

       433
       433
       +
       		select

     

       434
       434
       +
       			count(id), pull_id

     

       435
       435
       +
       		from

     

       436
       436
       +
       			pull_comments

     

       437
       437
       +
       		where

     

       438
       438
       +
       			submission_id in (%s)

     

       439
       439
       +
       		group by

     

       440
       440
       +
       			submission_id

     

       441
       441
       +
       	`, inClause)

     

       442
       442
       +
       

     

       443
       443
       +
       	args = []any{}

     

       444
       444
       +
       	for _, p := range pulls {

     

       445
       445
       +
       		args = append(args, p.Submissions[p.LastRoundNumber()].ID)

     

       446
       446
       +
       	}

     

       447
       447
       +
       	commentsRows, err := e.Query(commentsQuery, args...)

     

       448
       448
       +
       	if err != nil {

     

       449
       449
       +
       		return nil, err

     

       450
       450
       +
       	}

     

       451
       451
       +
       	defer commentsRows.Close()

     

       452
       452
       +
       

     

       453
       453
       +
       	for commentsRows.Next() {

     

       454
       454
       +
       		var commentCount, pullId int

     

       455
       455
       +
       		err := commentsRows.Scan(

     

       456
       456
       +
       			&commentCount,

     

       457
       457
       +
       			&pullId,

     

       458
       458
       +
       		)

     

       459
       459
       +
       		if err != nil {

     

       460
       460
       +
       			return nil, err

     

       461
       461
       +
       		}

     

       462
       462
       +
       		if p, ok := pulls[pullId]; ok {

     

       463
       463
       +
       			p.Submissions[p.LastRoundNumber()].Comments = make([]PullComment, commentCount)

     

       464
       464
       +
       		}

     

       465
       465
       +
       	}

     

       334
       466
        
       	if err := rows.Err(); err != nil {

     

       335
       467
        
       		return nil, err

     

       336
       468
        
       	}

     

       337
       469
        
       

     

       338
       338
       -
       	return pulls, nil

     

       470
       470
       +
       	orderedByDate := []*Pull{}

     

       471
       471
       +
       	for _, p := range pulls {

     

       472
       472
       +
       		orderedByDate = append(orderedByDate, p)

     

       473
       473
       +
       	}

     

       474
       474
       +
       	sort.Slice(orderedByDate, func(i, j int) bool {

     

       475
       475
       +
       		return orderedByDate[i].Created.After(orderedByDate[j].Created)

     

       476
       476
       +
       	})

     

       477
       477
       +
       

     

       478
       478
       +
       	return orderedByDate, nil

     

       339
       479
        
       }

     

       340
       480
        
       

     

       341
       481
        
       func GetPull(e Execer, repoAt syntax.ATURI, pullId int) (*Pull, error) {

     
···

       514
       654
        
       		return nil, err

     

       515
       655
        
       	}

     

       516
       656
        
       

     

       657
       657
       +
       	var pullSourceRepo *Repo

     

       658
       658
       +
       	if pull.PullSource != nil {

     

       659
       659
       +
       		if pull.PullSource.RepoAt != nil {

     

       660
       660
       +
       			pullSourceRepo, err = GetRepoByAtUri(e, pull.PullSource.RepoAt.String())

     

       661
       661
       +
       			if err != nil {

     

       662
       662
       +
       				log.Printf("failed to get repo by at uri: %v", err)

     

       663
       663
       +
       			} else {

     

       664
       664
       +
       				pull.PullSource.Repo = pullSourceRepo

     

       665
       665
       +
       			}

     

       666
       666
       +
       		}

     

       667
       667
       +
       	}

     

       668
       668
       +
       

     

       517
       669
        
       	pull.Submissions = make([]*PullSubmission, len(submissionsMap))

     

       518
       670
        
       	for _, submission := range submissionsMap {

     

       519
       671
        
       		pull.Submissions[submission.RoundNumber] = submission

     
···

       522
       674
        
       	return &pull, nil

     

       523
       675
        
       }

     

       524
       676
        
       

     

       525
       525
       -
       func GetPullsByOwnerDid(e Execer, did string) ([]Pull, error) {

     

       677
       677
       +
       // timeframe here is directly passed into the sql query filter, and any

     

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

     

       679
       679
       +
       func GetPullsByOwnerDid(e Execer, did, timeframe string) ([]Pull, error) {

     

       526
       680
        
       	var pulls []Pull

     

       527
       681
        
       

     

       528
       682
        
       	rows, err := e.Query(`

     

       529
       683
        
       			select

     

       530
       530
       -
       				owner_did,

     

       531
       531
       -
       				repo_at,

     

       532
       532
       -
       				pull_id,

     

       533
       533
       -
       				created,

     

       534
       534
       -
       				title,

     

       535
       535
       -
       				state

     

       684
       684
       +
       				p.owner_did,

     

       685
       685
       +
       				p.repo_at,

     

       686
       686
       +
       				p.pull_id,

     

       687
       687
       +
       				p.created,

     

       688
       688
       +
       				p.title,

     

       689
       689
       +
       				p.state,

     

       690
       690
       +
       				r.did,

     

       691
       691
       +
       				r.name,

     

       692
       692
       +
       				r.knot,

     

       693
       693
       +
       				r.rkey,

     

       694
       694
       +
       				r.created

     

       536
       695
        
       			from

     

       537
       537
       -
       				pulls

     

       696
       696
       +
       				pulls p

     

       697
       697
       +
       			join

     

       698
       698
       +
       				repos r on p.repo_at = r.at_uri

     

       538
       699
        
       			where

     

       539
       539
       -
       				owner_did = ?

     

       700
       700
       +
       				p.owner_did = ? and p.created >= date ('now', ?)

     

       540
       701
        
       			order by

     

       541
       541
       -
       				created desc`, did)

     

       702
       702
       +
       				p.created desc`, did, timeframe)

     

       542
       703
        
       	if err != nil {

     

       543
       704
        
       		return nil, err

     

       544
       705
        
       	}

     
···

       546
       707
        
       

     

       547
       708
        
       	for rows.Next() {

     

       548
       709
        
       		var pull Pull

     

       549
       549
       -
       		var createdAt string

     

       710
       710
       +
       		var repo Repo

     

       711
       711
       +
       		var pullCreatedAt, repoCreatedAt string

     

       550
       712
        
       		err := rows.Scan(

     

       551
       713
        
       			&pull.OwnerDid,

     

       552
       714
        
       			&pull.RepoAt,

     

       553
       715
        
       			&pull.PullId,

     

       554
       554
       -
       			&createdAt,

     

       716
       716
       +
       			&pullCreatedAt,

     

       555
       717
        
       			&pull.Title,

     

       556
       718
        
       			&pull.State,

     

       719
       719
       +
       			&repo.Did,

     

       720
       720
       +
       			&repo.Name,

     

       721
       721
       +
       			&repo.Knot,

     

       722
       722
       +
       			&repo.Rkey,

     

       723
       723
       +
       			&repoCreatedAt,

     

       557
       724
        
       		)

     

       558
       725
        
       		if err != nil {

     

       559
       726
        
       			return nil, err

     

       560
       727
        
       		}

     

       561
       728
        
       

     

       562
       562
       -
       		createdTime, err := time.Parse(time.RFC3339, createdAt)

     

       729
       729
       +
       		pullCreatedTime, err := time.Parse(time.RFC3339, pullCreatedAt)

     

       730
       730
       +
       		if err != nil {

     

       731
       731
       +
       			return nil, err

     

       732
       732
       +
       		}

     

       733
       733
       +
       		pull.Created = pullCreatedTime

     

       734
       734
       +
       

     

       735
       735
       +
       		repoCreatedTime, err := time.Parse(time.RFC3339, repoCreatedAt)

     

       563
       736
        
       		if err != nil {

     

       564
       737
        
       			return nil, err

     

       565
       738
        
       		}

     

       566
       566
       -
       		pull.Created = createdTime

     

       739
       739
       +
       		repo.Created = repoCreatedTime

     

       740
       740
       +
       

     

       741
       741
       +
       		pull.Repo = &repo

     

       567
       742
        
       

     

       568
       743
        
       		pulls = append(pulls, pull)

     

       569
       744
        
       	}

+5 -3

appview/db/repos.go

···

       77
       77
        
       		where

     

       78
       78
        
       			r.did = ?

     

       79
       79
        
       		group by

     

       80
       80
       -
       			r.at_uri`, did)

     

       80
       80
       +
       			r.at_uri

     

       81
       81
       +
       		order by r.created desc`,

     

       82
       82
       +
       		did)

     

       81
       83
        
       	if err != nil {

     

       82
       84
        
       		return nil, err

     

       83
       85
        
       	}

     
···

       176
       178
        
       	return err

     

       177
       179
        
       }

     

       178
       180
        
       

     

       179
       179
       -
       func RemoveRepo(e Execer, did, name, rkey string) error {

     

       180
       180
       -
       	_, err := e.Exec(`delete from repos where did = ? and name = ? and rkey = ?`, did, name, rkey)

     

       181
       181
       +
       func RemoveRepo(e Execer, did, name string) error {

     

       182
       182
       +
       	_, err := e.Exec(`delete from repos where did = ? and name = ?`, did, name)

     

       181
       183
        
       	return err

     

       182
       184
        
       }

     

       183
       185

+62

appview/filetree/filetree.go

···

       1
       1
       +
       package filetree

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"path/filepath"

     

       5
       5
       +
       	"sort"

     

       6
       6
       +
       	"strings"

     

       7
       7
       +
       )

     

       8
       8
       +
       

     

       9
       9
       +
       type FileTreeNode struct {

     

       10
       10
       +
       	Name        string

     

       11
       11
       +
       	Path        string

     

       12
       12
       +
       	IsDirectory bool

     

       13
       13
       +
       	Children    map[string]*FileTreeNode

     

       14
       14
       +
       }

     

       15
       15
       +
       

     

       16
       16
       +
       // NewNode creates a new node

     

       17
       17
       +
       func newNode(name, path string, isDir bool) *FileTreeNode {

     

       18
       18
       +
       	return &FileTreeNode{

     

       19
       19
       +
       		Name:        name,

     

       20
       20
       +
       		Path:        path,

     

       21
       21
       +
       		IsDirectory: isDir,

     

       22
       22
       +
       		Children:    make(map[string]*FileTreeNode),

     

       23
       23
       +
       	}

     

       24
       24
       +
       }

     

       25
       25
       +
       

     

       26
       26
       +
       func FileTree(files []string) *FileTreeNode {

     

       27
       27
       +
       	rootNode := newNode("", "", true)

     

       28
       28
       +
       

     

       29
       29
       +
       	sort.Strings(files)

     

       30
       30
       +
       

     

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

     

       32
       32
       +
       		if file == "" {

     

       33
       33
       +
       			continue

     

       34
       34
       +
       		}

     

       35
       35
       +
       

     

       36
       36
       +
       		parts := strings.Split(filepath.Clean(file), "/")

     

       37
       37
       +
       		if len(parts) == 0 {

     

       38
       38
       +
       			continue

     

       39
       39
       +
       		}

     

       40
       40
       +
       

     

       41
       41
       +
       		currentNode := rootNode

     

       42
       42
       +
       		currentPath := ""

     

       43
       43
       +
       

     

       44
       44
       +
       		for i, part := range parts {

     

       45
       45
       +
       			if currentPath == "" {

     

       46
       46
       +
       				currentPath = part

     

       47
       47
       +
       			} else {

     

       48
       48
       +
       				currentPath = filepath.Join(currentPath, part)

     

       49
       49
       +
       			}

     

       50
       50
       +
       

     

       51
       51
       +
       			isDir := i < len(parts)-1

     

       52
       52
       +
       

     

       53
       53
       +
       			if _, exists := currentNode.Children[part]; !exists {

     

       54
       54
       +
       				currentNode.Children[part] = newNode(part, currentPath, isDir)

     

       55
       55
       +
       			}

     

       56
       56
       +
       

     

       57
       57
       +
       			currentNode = currentNode.Children[part]

     

       58
       58
       +
       		}

     

       59
       59
       +
       	}

     

       60
       60
       +
       

     

       61
       61
       +
       	return rootNode

     

       62
       62
       +
       }

+126

appview/middleware/middleware.go

···

       1
       1
       +
       package middleware

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       	"log"

     

       6
       6
       +
       	"net/http"

     

       7
       7
       +
       	"strconv"

     

       8
       8
       +
       	"time"

     

       9
       9
       +
       

     

       10
       10
       +
       	comatproto "github.com/bluesky-social/indigo/api/atproto"

     

       11
       11
       +
       	"github.com/bluesky-social/indigo/xrpc"

     

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

     

       13
       13
       +
       	"tangled.sh/tangled.sh/core/appview/auth"

     

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

     

       15
       15
       +
       )

     

       16
       16
       +
       

     

       17
       17
       +
       type Middleware func(http.Handler) http.Handler

     

       18
       18
       +
       

     

       19
       19
       +
       func AuthMiddleware(a *auth.Auth) Middleware {

     

       20
       20
       +
       	return func(next http.Handler) http.Handler {

     

       21
       21
       +
       		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       22
       22
       +
       			redirectFunc := func(w http.ResponseWriter, r *http.Request) {

     

       23
       23
       +
       				http.Redirect(w, r, "/login", http.StatusTemporaryRedirect)

     

       24
       24
       +
       			}

     

       25
       25
       +
       			if r.Header.Get("HX-Request") == "true" {

     

       26
       26
       +
       				redirectFunc = func(w http.ResponseWriter, _ *http.Request) {

     

       27
       27
       +
       					w.Header().Set("HX-Redirect", "/login")

     

       28
       28
       +
       					w.WriteHeader(http.StatusOK)

     

       29
       29
       +
       				}

     

       30
       30
       +
       			}

     

       31
       31
       +
       

     

       32
       32
       +
       			session, err := a.GetSession(r)

     

       33
       33
       +
       			if session.IsNew || err != nil {

     

       34
       34
       +
       				log.Printf("not logged in, redirecting")

     

       35
       35
       +
       				redirectFunc(w, r)

     

       36
       36
       +
       				return

     

       37
       37
       +
       			}

     

       38
       38
       +
       

     

       39
       39
       +
       			authorized, ok := session.Values[appview.SessionAuthenticated].(bool)

     

       40
       40
       +
       			if !ok || !authorized {

     

       41
       41
       +
       				log.Printf("not logged in, redirecting")

     

       42
       42
       +
       				redirectFunc(w, r)

     

       43
       43
       +
       				return

     

       44
       44
       +
       			}

     

       45
       45
       +
       

     

       46
       46
       +
       			// refresh if nearing expiry

     

       47
       47
       +
       			// TODO: dedup with /login

     

       48
       48
       +
       			expiryStr := session.Values[appview.SessionExpiry].(string)

     

       49
       49
       +
       			expiry, err := time.Parse(time.RFC3339, expiryStr)

     

       50
       50
       +
       			if err != nil {

     

       51
       51
       +
       				log.Println("invalid expiry time", err)

     

       52
       52
       +
       				redirectFunc(w, r)

     

       53
       53
       +
       				return

     

       54
       54
       +
       			}

     

       55
       55
       +
       			pdsUrl, ok1 := session.Values[appview.SessionPds].(string)

     

       56
       56
       +
       			did, ok2 := session.Values[appview.SessionDid].(string)

     

       57
       57
       +
       			refreshJwt, ok3 := session.Values[appview.SessionRefreshJwt].(string)

     

       58
       58
       +
       

     

       59
       59
       +
       			if !ok1 || !ok2 || !ok3 {

     

       60
       60
       +
       				log.Println("invalid expiry time", err)

     

       61
       61
       +
       				redirectFunc(w, r)

     

       62
       62
       +
       				return

     

       63
       63
       +
       			}

     

       64
       64
       +
       

     

       65
       65
       +
       			if time.Now().After(expiry) {

     

       66
       66
       +
       				log.Println("token expired, refreshing ...")

     

       67
       67
       +
       

     

       68
       68
       +
       				client := xrpc.Client{

     

       69
       69
       +
       					Host: pdsUrl,

     

       70
       70
       +
       					Auth: &xrpc.AuthInfo{

     

       71
       71
       +
       						Did:        did,

     

       72
       72
       +
       						AccessJwt:  refreshJwt,

     

       73
       73
       +
       						RefreshJwt: refreshJwt,

     

       74
       74
       +
       					},

     

       75
       75
       +
       				}

     

       76
       76
       +
       				atSession, err := comatproto.ServerRefreshSession(r.Context(), &client)

     

       77
       77
       +
       				if err != nil {

     

       78
       78
       +
       					log.Println("failed to refresh session", err)

     

       79
       79
       +
       					redirectFunc(w, r)

     

       80
       80
       +
       					return

     

       81
       81
       +
       				}

     

       82
       82
       +
       

     

       83
       83
       +
       				sessionish := auth.RefreshSessionWrapper{atSession}

     

       84
       84
       +
       

     

       85
       85
       +
       				err = a.StoreSession(r, w, &sessionish, pdsUrl)

     

       86
       86
       +
       				if err != nil {

     

       87
       87
       +
       					log.Printf("failed to store session for did: %s\n: %s", atSession.Did, err)

     

       88
       88
       +
       					return

     

       89
       89
       +
       				}

     

       90
       90
       +
       

     

       91
       91
       +
       				log.Println("successfully refreshed token")

     

       92
       92
       +
       			}

     

       93
       93
       +
       

     

       94
       94
       +
       			next.ServeHTTP(w, r)

     

       95
       95
       +
       		})

     

       96
       96
       +
       	}

     

       97
       97
       +
       }

     

       98
       98
       +
       

     

       99
       99
       +
       func Paginate(next http.Handler) http.Handler {

     

       100
       100
       +
       	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       101
       101
       +
       		page := pagination.FirstPage()

     

       102
       102
       +
       

     

       103
       103
       +
       		offsetVal := r.URL.Query().Get("offset")

     

       104
       104
       +
       		if offsetVal != "" {

     

       105
       105
       +
       			offset, err := strconv.Atoi(offsetVal)

     

       106
       106
       +
       			if err != nil {

     

       107
       107
       +
       				log.Println("invalid offset")

     

       108
       108
       +
       			} else {

     

       109
       109
       +
       				page.Offset = offset

     

       110
       110
       +
       			}

     

       111
       111
       +
       		}

     

       112
       112
       +
       

     

       113
       113
       +
       		limitVal := r.URL.Query().Get("limit")

     

       114
       114
       +
       		if limitVal != "" {

     

       115
       115
       +
       			limit, err := strconv.Atoi(limitVal)

     

       116
       116
       +
       			if err != nil {

     

       117
       117
       +
       				log.Println("invalid limit")

     

       118
       118
       +
       			} else {

     

       119
       119
       +
       				page.Limit = limit

     

       120
       120
       +
       			}

     

       121
       121
       +
       		}

     

       122
       122
       +
       

     

       123
       123
       +
       		ctx := context.WithValue(r.Context(), "page", page)

     

       124
       124
       +
       		next.ServeHTTP(w, r.WithContext(ctx))

     

       125
       125
       +
       	})

     

       126
       126
       +
       }

-40

appview/pages/chroma.go

···

       1
       1
       -
       package pages

     

       2
       2
       -
       

     

       3
       3
       -
       import "github.com/alecthomas/chroma/v2"

     

       4
       4
       -
       

     

       5
       5
       -
       var tangledTheme map[chroma.TokenType]string = map[chroma.TokenType]string{

     

       6
       6
       -
       	// Keywords

     

       7
       7
       -
       	chroma.Keyword:            "text-blue-400",

     

       8
       8
       -
       	chroma.KeywordConstant:    "text-indigo-400",

     

       9
       9
       -
       	chroma.KeywordDeclaration: "text-purple-400",

     

       10
       10
       -
       	chroma.KeywordNamespace:   "text-teal-400",

     

       11
       11
       -
       	chroma.KeywordReserved:    "text-pink-400",

     

       12
       12
       -
       

     

       13
       13
       -
       	// Names

     

       14
       14
       -
       	chroma.Name:          "text-gray-700",

     

       15
       15
       -
       	chroma.NameFunction:  "text-green-500",

     

       16
       16
       -
       	chroma.NameClass:     "text-orange-400",

     

       17
       17
       -
       	chroma.NameNamespace: "text-cyan-500",

     

       18
       18
       -
       	chroma.NameVariable:  "text-red-400",

     

       19
       19
       -
       	chroma.NameBuiltin:   "text-yellow-500",

     

       20
       20
       -
       

     

       21
       21
       -
       	// Literals

     

       22
       22
       -
       	chroma.LiteralString:      "text-emerald-500 ",

     

       23
       23
       -
       	chroma.LiteralStringChar:  "text-lime-500",

     

       24
       24
       -
       	chroma.LiteralNumber:      "text-rose-400",

     

       25
       25
       -
       	chroma.LiteralNumberFloat: "text-amber-500",

     

       26
       26
       -
       

     

       27
       27
       -
       	// Operators

     

       28
       28
       -
       	chroma.Operator:     "text-blue-500",

     

       29
       29
       -
       	chroma.OperatorWord: "text-indigo-500",

     

       30
       30
       -
       

     

       31
       31
       -
       	// Comments

     

       32
       32
       -
       	chroma.Comment:       "text-gray-500 italic",

     

       33
       33
       -
       	chroma.CommentSingle: "text-gray-400 italic",

     

       34
       34
       -
       

     

       35
       35
       -
       	// Generic

     

       36
       36
       -
       	chroma.GenericError:    "text-red-600",

     

       37
       37
       -
       	chroma.GenericHeading:  "text-purple-500 font-bold",

     

       38
       38
       -
       	chroma.GenericDeleted:  "text-red-400 line-through",

     

       39
       39
       -
       	chroma.GenericInserted: "text-green-400 underline",

     

       40
       40
       -
       }

+9 -1

appview/pages/funcmap.go

···

       13
       13
        
       	"time"

     

       14
       14
        
       

     

       15
       15
        
       	"github.com/dustin/go-humanize"

     

       16
       16
       +
       	"tangled.sh/tangled.sh/core/appview/filetree"

     

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

     

       16
       18
        
       )

     

       17
       19
        
       

     

       18
       20
        
       func funcMap() template.FuncMap {

     
···

       30
       32
        
       			return strings.Split(s, sep)

     

       31
       33
        
       		},

     

       32
       34
        
       		"add": func(a, b int) int {

     

       35
       35
       +
       			return a + b

     

       36
       36
       +
       		},

     

       37
       37
       +
       		// the absolute state of go templates

     

       38
       38
       +
       		"add64": func(a, b int64) int64 {

     

       33
       39
        
       			return a + b

     

       34
       40
        
       		},

     

       35
       41
        
       		"sub": func(a, b int) int {

     
···

       137
       143
        
       			return v.Slice(start, end).Interface()

     

       138
       144
        
       		},

     

       139
       145
        
       		"markdown": func(text string) template.HTML {

     

       140
       140
       -
       			return template.HTML(renderMarkdown(text))

     

       146
       146
       +
       			return template.HTML(markup.RenderMarkdown(text))

     

       141
       147
        
       		},

     

       142
       148
        
       		"isNil": func(t any) bool {

     

       143
       149
        
       			// returns false for other "zero" values

     
···

       168
       174
        
       			}

     

       169
       175
        
       			return template.HTML(data)

     

       170
       176
        
       		},

     

       177
       177
       +
       		"cssContentHash": CssContentHash,

     

       178
       178
       +
       		"fileTree":       filetree.FileTree,

     

       171
       179
        
       	}

     

       172
       180
        
       }

     

       173
       181

-23

appview/pages/markdown.go

···

       1
       1
       -
       package pages

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"bytes"

     

       5
       5
       -
       

     

       6
       6
       -
       	"github.com/yuin/goldmark"

     

       7
       7
       -
       	"github.com/yuin/goldmark/extension"

     

       8
       8
       -
       	"github.com/yuin/goldmark/parser"

     

       9
       9
       -
       )

     

       10
       10
       -
       

     

       11
       11
       -
       func renderMarkdown(source string) string {

     

       12
       12
       -
       	md := goldmark.New(

     

       13
       13
       -
       		goldmark.WithExtensions(extension.GFM),

     

       14
       14
       -
       		goldmark.WithParserOptions(

     

       15
       15
       -
       			parser.WithAutoHeadingID(),

     

       16
       16
       -
       		),

     

       17
       17
       -
       	)

     

       18
       18
       -
       	var buf bytes.Buffer

     

       19
       19
       -
       	if err := md.Convert([]byte(source), &buf); err != nil {

     

       20
       20
       -
       		return source

     

       21
       21
       -
       	}

     

       22
       22
       -
       	return buf.String()

     

       23
       23
       -
       }

+24

appview/pages/markup/markdown.go

···

       1
       1
       +
       // Package markup is an umbrella package for all markups and their renderers.

     

       2
       2
       +
       package markup

     

       3
       3
       +
       

     

       4
       4
       +
       import (

     

       5
       5
       +
       	"bytes"

     

       6
       6
       +
       

     

       7
       7
       +
       	"github.com/yuin/goldmark"

     

       8
       8
       +
       	"github.com/yuin/goldmark/extension"

     

       9
       9
       +
       	"github.com/yuin/goldmark/parser"

     

       10
       10
       +
       )

     

       11
       11
       +
       

     

       12
       12
       +
       func RenderMarkdown(source string) string {

     

       13
       13
       +
       	md := goldmark.New(

     

       14
       14
       +
       		goldmark.WithExtensions(extension.GFM),

     

       15
       15
       +
       		goldmark.WithParserOptions(

     

       16
       16
       +
       			parser.WithAutoHeadingID(),

     

       17
       17
       +
       		),

     

       18
       18
       +
       	)

     

       19
       19
       +
       	var buf bytes.Buffer

     

       20
       20
       +
       	if err := md.Convert([]byte(source), &buf); err != nil {

     

       21
       21
       +
       		return source

     

       22
       22
       +
       	}

     

       23
       23
       +
       	return buf.String()

     

       24
       24
       +
       }

+26

appview/pages/markup/readme.go

···

       1
       1
       +
       package markup

     

       2
       2
       +
       

     

       3
       3
       +
       import "strings"

     

       4
       4
       +
       

     

       5
       5
       +
       type Format string

     

       6
       6
       +
       

     

       7
       7
       +
       const (

     

       8
       8
       +
       	FormatMarkdown Format = "markdown"

     

       9
       9
       +
       	FormatText     Format = "text"

     

       10
       10
       +
       )

     

       11
       11
       +
       

     

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

     

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

     

       14
       14
       +
       }

     

       15
       15
       +
       

     

       16
       16
       +
       func GetFormat(filename string) Format {

     

       17
       17
       +
       	for format, extensions := range FileTypes {

     

       18
       18
       +
       		for _, extension := range extensions {

     

       19
       19
       +
       			if strings.HasSuffix(filename, extension) {

     

       20
       20
       +
       				return format

     

       21
       21
       +
       			}

     

       22
       22
       +
       		}

     

       23
       23
       +
       	}

     

       24
       24
       +
       	// default format

     

       25
       25
       +
       	return FormatText

     

       26
       26
       +
       }

+278 -93

appview/pages/pages.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"bytes"

     

       5
       5
       +
       	"crypto/sha256"

     

       5
       6
        
       	"embed"

     

       7
       7
       +
       	"encoding/hex"

     

       6
       8
        
       	"fmt"

     

       7
       9
        
       	"html/template"

     

       8
       10
        
       	"io"

     

       9
       11
        
       	"io/fs"

     

       10
       12
        
       	"log"

     

       11
       13
        
       	"net/http"

     

       14
       14
       +
       	"os"

     

       12
       15
        
       	"path"

     

       13
       16
        
       	"path/filepath"

     

       14
       17
        
       	"slices"

     

       15
       18
        
       	"strings"

     

       16
       19
        
       

     

       20
       20
       +
       	"tangled.sh/tangled.sh/core/appview/auth"

     

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

     

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

     

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

     

       24
       24
       +
       	"tangled.sh/tangled.sh/core/appview/state/userutil"

     

       25
       25
       +
       	"tangled.sh/tangled.sh/core/patchutil"

     

       26
       26
       +
       	"tangled.sh/tangled.sh/core/types"

     

       27
       27
       +
       

     

       17
       28
        
       	"github.com/alecthomas/chroma/v2"

     

       18
       29
        
       	chromahtml "github.com/alecthomas/chroma/v2/formatters/html"

     

       19
       30
        
       	"github.com/alecthomas/chroma/v2/lexers"

     

       20
       31
        
       	"github.com/alecthomas/chroma/v2/styles"

     

       21
       32
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       22
       33
        
       	"github.com/microcosm-cc/bluemonday"

     

       23
       23
       -
       	"tangled.sh/tangled.sh/core/appview/auth"

     

       24
       24
       -
       	"tangled.sh/tangled.sh/core/appview/db"

     

       25
       25
       -
       	"tangled.sh/tangled.sh/core/appview/state/userutil"

     

       26
       26
       -
       	"tangled.sh/tangled.sh/core/types"

     

       27
       34
        
       )

     

       28
       35
        
       

     

       29
       36
        
       //go:embed templates/* static

     

       30
       37
        
       var Files embed.FS

     

       31
       38
        
       

     

       32
       39
        
       type Pages struct {

     

       33
       33
       -
       	t map[string]*template.Template

     

       40
       40
       +
       	t           map[string]*template.Template

     

       41
       41
       +
       	dev         bool

     

       42
       42
       +
       	embedFS     embed.FS

     

       43
       43
       +
       	templateDir string // Path to templates on disk for dev mode

     

       44
       44
       +
       }

     

       45
       45
       +
       

     

       46
       46
       +
       func NewPages(dev bool) *Pages {

     

       47
       47
       +
       	p := &Pages{

     

       48
       48
       +
       		t:           make(map[string]*template.Template),

     

       49
       49
       +
       		dev:         dev,

     

       50
       50
       +
       		embedFS:     Files,

     

       51
       51
       +
       		templateDir: "appview/pages",

     

       52
       52
       +
       	}

     

       53
       53
       +
       

     

       54
       54
       +
       	// Initial load of all templates

     

       55
       55
       +
       	p.loadAllTemplates()

     

       56
       56
       +
       

     

       57
       57
       +
       	return p

     

       34
       58
        
       }

     

       35
       59
        
       

     

       36
       36
       -
       func NewPages() *Pages {

     

       60
       60
       +
       func (p *Pages) loadAllTemplates() {

     

       37
       61
        
       	templates := make(map[string]*template.Template)

     

       62
       62
       +
       	var fragmentPaths []string

     

       38
       63
        
       

     

       39
       39
       -
       	// Walk through embedded templates directory and parse all .html files

     

       40
       40
       -
       	err := fs.WalkDir(Files, "templates", func(path string, d fs.DirEntry, err error) error {

     

       64
       64
       +
       	// Use embedded FS for initial loading

     

       65
       65
       +
       	// First, collect all fragment paths

     

       66
       66
       +
       	err := fs.WalkDir(p.embedFS, "templates", func(path string, d fs.DirEntry, err error) error {

     

       41
       67
        
       		if err != nil {

     

       42
       68
        
       			return err

     

       43
       69
        
       		}

     

       44
       44
       -
       

     

       45
       45
       -
       		if !d.IsDir() && strings.HasSuffix(path, ".html") {

     

       46
       46
       -
       			name := strings.TrimPrefix(path, "templates/")

     

       47
       47
       -
       			name = strings.TrimSuffix(name, ".html")

     

       70
       70
       +
       		if d.IsDir() {

     

       71
       71
       +
       			return nil

     

       72
       72
       +
       		}

     

       73
       73
       +
       		if !strings.HasSuffix(path, ".html") {

     

       74
       74
       +
       			return nil

     

       75
       75
       +
       		}

     

       76
       76
       +
       		if !strings.Contains(path, "fragments/") {

     

       77
       77
       +
       			return nil

     

       78
       78
       +
       		}

     

       79
       79
       +
       		name := strings.TrimPrefix(path, "templates/")

     

       80
       80
       +
       		name = strings.TrimSuffix(name, ".html")

     

       81
       81
       +
       		tmpl, err := template.New(name).

     

       82
       82
       +
       			Funcs(funcMap()).

     

       83
       83
       +
       			ParseFS(p.embedFS, path)

     

       84
       84
       +
       		if err != nil {

     

       85
       85
       +
       			log.Fatalf("setting up fragment: %v", err)

     

       86
       86
       +
       		}

     

       87
       87
       +
       		templates[name] = tmpl

     

       88
       88
       +
       		fragmentPaths = append(fragmentPaths, path)

     

       89
       89
       +
       		log.Printf("loaded fragment: %s", name)

     

       90
       90
       +
       		return nil

     

       91
       91
       +
       	})

     

       92
       92
       +
       	if err != nil {

     

       93
       93
       +
       		log.Fatalf("walking template dir for fragments: %v", err)

     

       94
       94
       +
       	}

     

       48
       95
        
       

     

       49
       49
       -
       			// add fragments as templates

     

       50
       50
       -
       			if strings.HasPrefix(path, "templates/fragments/") {

     

       51
       51
       -
       				tmpl, err := template.New(name).

     

       52
       52
       -
       					Funcs(funcMap()).

     

       53
       53
       -
       					ParseFS(Files, path)

     

       54
       54
       -
       				if err != nil {

     

       55
       55
       -
       					return fmt.Errorf("setting up fragment: %w", err)

     

       56
       56
       -
       				}

     

       96
       96
       +
       	// Then walk through and setup the rest of the templates

     

       97
       97
       +
       	err = fs.WalkDir(p.embedFS, "templates", func(path string, d fs.DirEntry, err error) error {

     

       98
       98
       +
       		if err != nil {

     

       99
       99
       +
       			return err

     

       100
       100
       +
       		}

     

       101
       101
       +
       		if d.IsDir() {

     

       102
       102
       +
       			return nil

     

       103
       103
       +
       		}

     

       104
       104
       +
       		if !strings.HasSuffix(path, "html") {

     

       105
       105
       +
       			return nil

     

       106
       106
       +
       		}

     

       107
       107
       +
       		// Skip fragments as they've already been loaded

     

       108
       108
       +
       		if strings.Contains(path, "fragments/") {

     

       109
       109
       +
       			return nil

     

       110
       110
       +
       		}

     

       111
       111
       +
       		// Skip layouts

     

       112
       112
       +
       		if strings.Contains(path, "layouts/") {

     

       113
       113
       +
       			return nil

     

       114
       114
       +
       		}

     

       115
       115
       +
       		name := strings.TrimPrefix(path, "templates/")

     

       116
       116
       +
       		name = strings.TrimSuffix(name, ".html")

     

       117
       117
       +
       		// Add the page template on top of the base

     

       118
       118
       +
       		allPaths := []string{}

     

       119
       119
       +
       		allPaths = append(allPaths, "templates/layouts/*.html")

     

       120
       120
       +
       		allPaths = append(allPaths, fragmentPaths...)

     

       121
       121
       +
       		allPaths = append(allPaths, path)

     

       122
       122
       +
       		tmpl, err := template.New(name).

     

       123
       123
       +
       			Funcs(funcMap()).

     

       124
       124
       +
       			ParseFS(p.embedFS, allPaths...)

     

       125
       125
       +
       		if err != nil {

     

       126
       126
       +
       			return fmt.Errorf("setting up template: %w", err)

     

       127
       127
       +
       		}

     

       128
       128
       +
       		templates[name] = tmpl

     

       129
       129
       +
       		log.Printf("loaded template: %s", name)

     

       130
       130
       +
       		return nil

     

       131
       131
       +
       	})

     

       132
       132
       +
       	if err != nil {

     

       133
       133
       +
       		log.Fatalf("walking template dir: %v", err)

     

       134
       134
       +
       	}

     

       57
       135
        
       

     

       58
       58
       -
       				templates[name] = tmpl

     

       59
       59
       -
       				log.Printf("loaded fragment: %s", name)

     

       60
       60
       -
       			}

     

       136
       136
       +
       	log.Printf("total templates loaded: %d", len(templates))

     

       137
       137
       +
       	p.t = templates

     

       138
       138
       +
       }

     

       61
       139
        
       

     

       62
       62
       -
       			// layouts and fragments are applied first

     

       63
       63
       -
       			if !strings.HasPrefix(path, "templates/layouts/") &&

     

       64
       64
       -
       				!strings.HasPrefix(path, "templates/fragments/") {

     

       65
       65
       -
       				// Add the page template on top of the base

     

       66
       66
       -
       				tmpl, err := template.New(name).

     

       67
       67
       -
       					Funcs(funcMap()).

     

       68
       68
       -
       					ParseFS(Files, "templates/layouts/*.html", "templates/fragments/*.html", path)

     

       69
       69
       -
       				if err != nil {

     

       70
       70
       -
       					return fmt.Errorf("setting up template: %w", err)

     

       71
       71
       -
       				}

     

       140
       140
       +
       // loadTemplateFromDisk loads a template from the filesystem in dev mode

     

       141
       141
       +
       func (p *Pages) loadTemplateFromDisk(name string) error {

     

       142
       142
       +
       	if !p.dev {

     

       143
       143
       +
       		return nil

     

       144
       144
       +
       	}

     

       72
       145
        
       

     

       73
       73
       -
       				templates[name] = tmpl

     

       74
       74
       -
       				log.Printf("loaded template: %s", name)

     

       75
       75
       -
       			}

     

       146
       146
       +
       	log.Printf("reloading template from disk: %s", name)

     

       76
       147
        
       

     

       148
       148
       +
       	// Find all fragments first

     

       149
       149
       +
       	var fragmentPaths []string

     

       150
       150
       +
       	err := filepath.WalkDir(filepath.Join(p.templateDir, "templates"), func(path string, d fs.DirEntry, err error) error {

     

       151
       151
       +
       		if err != nil {

     

       152
       152
       +
       			return err

     

       153
       153
       +
       		}

     

       154
       154
       +
       		if d.IsDir() {

     

       77
       155
        
       			return nil

     

       78
       156
        
       		}

     

       157
       157
       +
       		if !strings.HasSuffix(path, ".html") {

     

       158
       158
       +
       			return nil

     

       159
       159
       +
       		}

     

       160
       160
       +
       		if !strings.Contains(path, "fragments/") {

     

       161
       161
       +
       			return nil

     

       162
       162
       +
       		}

     

       163
       163
       +
       		fragmentPaths = append(fragmentPaths, path)

     

       79
       164
        
       		return nil

     

       80
       165
        
       	})

     

       81
       166
        
       	if err != nil {

     

       82
       82
       -
       		log.Fatalf("walking template dir: %v", err)

     

       167
       167
       +
       		return fmt.Errorf("walking disk template dir for fragments: %w", err)

     

       83
       168
        
       	}

     

       84
       169
        
       

     

       85
       85
       -
       	log.Printf("total templates loaded: %d", len(templates))

     

       170
       170
       +
       	// Find the template path on disk

     

       171
       171
       +
       	templatePath := filepath.Join(p.templateDir, "templates", name+".html")

     

       172
       172
       +
       	if _, err := os.Stat(templatePath); os.IsNotExist(err) {

     

       173
       173
       +
       		return fmt.Errorf("template not found on disk: %s", name)

     

       174
       174
       +
       	}

     

       175
       175
       +
       

     

       176
       176
       +
       	// Create a new template

     

       177
       177
       +
       	tmpl := template.New(name).Funcs(funcMap())

     

       178
       178
       +
       

     

       179
       179
       +
       	// Parse layouts

     

       180
       180
       +
       	layoutGlob := filepath.Join(p.templateDir, "templates", "layouts", "*.html")

     

       181
       181
       +
       	layouts, err := filepath.Glob(layoutGlob)

     

       182
       182
       +
       	if err != nil {

     

       183
       183
       +
       		return fmt.Errorf("finding layout templates: %w", err)

     

       184
       184
       +
       	}

     

       86
       185
        
       

     

       87
       87
       -
       	return &Pages{

     

       88
       88
       -
       		t: templates,

     

       186
       186
       +
       	// Create paths for parsing

     

       187
       187
       +
       	allFiles := append(layouts, fragmentPaths...)

     

       188
       188
       +
       	allFiles = append(allFiles, templatePath)

     

       189
       189
       +
       

     

       190
       190
       +
       	// Parse all templates

     

       191
       191
       +
       	tmpl, err = tmpl.ParseFiles(allFiles...)

     

       192
       192
       +
       	if err != nil {

     

       193
       193
       +
       		return fmt.Errorf("parsing template files: %w", err)

     

       89
       194
        
       	}

     

       195
       195
       +
       

     

       196
       196
       +
       	// Update the template in the map

     

       197
       197
       +
       	p.t[name] = tmpl

     

       198
       198
       +
       	log.Printf("template reloaded from disk: %s", name)

     

       199
       199
       +
       	return nil

     

       90
       200
        
       }

     

       91
       201
        
       

     

       92
       92
       -
       type LoginParams struct {

     

       202
       202
       +
       func (p *Pages) executeOrReload(templateName string, w io.Writer, base string, params any) error {

     

       203
       203
       +
       	// In dev mode, reload the template from disk before executing

     

       204
       204
       +
       	if p.dev {

     

       205
       205
       +
       		if err := p.loadTemplateFromDisk(templateName); err != nil {

     

       206
       206
       +
       			log.Printf("warning: failed to reload template %s from disk: %v", templateName, err)

     

       207
       207
       +
       			// Continue with the existing template

     

       208
       208
       +
       		}

     

       209
       209
       +
       	}

     

       210
       210
       +
       

     

       211
       211
       +
       	tmpl, exists := p.t[templateName]

     

       212
       212
       +
       	if !exists {

     

       213
       213
       +
       		return fmt.Errorf("template not found: %s", templateName)

     

       214
       214
       +
       	}

     

       215
       215
       +
       

     

       216
       216
       +
       	if base == "" {

     

       217
       217
       +
       		return tmpl.Execute(w, params)

     

       218
       218
       +
       	} else {

     

       219
       219
       +
       		return tmpl.ExecuteTemplate(w, base, params)

     

       220
       220
       +
       	}

     

       93
       221
        
       }

     

       94
       222
        
       

     

       95
       223
        
       func (p *Pages) execute(name string, w io.Writer, params any) error {

     

       96
       96
       -
       	return p.t[name].ExecuteTemplate(w, "layouts/base", params)

     

       224
       224
       +
       	return p.executeOrReload(name, w, "layouts/base", params)

     

       97
       225
        
       }

     

       98
       226
        
       

     

       99
       227
        
       func (p *Pages) executePlain(name string, w io.Writer, params any) error {

     

       100
       100
       -
       	return p.t[name].Execute(w, params)

     

       228
       228
       +
       	return p.executeOrReload(name, w, "", params)

     

       101
       229
        
       }

     

       102
       230
        
       

     

       103
       231
        
       func (p *Pages) executeRepo(name string, w io.Writer, params any) error {

     

       104
       104
       -
       	return p.t[name].ExecuteTemplate(w, "layouts/repobase", params)

     

       232
       232
       +
       	return p.executeOrReload(name, w, "layouts/repobase", params)

     

       233
       233
       +
       }

     

       234
       234
       +
       

     

       235
       235
       +
       type LoginParams struct {

     

       105
       236
        
       }

     

       106
       237
        
       

     

       107
       238
        
       func (p *Pages) Login(w io.Writer, params LoginParams) error {

     
···

       176
       307
        
       	CollaboratingRepos []db.Repo

     

       177
       308
        
       	ProfileStats       ProfileStats

     

       178
       309
        
       	FollowStatus       db.FollowStatus

     

       179
       179
       -
       	DidHandleMap       map[string]string

     

       180
       310
        
       	AvatarUri          string

     

       181
       181
       -
       	ProfileTimeline    []db.ProfileTimelineEvent

     

       311
       311
       +
       	ProfileTimeline    *db.ProfileTimeline

     

       312
       312
       +
       

     

       313
       313
       +
       	DidHandleMap map[string]string

     

       182
       314
        
       }

     

       183
       315
        
       

     

       184
       316
        
       type ProfileStats struct {

     
···

       196
       328
        
       }

     

       197
       329
        
       

     

       198
       330
        
       func (p *Pages) FollowFragment(w io.Writer, params FollowFragmentParams) error {

     

       199
       199
       -
       	return p.executePlain("fragments/follow", w, params)

     

       331
       331
       +
       	return p.executePlain("user/fragments/follow", w, params)

     

       200
       332
        
       }

     

       201
       333
        
       

     

       202
       334
        
       type RepoActionsFragmentParams struct {

     
···

       206
       338
        
       }

     

       207
       339
        
       

     

       208
       340
        
       func (p *Pages) RepoActionsFragment(w io.Writer, params RepoActionsFragmentParams) error {

     

       209
       209
       -
       	return p.executePlain("fragments/repoActions", w, params)

     

       341
       341
       +
       	return p.executePlain("repo/fragments/repoActions", w, params)

     

       210
       342
        
       }

     

       211
       343
        
       

     

       212
       344
        
       type RepoDescriptionParams struct {

     
···

       214
       346
        
       }

     

       215
       347
        
       

     

       216
       348
        
       func (p *Pages) EditRepoDescriptionFragment(w io.Writer, params RepoDescriptionParams) error {

     

       217
       217
       -
       	return p.executePlain("fragments/editRepoDescription", w, params)

     

       349
       349
       +
       	return p.executePlain("repo/fragments/editRepoDescription", w, params)

     

       218
       350
        
       }

     

       219
       351
        
       

     

       220
       352
        
       func (p *Pages) RepoDescriptionFragment(w io.Writer, params RepoDescriptionParams) error {

     

       221
       221
       -
       	return p.executePlain("fragments/repoDescription", w, params)

     

       353
       353
       +
       	return p.executePlain("repo/fragments/repoDescription", w, params)

     

       222
       354
        
       }

     

       223
       355
        
       

     

       224
       356
        
       type RepoInfo struct {

     
···

       244
       376
        
       	return slices.Contains(r.Roles, "repo:settings")

     

       245
       377
        
       }

     

       246
       378
        
       

     

       379
       379
       +
       func (r RolesInRepo) CollaboratorInviteAllowed() bool {

     

       380
       380
       +
       	return slices.Contains(r.Roles, "repo:invite")

     

       381
       381
       +
       }

     

       382
       382
       +
       

     

       383
       383
       +
       func (r RolesInRepo) RepoDeleteAllowed() bool {

     

       384
       384
       +
       	return slices.Contains(r.Roles, "repo:delete")

     

       385
       385
       +
       }

     

       386
       386
       +
       

     

       247
       387
        
       func (r RolesInRepo) IsOwner() bool {

     

       248
       388
        
       	return slices.Contains(r.Roles, "repo:owner")

     

       249
       389
        
       }

     
···

       282
       422
        
       

     

       283
       423
        
       func (r RepoInfo) GetTabs() [][]string {

     

       284
       424
        
       	tabs := [][]string{

     

       285
       285
       -
       		{"overview", "/"},

     

       286
       286
       -
       		{"issues", "/issues"},

     

       287
       287
       -
       		{"pulls", "/pulls"},

     

       425
       425
       +
       		{"overview", "/", "square-chart-gantt"},

     

       426
       426
       +
       		{"issues", "/issues", "circle-dot"},

     

       427
       427
       +
       		{"pulls", "/pulls", "git-pull-request"},

     

       288
       428
        
       	}

     

       289
       429
        
       

     

       290
       430
        
       	if r.Roles.SettingsAllowed() {

     

       291
       291
       -
       		tabs = append(tabs, []string{"settings", "/settings"})

     

       431
       431
       +
       		tabs = append(tabs, []string{"settings", "/settings", "cog"})

     

       292
       432
        
       	}

     

       293
       433
        
       

     

       294
       434
        
       	return tabs

     
···

       339
       479
        
       		ext := filepath.Ext(params.ReadmeFileName)

     

       340
       480
        
       		switch ext {

     

       341
       481
        
       		case ".md", ".markdown", ".mdown", ".mkdn", ".mkd":

     

       342
       342
       -
       			htmlString = renderMarkdown(params.Readme)

     

       482
       482
       +
       			htmlString = markup.RenderMarkdown(params.Readme)

     

       343
       483
        
       			params.Raw = false

     

       344
       484
        
       			params.HTMLReadme = template.HTML(bluemonday.UGCPolicy().Sanitize(htmlString))

     

       345
       485
        
       		default:

     
···

       366
       506
        
       }

     

       367
       507
        
       

     

       368
       508
        
       type RepoCommitParams struct {

     

       369
       369
       -
       	LoggedInUser *auth.User

     

       370
       370
       -
       	RepoInfo     RepoInfo

     

       371
       371
       -
       	Active       string

     

       372
       372
       -
       	types.RepoCommitResponse

     

       509
       509
       +
       	LoggedInUser       *auth.User

     

       510
       510
       +
       	RepoInfo           RepoInfo

     

       511
       511
       +
       	Active             string

     

       373
       512
        
       	EmailToDidOrHandle map[string]string

     

       513
       513
       +
       

     

       514
       514
       +
       	types.RepoCommitResponse

     

       374
       515
        
       }

     

       375
       516
        
       

     

       376
       517
        
       func (p *Pages) RepoCommit(w io.Writer, params RepoCommitParams) error {

     
···

       435
       576
        
       }

     

       436
       577
        
       

     

       437
       578
        
       type RepoBlobParams struct {

     

       438
       438
       -
       	LoggedInUser *auth.User

     

       439
       439
       -
       	RepoInfo     RepoInfo

     

       440
       440
       -
       	Active       string

     

       441
       441
       -
       	BreadCrumbs  [][]string

     

       579
       579
       +
       	LoggedInUser     *auth.User

     

       580
       580
       +
       	RepoInfo         RepoInfo

     

       581
       581
       +
       	Active           string

     

       582
       582
       +
       	BreadCrumbs      [][]string

     

       583
       583
       +
       	ShowRendered     bool

     

       584
       584
       +
       	RenderToggle     bool

     

       585
       585
       +
       	RenderedContents template.HTML

     

       442
       586
        
       	types.RepoBlobResponse

     

       443
       587
        
       }

     

       444
       588
        
       

     

       445
       589
        
       func (p *Pages) RepoBlob(w io.Writer, params RepoBlobParams) error {

     

       446
       446
       -
       	style := styles.Get("bw")

     

       447
       447
       -
       	b := style.Builder()

     

       448
       448
       -
       	b.Add(chroma.LiteralString, "noitalic")

     

       449
       449
       -
       	style, _ = b.Build()

     

       590
       590
       +
       	var style *chroma.Style = styles.Get("catpuccin-latte")

     

       591
       591
       +
       

     

       592
       592
       +
       	if params.ShowRendered {

     

       593
       593
       +
       		switch markup.GetFormat(params.Path) {

     

       594
       594
       +
       		case markup.FormatMarkdown:

     

       595
       595
       +
       			params.RenderedContents = template.HTML(markup.RenderMarkdown(params.Contents))

     

       596
       596
       +
       		}

     

       597
       597
       +
       	}

     

       450
       598
        
       

     

       451
       599
        
       	if params.Lines < 5000 {

     

       452
       600
        
       		c := params.Contents

     
···

       455
       603
        
       			chromahtml.WithLineNumbers(true),

     

       456
       604
        
       			chromahtml.WithLinkableLineNumbers(true, "L"),

     

       457
       605
        
       			chromahtml.Standalone(false),

     

       606
       606
       +
       			chromahtml.WithClasses(true),

     

       458
       607
        
       		)

     

       459
       608
        
       

     

       460
       609
        
       		lexer := lexers.Get(filepath.Base(params.Path))

     
···

       503
       652
        
       }

     

       504
       653
        
       

     

       505
       654
        
       type RepoIssuesParams struct {

     

       506
       506
       -
       	LoggedInUser *auth.User

     

       507
       507
       -
       	RepoInfo     RepoInfo

     

       508
       508
       -
       	Active       string

     

       509
       509
       -
       	Issues       []db.Issue

     

       510
       510
       -
       	DidHandleMap map[string]string

     

       511
       511
       -
       

     

       655
       655
       +
       	LoggedInUser    *auth.User

     

       656
       656
       +
       	RepoInfo        RepoInfo

     

       657
       657
       +
       	Active          string

     

       658
       658
       +
       	Issues          []db.Issue

     

       659
       659
       +
       	DidHandleMap    map[string]string

     

       660
       660
       +
       	Page            pagination.Page

     

       512
       661
        
       	FilteringByOpen bool

     

       513
       662
        
       }

     

       514
       663
        
       

     
···

       558
       707
        
       }

     

       559
       708
        
       

     

       560
       709
        
       func (p *Pages) EditIssueCommentFragment(w io.Writer, params EditIssueCommentParams) error {

     

       561
       561
       -
       	return p.executePlain("fragments/editIssueComment", w, params)

     

       710
       710
       +
       	return p.executePlain("repo/issues/fragments/editIssueComment", w, params)

     

       562
       711
        
       }

     

       563
       712
        
       

     

       564
       713
        
       type SingleIssueCommentParams struct {

     
···

       570
       719
        
       }

     

       571
       720
        
       

     

       572
       721
        
       func (p *Pages) SingleIssueCommentFragment(w io.Writer, params SingleIssueCommentParams) error {

     

       573
       573
       -
       	return p.executePlain("fragments/issueComment", w, params)

     

       722
       722
       +
       	return p.executePlain("repo/issues/fragments/issueComment", w, params)

     

       574
       723
        
       }

     

       575
       724
        
       

     

       576
       725
        
       type RepoNewPullParams struct {

     
···

       588
       737
        
       type RepoPullsParams struct {

     

       589
       738
        
       	LoggedInUser *auth.User

     

       590
       739
        
       	RepoInfo     RepoInfo

     

       591
       591
       -
       	Pulls        []db.Pull

     

       740
       740
       +
       	Pulls        []*db.Pull

     

       592
       741
        
       	Active       string

     

       593
       742
        
       	DidHandleMap map[string]string

     

       594
       743
        
       	FilteringBy  db.PullState

     
···

       618
       767
        
       }

     

       619
       768
        
       

     

       620
       769
        
       type RepoSinglePullParams struct {

     

       621
       621
       -
       	LoggedInUser   *auth.User

     

       622
       622
       -
       	RepoInfo       RepoInfo

     

       623
       623
       -
       	Active         string

     

       624
       624
       -
       	DidHandleMap   map[string]string

     

       625
       625
       -
       	Pull           *db.Pull

     

       626
       626
       -
       	PullSourceRepo *db.Repo

     

       627
       627
       -
       	MergeCheck     types.MergeCheckResponse

     

       628
       628
       -
       	ResubmitCheck  ResubmitResult

     

       770
       770
       +
       	LoggedInUser  *auth.User

     

       771
       771
       +
       	RepoInfo      RepoInfo

     

       772
       772
       +
       	Active        string

     

       773
       773
       +
       	DidHandleMap  map[string]string

     

       774
       774
       +
       	Pull          *db.Pull

     

       775
       775
       +
       	MergeCheck    types.MergeCheckResponse

     

       776
       776
       +
       	ResubmitCheck ResubmitResult

     

       629
       777
        
       }

     

       630
       778
        
       

     

       631
       779
        
       func (p *Pages) RepoSinglePull(w io.Writer, params RepoSinglePullParams) error {

     
···

       638
       786
        
       	DidHandleMap map[string]string

     

       639
       787
        
       	RepoInfo     RepoInfo

     

       640
       788
        
       	Pull         *db.Pull

     

       641
       641
       -
       	Diff         types.NiceDiff

     

       789
       789
       +
       	Diff         *types.NiceDiff

     

       642
       790
        
       	Round        int

     

       643
       791
        
       	Submission   *db.PullSubmission

     

       644
       792
        
       }

     
···

       648
       796
        
       	return p.execute("repo/pulls/patch", w, params)

     

       649
       797
        
       }

     

       650
       798
        
       

     

       799
       799
       +
       type RepoPullInterdiffParams struct {

     

       800
       800
       +
       	LoggedInUser *auth.User

     

       801
       801
       +
       	DidHandleMap map[string]string

     

       802
       802
       +
       	RepoInfo     RepoInfo

     

       803
       803
       +
       	Pull         *db.Pull

     

       804
       804
       +
       	Round        int

     

       805
       805
       +
       	Interdiff    *patchutil.InterdiffResult

     

       806
       806
       +
       }

     

       807
       807
       +
       

     

       808
       808
       +
       // this name is a mouthful

     

       809
       809
       +
       func (p *Pages) RepoPullInterdiffPage(w io.Writer, params RepoPullInterdiffParams) error {

     

       810
       810
       +
       	return p.execute("repo/pulls/interdiff", w, params)

     

       811
       811
       +
       }

     

       812
       812
       +
       

     

       651
       813
        
       type PullPatchUploadParams struct {

     

       652
       814
        
       	RepoInfo RepoInfo

     

       653
       815
        
       }

     

       654
       816
        
       

     

       655
       817
        
       func (p *Pages) PullPatchUploadFragment(w io.Writer, params PullPatchUploadParams) error {

     

       656
       656
       -
       	return p.executePlain("fragments/pullPatchUpload", w, params)

     

       818
       818
       +
       	return p.executePlain("repo/pulls/fragments/pullPatchUpload", w, params)

     

       657
       819
        
       }

     

       658
       820
        
       

     

       659
       821
        
       type PullCompareBranchesParams struct {

     
···

       662
       824
        
       }

     

       663
       825
        
       

     

       664
       826
        
       func (p *Pages) PullCompareBranchesFragment(w io.Writer, params PullCompareBranchesParams) error {

     

       665
       665
       -
       	return p.executePlain("fragments/pullCompareBranches", w, params)

     

       827
       827
       +
       	return p.executePlain("repo/pulls/fragments/pullCompareBranches", w, params)

     

       666
       828
        
       }

     

       667
       829
        
       

     

       668
       830
        
       type PullCompareForkParams struct {

     
···

       671
       833
        
       }

     

       672
       834
        
       

     

       673
       835
        
       func (p *Pages) PullCompareForkFragment(w io.Writer, params PullCompareForkParams) error {

     

       674
       674
       -
       	return p.executePlain("fragments/pullCompareForks", w, params)

     

       836
       836
       +
       	return p.executePlain("repo/pulls/fragments/pullCompareForks", w, params)

     

       675
       837
        
       }

     

       676
       838
        
       

     

       677
       839
        
       type PullCompareForkBranchesParams struct {

     
···

       681
       843
        
       }

     

       682
       844
        
       

     

       683
       845
        
       func (p *Pages) PullCompareForkBranchesFragment(w io.Writer, params PullCompareForkBranchesParams) error {

     

       684
       684
       -
       	return p.executePlain("fragments/pullCompareForksBranches", w, params)

     

       846
       846
       +
       	return p.executePlain("repo/pulls/fragments/pullCompareForksBranches", w, params)

     

       685
       847
        
       }

     

       686
       848
        
       

     

       687
       849
        
       type PullResubmitParams struct {

     
···

       692
       854
        
       }

     

       693
       855
        
       

     

       694
       856
        
       func (p *Pages) PullResubmitFragment(w io.Writer, params PullResubmitParams) error {

     

       695
       695
       -
       	return p.executePlain("fragments/pullResubmit", w, params)

     

       857
       857
       +
       	return p.executePlain("repo/pulls/fragments/pullResubmit", w, params)

     

       696
       858
        
       }

     

       697
       859
        
       

     

       698
       860
        
       type PullActionsParams struct {

     
···

       705
       867
        
       }

     

       706
       868
        
       

     

       707
       869
        
       func (p *Pages) PullActionsFragment(w io.Writer, params PullActionsParams) error {

     

       708
       708
       -
       	return p.executePlain("fragments/pullActions", w, params)

     

       870
       870
       +
       	return p.executePlain("repo/pulls/fragments/pullActions", w, params)

     

       709
       871
        
       }

     

       710
       872
        
       

     

       711
       873
        
       type PullNewCommentParams struct {

     
···

       716
       878
        
       }

     

       717
       879
        
       

     

       718
       880
        
       func (p *Pages) PullNewCommentFragment(w io.Writer, params PullNewCommentParams) error {

     

       719
       719
       -
       	return p.executePlain("fragments/pullNewComment", w, params)

     

       881
       881
       +
       	return p.executePlain("repo/pulls/fragments/pullNewComment", w, params)

     

       720
       882
        
       }

     

       721
       883
        
       

     

       722
       884
        
       func (p *Pages) Static() http.Handler {

     

       885
       885
       +
       	if p.dev {

     

       886
       886
       +
       		return http.StripPrefix("/static/", http.FileServer(http.Dir("appview/pages/static")))

     

       887
       887
       +
       	}

     

       888
       888
       +
       

     

       723
       889
        
       	sub, err := fs.Sub(Files, "static")

     

       724
       890
        
       	if err != nil {

     

       725
       891
        
       		log.Fatalf("no static dir found? that's crazy: %v", err)

     
···

       730
       896
        
       

     

       731
       897
        
       func Cache(h http.Handler) http.Handler {

     

       732
       898
        
       	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       733
       733
       -
       		if strings.HasSuffix(r.URL.Path, ".css") {

     

       899
       899
       +
       		path := strings.Split(r.URL.Path, "?")[0]

     

       900
       900
       +
       

     

       901
       901
       +
       		if strings.HasSuffix(path, ".css") {

     

       734
       902
        
       			// on day for css files

     

       735
       903
        
       			w.Header().Set("Cache-Control", "public, max-age=86400")

     

       736
       904
        
       		} else {

     
···

       738
       906
        
       		}

     

       739
       907
        
       		h.ServeHTTP(w, r)

     

       740
       908
        
       	})

     

       909
       909
       +
       }

     

       910
       910
       +
       

     

       911
       911
       +
       func CssContentHash() string {

     

       912
       912
       +
       	cssFile, err := Files.Open("static/tw.css")

     

       913
       913
       +
       	if err != nil {

     

       914
       914
       +
       		log.Printf("Error opening CSS file: %v", err)

     

       915
       915
       +
       		return ""

     

       916
       916
       +
       	}

     

       917
       917
       +
       	defer cssFile.Close()

     

       918
       918
       +
       

     

       919
       919
       +
       	hasher := sha256.New()

     

       920
       920
       +
       	if _, err := io.Copy(hasher, cssFile); err != nil {

     

       921
       921
       +
       		log.Printf("Error hashing CSS file: %v", err)

     

       922
       922
       +
       		return ""

     

       923
       923
       +
       	}

     

       924
       924
       +
       

     

       925
       925
       +
       	return hex.EncodeToString(hasher.Sum(nil))[:8] // Use first 8 chars of hash

     

       741
       926
        
       }

     

       742
       927
        
       

     

       743
       928
        
       func (p *Pages) Error500(w io.Writer) error {

-33

appview/pages/templates/fragments/cloneInstructions.html

···

       1
       1
       -
       {{ define "fragments/cloneInstructions" }}

     

       2
       2
       -
       <section class="mt-4 p-6 rounded bg-white dark:bg-gray-800 dark:text-white w-full mx-auto overflow-auto flex flex-col gap-4">

     

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

     

       4
       4
       -
           <strong>push</strong>

     

       5
       5
       -
           <div class="md:pl-4 overflow-x-auto whitespace-nowrap">

     

       6
       6
       -
             <code class="dark:text-gray-100">git remote add origin git@{{.RepoInfo.Knot}}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code>

     

       7
       7
       -
           </div>

     

       8
       8
       -
         </div>

     

       9
       9
       -
       

     

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

     

       11
       11
       -
           <strong>clone</strong>

     

       12
       12
       -
           <div class="md:pl-4 flex flex-col gap-2">

     

       13
       13
       -
       

     

       14
       14
       -
             <div class="flex items-center gap-3">

     

       15
       15
       -
               <span class="bg-gray-100 dark:bg-gray-700 p-1 mr-1 font-mono text-sm rounded select-none dark:text-white">HTTP</span>

     

       16
       16
       -
               <div class="overflow-x-auto whitespace-nowrap flex-1">

     

       17
       17
       -
                 <code class="dark:text-gray-100">git clone https://tangled.sh/{{ .RepoInfo.OwnerWithAt }}/{{ .RepoInfo.Name }}</code>

     

       18
       18
       -
               </div>

     

       19
       19
       -
             </div>

     

       20
       20
       -
       

     

       21
       21
       -
             <div class="flex items-center gap-3">

     

       22
       22
       -
               <span class="bg-gray-100 dark:bg-gray-700 p-1 mr-1 font-mono text-sm rounded select-none dark:text-white">SSH</span>

     

       23
       23
       -
               <div class="overflow-x-auto whitespace-nowrap flex-1">

     

       24
       24
       -
                 <code class="dark:text-gray-100">git clone git@{{.RepoInfo.Knot}}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code>

     

       25
       25
       -
               </div>

     

       26
       26
       -
             </div>

     

       27
       27
       -
           </div>

     

       28
       28
       -
         </div>

     

       29
       29
       -
       

     

       30
       30
       -
       

     

       31
       31
       -
         <p class="py-2 text-gray-500 dark:text-gray-400">Note that for self-hosted knots, clone URLs may be different based on your setup.</p>

     

       32
       32
       -
       </section>

     

       33
       33
       -
       {{ end }}

-114

appview/pages/templates/fragments/diff.html

···

       1
       1
       -
       {{ define "fragments/diff" }}

     

       2
       2
       -
       {{ $repo := index . 0 }}

     

       3
       3
       -
       {{ $diff := index . 1 }}

     

       4
       4
       -
       {{ $commit := $diff.Commit }}

     

       5
       5
       -
       {{ $stat := $diff.Stat }}

     

       6
       6
       -
       {{ $diff := $diff.Diff }}

     

       7
       7
       -
       

     

       8
       8
       -
         {{ $this := $commit.This }}

     

       9
       9
       -
         {{ $parent := $commit.Parent }}

     

       10
       10
       -
       

     

       11
       11
       -
         {{ $last := sub (len $diff) 1 }}

     

       12
       12
       -
         {{ range $idx, $hunk := $diff }}

     

       13
       13
       -
         {{ with $hunk }}

     

       14
       14
       -
         <section class="mt-6 border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm">

     

       15
       15
       -
           <div id="file-{{ .Name.New }}">

     

       16
       16
       -
             <div id="diff-file">

     

       17
       17
       -
               <details open>

     

       18
       18
       -
                 <summary class="list-none cursor-pointer sticky top-0">

     

       19
       19
       -
                   <div id="diff-file-header" class="rounded cursor-pointer bg-white dark:bg-gray-800 flex justify-between">

     

       20
       20
       -
                     <div id="left-side-items" class="p-2 flex gap-2 items-center">

     

       21
       21
       -
                       {{ $markerstyle := "diff-type p-1 mr-1 font-mono text-sm rounded select-none" }}

     

       22
       22
       -
       

     

       23
       23
       -
                       {{ if .IsNew }}

     

       24
       24
       -
                       <span class="bg-green-100 text-green-700 dark:bg-green-800/50 dark:text-green-400 {{ $markerstyle }}">ADDED</span>

     

       25
       25
       -
                       {{ else if .IsDelete }}

     

       26
       26
       -
                       <span class="bg-red-100 text-red-700 dark:bg-red-800/50 dark:text-red-400 {{ $markerstyle }}">DELETED</span>

     

       27
       27
       -
                       {{ else if .IsCopy }}

     

       28
       28
       -
                       <span class="bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300 {{ $markerstyle }}">COPIED</span>

     

       29
       29
       -
                       {{ else if .IsRename }}

     

       30
       30
       -
                       <span class="bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300 {{ $markerstyle }}">RENAMED</span>

     

       31
       31
       -
                       {{ else }}

     

       32
       32
       -
                       <span class="bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300 {{ $markerstyle }}">MODIFIED</span>

     

       33
       33
       -
                       {{ end }}

     

       34
       34
       -
       

     

       35
       35
       -
                       {{ if .IsDelete }}

     

       36
       36
       -
                       <a class="dark:text-white" {{if $this }}href="/{{ $repo }}/blob/{{ $this }}/{{ .Name.Old }}"{{end}}>

     

       37
       37
       -
                         {{ .Name.Old }}

     

       38
       38
       -
                       </a>

     

       39
       39
       -
                       {{ else if (or .IsCopy .IsRename) }}

     

       40
       40
       -
                       <a class="dark:text-white" {{if $parent}}href="/{{ $repo }}/blob/{{ $parent }}/{{ .Name.Old }}"{{end}}>

     

       41
       41
       -
                         {{ .Name.Old }}

     

       42
       42
       -
                       </a>

     

       43
       43
       -
                       {{ i "arrow-right" "w-4 h-4" }}

     

       44
       44
       -
                       <a class="dark:text-white" {{if $this}}href="/{{ $repo }}/blob/{{ $this }}/{{ .Name.New }}"{{end}}>

     

       45
       45
       -
                         {{ .Name.New }}

     

       46
       46
       -
                       </a>

     

       47
       47
       -
                       {{ else }}

     

       48
       48
       -
                       <a class="dark:text-white" {{if $this}}href="/{{ $repo }}/blob/{{ $this }}/{{ .Name.New }}"{{end}}>

     

       49
       49
       -
                         {{ .Name.New }}

     

       50
       50
       -
                       </a>

     

       51
       51
       -
                       {{ end }}

     

       52
       52
       -
                     </div>

     

       53
       53
       -
       

     

       54
       54
       -
                     {{ $iconstyle := "p-1 mx-1 hover:bg-gray-100 dark:hover:bg-gray-700 rounded" }}

     

       55
       55
       -
                     <div id="right-side-items" class="p-2 flex items-center">

     

       56
       56
       -
                       <a title="top of file" href="#file-{{ .Name.New }}" class="{{ $iconstyle }}">{{ i "arrow-up-to-line" "w-4 h-4" }}</a>

     

       57
       57
       -
                       {{ if gt $idx 0 }}

     

       58
       58
       -
                         {{ $prev := index $diff (sub $idx 1) }}

     

       59
       59
       -
                         <a title="previous file" href="#file-{{ $prev.Name.New }}" class="{{ $iconstyle }}">{{ i "arrow-up" "w-4 h-4" }}</a>

     

       60
       60
       -
                       {{ end }}

     

       61
       61
       -
       

     

       62
       62
       -
                       {{ if lt $idx $last }}

     

       63
       63
       -
                         {{ $next := index $diff (add $idx 1) }}

     

       64
       64
       -
                         <a title="next file" href="#file-{{ $next.Name.New }}" class="{{ $iconstyle }}">{{ i "arrow-down" "w-4 h-4" }}</a>

     

       65
       65
       -
                       {{ end }}

     

       66
       66
       -
                     </div>

     

       67
       67
       -
       

     

       68
       68
       -
                   </div>

     

       69
       69
       -
                 </summary>

     

       70
       70
       -
       

     

       71
       71
       -
                 <div class="transition-all duration-700 ease-in-out">

     

       72
       72
       -
                   {{ if .IsDelete }}

     

       73
       73
       -
                   <p class="text-center text-gray-400 dark:text-gray-500 p-4">

     

       74
       74
       -
                   This file has been deleted in this commit.

     

       75
       75
       -
                   </p>

     

       76
       76
       -
                   {{ else }}

     

       77
       77
       -
                   {{ if .IsBinary }}

     

       78
       78
       -
                   <p class="text-center text-gray-400 dark:text-gray-500 p-4">

     

       79
       79
       -
                   This is a binary file and will not be displayed.

     

       80
       80
       -
                   </p>

     

       81
       81
       -
                   {{ else }}

     

       82
       82
       -
                   <pre class="overflow-x-auto"><div class="overflow-x-auto"><div class="min-w-full inline-block">{{- range .TextFragments -}}<div class="bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400 select-none">{{- .Header -}}</div>{{- range .Lines -}}

     

       83
       83
       -
                              {{- if eq .Op.String "+" -}}

     

       84
       84
       -
                              <div class="bg-green-100 dark:bg-green-800/30 text-green-700 dark:text-green-400 flex min-w-full">

     

       85
       85
       -
                                <div class="w-10 flex-shrink-0 select-none p-1 text-center">{{ .Op.String }}</div>

     

       86
       86
       -
                                <div class="p-1 whitespace-pre">{{ .Line }}</div>

     

       87
       87
       -
                              </div>

     

       88
       88
       -
                              {{- end -}}

     

       89
       89
       -
                              {{- if eq .Op.String "-" -}}

     

       90
       90
       -
                              <div class="bg-red-100 dark:bg-red-800/30 text-red-700 dark:text-red-400 flex min-w-full">

     

       91
       91
       -
                                <div class="w-10 flex-shrink-0 select-none p-1 text-center">{{ .Op.String }}</div>

     

       92
       92
       -
                                <div class="p-1 whitespace-pre">{{ .Line }}</div>

     

       93
       93
       -
                              </div>

     

       94
       94
       -
                              {{- end -}}

     

       95
       95
       -
                              {{- if eq .Op.String " " -}}

     

       96
       96
       -
                              <div class="bg-white dark:bg-gray-800 text-gray-500 dark:text-gray-400 flex min-w-full">

     

       97
       97
       -
                                <div class="w-10 flex-shrink-0 select-none p-1 text-center">{{ .Op.String }}</div>

     

       98
       98
       -
                                <div class="p-1 whitespace-pre">{{ .Line }}</div>

     

       99
       99
       -
                              </div>

     

       100
       100
       -
                              {{- end -}}

     

       101
       101
       -
                            {{- end -}}

     

       102
       102
       -
                          {{- end -}}</div></div></pre>

     

       103
       103
       -
                   {{- end -}}

     

       104
       104
       -
                   {{ end }}

     

       105
       105
       -
                 </div>

     

       106
       106
       -
       

     

       107
       107
       -
               </details>

     

       108
       108
       -
       

     

       109
       109
       -
             </div>

     

       110
       110
       -
           </div>

     

       111
       111
       -
         </section>

     

       112
       112
       -
         {{ end }}

     

       113
       113
       -
         {{ end }}

     

       114
       114
       -
       {{ end }}

-52

appview/pages/templates/fragments/editIssueComment.html

···

       1
       1
       -
       {{ define "fragments/editIssueComment" }}

     

       2
       2
       -
         {{ with .Comment }}

     

       3
       3
       -
         <div id="comment-container-{{.CommentId}}">

     

       4
       4
       -
           <div class="flex items-center gap-2 mb-2 text-gray-500 text-sm">

     

       5
       5
       -
             {{ $owner := didOrHandle $.LoggedInUser.Did $.LoggedInUser.Handle }}

     

       6
       6
       -
             <a href="/{{ $owner }}" class="no-underline hover:underline">{{ $owner }}</a>

     

       7
       7
       -
       

     

       8
       8
       -
             <!-- show user "hats" -->

     

       9
       9
       -
             {{ $isIssueAuthor := eq .OwnerDid $.Issue.OwnerDid }}

     

       10
       10
       -
             {{ if $isIssueAuthor }}

     

       11
       11
       -
             <span class="before:content-['·']"></span>

     

       12
       12
       -
             <span class="rounded bg-gray-100 text-black font-mono px-2 mx-1/2 inline-flex items-center">

     

       13
       13
       -
               author

     

       14
       14
       -
             </span>

     

       15
       15
       -
             {{ end }}

     

       16
       16
       -
       

     

       17
       17
       -
             <span class="before:content-['·']"></span>

     

       18
       18
       -
             <a

     

       19
       19
       -
                 href="#{{ .CommentId }}"

     

       20
       20
       -
                 class="text-gray-500 hover:text-gray-500 hover:underline no-underline"

     

       21
       21
       -
                 id="{{ .CommentId }}">

     

       22
       22
       -
               {{ .Created | timeFmt }}

     

       23
       23
       -
             </a>

     

       24
       24
       -
       

     

       25
       25
       -
             <button

     

       26
       26
       -
               class="btn px-2 py-1 flex items-center gap-2 text-sm"

     

       27
       27
       -
               hx-post="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/edit"

     

       28
       28
       -
               hx-include="#edit-textarea-{{ .CommentId }}"

     

       29
       29
       -
               hx-target="#comment-container-{{ .CommentId }}"

     

       30
       30
       -
               hx-swap="outerHTML">

     

       31
       31
       -
               {{ i "check" "w-4 h-4" }}

     

       32
       32
       -
             </button>

     

       33
       33
       -
             <button

     

       34
       34
       -
               class="btn px-2 py-1  flex items-center gap-2 text-sm"

     

       35
       35
       -
               hx-get="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/"

     

       36
       36
       -
               hx-target="#comment-container-{{ .CommentId }}"

     

       37
       37
       -
               hx-swap="outerHTML">

     

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

     

       39
       39
       -
             </button>

     

       40
       40
       -
             <span id="comment-{{.CommentId}}-status"></span>

     

       41
       41
       -
           </div>

     

       42
       42
       -
       

     

       43
       43
       -
           <div>

     

       44
       44
       -
             <textarea

     

       45
       45
       -
               id="edit-textarea-{{ .CommentId }}"

     

       46
       46
       -
               name="body"

     

       47
       47
       -
               class="w-full p-2 border rounded min-h-[100px]">{{ .Body }}</textarea>

     

       48
       48
       -
           </div>

     

       49
       49
       -
         </div>

     

       50
       50
       -
         {{ end }}

     

       51
       51
       -
       {{ end }}

     

       52
       52
       -

-11

appview/pages/templates/fragments/editRepoDescription.html

···

       1
       1
       -
       {{ define "fragments/editRepoDescription" }}

     

       2
       2
       -
       <form hx-put="/{{ .RepoInfo.FullName }}/description" hx-target="this" hx-swap="outerHTML" class="flex flex-wrap gap-2">

     

       3
       3
       -
           <input type="text" class="p-1" name="description" value="{{ .RepoInfo.Description }}">

     

       4
       4
       -
           <button type="submit" class="btn p-2 flex items-center gap-2 no-underline text-sm">

     

       5
       5
       -
             {{ i "check" "w-3 h-3" }} save 

     

       6
       6
       -
           </button>

     

       7
       7
       -
           <button type="button" class="btn p-2 flex items-center gap-2 no-underline text-sm" hx-get="/{{ .RepoInfo.FullName }}/description" >

     

       8
       8
       -
             {{ i "x" "w-3 h-3" }} cancel 

     

       9
       9
       -
           </button>

     

       10
       10
       -
       </form>

     

       11
       11
       -
       {{ end }}

-17

appview/pages/templates/fragments/follow.html

···

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

     

       2
       2
       -
         <button id="followBtn"

     

       3
       3
       -
           class="btn mt-2 w-full"

     

       4
       4
       -
       

     

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

     

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

     

       7
       7
       -
           {{ else }}

     

       8
       8
       -
           hx-delete="/follow?subject={{.UserDid}}"

     

       9
       9
       -
           {{ end }}

     

       10
       10
       -
       

     

       11
       11
       -
           hx-trigger="click"

     

       12
       12
       -
           hx-target="#followBtn"

     

       13
       13
       -
           hx-swap="outerHTML"

     

       14
       14
       -
           >

     

       15
       15
       -
           {{ if eq .FollowStatus.String "IsNotFollowing" }}Follow{{ else }}Unfollow{{ end }}

     

       16
       16
       -
         </button>

     

       17
       17
       -
       {{ end }}

-60

appview/pages/templates/fragments/issueComment.html

···

       1
       1
       -
       {{ define "fragments/issueComment" }}

     

       2
       2
       -
         {{ with .Comment }}

     

       3
       3
       -
         <div id="comment-container-{{.CommentId}}">

     

       4
       4
       -
           <div class="flex items-center gap-2 mb-2 text-gray-500 text-sm">

     

       5
       5
       -
             {{ $owner := index $.DidHandleMap .OwnerDid }}

     

       6
       6
       -
             <a href="/{{ $owner }}" class="no-underline hover:underline">{{ $owner }}</a>

     

       7
       7
       -
       

     

       8
       8
       -
             <!-- show user "hats" -->

     

       9
       9
       -
             {{ $isIssueAuthor := eq .OwnerDid $.Issue.OwnerDid }}

     

       10
       10
       -
             {{ if $isIssueAuthor }}

     

       11
       11
       -
             <span class="before:content-['·']"></span>

     

       12
       12
       -
             <span class="rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">

     

       13
       13
       -
               author

     

       14
       14
       -
             </span>

     

       15
       15
       -
             {{ end }}

     

       16
       16
       -
       

     

       17
       17
       -
             <span class="before:content-['·']"></span>

     

       18
       18
       -
             <a

     

       19
       19
       -
                 href="#{{ .CommentId }}"

     

       20
       20
       -
                 class="text-gray-500 hover:text-gray-500 hover:underline no-underline"

     

       21
       21
       -
                 id="{{ .CommentId }}">

     

       22
       22
       -
               {{ if .Deleted }}

     

       23
       23
       -
                 deleted {{ .Deleted | timeFmt }}

     

       24
       24
       -
               {{ else if .Edited }}

     

       25
       25
       -
                 edited {{ .Edited | timeFmt }}

     

       26
       26
       -
               {{ else }}

     

       27
       27
       -
                 {{ .Created | timeFmt }}

     

       28
       28
       -
               {{ end }}

     

       29
       29
       -
             </a>

     

       30
       30
       -
       

     

       31
       31
       -
             {{ $isCommentOwner := and $.LoggedInUser (eq $.LoggedInUser.Did .OwnerDid) }}

     

       32
       32
       -
             {{ if and $isCommentOwner (not .Deleted) }}

     

       33
       33
       -
             <button 

     

       34
       34
       -
               class="btn px-2 py-1 text-sm" 

     

       35
       35
       -
               hx-get="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/edit"

     

       36
       36
       -
               hx-swap="outerHTML"

     

       37
       37
       -
               hx-target="#comment-container-{{.CommentId}}"

     

       38
       38
       -
               >

     

       39
       39
       -
               {{ i "pencil" "w-4 h-4" }}

     

       40
       40
       -
             </button>

     

       41
       41
       -
             <button 

     

       42
       42
       -
               class="btn px-2 py-1 text-sm text-red-500"

     

       43
       43
       -
               hx-delete="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/"

     

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

     

       45
       45
       -
               hx-swap="outerHTML"

     

       46
       46
       -
               hx-target="#comment-container-{{.CommentId}}"

     

       47
       47
       -
               >

     

       48
       48
       -
               {{ i "trash-2" "w-4 h-4" }}

     

       49
       49
       -
             </button>

     

       50
       50
       -
             {{ end }}

     

       51
       51
       -
       

     

       52
       52
       -
           </div>

     

       53
       53
       -
           {{ if not .Deleted }}

     

       54
       54
       -
           <div class="prose dark:prose-invert">

     

       55
       55
       -
             {{ .Body | markdown }}

     

       56
       56
       -
           </div>

     

       57
       57
       -
           {{ end }}

     

       58
       58
       -
         </div>

     

       59
       59
       -
         {{ end }}

     

       60
       60
       -
       {{ end }}

-91

appview/pages/templates/fragments/pullActions.html

···

       1
       1
       -
       {{ define "fragments/pullActions" }}

     

       2
       2
       -
         {{ $lastIdx := sub (len .Pull.Submissions) 1 }}

     

       3
       3
       -
         {{ $roundNumber := .RoundNumber }}

     

       4
       4
       -
       

     

       5
       5
       -
         {{ $isPushAllowed := .RepoInfo.Roles.IsPushAllowed }}

     

       6
       6
       -
         {{ $isMerged := .Pull.State.IsMerged }}

     

       7
       7
       -
         {{ $isClosed := .Pull.State.IsClosed }}

     

       8
       8
       -
         {{ $isOpen := .Pull.State.IsOpen }}

     

       9
       9
       -
         {{ $isConflicted := and .MergeCheck (or .MergeCheck.Error .MergeCheck.IsConflicted) }}

     

       10
       10
       -
         {{ $isPullAuthor := and .LoggedInUser (eq .LoggedInUser.Did .Pull.OwnerDid) }}

     

       11
       11
       -
         {{ $isLastRound := eq $roundNumber $lastIdx }}

     

       12
       12
       -
         {{ $isSameRepoBranch := .Pull.IsSameRepoBranch }}

     

       13
       13
       -
         {{ $isUpToDate := .ResubmitCheck.No }}

     

       14
       14
       -
         <div class="relative w-fit">

     

       15
       15
       -
           <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div>

     

       16
       16
       -
           <div id="actions-{{$roundNumber}}" class="flex flex-wrap gap-2">

     

       17
       17
       -
               <button 

     

       18
       18
       -
                 hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ $roundNumber }}/comment"

     

       19
       19
       -
                 hx-target="#actions-{{$roundNumber}}"

     

       20
       20
       -
                 hx-swap="outerHtml"

     

       21
       21
       -
                 class="btn p-2 flex items-center gap-2 no-underline hover:no-underline">

     

       22
       22
       -
                   {{ i "message-square-plus" "w-4 h-4" }}

     

       23
       23
       -
                   <span>comment</span>

     

       24
       24
       -
               </button>

     

       25
       25
       -
               {{ if and $isPushAllowed $isOpen $isLastRound }}

     

       26
       26
       -
                 {{ $disabled := "" }}

     

       27
       27
       -
                 {{ if $isConflicted }}

     

       28
       28
       -
                   {{ $disabled = "disabled" }}

     

       29
       29
       -
                 {{ end }}

     

       30
       30
       -
                 <button 

     

       31
       31
       -
                   hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/merge"

     

       32
       32
       -
                   hx-swap="none"

     

       33
       33
       -
                   hx-confirm="Are you sure you want to merge pull #{{ .Pull.PullId }} into the `{{ .Pull.TargetBranch }}` branch?"

     

       34
       34
       -
                   class="btn p-2 flex items-center gap-2" {{ $disabled }}>

     

       35
       35
       -
                   {{ i "git-merge" "w-4 h-4" }}

     

       36
       36
       -
                     <span>merge</span>

     

       37
       37
       -
                 </button>

     

       38
       38
       -
               {{ end }}

     

       39
       39
       -
       

     

       40
       40
       -
               {{ if and $isPullAuthor $isOpen $isLastRound }}

     

       41
       41
       -
                 {{ $disabled := "" }}

     

       42
       42
       -
                 {{ if $isUpToDate }}

     

       43
       43
       -
                   {{ $disabled = "disabled" }}

     

       44
       44
       -
                 {{ end }}

     

       45
       45
       -
                 <button id="resubmitBtn"

     

       46
       46
       -
                     {{ if not .Pull.IsPatch }}

     

       47
       47
       -
                       hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit"

     

       48
       48
       -
                     {{ else }}

     

       49
       49
       -
                       hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit"

     

       50
       50
       -
                       hx-target="#actions-{{$roundNumber}}"

     

       51
       51
       -
                       hx-swap="outerHtml"

     

       52
       52
       -
                     {{ end }}

     

       53
       53
       -
       

     

       54
       54
       -
                     hx-disabled-elt="#resubmitBtn"

     

       55
       55
       -
                     class="btn p-2 flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed" {{ $disabled }}

     

       56
       56
       -
       

     

       57
       57
       -
                     {{ if $disabled }}

     

       58
       58
       -
                     title="Update this branch to resubmit this pull request"

     

       59
       59
       -
                     {{ else }}

     

       60
       60
       -
                     title="Resubmit this pull request"

     

       61
       61
       -
                     {{ end }}

     

       62
       62
       -
                     >

     

       63
       63
       -
                   {{ i "rotate-ccw" "w-4 h-4" }}

     

       64
       64
       -
                     <span>resubmit</span>

     

       65
       65
       -
                 </button>

     

       66
       66
       -
               {{ end }}

     

       67
       67
       -
       

     

       68
       68
       -
               {{ if and (or $isPullAuthor $isPushAllowed) $isOpen $isLastRound }}

     

       69
       69
       -
               <button 

     

       70
       70
       -
                 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/close"

     

       71
       71
       -
                 hx-swap="none"

     

       72
       72
       -
                 class="btn p-2 flex items-center gap-2">

     

       73
       73
       -
                 {{ i "ban" "w-4 h-4" }}

     

       74
       74
       -
                   <span>close</span>

     

       75
       75
       -
               </button>

     

       76
       76
       -
               {{ end }}

     

       77
       77
       -
       

     

       78
       78
       -
               {{ if and (or $isPullAuthor $isPushAllowed) $isClosed $isLastRound }}

     

       79
       79
       -
               <button 

     

       80
       80
       -
                 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/reopen"

     

       81
       81
       -
                 hx-swap="none"

     

       82
       82
       -
                 class="btn p-2 flex items-center gap-2">

     

       83
       83
       -
                 {{ i "circle-dot" "w-4 h-4" }}

     

       84
       84
       -
                   <span>reopen</span>

     

       85
       85
       -
               </button>

     

       86
       86
       -
               {{ end }}

     

       87
       87
       -
           </div>

     

       88
       88
       -
         </div>

     

       89
       89
       -
       {{ end }}

     

       90
       90
       -
       

     

       91
       91
       -

-20

appview/pages/templates/fragments/pullCompareBranches.html

···

       1
       1
       -
       {{ define "fragments/pullCompareBranches" }}

     

       2
       2
       -
           <div id="patch-upload">

     

       3
       3
       -
               <label for="targetBranch" class="dark:text-white"

     

       4
       4
       -
                   >select a branch</label

     

       5
       5
       -
               >

     

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

     

       7
       7
       -
                   <select

     

       8
       8
       -
                       name="sourceBranch"

     

       9
       9
       -
                       class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"

     

       10
       10
       -
                   >

     

       11
       11
       -
                       <option disabled selected>source branch</option>

     

       12
       12
       -
                       {{ range .Branches }}

     

       13
       13
       -
                           <option value="{{ .Reference.Name }}" class="py-1">

     

       14
       14
       -
                               {{ .Reference.Name }}

     

       15
       15
       -
                           </option>

     

       16
       16
       -
                       {{ end }}

     

       17
       17
       -
                   </select>

     

       18
       18
       -
               </div>

     

       19
       19
       -
           </div>

     

       20
       20
       -
       {{ end }}

-42

appview/pages/templates/fragments/pullCompareForks.html

···

       1
       1
       -
       {{ define "fragments/pullCompareForks" }}

     

       2
       2
       -
           <div id="patch-upload">

     

       3
       3
       -
               <label for="forkSelect" class="dark:text-white"

     

       4
       4
       -
                   >select a fork to compare</label

     

       5
       5
       -
               >

     

       6
       6
       -
               <div class="flex flex-wrap gap-4 items-center mb-4">

     

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

     

       8
       8
       -
                       <select

     

       9
       9
       -
                           id="forkSelect"

     

       10
       10
       -
                           name="fork"

     

       11
       11
       -
                           required

     

       12
       12
       -
                           class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"

     

       13
       13
       -
                           hx-get="/{{ $.RepoInfo.FullName }}/pulls/new/fork-branches"

     

       14
       14
       -
                           hx-target="#branch-selection"

     

       15
       15
       -
                           hx-vals='{"fork": this.value}'

     

       16
       16
       -
                           hx-swap="innerHTML"

     

       17
       17
       -
                           onchange="document.getElementById('hiddenForkInput').value = this.value;"

     

       18
       18
       -
                       >

     

       19
       19
       -
                           <option disabled selected>select a fork</option>

     

       20
       20
       -
                           {{ range .Forks }}

     

       21
       21
       -
                               <option value="{{ .Name }}" class="py-1">

     

       22
       22
       -
                                   {{ .Name }}

     

       23
       23
       -
                               </option>

     

       24
       24
       -
                           {{ end }}

     

       25
       25
       -
                       </select>

     

       26
       26
       -
       

     

       27
       27
       -
                       <input

     

       28
       28
       -
                           type="hidden"

     

       29
       29
       -
                           id="hiddenForkInput"

     

       30
       30
       -
                           name="fork"

     

       31
       31
       -
                           value=""

     

       32
       32
       -
                       />

     

       33
       33
       -
                   </div>

     

       34
       34
       -
       

     

       35
       35
       -
                   <div id="branch-selection">

     

       36
       36
       -
                       <div class="text-sm text-gray-500 dark:text-gray-400">

     

       37
       37
       -
                           Select a fork first to view available branches

     

       38
       38
       -
                       </div>

     

       39
       39
       -
                   </div>

     

       40
       40
       -
               </div>

     

       41
       41
       -
           </div>

     

       42
       42
       -
       {{ end }}

-15

appview/pages/templates/fragments/pullCompareForksBranches.html

···

       1
       1
       -
       {{ define "fragments/pullCompareForksBranches" }}

     

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

     

       3
       3
       -
               <select

     

       4
       4
       -
                   name="sourceBranch"

     

       5
       5
       -
                   class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"

     

       6
       6
       -
               >

     

       7
       7
       -
                   <option disabled selected>source branch</option>

     

       8
       8
       -
                   {{ range .SourceBranches }}

     

       9
       9
       -
                       <option value="{{ .Reference.Name }}" class="py-1">

     

       10
       10
       -
                           {{ .Reference.Name }}

     

       11
       11
       -
                       </option>

     

       12
       12
       -
                   {{ end }}

     

       13
       13
       -
               </select>

     

       14
       14
       -
           </div>

     

       15
       15
       -
       {{ end }}

-32

appview/pages/templates/fragments/pullNewComment.html

···

       1
       1
       -
       {{ define "fragments/pullNewComment" }}

     

       2
       2
       -
       <div 

     

       3
       3
       -
         id="pull-comment-card-{{ .RoundNumber }}" 

     

       4
       4
       -
         class="bg-white dark:bg-gray-800 rounded drop-shadow-sm p-4 relative w-full flex flex-col gap-2">

     

       5
       5
       -
         <div class="text-sm text-gray-500 dark:text-gray-400">

     

       6
       6
       -
           {{ didOrHandle .LoggedInUser.Did .LoggedInUser.Handle }}

     

       7
       7
       -
         </div>

     

       8
       8
       -
         <form

     

       9
       9
       -
           hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/comment"

     

       10
       10
       -
           hx-swap="none"

     

       11
       11
       -
           class="w-full flex flex-wrap gap-2">

     

       12
       12
       -
           <textarea

     

       13
       13
       -
               name="body"

     

       14
       14
       -
               class="w-full p-2 rounded border border-gray-200"

     

       15
       15
       -
               placeholder="Add to the discussion..."></textarea>

     

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

     

       17
       17
       -
             {{ i "message-square" "w-4 h-4" }} comment

     

       18
       18
       -
           </button>

     

       19
       19
       -
           <button 

     

       20
       20
       -
             type="button" 

     

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

     

       22
       22
       -
             hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/actions"

     

       23
       23
       -
             hx-swap="outerHTML"

     

       24
       24
       -
             hx-target="#pull-comment-card-{{ .RoundNumber }}">

     

       25
       25
       -
             {{ i "x" "w-4 h-4" }}

     

       26
       26
       -
             <span>cancel</span>

     

       27
       27
       -
           </button>

     

       28
       28
       -
           <div id="pull-comment"></div>

     

       29
       29
       -
         </form>

     

       30
       30
       -
       </div>

     

       31
       31
       -
       {{ end }}

     

       32
       32
       -

-14

appview/pages/templates/fragments/pullPatchUpload.html

···

       1
       1
       -
       {{ define "fragments/pullPatchUpload" }}

     

       2
       2
       -
           <div id="patch-upload">

     

       3
       3
       -
               <textarea

     

       4
       4
       -
                   name="patch"

     

       5
       5
       -
                   id="patch"

     

       6
       6
       -
                   rows="12"

     

       7
       7
       -
                   class="w-full resize-y font-mono dark:bg-gray-700 dark:text-white dark:border-gray-600"

     

       8
       8
       -
                   placeholder="diff --git a/file.txt b/file.txt

     

       9
       9
       -
                   index 1234567..abcdefg 100644

     

       10
       10
       -
                   --- a/file.txt

     

       11
       11
       -
                   +++ b/file.txt"

     

       12
       12
       -
               ></textarea>

     

       13
       13
       -
           </div>

     

       14
       14
       -
       {{ end }}

-52

appview/pages/templates/fragments/pullResubmit.html

···

       1
       1
       -
       {{ define "fragments/pullResubmit" }}

     

       2
       2
       -
         <div

     

       3
       3
       -
             id="resubmit-pull-card"

     

       4
       4
       -
             class="rounded relative border bg-amber-50 dark:bg-amber-900 border-amber-200 dark:border-amber-500 px-6 py-2">

     

       5
       5
       -
       

     

       6
       6
       -
             <div class="flex items-center gap-2 text-amber-500 dark:text-amber-50">

     

       7
       7
       -
               {{ i "pencil" "w-4 h-4" }}

     

       8
       8
       -
               <span class="font-medium">resubmit your patch</span>

     

       9
       9
       -
             </div>

     

       10
       10
       -
       

     

       11
       11
       -
             <div class="mt-2 text-sm text-gray-700 dark:text-gray-200">

     

       12
       12
       -
               You can update this patch to address any reviews. 

     

       13
       13
       -
               This will begin a new round of reviews,

     

       14
       14
       -
               but you'll still be able to view your previous submissions and feedback.

     

       15
       15
       -
             </div>

     

       16
       16
       -
       

     

       17
       17
       -
             <div class="mt-4 flex flex-col">

     

       18
       18
       -
               <form 

     

       19
       19
       -
                 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit" 

     

       20
       20
       -
                 hx-swap="none"

     

       21
       21
       -
                 class="w-full flex flex-wrap gap-2">

     

       22
       22
       -
                 <textarea

     

       23
       23
       -
                   name="patch"

     

       24
       24
       -
                   class="w-full p-2 mb-2"

     

       25
       25
       -
                   placeholder="Paste your updated patch here."

     

       26
       26
       -
                   rows="15"

     

       27
       27
       -
                   >{{.Pull.LatestPatch}}</textarea>

     

       28
       28
       -
                 <button

     

       29
       29
       -
                     type="submit"

     

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

     

       31
       31
       -
                     {{ if or .Pull.State.IsClosed }}

     

       32
       32
       -
                     disabled

     

       33
       33
       -
                     {{ end }}>

     

       34
       34
       -
                   {{ i "rotate-ccw" "w-4 h-4" }}

     

       35
       35
       -
                   <span>resubmit</span>

     

       36
       36
       -
                 </button>

     

       37
       37
       -
                 <button 

     

       38
       38
       -
                   type="button" 

     

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

     

       40
       40
       -
                   hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .Pull.LastRoundNumber }}/actions"

     

       41
       41
       -
                   hx-swap="outerHTML"

     

       42
       42
       -
                   hx-target="#resubmit-pull-card">

     

       43
       43
       -
                   {{ i "x" "w-4 h-4" }}

     

       44
       44
       -
                   <span>cancel</span>

     

       45
       45
       -
                 </button>

     

       46
       46
       -
               </form>

     

       47
       47
       -
       

     

       48
       48
       -
               <div id="resubmit-error" class="error"></div>

     

       49
       49
       -
               <div id="resubmit-success" class="success"></div>

     

       50
       50
       -
             </div>

     

       51
       51
       -
         </div>

     

       52
       52
       -
       {{ end }}

-41

appview/pages/templates/fragments/repoActions.html

···

       1
       1
       -
       {{ define "fragments/repoActions" }}

     

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

     

       3
       3
       -
         <button id="starBtn"

     

       4
       4
       -
           class="btn disabled:opacity-50 disabled:cursor-not-allowed"

     

       5
       5
       -
       

     

       6
       6
       -
           {{ if .IsStarred }}

     

       7
       7
       -
           hx-delete="/star?subject={{.RepoAt}}&countHint={{.Stats.StarCount}}"

     

       8
       8
       -
           {{ else }}

     

       9
       9
       -
           hx-post="/star?subject={{.RepoAt}}&countHint={{.Stats.StarCount}}"

     

       10
       10
       -
           {{ end }}

     

       11
       11
       -
       

     

       12
       12
       -
           hx-trigger="click"

     

       13
       13
       -
           hx-target="#starBtn"

     

       14
       14
       -
           hx-swap="outerHTML"

     

       15
       15
       -
           hx-disabled-elt="#starBtn"

     

       16
       16
       -
           >

     

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

     

       18
       18
       -
             {{ if .IsStarred }}

     

       19
       19
       -
             {{ i "star" "w-4 h-4 fill-current" }}

     

       20
       20
       -
             {{ else }}

     

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

     

       22
       22
       -
             {{ end }}

     

       23
       23
       -
             <span>

     

       24
       24
       -
               {{ .Stats.StarCount }}

     

       25
       25
       -
             </span>

     

       26
       26
       -
           </div>

     

       27
       27
       -
         </button>

     

       28
       28
       -
         {{ if .DisableFork }}

     

       29
       29
       -
         <button class="btn no-underline hover:no-underline flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed" disabled title="Empty repositories cannot be forked">

     

       30
       30
       -
             {{ i "git-fork" "w-4 h-4"}}

     

       31
       31
       -
             fork

     

       32
       32
       -
         </button>

     

       33
       33
       -
         {{ else }}

     

       34
       34
       -
         <a class="btn no-underline hover:no-underline flex items-center gap-2" href="/{{ .FullName }}/fork">

     

       35
       35
       -
             {{ i "git-fork" "w-4 h-4"}}

     

       36
       36
       -
             fork

     

       37
       37
       -
         </a>

     

       38
       38
       -
         {{ end }}

     

       39
       39
       -
       </div>

     

       40
       40
       -
       {{ end }}

     

       41
       41
       -

-15

appview/pages/templates/fragments/repoDescription.html

···

       1
       1
       -
       {{ define "fragments/repoDescription" }}

     

       2
       2
       -
       <span id="repo-description" class="flex flex-wrap items-center gap-2" hx-target="this" hx-swap="outerHTML">

     

       3
       3
       -
           {{ if .RepoInfo.Description }}

     

       4
       4
       -
               {{ .RepoInfo.Description }}

     

       5
       5
       -
           {{ else }}

     

       6
       6
       -
               <span class="italic">this repo has no description</span>

     

       7
       7
       -
           {{ end }}

     

       8
       8
       -
       

     

       9
       9
       -
           {{ if .RepoInfo.Roles.IsOwner }}

     

       10
       10
       -
           <button class="btn p-2 flex items-center gap-2 no-underline text-sm" hx-get="/{{ .RepoInfo.FullName }}/description/edit">

     

       11
       11
       -
             {{ i "pencil" "w-3 h-3" }} edit

     

       12
       12
       -
           </button>

     

       13
       13
       -
           {{ end }}

     

       14
       14
       -
       </span>

     

       15
       15
       -
       {{ end }}

+2 -3

appview/pages/templates/layouts/base.html

···

       8
       8
        
                       content="width=device-width, initial-scale=1.0"

     

       9
       9
        
                   />

     

       10
       10
        
                   <script src="/static/htmx.min.js"></script>

     

       11
       11
       -
                   <link href="/static/tw.css" rel="stylesheet" type="text/css" />

     

       12
       12
       -
                   

     

       11
       11
       +
                   <link rel="stylesheet" href="/static/tw.css?{{ cssContentHash }}" type="text/css" />

     

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

     

       14
       13
        
                   {{ block "extrameta" . }}{{ end }}

     

       15
       14
        
               </head>

     

       16
       15
        
               <body class="bg-slate-100 dark:bg-gray-900 dark:text-white transition-colors duration-200">

     

       17
       16
        
                 <div class="container mx-auto px-1 md:pt-4 min-h-screen flex flex-col">

     

       18
       18
       -
                   <header style="z-index: 5">

     

       17
       17
       +
                   <header style="z-index: 20">

     

       19
       18
        
                     {{ block "topbar" . }}

     

       20
       19
        
                     {{ template "layouts/topbar" . }}

     

       21
       20
        
                     {{ end }}

+10 -6

appview/pages/templates/layouts/repobase.html

···

       19
       19
        
             <a href="/{{ .RepoInfo.FullName }}" class="font-bold">{{ .RepoInfo.Name }}</a>

     

       20
       20
        
           </div>

     

       21
       21
        
       

     

       22
       22
       -
           {{ template "fragments/repoActions" .RepoInfo }}

     

       22
       22
       +
           {{ template "repo/fragments/repoActions" .RepoInfo }}

     

       23
       23
        
         </div>

     

       24
       24
       -
         {{ template "fragments/repoDescription" . }}

     

       24
       24
       +
         {{ template "repo/fragments/repoDescription" . }}

     

       25
       25
        
       </section>

     

       26
       26
        
           <section class="min-h-screen flex flex-col drop-shadow-sm">

     

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

     
···

       32
       32
        
                       {{ range $item := $tabs }}

     

       33
       33
        
                           {{ $key := index $item 0 }}

     

       34
       34
        
                           {{ $value := index $item 1 }}

     

       35
       35
       +
                           {{ $icon := index $item 2 }}

     

       35
       36
        
                           {{ $meta := index $tabmeta $key }}

     

       36
       37
        
                           <a

     

       37
       38
        
                               href="/{{ $.RepoInfo.FullName }}{{ $value }}"

     
···

       47
       48
        
                                    {{ end }}

     

       48
       49
        
                                    "

     

       49
       50
        
                               >

     

       50
       50
       -
                                   {{ $key }}

     

       51
       51
       -
                                   {{ if not (isNil $meta) }}

     

       52
       52
       -
                                   <span class="bg-gray-200 dark:bg-gray-700 rounded py-1/2 px-1 text-sm">{{  $meta }}</span>

     

       53
       53
       -
                                   {{ end }}

     

       51
       51
       +
                                   <span class="flex items-center justify-center">

     

       52
       52
       +
                                       {{ i $icon "w-4 h-4 mr-2" }}

     

       53
       53
       +
                                       {{ $key }}

     

       54
       54
       +
                                       {{ if not (isNil $meta) }}

     

       55
       55
       +
                                       <span class="bg-gray-200 dark:bg-gray-700 rounded py-1/2 px-1 text-sm ml-1">{{  $meta }}</span>

     

       56
       56
       +
                                       {{ end }}

     

       57
       57
       +
                                   </span>

     

       54
       58
        
                               </div>

     

       55
       59
        
                           </a>

     

       56
       60
        
                       {{ end }}

+13 -2

appview/pages/templates/repo/blob.html

···

       29
       29
        
                               >

     

       30
       30
        
                               /

     

       31
       31
        
                           {{ else }}

     

       32
       32
       -
                               <span class="text-bold text-gray-600 dark:text-gray-300"

     

       32
       32
       +
                               <span class="text-bold text-black dark:text-white"

     

       33
       33
        
                                   >{{ index . 0 }}</span

     

       34
       34
        
                               >

     

       35
       35
        
                           {{ end }}

     
···

       43
       43
        
                       <span>{{ byteFmt .SizeHint }}</span>

     

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

     

       45
       45
        
                       <a href="/{{ .RepoInfo.FullName }}/blob/{{ .Ref }}/raw/{{ .Path }}">view raw</a>

     

       46
       46
       +
                       {{ if .RenderToggle }}

     

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

     

       48
       48
       +
                       <a 

     

       49
       49
       +
                       href="/{{ .RepoInfo.FullName }}/blob/{{ .Ref }}/{{ .Path }}?code={{ .ShowRendered }}" 

     

       50
       50
       +
                       hx-boost="true"

     

       51
       51
       +
                       >view {{ if .ShowRendered }}code{{ else }}rendered{{ end }}</a>

     

       52
       52
       +
                       {{ end }}

     

       46
       53
        
                   </div>

     

       47
       54
        
               </div>

     

       48
       55
        
           </div>

     
···

       52
       59
        
               </p>

     

       53
       60
        
           {{ else }}

     

       54
       61
        
           <div class="overflow-auto relative">

     

       55
       55
       -
               <div class="whitespace-pre peer-target:bg-yellow-200 dark:peer-target:bg-yellow-900">{{ $.Contents | escapeHtml }}</div>

     

       62
       62
       +
               {{ if .ShowRendered }}

     

       63
       63
       +
               <div id="blob-contents" class="prose dark:prose-invert">{{ .RenderedContents }}</div>

     

       64
       64
       +
               {{ else }}

     

       65
       65
       +
               <div id="blob-contents" class="whitespace-pre peer-target:bg-yellow-200 dark:peer-target:bg-yellow-900">{{ $.Contents | escapeHtml }}</div>

     

       66
       66
       +
               {{ end }}

     

       56
       67
        
           </div>

     

       57
       68
        
           {{ end }}

     

       58
       69
        
       {{ end }}

+2 -19

appview/pages/templates/repo/commit.html

···

       4
       4
        
       

     

       5
       5
        
       {{ $repo := .RepoInfo.FullName }}

     

       6
       6
        
       {{ $commit := .Diff.Commit }}

     

       7
       7
       -
       {{ $stat := .Diff.Stat }}

     

       8
       8
       -
       {{ $diff := .Diff.Diff }}

     

       9
       7
        
       

     

       10
       8
        
       <section class="commit dark:text-white">

     

       11
       9
        
         <div id="commit-message">

     
···

       13
       11
        
           <div>

     

       14
       12
        
             <p class="pb-2">{{ index $messageParts 0 }}</p>

     

       15
       13
        
             {{ if gt (len $messageParts) 1 }}

     

       16
       16
       -
             <p class="mt-1 cursor-text pb-2 text-sm">{{ nl2br (unwrapText (index $messageParts 1)) }}</p>

     

       14
       14
       +
             <p class="mt-1 cursor-text pb-2 text-sm">{{ nl2br (index $messageParts 1) }}</p>

     

       17
       15
        
             {{ end }}

     

       18
       16
        
           </div>

     

       19
       17
        
         </div>

     
···

       29
       27
        
                 {{ end }}

     

       30
       28
        
                 <span class="px-1 select-none before:content-['\00B7']"></span>

     

       31
       29
        
                 {{ timeFmt $commit.Author.When }}

     

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

     

       33
       33
       -
                 <span>{{ $stat.FilesChanged }}</span> files <span class="font-mono">(+{{ $stat.Insertions }}, -{{ $stat.Deletions }})</span>

     

       34
       30
        
                 <span class="px-1 select-none before:content-['\00B7']"></span>

     

       35
       31
        
             </p>

     

       36
       32
        
       

     
···

       43
       39
        
             </p>

     

       44
       40
        
         </div>

     

       45
       41
        
       

     

       46
       46
       -
         <div class="diff-stat">

     

       47
       47
       -
           <br>

     

       48
       48
       -
           <strong class="text-sm uppercase mb-4 dark:text-gray-200">Changed files</strong>

     

       49
       49
       -
           {{ range $diff }}

     

       50
       50
       -
           <ul class="dark:text-gray-200">

     

       51
       51
       -
             {{ if .IsDelete }}

     

       52
       52
       -
             <li><a href="#file-{{ .Name.Old }}" class="dark:hover:text-gray-300">{{ .Name.Old }}</a></li>

     

       53
       53
       -
             {{ else }}

     

       54
       54
       -
             <li><a href="#file-{{ .Name.New }}" class="dark:hover:text-gray-300">{{ .Name.New }}</a></li>

     

       55
       55
       -
             {{ end }}

     

       56
       56
       -
           </ul>

     

       57
       57
       -
           {{ end }}

     

       58
       58
       -
         </div>

     

       59
       42
        
       </section>

     

       60
       43
        
       

     

       61
       44
        
       {{end}}

     

       62
       45
        
       

     

       63
       46
        
       {{ define "repoAfter" }}

     

       64
       64
       -
       {{ template "fragments/diff" (list .RepoInfo.FullName .Diff) }}

     

       47
       47
       +
       {{ template "repo/fragments/diff" (list .RepoInfo.FullName .Diff) }}

     

       65
       48
        
       {{end}}

+1 -1

appview/pages/templates/repo/empty.html

···

       9
       9
        
       {{ end }}

     

       10
       10
        
       

     

       11
       11
        
       {{ define "repoAfter" }}

     

       12
       12
       -
           {{ template "fragments/cloneInstructions" . }}

     

       12
       12
       +
           {{ template "repo/fragments/cloneInstructions" . }}

     

       13
       13
        
       {{ end }}

+51

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

···

       1
       1
       +
       {{ define "repo/fragments/cloneInstructions" }}

     

       2
       2
       +
           <section

     

       3
       3
       +
               class="mt-4 p-6 rounded bg-white dark:bg-gray-800 dark:text-white w-full mx-auto overflow-auto flex flex-col gap-4"

     

       4
       4
       +
           >

     

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

     

       6
       6
       +
                   <strong>push</strong>

     

       7
       7
       +
                   <div class="md:pl-4 overflow-x-auto whitespace-nowrap">

     

       8
       8
       +
                       <code class="dark:text-gray-100"

     

       9
       9
       +
                           >git remote add origin

     

       10
       10
       +
                           git@{{ .RepoInfo.Knot }}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code

     

       11
       11
       +
                       >

     

       12
       12
       +
                   </div>

     

       13
       13
       +
               </div>

     

       14
       14
       +
       

     

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

     

       16
       16
       +
                   <strong>clone</strong>

     

       17
       17
       +
                   <div class="md:pl-4 flex flex-col gap-2">

     

       18
       18
       +
                       <div class="flex items-center gap-3">

     

       19
       19
       +
                           <span

     

       20
       20
       +
                               class="bg-gray-100 dark:bg-gray-700 p-1 mr-1 font-mono text-sm rounded select-none dark:text-white"

     

       21
       21
       +
                               >HTTP</span

     

       22
       22
       +
                           >

     

       23
       23
       +
                           <div class="overflow-x-auto whitespace-nowrap flex-1">

     

       24
       24
       +
                               <code class="dark:text-gray-100"

     

       25
       25
       +
                                   >git clone

     

       26
       26
       +
                                   https://tangled.sh/{{ .RepoInfo.OwnerWithAt }}/{{ .RepoInfo.Name }}</code

     

       27
       27
       +
                               >

     

       28
       28
       +
                           </div>

     

       29
       29
       +
                       </div>

     

       30
       30
       +
       

     

       31
       31
       +
                       <div class="flex items-center gap-3">

     

       32
       32
       +
                           <span

     

       33
       33
       +
                               class="bg-gray-100 dark:bg-gray-700 p-1 mr-1 font-mono text-sm rounded select-none dark:text-white"

     

       34
       34
       +
                               >SSH</span

     

       35
       35
       +
                           >

     

       36
       36
       +
                           <div class="overflow-x-auto whitespace-nowrap flex-1">

     

       37
       37
       +
                               <code class="dark:text-gray-100"

     

       38
       38
       +
                                   >git clone

     

       39
       39
       +
                                   git@{{ .RepoInfo.Knot }}:{{ .RepoInfo.OwnerHandle }}/{{ .RepoInfo.Name }}</code

     

       40
       40
       +
                               >

     

       41
       41
       +
                           </div>

     

       42
       42
       +
                       </div>

     

       43
       43
       +
                   </div>

     

       44
       44
       +
               </div>

     

       45
       45
       +
       

     

       46
       46
       +
               <p class="py-2 text-gray-500 dark:text-gray-400">

     

       47
       47
       +
                   Note that for self-hosted knots, clone URLs may be different based

     

       48
       48
       +
                   on your setup.

     

       49
       49
       +
               </p>

     

       50
       50
       +
           </section>

     

       51
       51
       +
       {{ end }}

+163

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

···

       1
       1
       +
       {{ define "repo/fragments/diff" }}

     

       2
       2
       +
       {{ $repo := index . 0 }}

     

       3
       3
       +
       {{ $diff := index . 1 }}

     

       4
       4
       +
       {{ $commit := $diff.Commit }}

     

       5
       5
       +
       {{ $stat := $diff.Stat }}

     

       6
       6
       +
       {{ $fileTree := fileTree $diff.ChangedFiles }}

     

       7
       7
       +
       {{ $diff := $diff.Diff }}

     

       8
       8
       +
       

     

       9
       9
       +
         {{ $this := $commit.This }}

     

       10
       10
       +
         {{ $parent := $commit.Parent }}

     

       11
       11
       +
       

     

       12
       12
       +
         <section class="mt-6 p-6 border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm">

     

       13
       13
       +
           <div class="diff-stat">

     

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

     

       15
       15
       +
               <strong class="text-sm uppercase dark:text-gray-200">Changed files</strong>

     

       16
       16
       +
               {{ block "statPill" $stat }} {{ end }}

     

       17
       17
       +
             </div>

     

       18
       18
       +
             {{ block "fileTree" $fileTree }} {{ end }}

     

       19
       19
       +
           </div>

     

       20
       20
       +
         </section>

     

       21
       21
       +
       

     

       22
       22
       +
         {{ $last := sub (len $diff) 1 }}

     

       23
       23
       +
         {{ range $idx, $hunk := $diff }}

     

       24
       24
       +
         {{ with $hunk }}

     

       25
       25
       +
         <section class="mt-6 border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm">

     

       26
       26
       +
           <div id="file-{{ .Name.New }}">

     

       27
       27
       +
             <div id="diff-file">

     

       28
       28
       +
               <details open>

     

       29
       29
       +
                 <summary class="list-none cursor-pointer sticky top-0">

     

       30
       30
       +
                   <div id="diff-file-header" class="rounded cursor-pointer bg-white dark:bg-gray-800 flex justify-between">

     

       31
       31
       +
                     <div id="left-side-items" class="p-2 flex gap-2 items-center overflow-x-auto">

     

       32
       32
       +
                       <div class="flex gap-1 items-center">

     

       33
       33
       +
                         {{ $markerstyle := "diff-type p-1 mr-1 font-mono text-sm rounded select-none" }}

     

       34
       34
       +
                         {{ if .IsNew }}

     

       35
       35
       +
                         <span class="bg-green-100 text-green-700 dark:bg-green-800/50 dark:text-green-400 {{ $markerstyle }}">ADDED</span>

     

       36
       36
       +
                         {{ else if .IsDelete }}

     

       37
       37
       +
                         <span class="bg-red-100 text-red-700 dark:bg-red-800/50 dark:text-red-400 {{ $markerstyle }}">DELETED</span>

     

       38
       38
       +
                         {{ else if .IsCopy }}

     

       39
       39
       +
                         <span class="bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300 {{ $markerstyle }}">COPIED</span>

     

       40
       40
       +
                         {{ else if .IsRename }}

     

       41
       41
       +
                         <span class="bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300 {{ $markerstyle }}">RENAMED</span>

     

       42
       42
       +
                         {{ else }}

     

       43
       43
       +
                         <span class="bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300 {{ $markerstyle }}">MODIFIED</span>

     

       44
       44
       +
                         {{ end }}

     

       45
       45
       +
       

     

       46
       46
       +
                         {{ block "statPill" .Stats }} {{ end }}

     

       47
       47
       +
                       </div>

     

       48
       48
       +
       

     

       49
       49
       +
                       <div class="flex gap-2 items-center overflow-x-auto">

     

       50
       50
       +
                         {{ if .IsDelete }}

     

       51
       51
       +
                         <a class="dark:text-white whitespace-nowrap overflow-x-auto" {{if $this }}href="/{{ $repo }}/blob/{{ $this }}/{{ .Name.Old }}"{{end}}>

     

       52
       52
       +
                           {{ .Name.Old }}

     

       53
       53
       +
                         </a>

     

       54
       54
       +
                         {{ else if (or .IsCopy .IsRename) }}

     

       55
       55
       +
                         <a class="dark:text-white whitespace-nowrap overflow-x-auto" {{if $parent}}href="/{{ $repo }}/blob/{{ $parent }}/{{ .Name.Old }}"{{end}}>

     

       56
       56
       +
                           {{ .Name.Old }}

     

       57
       57
       +
                         </a>

     

       58
       58
       +
                         {{ i "arrow-right" "w-4 h-4" }}

     

       59
       59
       +
                         <a class="dark:text-white whitespace-nowrap overflow-x-auto" {{if $this}}href="/{{ $repo }}/blob/{{ $this }}/{{ .Name.New }}"{{end}}>

     

       60
       60
       +
                           {{ .Name.New }}

     

       61
       61
       +
                         </a>

     

       62
       62
       +
                         {{ else }}

     

       63
       63
       +
                         <a class="dark:text-white whitespace-nowrap overflow-x-auto" {{if $this}}href="/{{ $repo }}/blob/{{ $this }}/{{ .Name.New }}"{{end}}>

     

       64
       64
       +
                           {{ .Name.New }}

     

       65
       65
       +
                         </a>

     

       66
       66
       +
                         {{ end }}

     

       67
       67
       +
                       </div>

     

       68
       68
       +
                     </div>

     

       69
       69
       +
       

     

       70
       70
       +
                     {{ $iconstyle := "p-1 mx-1 hover:bg-gray-100 dark:hover:bg-gray-700 rounded" }}

     

       71
       71
       +
                     <div id="right-side-items" class="p-2 flex items-center">

     

       72
       72
       +
                       <a title="top of file" href="#file-{{ .Name.New }}" class="{{ $iconstyle }}">{{ i "arrow-up-to-line" "w-4 h-4" }}</a>

     

       73
       73
       +
                       {{ if gt $idx 0 }}

     

       74
       74
       +
                         {{ $prev := index $diff (sub $idx 1) }}

     

       75
       75
       +
                         <a title="previous file" href="#file-{{ $prev.Name.New }}" class="{{ $iconstyle }}">{{ i "arrow-up" "w-4 h-4" }}</a>

     

       76
       76
       +
                       {{ end }}

     

       77
       77
       +
       

     

       78
       78
       +
                       {{ if lt $idx $last }}

     

       79
       79
       +
                         {{ $next := index $diff (add $idx 1) }}

     

       80
       80
       +
                         <a title="next file" href="#file-{{ $next.Name.New }}" class="{{ $iconstyle }}">{{ i "arrow-down" "w-4 h-4" }}</a>

     

       81
       81
       +
                       {{ end }}

     

       82
       82
       +
                     </div>

     

       83
       83
       +
       

     

       84
       84
       +
                   </div>

     

       85
       85
       +
                 </summary>

     

       86
       86
       +
       

     

       87
       87
       +
                 <div class="transition-all duration-700 ease-in-out">

     

       88
       88
       +
                   {{ if .IsDelete }}

     

       89
       89
       +
                     <p class="text-center text-gray-400 dark:text-gray-500 p-4">

     

       90
       90
       +
                     This file has been deleted.

     

       91
       91
       +
                     </p>

     

       92
       92
       +
                   {{ else if .IsCopy }}

     

       93
       93
       +
                     <p class="text-center text-gray-400 dark:text-gray-500 p-4">

     

       94
       94
       +
                     This file has been copied.

     

       95
       95
       +
                     </p>

     

       96
       96
       +
                   {{ else if .IsBinary }}

     

       97
       97
       +
                     <p class="text-center text-gray-400 dark:text-gray-500 p-4">

     

       98
       98
       +
                     This is a binary file and will not be displayed.

     

       99
       99
       +
                     </p>

     

       100
       100
       +
                   {{ else }}

     

       101
       101
       +
                   {{ $name := .Name.New }}

     

       102
       102
       +
                   <pre class="overflow-x-auto"><div class="overflow-x-auto"><div class="min-w-full inline-block">{{- range .TextFragments -}}<div class="bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400 select-none text-center">&middot;&middot;&middot;</div>

     

       103
       103
       +
                    {{- $oldStart := .OldPosition -}}

     

       104
       104
       +
                    {{- $newStart := .NewPosition -}}

     

       105
       105
       +
                    {{- $lineNrStyle := "min-w-[3.5rem] flex-shrink-0 select-none text-right bg-white dark:bg-gray-800 scroll-mt-10 target:border target:border-amber-500 target:rounded " -}}

     

       106
       106
       +
                    {{- $linkStyle := "text-gray-400 dark:text-gray-500 hover:underline" -}}

     

       107
       107
       +
                    {{- $lineNrSepStyle1 := "" -}}

     

       108
       108
       +
                    {{- $lineNrSepStyle2 := "pr-2" -}}

     

       109
       109
       +
                    {{- range .Lines -}}

     

       110
       110
       +
                      {{- if eq .Op.String "+" -}}

     

       111
       111
       +
                        <div class="bg-green-100 dark:bg-green-800/30 text-green-700 dark:text-green-400 flex min-w-full items-center">

     

       112
       112
       +
                          <div class="{{$lineNrStyle}} {{$lineNrSepStyle1}}"><span aria-hidden="true" class="invisible">{{$newStart}}</span></div>

     

       113
       113
       +
                          <div class="{{$lineNrStyle}} {{$lineNrSepStyle2}}" id="{{$name}}-N{{$newStart}}"><a class="{{$linkStyle}}" href="#{{$name}}-N{{$newStart}}">{{ $newStart }}</a></div>

     

       114
       114
       +
                          <div class="w-5 flex-shrink-0 select-none text-center">{{ .Op.String }}</div>

     

       115
       115
       +
                          <div class="px-2">{{ .Line }}</div>

     

       116
       116
       +
                        </div>

     

       117
       117
       +
                        {{- $newStart = add64 $newStart 1 -}}

     

       118
       118
       +
                      {{- end -}}

     

       119
       119
       +
                      {{- if eq .Op.String "-" -}}

     

       120
       120
       +
                        <div class="bg-red-100 dark:bg-red-800/30 text-red-700 dark:text-red-400 flex min-w-full items-center">

     

       121
       121
       +
                          <div class="{{$lineNrStyle}} {{$lineNrSepStyle1}}" id="{{$name}}-O{{$oldStart}}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{$oldStart}}">{{ $oldStart }}</a></div>

     

       122
       122
       +
                          <div class="{{$lineNrStyle}} {{$lineNrSepStyle2}}"><span aria-hidden="true" class="invisible">{{$oldStart}}</span></div>

     

       123
       123
       +
                          <div class="w-5 flex-shrink-0 select-none text-center">{{ .Op.String }}</div>

     

       124
       124
       +
                          <div class="px-2">{{ .Line }}</div>

     

       125
       125
       +
                        </div>

     

       126
       126
       +
                        {{- $oldStart = add64 $oldStart 1 -}}

     

       127
       127
       +
                      {{- end -}}

     

       128
       128
       +
                      {{- if eq .Op.String " " -}}

     

       129
       129
       +
                        <div class="bg-white dark:bg-gray-800 text-gray-500 dark:text-gray-400 flex min-w-full items-center">

     

       130
       130
       +
                          <div class="{{$lineNrStyle}} {{$lineNrSepStyle1}}" id="{{$name}}-O{{$oldStart}}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{$oldStart}}">{{ $oldStart }}</a></div>

     

       131
       131
       +
                          <div class="{{$lineNrStyle}} {{$lineNrSepStyle2}}" id="{{$name}}-N{{$newStart}}"><a class="{{$linkStyle}}" href="#{{$name}}-N{{$newStart}}">{{ $newStart }}</a></div>

     

       132
       132
       +
                          <div class="w-5 flex-shrink-0 select-none text-center">{{ .Op.String }}</div>

     

       133
       133
       +
                          <div class="px-2">{{ .Line }}</div>

     

       134
       134
       +
                        </div>

     

       135
       135
       +
                        {{- $newStart = add64 $newStart 1 -}}

     

       136
       136
       +
                        {{- $oldStart = add64 $oldStart 1 -}}

     

       137
       137
       +
                      {{- end -}}

     

       138
       138
       +
                    {{- end -}}

     

       139
       139
       +
                    {{- end -}}</div></div></pre>

     

       140
       140
       +
                   {{- end -}}

     

       141
       141
       +
                 </div>

     

       142
       142
       +
       

     

       143
       143
       +
               </details>

     

       144
       144
       +
       

     

       145
       145
       +
             </div>

     

       146
       146
       +
           </div>

     

       147
       147
       +
         </section>

     

       148
       148
       +
         {{ end }}

     

       149
       149
       +
         {{ end }}

     

       150
       150
       +
       {{ end }}

     

       151
       151
       +
       

     

       152
       152
       +
       {{ define "statPill" }}

     

       153
       153
       +
         <div class="flex items-center font-mono text-sm">

     

       154
       154
       +
           {{ if and .Insertions .Deletions }}

     

       155
       155
       +
             <span class="rounded-l p-1 select-none bg-green-100 text-green-700 dark:bg-green-800/50 dark:text-green-400">+{{ .Insertions }}</span>

     

       156
       156
       +
             <span class="rounded-r p-1 select-none bg-red-100 text-red-700 dark:bg-red-800/50 dark:text-red-400">-{{ .Deletions }}</span>

     

       157
       157
       +
           {{ else if .Insertions }}

     

       158
       158
       +
             <span class="rounded p-1 select-none bg-green-100 text-green-700 dark:bg-green-800/50 dark:text-green-400">+{{ .Insertions }}</span>

     

       159
       159
       +
           {{ else if .Deletions }}

     

       160
       160
       +
             <span class="rounded p-1 select-none bg-red-100 text-red-700 dark:bg-red-800/50 dark:text-red-400">-{{ .Deletions }}</span>

     

       161
       161
       +
           {{ end }}

     

       162
       162
       +
         </div>

     

       163
       163
       +
       {{ end }}

+11

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

···

       1
       1
       +
       {{ define "repo/fragments/editRepoDescription" }}

     

       2
       2
       +
       <form hx-put="/{{ .RepoInfo.FullName }}/description" hx-target="this" hx-swap="outerHTML" class="flex flex-wrap gap-2">

     

       3
       3
       +
           <input type="text" class="p-1" name="description" value="{{ .RepoInfo.Description }}">

     

       4
       4
       +
           <button type="submit" class="btn p-1 flex items-center gap-2 no-underline text-sm">

     

       5
       5
       +
             {{ i "check" "w-3 h-3" }} save 

     

       6
       6
       +
           </button>

     

       7
       7
       +
           <button type="button" class="btn p-1 flex items-center gap-2 no-underline text-sm" hx-get="/{{ .RepoInfo.FullName }}/description" >

     

       8
       8
       +
             {{ i "x" "w-3 h-3" }} cancel 

     

       9
       9
       +
           </button>

     

       10
       10
       +
       </form>

     

       11
       11
       +
       {{ end }}

+27

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

···

       1
       1
       +
       {{ define "fileTree" }}

     

       2
       2
       +
         {{ if and .Name .IsDirectory }}

     

       3
       3
       +
           <details open>

     

       4
       4
       +
             <summary class="cursor-pointer list-none pt-1">

     

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

     

       6
       6
       +
                 {{ i "folder" "w-3 h-3 fill-current" }}

     

       7
       7
       +
                 <span class="text-black dark:text-white">{{ .Name }}</span>

     

       8
       8
       +
               </span>

     

       9
       9
       +
             </summary>

     

       10
       10
       +
             <div class="ml-1 pl-4 border-l border-gray-200 dark:border-gray-700">

     

       11
       11
       +
               {{ range $child := .Children }}

     

       12
       12
       +
                 {{ block "fileTree" $child }} {{ end }}

     

       13
       13
       +
               {{ end }}

     

       14
       14
       +
             </div>

     

       15
       15
       +
           </details>

     

       16
       16
       +
         {{ else if .Name }}

     

       17
       17
       +
           <div class="flex items-center gap-2 pt-1">

     

       18
       18
       +
             {{ i "file" "w-3 h-3" }}

     

       19
       19
       +
             <a href="#file-{{ .Path }}" class="text-black dark:text-white no-underline hover:underline">{{ .Name }}</a>

     

       20
       20
       +
           </div>

     

       21
       21
       +
         {{ else }}

     

       22
       22
       +
           {{ range $child := .Children }}

     

       23
       23
       +
             {{ block "fileTree" $child }} {{ end }}

     

       24
       24
       +
           {{ end }}

     

       25
       25
       +
         {{ end }}

     

       26
       26
       +
       {{ end }}

     

       27
       27
       +

+143

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

···

       1
       1
       +
       {{ define "repo/fragments/interdiff" }}

     

       2
       2
       +
       {{ $repo := index . 0 }}

     

       3
       3
       +
       {{ $x := index . 1 }}

     

       4
       4
       +
       {{ $fileTree := fileTree $x.AffectedFiles }}

     

       5
       5
       +
       {{ $diff := $x.Files }}

     

       6
       6
       +
       

     

       7
       7
       +
         <section class="mt-6 p-6 border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm">

     

       8
       8
       +
           <div class="diff-stat">

     

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

     

       10
       10
       +
               <strong class="text-sm uppercase dark:text-gray-200">files</strong>

     

       11
       11
       +
             </div>

     

       12
       12
       +
             {{ block "fileTree" $fileTree }} {{ end }}

     

       13
       13
       +
           </div>

     

       14
       14
       +
         </section>

     

       15
       15
       +
       

     

       16
       16
       +
         {{ $last := sub (len $diff) 1 }}

     

       17
       17
       +
         {{ range $idx, $hunk := $diff }}

     

       18
       18
       +
         {{ with $hunk }}

     

       19
       19
       +
         <section class="mt-6 border border-gray-200 dark:border-gray-700 w-full mx-auto rounded bg-white dark:bg-gray-800 drop-shadow-sm">

     

       20
       20
       +
           <div id="file-{{ .Name }}">

     

       21
       21
       +
             <div id="diff-file">

     

       22
       22
       +
               <details {{ if not (.Status.IsOnlyInOne) }}open{{end}}>

     

       23
       23
       +
                 <summary class="list-none cursor-pointer sticky top-0">

     

       24
       24
       +
                   <div id="diff-file-header" class="rounded cursor-pointer bg-white dark:bg-gray-800 flex justify-between">

     

       25
       25
       +
                     <div id="left-side-items" class="p-2 flex gap-2 items-center overflow-x-auto">

     

       26
       26
       +
                       <div class="flex gap-1 items-center" style="direction: ltr;">

     

       27
       27
       +
                         {{ $markerstyle := "diff-type p-1 mr-1 font-mono text-sm rounded select-none" }}

     

       28
       28
       +
                         {{ if .Status.IsOk }}

     

       29
       29
       +
                           <span class="bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300 {{ $markerstyle }}">CHANGED</span>

     

       30
       30
       +
                         {{ else if .Status.IsUnchanged }}

     

       31
       31
       +
                           <span class="bg-gray-100 text-gray-700 dark:bg-gray-700 dark:text-gray-300 {{ $markerstyle }}">UNCHANGED</span>

     

       32
       32
       +
                         {{ else if .Status.IsOnlyInOne }}

     

       33
       33
       +
                           <span class="bg-red-100 text-red-700 dark:bg-red-800/50 dark:text-red-400 {{ $markerstyle }}">REVERTED</span>

     

       34
       34
       +
                         {{ else if .Status.IsOnlyInTwo }}

     

       35
       35
       +
                           <span class="bg-green-100 text-green-700 dark:bg-green-800/50 dark:text-green-400 {{ $markerstyle }}">NEW</span>

     

       36
       36
       +
                         {{ else if .Status.IsRebased }}

     

       37
       37
       +
                           <span class="bg-amber-100 text-amber-700 dark:bg-amber-800/50 dark:text-amber-400 {{ $markerstyle }}">REBASED</span>

     

       38
       38
       +
                         {{ else }}

     

       39
       39
       +
                           <span class="bg-red-100 text-red-700 dark:bg-red-800/50 dark:text-red-400 {{ $markerstyle }}">ERROR</span>

     

       40
       40
       +
                         {{ end }}

     

       41
       41
       +
                       </div>

     

       42
       42
       +
       

     

       43
       43
       +
                       <div class="flex gap-2 items-center overflow-x-auto" style="direction: rtl;">

     

       44
       44
       +
                         <a class="dark:text-white whitespace-nowrap overflow-x-auto" href="">

     

       45
       45
       +
                           {{ .Name }}

     

       46
       46
       +
                         </a>

     

       47
       47
       +
                       </div>

     

       48
       48
       +
                     </div>

     

       49
       49
       +
       

     

       50
       50
       +
                     {{ $iconstyle := "p-1 mx-1 hover:bg-gray-100 dark:hover:bg-gray-700 rounded" }}

     

       51
       51
       +
                     <div id="right-side-items" class="p-2 flex items-center">

     

       52
       52
       +
                       <a title="top of file" href="#file-{{ .Name }}" class="{{ $iconstyle }}">{{ i "arrow-up-to-line" "w-4 h-4" }}</a>

     

       53
       53
       +
                       {{ if gt $idx 0 }}

     

       54
       54
       +
                         {{ $prev := index $diff (sub $idx 1) }}

     

       55
       55
       +
                         <a title="previous file" href="#file-{{ $prev.Name }}" class="{{ $iconstyle }}">{{ i "arrow-up" "w-4 h-4" }}</a>

     

       56
       56
       +
                       {{ end }}

     

       57
       57
       +
       

     

       58
       58
       +
                       {{ if lt $idx $last }}

     

       59
       59
       +
                         {{ $next := index $diff (add $idx 1) }}

     

       60
       60
       +
                         <a title="next file" href="#file-{{ $next.Name }}" class="{{ $iconstyle }}">{{ i "arrow-down" "w-4 h-4" }}</a>

     

       61
       61
       +
                       {{ end }}

     

       62
       62
       +
                     </div>

     

       63
       63
       +
       

     

       64
       64
       +
                   </div>

     

       65
       65
       +
                 </summary>

     

       66
       66
       +
       

     

       67
       67
       +
                 <div class="transition-all duration-700 ease-in-out">

     

       68
       68
       +
                   {{ if .Status.IsUnchanged }}

     

       69
       69
       +
                     <p class="text-center text-gray-400 dark:text-gray-500 p-4">

     

       70
       70
       +
                     This file has not been changed.

     

       71
       71
       +
                     </p>

     

       72
       72
       +
                   {{ else if .Status.IsRebased }}

     

       73
       73
       +
                     <p class="text-center text-gray-400 dark:text-gray-500 p-4">

     

       74
       74
       +
                     This patch was likely rebased, as context lines do not match.

     

       75
       75
       +
                     </p>

     

       76
       76
       +
                   {{ else if .Status.IsError }}

     

       77
       77
       +
                     <p class="text-center text-gray-400 dark:text-gray-500 p-4">

     

       78
       78
       +
                     Failed to calculate interdiff for this file.

     

       79
       79
       +
                     </p>

     

       80
       80
       +
                   {{ else }}

     

       81
       81
       +
                   {{ $name := .Name }}

     

       82
       82
       +
                   <pre class="overflow-x-auto"><div class="overflow-x-auto"><div class="min-w-full inline-block">{{- range .TextFragments -}}<div class="bg-gray-100 dark:bg-gray-700 text-gray-500 dark:text-gray-400 select-none text-center">&middot;&middot;&middot;</div>

     

       83
       83
       +
                    {{- $oldStart := .OldPosition -}}

     

       84
       84
       +
                    {{- $newStart := .NewPosition -}}

     

       85
       85
       +
                    {{- $lineNrStyle := "min-w-[3.5rem] flex-shrink-0 select-none text-right bg-white dark:bg-gray-800 scroll-mt-10 target:border target:border-amber-500 target:rounded " -}}

     

       86
       86
       +
                    {{- $linkStyle := "text-gray-400 dark:text-gray-500 hover:underline" -}}

     

       87
       87
       +
                    {{- $lineNrSepStyle1 := "" -}}

     

       88
       88
       +
                    {{- $lineNrSepStyle2 := "pr-2" -}}

     

       89
       89
       +
                    {{- range .Lines -}}

     

       90
       90
       +
                      {{- if eq .Op.String "+" -}}

     

       91
       91
       +
                        <div class="bg-green-100 dark:bg-green-800/30 text-green-700 dark:text-green-400 flex min-w-full items-center">

     

       92
       92
       +
                          <div class="{{$lineNrStyle}} {{$lineNrSepStyle1}}"><span aria-hidden="true" class="invisible">{{$newStart}}</span></div>

     

       93
       93
       +
                          <div class="{{$lineNrStyle}} {{$lineNrSepStyle2}}" id="{{$name}}-N{{$newStart}}"><a class="{{$linkStyle}}" href="#{{$name}}-N{{$newStart}}">{{ $newStart }}</a></div>

     

       94
       94
       +
                          <div class="w-5 flex-shrink-0 select-none text-center">{{ .Op.String }}</div>

     

       95
       95
       +
                          <div class="px-2">{{ .Line }}</div>

     

       96
       96
       +
                        </div>

     

       97
       97
       +
                        {{- $newStart = add64 $newStart 1 -}}

     

       98
       98
       +
                      {{- end -}}

     

       99
       99
       +
                      {{- if eq .Op.String "-" -}}

     

       100
       100
       +
                        <div class="bg-red-100 dark:bg-red-800/30 text-red-700 dark:text-red-400 flex min-w-full items-center">

     

       101
       101
       +
                          <div class="{{$lineNrStyle}} {{$lineNrSepStyle1}}" id="{{$name}}-O{{$oldStart}}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{$oldStart}}">{{ $oldStart }}</a></div>

     

       102
       102
       +
                          <div class="{{$lineNrStyle}} {{$lineNrSepStyle2}}"><span aria-hidden="true" class="invisible">{{$oldStart}}</span></div>

     

       103
       103
       +
                          <div class="w-5 flex-shrink-0 select-none text-center">{{ .Op.String }}</div>

     

       104
       104
       +
                          <div class="px-2">{{ .Line }}</div>

     

       105
       105
       +
                        </div>

     

       106
       106
       +
                        {{- $oldStart = add64 $oldStart 1 -}}

     

       107
       107
       +
                      {{- end -}}

     

       108
       108
       +
                      {{- if eq .Op.String " " -}}

     

       109
       109
       +
                        <div class="bg-white dark:bg-gray-800 text-gray-500 dark:text-gray-400 flex min-w-full items-center">

     

       110
       110
       +
                          <div class="{{$lineNrStyle}} {{$lineNrSepStyle1}}" id="{{$name}}-O{{$oldStart}}"><a class="{{$linkStyle}}" href="#{{$name}}-O{{$oldStart}}">{{ $oldStart }}</a></div>

     

       111
       111
       +
                          <div class="{{$lineNrStyle}} {{$lineNrSepStyle2}}" id="{{$name}}-N{{$newStart}}"><a class="{{$linkStyle}}" href="#{{$name}}-N{{$newStart}}">{{ $newStart }}</a></div>

     

       112
       112
       +
                          <div class="w-5 flex-shrink-0 select-none text-center">{{ .Op.String }}</div>

     

       113
       113
       +
                          <div class="px-2">{{ .Line }}</div>

     

       114
       114
       +
                        </div>

     

       115
       115
       +
                        {{- $newStart = add64 $newStart 1 -}}

     

       116
       116
       +
                        {{- $oldStart = add64 $oldStart 1 -}}

     

       117
       117
       +
                      {{- end -}}

     

       118
       118
       +
                    {{- end -}}

     

       119
       119
       +
                    {{- end -}}</div></div></pre>

     

       120
       120
       +
                   {{- end -}}

     

       121
       121
       +
                 </div>

     

       122
       122
       +
       

     

       123
       123
       +
               </details>

     

       124
       124
       +
       

     

       125
       125
       +
             </div>

     

       126
       126
       +
           </div>

     

       127
       127
       +
         </section>

     

       128
       128
       +
         {{ end }}

     

       129
       129
       +
         {{ end }}

     

       130
       130
       +
       {{ end }}

     

       131
       131
       +
       

     

       132
       132
       +
       {{ define "statPill" }}

     

       133
       133
       +
         <div class="flex items-center font-mono text-sm">

     

       134
       134
       +
           {{ if and .Insertions .Deletions }}

     

       135
       135
       +
             <span class="rounded-l p-1 select-none bg-green-100 text-green-700 dark:bg-green-800/50 dark:text-green-400">+{{ .Insertions }}</span>

     

       136
       136
       +
             <span class="rounded-r p-1 select-none bg-red-100 text-red-700 dark:bg-red-800/50 dark:text-red-400">-{{ .Deletions }}</span>

     

       137
       137
       +
           {{ else if .Insertions }}

     

       138
       138
       +
             <span class="rounded p-1 select-none bg-green-100 text-green-700 dark:bg-green-800/50 dark:text-green-400">+{{ .Insertions }}</span>

     

       139
       139
       +
           {{ else if .Deletions }}

     

       140
       140
       +
             <span class="rounded p-1 select-none bg-red-100 text-red-700 dark:bg-red-800/50 dark:text-red-400">-{{ .Deletions }}</span>

     

       141
       141
       +
           {{ end }}

     

       142
       142
       +
         </div>

     

       143
       143
       +
       {{ end }}

+47

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

···

       1
       1
       +
       {{ define "repo/fragments/repoActions" }}

     

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

     

       3
       3
       +
               <button

     

       4
       4
       +
                   id="starBtn"

     

       5
       5
       +
                   class="btn disabled:opacity-50 disabled:cursor-not-allowed"

     

       6
       6
       +
                   {{ if .IsStarred }}

     

       7
       7
       +
                       hx-delete="/star?subject={{ .RepoAt }}&countHint={{ .Stats.StarCount }}"

     

       8
       8
       +
                   {{ else }}

     

       9
       9
       +
                       hx-post="/star?subject={{ .RepoAt }}&countHint={{ .Stats.StarCount }}"

     

       10
       10
       +
                   {{ end }}

     

       11
       11
       +
       

     

       12
       12
       +
                   hx-trigger="click"

     

       13
       13
       +
                   hx-target="#starBtn"

     

       14
       14
       +
                   hx-swap="outerHTML"

     

       15
       15
       +
                   hx-disabled-elt="#starBtn"

     

       16
       16
       +
               >

     

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

     

       18
       18
       +
                       {{ if .IsStarred }}

     

       19
       19
       +
                           {{ i "star" "w-4 h-4 fill-current" }}

     

       20
       20
       +
                       {{ else }}

     

       21
       21
       +
                           {{ i "star" "w-4 h-4" }}

     

       22
       22
       +
                       {{ end }}

     

       23
       23
       +
                       <span class="text-sm">

     

       24
       24
       +
                           {{ .Stats.StarCount }}

     

       25
       25
       +
                       </span>

     

       26
       26
       +
                   </div>

     

       27
       27
       +
               </button>

     

       28
       28
       +
               {{ if .DisableFork }}

     

       29
       29
       +
                   <button

     

       30
       30
       +
                       class="btn text-sm no-underline hover:no-underline flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed"

     

       31
       31
       +
                       disabled

     

       32
       32
       +
                       title="Empty repositories cannot be forked"

     

       33
       33
       +
                   >

     

       34
       34
       +
                       {{ i "git-fork" "w-4 h-4" }}

     

       35
       35
       +
                       fork

     

       36
       36
       +
                   </button>

     

       37
       37
       +
               {{ else }}

     

       38
       38
       +
                   <a

     

       39
       39
       +
                       class="btn text-sm no-underline hover:no-underline flex items-center gap-2"

     

       40
       40
       +
                       href="/{{ .FullName }}/fork"

     

       41
       41
       +
                   >

     

       42
       42
       +
                       {{ i "git-fork" "w-4 h-4" }}

     

       43
       43
       +
                       fork

     

       44
       44
       +
                   </a>

     

       45
       45
       +
               {{ end }}

     

       46
       46
       +
           </div>

     

       47
       47
       +
       {{ end }}

+15

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

···

       1
       1
       +
       {{ define "repo/fragments/repoDescription" }}

     

       2
       2
       +
       <span id="repo-description" class="flex flex-wrap items-center gap-2 text-sm" hx-target="this" hx-swap="outerHTML">

     

       3
       3
       +
           {{ if .RepoInfo.Description }}

     

       4
       4
       +
               {{ .RepoInfo.Description }}

     

       5
       5
       +
           {{ else }}

     

       6
       6
       +
               <span class="italic">this repo has no description</span>

     

       7
       7
       +
           {{ end }}

     

       8
       8
       +
       

     

       9
       9
       +
           {{ if .RepoInfo.Roles.IsOwner }}

     

       10
       10
       +
           <button class="flex items-center gap-2 no-underline text-sm" hx-get="/{{ .RepoInfo.FullName }}/description/edit">

     

       11
       11
       +
             {{ i "pencil" "w-3 h-3" }}

     

       12
       12
       +
           </button>

     

       13
       13
       +
           {{ end }}

     

       14
       14
       +
       </span>

     

       15
       15
       +
       {{ end }}

+207 -172

appview/pages/templates/repo/index.html

···

       1
       1
        
       {{ define "title" }}{{ .RepoInfo.FullName }} at {{ .Ref }}{{ end }}

     

       2
       2
        
       

     

       3
       3
       -
       

     

       4
       3
        
       {{ define "extrameta" }}

     

       5
       5
       -
           <meta name="vcs:clone" content="https://tangled.sh/{{ .RepoInfo.FullName }}"/>

     

       6
       6
       -
           <meta name="forge:summary" content="https://tangled.sh/{{ .RepoInfo.FullName }}">

     

       7
       7
       -
           <meta name="forge:dir" content="https://tangled.sh/{{ .RepoInfo.FullName }}/tree/{ref}/{path}">

     

       8
       8
       -
           <meta name="forge:file" content="https://tangled.sh/{{ .RepoInfo.FullName }}/blob/{ref}/{path}">

     

       9
       9
       -
           <meta name="forge:line" content="https://tangled.sh/{{ .RepoInfo.FullName }}/blob/{ref}/{path}#L{line}">

     

       10
       10
       -
           <meta name="go-import" content="tangled.sh/{{ .RepoInfo.FullNameWithoutAt }} git https://tangled.sh/{{ .RepoInfo.FullName }}">

     

       4
       4
       +
           <meta

     

       5
       5
       +
               name="vcs:clone"

     

       6
       6
       +
               content="https://tangled.sh/{{ .RepoInfo.FullName }}"

     

       7
       7
       +
           />

     

       8
       8
       +
           <meta

     

       9
       9
       +
               name="forge:summary"

     

       10
       10
       +
               content="https://tangled.sh/{{ .RepoInfo.FullName }}"

     

       11
       11
       +
           />

     

       12
       12
       +
           <meta

     

       13
       13
       +
               name="forge:dir"

     

       14
       14
       +
               content="https://tangled.sh/{{ .RepoInfo.FullName }}/tree/{ref}/{path}"

     

       15
       15
       +
           />

     

       16
       16
       +
           <meta

     

       17
       17
       +
               name="forge:file"

     

       18
       18
       +
               content="https://tangled.sh/{{ .RepoInfo.FullName }}/blob/{ref}/{path}"

     

       19
       19
       +
           />

     

       20
       20
       +
           <meta

     

       21
       21
       +
               name="forge:line"

     

       22
       22
       +
               content="https://tangled.sh/{{ .RepoInfo.FullName }}/blob/{ref}/{path}#L{line}"

     

       23
       23
       +
           />

     

       24
       24
       +
           <meta

     

       25
       25
       +
               name="go-import"

     

       26
       26
       +
               content="tangled.sh/{{ .RepoInfo.FullNameWithoutAt }} git https://tangled.sh/{{ .RepoInfo.FullName }}"

     

       27
       27
       +
           />

     

       11
       28
        
       {{ end }}

     

       12
       12
       -
       

     

       13
       29
        
       

     

       14
       30
        
       {{ define "repoContent" }}

     

       15
       31
        
           <main>

     

       16
       16
       -
             {{ block "branchSelector" . }} {{ end }}

     

       32
       32
       +
               {{ block "branchSelector" . }}{{ end }}

     

       17
       33
        
               <div class="grid grid-cols-1 md:grid-cols-2 gap-2">

     

       18
       18
       -
                 {{ block "fileTree" . }} {{ end }}

     

       19
       19
       -
                 {{ block "commitLog" . }} {{ end }}

     

       34
       34
       +
                   {{ block "fileTree" . }}{{ end }}

     

       35
       35
       +
                   {{ block "commitLog" . }}{{ end }}

     

       20
       36
        
               </div>

     

       21
       37
        
           </main>

     

       22
       38
        
       {{ end }}

     

       23
       39
        
       

     

       24
       40
        
       {{ define "branchSelector" }}

     

       25
       25
       -
       <div class="flex justify-between pb-5">

     

       26
       26
       -
           <select

     

       27
       27
       -
               onchange="window.location.href = '/{{ .RepoInfo.FullName }}/tree/' + encodeURIComponent(this.value)"

     

       28
       28
       -
               class="p-1 border border-gray-200 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-700"

     

       29
       29
       -
           >

     

       30
       30
       -
               <optgroup label="branches" class="bold text-sm">

     

       31
       31
       -
                   {{ range .Branches }}

     

       32
       32
       -
                       <option

     

       33
       33
       -
                           value="{{ .Reference.Name }}"

     

       34
       34
       -
                           class="py-1"

     

       35
       35
       -
                           {{ if eq .Reference.Name $.Ref }}

     

       36
       36
       -
                               selected

     

       37
       37
       -
                           {{ end }}

     

       38
       38
       -
                       >

     

       39
       39
       -
                           {{ .Reference.Name }}

     

       40
       40
       -
                       </option>

     

       41
       41
       -
                   {{ end }}

     

       42
       42
       -
               </optgroup>

     

       43
       43
       -
               <optgroup label="tags" class="bold text-sm">

     

       44
       44
       -
                   {{ range .Tags }}

     

       45
       45
       -
                       <option

     

       46
       46
       -
                           value="{{ .Reference.Name }}"

     

       47
       47
       -
                           class="py-1"

     

       48
       48
       -
                           {{ if eq .Reference.Name $.Ref }}

     

       49
       49
       -
                               selected

     

       50
       50
       -
                           {{ end }}

     

       51
       51
       -
                       >

     

       52
       52
       -
                           {{ .Reference.Name }}

     

       53
       53
       -
                       </option>

     

       54
       54
       -
                   {{ else }}

     

       55
       55
       -
                       <option class="py-1" disabled>no tags found</option>

     

       56
       56
       -
                   {{ end }}

     

       57
       57
       -
               </optgroup>

     

       58
       58
       -
           </select>

     

       59
       59
       -
           <a

     

       60
       60
       -
               href="/{{ .RepoInfo.FullName }}/commits/{{ .Ref | urlquery }}"

     

       61
       61
       -
               class="ml-2 no-underline flex items-center gap-2 text-sm uppercase font-bold dark:text-white"

     

       62
       62
       -
           >

     

       63
       63
       -
               {{ i "logs" "w-4 h-4" }}

     

       64
       64
       -
               {{ .TotalCommits }}

     

       65
       65
       -
               {{ if eq .TotalCommits 1 }}commit{{ else }}commits{{ end }}

     

       66
       66
       -
           </a>

     

       67
       67
       -
       </div>

     

       41
       41
       +
           <div class="flex justify-between pb-5">

     

       42
       42
       +
               <select

     

       43
       43
       +
                   onchange="window.location.href = '/{{ .RepoInfo.FullName }}/tree/' + encodeURIComponent(this.value)"

     

       44
       44
       +
                   class="p-1 border border-gray-200 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-700"

     

       45
       45
       +
               >

     

       46
       46
       +
                   <optgroup label="branches" class="bold text-sm">

     

       47
       47
       +
                       {{ range .Branches }}

     

       48
       48
       +
                           <option

     

       49
       49
       +
                               value="{{ .Reference.Name }}"

     

       50
       50
       +
                               class="py-1"

     

       51
       51
       +
                               {{ if eq .Reference.Name $.Ref }}

     

       52
       52
       +
                                   selected

     

       53
       53
       +
                               {{ end }}

     

       54
       54
       +
                           >

     

       55
       55
       +
                               {{ .Reference.Name }}

     

       56
       56
       +
                           </option>

     

       57
       57
       +
                       {{ end }}

     

       58
       58
       +
                   </optgroup>

     

       59
       59
       +
                   <optgroup label="tags" class="bold text-sm">

     

       60
       60
       +
                       {{ range .Tags }}

     

       61
       61
       +
                           <option

     

       62
       62
       +
                               value="{{ .Reference.Name }}"

     

       63
       63
       +
                               class="py-1"

     

       64
       64
       +
                               {{ if eq .Reference.Name $.Ref }}

     

       65
       65
       +
                                   selected

     

       66
       66
       +
                               {{ end }}

     

       67
       67
       +
                           >

     

       68
       68
       +
                               {{ .Reference.Name }}

     

       69
       69
       +
                           </option>

     

       70
       70
       +
                       {{ else }}

     

       71
       71
       +
                           <option class="py-1" disabled>no tags found</option>

     

       72
       72
       +
                       {{ end }}

     

       73
       73
       +
                   </optgroup>

     

       74
       74
       +
               </select>

     

       75
       75
       +
               <a

     

       76
       76
       +
                   href="/{{ .RepoInfo.FullName }}/commits/{{ .Ref | urlquery }}"

     

       77
       77
       +
                   class="ml-2 no-underline flex items-center gap-2 text-sm uppercase font-bold dark:text-white"

     

       78
       78
       +
               >

     

       79
       79
       +
                   {{ i "logs" "w-4 h-4" }}

     

       80
       80
       +
                   {{ .TotalCommits }}

     

       81
       81
       +
                   {{ if eq .TotalCommits 1 }}commit{{ else }}commits{{ end }}

     

       82
       82
       +
               </a>

     

       83
       83
       +
           </div>

     

       68
       84
        
       {{ end }}

     

       69
       85
        
       

     

       70
       86
        
       {{ define "fileTree" }}

     

       71
       71
       -
       <div id="file-tree" class="col-span-1 pr-2 md:border-r md:border-gray-200 dark:md:border-gray-700">

     

       72
       72
       -
           {{ $containerstyle := "py-1" }}

     

       73
       73
       -
           {{ $linkstyle := "no-underline hover:underline dark:text-white" }}

     

       87
       87
       +
           <div

     

       88
       88
       +
               id="file-tree"

     

       89
       89
       +
               class="col-span-1 pr-2 md:border-r md:border-gray-200 dark:md:border-gray-700"

     

       90
       90
       +
           >

     

       91
       91
       +
               {{ $containerstyle := "py-1" }}

     

       92
       92
       +
               {{ $linkstyle := "no-underline hover:underline dark:text-white" }}

     

       74
       93
        
       

     

       75
       75
       -
           {{ range .Files }}

     

       76
       76
       -
               {{ if not .IsFile }}

     

       77
       77
       -
                   <div class="{{ $containerstyle }}">

     

       78
       78
       -
                       <div class="flex justify-between items-center">

     

       79
       79
       -
                           <a

     

       80
       80
       -
                               href="/{{ $.RepoInfo.FullName }}/tree/{{ $.Ref | urlquery }}/{{ .Name }}"

     

       81
       81
       -
                               class="{{ $linkstyle }}"

     

       82
       82
       -
                           >

     

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

     

       84
       84
       -
                                 {{ i "folder" "w-3 h-3 fill-current" }}

     

       85
       85
       -
                                 {{ .Name }}

     

       86
       86
       -
                               </div>

     

       87
       87
       -
                           </a>

     

       94
       94
       +
               {{ range .Files }}

     

       95
       95
       +
                   {{ if not .IsFile }}

     

       96
       96
       +
                       <div class="{{ $containerstyle }}">

     

       97
       97
       +
                           <div class="flex justify-between items-center">

     

       98
       98
       +
                               <a

     

       99
       99
       +
                                   href="/{{ $.RepoInfo.FullName }}/tree/{{ $.Ref | urlquery }}/{{ .Name }}"

     

       100
       100
       +
                                   class="{{ $linkstyle }}"

     

       101
       101
       +
                               >

     

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

     

       103
       103
       +
                                       {{ i "folder" "w-3 h-3 fill-current" }}

     

       104
       104
       +
                                       {{ .Name }}

     

       105
       105
       +
                                   </div>

     

       106
       106
       +
                               </a>

     

       88
       107
        
       

     

       89
       89
       -
                           <time class="text-xs text-gray-500 dark:text-gray-400"

     

       90
       90
       -
                               >{{ timeFmt .LastCommit.When }}</time

     

       91
       91
       -
                           >

     

       108
       108
       +
                               <time class="text-xs text-gray-500 dark:text-gray-400"

     

       109
       109
       +
                                   >{{ timeFmt .LastCommit.When }}</time

     

       110
       110
       +
                               >

     

       111
       111
       +
                           </div>

     

       92
       112
        
                       </div>

     

       93
       93
       -
                   </div>

     

       113
       113
       +
                   {{ end }}

     

       94
       114
        
               {{ end }}

     

       95
       95
       -
           {{ end }}

     

       96
       115
        
       

     

       97
       97
       -
           {{ range .Files }}

     

       98
       98
       -
               {{ if .IsFile }}

     

       99
       99
       -
                   <div class="{{ $containerstyle }}">

     

       100
       100
       -
                       <div class="flex justify-between items-center">

     

       101
       101
       -
                           <a

     

       102
       102
       -
                               href="/{{ $.RepoInfo.FullName }}/blob/{{ $.Ref | urlquery }}/{{ .Name }}"

     

       103
       103
       -
                               class="{{ $linkstyle }}"

     

       104
       104
       -
                           >

     

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

     

       106
       106
       -
                                 {{ i "file" "w-3 h-3" }}{{ .Name }}

     

       107
       107
       -
                               </div>

     

       108
       108
       -
                           </a>

     

       116
       116
       +
               {{ range .Files }}

     

       117
       117
       +
                   {{ if .IsFile }}

     

       118
       118
       +
                       <div class="{{ $containerstyle }}">

     

       119
       119
       +
                           <div class="flex justify-between items-center">

     

       120
       120
       +
                               <a

     

       121
       121
       +
                                   href="/{{ $.RepoInfo.FullName }}/blob/{{ $.Ref | urlquery }}/{{ .Name }}"

     

       122
       122
       +
                                   class="{{ $linkstyle }}"

     

       123
       123
       +
                               >

     

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

     

       125
       125
       +
                                       {{ i "file" "w-3 h-3" }}{{ .Name }}

     

       126
       126
       +
                                   </div>

     

       127
       127
       +
                               </a>

     

       109
       128
        
       

     

       110
       110
       -
                           <time class="text-xs text-gray-500 dark:text-gray-400"

     

       111
       111
       -
                               >{{ timeFmt .LastCommit.When }}</time

     

       112
       112
       -
                           >

     

       129
       129
       +
                               <time class="text-xs text-gray-500 dark:text-gray-400"

     

       130
       130
       +
                                   >{{ timeFmt .LastCommit.When }}</time

     

       131
       131
       +
                               >

     

       132
       132
       +
                           </div>

     

       113
       133
        
                       </div>

     

       114
       114
       -
                   </div>

     

       134
       134
       +
                   {{ end }}

     

       115
       135
        
               {{ end }}

     

       116
       116
       -
           {{ end }}

     

       117
       117
       -
       </div>

     

       136
       136
       +
           </div>

     

       118
       137
        
       {{ end }}

     

       119
       138
        
       

     

       120
       120
       -
       

     

       121
       139
        
       {{ define "commitLog" }}

     

       122
       122
       -
       <div id="commit-log" class="hidden md:block md:col-span-1">

     

       123
       123
       -
           {{ range .Commits }}

     

       124
       124
       -
                 <div class="relative px-2 pb-8">

     

       125
       125
       -
                     <div id="commit-message">

     

       126
       126
       -
                         {{ $messageParts := splitN .Message "\n\n" 2 }}

     

       127
       127
       -
                         <div class="text-base cursor-pointer">

     

       128
       128
       -
                             <div>

     

       129
       129
       -
                                 <div>

     

       130
       130
       -
                                     <a

     

       131
       131
       -
                                         href="/{{ $.RepoInfo.FullName }}/commit/{{ .Hash.String }}"

     

       132
       132
       -
                                         class="inline no-underline hover:underline dark:text-white"

     

       133
       133
       -
                                         >{{ index $messageParts 0 }}</a

     

       134
       134
       -
                                     >

     

       135
       135
       -
                                     {{ if gt (len $messageParts) 1 }}

     

       140
       140
       +
           <div id="commit-log" class="hidden md:block md:col-span-1">

     

       141
       141
       +
               {{ range .Commits }}

     

       142
       142
       +
                   <div class="relative px-2 pb-8">

     

       143
       143
       +
                       <div id="commit-message">

     

       144
       144
       +
                           {{ $messageParts := splitN .Message "\n\n" 2 }}

     

       145
       145
       +
                           <div class="text-base cursor-pointer">

     

       146
       146
       +
                               <div>

     

       147
       147
       +
                                   <div>

     

       148
       148
       +
                                       <a

     

       149
       149
       +
                                           href="/{{ $.RepoInfo.FullName }}/commit/{{ .Hash.String }}"

     

       150
       150
       +
                                           class="inline no-underline hover:underline dark:text-white"

     

       151
       151
       +
                                           >{{ index $messageParts 0 }}</a

     

       152
       152
       +
                                       >

     

       153
       153
       +
                                       {{ if gt (len $messageParts) 1 }}

     

       136
       154
        
       

     

       137
       137
       -
                                         <button

     

       138
       138
       -
                                             class="py-1/2 px-1 bg-gray-200 hover:bg-gray-400 rounded dark:bg-gray-700 dark:hover:bg-gray-600"

     

       139
       139
       -
                                             hx-on:click="this.parentElement.nextElementSibling.classList.toggle('hidden')"

     

       140
       140
       -
                                         >

     

       141
       141
       -
                                         {{ i "ellipsis" "w-3 h-3" }}

     

       142
       142
       -
                                         </button>

     

       143
       143
       -
                                     {{ end }}

     

       144
       144
       -
                                 </div>

     

       145
       145
       -
                                 {{ if gt (len $messageParts) 1 }}

     

       146
       146
       -
                                     <p

     

       147
       147
       -
                                         class="hidden mt-1 text-sm cursor-text pb-2 dark:text-gray-300"

     

       148
       148
       -
                                     >

     

       149
       149
       -
                                         {{ nl2br (unwrapText (index $messageParts 1)) }}

     

       150
       150
       -
                                     </p>

     

       151
       151
       -
                                 {{ end }}

     

       152
       152
       -
                             </div>

     

       153
       153
       -
                         </div>

     

       154
       154
       -
                     </div>

     

       155
       155
       +
                                           <button

     

       156
       156
       +
                                               class="py-1/2 px-1 bg-gray-200 hover:bg-gray-400 rounded dark:bg-gray-700 dark:hover:bg-gray-600"

     

       157
       157
       +
                                               hx-on:click="this.parentElement.nextElementSibling.classList.toggle('hidden')"

     

       158
       158
       +
                                           >

     

       159
       159
       +
                                               {{ i "ellipsis" "w-3 h-3" }}

     

       160
       160
       +
                                           </button>

     

       161
       161
       +
                                       {{ end }}

     

       162
       162
       +
                                   </div>

     

       163
       163
       +
                                   {{ if gt (len $messageParts) 1 }}

     

       164
       164
       +
                                       <p

     

       165
       165
       +
                                           class="hidden mt-1 text-sm cursor-text pb-2 dark:text-gray-300"

     

       166
       166
       +
                                       >

     

       167
       167
       +
                                           {{ nl2br (index $messageParts 1) }}

     

       168
       168
       +
                                       </p>

     

       169
       169
       +
                                   {{ end }}

     

       170
       170
       +
                               </div>

     

       171
       171
       +
                           </div>

     

       172
       172
       +
                       </div>

     

       155
       173
        
       

     

       156
       156
       -
                     <div class="text-xs text-gray-500 dark:text-gray-400">

     

       157
       157
       -
                         <span class="font-mono">

     

       158
       158
       -
                             <a

     

       159
       159
       -
                                 href="/{{ $.RepoInfo.FullName }}/commit/{{ .Hash.String }}"

     

       160
       160
       -
                                 class="text-gray-500 dark:text-gray-400 no-underline hover:underline"

     

       161
       161
       -
                                 >{{ slice .Hash.String 0 8 }}</a

     

       162
       162
       -
                             >

     

       163
       163
       -
                         </span>

     

       164
       164
       -
                         <span

     

       165
       165
       -
                             class="mx-2 before:content-['·'] before:select-none"

     

       166
       166
       -
                         ></span>

     

       167
       167
       -
                         <span>

     

       168
       168
       -
                             {{ $didOrHandle := index $.EmailToDidOrHandle .Author.Email }}

     

       169
       169
       -
                             <a

     

       170
       170
       -
                                 href="{{ if $didOrHandle }}/{{ $didOrHandle }}{{ else }}mailto:{{ .Author.Email }}{{ end }}"

     

       171
       171
       -
                                 class="text-gray-500 dark:text-gray-400 no-underline hover:underline"

     

       172
       172
       -
                                 >{{ if $didOrHandle }}{{ $didOrHandle }}{{ else }}{{ .Author.Name }}{{ end }}</a

     

       173
       173
       -
                             >

     

       174
       174
       -
                         </span>

     

       175
       175
       -
                         <div

     

       176
       176
       -
                             class="inline-block px-1 select-none after:content-['·']"

     

       177
       177
       -
                         ></div>

     

       178
       178
       -
                         <span>{{ timeFmt .Author.When }}</span>

     

       179
       179
       -
                         {{ $tagsForCommit := index $.TagMap .Hash.String }}

     

       180
       180
       -
                         {{ if gt (len $tagsForCommit) 0 }}

     

       174
       174
       +
                       <div class="text-xs text-gray-500 dark:text-gray-400">

     

       175
       175
       +
                           <span class="font-mono">

     

       176
       176
       +
                               <a

     

       177
       177
       +
                                   href="/{{ $.RepoInfo.FullName }}/commit/{{ .Hash.String }}"

     

       178
       178
       +
                                   class="text-gray-500 dark:text-gray-400 no-underline hover:underline"

     

       179
       179
       +
                                   >{{ slice .Hash.String 0 8 }}</a></span>

     

       180
       180
       +
                           <span

     

       181
       181
       +
                               class="mx-2 before:content-['·'] before:select-none"

     

       182
       182
       +
                           ></span>

     

       183
       183
       +
                           <span>

     

       184
       184
       +
                               {{ $didOrHandle := index $.EmailToDidOrHandle .Author.Email }}

     

       185
       185
       +
                               <a

     

       186
       186
       +
                                   href="{{ if $didOrHandle }}

     

       187
       187
       +
                                       /{{ $didOrHandle }}

     

       188
       188
       +
                                   {{ else }}

     

       189
       189
       +
                                       mailto:{{ .Author.Email }}

     

       190
       190
       +
                                   {{ end }}"

     

       191
       191
       +
                                   class="text-gray-500 dark:text-gray-400 no-underline hover:underline"

     

       192
       192
       +
                                   >{{ if $didOrHandle }}

     

       193
       193
       +
                                       {{ $didOrHandle }}

     

       194
       194
       +
                                   {{ else }}

     

       195
       195
       +
                                       {{ .Author.Name }}

     

       196
       196
       +
                                   {{ end }}</a

     

       197
       197
       +
                               >

     

       198
       198
       +
                           </span>

     

       181
       199
        
                           <div

     

       182
       200
        
                               class="inline-block px-1 select-none after:content-['·']"

     

       183
       201
        
                           ></div>

     

       184
       184
       -
                         {{ end }}

     

       185
       185
       -
                         {{ range $tagsForCommit }}

     

       186
       186
       -
                           <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">

     

       187
       187
       -
                             {{ . }}

     

       188
       188
       -
                           </span>

     

       189
       189
       -
                         {{ end }}

     

       190
       190
       -
                     </div>

     

       191
       191
       -
                 </div>

     

       192
       192
       -
           {{ end }}

     

       193
       193
       -
       </div>

     

       202
       202
       +
                           <span>{{ timeFmt .Author.When }}</span>

     

       203
       203
       +
                           {{ $tagsForCommit := index $.TagMap .Hash.String }}

     

       204
       204
       +
                           {{ if gt (len $tagsForCommit) 0 }}

     

       205
       205
       +
                               <div

     

       206
       206
       +
                                   class="inline-block px-1 select-none after:content-['·']"

     

       207
       207
       +
                               ></div>

     

       208
       208
       +
                           {{ end }}

     

       209
       209
       +
                           {{ range $tagsForCommit }}

     

       210
       210
       +
                               <span

     

       211
       211
       +
                                   class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center"

     

       212
       212
       +
                               >

     

       213
       213
       +
                                   {{ . }}

     

       214
       214
       +
                               </span>

     

       215
       215
       +
                           {{ end }}

     

       216
       216
       +
                       </div>

     

       217
       217
       +
                   </div>

     

       218
       218
       +
               {{ end }}

     

       219
       219
       +
           </div>

     

       194
       220
        
       {{ end }}

     

       195
       195
       -
       

     

       196
       221
        
       

     

       197
       222
        
       {{ define "repoAfter" }}

     

       198
       223
        
           {{- if .HTMLReadme }}

     

       199
       199
       -
           <section class="mt-4 p-6 rounded bg-white dark:bg-gray-800 dark:text-white w-full mx-auto overflow-auto {{ if not .Raw }} prose dark:prose-invert dark:[&_pre]:bg-gray-900 dark:[&_code]:text-gray-300 dark:[&_pre_code]:bg-gray-900 dark:[&_pre]:border dark:[&_pre]:border-gray-700 {{ end }}">

     

       200
       200
       -
               <article class="{{ if .Raw }}whitespace-pre{{end}}">

     

       201
       201
       -
                   {{ if .Raw }}

     

       202
       202
       -
                       <pre class="dark:bg-gray-900 dark:text-gray-200 dark:border dark:border-gray-700 dark:p-4 dark:rounded">{{ .HTMLReadme }}</pre>

     

       203
       203
       -
                   {{ else }}

     

       204
       204
       -
                       {{ .HTMLReadme }}

     

       205
       205
       -
                   {{ end }}

     

       206
       206
       -
               </article>

     

       207
       207
       -
           </section>

     

       224
       224
       +
               <section

     

       225
       225
       +
                   class="mt-4 p-6 rounded bg-white dark:bg-gray-800 dark:text-white w-full mx-auto overflow-auto {{ if not .Raw }}

     

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

     

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

     

       228
       228
       +
                       dark:[&_pre]:border dark:[&_pre]:border-gray-700

     

       229
       229
       +
                   {{ end }}"

     

       230
       230
       +
               >

     

       231
       231
       +
                   <article class="{{ if .Raw }}whitespace-pre{{ end }}">

     

       232
       232
       +
                       {{ if .Raw }}

     

       233
       233
       +
                           <pre

     

       234
       234
       +
                               class="dark:bg-gray-900 dark:text-gray-200 dark:border dark:border-gray-700 dark:p-4 dark:rounded"

     

       235
       235
       +
                           >

     

       236
       236
       +
       {{ .HTMLReadme }}</pre

     

       237
       237
       +
                           >

     

       238
       238
       +
                       {{ else }}

     

       239
       239
       +
                           {{ .HTMLReadme }}

     

       240
       240
       +
                       {{ end }}

     

       241
       241
       +
                   </article>

     

       242
       242
       +
               </section>

     

       208
       243
        
           {{- end -}}

     

       209
       244
        
       

     

       210
       210
       -
           {{ template "fragments/cloneInstructions" . }}

     

       245
       245
       +
           {{ template "repo/fragments/cloneInstructions" . }}

     

       211
       246
        
       {{ end }}

+52

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

···

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

     

       2
       2
       +
         {{ with .Comment }}

     

       3
       3
       +
         <div id="comment-container-{{.CommentId}}">

     

       4
       4
       +
           <div class="flex items-center gap-2 mb-2 text-gray-500 text-sm">

     

       5
       5
       +
             {{ $owner := didOrHandle $.LoggedInUser.Did $.LoggedInUser.Handle }}

     

       6
       6
       +
             <a href="/{{ $owner }}" class="no-underline hover:underline">{{ $owner }}</a>

     

       7
       7
       +
       

     

       8
       8
       +
             <!-- show user "hats" -->

     

       9
       9
       +
             {{ $isIssueAuthor := eq .OwnerDid $.Issue.OwnerDid }}

     

       10
       10
       +
             {{ if $isIssueAuthor }}

     

       11
       11
       +
             <span class="before:content-['·']"></span>

     

       12
       12
       +
             <span class="rounded bg-gray-100 text-black font-mono px-2 mx-1/2 inline-flex items-center">

     

       13
       13
       +
               author

     

       14
       14
       +
             </span>

     

       15
       15
       +
             {{ end }}

     

       16
       16
       +
       

     

       17
       17
       +
             <span class="before:content-['·']"></span>

     

       18
       18
       +
             <a

     

       19
       19
       +
                 href="#{{ .CommentId }}"

     

       20
       20
       +
                 class="text-gray-500 hover:text-gray-500 hover:underline no-underline"

     

       21
       21
       +
                 id="{{ .CommentId }}">

     

       22
       22
       +
               {{ .Created | timeFmt }}

     

       23
       23
       +
             </a>

     

       24
       24
       +
       

     

       25
       25
       +
             <button

     

       26
       26
       +
               class="btn px-2 py-1 flex items-center gap-2 text-sm"

     

       27
       27
       +
               hx-post="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/edit"

     

       28
       28
       +
               hx-include="#edit-textarea-{{ .CommentId }}"

     

       29
       29
       +
               hx-target="#comment-container-{{ .CommentId }}"

     

       30
       30
       +
               hx-swap="outerHTML">

     

       31
       31
       +
               {{ i "check" "w-4 h-4" }}

     

       32
       32
       +
             </button>

     

       33
       33
       +
             <button

     

       34
       34
       +
               class="btn px-2 py-1  flex items-center gap-2 text-sm"

     

       35
       35
       +
               hx-get="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/"

     

       36
       36
       +
               hx-target="#comment-container-{{ .CommentId }}"

     

       37
       37
       +
               hx-swap="outerHTML">

     

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

     

       39
       39
       +
             </button>

     

       40
       40
       +
             <span id="comment-{{.CommentId}}-status"></span>

     

       41
       41
       +
           </div>

     

       42
       42
       +
       

     

       43
       43
       +
           <div>

     

       44
       44
       +
             <textarea

     

       45
       45
       +
               id="edit-textarea-{{ .CommentId }}"

     

       46
       46
       +
               name="body"

     

       47
       47
       +
               class="w-full p-2 border rounded min-h-[100px]">{{ .Body }}</textarea>

     

       48
       48
       +
           </div>

     

       49
       49
       +
         </div>

     

       50
       50
       +
         {{ end }}

     

       51
       51
       +
       {{ end }}

     

       52
       52
       +

+59

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

···

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

     

       2
       2
       +
         {{ with .Comment }}

     

       3
       3
       +
         <div id="comment-container-{{.CommentId}}">

     

       4
       4
       +
           <div class="flex items-center gap-2 mb-2 text-gray-500 dark:text-gray-400 text-sm">

     

       5
       5
       +
             {{ $owner := index $.DidHandleMap .OwnerDid }}

     

       6
       6
       +
             <a href="/{{ $owner }}" class="no-underline hover:underline">{{ $owner }}</a>

     

       7
       7
       +
       

     

       8
       8
       +
            <span class="before:content-['·']"></span>

     

       9
       9
       +
             <a

     

       10
       10
       +
                 href="#{{ .CommentId }}"

     

       11
       11
       +
                 class="text-gray-500 dark:text-gray-400 hover:text-gray-500 dark:hover:text-gray-400 hover:underline no-underline"

     

       12
       12
       +
                 id="{{ .CommentId }}">

     

       13
       13
       +
               {{ if .Deleted }}

     

       14
       14
       +
                 deleted {{ .Deleted | timeFmt }}

     

       15
       15
       +
               {{ else if .Edited }}

     

       16
       16
       +
                 edited {{ .Edited | timeFmt }}

     

       17
       17
       +
               {{ else }}

     

       18
       18
       +
                 {{ .Created | timeFmt }}

     

       19
       19
       +
               {{ end }}

     

       20
       20
       +
             </a>

     

       21
       21
       +
             

     

       22
       22
       +
             <!-- show user "hats" -->

     

       23
       23
       +
             {{ $isIssueAuthor := eq .OwnerDid $.Issue.OwnerDid }}

     

       24
       24
       +
             {{ if $isIssueAuthor }}

     

       25
       25
       +
             <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">

     

       26
       26
       +
               author

     

       27
       27
       +
             </span>

     

       28
       28
       +
             {{ end }}

     

       29
       29
       +
       

     

       30
       30
       +
             {{ $isCommentOwner := and $.LoggedInUser (eq $.LoggedInUser.Did .OwnerDid) }}

     

       31
       31
       +
             {{ if and $isCommentOwner (not .Deleted) }}

     

       32
       32
       +
             <button 

     

       33
       33
       +
               class="btn px-2 py-1 text-sm" 

     

       34
       34
       +
               hx-get="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/edit"

     

       35
       35
       +
               hx-swap="outerHTML"

     

       36
       36
       +
               hx-target="#comment-container-{{.CommentId}}"

     

       37
       37
       +
               >

     

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

     

       39
       39
       +
             </button>

     

       40
       40
       +
             <button 

     

       41
       41
       +
               class="btn px-2 py-1 text-sm text-red-500"

     

       42
       42
       +
               hx-delete="/{{ $.RepoInfo.FullName }}/issues/{{ .Issue }}/comment/{{ .CommentId }}/"

     

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

     

       44
       44
       +
               hx-swap="outerHTML"

     

       45
       45
       +
               hx-target="#comment-container-{{.CommentId}}"

     

       46
       46
       +
               >

     

       47
       47
       +
               {{ i "trash-2" "w-4 h-4" }}

     

       48
       48
       +
             </button>

     

       49
       49
       +
             {{ end }}

     

       50
       50
       +
       

     

       51
       51
       +
           </div>

     

       52
       52
       +
           {{ if not .Deleted }}

     

       53
       53
       +
           <div class="prose dark:prose-invert">

     

       54
       54
       +
             {{ .Body | markdown }}

     

       55
       55
       +
           </div>

     

       56
       56
       +
           {{ end }}

     

       57
       57
       +
         </div>

     

       58
       58
       +
         {{ end }}

     

       59
       59
       +
       {{ end }}

+112 -42

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

···

       44
       44
        
       {{ end }}

     

       45
       45
        
       

     

       46
       46
        
       {{ define "repoAfter" }}

     

       47
       47
       -
           {{ if gt (len .Comments) 0 }}

     

       48
       48
       -
           <section id="comments" class="mt-8 space-y-4 relative">

     

       47
       47
       +
           <section id="comments" class="my-2 mt-2 space-y-2 relative">

     

       49
       48
        
               {{ range $index, $comment := .Comments }}

     

       50
       49
        
                   <div

     

       51
       50
        
                       id="comment-{{ .CommentId }}"

     

       52
       52
       -
                       class="rounded bg-white px-6 py-4 relative dark:bg-gray-800">

     

       53
       53
       -
                       {{ if eq $index 0 }}

     

       54
       54
       -
                           <div class="absolute left-8 -top-8 w-px h-8 bg-gray-300 dark:bg-gray-700" ></div>

     

       55
       55
       -
                       {{ else }}

     

       56
       56
       -
                           <div class="absolute left-8 -top-4 w-px h-4 bg-gray-300 dark:bg-gray-700" ></div>

     

       51
       51
       +
                       class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-2 px-4 relative w-full md:max-w-3/5 md:w-fit">

     

       52
       52
       +
                       {{ if gt $index 0 }}

     

       53
       53
       +
                       <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div>

     

       57
       54
        
                       {{ end }}

     

       58
       58
       -
       

     

       59
       59
       -
                       {{ template "fragments/issueComment" (dict "RepoInfo" $.RepoInfo "LoggedInUser" $.LoggedInUser "DidHandleMap" $.DidHandleMap "Issue" $.Issue "Comment" .)}}

     

       55
       55
       +
                       {{ template "repo/issues/fragments/issueComment" (dict "RepoInfo" $.RepoInfo "LoggedInUser" $.LoggedInUser "DidHandleMap" $.DidHandleMap "Issue" $.Issue "Comment" .)}}

     

       60
       56
        
                   </div>

     

       61
       57
        
               {{ end }}

     

       62
       58
        
           </section>

     

       63
       63
       -
           {{ end }}

     

       64
       59
        
       

     

       65
       60
        
           {{ block "newComment" . }} {{ end }}

     

       66
       61
        
       

     

       67
       67
       -
           {{ $isIssueAuthor := and .LoggedInUser (eq .LoggedInUser.Did .Issue.OwnerDid) }}

     

       68
       68
       -
           {{ $isRepoCollaborator := .RepoInfo.Roles.IsCollaborator }}

     

       69
       69
       -
           {{ if or $isIssueAuthor $isRepoCollaborator }}

     

       70
       70
       -
               {{ $action := "close" }}

     

       71
       71
       -
               {{ $icon := "circle-x" }}

     

       72
       72
       -
               {{ $hoverColor := "red" }}

     

       73
       73
       -
               {{ if eq .State "closed" }}

     

       74
       74
       -
                   {{ $action = "reopen" }}

     

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

     

       76
       76
       -
                   {{ $hoverColor = "green" }}

     

       77
       77
       -
               {{ end }}

     

       78
       78
       -
               <form

     

       79
       79
       -
                   hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/{{ $action }}"

     

       80
       80
       -
                   hx-swap="none"

     

       81
       81
       -
                   class="mt-8"

     

       82
       82
       -
               >

     

       83
       83
       -
                   <button type="submit" class="btn hover:bg-{{ $hoverColor }}-300">

     

       84
       84
       -
                       {{ i $icon "w-4 h-4 mr-2" }}

     

       85
       85
       -
                       <span class="text-black dark:text-gray-400">{{ $action }}</span>

     

       86
       86
       -
                   </button>

     

       87
       87
       -
                   <div id="issue-action" class="error"></div>

     

       88
       88
       -
               </form>

     

       89
       89
       -
           {{ end }}

     

       90
       62
        
       {{ end }}

     

       91
       63
        
       

     

       92
       64
        
       {{ define "newComment" }}

     

       93
       65
        
         {{ if .LoggedInUser }}

     

       94
       94
       -
           <div class="bg-white rounded drop-shadow-sm py-4 px-6 relative w-full flex flex-col gap-2 mt-8 dark:bg-gray-800 dark:text-gray-400">

     

       95
       95
       -
             <div class="absolute left-8 -top-8 w-px h-8 bg-gray-300 dark:bg-gray-700" ></div>

     

       96
       96
       -
             <div class="text-sm text-gray-500 dark:text-gray-400">

     

       66
       66
       +
         <form 

     

       67
       67
       +
             id="comment-form" 

     

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

     

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

     

       70
       70
       +
         >

     

       71
       71
       +
           <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-4 px-4 relative w-full md:w-3/5">

     

       72
       72
       +
             <div class="text-sm pb-2 text-gray-500 dark:text-gray-400">

     

       97
       73
        
               {{ didOrHandle .LoggedInUser.Did .LoggedInUser.Handle }}

     

       98
       74
        
             </div>

     

       99
       99
       -
             <form hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/comment">

     

       100
       75
        
                 <textarea

     

       76
       76
       +
                     id="comment-textarea"

     

       101
       77
        
                     name="body"

     

       102
       78
        
                     class="w-full p-2 rounded border border-gray-200 dark:border-gray-700"

     

       103
       103
       -
                     placeholder="Add to the discussion..."

     

       79
       79
       +
                     placeholder="Add to the discussion. Markdown is supported."

     

       80
       80
       +
                     onkeyup="updateCommentForm()"

     

       104
       81
        
                 ></textarea>

     

       105
       105
       -
                 <button type="submit" class="btn mt-2">comment</button>

     

       106
       82
        
                 <div id="issue-comment"></div>

     

       107
       107
       -
             </form>

     

       83
       83
       +
             <div id="issue-action" class="error"></div>

     

       108
       84
        
           </div>

     

       85
       85
       +
           

     

       86
       86
       +
           <div class="flex gap-2 mt-2">

     

       87
       87
       +
               <button 

     

       88
       88
       +
                   id="comment-button" 

     

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

     

       90
       90
       +
                   type="submit" 

     

       91
       91
       +
                   hx-disabled-elt="#comment-button"

     

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

     

       93
       93
       +
                   disabled

     

       94
       94
       +
               >

     

       95
       95
       +
                   {{ i "message-square-plus" "w-4 h-4" }}

     

       96
       96
       +
                   comment

     

       97
       97
       +
               </button>

     

       98
       98
       +
       

     

       99
       99
       +
               {{ $isIssueAuthor := and .LoggedInUser (eq .LoggedInUser.Did .Issue.OwnerDid) }}

     

       100
       100
       +
               {{ $isRepoCollaborator := .RepoInfo.Roles.IsCollaborator }}

     

       101
       101
       +
               {{ if and (or $isIssueAuthor $isRepoCollaborator) (eq .State "open") }}

     

       102
       102
       +
               <button 

     

       103
       103
       +
                   id="close-button"

     

       104
       104
       +
                   type="button" 

     

       105
       105
       +
                   class="btn flex items-center gap-2"

     

       106
       106
       +
                   hx-trigger="click"

     

       107
       107
       +
               >

     

       108
       108
       +
                   {{ i "ban" "w-4 h-4" }}

     

       109
       109
       +
                   close

     

       110
       110
       +
               </button>

     

       111
       111
       +
               <div 

     

       112
       112
       +
                   id="close-with-comment" 

     

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

     

       114
       114
       +
                   hx-trigger="click from:#close-button" 

     

       115
       115
       +
                   hx-disabled-elt="#close-with-comment"

     

       116
       116
       +
                   hx-target="#issue-comment"

     

       117
       117
       +
                   hx-vals="js:{body: document.getElementById('comment-textarea').value.trim() !== '' ? document.getElementById('comment-textarea').value : ''}"

     

       118
       118
       +
                   hx-swap="none"

     

       119
       119
       +
               >

     

       120
       120
       +
               </div>

     

       121
       121
       +
               <div 

     

       122
       122
       +
                   id="close-issue" 

     

       123
       123
       +
                   hx-disabled-elt="#close-issue"

     

       124
       124
       +
                   hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/close" 

     

       125
       125
       +
                   hx-trigger="click from:#close-button" 

     

       126
       126
       +
                   hx-target="#issue-action"

     

       127
       127
       +
                   hx-swap="none"

     

       128
       128
       +
               >

     

       129
       129
       +
               </div>

     

       130
       130
       +
               <script>

     

       131
       131
       +
                   document.addEventListener('htmx:configRequest', function(evt) {

     

       132
       132
       +
                       if (evt.target.id === 'close-with-comment') {

     

       133
       133
       +
                           const commentText = document.getElementById('comment-textarea').value.trim();

     

       134
       134
       +
                           if (commentText === '') {

     

       135
       135
       +
                               evt.detail.parameters = {};

     

       136
       136
       +
                               evt.preventDefault();

     

       137
       137
       +
                           }

     

       138
       138
       +
                       }

     

       139
       139
       +
                   });

     

       140
       140
       +
               </script>

     

       141
       141
       +
               {{ else if and (or $isIssueAuthor $isRepoCollaborator) (eq .State "closed") }}

     

       142
       142
       +
               <button 

     

       143
       143
       +
                   type="button" 

     

       144
       144
       +
                   class="btn flex items-center gap-2"

     

       145
       145
       +
                   hx-post="/{{ .RepoInfo.FullName }}/issues/{{ .Issue.IssueId }}/reopen"

     

       146
       146
       +
                   hx-swap="none"

     

       147
       147
       +
               >

     

       148
       148
       +
                   {{ i "refresh-ccw-dot" "w-4 h-4" }}

     

       149
       149
       +
                   reopen

     

       150
       150
       +
               </button>

     

       151
       151
       +
               {{ end }}

     

       152
       152
       +
       

     

       153
       153
       +
               <script>

     

       154
       154
       +
               function updateCommentForm() {

     

       155
       155
       +
                   const textarea = document.getElementById('comment-textarea');

     

       156
       156
       +
                   const commentButton = document.getElementById('comment-button');

     

       157
       157
       +
                   const closeButton = document.getElementById('close-button');

     

       158
       158
       +
       

     

       159
       159
       +
                   if (textarea.value.trim() !== '') {

     

       160
       160
       +
                       commentButton.removeAttribute('disabled');

     

       161
       161
       +
                   } else {

     

       162
       162
       +
                       commentButton.setAttribute('disabled', '');

     

       163
       163
       +
                   }

     

       164
       164
       +
       

     

       165
       165
       +
                   if (closeButton) {

     

       166
       166
       +
                       if (textarea.value.trim() !== '') {

     

       167
       167
       +
                           closeButton.innerHTML = '{{ i "ban" "w-4 h-4" }} close with comment';

     

       168
       168
       +
                       } else {

     

       169
       169
       +
                           closeButton.innerHTML = '{{ i "ban" "w-4 h-4" }} close';

     

       170
       170
       +
                       }

     

       171
       171
       +
                   }

     

       172
       172
       +
               }

     

       173
       173
       +
       

     

       174
       174
       +
               document.addEventListener('DOMContentLoaded', function() {

     

       175
       175
       +
                   updateCommentForm();

     

       176
       176
       +
               });

     

       177
       177
       +
               </script>

     

       178
       178
       +
           </div>

     

       179
       179
       +
         </form> 

     

       109
       180
        
         {{ else }}

     

       110
       110
       -
           <div class="bg-white dark:bg-gray-800 dark:text-gray-400 rounded drop-shadow-sm px-6 py-4 mt-8">

     

       111
       111
       -
             <div class="absolute left-8 -top-8 w-px h-8 bg-gray-300 dark:bg-gray-700" ></div>

     

       181
       181
       +
           <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-4 px-4 relative w-fit">

     

       112
       182
        
             <a href="/login" class="underline">login</a> to join the discussion

     

       113
       183
        
           </div>

     

       114
       184
        
         {{ end }}

+41 -3

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

···

       4
       4
        
           <div class="flex justify-between items-center">

     

       5
       5
        
               <p>

     

       6
       6
        
               filtering

     

       7
       7
       -
               <select class="border px-1 bg-white border-gray-200 dark:bg-gray-800 dark:border-gray-700" onchange="window.location.href = '/{{ .RepoInfo.FullName }}/issues?state=' + this.value">

     

       7
       7
       +
               <select class="border p-1 bg-white border-gray-200 dark:bg-gray-800 dark:border-gray-700" onchange="window.location.href = '/{{ .RepoInfo.FullName }}/issues?state=' + this.value">

     

       8
       8
        
                 <option value="open" {{ if .FilteringByOpen }}selected{{ end }}>open ({{ .RepoInfo.Stats.IssueCount.Open }})</option>

     

       9
       9
        
                 <option value="closed" {{ if not .FilteringByOpen }}selected{{ end }}>closed ({{ .RepoInfo.Stats.IssueCount.Closed }})</option>

     

       10
       10
        
               </select>

     
···

       13
       13
        
               <a

     

       14
       14
        
                   href="/{{ .RepoInfo.FullName }}/issues/new"

     

       15
       15
        
                   class="btn text-sm flex items-center gap-2 no-underline hover:no-underline">

     

       16
       16
       -
                   {{ i "plus" "w-4 h-4" }}

     

       17
       17
       -
                   <span>new issue</span>

     

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

     

       17
       17
       +
                   <span>new</span>

     

       18
       18
        
               </a>

     

       19
       19
        
           </div>

     

       20
       20
        
           <div class="error" id="issues"></div>

     
···

       69
       69
        
           </p>

     

       70
       70
        
         </div>

     

       71
       71
        
         {{ end }}

     

       72
       72
       +
       </div>

     

       73
       73
       +
       

     

       74
       74
       +
       {{ block "pagination" . }} {{ end }}

     

       75
       75
       +
       

     

       76
       76
       +
       {{ end }}

     

       77
       77
       +
       

     

       78
       78
       +
       {{ define "pagination" }}

     

       79
       79
       +
       <div class="flex justify-end mt-4 gap-2">

     

       80
       80
       +
           {{ $currentState := "closed" }}

     

       81
       81
       +
           {{ if .FilteringByOpen }}

     

       82
       82
       +
             {{ $currentState = "open" }}

     

       83
       83
       +
           {{ end }}

     

       84
       84
       +
       

     

       85
       85
       +
           {{ if gt .Page.Offset 0 }}

     

       86
       86
       +
              {{ $prev := .Page.Previous }}

     

       87
       87
       +
               <a

     

       88
       88
       +
                   class="btn flex items-center gap-2 no-underline hover:no-underline dark:text-white dark:hover:bg-gray-700"

     

       89
       89
       +
                   hx-boost="true"

     

       90
       90
       +
                   href = "/{{ $.RepoInfo.FullName }}/issues?state={{ $currentState }}&offset={{ $prev.Offset }}&limit={{ $prev.Limit }}"

     

       91
       91
       +
               >

     

       92
       92
       +
                   {{ i "chevron-left" "w-4 h-4" }}

     

       93
       93
       +
                   previous

     

       94
       94
       +
               </a>

     

       95
       95
       +
           {{ else }}

     

       96
       96
       +
               <div></div>

     

       97
       97
       +
           {{ end }}

     

       98
       98
       +
       

     

       99
       99
       +
           {{ if eq (len .Issues) .Page.Limit }}

     

       100
       100
       +
              {{ $next := .Page.Next }}

     

       101
       101
       +
               <a

     

       102
       102
       +
                   class="btn flex items-center gap-2 no-underline hover:no-underline dark:text-white dark:hover:bg-gray-700"

     

       103
       103
       +
                   hx-boost="true"

     

       104
       104
       +
                   href = "/{{ $.RepoInfo.FullName }}/issues?state={{ $currentState }}&offset={{ $next.Offset }}&limit={{ $next.Limit }}"

     

       105
       105
       +
               >

     

       106
       106
       +
                   next

     

       107
       107
       +
                   {{ i "chevron-right" "w-4 h-4" }}

     

       108
       108
       +
               </a>

     

       109
       109
       +
           {{ end }}

     

       72
       110
        
       </div>

     

       73
       111
        
       {{ end }}

+1 -1

appview/pages/templates/repo/log.html

···

       83
       83
        
                                               <p

     

       84
       84
        
                                                   class="hidden mt-1 text-sm cursor-text pb-2 dark:text-gray-300"

     

       85
       85
        
                                               >

     

       86
       86
       -
                                                   {{ nl2br (unwrapText (index $messageParts 1)) }}

     

       86
       86
       +
                                                   {{ nl2br (index $messageParts 1) }}

     

       87
       87
        
                                               </p>

     

       88
       88
        
                                           {{ end }}

     

       89
       89
        
                                       </div>

+90

appview/pages/templates/repo/pulls/fragments/pullActions.html

···

       1
       1
       +
       {{ define "repo/pulls/fragments/pullActions" }}

     

       2
       2
       +
         {{ $lastIdx := sub (len .Pull.Submissions) 1 }}

     

       3
       3
       +
         {{ $roundNumber := .RoundNumber }}

     

       4
       4
       +
       

     

       5
       5
       +
         {{ $isPushAllowed := .RepoInfo.Roles.IsPushAllowed }}

     

       6
       6
       +
         {{ $isMerged := .Pull.State.IsMerged }}

     

       7
       7
       +
         {{ $isClosed := .Pull.State.IsClosed }}

     

       8
       8
       +
         {{ $isOpen := .Pull.State.IsOpen }}

     

       9
       9
       +
         {{ $isConflicted := and .MergeCheck (or .MergeCheck.Error .MergeCheck.IsConflicted) }}

     

       10
       10
       +
         {{ $isPullAuthor := and .LoggedInUser (eq .LoggedInUser.Did .Pull.OwnerDid) }}

     

       11
       11
       +
         {{ $isLastRound := eq $roundNumber $lastIdx }}

     

       12
       12
       +
         {{ $isSameRepoBranch := .Pull.IsBranchBased }}

     

       13
       13
       +
         {{ $isUpToDate := .ResubmitCheck.No }}

     

       14
       14
       +
         <div class="relative w-fit">

     

       15
       15
       +
           <div id="actions-{{$roundNumber}}" class="flex flex-wrap gap-2">

     

       16
       16
       +
               <button 

     

       17
       17
       +
                 hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ $roundNumber }}/comment"

     

       18
       18
       +
                 hx-target="#actions-{{$roundNumber}}"

     

       19
       19
       +
                 hx-swap="outerHtml"

     

       20
       20
       +
                 class="btn p-2 flex items-center gap-2 no-underline hover:no-underline">

     

       21
       21
       +
                   {{ i "message-square-plus" "w-4 h-4" }}

     

       22
       22
       +
                   <span>comment</span>

     

       23
       23
       +
               </button>

     

       24
       24
       +
               {{ if and $isPushAllowed $isOpen $isLastRound }}

     

       25
       25
       +
                 {{ $disabled := "" }}

     

       26
       26
       +
                 {{ if $isConflicted }}

     

       27
       27
       +
                   {{ $disabled = "disabled" }}

     

       28
       28
       +
                 {{ end }}

     

       29
       29
       +
                 <button 

     

       30
       30
       +
                   hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/merge"

     

       31
       31
       +
                   hx-swap="none"

     

       32
       32
       +
                   hx-confirm="Are you sure you want to merge pull #{{ .Pull.PullId }} into the `{{ .Pull.TargetBranch }}` branch?"

     

       33
       33
       +
                   class="btn p-2 flex items-center gap-2" {{ $disabled }}>

     

       34
       34
       +
                   {{ i "git-merge" "w-4 h-4" }}

     

       35
       35
       +
                     <span>merge</span>

     

       36
       36
       +
                 </button>

     

       37
       37
       +
               {{ end }}

     

       38
       38
       +
       

     

       39
       39
       +
               {{ if and $isPullAuthor $isOpen $isLastRound }}

     

       40
       40
       +
                 {{ $disabled := "" }}

     

       41
       41
       +
                 {{ if $isUpToDate }}

     

       42
       42
       +
                   {{ $disabled = "disabled" }}

     

       43
       43
       +
                 {{ end }}

     

       44
       44
       +
                 <button id="resubmitBtn"

     

       45
       45
       +
                     {{ if not .Pull.IsPatchBased }}

     

       46
       46
       +
                       hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit"

     

       47
       47
       +
                     {{ else }}

     

       48
       48
       +
                       hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit"

     

       49
       49
       +
                       hx-target="#actions-{{$roundNumber}}"

     

       50
       50
       +
                       hx-swap="outerHtml"

     

       51
       51
       +
                     {{ end }}

     

       52
       52
       +
       

     

       53
       53
       +
                     hx-disabled-elt="#resubmitBtn"

     

       54
       54
       +
                     class="btn p-2 flex items-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed" {{ $disabled }}

     

       55
       55
       +
       

     

       56
       56
       +
                     {{ if $disabled }}

     

       57
       57
       +
                     title="Update this branch to resubmit this pull request"

     

       58
       58
       +
                     {{ else }}

     

       59
       59
       +
                     title="Resubmit this pull request"

     

       60
       60
       +
                     {{ end }}

     

       61
       61
       +
                     >

     

       62
       62
       +
                   {{ i "rotate-ccw" "w-4 h-4" }}

     

       63
       63
       +
                     <span>resubmit</span>

     

       64
       64
       +
                 </button>

     

       65
       65
       +
               {{ end }}

     

       66
       66
       +
       

     

       67
       67
       +
               {{ if and (or $isPullAuthor $isPushAllowed) $isOpen $isLastRound }}

     

       68
       68
       +
               <button 

     

       69
       69
       +
                 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/close"

     

       70
       70
       +
                 hx-swap="none"

     

       71
       71
       +
                 class="btn p-2 flex items-center gap-2">

     

       72
       72
       +
                 {{ i "ban" "w-4 h-4" }}

     

       73
       73
       +
                   <span>close</span>

     

       74
       74
       +
               </button>

     

       75
       75
       +
               {{ end }}

     

       76
       76
       +
       

     

       77
       77
       +
               {{ if and (or $isPullAuthor $isPushAllowed) $isClosed $isLastRound }}

     

       78
       78
       +
               <button 

     

       79
       79
       +
                 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/reopen"

     

       80
       80
       +
                 hx-swap="none"

     

       81
       81
       +
                 class="btn p-2 flex items-center gap-2">

     

       82
       82
       +
                 {{ i "refresh-ccw-dot" "w-4 h-4" }}

     

       83
       83
       +
                   <span>reopen</span>

     

       84
       84
       +
               </button>

     

       85
       85
       +
               {{ end }}

     

       86
       86
       +
           </div>

     

       87
       87
       +
         </div>

     

       88
       88
       +
       {{ end }}

     

       89
       89
       +
       

     

       90
       90
       +

+25

appview/pages/templates/repo/pulls/fragments/pullCompareBranches.html

···

       1
       1
       +
       {{ define "repo/pulls/fragments/pullCompareBranches" }}

     

       2
       2
       +
           <div id="patch-upload">

     

       3
       3
       +
               <label for="targetBranch" class="dark:text-white"

     

       4
       4
       +
                   >select a branch</label

     

       5
       5
       +
               >

     

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

     

       7
       7
       +
                   <select

     

       8
       8
       +
                       name="sourceBranch"

     

       9
       9
       +
                       class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"

     

       10
       10
       +
                   >

     

       11
       11
       +
                       <option disabled selected>source branch</option>

     

       12
       12
       +
                       {{ range .Branches }}

     

       13
       13
       +
                           <option value="{{ .Reference.Name }}" class="py-1">

     

       14
       14
       +
                               {{ .Reference.Name }}

     

       15
       15
       +
                           </option>

     

       16
       16
       +
                       {{ end }}

     

       17
       17
       +
                   </select>

     

       18
       18
       +
               </div>

     

       19
       19
       +
           </div>

     

       20
       20
       +
       

     

       21
       21
       +
           <p class="mt-4">

     

       22
       22
       +
               Title and description are optional; if left out, they will be extracted

     

       23
       23
       +
               from the first commit.

     

       24
       24
       +
           </p>

     

       25
       25
       +
       {{ end }}

+46

appview/pages/templates/repo/pulls/fragments/pullCompareForks.html

···

       1
       1
       +
       {{ define "repo/pulls/fragments/pullCompareForks" }}

     

       2
       2
       +
           <div id="patch-upload">

     

       3
       3
       +
               <label for="forkSelect" class="dark:text-white"

     

       4
       4
       +
                   >select a fork to compare</label

     

       5
       5
       +
               >

     

       6
       6
       +
               <div class="flex flex-wrap gap-4 items-center mb-4">

     

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

     

       8
       8
       +
                       <select

     

       9
       9
       +
                           id="forkSelect"

     

       10
       10
       +
                           name="fork"

     

       11
       11
       +
                           required

     

       12
       12
       +
                           class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"

     

       13
       13
       +
                           hx-get="/{{ $.RepoInfo.FullName }}/pulls/new/fork-branches"

     

       14
       14
       +
                           hx-target="#branch-selection"

     

       15
       15
       +
                           hx-vals='{"fork": this.value}'

     

       16
       16
       +
                           hx-swap="innerHTML"

     

       17
       17
       +
                           onchange="document.getElementById('hiddenForkInput').value = this.value;"

     

       18
       18
       +
                       >

     

       19
       19
       +
                           <option disabled selected>select a fork</option>

     

       20
       20
       +
                           {{ range .Forks }}

     

       21
       21
       +
                               <option value="{{ .Name }}" class="py-1">

     

       22
       22
       +
                                   {{ .Name }}

     

       23
       23
       +
                               </option>

     

       24
       24
       +
                           {{ end }}

     

       25
       25
       +
                       </select>

     

       26
       26
       +
       

     

       27
       27
       +
                       <input

     

       28
       28
       +
                           type="hidden"

     

       29
       29
       +
                           id="hiddenForkInput"

     

       30
       30
       +
                           name="fork"

     

       31
       31
       +
                           value=""

     

       32
       32
       +
                       />

     

       33
       33
       +
                   </div>

     

       34
       34
       +
       

     

       35
       35
       +
                   <div id="branch-selection">

     

       36
       36
       +
                       <div class="text-sm text-gray-500 dark:text-gray-400">

     

       37
       37
       +
                           Select a fork first to view available branches

     

       38
       38
       +
                       </div>

     

       39
       39
       +
                   </div>

     

       40
       40
       +
               </div>

     

       41
       41
       +
           </div>

     

       42
       42
       +
           <p class="mt-4">

     

       43
       43
       +
               Title and description are optional; if left out, they will be extracted

     

       44
       44
       +
               from the first commit.

     

       45
       45
       +
           </p>

     

       46
       46
       +
       {{ end }}

+15

appview/pages/templates/repo/pulls/fragments/pullCompareForksBranches.html

···

       1
       1
       +
       {{ define "repo/pulls/fragments/pullCompareForksBranches" }}

     

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

     

       3
       3
       +
               <select

     

       4
       4
       +
                   name="sourceBranch"

     

       5
       5
       +
                   class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"

     

       6
       6
       +
               >

     

       7
       7
       +
                   <option disabled selected>source branch</option>

     

       8
       8
       +
                   {{ range .SourceBranches }}

     

       9
       9
       +
                       <option value="{{ .Reference.Name }}" class="py-1">

     

       10
       10
       +
                           {{ .Reference.Name }}

     

       11
       11
       +
                       </option>

     

       12
       12
       +
                   {{ end }}

     

       13
       13
       +
               </select>

     

       14
       14
       +
           </div>

     

       15
       15
       +
       {{ end }}

+70

appview/pages/templates/repo/pulls/fragments/pullHeader.html

···

       1
       1
       +
       {{ define "repo/pulls/fragments/pullHeader" }}

     

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

     

       3
       3
       +
           <h1 class="text-2xl dark:text-white">

     

       4
       4
       +
               {{ .Pull.Title }}

     

       5
       5
       +
               <span class="text-gray-500 dark:text-gray-400">#{{ .Pull.PullId }}</span>

     

       6
       6
       +
           </h1>

     

       7
       7
       +
       </header>

     

       8
       8
       +
       

     

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

     

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

     

       11
       11
       +
       

     

       12
       12
       +
       {{ if .Pull.State.IsOpen }}

     

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

     

       14
       14
       +
           {{ $icon = "git-pull-request" }}

     

       15
       15
       +
       {{ else if .Pull.State.IsMerged }}

     

       16
       16
       +
           {{ $bgColor = "bg-purple-600 dark:bg-purple-700" }}

     

       17
       17
       +
           {{ $icon = "git-merge" }}

     

       18
       18
       +
       {{ end }}

     

       19
       19
       +
       

     

       20
       20
       +
       <section class="mt-2">

     

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

     

       22
       22
       +
               <div

     

       23
       23
       +
                   id="state"

     

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

     

       25
       25
       +
               >

     

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

     

       27
       27
       +
                   <span class="text-white">{{ .Pull.State.String }}</span>

     

       28
       28
       +
               </div>

     

       29
       29
       +
               <span class="text-gray-500 dark:text-gray-400 text-sm">

     

       30
       30
       +
                   opened by

     

       31
       31
       +
                   {{ $owner := index $.DidHandleMap .Pull.OwnerDid }}

     

       32
       32
       +
                   <a href="/{{ $owner }}" class="no-underline hover:underline"

     

       33
       33
       +
                       >{{ $owner }}</a

     

       34
       34
       +
                   >

     

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

     

       36
       36
       +
                   <time>{{ .Pull.Created | timeFmt }}</time>

     

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

     

       38
       38
       +
                   <span>

     

       39
       39
       +
                     targeting

     

       40
       40
       +
                     <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">

     

       41
       41
       +
                       <a href="/{{ .RepoInfo.FullName }}/tree/{{ .Pull.TargetBranch }}" class="no-underline hover:underline">{{ .Pull.TargetBranch }}</a>

     

       42
       42
       +
                     </span>

     

       43
       43
       +
                   </span>

     

       44
       44
       +
                   {{ if not .Pull.IsPatchBased }}

     

       45
       45
       +
                   <span>from

     

       46
       46
       +
                     {{ if .Pull.IsForkBased }}

     

       47
       47
       +
                       {{ if .Pull.PullSource.Repo }}

     

       48
       48
       +
                       <a href="/{{ $owner }}/{{ .Pull.PullSource.Repo.Name }}" class="no-underline hover:underline">{{ $owner }}/{{ .Pull.PullSource.Repo.Name }}</a>

     

       49
       49
       +
                       {{ else }}

     

       50
       50
       +
                       <span class="italic">[deleted fork]</span>

     

       51
       51
       +
                       {{ end }}

     

       52
       52
       +
                     {{ end }}

     

       53
       53
       +
       

     

       54
       54
       +
                     <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">

     

       55
       55
       +
                       {{ .Pull.PullSource.Branch }}

     

       56
       56
       +
                     </span>

     

       57
       57
       +
                   </span>

     

       58
       58
       +
                   {{ end }}

     

       59
       59
       +
               </span>

     

       60
       60
       +
           </div>

     

       61
       61
       +
       

     

       62
       62
       +
           {{ if .Pull.Body }}

     

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

     

       64
       64
       +
                   {{ .Pull.Body | markdown }}

     

       65
       65
       +
               </article>

     

       66
       66
       +
           {{ end }}

     

       67
       67
       +
       </section>

     

       68
       68
       +
       

     

       69
       69
       +
       

     

       70
       70
       +
       {{ end }}

+32

appview/pages/templates/repo/pulls/fragments/pullNewComment.html

···

       1
       1
       +
       {{ define "repo/pulls/fragments/pullNewComment" }}

     

       2
       2
       +
       <div 

     

       3
       3
       +
         id="pull-comment-card-{{ .RoundNumber }}" 

     

       4
       4
       +
         class="bg-white dark:bg-gray-800 rounded drop-shadow-sm p-4 relative w-full flex flex-col gap-2">

     

       5
       5
       +
         <div class="text-sm text-gray-500 dark:text-gray-400">

     

       6
       6
       +
           {{ didOrHandle .LoggedInUser.Did .LoggedInUser.Handle }}

     

       7
       7
       +
         </div>

     

       8
       8
       +
         <form

     

       9
       9
       +
           hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/comment"

     

       10
       10
       +
           hx-swap="none"

     

       11
       11
       +
           class="w-full flex flex-wrap gap-2">

     

       12
       12
       +
           <textarea

     

       13
       13
       +
               name="body"

     

       14
       14
       +
               class="w-full p-2 rounded border border-gray-200"

     

       15
       15
       +
               placeholder="Add to the discussion..."></textarea>

     

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

     

       17
       17
       +
             {{ i "message-square" "w-4 h-4" }} comment

     

       18
       18
       +
           </button>

     

       19
       19
       +
           <button 

     

       20
       20
       +
             type="button" 

     

       21
       21
       +
             class="btn flex items-center gap-2" 

     

       22
       22
       +
             hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/actions"

     

       23
       23
       +
             hx-swap="outerHTML"

     

       24
       24
       +
             hx-target="#pull-comment-card-{{ .RoundNumber }}">

     

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

     

       26
       26
       +
             <span>cancel</span>

     

       27
       27
       +
           </button>

     

       28
       28
       +
           <div id="pull-comment"></div>

     

       29
       29
       +
         </form>

     

       30
       30
       +
       </div>

     

       31
       31
       +
       {{ end }}

     

       32
       32
       +

+21

appview/pages/templates/repo/pulls/fragments/pullPatchUpload.html

···

       1
       1
       +
       {{ define "repo/pulls/fragments/pullPatchUpload" }}

     

       2
       2
       +
           <div id="patch-upload">

     

       3
       3
       +
               <p>

     

       4
       4
       +
                   You can paste a <code>git diff</code> or a

     

       5
       5
       +
                   <code>git format-patch</code> patch series here.

     

       6
       6
       +
               </p>

     

       7
       7
       +
               <textarea

     

       8
       8
       +
                   hx-trigger="keyup changed delay:500ms, paste delay:500ms"

     

       9
       9
       +
                   hx-post="/{{ .RepoInfo.FullName }}/pulls/new/validate-patch"

     

       10
       10
       +
                   hx-swap="none"

     

       11
       11
       +
                   name="patch"

     

       12
       12
       +
                   id="patch"

     

       13
       13
       +
                   rows="12"

     

       14
       14
       +
                   class="w-full mt-2 resize-y font-mono dark:bg-gray-700 dark:text-white dark:border-gray-600"

     

       15
       15
       +
                   placeholder="diff --git a/file.txt b/file.txt

     

       16
       16
       +
       index 1234567..abcdefg 100644

     

       17
       17
       +
       --- a/file.txt

     

       18
       18
       +
       +++ b/file.txt"

     

       19
       19
       +
               ></textarea>

     

       20
       20
       +
           </div>

     

       21
       21
       +
       {{ end }}

+52

appview/pages/templates/repo/pulls/fragments/pullResubmit.html

···

       1
       1
       +
       {{ define "repo/pulls/fragments/pullResubmit" }}

     

       2
       2
       +
         <div

     

       3
       3
       +
             id="resubmit-pull-card"

     

       4
       4
       +
             class="rounded relative border bg-amber-50 dark:bg-amber-900 border-amber-200 dark:border-amber-500 px-6 py-2">

     

       5
       5
       +
       

     

       6
       6
       +
             <div class="flex items-center gap-2 text-amber-500 dark:text-amber-50">

     

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

     

       8
       8
       +
               <span class="font-medium">resubmit your patch</span>

     

       9
       9
       +
             </div>

     

       10
       10
       +
       

     

       11
       11
       +
             <div class="mt-2 text-sm text-gray-700 dark:text-gray-200">

     

       12
       12
       +
               You can update this patch to address any reviews. 

     

       13
       13
       +
               This will begin a new round of reviews,

     

       14
       14
       +
               but you'll still be able to view your previous submissions and feedback.

     

       15
       15
       +
             </div>

     

       16
       16
       +
       

     

       17
       17
       +
             <div class="mt-4 flex flex-col">

     

       18
       18
       +
               <form 

     

       19
       19
       +
                 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/resubmit" 

     

       20
       20
       +
                 hx-swap="none"

     

       21
       21
       +
                 class="w-full flex flex-wrap gap-2">

     

       22
       22
       +
                 <textarea

     

       23
       23
       +
                   name="patch"

     

       24
       24
       +
                   class="w-full p-2 mb-2"

     

       25
       25
       +
                   placeholder="Paste your updated patch here."

     

       26
       26
       +
                   rows="15"

     

       27
       27
       +
                   >{{.Pull.LatestPatch}}</textarea>

     

       28
       28
       +
                 <button

     

       29
       29
       +
                     type="submit"

     

       30
       30
       +
                     class="btn flex items-center gap-2"

     

       31
       31
       +
                     {{ if or .Pull.State.IsClosed }}

     

       32
       32
       +
                     disabled

     

       33
       33
       +
                     {{ end }}>

     

       34
       34
       +
                   {{ i "rotate-ccw" "w-4 h-4" }}

     

       35
       35
       +
                   <span>resubmit</span>

     

       36
       36
       +
                 </button>

     

       37
       37
       +
                 <button 

     

       38
       38
       +
                   type="button" 

     

       39
       39
       +
                   class="btn flex items-center gap-2" 

     

       40
       40
       +
                   hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .Pull.LastRoundNumber }}/actions"

     

       41
       41
       +
                   hx-swap="outerHTML"

     

       42
       42
       +
                   hx-target="#resubmit-pull-card">

     

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

     

       44
       44
       +
                   <span>cancel</span>

     

       45
       45
       +
                 </button>

     

       46
       46
       +
               </form>

     

       47
       47
       +
       

     

       48
       48
       +
               <div id="resubmit-error" class="error"></div>

     

       49
       49
       +
               <div id="resubmit-success" class="success"></div>

     

       50
       50
       +
             </div>

     

       51
       51
       +
         </div>

     

       52
       52
       +
       {{ end }}

+25

appview/pages/templates/repo/pulls/interdiff.html

···

       1
       1
       +
       {{ define "title" }}

     

       2
       2
       +
          interdiff of round #{{ .Round }} and #{{ sub .Round 1 }}; pull #{{ .Pull.PullId }} &middot; {{ .RepoInfo.FullName }}

     

       3
       3
       +
       {{ end }}

     

       4
       4
       +
       

     

       5
       5
       +
       {{ define "content" }}

     

       6
       6
       +
         <section class="rounded drop-shadow-sm bg-white dark:bg-gray-800 py-4 px-6 dark:text-white">

     

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

     

       8
       8
       +
             <div class="flex gap-3 items-center mb-3">

     

       9
       9
       +
               <a href="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/" class="flex items-center gap-2 font-medium">

     

       10
       10
       +
                 {{ i "arrow-left" "w-5 h-5" }}

     

       11
       11
       +
                 back

     

       12
       12
       +
               </a>

     

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

     

       14
       14
       +
               interdiff of round #{{ .Round }} and #{{ sub .Round 1 }}

     

       15
       15
       +
             </div>

     

       16
       16
       +
             <div class="border-t border-gray-200 dark:border-gray-700 my-2"></div>

     

       17
       17
       +
             {{ template "repo/pulls/fragments/pullHeader" . }}

     

       18
       18
       +
           </header>

     

       19
       19
       +
         </section>

     

       20
       20
       +
       

     

       21
       21
       +
         <section>

     

       22
       22
       +
           {{ template "repo/fragments/interdiff" (list .RepoInfo.FullName .Interdiff) }}

     

       23
       23
       +
         </section>

     

       24
       24
       +
       {{ end }}

     

       25
       25
       +

+90 -93

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

···

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

     

       2
       2
        
       

     

       3
       3
        
       {{ define "repoContent" }}

     

       4
       4
       -
           <section class="prose dark:prose-invert">

     

       5
       5
       -
           <p>

     

       6
       6
       -
               This is v1 of the pull request flow. Paste your patch in the form below.

     

       7
       7
       -
               Here are the steps to get you started:

     

       8
       8
       -
               <ul class="list-decimal pl-10 space-y-2 text-gray-700 dark:text-gray-300">

     

       9
       9
       -
                   <li class="leading-relaxed">Clone this repository.</li>

     

       10
       10
       -
                   <li class="leading-relaxed">Make your changes in your local repository.</li>

     

       11
       11
       -
                   <li class="leading-relaxed">Grab the diff using <code>git diff</code>.</li>

     

       12
       12
       -
                   <li class="leading-relaxed">Paste the diff output in the form below.</li>

     

       13
       13
       -
               </ul>

     

       14
       14
       -
           </p>

     

       15
       15
       -
           </section>

     

       16
       4
        
           <form

     

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

     

       18
       6
        
               class="mt-6 space-y-6"

     

       19
       7
        
               hx-swap="none"

     

       20
       8
        
           >

     

       21
       9
        
               <div class="flex flex-col gap-4">

     

       22
       22
       -
                 <div>

     

       23
       23
       -
                   <label for="title" class="dark:text-white">write a title</label>

     

       24
       24
       -
                   <input type="text" name="title" id="title" class="w-full dark:bg-gray-700 dark:text-white dark:border-gray-600" />

     

       25
       25
       -
                 </div>

     

       10
       10
       +
                   <label>configure your pull request</label>

     

       26
       11
        
       

     

       27
       27
       -
                 <div>

     

       28
       28
       -
                   <label for="body" class="dark:text-white">add a description</label>

     

       29
       29
       -
                   <textarea

     

       30
       30
       -
                       name="body"

     

       31
       31
       -
                       id="body"

     

       32
       32
       -
                       rows="6"

     

       33
       33
       -
                       class="w-full resize-y dark:bg-gray-700 dark:text-white dark:border-gray-600"

     

       34
       34
       -
                       placeholder="Describe your change. Markdown is supported."

     

       35
       35
       -
                       ></textarea>

     

       36
       36
       -
                 </div>

     

       12
       12
       +
                   <p>First, choose a target branch on {{ .RepoInfo.FullName }}.</p>

     

       13
       13
       +
                   <div class="pb-2">

     

       14
       14
       +
                       <select

     

       15
       15
       +
                           required

     

       16
       16
       +
                           name="targetBranch"

     

       17
       17
       +
                           class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"

     

       18
       18
       +
                       >

     

       19
       19
       +
                           <option disabled selected>target branch</option>

     

       20
       20
       +
                           {{ range .Branches }}

     

       21
       21
       +
                               <option value="{{ .Reference.Name }}" class="py-1">

     

       22
       22
       +
                                   {{ .Reference.Name }}

     

       23
       23
       +
                               </option>

     

       24
       24
       +
                           {{ end }}

     

       25
       25
       +
                       </select>

     

       26
       26
       +
                   </div>

     

       37
       27
        
       

     

       28
       28
       +
                   <p>Next, choose a pull strategy.</p>

     

       29
       29
       +
                   <nav class="flex space-x-4 items-end">

     

       30
       30
       +
                       <button

     

       31
       31
       +
                           type="button"

     

       32
       32
       +
                           class="px-3 py-2 pb-2 btn"

     

       33
       33
       +
                           hx-get="/{{ .RepoInfo.FullName }}/pulls/new/patch-upload"

     

       34
       34
       +
                           hx-target="#patch-strategy"

     

       35
       35
       +
                           hx-swap="innerHTML"

     

       36
       36
       +
                       >

     

       37
       37
       +
                           paste patch

     

       38
       38
       +
                       </button>

     

       38
       39
        
       

     

       39
       39
       -
               <label>configure your pull request</label>

     

       40
       40
       +
                       {{ if .RepoInfo.Roles.IsPushAllowed }}

     

       41
       41
       +
                           <span class="text-sm text-gray-500 dark:text-gray-400 pb-2">

     

       42
       42
       +
                               or

     

       43
       43
       +
                           </span>

     

       44
       44
       +
                           <button

     

       45
       45
       +
                               type="button"

     

       46
       46
       +
                               class="px-3 py-2 pb-2 btn"

     

       47
       47
       +
                               hx-get="/{{ .RepoInfo.FullName }}/pulls/new/compare-branches"

     

       48
       48
       +
                               hx-target="#patch-strategy"

     

       49
       49
       +
                               hx-swap="innerHTML"

     

       50
       50
       +
                           >

     

       51
       51
       +
                               compare branches

     

       52
       52
       +
                           </button>

     

       53
       53
       +
                       {{ end }}

     

       40
       54
        
       

     

       41
       41
       -
               <p>First, choose a target branch on {{ .RepoInfo.FullName }}.</p>

     

       42
       42
       -
               <div class="pb-2">

     

       43
       43
       -
                   <select

     

       44
       44
       -
                       required

     

       45
       45
       -
                       name="targetBranch"

     

       46
       46
       -
                       class="p-1 border border-gray-200 bg-white dark:bg-gray-700 dark:text-white dark:border-gray-600"

     

       47
       47
       -
                   >

     

       48
       48
       -
                       <option disabled selected>target branch</option>

     

       49
       49
       -
                       {{ range .Branches }}

     

       50
       50
       -
                       <option value="{{ .Reference.Name }}" class="py-1">

     

       51
       51
       -
                           {{ .Reference.Name }}

     

       52
       52
       -
                       </option>

     

       53
       53
       -
                       {{ end }}

     

       54
       54
       -
                   </select>

     

       55
       55
       -
               </div>

     

       55
       55
       +
       

     

       56
       56
       +
                       <span class="text-sm text-gray-500 dark:text-gray-400 pb-2">

     

       57
       57
       +
                           or

     

       58
       58
       +
                       </span>

     

       59
       59
       +
                       <button

     

       60
       60
       +
                           type="button"

     

       61
       61
       +
                           class="px-3 py-2 pb-2 btn"

     

       62
       62
       +
                           hx-get="/{{ .RepoInfo.FullName }}/pulls/new/compare-forks"

     

       63
       63
       +
                           hx-target="#patch-strategy"

     

       64
       64
       +
                           hx-swap="innerHTML"

     

       65
       65
       +
                       >

     

       66
       66
       +
                           compare forks

     

       67
       67
       +
                       </button>

     

       68
       68
       +
                   </nav>

     

       69
       69
       +
       

     

       70
       70
       +
                   <section id="patch-strategy">

     

       71
       71
       +
                       {{ template "repo/pulls/fragments/pullPatchUpload" . }}

     

       72
       72
       +
                   </section>

     

       73
       73
       +
       

     

       74
       74
       +
                   <p id="patch-preview"></p>

     

       56
       75
        
       

     

       57
       57
       -
               <p>Then, choose a pull strategy.</p>

     

       58
       58
       -
               <nav class="flex space-x-4 items-end">

     

       59
       59
       -
                   <button

     

       60
       60
       -
                       type="button"

     

       61
       61
       -
                       class="px-3 py-2 pb-2 btn"

     

       62
       62
       -
                       hx-get="/{{ .RepoInfo.FullName }}/pulls/new/patch-upload"

     

       63
       63
       -
                       hx-target="#patch-strategy"

     

       64
       64
       -
                       hx-swap="innerHTML"

     

       65
       65
       -
                   >

     

       66
       66
       -
                       paste patch

     

       67
       67
       -
                   </button>

     

       76
       76
       +
                   <div id="patch-error" class="error dark:text-red-300"></div>

     

       68
       77
        
       

     

       69
       69
       -
               {{ if .RepoInfo.Roles.IsPushAllowed }}

     

       70
       70
       -
               <span class="text-sm text-gray-500 dark:text-gray-400 pb-2">

     

       71
       71
       -
                   or

     

       72
       72
       -
               </span>

     

       73
       73
       -
                   <button

     

       74
       74
       -
                       type="button"

     

       75
       75
       -
                       class="px-3 py-2 pb-2 btn"

     

       76
       76
       -
                       hx-get="/{{ .RepoInfo.FullName }}/pulls/new/compare-branches"

     

       77
       77
       -
                       hx-target="#patch-strategy"

     

       78
       78
       -
                       hx-swap="innerHTML"

     

       79
       79
       -
                   >

     

       80
       80
       -
                       compare branches

     

       81
       81
       -
                   </button>

     

       82
       82
       -
               {{ end }}

     

       78
       78
       +
                   <div>

     

       79
       79
       +
                       <label for="title" class="dark:text-white">write a title</label>

     

       83
       80
        
       

     

       84
       84
       -
               <span class="text-sm text-gray-500 dark:text-gray-400 pb-2">

     

       85
       85
       -
                   or

     

       86
       86
       -
               </span>

     

       87
       87
       -
               <button

     

       88
       88
       -
                   type="button"

     

       89
       89
       -
                   class="px-3 py-2 pb-2 btn"

     

       90
       90
       -
                   hx-get="/{{ .RepoInfo.FullName }}/pulls/new/compare-forks"

     

       91
       91
       -
                   hx-target="#patch-strategy"

     

       92
       92
       -
                   hx-swap="innerHTML"

     

       93
       93
       -
               >

     

       94
       94
       -
                   compare forks

     

       95
       95
       -
               </button>

     

       96
       96
       -
               </nav>

     

       81
       81
       +
                       <input

     

       82
       82
       +
                           type="text"

     

       83
       83
       +
                           name="title"

     

       84
       84
       +
                           id="title"

     

       85
       85
       +
                           class="w-full dark:bg-gray-700 dark:text-white dark:border-gray-600"

     

       86
       86
       +
                           placeholder="One-line summary of your change."

     

       87
       87
       +
                       />

     

       88
       88
       +
                   </div>

     

       97
       89
        
       

     

       98
       98
       -
              <section id="patch-strategy">

     

       99
       99
       -
                   {{ template "fragments/pullPatchUpload" . }}

     

       100
       100
       -
               </section>

     

       90
       90
       +
                   <div>

     

       91
       91
       +
                       <label for="body" class="dark:text-white"

     

       92
       92
       +
                           >add a description</label

     

       93
       93
       +
                       >

     

       101
       94
        
       

     

       102
       102
       -
               <div class="flex justify-start items-center gap-2 mt-4">

     

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

     

       104
       104
       -
                       {{ i "git-pull-request-create" "w-4 h-4" }}

     

       105
       105
       -
                       create pull

     

       106
       106
       -
                   </button>

     

       107
       107
       -
               </div>

     

       95
       95
       +
                       <textarea

     

       96
       96
       +
                           name="body"

     

       97
       97
       +
                           id="body"

     

       98
       98
       +
                           rows="6"

     

       99
       99
       +
                           class="w-full resize-y dark:bg-gray-700 dark:text-white dark:border-gray-600"

     

       100
       100
       +
                           placeholder="Describe your change. Markdown is supported."

     

       101
       101
       +
                       ></textarea>

     

       102
       102
       +
                   </div>

     

       108
       103
        
       

     

       104
       104
       +
                   <div class="flex justify-start items-center gap-2 mt-4">

     

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

     

       106
       106
       +
                           {{ i "git-pull-request-create" "w-4 h-4" }}

     

       107
       107
       +
                           create pull

     

       108
       108
       +
                       </button>

     

       109
       109
       +
                   </div>

     

       109
       110
        
               </div>

     

       110
       111
        
               <div id="pull" class="error dark:text-red-300"></div>

     

       111
       112
        
           </form>

     

       112
       113
        
       {{ end }}

     

       113
       113
       -
       

     

       114
       114
       -
       {{ define "repoAfter" }}

     

       115
       115
       -
       <div id="patch-preview" class="error dark:text-red-300"></div>

     

       116
       116
       -
       {{ end }}

+21 -84

appview/pages/templates/repo/pulls/patch.html

···

       3
       3
        
       {{ end }}

     

       4
       4
        
       

     

       5
       5
        
       {{ define "content" }}

     

       6
       6
       -
         {{ $stat := .Diff.Stat }}

     

       7
       7
       -
           <div class="rounded drop-shadow-sm bg-white dark:bg-gray-800 py-4 px-6 dark:text-white">

     

       8
       8
       -
             <header class="pb-2">

     

       9
       9
       -
                 <div class="flex gap-3 items-center mb-3">

     

       10
       10
       -
                     <a href="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/" class="flex items-center gap-2 font-medium">

     

       11
       11
       -
                       {{ i "arrow-left" "w-5 h-5" }}

     

       12
       12
       -
                       back

     

       13
       13
       -
                     </a>

     

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

     

       15
       15
       -
                     round #{{ .Round }}

     

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

     

       17
       17
       -
                     <a href="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .Round }}.patch">

     

       18
       18
       -
                         view raw

     

       19
       19
       -
                     </a>

     

       20
       20
       -
                 </div>

     

       21
       21
       -
                 <div class="border-t border-gray-200 dark:border-gray-700 my-2"></div>

     

       22
       22
       -
                 <h1 class="text-2xl mt-3">

     

       23
       23
       -
                     {{ .Pull.Title }}

     

       24
       24
       -
                     <span class="text-gray-500 dark:text-gray-400">#{{ .Pull.PullId }}</span>

     

       25
       25
       -
                 </h1>

     

       26
       26
       -
             </header>

     

       27
       27
       -
       

     

       28
       28
       -
             {{ $bgColor := "bg-gray-800" }}

     

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

     

       30
       30
       -
       

     

       31
       31
       -
             {{ if .Pull.State.IsOpen }}

     

       32
       32
       -
                 {{ $bgColor = "bg-green-600" }}

     

       33
       33
       -
                 {{ $icon = "git-pull-request" }}

     

       34
       34
       -
             {{ else if .Pull.State.IsMerged }}

     

       35
       35
       -
                 {{ $bgColor = "bg-purple-600" }}

     

       36
       36
       -
                 {{ $icon = "git-merge" }}

     

       37
       37
       -
             {{ end }}

     

       38
       38
       -
       

     

       39
       39
       -
             <section>

     

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

     

       41
       41
       -
                     <div

     

       42
       42
       -
                         id="state"

     

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

     

       44
       44
       -
                     >

     

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

     

       46
       46
       -
                         <span class="text-white">{{ .Pull.State.String }}</span>

     

       47
       47
       -
                     </div>

     

       48
       48
       -
                     <span class="text-gray-500 dark:text-gray-400 text-sm">

     

       49
       49
       -
                         opened by

     

       50
       50
       -
                         {{ $owner := index $.DidHandleMap .Pull.OwnerDid }}

     

       51
       51
       -
                         <a href="/{{ $owner }}" class="no-underline hover:underline"

     

       52
       52
       -
                             >{{ $owner }}</a

     

       53
       53
       -
                         >

     

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

     

       55
       55
       -
                         <time>{{ .Pull.Created | timeFmt }}</time>

     

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

     

       57
       57
       -
                         <span>targeting branch 

     

       58
       58
       -
                           <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">

     

       59
       59
       -
                             {{ .Pull.TargetBranch }}

     

       60
       60
       -
                           </span>

     

       61
       61
       -
                         </span>

     

       62
       62
       -
                     </span>

     

       63
       63
       -
                 </div>

     

       64
       64
       -
       

     

       65
       65
       -
                 {{ if .Pull.Body }}

     

       66
       66
       -
                     <article id="body" class="mt-2 prose dark:prose-invert">

     

       67
       67
       -
                         {{ .Pull.Body | markdown }}

     

       68
       68
       -
                     </article>

     

       69
       69
       -
                 {{ end }}

     

       70
       70
       -
             </section>

     

       71
       71
       -
       

     

       72
       72
       -
             <div id="diff-stat">

     

       73
       73
       -
               <br>

     

       74
       74
       -
               <strong class="text-sm uppercase mb-4">Changed files</strong>

     

       75
       75
       -
               {{ range .Diff.Diff }}

     

       76
       76
       -
               <ul>

     

       77
       77
       -
                 {{ if .IsDelete }}

     

       78
       78
       -
                 <li><a href="#file-{{ .Name.Old }}">{{ .Name.Old }}</a></li>

     

       79
       79
       -
                 {{ else }}

     

       80
       80
       -
                 <li><a href="#file-{{ .Name.New }}">{{ .Name.New }}</a></li>

     

       81
       81
       -
                 {{ end }}

     

       82
       82
       -
               </ul>

     

       83
       83
       -
               {{ end }}

     

       84
       84
       -
             </div>

     

       85
       85
       -
         </div>

     

       86
       86
       -
       

     

       87
       87
       -
         <section>

     

       88
       88
       -
           {{ template "fragments/diff" (list .RepoInfo.FullName .Diff) }}

     

       89
       89
       -
         </section>

     

       6
       6
       +
       <section>

     

       7
       7
       +
           <section

     

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

     

       9
       9
       +
           >

     

       10
       10
       +
               <div class="flex gap-3 items-center mb-3">

     

       11
       11
       +
                   <a href="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/" class="flex items-center gap-2 font-medium">

     

       12
       12
       +
                     {{ i "arrow-left" "w-5 h-5" }}

     

       13
       13
       +
                     back

     

       14
       14
       +
                   </a>

     

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

     

       16
       16
       +
                   round<span class="flex items-center">{{ i "hash" "w-4 h-4" }}{{ .Round }}</span>

     

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

     

       18
       18
       +
                   <a href="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .Round }}.patch">

     

       19
       19
       +
                       view raw

     

       20
       20
       +
                   </a>

     

       21
       21
       +
               </div>

     

       22
       22
       +
               <div class="border-t border-gray-200 dark:border-gray-700 my-2"></div>

     

       23
       23
       +
           {{ template "repo/pulls/fragments/pullHeader" . }}

     

       24
       24
       +
           </section>

     

       25
       25
       +
         {{ template "repo/fragments/diff" (list .RepoInfo.FullName .Diff) }}

     

       26
       26
       +
       </section>

     

       90
       27
        
       {{ end }}

+83 -84

appview/pages/templates/repo/pulls/pull.html

···

       3
       3
        
       {{ end }}

     

       4
       4
        
       

     

       5
       5
        
       {{ define "repoContent" }}

     

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

     

       7
       7
       -
               <h1 class="text-2xl dark:text-white">

     

       8
       8
       -
                   {{ .Pull.Title }}

     

       9
       9
       -
                   <span class="text-gray-500 dark:text-gray-400">#{{ .Pull.PullId }}</span>

     

       10
       10
       -
               </h1>

     

       11
       11
       -
           </header>

     

       12
       12
       -
       

     

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

     

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

     

       15
       15
       -
       

     

       16
       16
       -
           {{ if .Pull.State.IsOpen }}

     

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

     

       18
       18
       -
               {{ $icon = "git-pull-request" }}

     

       19
       19
       -
           {{ else if .Pull.State.IsMerged }}

     

       20
       20
       -
               {{ $bgColor = "bg-purple-600 dark:bg-purple-700" }}

     

       21
       21
       -
               {{ $icon = "git-merge" }}

     

       22
       22
       -
           {{ end }}

     

       23
       23
       -
       

     

       24
       24
       -
           <section>

     

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

     

       26
       26
       -
                   <div

     

       27
       27
       -
                       id="state"

     

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

     

       29
       29
       -
                   >

     

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

     

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

     

       32
       32
       -
                   </div>

     

       33
       33
       -
                   <span class="text-gray-500 dark:text-gray-400 text-sm">

     

       34
       34
       -
                       opened by

     

       35
       35
       -
                       {{ $owner := index $.DidHandleMap .Pull.OwnerDid }}

     

       36
       36
       -
                       <a href="/{{ $owner }}" class="no-underline hover:underline"

     

       37
       37
       -
                           >{{ $owner }}</a

     

       38
       38
       -
                       >

     

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

     

       40
       40
       -
                       <time>{{ .Pull.Created | timeFmt }}</time>

     

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

     

       42
       42
       -
                       <span>

     

       43
       43
       -
                         targeting

     

       44
       44
       -
                         <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">

     

       45
       45
       -
                           <a href="/{{ .RepoInfo.FullName }}/tree/{{ .Pull.TargetBranch }}" class="no-underline hover:underline">{{ .Pull.TargetBranch }}</a>

     

       46
       46
       -
                         </span>

     

       47
       47
       -
                       </span>

     

       48
       48
       -
                       {{ if not .Pull.IsPatch }}

     

       49
       49
       -
                       <span>from

     

       50
       50
       -
                         {{ if not .Pull.IsSameRepoBranch }}

     

       51
       51
       -
                           <a href="/{{ $owner }}/{{ .PullSourceRepo.Name }}" class="no-underline hover:underline">{{ $owner }}/{{ .PullSourceRepo.Name }}</a>

     

       52
       52
       -
                         {{ end }}

     

       53
       53
       -
       

     

       54
       54
       -
                         {{ $fullRepo := .RepoInfo.FullName }}

     

       55
       55
       -
                         {{ if not .Pull.IsSameRepoBranch }}

     

       56
       56
       -
                           {{ $fullRepo = printf "%s/%s" $owner .PullSourceRepo.Name }}

     

       57
       57
       -
                         {{ end }}

     

       58
       58
       -
                         <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">

     

       59
       59
       -
                           <a href="/{{ $fullRepo }}/tree/{{ .Pull.PullSource.Branch }}" class="no-underline hover:underline">{{ .Pull.PullSource.Branch }}</a>

     

       60
       60
       -
                         </span>

     

       61
       61
       -
                       </span>

     

       62
       62
       -
                       {{ end }}

     

       63
       63
       -
                   </span>

     

       64
       64
       -
               </div>

     

       65
       65
       -
       

     

       66
       66
       -
               {{ if .Pull.Body }}

     

       67
       67
       -
                   <article id="body" class="mt-2 prose dark:prose-invert">

     

       68
       68
       -
                       {{ .Pull.Body | markdown }}

     

       69
       69
       -
                   </article>

     

       70
       70
       -
               {{ end }}

     

       71
       71
       -
           </section>

     

       72
       72
       -
       

     

       6
       6
       +
           {{ template "repo/pulls/fragments/pullHeader" . }}

     

       73
       7
        
       {{ end }}

     

       74
       8
        
       

     

       75
       9
        
       {{ define "repoAfter" }}

     
···

       88
       22
        
         {{ $targetBranch := .Pull.TargetBranch }}

     

       89
       23
        
         {{ $repoName := .RepoInfo.FullName }}

     

       90
       24
        
         {{ range $idx, $item := .Pull.Submissions }}

     

       91
       91
       -
           {{ $diff := $item.AsNiceDiff $targetBranch }}

     

       92
       25
        
           {{ with $item }}

     

       93
       26
        
           <details {{ if eq $idx $lastIdx }}open{{ end }}>

     

       94
       27
        
               <summary id="round-#{{ .RoundNumber }}" class="list-none cursor-pointer">

     

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

     

       96
       29
        
                   <!-- round number -->

     

       97
       30
        
                   <div class="rounded bg-white dark:bg-gray-800 drop-shadow-sm px-3 py-2 dark:text-white">

     

       98
       98
       -
                     #{{ .RoundNumber }}

     

       31
       31
       +
                     <span class="flex items-center">{{ i "hash" "w-4 h-4" }}{{ .RoundNumber }}</span>

     

       99
       32
        
                   </div>

     

       100
       33
        
                   <!-- round summary -->

     

       101
       34
        
                   <div class="rounded drop-shadow-sm bg-white dark:bg-gray-800 p-2 text-gray-500 dark:text-gray-400">

     
···

       117
       50
        
                       {{ len .Comments }} comment{{$s}}

     

       118
       51
        
                     </span>

     

       119
       52
        
                   </div>

     

       120
       120
       -
                   <!-- view patch -->

     

       53
       53
       +
       

     

       121
       54
        
                   <a class="btn flex items-center gap-2 no-underline hover:no-underline p-2"

     

       122
       55
        
                      hx-boost="true"

     

       123
       56
        
                      href="/{{ $.RepoInfo.FullName }}/pulls/{{ $.Pull.PullId }}/round/{{.RoundNumber}}">

     

       124
       57
        
                     {{ i "file-diff" "w-4 h-4" }} <span class="hidden md:inline">view patch</span>

     

       125
       58
        
                   </a>

     

       59
       59
       +
                   {{ if not (eq .RoundNumber 0) }}

     

       60
       60
       +
                   <a class="btn flex items-center gap-2 no-underline hover:no-underline p-2"

     

       61
       61
       +
                      hx-boost="true"

     

       62
       62
       +
                      href="/{{ $.RepoInfo.FullName }}/pulls/{{ $.Pull.PullId }}/round/{{.RoundNumber}}/interdiff">

     

       63
       63
       +
                     {{ i "file-diff" "w-4 h-4" }} <span class="hidden md:inline">interdiff</span>

     

       64
       64
       +
                   </a>

     

       65
       65
       +
                   <span id="interdiff-error-{{.RoundNumber}}"></span>

     

       66
       66
       +
                   {{ end }}

     

       126
       67
        
                 </div>

     

       127
       68
        
               </summary>

     

       128
       128
       -
               <div class="md:pl-12 flex flex-col gap-2 mt-2 relative">

     

       129
       129
       -
                 {{ range .Comments }}

     

       130
       130
       -
                   <div id="comment-{{.ID}}" class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-2 px-4 relative w-fit">

     

       69
       69
       +
               

     

       70
       70
       +
               {{ if .IsFormatPatch }}

     

       71
       71
       +
               {{ $patches := .AsFormatPatch }}

     

       72
       72
       +
               {{ $round := .RoundNumber }}

     

       73
       73
       +
               <details class="group py-2 md:ml-[3.5rem] text-gray-500 dark:text-gray-400 flex flex-col gap-2 relative text-sm">

     

       74
       74
       +
                 <summary class="py-1 list-none cursor-pointer hover:text-gray-500 hover:dark:text-gray-400">

     

       75
       75
       +
                   {{ $s := "s" }}

     

       76
       76
       +
                   {{ if eq (len $patches) 1 }}

     

       77
       77
       +
                   {{ $s = "" }}

     

       78
       78
       +
                   {{ end }}

     

       79
       79
       +
                   <div class="group-open:hidden flex items-center gap-2 ml-2">

     

       80
       80
       +
                     {{ i "chevrons-up-down" "w-4 h-4" }} expand {{ len $patches }} commit{{$s}}

     

       81
       81
       +
                   </div>

     

       82
       82
       +
                   <div class="hidden group-open:flex items-center gap-2 ml-2">

     

       83
       83
       +
                     {{ i "chevrons-down-up" "w-4 h-4" }} hide {{ len $patches }} commit{{$s}}

     

       84
       84
       +
                   </div>

     

       85
       85
       +
                 </summary>

     

       86
       86
       +
                 {{ range $patches }}

     

       87
       87
       +
                    <div id="commit-{{.SHA}}" class="py-1 px-2 relative w-full md:max-w-3/5 md:w-fit flex flex-col">

     

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

     

       89
       89
       +
                        {{ i "git-commit-horizontal" "w-4 h-4" }}

     

       90
       90
       +
                        <div class="text-sm text-gray-500 dark:text-gray-400">

     

       91
       91
       +
                          {{ if not $.Pull.IsPatchBased }}

     

       92
       92
       +
                            {{ $fullRepo := $.RepoInfo.FullName }}

     

       93
       93
       +
                            {{ if $.Pull.IsForkBased }}

     

       94
       94
       +
                               {{ if $.Pull.PullSource.Repo }}

     

       95
       95
       +
                                 {{ $fullRepo = printf "%s/%s" $owner $.Pull.PullSource.Repo.Name }}

     

       96
       96
       +
                                 <a href="/{{ $fullRepo }}/commit/{{ .SHA }}" class="font-mono text-gray-500 dark:text-gray-400">{{ slice .SHA 0 8 }}</a>

     

       97
       97
       +
                               {{ else }}

     

       98
       98
       +
                                 <span class="font-mono">{{ slice .SHA 0 8 }}</span>

     

       99
       99
       +
                               {{ end }}

     

       100
       100
       +
                            {{ end }}

     

       101
       101
       +
                          {{ else }}

     

       102
       102
       +
                            <span class="font-mono">{{ slice .SHA 0 8 }}</span>

     

       103
       103
       +
                          {{ end }}

     

       104
       104
       +
                        </div>

     

       105
       105
       +
                        <div class="flex items-center">

     

       106
       106
       +
                          <span>{{ .Title }}</span>

     

       107
       107
       +
                          {{ if gt (len .Body) 0 }}

     

       108
       108
       +
                          <button

     

       109
       109
       +
                              class="py-1/2 px-1 mx-2 bg-gray-200 hover:bg-gray-400 rounded dark:bg-gray-700 dark:hover:bg-gray-600"

     

       110
       110
       +
                              hx-on:click="document.getElementById('body-{{$round}}-{{.SHA}}').classList.toggle('hidden')"

     

       111
       111
       +
                              >

     

       112
       112
       +
                              {{ i "ellipsis" "w-3 h-3" }}

     

       113
       113
       +
                          </button>

     

       114
       114
       +
                            {{ end }}

     

       115
       115
       +
                        </div>

     

       116
       116
       +
                      </div>

     

       117
       117
       +
                      {{ if gt (len .Body) 0 }}

     

       118
       118
       +
                      <p id="body-{{$round}}-{{.SHA}}" class="hidden mt-1 text-sm pb-2">

     

       119
       119
       +
                        {{ nl2br .Body }}

     

       120
       120
       +
                      </p>

     

       121
       121
       +
                      {{ end }}

     

       122
       122
       +
                    </div>

     

       123
       123
       +
                 {{ end }}

     

       124
       124
       +
               </details>

     

       125
       125
       +
               {{ end }}

     

       126
       126
       +
       

     

       127
       127
       +
       

     

       128
       128
       +
               <div class="md:pl-[3.5rem] flex flex-col gap-2 mt-2 relative">

     

       129
       129
       +
                 {{ range $cidx, $c := .Comments }}

     

       130
       130
       +
                   <div id="comment-{{$c.ID}}" class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-2 px-4 relative w-full md:max-w-3/5 md:w-fit">

     

       131
       131
       +
                     {{ if gt $cidx 0 }}

     

       131
       132
        
                     <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div>

     

       133
       133
       +
                     {{ end }}

     

       132
       134
        
                     <div class="text-sm text-gray-500 dark:text-gray-400">

     

       133
       133
       -
                       {{ $owner := index $.DidHandleMap .OwnerDid }} 

     

       135
       135
       +
                       {{ $owner := index $.DidHandleMap $c.OwnerDid }} 

     

       134
       136
        
                       <a href="/{{$owner}}">{{$owner}}</a>

     

       135
       137
        
                       <span class="before:content-['·']"></span>

     

       136
       136
       -
                       <a class="text-gray-500 dark:text-gray-400 hover:text-gray-500 dark:hover:text-gray-300" href="#comment-{{.ID}}"><time>{{ .Created | shortTimeFmt }}</time></a>

     

       138
       138
       +
                       <a class="text-gray-500 dark:text-gray-400 hover:text-gray-500 dark:hover:text-gray-300" href="#comment-{{.ID}}"><time>{{ $c.Created | shortTimeFmt }}</time></a>

     

       137
       139
        
                     </div>

     

       138
       140
        
                     <div class="prose dark:prose-invert">

     

       139
       139
       -
                       {{ .Body | markdown }}

     

       141
       141
       +
                       {{ $c.Body | markdown }}

     

       140
       142
        
                     </div>

     

       141
       143
        
                   </div>

     

       142
       144
        
                 {{ end }}

     
···

       147
       149
        
                 {{ end }}

     

       148
       150
        
       

     

       149
       151
        
                 {{ if $.LoggedInUser }}

     

       150
       150
       -
                   {{ template "fragments/pullActions" (dict "LoggedInUser" $.LoggedInUser "Pull" $.Pull "RepoInfo" $.RepoInfo "RoundNumber" .RoundNumber "MergeCheck" $.MergeCheck "ResubmitCheck" $.ResubmitCheck) }}

     

       152
       152
       +
                   {{ template "repo/pulls/fragments/pullActions" (dict "LoggedInUser" $.LoggedInUser "Pull" $.Pull "RepoInfo" $.RepoInfo "RoundNumber" .RoundNumber "MergeCheck" $.MergeCheck "ResubmitCheck" $.ResubmitCheck) }}

     

       151
       153
        
                 {{ else }}

     

       152
       154
        
                   <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm px-6 py-4 w-fit dark:text-white">

     

       153
       155
        
                     <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div>

     
···

       156
       158
        
                 {{ end }}

     

       157
       159
        
               </div>

     

       158
       160
        
           </details>

     

       159
       159
       -
           <hr class="md:hidden"/>

     

       161
       161
       +
           <hr class="md:hidden border-t border-gray-300 dark:border-gray-600"/>

     

       160
       162
        
           {{ end }}

     

       161
       163
        
         {{ end }}

     

       162
       164
        
       {{ end }}

     
···

       164
       166
        
       {{ define "mergeStatus" }}

     

       165
       167
        
         {{ if .Pull.State.IsClosed }}

     

       166
       168
        
         <div class="bg-gray-50 dark:bg-gray-700 border border-black dark:border-gray-500 rounded drop-shadow-sm px-6 py-2 relative w-fit">

     

       167
       167
       -
           <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div>

     

       168
       169
        
           <div class="flex items-center gap-2 text-black dark:text-white">

     

       169
       170
        
             {{ i "ban" "w-4 h-4" }}

     

       170
       171
        
             <span class="font-medium">closed without merging</span

     
···

       173
       174
        
         </div>

     

       174
       175
        
         {{ else if .Pull.State.IsMerged }}

     

       175
       176
        
         <div class="bg-purple-50 dark:bg-purple-900 border border-purple-500 rounded drop-shadow-sm px-6 py-2 relative w-fit">

     

       176
       176
       -
           <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div>

     

       177
       177
        
           <div class="flex items-center gap-2 text-purple-500 dark:text-purple-300">

     

       178
       178
        
             {{ i "git-merge" "w-4 h-4" }}

     

       179
       179
        
             <span class="font-medium">pull request successfully merged</span

     
···

       182
       182
        
         </div>

     

       183
       183
        
         {{ else if and .MergeCheck .MergeCheck.Error }}

     

       184
       184
        
           <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative w-fit">

     

       185
       185
       -
             <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div>

     

       186
       185
        
             <div class="flex items-center gap-2 text-red-500 dark:text-red-300">

     

       187
       186
        
               {{ i "triangle-alert" "w-4 h-4" }}

     

       188
       187
        
               <span class="font-medium">{{ .MergeCheck.Error }}</span>

     
···

       190
       189
        
           </div>

     

       191
       190
        
         {{ else if and .MergeCheck .MergeCheck.IsConflicted }}

     

       192
       191
        
           <div class="bg-red-50 dark:bg-red-900 border border-red-500 rounded drop-shadow-sm px-6 py-2 relative w-fit">

     

       193
       193
       -
             <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div>

     

       194
       192
        
             <div class="flex flex-col gap-2 text-red-500 dark:text-red-300">

     

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

     

       196
       194
        
                 {{ i "triangle-alert" "w-4 h-4" }}

     
···

       210
       208
        
           </div>

     

       211
       209
        
         {{ else if .MergeCheck }}

     

       212
       210
        
         <div class="bg-green-50 dark:bg-green-900 border border-green-500 rounded drop-shadow-sm px-6 py-2 relative w-fit">

     

       213
       213
       -
           <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div>

     

       214
       211
        
           <div class="flex items-center gap-2 text-green-500 dark:text-green-300">

     

       215
       212
        
             {{ i "circle-check-big" "w-4 h-4" }}

     

       216
       213
        
             <span class="font-medium">no conflicts, ready to merge</span>

     
···

       222
       219
        
       {{ define "resubmitStatus" }}

     

       223
       220
        
         {{ if .ResubmitCheck.Yes }}

     

       224
       221
        
         <div class="bg-amber-50 dark:bg-amber-900 border border-amber-500 rounded drop-shadow-sm px-6 py-2 relative w-fit">

     

       225
       225
       -
           <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div>

     

       226
       222
        
           <div class="flex items-center gap-2 text-amber-500 dark:text-amber-300">

     

       227
       223
        
             {{ i "triangle-alert" "w-4 h-4" }}

     

       228
       224
        
             <span class="font-medium">this branch has been updated, consider resubmitting</span>

     
···

       230
       226
        
         </div>

     

       231
       227
        
         {{ end }}

     

       232
       228
        
       {{ end }}

     

       229
       229
       +
       

     

       230
       230
       +
       {{ define "commits" }}

     

       231
       231
       +
       {{ end }}

+29 -6

appview/pages/templates/repo/pulls/pulls.html

···

       5
       5
        
               <p class="dark:text-white">

     

       6
       6
        
                   filtering

     

       7
       7
        
                   <select

     

       8
       8
       -
                       class="border px-1 bg-white dark:bg-gray-800 border-gray-200 dark:border-gray-600 dark:text-white"

     

       8
       8
       +
                       class="border p-1 bg-white dark:bg-gray-800 border-gray-200 dark:border-gray-600 dark:text-white"

     

       9
       9
        
                       onchange="window.location.href = '/{{ .RepoInfo.FullName }}/pulls?state=' + this.value"

     

       10
       10
        
                   >

     

       11
       11
        
                       <option value="open" {{ if .FilteringBy.IsOpen }}selected{{ end }}>

     
···

       22
       22
        
               </p>

     

       23
       23
        
               <a

     

       24
       24
        
                   href="/{{ .RepoInfo.FullName }}/pulls/new"

     

       25
       25
       -
                   class="btn text-sm flex items-center gap-2 no-underline hover:no-underline dark:text-white dark:bg-gray-700 dark:hover:bg-gray-600"

     

       25
       25
       +
                   class="btn text-sm flex items-center gap-2 no-underline hover:no-underline"

     

       26
       26
        
               >

     

       27
       27
       -
                   {{ i "git-pull-request" "w-4 h-4" }}

     

       28
       28
       -
                   <span>new pull request</span>

     

       27
       27
       +
                   {{ i "git-pull-request-create" "w-4 h-4" }}

     

       28
       28
       +
                   <span>new</span>

     

       29
       29
        
               </a>

     

       30
       30
        
           </div>

     

       31
       31
        
           <div class="error" id="pulls"></div>

     
···

       78
       78
        
                                 {{ .TargetBranch }}

     

       79
       79
        
                               </span>

     

       80
       80
        
                           </span>

     

       81
       81
       -
                           {{ if not .IsPatch }}

     

       81
       81
       +
                           {{ if not .IsPatchBased }}

     

       82
       82
        
                           <span>from

     

       83
       83
       -
                             {{ if not .IsSameRepoBranch }}

     

       83
       83
       +
                             {{ if .IsForkBased }}

     

       84
       84
       +
                               {{ if .PullSource.Repo }}

     

       84
       85
        
                               <a href="/{{ $owner }}/{{ .PullSource.Repo.Name }}" class="no-underline hover:underline">{{ $owner }}/{{ .PullSource.Repo.Name }}</a>

     

       86
       86
       +
                               {{ else }}

     

       87
       87
       +
                               <span class="italic">[deleted fork]</span>

     

       88
       88
       +
                               {{ end }}

     

       85
       89
        
                             {{ end }}

     

       86
       90
        
       

     

       87
       91
        
                             <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">

     
···

       89
       93
        
                             </span>

     

       90
       94
        
                           </span>

     

       91
       95
        
                           {{ end }}

     

       96
       96
       +
                           <span class="before:content-['·']">

     

       97
       97
       +
                               {{ $latestRound := .LastRoundNumber }}

     

       98
       98
       +
                               {{ $lastSubmission := index .Submissions $latestRound }}

     

       99
       99
       +
                               round

     

       100
       100
       +
                               <span class="text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 mx-1/2 inline-flex items-center">

     

       101
       101
       +
                                 #{{ .LastRoundNumber }}

     

       102
       102
       +
                               </span>

     

       103
       103
       +
                               {{ $commentCount := len $lastSubmission.Comments }}

     

       104
       104
       +
                               {{ $s := "s" }}

     

       105
       105
       +
                               {{ if eq $commentCount 1 }}

     

       106
       106
       +
                                 {{ $s = "" }}

     

       107
       107
       +
                               {{ end }}

     

       108
       108
       +
       

     

       109
       109
       +
                               {{ if eq $commentCount 0 }}

     

       110
       110
       +
                                 awaiting comments

     

       111
       111
       +
                               {{ else }}

     

       112
       112
       +
                                 recieved {{ len $lastSubmission.Comments}} comment{{$s}}

     

       113
       113
       +
                               {{ end }}

     

       114
       114
       +
                           </span>

     

       92
       115
        
                       </p>

     

       93
       116
        
                   </div>

     

       94
       117
        
               {{ end }}

+14 -3

appview/pages/templates/repo/settings.html

···

       22
       22
        
               {{ end }}

     

       23
       23
        
           </div>

     

       24
       24
        
       

     

       25
       25
       -
           {{ if .IsCollaboratorInviteAllowed }}

     

       25
       25
       +
           {{ if .RepoInfo.Roles.CollaboratorInviteAllowed }}

     

       26
       26
        
               <form hx-put="/{{ $.RepoInfo.FullName }}/settings/collaborator">

     

       27
       27
        
                   <label for="collaborator" class="dark:text-white"

     

       28
       28
        
                       >add collaborator</label

     
···

       45
       45
        
           {{ end }}

     

       46
       46
        
       

     

       47
       47
        
           <form hx-put="/{{ $.RepoInfo.FullName }}/settings/branches/default" class="mt-6">

     

       48
       48
       -
               <label for="branch">default branch:</label>

     

       49
       49
       -
               <select id="branch" name="branch" required class="p-1 border border-gray-200 bg-white">

     

       48
       48
       +
               <label for="branch">default branch</label>

     

       49
       49
       +
               <select id="branch" name="branch" required class="p-1 border border-gray-200 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-700">

     

       50
       50
        
                   {{ range .Branches }}

     

       51
       51
        
                       <option

     

       52
       52
        
                           value="{{ . }}"

     
···

       61
       61
        
               </select>

     

       62
       62
        
               <button class="btn my-2" type="text">save</button>

     

       63
       63
        
           </form>

     

       64
       64
       +
       

     

       65
       65
       +
           {{ if .RepoInfo.Roles.RepoDeleteAllowed }}

     

       66
       66
       +
           <form hx-confirm="Are you sure you want to delete this repository?" hx-delete="/{{ $.RepoInfo.FullName }}/settings/delete" class="mt-6">

     

       67
       67
       +
               <label for="branch">delete repository</label>

     

       68
       68
       +
               <button class="btn my-2" type="text">delete</button>

     

       69
       69
       +
               <span>

     

       70
       70
       +
                 Deleting a repository is irreversible and permanent.

     

       71
       71
       +
               </span>

     

       72
       72
       +
           </form>

     

       73
       73
       +
           {{ end }}

     

       74
       74
       +
       

     

       64
       75
        
       {{ end }}

+7 -6

appview/pages/templates/repo/tree.html

···

       17
       17
        
           {{ $containerstyle := "py-1" }}

     

       18
       18
        
           {{ $linkstyle := "no-underline hover:underline" }}

     

       19
       19
        
       

     

       20
       20
       -
           <div class="pb-2 mb-3 text-base border-b border-gray-200 dark:border-gray-500">

     

       20
       20
       +
           <div class="pb-2 mb-3 text-base border-b border-gray-200 dark:border-gray-700">

     

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

     

       22
       22
       -
               <div id="breadcrumbs" class="overflow-x-auto whitespace-nowrap">

     

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

     

       23
       23
        
                 {{ range .BreadCrumbs }}

     

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

     

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

     

       25
       25
        
                 {{ end }}

     

       26
       26
        
               </div>

     

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

     

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

     

       29
       29
        
       

     

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

     

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

     

       32
       31
        
                 {{ if eq $stats.NumFolders 1 }}

     

       33
       33
       -
                   <span>{{ $stats.NumFolders }} folder</span>

     

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

     

       33
       33
       +
                   <span>{{ $stats.NumFolders }} folder</span>

     

       35
       34
        
                 {{ else if gt $stats.NumFolders 1 }}

     

       36
       36
       -
                   <span>{{ $stats.NumFolders }} folders</span>

     

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

     

       36
       36
       +
                   <span>{{ $stats.NumFolders }} folders</span>

     

       38
       37
        
                 {{ end }}

     

       39
       38
        
       

     

       40
       39
        
                 {{ if eq $stats.NumFiles 1 }}

     

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

     

       41
       41
        
                   <span>{{ $stats.NumFiles }} file</span>

     

       42
       42
        
                 {{ else if gt $stats.NumFiles 1 }}

     

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

     

       43
       44
        
                   <span>{{ $stats.NumFiles }} files</span>

     

       44
       45
        
                 {{ end }}

     

       45
       46

+1 -1

appview/pages/templates/timeline.html

···

       23
       23
        
         </div>

     

       24
       24
        
         <div class="italic text-lg">

     

       25
       25
        
           tightly-knit social coding, <a href="/login" class="underline inline-flex gap-1 items-center">join now {{ i "arrow-right" "w-4 h-4" }}</a>

     

       26
       26
       -
           <p class="pt-5 px-10 text-sm text-gray-500 dark:text-gray-400">Join our IRC channel: <a href="https://web.libera.chat/#tangled"><code>#tangled</code> on Libera Chat</a>.

     

       26
       26
       +
           <p class="pt-5 px-10 text-sm text-gray-500 dark:text-gray-400">Join our <a href="https://chat.tangled.sh">Discord</a>or IRC channel: <a href="https://web.libera.chat/#tangled"><code>#tangled</code> on Libera Chat</a>.

     

       27
       27
        
           Read an introduction to Tangled <a href="https://blog.tangled.sh/intro">here</a>.</p>

     

       28
       28
        
         </div>

     

       29
       29
        
       </div>

+17

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

···

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

     

       2
       2
       +
         <button id="followBtn"

     

       3
       3
       +
           class="btn mt-2 w-full"

     

       4
       4
       +
       

     

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

     

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

     

       7
       7
       +
           {{ else }}

     

       8
       8
       +
           hx-delete="/follow?subject={{.UserDid}}"

     

       9
       9
       +
           {{ end }}

     

       10
       10
       +
       

     

       11
       11
       +
           hx-trigger="click"

     

       12
       12
       +
           hx-target="#followBtn"

     

       13
       13
       +
           hx-swap="outerHTML"

     

       14
       14
       +
           >

     

       15
       15
       +
           {{ if eq .FollowStatus.String "IsNotFollowing" }}Follow{{ else }}Unfollow{{ end }}

     

       16
       16
       +
         </button>

     

       17
       17
       +
       {{ end }}

+11 -3

appview/pages/templates/user/login.html

···

       8
       8
        
                       content="width=device-width, initial-scale=1.0"

     

       9
       9
        
                   />

     

       10
       10
        
                   <script src="/static/htmx.min.js"></script>

     

       11
       11
       -
                   <link rel="stylesheet" href="/static/tw.css" type="text/css" />

     

       11
       11
       +
                   <link rel="stylesheet" href="/static/tw.css?{{ cssContentHash }}" type="text/css" />

     

       12
       12
        
                   <title>login</title>

     

       13
       13
        
               </head>

     

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

     
···

       27
       27
        
                       >

     

       28
       28
        
                           <div class="flex flex-col">

     

       29
       29
        
                               <label for="handle">handle</label>

     

       30
       30
       -
                               <input type="text" id="handle" name="handle" required />

     

       30
       30
       +
                               <input 

     

       31
       31
       +
                                 type="text"

     

       32
       32
       +
                                 id="handle"

     

       33
       33
       +
                                 name="handle"

     

       34
       34
       +
                                 tabindex="1"

     

       35
       35
       +
                                 required

     

       36
       36
       +
                               />

     

       31
       37
        
                               <span class="text-xs text-gray-500 mt-1">

     

       32
       38
        
                                   You need to use your

     

       33
       39
        
                                   <a href="https://bsky.app">Bluesky</a> handle to log

     
···

       41
       47
        
                                   type="password"

     

       42
       48
        
                                   id="app_password"

     

       43
       49
        
                                   name="app_password"

     

       50
       50
       +
                                   tabindex="2"

     

       44
       51
        
                                   required

     

       45
       52
        
                               />

     

       46
       53
        
                               <span class="text-xs text-gray-500 mt-1">

     
···

       57
       64
        
                               class="btn w-full my-2 mt-6"

     

       58
       65
        
                               type="submit"

     

       59
       66
        
                               id="login-button"

     

       67
       67
       +
                               tabindex="3"

     

       60
       68
        
                           >

     

       61
       69
        
                               <span>login</span>

     

       62
       70
        
                           </button>

     

       63
       71
        
                       </form>

     

       64
       72
        
                       <p class="text-sm text-gray-500">

     

       65
       65
       -
                           Join our IRC channel:

     

       73
       73
       +
                           Join our <a href="https://chat.tangled.sh">Discord</a> or IRC channel:

     

       66
       74
        
                           <a href="https://web.libera.chat/#tangled"

     

       67
       75
        
                               ><code>#tangled</code> on Libera Chat</a

     

       68
       76
        
                           >.

+199 -72

appview/pages/templates/user/profile.html

···

       9
       9
        
               {{ block "ownRepos" . }}{{ end }}

     

       10
       10
        
               {{ block "collaboratingRepos" . }}{{ end }}

     

       11
       11
        
           </div>

     

       12
       12
       -
           

     

       13
       12
        
           <div class="md:col-span-2 order-3 md:order-3">

     

       14
       13
        
               {{ block "profileTimeline" . }}{{ end }}

     

       15
       14
        
           </div>

     

       16
       15
        
       </div>

     

       17
       16
        
       {{ end }}

     

       18
       17
        
       

     

       19
       19
       -
       

     

       20
       18
        
       {{ define "profileTimeline" }}

     

       21
       21
       -
           <div class="flex flex-col gap-3 relative">

     

       22
       22
       -
               <p class="px-6 text-sm font-bold py-2 dark:text-white">ACTIVITY</p>

     

       23
       23
       -
               {{ range .ProfileTimeline }}

     

       24
       24
       -
                 {{ if eq .Type "issue" }}

     

       25
       25
       -
                 <div class="px-6 py-2 bg-white dark:bg-gray-800 rounded drop-shadow-sm w-fit max-w-full flex items-center gap-2">

     

       26
       26
       -
                     {{ $textColor := "text-gray-800 dark:text-gray-400" }}

     

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

     

       28
       28
       -
                     {{ if .Issue.Open }}

     

       29
       29
       -
                         {{ $textColor = "text-green-600 dark:text-green-500" }}

     

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

     

       31
       31
       -
                     {{ end }}

     

       32
       32
       -
                   <div class="p-1 {{ $textColor }}">

     

       33
       33
       -
                       {{ i $icon "w-5 h-5" }}

     

       19
       19
       +
         <p class="text-sm font-bold py-2 dark:text-white px-6">ACTIVITY</p>

     

       20
       20
       +
         <div class="flex flex-col gap-6 relative">

     

       21
       21
       +
           {{ with .ProfileTimeline }}

     

       22
       22
       +
             {{ range $idx, $byMonth := .ByMonth }}

     

       23
       23
       +
               {{ with $byMonth }}

     

       24
       24
       +
               <div class="bg-white dark:bg-gray-800 px-6 py-4 rounded drop-shadow-sm">

     

       25
       25
       +
                 {{ if eq $idx 0 }}

     

       26
       26
       +
       

     

       27
       27
       +
                 {{ else }}

     

       28
       28
       +
                   {{ $s := "s" }}

     

       29
       29
       +
                   {{ if eq $idx 1 }}

     

       30
       30
       +
                     {{ $s = "" }}

     

       31
       31
       +
                   {{ end }}

     

       32
       32
       +
                   <p class="text-sm font-bold dark:text-white mb-2">{{$idx}} month{{$s}} ago</p>

     

       33
       33
       +
                 {{ end }}

     

       34
       34
       +
       

     

       35
       35
       +
                 {{ if .IsEmpty }}

     

       36
       36
       +
                   <div class="text-gray-500 dark:text-gray-400">

     

       37
       37
       +
                     No activity for this month

     

       34
       38
        
                   </div>

     

       35
       35
       -
                   <div>

     

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

     

       37
       37
       -
                     <a href="/{{ index $.DidHandleMap .Repo.Did }}/{{ .Repo.Name }}/issues/{{ .Issue.IssueId }}" class="no-underline hover:underline">{{ .Issue.Title }} <span class="text-gray-500 dark:text-gray-400">#{{ .Issue.IssueId }}</span></a>

     

       38
       38
       -
                     on 

     

       39
       39
       -
                     <a href="/{{ index $.DidHandleMap .Repo.Did }}/{{ .Repo.Name }}" class="no-underline hover:underline">{{ index $.DidHandleMap .Repo.Did }}<span class="select-none">/</span>{{ .Repo.Name }}</a>

     

       40
       40
       -
                     <time class="text-gray-700 dark:text-gray-400 text-xs ml-2">{{ .Issue.Created | shortTimeFmt }}</time>

     

       41
       41
       -
                     </p>

     

       39
       39
       +
                 {{ else }}

     

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

     

       41
       41
       +
                     {{ block "repoEvents"  (list .RepoEvents  $.DidHandleMap) }} {{ end }}

     

       42
       42
       +
                     {{ block "issueEvents" (list .IssueEvents $.DidHandleMap) }} {{ end }}

     

       43
       43
       +
                     {{ block "pullEvents"  (list .PullEvents  $.DidHandleMap) }} {{ end }}

     

       42
       44
        
                   </div>

     

       45
       45
       +
                 {{ end }}

     

       46
       46
       +
               </div>

     

       47
       47
       +
       

     

       48
       48
       +
               {{ end }}

     

       49
       49
       +
             {{ else }}

     

       50
       50
       +
               <p class="dark:text-white">This user does not have any activity yet.</p>

     

       51
       51
       +
             {{ end }}

     

       52
       52
       +
           {{ end }}

     

       53
       53
       +
         </div>

     

       54
       54
       +
       {{ end }}

     

       55
       55
       +
       

     

       56
       56
       +
       {{ define "repoEvents" }}

     

       57
       57
       +
         {{ $items := index . 0 }}

     

       58
       58
       +
         {{ $handleMap := index . 1 }}

     

       59
       59
       +
       

     

       60
       60
       +
         {{ if gt (len $items) 0 }}

     

       61
       61
       +
           <details>

     

       62
       62
       +
             <summary class="list-none cursor-pointer hover:text-gray-500 hover:dark:text-gray-400">

     

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

     

       64
       64
       +
                 {{ i "book-plus" "w-4 h-4" }}

     

       65
       65
       +
                 created {{ len $items }} {{if eq (len $items) 1 }}repository{{else}}repositories{{end}}

     

       66
       66
       +
               </div>

     

       67
       67
       +
             </summary>

     

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

     

       69
       69
       +
               {{ range $items }}

     

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

     

       71
       71
       +
                   <span class="text-gray-500 dark:text-gray-400">

     

       72
       72
       +
                     {{ if .Source }}

     

       73
       73
       +
                       {{ i "git-fork" "w-4 h-4" }}

     

       74
       74
       +
                     {{ else }}

     

       75
       75
       +
                       {{ i "book-plus" "w-4 h-4" }}

     

       76
       76
       +
                     {{ end }}

     

       77
       77
       +
                   </span>

     

       78
       78
       +
                   <a href="/{{ index $handleMap .Repo.Did }}/{{ .Repo.Name }}" class="no-underline hover:underline">

     

       79
       79
       +
                     {{- .Repo.Name -}}

     

       80
       80
       +
                   </a>

     

       43
       81
        
                 </div>

     

       44
       44
       -
                 {{ else if eq .Type "pull" }}

     

       45
       45
       -
                 <div class="px-6 py-2 bg-white dark:bg-gray-800 rounded drop-shadow-sm w-fit flex items-center gap-3">

     

       46
       46
       -
                   {{ $textColor := "text-gray-800 dark:text-gray-400" }}

     

       47
       47
       -
                   {{ $icon := "git-pull-request-closed" }}

     

       48
       48
       -
                   {{ if .Pull.State.IsOpen }}

     

       49
       49
       -
                       {{ $textColor = "text-green-600 dark:text-green-500" }}

     

       50
       50
       -
                       {{ $icon = "git-pull-request" }}

     

       51
       51
       -
                   {{ else if .Pull.State.IsMerged }}

     

       52
       52
       -
                       {{ $textColor = "text-purple-600 dark:text-purple-500" }}

     

       53
       53
       -
                       {{ $icon = "git-merge" }}

     

       82
       82
       +
               {{ end }}

     

       83
       83
       +
             </div>

     

       84
       84
       +
           </details>

     

       85
       85
       +
         {{ end }}

     

       86
       86
       +
       {{ end }}

     

       87
       87
       +
       

     

       88
       88
       +
       {{ define "issueEvents" }}

     

       89
       89
       +
         {{ $i := index . 0 }}

     

       90
       90
       +
         {{ $items := $i.Items }}

     

       91
       91
       +
         {{ $stats := $i.Stats }}

     

       92
       92
       +
         {{ $handleMap := index . 1 }}

     

       93
       93
       +
       

     

       94
       94
       +
         {{ if gt (len $items) 0 }}

     

       95
       95
       +
           <details>

     

       96
       96
       +
             <summary class="list-none cursor-pointer hover:text-gray-500 hover:dark:text-gray-400">

     

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

     

       98
       98
       +
                 {{ i "circle-dot" "w-4 h-4" }}

     

       99
       99
       +
       

     

       100
       100
       +
                 <div>

     

       101
       101
       +
                   created {{ len $items }} {{if eq (len $items) 1 }}issue{{else}}issues{{end}} 

     

       102
       102
       +
                 </div>

     

       103
       103
       +
       

     

       104
       104
       +
                 {{ if gt $stats.Open 0 }}

     

       105
       105
       +
                   <span class="px-2 py-1/2 text-sm rounded text-white bg-green-600 dark:bg-green-700">

     

       106
       106
       +
                     {{$stats.Open}} open

     

       107
       107
       +
                   </span>

     

       108
       108
       +
                 {{ end }}

     

       109
       109
       +
       

     

       110
       110
       +
                 {{ if gt $stats.Closed 0 }}

     

       111
       111
       +
                 <span class="px-2 py-1/2 text-sm rounded text-white bg-gray-800 dark:bg-gray-700">

     

       112
       112
       +
                   {{$stats.Closed}} closed

     

       113
       113
       +
                 </span>

     

       114
       114
       +
                 {{ end }}

     

       115
       115
       +
       

     

       116
       116
       +
               </div>

     

       117
       117
       +
             </summary>

     

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

     

       119
       119
       +
               {{ range $items }}

     

       120
       120
       +
                 {{ $repoOwner := index $handleMap .Metadata.Repo.Did }}

     

       121
       121
       +
                 {{ $repoName := .Metadata.Repo.Name }}

     

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

     

       123
       123
       +
       

     

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

     

       125
       125
       +
                   {{ if .Open }}

     

       126
       126
       +
                     <span class="text-green-600 dark:text-green-500">

     

       127
       127
       +
                       {{ i "circle-dot" "w-4 h-4" }}

     

       128
       128
       +
                     </span>

     

       129
       129
       +
                   {{ else }}

     

       130
       130
       +
                     <span class="text-gray-500 dark:text-gray-400">

     

       131
       131
       +
                       {{ i "ban" "w-4 h-4" }}

     

       132
       132
       +
                     </span>

     

       54
       133
        
                   {{ end }}

     

       55
       55
       -
                   <div class="{{ $textColor }} p-1">

     

       56
       56
       -
                       {{ i $icon "w-5 h-5" }}

     

       134
       134
       +
                   <div class="flex-none min-w-8 text-right">

     

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

     

       57
       136
        
                   </div>

     

       58
       58
       -
                   <div>

     

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

     

       60
       60
       -
                     <a href="/{{ index $.DidHandleMap .Repo.Did }}/{{ .Repo.Name }}/pulls/{{ .Pull.PullId }}" class="no-underline hover:underline">{{ .Pull.Title }} <span class="text-gray-500 dark:text-gray-400">#{{ .Pull.PullId }}</span></a>

     

       137
       137
       +
                   <div class="break-words max-w-full">

     

       138
       138
       +
                     <a href="/{{$repoUrl}}/issues/{{ .IssueId }}" class="no-underline hover:underline">

     

       139
       139
       +
                       {{ .Title -}}

     

       140
       140
       +
                     </a>

     

       61
       141
        
                     on

     

       62
       62
       -
                     <a href="/{{ index $.DidHandleMap .Repo.Did }}/{{ .Repo.Name }}" class="no-underline hover:underline">

     

       63
       63
       -
                         {{ index $.DidHandleMap .Repo.Did }}<span class="select-none">/</span>{{ .Repo.Name }}</a>

     

       64
       64
       -
                     <time class="text-gray-700 dark:text-gray-400 text-xs ml-2">{{ .Pull.Created | shortTimeFmt }}</time>

     

       65
       65
       -
                     </p>

     

       142
       142
       +
                     <a href="/{{$repoUrl}}" class="no-underline hover:underline whitespace-nowrap">

     

       143
       143
       +
                       {{$repoUrl}}

     

       144
       144
       +
                     </a>

     

       66
       145
        
                   </div>

     

       67
       146
        
                 </div>

     

       68
       68
       -
                 {{ else if eq .Type "repo" }}

     

       69
       69
       -
                 <div class="px-6 py-2 bg-white dark:bg-gray-800 rounded drop-shadow-sm w-fit flex items-center gap-3">

     

       70
       70
       -
                   {{ if .Source }}

     

       71
       71
       -
                   <div class="text-gray-800 dark:text-gray-400 p-1">

     

       72
       72
       -
                     {{ i "git-fork" "w-5 h-5" }}

     

       73
       73
       -
                   </div>

     

       147
       147
       +
               {{ end }}

     

       148
       148
       +
             </div>

     

       149
       149
       +
           </details>

     

       150
       150
       +
         {{ end }}

     

       151
       151
       +
       {{ end }}

     

       152
       152
       +
       

     

       153
       153
       +
       {{ define "pullEvents" }}

     

       154
       154
       +
         {{ $i := index . 0 }}

     

       155
       155
       +
         {{ $items := $i.Items }}

     

       156
       156
       +
         {{ $stats := $i.Stats }}

     

       157
       157
       +
         {{ $handleMap := index . 1 }}

     

       158
       158
       +
         {{ if gt (len $items) 0 }}

     

       159
       159
       +
           <details>

     

       160
       160
       +
             <summary class="list-none cursor-pointer hover:text-gray-500 hover:dark:text-gray-400">

     

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

     

       162
       162
       +
                 {{ i "git-pull-request" "w-4 h-4" }}

     

       163
       163
       +
       

     

       164
       164
       +
                 <div>

     

       165
       165
       +
                   created {{ len $items }} {{if eq (len $items) 1 }}pull request{{else}}pull requests{{end}} 

     

       166
       166
       +
                 </div>

     

       167
       167
       +
       

     

       168
       168
       +
                 {{ if gt $stats.Open 0 }}

     

       169
       169
       +
                   <span class="px-2 py-1/2 text-sm rounded text-white bg-green-600 dark:bg-green-700">

     

       170
       170
       +
                     {{$stats.Open}} open

     

       171
       171
       +
                   </span>

     

       172
       172
       +
                 {{ end }}

     

       173
       173
       +
       

     

       174
       174
       +
                 {{ if gt $stats.Merged 0 }}

     

       175
       175
       +
                   <span class="px-2 py-1/2 text-sm rounded text-white bg-purple-600 dark:bg-purple-700">

     

       176
       176
       +
                     {{$stats.Merged}} merged

     

       177
       177
       +
                   </span>

     

       178
       178
       +
                 {{ end }}

     

       179
       179
       +
       

     

       180
       180
       +
       

     

       181
       181
       +
                 {{ if gt $stats.Closed 0 }}

     

       182
       182
       +
                 <span class="px-2 py-1/2 text-sm rounded text-white bg-gray-800 dark:bg-gray-700">

     

       183
       183
       +
                   {{$stats.Closed}} closed

     

       184
       184
       +
                 </span>

     

       185
       185
       +
                 {{ end }}

     

       186
       186
       +
       

     

       187
       187
       +
               </div>

     

       188
       188
       +
             </summary>

     

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

     

       190
       190
       +
               {{ range $items }}

     

       191
       191
       +
                 {{ $repoOwner := index $handleMap .Repo.Did }}

     

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

     

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

     

       194
       194
       +
       

     

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

     

       196
       196
       +
                   {{ if .State.IsOpen }}

     

       197
       197
       +
                     <span class="text-green-600 dark:text-green-500">

     

       198
       198
       +
                       {{ i "git-pull-request" "w-4 h-4" }}

     

       199
       199
       +
                     </span>

     

       200
       200
       +
                   {{ else if .State.IsMerged }}

     

       201
       201
       +
                     <span class="text-purple-600 dark:text-purple-500">

     

       202
       202
       +
                       {{ i "git-merge" "w-4 h-4" }}

     

       203
       203
       +
                     </span>

     

       74
       204
        
                   {{ else }}

     

       75
       75
       -
                   <div class="text-gray-800 dark:text-gray-400 p-1">

     

       76
       76
       -
                     {{ i "book-plus" "w-5 h-5" }}

     

       205
       205
       +
                     <span class="text-gray-600 dark:text-gray-300">

     

       206
       206
       +
                       {{ i "git-pull-request-closed" "w-4 h-4" }}

     

       207
       207
       +
                     </span>

     

       208
       208
       +
                   {{ end }}

     

       209
       209
       +
                   <div class="flex-none min-w-8 text-right">

     

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

     

       77
       211
        
                   </div>

     

       78
       78
       -
                   {{ end }}

     

       79
       79
       -
                   <div>

     

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

     

       81
       81
       -
       

     

       82
       82
       -
                     {{ if .Source }}

     

       83
       83
       -
                       forked

     

       84
       84
       -
                       <a href="/{{ index $.DidHandleMap .Source.Did }}/{{ .Source.Name }}" class="no-underline hover:underline">

     

       85
       85
       -
                         {{ index $.DidHandleMap .Source.Did }}/{{ .Source.Name }}

     

       86
       86
       -
                       </a>

     

       87
       87
       -
                       to

     

       88
       88
       -
                       <a href="/{{ didOrHandle $.UserHandle $.UserDid }}/{{ .Repo.Name }}" class="no-underline hover:underline">{{ .Repo.Name }}</a>

     

       89
       89
       -
                     {{ else }}

     

       90
       90
       -
                       created

     

       91
       91
       -
                       <a href="/{{ index $.DidHandleMap .Repo.Did }}/{{ .Repo.Name }}" class="no-underline hover:underline">{{ .Repo.Name }}</a>

     

       92
       92
       -
                     {{ end }}

     

       93
       93
       -
                     <time class="text-gray-700 dark:text-gray-400 text-xs ml-2">{{ .Repo.Created | shortTimeFmt }}</time>

     

       94
       94
       -
                     </p>

     

       212
       212
       +
                   <div class="break-words max-w-full">

     

       213
       213
       +
                     <a href="/{{$repoUrl}}/pulls/{{ .PullId }}" class="no-underline hover:underline">

     

       214
       214
       +
                       {{ .Title -}}

     

       215
       215
       +
                     </a>

     

       216
       216
       +
                     on

     

       217
       217
       +
                     <a href="/{{$repoUrl}}" class="no-underline hover:underline whitespace-nowrap">

     

       218
       218
       +
                       {{$repoUrl}}

     

       219
       219
       +
                     </a>

     

       95
       220
        
                   </div>

     

       96
       221
        
                 </div>

     

       97
       97
       -
                 {{ end }}

     

       98
       98
       -
               {{ else }}

     

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

     

       100
       222
        
               {{ end }}

     

       101
       223
        
             </div>

     

       224
       224
       +
           </details>

     

       225
       225
       +
         {{ end }}

     

       102
       226
        
       {{ end }}

     

       103
       227
        
       

     

       104
       228
        
       {{ define "profileCard" }}

     
···

       108
       232
        
                       <img class="w-3/4 rounded-full p-2" src="{{ .AvatarUri }}" />

     

       109
       233
        
                   {{ end }}

     

       110
       234
        
               </div>

     

       111
       111
       -
               <p class="text-xl font-bold text-center dark:text-white">

     

       112
       112
       -
                   {{ truncateAt30 (didOrHandle .UserDid .UserHandle) }}

     

       235
       235
       +
               <p 

     

       236
       236
       +
                 title="{{ didOrHandle .UserDid .UserHandle }}"

     

       237
       237
       +
                 class="text-lg font-bold text-center dark:text-white overflow-hidden text-ellipsis whitespace-nowrap max-w-full"

     

       238
       238
       +
                 >

     

       239
       239
       +
                 {{ didOrHandle .UserDid .UserHandle }}

     

       113
       240
        
               </p>

     

       114
       241
        
               <div class="text-sm text-center dark:text-gray-300">

     

       115
       242
        
                   <span>{{ .ProfileStats.Followers }} followers</span>

     
···

       120
       247
        
               </div>

     

       121
       248
        
       

     

       122
       249
        
               {{ if ne .FollowStatus.String "IsSelf" }}

     

       123
       123
       -
                   {{ template "fragments/follow" . }}

     

       250
       250
       +
                   {{ template "user/fragments/follow" . }}

     

       124
       251
        
               {{ end }}

     

       125
       252
        
           </div>

     

       126
       253
        
       {{ end }}

+31

appview/pagination/page.go

···

       1
       1
       +
       package pagination

     

       2
       2
       +
       

     

       3
       3
       +
       type Page struct {

     

       4
       4
       +
       	Offset int // where to start from

     

       5
       5
       +
       	Limit  int // number of items in a page

     

       6
       6
       +
       }

     

       7
       7
       +
       

     

       8
       8
       +
       func FirstPage() Page {

     

       9
       9
       +
       	return Page{

     

       10
       10
       +
       		Offset: 0,

     

       11
       11
       +
       		Limit:  10,

     

       12
       12
       +
       	}

     

       13
       13
       +
       }

     

       14
       14
       +
       

     

       15
       15
       +
       func (p Page) Previous() Page {

     

       16
       16
       +
       	if p.Offset-p.Limit < 0 {

     

       17
       17
       +
       		return FirstPage()

     

       18
       18
       +
       	} else {

     

       19
       19
       +
       		return Page{

     

       20
       20
       +
       			Offset: p.Offset - p.Limit,

     

       21
       21
       +
       			Limit:  p.Limit,

     

       22
       22
       +
       		}

     

       23
       23
       +
       	}

     

       24
       24
       +
       }

     

       25
       25
       +
       

     

       26
       26
       +
       func (p Page) Next() Page {

     

       27
       27
       +
       	return Page{

     

       28
       28
       +
       		Offset: p.Offset + p.Limit,

     

       29
       29
       +
       		Limit:  p.Limit,

     

       30
       30
       +
       	}

     

       31
       31
       +
       }

+451

appview/settings/settings.go

···

       1
       1
       +
       package settings

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"database/sql"

     

       5
       5
       +
       	"errors"

     

       6
       6
       +
       	"fmt"

     

       7
       7
       +
       	"log"

     

       8
       8
       +
       	"net/http"

     

       9
       9
       +
       	"net/url"

     

       10
       10
       +
       	"strings"

     

       11
       11
       +
       	"time"

     

       12
       12
       +
       

     

       13
       13
       +
       	"github.com/go-chi/chi/v5"

     

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

     

       15
       15
       +
       	"tangled.sh/tangled.sh/core/appview"

     

       16
       16
       +
       	"tangled.sh/tangled.sh/core/appview/auth"

     

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

     

       18
       18
       +
       	"tangled.sh/tangled.sh/core/appview/email"

     

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

     

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

     

       21
       21
       +
       

     

       22
       22
       +
       	comatproto "github.com/bluesky-social/indigo/api/atproto"

     

       23
       23
       +
       	lexutil "github.com/bluesky-social/indigo/lex/util"

     

       24
       24
       +
       	"github.com/gliderlabs/ssh"

     

       25
       25
       +
       	"github.com/google/uuid"

     

       26
       26
       +
       )

     

       27
       27
       +
       

     

       28
       28
       +
       type Settings struct {

     

       29
       29
       +
       	Db     *db.DB

     

       30
       30
       +
       	Auth   *auth.Auth

     

       31
       31
       +
       	Pages  *pages.Pages

     

       32
       32
       +
       	Config *appview.Config

     

       33
       33
       +
       }

     

       34
       34
       +
       

     

       35
       35
       +
       func (s *Settings) Router() http.Handler {

     

       36
       36
       +
       	r := chi.NewRouter()

     

       37
       37
       +
       

     

       38
       38
       +
       	r.Use(middleware.AuthMiddleware(s.Auth))

     

       39
       39
       +
       

     

       40
       40
       +
       	r.Get("/", s.settings)

     

       41
       41
       +
       

     

       42
       42
       +
       	r.Route("/keys", func(r chi.Router) {

     

       43
       43
       +
       		r.Put("/", s.keys)

     

       44
       44
       +
       		r.Delete("/", s.keys)

     

       45
       45
       +
       	})

     

       46
       46
       +
       

     

       47
       47
       +
       	r.Route("/emails", func(r chi.Router) {

     

       48
       48
       +
       		r.Put("/", s.emails)

     

       49
       49
       +
       		r.Delete("/", s.emails)

     

       50
       50
       +
       		r.Get("/verify", s.emailsVerify)

     

       51
       51
       +
       		r.Post("/verify/resend", s.emailsVerifyResend)

     

       52
       52
       +
       		r.Post("/primary", s.emailsPrimary)

     

       53
       53
       +
       	})

     

       54
       54
       +
       

     

       55
       55
       +
       	return r

     

       56
       56
       +
       }

     

       57
       57
       +
       

     

       58
       58
       +
       func (s *Settings) settings(w http.ResponseWriter, r *http.Request) {

     

       59
       59
       +
       	user := s.Auth.GetUser(r)

     

       60
       60
       +
       	pubKeys, err := db.GetPublicKeys(s.Db, user.Did)

     

       61
       61
       +
       	if err != nil {

     

       62
       62
       +
       		log.Println(err)

     

       63
       63
       +
       	}

     

       64
       64
       +
       

     

       65
       65
       +
       	emails, err := db.GetAllEmails(s.Db, user.Did)

     

       66
       66
       +
       	if err != nil {

     

       67
       67
       +
       		log.Println(err)

     

       68
       68
       +
       	}

     

       69
       69
       +
       

     

       70
       70
       +
       	s.Pages.Settings(w, pages.SettingsParams{

     

       71
       71
       +
       		LoggedInUser: user,

     

       72
       72
       +
       		PubKeys:      pubKeys,

     

       73
       73
       +
       		Emails:       emails,

     

       74
       74
       +
       	})

     

       75
       75
       +
       }

     

       76
       76
       +
       

     

       77
       77
       +
       // buildVerificationEmail creates an email.Email struct for verification emails

     

       78
       78
       +
       func (s *Settings) buildVerificationEmail(emailAddr, did, code string) email.Email {

     

       79
       79
       +
       	verifyURL := s.verifyUrl(did, emailAddr, code)

     

       80
       80
       +
       

     

       81
       81
       +
       	return email.Email{

     

       82
       82
       +
       		APIKey:  s.Config.ResendApiKey,

     

       83
       83
       +
       		From:    "noreply@notifs.tangled.sh",

     

       84
       84
       +
       		To:      emailAddr,

     

       85
       85
       +
       		Subject: "Verify your Tangled email",

     

       86
       86
       +
       		Text: `Click the link below (or copy and paste it into your browser) to verify your email address.

     

       87
       87
       +
       ` + verifyURL,

     

       88
       88
       +
       		Html: `<p>Click the link (or copy and paste it into your browser) to verify your email address.</p>

     

       89
       89
       +
       <p><a href="` + verifyURL + `">` + verifyURL + `</a></p>`,

     

       90
       90
       +
       	}

     

       91
       91
       +
       }

     

       92
       92
       +
       

     

       93
       93
       +
       // sendVerificationEmail handles the common logic for sending verification emails

     

       94
       94
       +
       func (s *Settings) sendVerificationEmail(w http.ResponseWriter, did, emailAddr, code string, errorContext string) error {

     

       95
       95
       +
       	emailToSend := s.buildVerificationEmail(emailAddr, did, code)

     

       96
       96
       +
       

     

       97
       97
       +
       	err := email.SendEmail(emailToSend)

     

       98
       98
       +
       	if err != nil {

     

       99
       99
       +
       		log.Printf("sending email: %s", err)

     

       100
       100
       +
       		s.Pages.Notice(w, "settings-emails-error", fmt.Sprintf("Unable to send verification email at this moment, try again later. %s", errorContext))

     

       101
       101
       +
       		return err

     

       102
       102
       +
       	}

     

       103
       103
       +
       

     

       104
       104
       +
       	return nil

     

       105
       105
       +
       }

     

       106
       106
       +
       

     

       107
       107
       +
       func (s *Settings) emails(w http.ResponseWriter, r *http.Request) {

     

       108
       108
       +
       	switch r.Method {

     

       109
       109
       +
       	case http.MethodGet:

     

       110
       110
       +
       		s.Pages.Notice(w, "settings-emails", "Unimplemented.")

     

       111
       111
       +
       		log.Println("unimplemented")

     

       112
       112
       +
       		return

     

       113
       113
       +
       	case http.MethodPut:

     

       114
       114
       +
       		did := s.Auth.GetDid(r)

     

       115
       115
       +
       		emAddr := r.FormValue("email")

     

       116
       116
       +
       		emAddr = strings.TrimSpace(emAddr)

     

       117
       117
       +
       

     

       118
       118
       +
       		if !email.IsValidEmail(emAddr) {

     

       119
       119
       +
       			s.Pages.Notice(w, "settings-emails-error", "Invalid email address.")

     

       120
       120
       +
       			return

     

       121
       121
       +
       		}

     

       122
       122
       +
       

     

       123
       123
       +
       		// check if email already exists in database

     

       124
       124
       +
       		existingEmail, err := db.GetEmail(s.Db, did, emAddr)

     

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

     

       126
       126
       +
       			log.Printf("checking for existing email: %s", err)

     

       127
       127
       +
       			s.Pages.Notice(w, "settings-emails-error", "Unable to add email at this moment, try again later.")

     

       128
       128
       +
       			return

     

       129
       129
       +
       		}

     

       130
       130
       +
       

     

       131
       131
       +
       		if err == nil {

     

       132
       132
       +
       			if existingEmail.Verified {

     

       133
       133
       +
       				s.Pages.Notice(w, "settings-emails-error", "This email is already verified.")

     

       134
       134
       +
       				return

     

       135
       135
       +
       			}

     

       136
       136
       +
       

     

       137
       137
       +
       			s.Pages.Notice(w, "settings-emails-error", "This email is already added but not verified. Check your inbox for the verification link.")

     

       138
       138
       +
       			return

     

       139
       139
       +
       		}

     

       140
       140
       +
       

     

       141
       141
       +
       		code := uuid.New().String()

     

       142
       142
       +
       

     

       143
       143
       +
       		// Begin transaction

     

       144
       144
       +
       		tx, err := s.Db.Begin()

     

       145
       145
       +
       		if err != nil {

     

       146
       146
       +
       			log.Printf("failed to start transaction: %s", err)

     

       147
       147
       +
       			s.Pages.Notice(w, "settings-emails-error", "Unable to add email at this moment, try again later.")

     

       148
       148
       +
       			return

     

       149
       149
       +
       		}

     

       150
       150
       +
       		defer tx.Rollback()

     

       151
       151
       +
       

     

       152
       152
       +
       		if err := db.AddEmail(tx, db.Email{

     

       153
       153
       +
       			Did:              did,

     

       154
       154
       +
       			Address:          emAddr,

     

       155
       155
       +
       			Verified:         false,

     

       156
       156
       +
       			VerificationCode: code,

     

       157
       157
       +
       		}); err != nil {

     

       158
       158
       +
       			log.Printf("adding email: %s", err)

     

       159
       159
       +
       			s.Pages.Notice(w, "settings-emails-error", "Unable to add email at this moment, try again later.")

     

       160
       160
       +
       			return

     

       161
       161
       +
       		}

     

       162
       162
       +
       

     

       163
       163
       +
       		if err := s.sendVerificationEmail(w, did, emAddr, code, ""); err != nil {

     

       164
       164
       +
       			return

     

       165
       165
       +
       		}

     

       166
       166
       +
       

     

       167
       167
       +
       		// Commit transaction

     

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

     

       169
       169
       +
       			log.Printf("failed to commit transaction: %s", err)

     

       170
       170
       +
       			s.Pages.Notice(w, "settings-emails-error", "Unable to add email at this moment, try again later.")

     

       171
       171
       +
       			return

     

       172
       172
       +
       		}

     

       173
       173
       +
       

     

       174
       174
       +
       		s.Pages.Notice(w, "settings-emails-success", "Click the link in the email we sent you to verify your email address.")

     

       175
       175
       +
       		return

     

       176
       176
       +
       	case http.MethodDelete:

     

       177
       177
       +
       		did := s.Auth.GetDid(r)

     

       178
       178
       +
       		emailAddr := r.FormValue("email")

     

       179
       179
       +
       		emailAddr = strings.TrimSpace(emailAddr)

     

       180
       180
       +
       

     

       181
       181
       +
       		// Begin transaction

     

       182
       182
       +
       		tx, err := s.Db.Begin()

     

       183
       183
       +
       		if err != nil {

     

       184
       184
       +
       			log.Printf("failed to start transaction: %s", err)

     

       185
       185
       +
       			s.Pages.Notice(w, "settings-emails-error", "Unable to delete email at this moment, try again later.")

     

       186
       186
       +
       			return

     

       187
       187
       +
       		}

     

       188
       188
       +
       		defer tx.Rollback()

     

       189
       189
       +
       

     

       190
       190
       +
       		if err := db.DeleteEmail(tx, did, emailAddr); err != nil {

     

       191
       191
       +
       			log.Printf("deleting email: %s", err)

     

       192
       192
       +
       			s.Pages.Notice(w, "settings-emails-error", "Unable to delete email at this moment, try again later.")

     

       193
       193
       +
       			return

     

       194
       194
       +
       		}

     

       195
       195
       +
       

     

       196
       196
       +
       		// Commit transaction

     

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

     

       198
       198
       +
       			log.Printf("failed to commit transaction: %s", err)

     

       199
       199
       +
       			s.Pages.Notice(w, "settings-emails-error", "Unable to delete email at this moment, try again later.")

     

       200
       200
       +
       			return

     

       201
       201
       +
       		}

     

       202
       202
       +
       

     

       203
       203
       +
       		s.Pages.HxLocation(w, "/settings")

     

       204
       204
       +
       		return

     

       205
       205
       +
       	}

     

       206
       206
       +
       }

     

       207
       207
       +
       

     

       208
       208
       +
       func (s *Settings) verifyUrl(did string, email string, code string) string {

     

       209
       209
       +
       	var appUrl string

     

       210
       210
       +
       	if s.Config.Dev {

     

       211
       211
       +
       		appUrl = "http://" + s.Config.ListenAddr

     

       212
       212
       +
       	} else {

     

       213
       213
       +
       		appUrl = "https://tangled.sh"

     

       214
       214
       +
       	}

     

       215
       215
       +
       

     

       216
       216
       +
       	return fmt.Sprintf("%s/settings/emails/verify?did=%s&email=%s&code=%s", appUrl, url.QueryEscape(did), url.QueryEscape(email), url.QueryEscape(code))

     

       217
       217
       +
       }

     

       218
       218
       +
       

     

       219
       219
       +
       func (s *Settings) emailsVerify(w http.ResponseWriter, r *http.Request) {

     

       220
       220
       +
       	q := r.URL.Query()

     

       221
       221
       +
       

     

       222
       222
       +
       	// Get the parameters directly from the query

     

       223
       223
       +
       	emailAddr := q.Get("email")

     

       224
       224
       +
       	did := q.Get("did")

     

       225
       225
       +
       	code := q.Get("code")

     

       226
       226
       +
       

     

       227
       227
       +
       	valid, err := db.CheckValidVerificationCode(s.Db, did, emailAddr, code)

     

       228
       228
       +
       	if err != nil {

     

       229
       229
       +
       		log.Printf("checking email verification: %s", err)

     

       230
       230
       +
       		s.Pages.Notice(w, "settings-emails-error", "Error verifying email. Please try again later.")

     

       231
       231
       +
       		return

     

       232
       232
       +
       	}

     

       233
       233
       +
       

     

       234
       234
       +
       	if !valid {

     

       235
       235
       +
       		s.Pages.Notice(w, "settings-emails-error", "Invalid verification code. Please request a new verification email.")

     

       236
       236
       +
       		return

     

       237
       237
       +
       	}

     

       238
       238
       +
       

     

       239
       239
       +
       	// Mark email as verified in the database

     

       240
       240
       +
       	if err := db.MarkEmailVerified(s.Db, did, emailAddr); err != nil {

     

       241
       241
       +
       		log.Printf("marking email as verified: %s", err)

     

       242
       242
       +
       		s.Pages.Notice(w, "settings-emails-error", "Error updating email verification status. Please try again later.")

     

       243
       243
       +
       		return

     

       244
       244
       +
       	}

     

       245
       245
       +
       

     

       246
       246
       +
       	http.Redirect(w, r, "/settings", http.StatusSeeOther)

     

       247
       247
       +
       }

     

       248
       248
       +
       

     

       249
       249
       +
       func (s *Settings) emailsVerifyResend(w http.ResponseWriter, r *http.Request) {

     

       250
       250
       +
       	if r.Method != http.MethodPost {

     

       251
       251
       +
       		s.Pages.Notice(w, "settings-emails-error", "Invalid request method.")

     

       252
       252
       +
       		return

     

       253
       253
       +
       	}

     

       254
       254
       +
       

     

       255
       255
       +
       	did := s.Auth.GetDid(r)

     

       256
       256
       +
       	emAddr := r.FormValue("email")

     

       257
       257
       +
       	emAddr = strings.TrimSpace(emAddr)

     

       258
       258
       +
       

     

       259
       259
       +
       	if !email.IsValidEmail(emAddr) {

     

       260
       260
       +
       		s.Pages.Notice(w, "settings-emails-error", "Invalid email address.")

     

       261
       261
       +
       		return

     

       262
       262
       +
       	}

     

       263
       263
       +
       

     

       264
       264
       +
       	// Check if email exists and is unverified

     

       265
       265
       +
       	existingEmail, err := db.GetEmail(s.Db, did, emAddr)

     

       266
       266
       +
       	if err != nil {

     

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

     

       268
       268
       +
       			s.Pages.Notice(w, "settings-emails-error", "Email not found. Please add it first.")

     

       269
       269
       +
       		} else {

     

       270
       270
       +
       			log.Printf("checking for existing email: %s", err)

     

       271
       271
       +
       			s.Pages.Notice(w, "settings-emails-error", "Unable to resend verification email at this moment, try again later.")

     

       272
       272
       +
       		}

     

       273
       273
       +
       		return

     

       274
       274
       +
       	}

     

       275
       275
       +
       

     

       276
       276
       +
       	if existingEmail.Verified {

     

       277
       277
       +
       		s.Pages.Notice(w, "settings-emails-error", "This email is already verified.")

     

       278
       278
       +
       		return

     

       279
       279
       +
       	}

     

       280
       280
       +
       

     

       281
       281
       +
       	// Check if last verification email was sent less than 10 minutes ago

     

       282
       282
       +
       	if existingEmail.LastSent != nil {

     

       283
       283
       +
       		timeSinceLastSent := time.Since(*existingEmail.LastSent)

     

       284
       284
       +
       		if timeSinceLastSent < 10*time.Minute {

     

       285
       285
       +
       			waitTime := 10*time.Minute - timeSinceLastSent

     

       286
       286
       +
       			s.Pages.Notice(w, "settings-emails-error", fmt.Sprintf("Please wait %d minutes before requesting another verification email.", int(waitTime.Minutes()+1)))

     

       287
       287
       +
       			return

     

       288
       288
       +
       		}

     

       289
       289
       +
       	}

     

       290
       290
       +
       

     

       291
       291
       +
       	// Generate new verification code

     

       292
       292
       +
       	code := uuid.New().String()

     

       293
       293
       +
       

     

       294
       294
       +
       	// Begin transaction

     

       295
       295
       +
       	tx, err := s.Db.Begin()

     

       296
       296
       +
       	if err != nil {

     

       297
       297
       +
       		log.Printf("failed to start transaction: %s", err)

     

       298
       298
       +
       		s.Pages.Notice(w, "settings-emails-error", "Unable to resend verification email at this moment, try again later.")

     

       299
       299
       +
       		return

     

       300
       300
       +
       	}

     

       301
       301
       +
       	defer tx.Rollback()

     

       302
       302
       +
       

     

       303
       303
       +
       	// Update the verification code and last sent time

     

       304
       304
       +
       	if err := db.UpdateVerificationCode(tx, did, emAddr, code); err != nil {

     

       305
       305
       +
       		log.Printf("updating email verification: %s", err)

     

       306
       306
       +
       		s.Pages.Notice(w, "settings-emails-error", "Unable to resend verification email at this moment, try again later.")

     

       307
       307
       +
       		return

     

       308
       308
       +
       	}

     

       309
       309
       +
       

     

       310
       310
       +
       	// Send verification email

     

       311
       311
       +
       	if err := s.sendVerificationEmail(w, did, emAddr, code, ""); err != nil {

     

       312
       312
       +
       		return

     

       313
       313
       +
       	}

     

       314
       314
       +
       

     

       315
       315
       +
       	// Commit transaction

     

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

     

       317
       317
       +
       		log.Printf("failed to commit transaction: %s", err)

     

       318
       318
       +
       		s.Pages.Notice(w, "settings-emails-error", "Unable to resend verification email at this moment, try again later.")

     

       319
       319
       +
       		return

     

       320
       320
       +
       	}

     

       321
       321
       +
       

     

       322
       322
       +
       	s.Pages.Notice(w, "settings-emails-success", "Verification email resent. Click the link in the email we sent you to verify your email address.")

     

       323
       323
       +
       }

     

       324
       324
       +
       

     

       325
       325
       +
       func (s *Settings) emailsPrimary(w http.ResponseWriter, r *http.Request) {

     

       326
       326
       +
       	did := s.Auth.GetDid(r)

     

       327
       327
       +
       	emailAddr := r.FormValue("email")

     

       328
       328
       +
       	emailAddr = strings.TrimSpace(emailAddr)

     

       329
       329
       +
       

     

       330
       330
       +
       	if emailAddr == "" {

     

       331
       331
       +
       		s.Pages.Notice(w, "settings-emails-error", "Email address cannot be empty.")

     

       332
       332
       +
       		return

     

       333
       333
       +
       	}

     

       334
       334
       +
       

     

       335
       335
       +
       	if err := db.MakeEmailPrimary(s.Db, did, emailAddr); err != nil {

     

       336
       336
       +
       		log.Printf("setting primary email: %s", err)

     

       337
       337
       +
       		s.Pages.Notice(w, "settings-emails-error", "Error setting primary email. Please try again later.")

     

       338
       338
       +
       		return

     

       339
       339
       +
       	}

     

       340
       340
       +
       

     

       341
       341
       +
       	s.Pages.HxLocation(w, "/settings")

     

       342
       342
       +
       }

     

       343
       343
       +
       

     

       344
       344
       +
       func (s *Settings) keys(w http.ResponseWriter, r *http.Request) {

     

       345
       345
       +
       	switch r.Method {

     

       346
       346
       +
       	case http.MethodGet:

     

       347
       347
       +
       		s.Pages.Notice(w, "settings-keys", "Unimplemented.")

     

       348
       348
       +
       		log.Println("unimplemented")

     

       349
       349
       +
       		return

     

       350
       350
       +
       	case http.MethodPut:

     

       351
       351
       +
       		did := s.Auth.GetDid(r)

     

       352
       352
       +
       		key := r.FormValue("key")

     

       353
       353
       +
       		key = strings.TrimSpace(key)

     

       354
       354
       +
       		name := r.FormValue("name")

     

       355
       355
       +
       		client, _ := s.Auth.AuthorizedClient(r)

     

       356
       356
       +
       

     

       357
       357
       +
       		_, _, _, _, err := ssh.ParseAuthorizedKey([]byte(key))

     

       358
       358
       +
       		if err != nil {

     

       359
       359
       +
       			log.Printf("parsing public key: %s", err)

     

       360
       360
       +
       			s.Pages.Notice(w, "settings-keys", "That doesn't look like a valid public key. Make sure it's a <strong>public</strong> key.")

     

       361
       361
       +
       			return

     

       362
       362
       +
       		}

     

       363
       363
       +
       

     

       364
       364
       +
       		rkey := appview.TID()

     

       365
       365
       +
       

     

       366
       366
       +
       		tx, err := s.Db.Begin()

     

       367
       367
       +
       		if err != nil {

     

       368
       368
       +
       			log.Printf("failed to start tx; adding public key: %s", err)

     

       369
       369
       +
       			s.Pages.Notice(w, "settings-keys", "Unable to add public key at this moment, try again later.")

     

       370
       370
       +
       			return

     

       371
       371
       +
       		}

     

       372
       372
       +
       		defer tx.Rollback()

     

       373
       373
       +
       

     

       374
       374
       +
       		if err := db.AddPublicKey(tx, did, name, key, rkey); err != nil {

     

       375
       375
       +
       			log.Printf("adding public key: %s", err)

     

       376
       376
       +
       			s.Pages.Notice(w, "settings-keys", "Failed to add public key.")

     

       377
       377
       +
       			return

     

       378
       378
       +
       		}

     

       379
       379
       +
       

     

       380
       380
       +
       		// store in pds too

     

       381
       381
       +
       		resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{

     

       382
       382
       +
       			Collection: tangled.PublicKeyNSID,

     

       383
       383
       +
       			Repo:       did,

     

       384
       384
       +
       			Rkey:       rkey,

     

       385
       385
       +
       			Record: &lexutil.LexiconTypeDecoder{

     

       386
       386
       +
       				Val: &tangled.PublicKey{

     

       387
       387
       +
       					Created: time.Now().Format(time.RFC3339),

     

       388
       388
       +
       					Key:     key,

     

       389
       389
       +
       					Name:    name,

     

       390
       390
       +
       				}},

     

       391
       391
       +
       		})

     

       392
       392
       +
       		// invalid record

     

       393
       393
       +
       		if err != nil {

     

       394
       394
       +
       			log.Printf("failed to create record: %s", err)

     

       395
       395
       +
       			s.Pages.Notice(w, "settings-keys", "Failed to create record.")

     

       396
       396
       +
       			return

     

       397
       397
       +
       		}

     

       398
       398
       +
       

     

       399
       399
       +
       		log.Println("created atproto record: ", resp.Uri)

     

       400
       400
       +
       

     

       401
       401
       +
       		err = tx.Commit()

     

       402
       402
       +
       		if err != nil {

     

       403
       403
       +
       			log.Printf("failed to commit tx; adding public key: %s", err)

     

       404
       404
       +
       			s.Pages.Notice(w, "settings-keys", "Unable to add public key at this moment, try again later.")

     

       405
       405
       +
       			return

     

       406
       406
       +
       		}

     

       407
       407
       +
       

     

       408
       408
       +
       		s.Pages.HxLocation(w, "/settings")

     

       409
       409
       +
       		return

     

       410
       410
       +
       

     

       411
       411
       +
       	case http.MethodDelete:

     

       412
       412
       +
       		did := s.Auth.GetDid(r)

     

       413
       413
       +
       		q := r.URL.Query()

     

       414
       414
       +
       

     

       415
       415
       +
       		name := q.Get("name")

     

       416
       416
       +
       		rkey := q.Get("rkey")

     

       417
       417
       +
       		key := q.Get("key")

     

       418
       418
       +
       

     

       419
       419
       +
       		log.Println(name)

     

       420
       420
       +
       		log.Println(rkey)

     

       421
       421
       +
       		log.Println(key)

     

       422
       422
       +
       

     

       423
       423
       +
       		client, _ := s.Auth.AuthorizedClient(r)

     

       424
       424
       +
       

     

       425
       425
       +
       		if err := db.RemovePublicKey(s.Db, did, name, key); err != nil {

     

       426
       426
       +
       			log.Printf("removing public key: %s", err)

     

       427
       427
       +
       			s.Pages.Notice(w, "settings-keys", "Failed to remove public key.")

     

       428
       428
       +
       			return

     

       429
       429
       +
       		}

     

       430
       430
       +
       

     

       431
       431
       +
       		if rkey != "" {

     

       432
       432
       +
       			// remove from pds too

     

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

     

       434
       434
       +
       				Collection: tangled.PublicKeyNSID,

     

       435
       435
       +
       				Repo:       did,

     

       436
       436
       +
       				Rkey:       rkey,

     

       437
       437
       +
       			})

     

       438
       438
       +
       

     

       439
       439
       +
       			// invalid record

     

       440
       440
       +
       			if err != nil {

     

       441
       441
       +
       				log.Printf("failed to delete record from PDS: %s", err)

     

       442
       442
       +
       				s.Pages.Notice(w, "settings-keys", "Failed to remove key from PDS.")

     

       443
       443
       +
       				return

     

       444
       444
       +
       			}

     

       445
       445
       +
       		}

     

       446
       446
       +
       		log.Println("deleted successfully")

     

       447
       447
       +
       

     

       448
       448
       +
       		s.Pages.HxLocation(w, "/settings")

     

       449
       449
       +
       		return

     

       450
       450
       +
       	}

     

       451
       451
       +
       }

+2 -1

appview/state/follow.go

···

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

     

       9
       9
        
       	lexutil "github.com/bluesky-social/indigo/lex/util"

     

       10
       10
        
       	tangled "tangled.sh/tangled.sh/core/api/tangled"

     

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

     

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

     

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

     

       13
       14
        
       )

     
···

       36
       37
        
       	switch r.Method {

     

       37
       38
        
       	case http.MethodPost:

     

       38
       39
        
       		createdAt := time.Now().Format(time.RFC3339)

     

       39
       39
       -
       		rkey := s.TID()

     

       40
       40
       +
       		rkey := appview.TID()

     

       40
       41
        
       		resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{

     

       41
       42
        
       			Collection: tangled.GraphFollowNSID,

     

       42
       43
        
       			Repo:       currentUser.Did,

+16 -93

appview/state/middleware.go

···

       8
       8
        
       	"strings"

     

       9
       9
        
       	"time"

     

       10
       10
        
       

     

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

     

       11
       11
       +
       	"slices"

     

       12
       12
       +
       

     

       12
       13
        
       	"github.com/bluesky-social/indigo/atproto/identity"

     

       13
       13
       -
       	"github.com/bluesky-social/indigo/xrpc"

     

       14
       14
        
       	"github.com/go-chi/chi/v5"

     

       15
       15
       -
       	"tangled.sh/tangled.sh/core/appview"

     

       16
       16
       -
       	"tangled.sh/tangled.sh/core/appview/auth"

     

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

     

       16
       16
       +
       	"tangled.sh/tangled.sh/core/appview/middleware"

     

       18
       17
        
       )

     

       19
       18
        
       

     

       20
       20
       -
       type Middleware func(http.Handler) http.Handler

     

       21
       21
       -
       

     

       22
       22
       -
       func AuthMiddleware(s *State) Middleware {

     

       23
       23
       -
       	return func(next http.Handler) http.Handler {

     

       24
       24
       -
       		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       25
       25
       -
       			redirectFunc := func(w http.ResponseWriter, r *http.Request) {

     

       26
       26
       -
       				http.Redirect(w, r, "/login", http.StatusTemporaryRedirect)

     

       27
       27
       -
       			}

     

       28
       28
       -
       			if r.Header.Get("HX-Request") == "true" {

     

       29
       29
       -
       				redirectFunc = func(w http.ResponseWriter, _ *http.Request) {

     

       30
       30
       -
       					w.Header().Set("HX-Redirect", "/login")

     

       31
       31
       -
       					w.WriteHeader(http.StatusOK)

     

       32
       32
       -
       				}

     

       33
       33
       -
       			}

     

       34
       34
       -
       

     

       35
       35
       -
       			session, err := s.auth.GetSession(r)

     

       36
       36
       -
       			if session.IsNew || err != nil {

     

       37
       37
       -
       				log.Printf("not logged in, redirecting")

     

       38
       38
       -
       				redirectFunc(w, r)

     

       39
       39
       -
       				return

     

       40
       40
       -
       			}

     

       41
       41
       -
       

     

       42
       42
       -
       			authorized, ok := session.Values[appview.SessionAuthenticated].(bool)

     

       43
       43
       -
       			if !ok || !authorized {

     

       44
       44
       -
       				log.Printf("not logged in, redirecting")

     

       45
       45
       -
       				redirectFunc(w, r)

     

       46
       46
       -
       				return

     

       47
       47
       -
       			}

     

       48
       48
       -
       

     

       49
       49
       -
       			// refresh if nearing expiry

     

       50
       50
       -
       			// TODO: dedup with /login

     

       51
       51
       -
       			expiryStr := session.Values[appview.SessionExpiry].(string)

     

       52
       52
       -
       			expiry, err := time.Parse(time.RFC3339, expiryStr)

     

       53
       53
       -
       			if err != nil {

     

       54
       54
       -
       				log.Println("invalid expiry time", err)

     

       55
       55
       -
       				redirectFunc(w, r)

     

       56
       56
       -
       				return

     

       57
       57
       -
       			}

     

       58
       58
       -
       			pdsUrl, ok1 := session.Values[appview.SessionPds].(string)

     

       59
       59
       -
       			did, ok2 := session.Values[appview.SessionDid].(string)

     

       60
       60
       -
       			refreshJwt, ok3 := session.Values[appview.SessionRefreshJwt].(string)

     

       61
       61
       -
       

     

       62
       62
       -
       			if !ok1 || !ok2 || !ok3 {

     

       63
       63
       -
       				log.Println("invalid expiry time", err)

     

       64
       64
       -
       				redirectFunc(w, r)

     

       65
       65
       -
       				return

     

       66
       66
       -
       			}

     

       67
       67
       -
       

     

       68
       68
       -
       			if time.Now().After(expiry) {

     

       69
       69
       -
       				log.Println("token expired, refreshing ...")

     

       70
       70
       -
       

     

       71
       71
       -
       				client := xrpc.Client{

     

       72
       72
       -
       					Host: pdsUrl,

     

       73
       73
       -
       					Auth: &xrpc.AuthInfo{

     

       74
       74
       -
       						Did:        did,

     

       75
       75
       -
       						AccessJwt:  refreshJwt,

     

       76
       76
       -
       						RefreshJwt: refreshJwt,

     

       77
       77
       -
       					},

     

       78
       78
       -
       				}

     

       79
       79
       -
       				atSession, err := comatproto.ServerRefreshSession(r.Context(), &client)

     

       80
       80
       -
       				if err != nil {

     

       81
       81
       -
       					log.Println("failed to refresh session", err)

     

       82
       82
       -
       					redirectFunc(w, r)

     

       83
       83
       -
       					return

     

       84
       84
       -
       				}

     

       85
       85
       -
       

     

       86
       86
       -
       				sessionish := auth.RefreshSessionWrapper{atSession}

     

       87
       87
       -
       

     

       88
       88
       -
       				err = s.auth.StoreSession(r, w, &sessionish, pdsUrl)

     

       89
       89
       -
       				if err != nil {

     

       90
       90
       -
       					log.Printf("failed to store session for did: %s\n: %s", atSession.Did, err)

     

       91
       91
       -
       					return

     

       92
       92
       -
       				}

     

       93
       93
       -
       

     

       94
       94
       -
       				log.Println("successfully refreshed token")

     

       95
       95
       -
       			}

     

       96
       96
       -
       

     

       97
       97
       -
       			next.ServeHTTP(w, r)

     

       98
       98
       -
       		})

     

       99
       99
       -
       	}

     

       100
       100
       -
       }

     

       101
       101
       -
       

     

       102
       102
       -
       func knotRoleMiddleware(s *State, group string) Middleware {

     

       19
       19
       +
       func knotRoleMiddleware(s *State, group string) middleware.Middleware {

     

       103
       20
        
       	return func(next http.Handler) http.Handler {

     

       104
       21
        
       		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       105
       22
        
       			// requires auth also

     
···

       129
       46
        
       	}

     

       130
       47
        
       }

     

       131
       48
        
       

     

       132
       132
       -
       func KnotOwner(s *State) Middleware {

     

       49
       49
       +
       func KnotOwner(s *State) middleware.Middleware {

     

       133
       50
        
       	return knotRoleMiddleware(s, "server:owner")

     

       134
       51
        
       }

     

       135
       52
        
       

     

       136
       136
       -
       func RepoPermissionMiddleware(s *State, requiredPerm string) Middleware {

     

       53
       53
       +
       func RepoPermissionMiddleware(s *State, requiredPerm string) middleware.Middleware {

     

       137
       54
        
       	return func(next http.Handler) http.Handler {

     

       138
       55
        
       		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       139
       56
        
       			// requires auth also

     
···

       150
       67
        
       				return

     

       151
       68
        
       			}

     

       152
       69
        
       

     

       153
       153
       -
       			ok, err := s.enforcer.E.Enforce(actor.Did, f.Knot, f.OwnerSlashRepo(), requiredPerm)

     

       70
       70
       +
       			ok, err := s.enforcer.E.Enforce(actor.Did, f.Knot, f.DidSlashRepo(), requiredPerm)

     

       154
       71
        
       			if err != nil || !ok {

     

       155
       72
        
       				// we need a logged in user

     

       156
       73
        
       				log.Printf("%s does not have perms of a %s in repo %s", actor.Did, requiredPerm, f.OwnerSlashRepo())

     
···

       173
       90
        
       	})

     

       174
       91
        
       }

     

       175
       92
        
       

     

       176
       176
       -
       func ResolveIdent(s *State) Middleware {

     

       93
       93
       +
       func ResolveIdent(s *State) middleware.Middleware {

     

       94
       94
       +
       	excluded := []string{"favicon.ico"}

     

       95
       95
       +
       

     

       177
       96
        
       	return func(next http.Handler) http.Handler {

     

       178
       97
        
       		return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {

     

       179
       98
        
       			didOrHandle := chi.URLParam(req, "user")

     

       99
       99
       +
       			if slices.Contains(excluded, didOrHandle) {

     

       100
       100
       +
       				next.ServeHTTP(w, req)

     

       101
       101
       +
       				return

     

       102
       102
       +
       			}

     

       180
       103
        
       

     

       181
       104
        
       			id, err := s.resolver.ResolveIdent(req.Context(), didOrHandle)

     

       182
       105
        
       			if err != nil {

     
···

       193
       116
        
       	}

     

       194
       117
        
       }

     

       195
       118
        
       

     

       196
       196
       -
       func ResolveRepo(s *State) Middleware {

     

       119
       119
       +
       func ResolveRepo(s *State) middleware.Middleware {

     

       197
       120
        
       	return func(next http.Handler) http.Handler {

     

       198
       121
        
       		return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {

     

       199
       122
        
       			repoName := chi.URLParam(req, "repo")

     
···

       222
       145
        
       }

     

       223
       146
        
       

     

       224
       147
        
       // middleware that is tacked on top of /{user}/{repo}/pulls/{pull}

     

       225
       225
       -
       func ResolvePull(s *State) Middleware {

     

       148
       148
       +
       func ResolvePull(s *State) middleware.Middleware {

     

       226
       149
        
       	return func(next http.Handler) http.Handler {

     

       227
       150
        
       		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       228
       151
        
       			f, err := fullyResolvedRepo(r)

+15 -9

appview/state/profile.go

···

       5
       5
        
       	"log"

     

       6
       6
        
       	"net/http"

     

       7
       7
        
       

     

       8
       8
       +
       	"github.com/bluesky-social/indigo/atproto/identity"

     

       8
       9
        
       	"github.com/go-chi/chi/v5"

     

       9
       10
        
       	"tangled.sh/tangled.sh/core/appview/db"

     

       10
       11
        
       	"tangled.sh/tangled.sh/core/appview/pages"

     
···

       17
       18
        
       		return

     

       18
       19
        
       	}

     

       19
       20
        
       

     

       20
       20
       -
       	ident, err := s.resolver.ResolveIdent(r.Context(), didOrHandle)

     

       21
       21
       -
       	if err != nil {

     

       22
       22
       -
       		log.Printf("resolving identity: %s", err)

     

       23
       23
       -
       		w.WriteHeader(http.StatusNotFound)

     

       21
       21
       +
       	ident, ok := r.Context().Value("resolvedId").(identity.Identity)

     

       22
       22
       +
       	if !ok {

     

       23
       23
       +
       		s.pages.Error404(w)

     

       24
       24
        
       		return

     

       25
       25
        
       	}

     

       26
       26
        
       

     
···

       43
       43
        
       	for _, r := range collaboratingRepos {

     

       44
       44
        
       		didsToResolve = append(didsToResolve, r.Did)

     

       45
       45
        
       	}

     

       46
       46
       -
       	for _, evt := range timeline {

     

       47
       47
       -
       		if evt.Repo != nil {

     

       48
       48
       -
       			if evt.Repo.Source != "" {

     

       49
       49
       -
       				didsToResolve = append(didsToResolve, evt.Source.Did)

     

       46
       46
       +
       	for _, byMonth := range timeline.ByMonth {

     

       47
       47
       +
       		for _, pe := range byMonth.PullEvents.Items {

     

       48
       48
       +
       			didsToResolve = append(didsToResolve, pe.Repo.Did)

     

       49
       49
       +
       		}

     

       50
       50
       +
       		for _, ie := range byMonth.IssueEvents.Items {

     

       51
       51
       +
       			didsToResolve = append(didsToResolve, ie.Metadata.Repo.Did)

     

       52
       52
       +
       		}

     

       53
       53
       +
       		for _, re := range byMonth.RepoEvents {

     

       54
       54
       +
       			didsToResolve = append(didsToResolve, re.Repo.Did)

     

       55
       55
       +
       			if re.Source != nil {

     

       56
       56
       +
       				didsToResolve = append(didsToResolve, re.Source.Did)

     

       50
       57
        
       			}

     

       51
       58
        
       		}

     

       52
       52
       -
       		didsToResolve = append(didsToResolve, evt.Repo.Did)

     

       53
       59
        
       	}

     

       54
       60
        
       

     

       55
       61
        
       	resolvedIds := s.resolver.ResolveIdents(r.Context(), didsToResolve)

+536 -255

appview/state/pull.go

···

       10
       10
        
       	"net/http"

     

       11
       11
        
       	"net/url"

     

       12
       12
        
       	"strconv"

     

       13
       13
       -
       	"strings"

     

       14
       13
        
       	"time"

     

       15
       14
        
       

     

       16
       16
       -
       	"github.com/go-chi/chi/v5"

     

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

     

       16
       16
       +
       	"tangled.sh/tangled.sh/core/appview"

     

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

     

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

     

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

     

       20
       20
       +
       	"tangled.sh/tangled.sh/core/patchutil"

     

       21
       21
        
       	"tangled.sh/tangled.sh/core/types"

     

       22
       22
        
       

     

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

     

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

     

       25
       25
        
       	lexutil "github.com/bluesky-social/indigo/lex/util"

     

       26
       26
       +
       	"github.com/go-chi/chi/v5"

     

       26
       27
        
       )

     

       27
       28
        
       

     

       28
       29
        
       // htmx fragment

     
···

       55
       56
        
       		}

     

       56
       57
        
       

     

       57
       58
        
       		mergeCheckResponse := s.mergeCheck(f, pull)

     

       58
       58
       -
       		var resubmitResult pages.ResubmitResult

     

       59
       59
       +
       		resubmitResult := pages.Unknown

     

       59
       60
        
       		if user.Did == pull.OwnerDid {

     

       60
       61
        
       			resubmitResult = s.resubmitCheck(f, pull)

     

       61
       62
        
       		}

     
···

       115
       116
        
       	}

     

       116
       117
        
       

     

       117
       118
        
       	mergeCheckResponse := s.mergeCheck(f, pull)

     

       118
       118
       -
       	var resubmitResult pages.ResubmitResult

     

       119
       119
       -
       	if user.Did == pull.OwnerDid {

     

       119
       119
       +
       	resubmitResult := pages.Unknown

     

       120
       120
       +
       	if user != nil && user.Did == pull.OwnerDid {

     

       120
       121
        
       		resubmitResult = s.resubmitCheck(f, pull)

     

       121
       122
        
       	}

     

       122
       123
        
       

     

       123
       123
       -
       	var pullSourceRepo *db.Repo

     

       124
       124
       -
       	if pull.PullSource != nil {

     

       125
       125
       -
       		if pull.PullSource.RepoAt != nil {

     

       126
       126
       -
       			pullSourceRepo, err = db.GetRepoByAtUri(s.db, pull.PullSource.RepoAt.String())

     

       127
       127
       -
       			if err != nil {

     

       128
       128
       -
       				log.Printf("failed to get repo by at uri: %v", err)

     

       129
       129
       -
       				return

     

       130
       130
       -
       			}

     

       131
       131
       -
       		}

     

       132
       132
       -
       	}

     

       133
       133
       -
       

     

       134
       124
        
       	s.pages.RepoSinglePull(w, pages.RepoSinglePullParams{

     

       135
       135
       -
       		LoggedInUser:   user,

     

       136
       136
       -
       		RepoInfo:       f.RepoInfo(s, user),

     

       137
       137
       -
       		DidHandleMap:   didHandleMap,

     

       138
       138
       -
       		Pull:           pull,

     

       139
       139
       -
       		PullSourceRepo: pullSourceRepo,

     

       140
       140
       -
       		MergeCheck:     mergeCheckResponse,

     

       141
       141
       -
       		ResubmitCheck:  resubmitResult,

     

       125
       125
       +
       		LoggedInUser:  user,

     

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

     

       127
       127
       +
       		DidHandleMap:  didHandleMap,

     

       128
       128
       +
       		Pull:          pull,

     

       129
       129
       +
       		MergeCheck:    mergeCheckResponse,

     

       130
       130
       +
       		ResubmitCheck: resubmitResult,

     

       142
       131
        
       	})

     

       143
       132
        
       }

     

       144
       133
        
       

     
···

       254
       243
        
       

     

       255
       244
        
       	latestSubmission := pull.Submissions[pull.LastRoundNumber()]

     

       256
       245
        
       	if latestSubmission.SourceRev != result.Branch.Hash {

     

       246
       246
       +
       		fmt.Println(latestSubmission.SourceRev, result.Branch.Hash)

     

       257
       247
        
       		return pages.ShouldResubmit

     

       258
       248
        
       	}

     

       259
       249
        
       

     
···

       294
       284
        
       		}

     

       295
       285
        
       	}

     

       296
       286
        
       

     

       287
       287
       +
       	diff := pull.Submissions[roundIdInt].AsNiceDiff(pull.TargetBranch)

     

       288
       288
       +
       

     

       297
       289
        
       	s.pages.RepoPullPatchPage(w, pages.RepoPullPatchParams{

     

       298
       290
        
       		LoggedInUser: user,

     

       299
       291
        
       		DidHandleMap: didHandleMap,

     
···

       301
       293
        
       		Pull:         pull,

     

       302
       294
        
       		Round:        roundIdInt,

     

       303
       295
        
       		Submission:   pull.Submissions[roundIdInt],

     

       304
       304
       -
       		Diff:         pull.Submissions[roundIdInt].AsNiceDiff(pull.TargetBranch),

     

       296
       296
       +
       		Diff:         &diff,

     

       305
       297
        
       	})

     

       306
       298
        
       

     

       307
       299
        
       }

     

       308
       300
        
       

     

       301
       301
       +
       func (s *State) RepoPullInterdiff(w http.ResponseWriter, r *http.Request) {

     

       302
       302
       +
       	user := s.auth.GetUser(r)

     

       303
       303
       +
       

     

       304
       304
       +
       	f, err := fullyResolvedRepo(r)

     

       305
       305
       +
       	if err != nil {

     

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

     

       307
       307
       +
       		return

     

       308
       308
       +
       	}

     

       309
       309
       +
       

     

       310
       310
       +
       	pull, ok := r.Context().Value("pull").(*db.Pull)

     

       311
       311
       +
       	if !ok {

     

       312
       312
       +
       		log.Println("failed to get pull")

     

       313
       313
       +
       		s.pages.Notice(w, "pull-error", "Failed to get pull.")

     

       314
       314
       +
       		return

     

       315
       315
       +
       	}

     

       316
       316
       +
       

     

       317
       317
       +
       	roundId := chi.URLParam(r, "round")

     

       318
       318
       +
       	roundIdInt, err := strconv.Atoi(roundId)

     

       319
       319
       +
       	if err != nil || roundIdInt >= len(pull.Submissions) {

     

       320
       320
       +
       		http.Error(w, "bad round id", http.StatusBadRequest)

     

       321
       321
       +
       		log.Println("failed to parse round id", err)

     

       322
       322
       +
       		return

     

       323
       323
       +
       	}

     

       324
       324
       +
       

     

       325
       325
       +
       	if roundIdInt == 0 {

     

       326
       326
       +
       		http.Error(w, "bad round id", http.StatusBadRequest)

     

       327
       327
       +
       		log.Println("cannot interdiff initial submission")

     

       328
       328
       +
       		return

     

       329
       329
       +
       	}

     

       330
       330
       +
       

     

       331
       331
       +
       	identsToResolve := []string{pull.OwnerDid}

     

       332
       332
       +
       	resolvedIds := s.resolver.ResolveIdents(r.Context(), identsToResolve)

     

       333
       333
       +
       	didHandleMap := make(map[string]string)

     

       334
       334
       +
       	for _, identity := range resolvedIds {

     

       335
       335
       +
       		if !identity.Handle.IsInvalidHandle() {

     

       336
       336
       +
       			didHandleMap[identity.DID.String()] = fmt.Sprintf("@%s", identity.Handle.String())

     

       337
       337
       +
       		} else {

     

       338
       338
       +
       			didHandleMap[identity.DID.String()] = identity.DID.String()

     

       339
       339
       +
       		}

     

       340
       340
       +
       	}

     

       341
       341
       +
       

     

       342
       342
       +
       	currentPatch, err := pull.Submissions[roundIdInt].AsDiff(pull.TargetBranch)

     

       343
       343
       +
       	if err != nil {

     

       344
       344
       +
       		log.Println("failed to interdiff; current patch malformed")

     

       345
       345
       +
       		s.pages.Notice(w, fmt.Sprintf("interdiff-error-%d", roundIdInt), "Failed to calculate interdiff; current patch is invalid.")

     

       346
       346
       +
       		return

     

       347
       347
       +
       	}

     

       348
       348
       +
       

     

       349
       349
       +
       	previousPatch, err := pull.Submissions[roundIdInt-1].AsDiff(pull.TargetBranch)

     

       350
       350
       +
       	if err != nil {

     

       351
       351
       +
       		log.Println("failed to interdiff; previous patch malformed")

     

       352
       352
       +
       		s.pages.Notice(w, fmt.Sprintf("interdiff-error-%d", roundIdInt), "Failed to calculate interdiff; previous patch is invalid.")

     

       353
       353
       +
       		return

     

       354
       354
       +
       	}

     

       355
       355
       +
       

     

       356
       356
       +
       	interdiff := patchutil.Interdiff(previousPatch, currentPatch)

     

       357
       357
       +
       

     

       358
       358
       +
       	s.pages.RepoPullInterdiffPage(w, pages.RepoPullInterdiffParams{

     

       359
       359
       +
       		LoggedInUser: s.auth.GetUser(r),

     

       360
       360
       +
       		RepoInfo:     f.RepoInfo(s, user),

     

       361
       361
       +
       		Pull:         pull,

     

       362
       362
       +
       		Round:        roundIdInt,

     

       363
       363
       +
       		DidHandleMap: didHandleMap,

     

       364
       364
       +
       		Interdiff:    interdiff,

     

       365
       365
       +
       	})

     

       366
       366
       +
       	return

     

       367
       367
       +
       }

     

       368
       368
       +
       

     

       309
       369
        
       func (s *State) RepoPullPatchRaw(w http.ResponseWriter, r *http.Request) {

     

       310
       370
        
       	pull, ok := r.Context().Value("pull").(*db.Pull)

     

       311
       371
        
       	if !ok {

     
···

       369
       429
        
       				pullSourceRepo, err = db.GetRepoByAtUri(s.db, p.PullSource.RepoAt.String())

     

       370
       430
        
       				if err != nil {

     

       371
       431
        
       					log.Printf("failed to get repo by at uri: %v", err)

     

       372
       372
       -
       					return

     

       432
       432
       +
       					continue

     

       433
       433
       +
       				} else {

     

       434
       434
       +
       					p.PullSource.Repo = pullSourceRepo

     

       373
       435
        
       				}

     

       374
       436
        
       			}

     

       375
       437
        
       		}

     

       376
       376
       -
       

     

       377
       377
       -
       		p.PullSource.Repo = pullSourceRepo

     

       378
       438
        
       	}

     

       379
       439
        
       

     

       380
       440
        
       	identsToResolve := make([]string, len(pulls))

     
···

       464
       524
        
       		atResp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{

     

       465
       525
        
       			Collection: tangled.RepoPullCommentNSID,

     

       466
       526
        
       			Repo:       user.Did,

     

       467
       467
       -
       			Rkey:       s.TID(),

     

       527
       527
       +
       			Rkey:       appview.TID(),

     

       468
       528
        
       			Record: &lexutil.LexiconTypeDecoder{

     

       469
       529
        
       				Val: &tangled.RepoPullComment{

     

       470
       530
        
       					Repo:      &atUri,

     
···

       557
       617
        
       		sourceBranch := r.FormValue("sourceBranch")

     

       558
       618
        
       		patch := r.FormValue("patch")

     

       559
       619
        
       

     

       560
       560
       -
       		// Validate required fields for all PR types

     

       561
       561
       -
       		if title == "" || body == "" || targetBranch == "" {

     

       562
       562
       -
       			s.pages.Notice(w, "pull", "Title, body and target branch are required.")

     

       620
       620
       +
       		if targetBranch == "" {

     

       621
       621
       +
       			s.pages.Notice(w, "pull", "Target branch is required.")

     

       563
       622
        
       			return

     

       564
       623
        
       		}

     

       565
       624
        
       

     
···

       569
       628
        
       		isForkBased := fromFork != "" && sourceBranch != ""

     

       570
       629
        
       		isPatchBased := patch != "" && !isBranchBased && !isForkBased

     

       571
       630
        
       

     

       631
       631
       +
       		if isPatchBased && !patchutil.IsFormatPatch(patch) {

     

       632
       632
       +
       			if title == "" {

     

       633
       633
       +
       				s.pages.Notice(w, "pull", "Title is required for git-diff patches.")

     

       634
       634
       +
       				return

     

       635
       635
       +
       			}

     

       636
       636
       +
       		}

     

       637
       637
       +
       

     

       572
       638
        
       		// Validate we have at least one valid PR creation method

     

       573
       639
        
       		if !isBranchBased && !isPatchBased && !isForkBased {

     

       574
       640
        
       			s.pages.Notice(w, "pull", "Neither source branch nor patch supplied.")

     
···

       581
       647
        
       			return

     

       582
       648
        
       		}

     

       583
       649
        
       

     

       650
       650
       +
       		us, err := NewUnsignedClient(f.Knot, s.config.Dev)

     

       651
       651
       +
       		if err != nil {

     

       652
       652
       +
       			log.Printf("failed to create unsigned client to %s: %v", f.Knot, err)

     

       653
       653
       +
       			s.pages.Notice(w, "pull", "Failed to create a pull request. Try again later.")

     

       654
       654
       +
       			return

     

       655
       655
       +
       		}

     

       656
       656
       +
       

     

       657
       657
       +
       		caps, err := us.Capabilities()

     

       658
       658
       +
       		if err != nil {

     

       659
       659
       +
       			log.Println("error fetching knot caps", f.Knot, err)

     

       660
       660
       +
       			s.pages.Notice(w, "pull", "Failed to create a pull request. Try again later.")

     

       661
       661
       +
       			return

     

       662
       662
       +
       		}

     

       663
       663
       +
       

     

       664
       664
       +
       		if !caps.PullRequests.FormatPatch {

     

       665
       665
       +
       			s.pages.Notice(w, "pull", "This knot doesn't support format-patch. Unfortunately, there is no fallback for now.")

     

       666
       666
       +
       			return

     

       667
       667
       +
       		}

     

       668
       668
       +
       

     

       584
       669
        
       		// Handle the PR creation based on the type

     

       585
       670
        
       		if isBranchBased {

     

       671
       671
       +
       			if !caps.PullRequests.BranchSubmissions {

     

       672
       672
       +
       				s.pages.Notice(w, "pull", "This knot doesn't support branch-based pull requests. Try another way?")

     

       673
       673
       +
       				return

     

       674
       674
       +
       			}

     

       586
       675
        
       			s.handleBranchBasedPull(w, r, f, user, title, body, targetBranch, sourceBranch)

     

       587
       676
        
       		} else if isForkBased {

     

       677
       677
       +
       			if !caps.PullRequests.ForkSubmissions {

     

       678
       678
       +
       				s.pages.Notice(w, "pull", "This knot doesn't support fork-based pull requests. Try another way?")

     

       679
       679
       +
       				return

     

       680
       680
       +
       			}

     

       588
       681
        
       			s.handleForkBasedPull(w, r, f, user, fromFork, title, body, targetBranch, sourceBranch)

     

       589
       682
        
       		} else if isPatchBased {

     

       683
       683
       +
       			if !caps.PullRequests.PatchSubmissions {

     

       684
       684
       +
       				s.pages.Notice(w, "pull", "This knot doesn't support patch-based pull requests. Send your patch over email.")

     

       685
       685
       +
       				return

     

       686
       686
       +
       			}

     

       590
       687
        
       			s.handlePatchBasedPull(w, r, f, user, title, body, targetBranch, patch)

     

       591
       688
        
       		}

     

       592
       689
        
       		return

     
···

       609
       706
        
       		return

     

       610
       707
        
       	}

     

       611
       708
        
       

     

       612
       612
       -
       	resp, err := ksClient.Compare(f.OwnerDid(), f.RepoName, targetBranch, sourceBranch)

     

       613
       613
       -
       	switch resp.StatusCode {

     

       614
       614
       -
       	case 404:

     

       615
       615
       -
       	case 400:

     

       616
       616
       -
       		s.pages.Notice(w, "pull", "Branch based pull requests are not supported on this knot.")

     

       617
       617
       -
       		return

     

       618
       618
       -
       	}

     

       619
       619
       -
       

     

       620
       620
       -
       	respBody, err := io.ReadAll(resp.Body)

     

       709
       709
       +
       	comparison, err := ksClient.Compare(f.OwnerDid(), f.RepoName, targetBranch, sourceBranch)

     

       621
       710
        
       	if err != nil {

     

       622
       622
       -
       		log.Println("failed to compare across branches")

     

       623
       623
       -
       		s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       711
       711
       +
       		log.Println("failed to compare", err)

     

       712
       712
       +
       		s.pages.Notice(w, "pull", err.Error())

     

       624
       713
        
       		return

     

       625
       714
        
       	}

     

       626
       626
       -
       	defer resp.Body.Close()

     

       627
       715
        
       

     

       628
       628
       -
       	var diffTreeResponse types.RepoDiffTreeResponse

     

       629
       629
       -
       	err = json.Unmarshal(respBody, &diffTreeResponse)

     

       630
       630
       -
       	if err != nil {

     

       631
       631
       -
       		log.Println("failed to unmarshal diff tree response", err)

     

       632
       632
       -
       		s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       633
       633
       -
       		return

     

       634
       634
       -
       	}

     

       635
       635
       -
       

     

       636
       636
       -
       	sourceRev := diffTreeResponse.DiffTree.Rev2

     

       637
       637
       -
       	patch := diffTreeResponse.DiffTree.Patch

     

       716
       716
       +
       	sourceRev := comparison.Rev2

     

       717
       717
       +
       	patch := comparison.Patch

     

       638
       718
        
       

     

       639
       639
       -
       	if !isPatchValid(patch) {

     

       719
       719
       +
       	if !patchutil.IsPatchValid(patch) {

     

       640
       720
        
       		s.pages.Notice(w, "pull", "Invalid patch format. Please provide a valid diff.")

     

       641
       721
        
       		return

     

       642
       722
        
       	}

     
···

       645
       725
        
       }

     

       646
       726
        
       

     

       647
       727
        
       func (s *State) handlePatchBasedPull(w http.ResponseWriter, r *http.Request, f *FullyResolvedRepo, user *auth.User, title, body, targetBranch, patch string) {

     

       648
       648
       -
       	if !isPatchValid(patch) {

     

       728
       728
       +
       	if !patchutil.IsPatchValid(patch) {

     

       649
       729
        
       		s.pages.Notice(w, "pull", "Invalid patch format. Please provide a valid diff.")

     

       650
       730
        
       		return

     

       651
       731
        
       	}

     
···

       705
       785
        
       	// hiddenRef: hidden/feature-1/main (on repo-fork)

     

       706
       786
        
       	// targetBranch: main (on repo-1)

     

       707
       787
        
       	// sourceBranch: feature-1 (on repo-fork)

     

       708
       708
       -
       	diffResp, err := us.Compare(user.Did, fork.Name, hiddenRef, sourceBranch)

     

       788
       788
       +
       	comparison, err := us.Compare(user.Did, fork.Name, hiddenRef, sourceBranch)

     

       709
       789
        
       	if err != nil {

     

       710
       790
        
       		log.Println("failed to compare across branches", err)

     

       711
       711
       -
       		s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       712
       712
       -
       		return

     

       713
       713
       -
       	}

     

       714
       714
       -
       

     

       715
       715
       -
       	respBody, err := io.ReadAll(diffResp.Body)

     

       716
       716
       -
       	if err != nil {

     

       717
       717
       -
       		log.Println("failed to read response body", err)

     

       718
       718
       -
       		s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       791
       791
       +
       		s.pages.Notice(w, "pull", err.Error())

     

       719
       792
        
       		return

     

       720
       793
        
       	}

     

       721
       794
        
       

     

       722
       722
       -
       	defer resp.Body.Close()

     

       795
       795
       +
       	sourceRev := comparison.Rev2

     

       796
       796
       +
       	patch := comparison.Patch

     

       723
       797
        
       

     

       724
       724
       -
       	var diffTreeResponse types.RepoDiffTreeResponse

     

       725
       725
       -
       	err = json.Unmarshal(respBody, &diffTreeResponse)

     

       726
       726
       -
       	if err != nil {

     

       727
       727
       -
       		log.Println("failed to unmarshal diff tree response", err)

     

       728
       728
       -
       		s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       729
       729
       -
       		return

     

       730
       730
       -
       	}

     

       731
       731
       -
       

     

       732
       732
       -
       	sourceRev := diffTreeResponse.DiffTree.Rev2

     

       733
       733
       -
       	patch := diffTreeResponse.DiffTree.Patch

     

       734
       734
       -
       

     

       735
       735
       -
       	if !isPatchValid(patch) {

     

       798
       798
       +
       	if !patchutil.IsPatchValid(patch) {

     

       736
       799
        
       		s.pages.Notice(w, "pull", "Invalid patch format. Please provide a valid diff.")

     

       737
       800
        
       		return

     

       738
       801
        
       	}

     
···

       750
       813
        
       	}, &tangled.RepoPull_Source{Branch: sourceBranch, Repo: &fork.AtUri})

     

       751
       814
        
       }

     

       752
       815
        
       

     

       753
       753
       -
       func (s *State) createPullRequest(w http.ResponseWriter, r *http.Request, f *FullyResolvedRepo, user *auth.User, title, body, targetBranch, patch, sourceRev string, pullSource *db.PullSource, recordPullSource *tangled.RepoPull_Source) {

     

       816
       816
       +
       func (s *State) createPullRequest(

     

       817
       817
       +
       	w http.ResponseWriter,

     

       818
       818
       +
       	r *http.Request,

     

       819
       819
       +
       	f *FullyResolvedRepo,

     

       820
       820
       +
       	user *auth.User,

     

       821
       821
       +
       	title, body, targetBranch string,

     

       822
       822
       +
       	patch string,

     

       823
       823
       +
       	sourceRev string,

     

       824
       824
       +
       	pullSource *db.PullSource,

     

       825
       825
       +
       	recordPullSource *tangled.RepoPull_Source,

     

       826
       826
       +
       ) {

     

       754
       827
        
       	tx, err := s.db.BeginTx(r.Context(), nil)

     

       755
       828
        
       	if err != nil {

     

       756
       829
        
       		log.Println("failed to start tx")

     
···

       759
       832
        
       	}

     

       760
       833
        
       	defer tx.Rollback()

     

       761
       834
        
       

     

       762
       762
       -
       	rkey := s.TID()

     

       835
       835
       +
       	// We've already checked earlier if it's diff-based and title is empty,

     

       836
       836
       +
       	// so if it's still empty now, it's intentionally skipped owing to format-patch.

     

       837
       837
       +
       	if title == "" {

     

       838
       838
       +
       		formatPatches, err := patchutil.ExtractPatches(patch)

     

       839
       839
       +
       		if err != nil {

     

       840
       840
       +
       			s.pages.Notice(w, "pull", fmt.Sprintf("Failed to extract patches: %v", err))

     

       841
       841
       +
       			return

     

       842
       842
       +
       		}

     

       843
       843
       +
       		if len(formatPatches) == 0 {

     

       844
       844
       +
       			s.pages.Notice(w, "pull", "No patches found in the supplied format-patch.")

     

       845
       845
       +
       			return

     

       846
       846
       +
       		}

     

       847
       847
       +
       

     

       848
       848
       +
       		title = formatPatches[0].Title

     

       849
       849
       +
       		body = formatPatches[0].Body

     

       850
       850
       +
       	}

     

       851
       851
       +
       

     

       852
       852
       +
       	rkey := appview.TID()

     

       763
       853
        
       	initialSubmission := db.PullSubmission{

     

       764
       854
        
       		Patch:     patch,

     

       765
       855
        
       		SourceRev: sourceRev,

     
···

       813
       903
        
       	}

     

       814
       904
        
       

     

       815
       905
        
       	s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pullId))

     

       906
       906
       +
       }

     

       907
       907
       +
       

     

       908
       908
       +
       func (s *State) ValidatePatch(w http.ResponseWriter, r *http.Request) {

     

       909
       909
       +
       	_, err := fullyResolvedRepo(r)

     

       910
       910
       +
       	if err != nil {

     

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

     

       912
       912
       +
       		return

     

       913
       913
       +
       	}

     

       914
       914
       +
       

     

       915
       915
       +
       	patch := r.FormValue("patch")

     

       916
       916
       +
       	if patch == "" {

     

       917
       917
       +
       		s.pages.Notice(w, "patch-error", "Patch is required.")

     

       918
       918
       +
       		return

     

       919
       919
       +
       	}

     

       920
       920
       +
       

     

       921
       921
       +
       	if patch == "" || !patchutil.IsPatchValid(patch) {

     

       922
       922
       +
       		s.pages.Notice(w, "patch-error", "Invalid patch format. Please provide a valid git diff or format-patch.")

     

       923
       923
       +
       		return

     

       924
       924
       +
       	}

     

       925
       925
       +
       

     

       926
       926
       +
       	if patchutil.IsFormatPatch(patch) {

     

       927
       927
       +
       		s.pages.Notice(w, "patch-preview", "git-format-patch detected. Title and description are optional; if left out, they will be extracted from the first commit.")

     

       928
       928
       +
       	} else {

     

       929
       929
       +
       		s.pages.Notice(w, "patch-preview", "Regular git-diff detected. Please provide a title and description.")

     

       930
       930
       +
       	}

     

       816
       931
        
       }

     

       817
       932
        
       

     

       818
       933
        
       func (s *State) PatchUploadFragment(w http.ResponseWriter, r *http.Request) {

     
···

       990
       1105
        
       		})

     

       991
       1106
        
       		return

     

       992
       1107
        
       	case http.MethodPost:

     

       993
       993
       -
       		patch := r.FormValue("patch")

     

       994
       994
       -
       		var sourceRev string

     

       995
       995
       -
       		var recordPullSource *tangled.RepoPull_Source

     

       996
       996
       -
       

     

       997
       997
       -
       		var ownerDid, repoName, knotName string

     

       998
       998
       -
       		var isSameRepo bool = pull.IsSameRepoBranch()

     

       999
       999
       -
       		sourceBranch := pull.PullSource.Branch

     

       1000
       1000
       -
       		targetBranch := pull.TargetBranch

     

       1001
       1001
       -
       		recordPullSource = &tangled.RepoPull_Source{

     

       1002
       1002
       -
       			Branch: sourceBranch,

     

       1108
       1108
       +
       		if pull.IsPatchBased() {

     

       1109
       1109
       +
       			s.resubmitPatch(w, r)

     

       1110
       1110
       +
       			return

     

       1111
       1111
       +
       		} else if pull.IsBranchBased() {

     

       1112
       1112
       +
       			s.resubmitBranch(w, r)

     

       1113
       1113
       +
       			return

     

       1114
       1114
       +
       		} else if pull.IsForkBased() {

     

       1115
       1115
       +
       			s.resubmitFork(w, r)

     

       1116
       1116
       +
       			return

     

       1003
       1117
        
       		}

     

       1118
       1118
       +
       	}

     

       1119
       1119
       +
       }

     

       1004
       1120
        
       

     

       1005
       1005
       -
       		isPushAllowed := f.RepoInfo(s, user).Roles.IsPushAllowed()

     

       1006
       1006
       -
       		if isSameRepo && isPushAllowed {

     

       1007
       1007
       -
       			ownerDid = f.OwnerDid()

     

       1008
       1008
       -
       			repoName = f.RepoName

     

       1009
       1009
       -
       			knotName = f.Knot

     

       1010
       1010
       -
       		} else if !isSameRepo {

     

       1011
       1011
       -
       			sourceRepo, err := db.GetRepoByAtUri(s.db, pull.PullSource.RepoAt.String())

     

       1012
       1012
       -
       			if err != nil {

     

       1013
       1013
       -
       				log.Println("failed to get source repo", err)

     

       1014
       1014
       -
       				s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       1015
       1015
       -
       				return

     

       1016
       1016
       -
       			}

     

       1017
       1017
       -
       			ownerDid = sourceRepo.Did

     

       1018
       1018
       -
       			repoName = sourceRepo.Name

     

       1019
       1019
       -
       			knotName = sourceRepo.Knot

     

       1020
       1020
       -
       		}

     

       1121
       1121
       +
       func (s *State) resubmitPatch(w http.ResponseWriter, r *http.Request) {

     

       1122
       1122
       +
       	user := s.auth.GetUser(r)

     

       1123
       1123
       +
       

     

       1124
       1124
       +
       	pull, ok := r.Context().Value("pull").(*db.Pull)

     

       1125
       1125
       +
       	if !ok {

     

       1126
       1126
       +
       		log.Println("failed to get pull")

     

       1127
       1127
       +
       		s.pages.Notice(w, "pull-error", "Failed to edit patch. Try again later.")

     

       1128
       1128
       +
       		return

     

       1129
       1129
       +
       	}

     

       1130
       1130
       +
       

     

       1131
       1131
       +
       	f, err := fullyResolvedRepo(r)

     

       1132
       1132
       +
       	if err != nil {

     

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

     

       1134
       1134
       +
       		return

     

       1135
       1135
       +
       	}

     

       1136
       1136
       +
       

     

       1137
       1137
       +
       	if user.Did != pull.OwnerDid {

     

       1138
       1138
       +
       		log.Println("unauthorized user")

     

       1139
       1139
       +
       		w.WriteHeader(http.StatusUnauthorized)

     

       1140
       1140
       +
       		return

     

       1141
       1141
       +
       	}

     

       1142
       1142
       +
       

     

       1143
       1143
       +
       	patch := r.FormValue("patch")

     

       1144
       1144
       +
       

     

       1145
       1145
       +
       	if err = validateResubmittedPatch(pull, patch); err != nil {

     

       1146
       1146
       +
       		s.pages.Notice(w, "resubmit-error", err.Error())

     

       1147
       1147
       +
       		return

     

       1148
       1148
       +
       	}

     

       1149
       1149
       +
       

     

       1150
       1150
       +
       	tx, err := s.db.BeginTx(r.Context(), nil)

     

       1151
       1151
       +
       	if err != nil {

     

       1152
       1152
       +
       		log.Println("failed to start tx")

     

       1153
       1153
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1154
       1154
       +
       		return

     

       1155
       1155
       +
       	}

     

       1156
       1156
       +
       	defer tx.Rollback()

     

       1157
       1157
       +
       

     

       1158
       1158
       +
       	err = db.ResubmitPull(tx, pull, patch, "")

     

       1159
       1159
       +
       	if err != nil {

     

       1160
       1160
       +
       		log.Println("failed to resubmit pull request", err)

     

       1161
       1161
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to resubmit pull request. Try again later.")

     

       1162
       1162
       +
       		return

     

       1163
       1163
       +
       	}

     

       1164
       1164
       +
       	client, _ := s.auth.AuthorizedClient(r)

     

       1165
       1165
       +
       

     

       1166
       1166
       +
       	ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoPullNSID, user.Did, pull.Rkey)

     

       1167
       1167
       +
       	if err != nil {

     

       1168
       1168
       +
       		// failed to get record

     

       1169
       1169
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to update pull, no record found on PDS.")

     

       1170
       1170
       +
       		return

     

       1171
       1171
       +
       	}

     

       1172
       1172
       +
       

     

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

     

       1174
       1174
       +
       		Collection: tangled.RepoPullNSID,

     

       1175
       1175
       +
       		Repo:       user.Did,

     

       1176
       1176
       +
       		Rkey:       pull.Rkey,

     

       1177
       1177
       +
       		SwapRecord: ex.Cid,

     

       1178
       1178
       +
       		Record: &lexutil.LexiconTypeDecoder{

     

       1179
       1179
       +
       			Val: &tangled.RepoPull{

     

       1180
       1180
       +
       				Title:        pull.Title,

     

       1181
       1181
       +
       				PullId:       int64(pull.PullId),

     

       1182
       1182
       +
       				TargetRepo:   string(f.RepoAt),

     

       1183
       1183
       +
       				TargetBranch: pull.TargetBranch,

     

       1184
       1184
       +
       				Patch:        patch, // new patch

     

       1185
       1185
       +
       			},

     

       1186
       1186
       +
       		},

     

       1187
       1187
       +
       	})

     

       1188
       1188
       +
       	if err != nil {

     

       1189
       1189
       +
       		log.Println("failed to update record", err)

     

       1190
       1190
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.")

     

       1191
       1191
       +
       		return

     

       1192
       1192
       +
       	}

     

       1193
       1193
       +
       

     

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

     

       1195
       1195
       +
       		log.Println("failed to commit transaction", err)

     

       1196
       1196
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to resubmit pull.")

     

       1197
       1197
       +
       		return

     

       1198
       1198
       +
       	}

     

       1021
       1199
        
       

     

       1022
       1022
       -
       		if sourceBranch != "" && knotName != "" {

     

       1023
       1023
       -
       			// extract patch by performing compare

     

       1024
       1024
       -
       			ksClient, err := NewUnsignedClient(knotName, s.config.Dev)

     

       1025
       1025
       -
       			if err != nil {

     

       1026
       1026
       -
       				log.Printf("failed to create client for %s: %s", knotName, err)

     

       1027
       1027
       -
       				s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       1028
       1028
       -
       				return

     

       1029
       1029
       -
       			}

     

       1200
       1200
       +
       	s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pull.PullId))

     

       1201
       1201
       +
       	return

     

       1202
       1202
       +
       }

     

       1030
       1203
        
       

     

       1031
       1031
       -
       			if !isSameRepo {

     

       1032
       1032
       -
       				secret, err := db.GetRegistrationKey(s.db, knotName)

     

       1033
       1033
       -
       				if err != nil {

     

       1034
       1034
       -
       					log.Printf("failed to get registration key for %s: %s", knotName, err)

     

       1035
       1035
       -
       					s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       1036
       1036
       -
       					return

     

       1037
       1037
       -
       				}

     

       1038
       1038
       -
       				// update the hidden tracking branch to latest

     

       1039
       1039
       -
       				signedClient, err := NewSignedClient(knotName, secret, s.config.Dev)

     

       1040
       1040
       -
       				if err != nil {

     

       1041
       1041
       -
       					log.Printf("failed to create signed client for %s: %s", knotName, err)

     

       1042
       1042
       -
       					s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       1043
       1043
       -
       					return

     

       1044
       1044
       -
       				}

     

       1045
       1045
       -
       				resp, err := signedClient.NewHiddenRef(ownerDid, repoName, sourceBranch, targetBranch)

     

       1046
       1046
       -
       				if err != nil || resp.StatusCode != http.StatusNoContent {

     

       1047
       1047
       -
       					log.Printf("failed to update tracking branch: %s", err)

     

       1048
       1048
       -
       					s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       1049
       1049
       -
       					return

     

       1050
       1050
       -
       				}

     

       1051
       1051
       -
       			}

     

       1204
       1204
       +
       func (s *State) resubmitBranch(w http.ResponseWriter, r *http.Request) {

     

       1205
       1205
       +
       	user := s.auth.GetUser(r)

     

       1052
       1206
        
       

     

       1053
       1053
       -
       			var compareResp *http.Response

     

       1054
       1054
       -
       			if !isSameRepo {

     

       1055
       1055
       -
       				hiddenRef := url.QueryEscape(fmt.Sprintf("hidden/%s/%s", sourceBranch, targetBranch))

     

       1056
       1056
       -
       				compareResp, err = ksClient.Compare(ownerDid, repoName, hiddenRef, sourceBranch)

     

       1057
       1057
       -
       			} else {

     

       1058
       1058
       -
       				compareResp, err = ksClient.Compare(ownerDid, repoName, targetBranch, sourceBranch)

     

       1059
       1059
       -
       			}

     

       1060
       1060
       -
       			if err != nil {

     

       1061
       1061
       -
       				log.Printf("failed to compare branches: %s", err)

     

       1062
       1062
       -
       				s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       1063
       1063
       -
       				return

     

       1064
       1064
       -
       			}

     

       1065
       1065
       -
       			defer compareResp.Body.Close()

     

       1207
       1207
       +
       	pull, ok := r.Context().Value("pull").(*db.Pull)

     

       1208
       1208
       +
       	if !ok {

     

       1209
       1209
       +
       		log.Println("failed to get pull")

     

       1210
       1210
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to edit patch. Try again later.")

     

       1211
       1211
       +
       		return

     

       1212
       1212
       +
       	}

     

       1066
       1213
        
       

     

       1067
       1067
       -
       			switch compareResp.StatusCode {

     

       1068
       1068
       -
       			case 404:

     

       1069
       1069
       -
       			case 400:

     

       1070
       1070
       -
       				s.pages.Notice(w, "pull", "Branch based pull requests are not supported on this knot.")

     

       1071
       1071
       -
       				return

     

       1072
       1072
       -
       			}

     

       1214
       1214
       +
       	f, err := fullyResolvedRepo(r)

     

       1215
       1215
       +
       	if err != nil {

     

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

     

       1217
       1217
       +
       		return

     

       1218
       1218
       +
       	}

     

       1073
       1219
        
       

     

       1074
       1074
       -
       			respBody, err := io.ReadAll(compareResp.Body)

     

       1075
       1075
       -
       			if err != nil {

     

       1076
       1076
       -
       				log.Println("failed to compare across branches")

     

       1077
       1077
       -
       				s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       1078
       1078
       -
       				return

     

       1079
       1079
       -
       			}

     

       1080
       1080
       -
       			defer compareResp.Body.Close()

     

       1220
       1220
       +
       	if user.Did != pull.OwnerDid {

     

       1221
       1221
       +
       		log.Println("unauthorized user")

     

       1222
       1222
       +
       		w.WriteHeader(http.StatusUnauthorized)

     

       1223
       1223
       +
       		return

     

       1224
       1224
       +
       	}

     

       1081
       1225
        
       

     

       1082
       1082
       -
       			var diffTreeResponse types.RepoDiffTreeResponse

     

       1083
       1083
       -
       			err = json.Unmarshal(respBody, &diffTreeResponse)

     

       1084
       1084
       -
       			if err != nil {

     

       1085
       1085
       -
       				log.Println("failed to unmarshal diff tree response", err)

     

       1086
       1086
       -
       				s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     

       1087
       1087
       -
       				return

     

       1088
       1088
       -
       			}

     

       1226
       1226
       +
       	if !f.RepoInfo(s, user).Roles.IsPushAllowed() {

     

       1227
       1227
       +
       		log.Println("unauthorized user")

     

       1228
       1228
       +
       		w.WriteHeader(http.StatusUnauthorized)

     

       1229
       1229
       +
       		return

     

       1230
       1230
       +
       	}

     

       1089
       1231
        
       

     

       1090
       1090
       -
       			sourceRev = diffTreeResponse.DiffTree.Rev2

     

       1091
       1091
       -
       			patch = diffTreeResponse.DiffTree.Patch

     

       1092
       1092
       -
       		}

     

       1232
       1232
       +
       	ksClient, err := NewUnsignedClient(f.Knot, s.config.Dev)

     

       1233
       1233
       +
       	if err != nil {

     

       1234
       1234
       +
       		log.Printf("failed to create client for %s: %s", f.Knot, err)

     

       1235
       1235
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1236
       1236
       +
       		return

     

       1237
       1237
       +
       	}

     

       1093
       1238
        
       

     

       1094
       1094
       -
       		if patch == "" {

     

       1095
       1095
       -
       			s.pages.Notice(w, "resubmit-error", "Patch is empty.")

     

       1096
       1096
       -
       			return

     

       1097
       1097
       -
       		}

     

       1239
       1239
       +
       	comparison, err := ksClient.Compare(f.OwnerDid(), f.RepoName, pull.TargetBranch, pull.PullSource.Branch)

     

       1240
       1240
       +
       	if err != nil {

     

       1241
       1241
       +
       		log.Printf("compare request failed: %s", err)

     

       1242
       1242
       +
       		s.pages.Notice(w, "resubmit-error", err.Error())

     

       1243
       1243
       +
       		return

     

       1244
       1244
       +
       	}

     

       1098
       1245
        
       

     

       1099
       1099
       -
       		if patch == pull.LatestPatch() {

     

       1100
       1100
       -
       			s.pages.Notice(w, "resubmit-error", "Patch is identical to previous submission.")

     

       1101
       1101
       -
       			return

     

       1102
       1102
       -
       		}

     

       1246
       1246
       +
       	sourceRev := comparison.Rev2

     

       1247
       1247
       +
       	patch := comparison.Patch

     

       1103
       1248
        
       

     

       1104
       1104
       -
       		if sourceRev == pull.Submissions[pull.LastRoundNumber()].SourceRev {

     

       1105
       1105
       -
       			s.pages.Notice(w, "resubmit-error", "This branch has not changed since the last submission.")

     

       1106
       1106
       -
       			return

     

       1107
       1107
       -
       		}

     

       1249
       1249
       +
       	if err = validateResubmittedPatch(pull, patch); err != nil {

     

       1250
       1250
       +
       		s.pages.Notice(w, "resubmit-error", err.Error())

     

       1251
       1251
       +
       		return

     

       1252
       1252
       +
       	}

     

       1108
       1253
        
       

     

       1109
       1109
       -
       		if !isPatchValid(patch) {

     

       1110
       1110
       -
       			s.pages.Notice(w, "resubmit-error", "Invalid patch format. Please provide a valid diff.")

     

       1111
       1111
       -
       			return

     

       1112
       1112
       -
       		}

     

       1254
       1254
       +
       	if sourceRev == pull.Submissions[pull.LastRoundNumber()].SourceRev {

     

       1255
       1255
       +
       		s.pages.Notice(w, "resubmit-error", "This branch has not changed since the last submission.")

     

       1256
       1256
       +
       		return

     

       1257
       1257
       +
       	}

     

       1113
       1258
        
       

     

       1114
       1114
       -
       		tx, err := s.db.BeginTx(r.Context(), nil)

     

       1115
       1115
       -
       		if err != nil {

     

       1116
       1116
       -
       			log.Println("failed to start tx")

     

       1117
       1117
       -
       			s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1118
       1118
       -
       			return

     

       1119
       1119
       -
       		}

     

       1120
       1120
       -
       		defer tx.Rollback()

     

       1259
       1259
       +
       	tx, err := s.db.BeginTx(r.Context(), nil)

     

       1260
       1260
       +
       	if err != nil {

     

       1261
       1261
       +
       		log.Println("failed to start tx")

     

       1262
       1262
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1263
       1263
       +
       		return

     

       1264
       1264
       +
       	}

     

       1265
       1265
       +
       	defer tx.Rollback()

     

       1121
       1266
        
       

     

       1122
       1122
       -
       		err = db.ResubmitPull(tx, pull, patch, sourceRev)

     

       1123
       1123
       -
       		if err != nil {

     

       1124
       1124
       -
       			log.Println("failed to create pull request", err)

     

       1125
       1125
       -
       			s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1126
       1126
       -
       			return

     

       1127
       1127
       -
       		}

     

       1128
       1128
       -
       		client, _ := s.auth.AuthorizedClient(r)

     

       1267
       1267
       +
       	err = db.ResubmitPull(tx, pull, patch, sourceRev)

     

       1268
       1268
       +
       	if err != nil {

     

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

     

       1270
       1270
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1271
       1271
       +
       		return

     

       1272
       1272
       +
       	}

     

       1273
       1273
       +
       	client, _ := s.auth.AuthorizedClient(r)

     

       1129
       1274
        
       

     

       1130
       1130
       -
       		ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoPullNSID, user.Did, pull.Rkey)

     

       1131
       1131
       -
       		if err != nil {

     

       1132
       1132
       -
       			// failed to get record

     

       1133
       1133
       -
       			s.pages.Notice(w, "resubmit-error", "Failed to update pull, no record found on PDS.")

     

       1134
       1134
       -
       			return

     

       1135
       1135
       -
       		}

     

       1275
       1275
       +
       	ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoPullNSID, user.Did, pull.Rkey)

     

       1276
       1276
       +
       	if err != nil {

     

       1277
       1277
       +
       		// failed to get record

     

       1278
       1278
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to update pull, no record found on PDS.")

     

       1279
       1279
       +
       		return

     

       1280
       1280
       +
       	}

     

       1136
       1281
        
       

     

       1137
       1137
       -
       		_, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{

     

       1138
       1138
       -
       			Collection: tangled.RepoPullNSID,

     

       1139
       1139
       -
       			Repo:       user.Did,

     

       1140
       1140
       -
       			Rkey:       pull.Rkey,

     

       1141
       1141
       -
       			SwapRecord: ex.Cid,

     

       1142
       1142
       -
       			Record: &lexutil.LexiconTypeDecoder{

     

       1143
       1143
       -
       				Val: &tangled.RepoPull{

     

       1144
       1144
       -
       					Title:        pull.Title,

     

       1145
       1145
       -
       					PullId:       int64(pull.PullId),

     

       1146
       1146
       -
       					TargetRepo:   string(f.RepoAt),

     

       1147
       1147
       -
       					TargetBranch: pull.TargetBranch,

     

       1148
       1148
       -
       					Patch:        patch, // new patch

     

       1149
       1149
       -
       					Source:       recordPullSource,

     

       1150
       1150
       -
       				},

     

       1282
       1282
       +
       	recordPullSource := &tangled.RepoPull_Source{

     

       1283
       1283
       +
       		Branch: pull.PullSource.Branch,

     

       1284
       1284
       +
       	}

     

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

     

       1286
       1286
       +
       		Collection: tangled.RepoPullNSID,

     

       1287
       1287
       +
       		Repo:       user.Did,

     

       1288
       1288
       +
       		Rkey:       pull.Rkey,

     

       1289
       1289
       +
       		SwapRecord: ex.Cid,

     

       1290
       1290
       +
       		Record: &lexutil.LexiconTypeDecoder{

     

       1291
       1291
       +
       			Val: &tangled.RepoPull{

     

       1292
       1292
       +
       				Title:        pull.Title,

     

       1293
       1293
       +
       				PullId:       int64(pull.PullId),

     

       1294
       1294
       +
       				TargetRepo:   string(f.RepoAt),

     

       1295
       1295
       +
       				TargetBranch: pull.TargetBranch,

     

       1296
       1296
       +
       				Patch:        patch, // new patch

     

       1297
       1297
       +
       				Source:       recordPullSource,

     

       1151
       1298
        
       			},

     

       1152
       1152
       -
       		})

     

       1153
       1153
       -
       		if err != nil {

     

       1154
       1154
       -
       			log.Println("failed to update record", err)

     

       1155
       1155
       -
       			s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.")

     

       1156
       1156
       -
       			return

     

       1157
       1157
       -
       		}

     

       1299
       1299
       +
       		},

     

       1300
       1300
       +
       	})

     

       1301
       1301
       +
       	if err != nil {

     

       1302
       1302
       +
       		log.Println("failed to update record", err)

     

       1303
       1303
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.")

     

       1304
       1304
       +
       		return

     

       1305
       1305
       +
       	}

     

       1306
       1306
       +
       

     

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

     

       1308
       1308
       +
       		log.Println("failed to commit transaction", err)

     

       1309
       1309
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to resubmit pull.")

     

       1310
       1310
       +
       		return

     

       1311
       1311
       +
       	}

     

       1312
       1312
       +
       

     

       1313
       1313
       +
       	s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pull.PullId))

     

       1314
       1314
       +
       	return

     

       1315
       1315
       +
       }

     

       1316
       1316
       +
       

     

       1317
       1317
       +
       func (s *State) resubmitFork(w http.ResponseWriter, r *http.Request) {

     

       1318
       1318
       +
       	user := s.auth.GetUser(r)

     

       1319
       1319
       +
       

     

       1320
       1320
       +
       	pull, ok := r.Context().Value("pull").(*db.Pull)

     

       1321
       1321
       +
       	if !ok {

     

       1322
       1322
       +
       		log.Println("failed to get pull")

     

       1323
       1323
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to edit patch. Try again later.")

     

       1324
       1324
       +
       		return

     

       1325
       1325
       +
       	}

     

       1326
       1326
       +
       

     

       1327
       1327
       +
       	f, err := fullyResolvedRepo(r)

     

       1328
       1328
       +
       	if err != nil {

     

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

     

       1330
       1330
       +
       		return

     

       1331
       1331
       +
       	}

     

       1332
       1332
       +
       

     

       1333
       1333
       +
       	if user.Did != pull.OwnerDid {

     

       1334
       1334
       +
       		log.Println("unauthorized user")

     

       1335
       1335
       +
       		w.WriteHeader(http.StatusUnauthorized)

     

       1336
       1336
       +
       		return

     

       1337
       1337
       +
       	}

     

       1338
       1338
       +
       

     

       1339
       1339
       +
       	forkRepo, err := db.GetRepoByAtUri(s.db, pull.PullSource.RepoAt.String())

     

       1340
       1340
       +
       	if err != nil {

     

       1341
       1341
       +
       		log.Println("failed to get source repo", err)

     

       1342
       1342
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1343
       1343
       +
       		return

     

       1344
       1344
       +
       	}

     

       1345
       1345
       +
       

     

       1346
       1346
       +
       	// extract patch by performing compare

     

       1347
       1347
       +
       	ksClient, err := NewUnsignedClient(forkRepo.Knot, s.config.Dev)

     

       1348
       1348
       +
       	if err != nil {

     

       1349
       1349
       +
       		log.Printf("failed to create client for %s: %s", forkRepo.Knot, err)

     

       1350
       1350
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1351
       1351
       +
       		return

     

       1352
       1352
       +
       	}

     

       1353
       1353
       +
       

     

       1354
       1354
       +
       	secret, err := db.GetRegistrationKey(s.db, forkRepo.Knot)

     

       1355
       1355
       +
       	if err != nil {

     

       1356
       1356
       +
       		log.Printf("failed to get registration key for %s: %s", forkRepo.Knot, err)

     

       1357
       1357
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1358
       1358
       +
       		return

     

       1359
       1359
       +
       	}

     

       1360
       1360
       +
       

     

       1361
       1361
       +
       	// update the hidden tracking branch to latest

     

       1362
       1362
       +
       	signedClient, err := NewSignedClient(forkRepo.Knot, secret, s.config.Dev)

     

       1363
       1363
       +
       	if err != nil {

     

       1364
       1364
       +
       		log.Printf("failed to create signed client for %s: %s", forkRepo.Knot, err)

     

       1365
       1365
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1366
       1366
       +
       		return

     

       1367
       1367
       +
       	}

     

       1158
       1368
        
       

     

       1159
       1159
       -
       		if err = tx.Commit(); err != nil {

     

       1160
       1160
       -
       			log.Println("failed to commit transaction", err)

     

       1161
       1161
       -
       			s.pages.Notice(w, "resubmit-error", "Failed to resubmit pull.")

     

       1162
       1162
       -
       			return

     

       1163
       1163
       -
       		}

     

       1369
       1369
       +
       	resp, err := signedClient.NewHiddenRef(forkRepo.Did, forkRepo.Name, pull.PullSource.Branch, pull.TargetBranch)

     

       1370
       1370
       +
       	if err != nil || resp.StatusCode != http.StatusNoContent {

     

       1371
       1371
       +
       		log.Printf("failed to update tracking branch: %s", err)

     

       1372
       1372
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1373
       1373
       +
       		return

     

       1374
       1374
       +
       	}

     

       1164
       1375
        
       

     

       1165
       1165
       -
       		s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pull.PullId))

     

       1376
       1376
       +
       	hiddenRef := url.QueryEscape(fmt.Sprintf("hidden/%s/%s", pull.PullSource.Branch, pull.TargetBranch))

     

       1377
       1377
       +
       	comparison, err := ksClient.Compare(forkRepo.Did, forkRepo.Name, hiddenRef, pull.PullSource.Branch)

     

       1378
       1378
       +
       	if err != nil {

     

       1379
       1379
       +
       		log.Printf("failed to compare branches: %s", err)

     

       1380
       1380
       +
       		s.pages.Notice(w, "resubmit-error", err.Error())

     

       1166
       1381
        
       		return

     

       1167
       1382
        
       	}

     

       1383
       1383
       +
       

     

       1384
       1384
       +
       	sourceRev := comparison.Rev2

     

       1385
       1385
       +
       	patch := comparison.Patch

     

       1386
       1386
       +
       

     

       1387
       1387
       +
       	if err = validateResubmittedPatch(pull, patch); err != nil {

     

       1388
       1388
       +
       		s.pages.Notice(w, "resubmit-error", err.Error())

     

       1389
       1389
       +
       		return

     

       1390
       1390
       +
       	}

     

       1391
       1391
       +
       

     

       1392
       1392
       +
       	if sourceRev == pull.Submissions[pull.LastRoundNumber()].SourceRev {

     

       1393
       1393
       +
       		s.pages.Notice(w, "resubmit-error", "This branch has not changed since the last submission.")

     

       1394
       1394
       +
       		return

     

       1395
       1395
       +
       	}

     

       1396
       1396
       +
       

     

       1397
       1397
       +
       	tx, err := s.db.BeginTx(r.Context(), nil)

     

       1398
       1398
       +
       	if err != nil {

     

       1399
       1399
       +
       		log.Println("failed to start tx")

     

       1400
       1400
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1401
       1401
       +
       		return

     

       1402
       1402
       +
       	}

     

       1403
       1403
       +
       	defer tx.Rollback()

     

       1404
       1404
       +
       

     

       1405
       1405
       +
       	err = db.ResubmitPull(tx, pull, patch, sourceRev)

     

       1406
       1406
       +
       	if err != nil {

     

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

     

       1408
       1408
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")

     

       1409
       1409
       +
       		return

     

       1410
       1410
       +
       	}

     

       1411
       1411
       +
       	client, _ := s.auth.AuthorizedClient(r)

     

       1412
       1412
       +
       

     

       1413
       1413
       +
       	ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoPullNSID, user.Did, pull.Rkey)

     

       1414
       1414
       +
       	if err != nil {

     

       1415
       1415
       +
       		// failed to get record

     

       1416
       1416
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to update pull, no record found on PDS.")

     

       1417
       1417
       +
       		return

     

       1418
       1418
       +
       	}

     

       1419
       1419
       +
       

     

       1420
       1420
       +
       	repoAt := pull.PullSource.RepoAt.String()

     

       1421
       1421
       +
       	recordPullSource := &tangled.RepoPull_Source{

     

       1422
       1422
       +
       		Branch: pull.PullSource.Branch,

     

       1423
       1423
       +
       		Repo:   &repoAt,

     

       1424
       1424
       +
       	}

     

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

     

       1426
       1426
       +
       		Collection: tangled.RepoPullNSID,

     

       1427
       1427
       +
       		Repo:       user.Did,

     

       1428
       1428
       +
       		Rkey:       pull.Rkey,

     

       1429
       1429
       +
       		SwapRecord: ex.Cid,

     

       1430
       1430
       +
       		Record: &lexutil.LexiconTypeDecoder{

     

       1431
       1431
       +
       			Val: &tangled.RepoPull{

     

       1432
       1432
       +
       				Title:        pull.Title,

     

       1433
       1433
       +
       				PullId:       int64(pull.PullId),

     

       1434
       1434
       +
       				TargetRepo:   string(f.RepoAt),

     

       1435
       1435
       +
       				TargetBranch: pull.TargetBranch,

     

       1436
       1436
       +
       				Patch:        patch, // new patch

     

       1437
       1437
       +
       				Source:       recordPullSource,

     

       1438
       1438
       +
       			},

     

       1439
       1439
       +
       		},

     

       1440
       1440
       +
       	})

     

       1441
       1441
       +
       	if err != nil {

     

       1442
       1442
       +
       		log.Println("failed to update record", err)

     

       1443
       1443
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to update pull request on the PDS. Try again later.")

     

       1444
       1444
       +
       		return

     

       1445
       1445
       +
       	}

     

       1446
       1446
       +
       

     

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

     

       1448
       1448
       +
       		log.Println("failed to commit transaction", err)

     

       1449
       1449
       +
       		s.pages.Notice(w, "resubmit-error", "Failed to resubmit pull.")

     

       1450
       1450
       +
       		return

     

       1451
       1451
       +
       	}

     

       1452
       1452
       +
       

     

       1453
       1453
       +
       	s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pull.PullId))

     

       1454
       1454
       +
       	return

     

       1455
       1455
       +
       }

     

       1456
       1456
       +
       

     

       1457
       1457
       +
       // validate a resubmission against a pull request

     

       1458
       1458
       +
       func validateResubmittedPatch(pull *db.Pull, patch string) error {

     

       1459
       1459
       +
       	if patch == "" {

     

       1460
       1460
       +
       		return fmt.Errorf("Patch is empty.")

     

       1461
       1461
       +
       	}

     

       1462
       1462
       +
       

     

       1463
       1463
       +
       	if patch == pull.LatestPatch() {

     

       1464
       1464
       +
       		return fmt.Errorf("Patch is identical to previous submission.")

     

       1465
       1465
       +
       	}

     

       1466
       1466
       +
       

     

       1467
       1467
       +
       	if !patchutil.IsPatchValid(patch) {

     

       1468
       1468
       +
       		return fmt.Errorf("Invalid patch format. Please provide a valid diff.")

     

       1469
       1469
       +
       	}

     

       1470
       1470
       +
       

     

       1471
       1471
       +
       	return nil

     

       1168
       1472
        
       }

     

       1169
       1473
        
       

     

       1170
       1474
        
       func (s *State) MergePull(w http.ResponseWriter, r *http.Request) {

     
···

       1338
       1642
        
       	s.pages.HxLocation(w, fmt.Sprintf("/%s/pulls/%d", f.OwnerSlashRepo(), pull.PullId))

     

       1339
       1643
        
       	return

     

       1340
       1644
        
       }

     

       1341
       1341
       -
       

     

       1342
       1342
       -
       // Very basic validation to check if it looks like a diff/patch

     

       1343
       1343
       -
       // A valid patch usually starts with diff or --- lines

     

       1344
       1344
       -
       func isPatchValid(patch string) bool {

     

       1345
       1345
       -
       	// Basic validation to check if it looks like a diff/patch

     

       1346
       1346
       -
       	// A valid patch usually starts with diff or --- lines

     

       1347
       1347
       -
       	if len(patch) == 0 {

     

       1348
       1348
       -
       		return false

     

       1349
       1349
       -
       	}

     

       1350
       1350
       -
       

     

       1351
       1351
       -
       	lines := strings.Split(patch, "\n")

     

       1352
       1352
       -
       	if len(lines) < 2 {

     

       1353
       1353
       -
       		return false

     

       1354
       1354
       -
       	}

     

       1355
       1355
       -
       

     

       1356
       1356
       -
       	// Check for common patch format markers

     

       1357
       1357
       -
       	firstLine := strings.TrimSpace(lines[0])

     

       1358
       1358
       -
       	return strings.HasPrefix(firstLine, "diff ") ||

     

       1359
       1359
       -
       		strings.HasPrefix(firstLine, "--- ") ||

     

       1360
       1360
       -
       		strings.HasPrefix(firstLine, "Index: ") ||

     

       1361
       1361
       -
       		strings.HasPrefix(firstLine, "+++ ") ||

     

       1362
       1362
       -
       		strings.HasPrefix(firstLine, "@@ ")

     

       1363
       1363
       -
       }

+177 -20

appview/state/repo.go

···

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

     

       22
       22
        
       	securejoin "github.com/cyphar/filepath-securejoin"

     

       23
       23
        
       	"github.com/go-chi/chi/v5"

     

       24
       24
       +
       	"github.com/go-git/go-git/v5/plumbing"

     

       24
       25
        
       	"tangled.sh/tangled.sh/core/api/tangled"

     

       26
       26
       +
       	"tangled.sh/tangled.sh/core/appview"

     

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

     

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

     

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

     

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

     

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

     

       28
       32
        
       	"tangled.sh/tangled.sh/core/types"

     

       29
       33
        
       

     

       30
       34
        
       	comatproto "github.com/bluesky-social/indigo/api/atproto"

     
···

       247
       251
        
       	if !s.config.Dev {

     

       248
       252
        
       		protocol = "https"

     

       249
       253
        
       	}

     

       254
       254
       +
       

     

       255
       255
       +
       	if !plumbing.IsHash(ref) {

     

       256
       256
       +
       		s.pages.Error404(w)

     

       257
       257
       +
       		return

     

       258
       258
       +
       	}

     

       259
       259
       +
       

     

       250
       260
        
       	resp, err := http.Get(fmt.Sprintf("%s://%s/%s/%s/commit/%s", protocol, f.Knot, f.OwnerDid(), f.RepoName, ref))

     

       251
       261
        
       	if err != nil {

     

       252
       262
        
       		log.Println("failed to reach knotserver", err)

     
···

       311
       321
        
       	user := s.auth.GetUser(r)

     

       312
       322
        
       

     

       313
       323
        
       	var breadcrumbs [][]string

     

       314
       314
       -
       	breadcrumbs = append(breadcrumbs, []string{f.RepoName, fmt.Sprintf("/%s/%s/tree/%s", f.OwnerDid(), f.RepoName, ref)})

     

       324
       324
       +
       	breadcrumbs = append(breadcrumbs, []string{f.RepoName, fmt.Sprintf("/%s/tree/%s", f.OwnerSlashRepo(), ref)})

     

       315
       325
        
       	if treePath != "" {

     

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

     

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

     

       318
       328
        
       		}

     

       319
       329
        
       	}

     

       320
       330
        
       

     

       321
       321
       -
       	baseTreeLink := path.Join(f.OwnerDid(), f.RepoName, "tree", ref, treePath)

     

       322
       322
       -
       	baseBlobLink := path.Join(f.OwnerDid(), f.RepoName, "blob", ref, treePath)

     

       331
       331
       +
       	baseTreeLink := path.Join(f.OwnerSlashRepo(), "tree", ref, treePath)

     

       332
       332
       +
       	baseBlobLink := path.Join(f.OwnerSlashRepo(), "blob", ref, treePath)

     

       323
       333
        
       

     

       324
       334
        
       	s.pages.RepoTree(w, pages.RepoTreeParams{

     

       325
       335
        
       		LoggedInUser:     user,

     
···

       446
       456
        
       	}

     

       447
       457
        
       

     

       448
       458
        
       	var breadcrumbs [][]string

     

       449
       449
       -
       	breadcrumbs = append(breadcrumbs, []string{f.RepoName, fmt.Sprintf("/%s/%s/tree/%s", f.OwnerDid(), f.RepoName, ref)})

     

       459
       459
       +
       	breadcrumbs = append(breadcrumbs, []string{f.RepoName, fmt.Sprintf("/%s/tree/%s", f.OwnerSlashRepo(), ref)})

     

       450
       460
        
       	if filePath != "" {

     

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

     

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

     

       453
       463
        
       		}

     

       454
       464
        
       	}

     

       455
       465
        
       

     

       466
       466
       +
       	showRendered := false

     

       467
       467
       +
       	renderToggle := false

     

       468
       468
       +
       

     

       469
       469
       +
       	if markup.GetFormat(result.Path) == markup.FormatMarkdown {

     

       470
       470
       +
       		renderToggle = true

     

       471
       471
       +
       		showRendered = r.URL.Query().Get("code") != "true"

     

       472
       472
       +
       	}

     

       473
       473
       +
       

     

       456
       474
        
       	user := s.auth.GetUser(r)

     

       457
       475
        
       	s.pages.RepoBlob(w, pages.RepoBlobParams{

     

       458
       476
        
       		LoggedInUser:     user,

     

       459
       477
        
       		RepoInfo:         f.RepoInfo(s, user),

     

       460
       478
        
       		RepoBlobResponse: result,

     

       461
       479
        
       		BreadCrumbs:      breadcrumbs,

     

       480
       480
       +
       		ShowRendered:     showRendered,

     

       481
       481
       +
       		RenderToggle:     renderToggle,

     

       462
       482
        
       	})

     

       463
       483
        
       	return

     

       464
       484
        
       }

     
···

       566
       586
        
       		}

     

       567
       587
        
       	}()

     

       568
       588
        
       

     

       569
       569
       -
       	err = s.enforcer.AddCollaborator(collaboratorIdent.DID.String(), f.Knot, f.OwnerSlashRepo())

     

       589
       589
       +
       	err = s.enforcer.AddCollaborator(collaboratorIdent.DID.String(), f.Knot, f.DidSlashRepo())

     

       570
       590
        
       	if err != nil {

     

       571
       591
        
       		w.Write([]byte(fmt.Sprint("failed to add collaborator: ", err)))

     

       572
       592
        
       		return

     
···

       596
       616
        
       

     

       597
       617
        
       }

     

       598
       618
        
       

     

       619
       619
       +
       func (s *State) DeleteRepo(w http.ResponseWriter, r *http.Request) {

     

       620
       620
       +
       	user := s.auth.GetUser(r)

     

       621
       621
       +
       

     

       622
       622
       +
       	f, err := fullyResolvedRepo(r)

     

       623
       623
       +
       	if err != nil {

     

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

     

       625
       625
       +
       		return

     

       626
       626
       +
       	}

     

       627
       627
       +
       

     

       628
       628
       +
       	// remove record from pds

     

       629
       629
       +
       	xrpcClient, _ := s.auth.AuthorizedClient(r)

     

       630
       630
       +
       	repoRkey := f.RepoAt.RecordKey().String()

     

       631
       631
       +
       	_, err = comatproto.RepoDeleteRecord(r.Context(), xrpcClient, &comatproto.RepoDeleteRecord_Input{

     

       632
       632
       +
       		Collection: tangled.RepoNSID,

     

       633
       633
       +
       		Repo:       user.Did,

     

       634
       634
       +
       		Rkey:       repoRkey,

     

       635
       635
       +
       	})

     

       636
       636
       +
       	if err != nil {

     

       637
       637
       +
       		log.Printf("failed to delete record: %s", err)

     

       638
       638
       +
       		s.pages.Notice(w, "settings-delete", "Failed to delete repository from PDS.")

     

       639
       639
       +
       		return

     

       640
       640
       +
       	}

     

       641
       641
       +
       	log.Println("removed repo record ", f.RepoAt.String())

     

       642
       642
       +
       

     

       643
       643
       +
       	secret, err := db.GetRegistrationKey(s.db, f.Knot)

     

       644
       644
       +
       	if err != nil {

     

       645
       645
       +
       		log.Printf("no key found for domain %s: %s\n", f.Knot, err)

     

       646
       646
       +
       		return

     

       647
       647
       +
       	}

     

       648
       648
       +
       

     

       649
       649
       +
       	ksClient, err := NewSignedClient(f.Knot, secret, s.config.Dev)

     

       650
       650
       +
       	if err != nil {

     

       651
       651
       +
       		log.Println("failed to create client to ", f.Knot)

     

       652
       652
       +
       		return

     

       653
       653
       +
       	}

     

       654
       654
       +
       

     

       655
       655
       +
       	ksResp, err := ksClient.RemoveRepo(f.OwnerDid(), f.RepoName)

     

       656
       656
       +
       	if err != nil {

     

       657
       657
       +
       		log.Printf("failed to make request to %s: %s", f.Knot, err)

     

       658
       658
       +
       		return

     

       659
       659
       +
       	}

     

       660
       660
       +
       

     

       661
       661
       +
       	if ksResp.StatusCode != http.StatusNoContent {

     

       662
       662
       +
       		log.Println("failed to remove repo from knot, continuing anyway ", f.Knot)

     

       663
       663
       +
       	} else {

     

       664
       664
       +
       		log.Println("removed repo from knot ", f.Knot)

     

       665
       665
       +
       	}

     

       666
       666
       +
       

     

       667
       667
       +
       	tx, err := s.db.BeginTx(r.Context(), nil)

     

       668
       668
       +
       	if err != nil {

     

       669
       669
       +
       		log.Println("failed to start tx")

     

       670
       670
       +
       		w.Write([]byte(fmt.Sprint("failed to add collaborator: ", err)))

     

       671
       671
       +
       		return

     

       672
       672
       +
       	}

     

       673
       673
       +
       	defer func() {

     

       674
       674
       +
       		tx.Rollback()

     

       675
       675
       +
       		err = s.enforcer.E.LoadPolicy()

     

       676
       676
       +
       		if err != nil {

     

       677
       677
       +
       			log.Println("failed to rollback policies")

     

       678
       678
       +
       		}

     

       679
       679
       +
       	}()

     

       680
       680
       +
       

     

       681
       681
       +
       	// remove collaborator RBAC

     

       682
       682
       +
       	repoCollaborators, err := s.enforcer.E.GetImplicitUsersForResourceByDomain(f.DidSlashRepo(), f.Knot)

     

       683
       683
       +
       	if err != nil {

     

       684
       684
       +
       		s.pages.Notice(w, "settings-delete", "Failed to remove collaborators")

     

       685
       685
       +
       		return

     

       686
       686
       +
       	}

     

       687
       687
       +
       	for _, c := range repoCollaborators {

     

       688
       688
       +
       		did := c[0]

     

       689
       689
       +
       		s.enforcer.RemoveCollaborator(did, f.Knot, f.DidSlashRepo())

     

       690
       690
       +
       	}

     

       691
       691
       +
       	log.Println("removed collaborators")

     

       692
       692
       +
       

     

       693
       693
       +
       	// remove repo RBAC

     

       694
       694
       +
       	err = s.enforcer.RemoveRepo(f.OwnerDid(), f.Knot, f.DidSlashRepo())

     

       695
       695
       +
       	if err != nil {

     

       696
       696
       +
       		s.pages.Notice(w, "settings-delete", "Failed to update RBAC rules")

     

       697
       697
       +
       		return

     

       698
       698
       +
       	}

     

       699
       699
       +
       

     

       700
       700
       +
       	// remove repo from db

     

       701
       701
       +
       	err = db.RemoveRepo(tx, f.OwnerDid(), f.RepoName)

     

       702
       702
       +
       	if err != nil {

     

       703
       703
       +
       		s.pages.Notice(w, "settings-delete", "Failed to update appview")

     

       704
       704
       +
       		return

     

       705
       705
       +
       	}

     

       706
       706
       +
       	log.Println("removed repo from db")

     

       707
       707
       +
       

     

       708
       708
       +
       	err = tx.Commit()

     

       709
       709
       +
       	if err != nil {

     

       710
       710
       +
       		log.Println("failed to commit changes", err)

     

       711
       711
       +
       		http.Error(w, err.Error(), http.StatusInternalServerError)

     

       712
       712
       +
       		return

     

       713
       713
       +
       	}

     

       714
       714
       +
       

     

       715
       715
       +
       	err = s.enforcer.E.SavePolicy()

     

       716
       716
       +
       	if err != nil {

     

       717
       717
       +
       		log.Println("failed to update ACLs", err)

     

       718
       718
       +
       		http.Error(w, err.Error(), http.StatusInternalServerError)

     

       719
       719
       +
       		return

     

       720
       720
       +
       	}

     

       721
       721
       +
       

     

       722
       722
       +
       	s.pages.HxRedirect(w, fmt.Sprintf("/%s", f.OwnerDid()))

     

       723
       723
       +
       }

     

       724
       724
       +
       

     

       599
       725
        
       func (s *State) SetDefaultBranch(w http.ResponseWriter, r *http.Request) {

     

       600
       726
        
       	f, err := fullyResolvedRepo(r)

     

       601
       727
        
       	if err != nil {

     
···

       653
       779
        
       

     

       654
       780
        
       		isCollaboratorInviteAllowed := false

     

       655
       781
        
       		if user != nil {

     

       656
       656
       -
       			ok, err := s.enforcer.IsCollaboratorInviteAllowed(user.Did, f.Knot, f.OwnerSlashRepo())

     

       782
       782
       +
       			ok, err := s.enforcer.IsCollaboratorInviteAllowed(user.Did, f.Knot, f.DidSlashRepo())

     

       657
       783
        
       			if err == nil && ok {

     

       658
       784
        
       				isCollaboratorInviteAllowed = true

     

       659
       785
        
       			}

     
···

       737
       863
        
       }

     

       738
       864
        
       

     

       739
       865
        
       func (f *FullyResolvedRepo) OwnerSlashRepo() string {

     

       866
       866
       +
       	handle := f.OwnerId.Handle

     

       867
       867
       +
       

     

       868
       868
       +
       	var p string

     

       869
       869
       +
       	if handle != "" && !handle.IsInvalidHandle() {

     

       870
       870
       +
       		p, _ = securejoin.SecureJoin(fmt.Sprintf("@%s", handle), f.RepoName)

     

       871
       871
       +
       	} else {

     

       872
       872
       +
       		p, _ = securejoin.SecureJoin(f.OwnerDid(), f.RepoName)

     

       873
       873
       +
       	}

     

       874
       874
       +
       

     

       875
       875
       +
       	return p

     

       876
       876
       +
       }

     

       877
       877
       +
       

     

       878
       878
       +
       func (f *FullyResolvedRepo) DidSlashRepo() string {

     

       740
       879
        
       	p, _ := securejoin.SecureJoin(f.OwnerDid(), f.RepoName)

     

       741
       880
        
       	return p

     

       742
       881
        
       }

     

       743
       882
        
       

     

       744
       883
        
       func (f *FullyResolvedRepo) Collaborators(ctx context.Context, s *State) ([]pages.Collaborator, error) {

     

       745
       745
       -
       	repoCollaborators, err := s.enforcer.E.GetImplicitUsersForResourceByDomain(f.OwnerSlashRepo(), f.Knot)

     

       884
       884
       +
       	repoCollaborators, err := s.enforcer.E.GetImplicitUsersForResourceByDomain(f.DidSlashRepo(), f.Knot)

     

       746
       885
        
       	if err != nil {

     

       747
       886
        
       		return nil, err

     

       748
       887
        
       	}

     
···

       827
       966
        
       	}

     

       828
       967
        
       

     

       829
       968
        
       	knot := f.Knot

     

       830
       830
       -
       	if knot == "knot1.tangled.sh" {

     

       831
       831
       -
       		knot = "tangled.sh"

     

       832
       832
       -
       	}

     

       833
       833
       -
       

     

       834
       969
        
       	var disableFork bool

     

       835
       970
        
       	us, err := NewUnsignedClient(knot, s.config.Dev)

     

       836
       971
        
       	if err != nil {

     
···

       858
       993
        
       			}

     

       859
       994
        
       		}

     

       860
       995
        
       	}

     

       996
       996
       +
       

     

       997
       997
       +
       	if knot == "knot1.tangled.sh" {

     

       998
       998
       +
       		knot = "tangled.sh"

     

       999
       999
       +
       	}

     

       1000
       1000
       +
       

     

       861
       1001
        
       	repoInfo := pages.RepoInfo{

     

       862
       1002
        
       		OwnerDid:    f.OwnerDid(),

     

       863
       1003
        
       		OwnerHandle: f.OwnerHandle(),

     
···

       978
       1118
        
       		_, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{

     

       979
       1119
        
       			Collection: tangled.RepoIssueStateNSID,

     

       980
       1120
        
       			Repo:       user.Did,

     

       981
       981
       -
       			Rkey:       s.TID(),

     

       1121
       1121
       +
       			Rkey:       appview.TID(),

     

       982
       1122
        
       			Record: &lexutil.LexiconTypeDecoder{

     

       983
       1123
        
       				Val: &tangled.RepoIssueState{

     

       984
       1124
        
       					Issue: issue.IssueAt,

     
···

       1082
       1222
        
       		}

     

       1083
       1223
        
       

     

       1084
       1224
        
       		commentId := mathrand.IntN(1000000)

     

       1085
       1085
       -
       		rkey := s.TID()

     

       1225
       1225
       +
       		rkey := appview.TID()

     

       1086
       1226
        
       

     

       1087
       1227
        
       		err := db.NewIssueComment(s.db, &db.Comment{

     

       1088
       1228
        
       			OwnerDid:  user.Did,

     
···

       1420
       1560
        
       		isOpen = true

     

       1421
       1561
        
       	}

     

       1422
       1562
        
       

     

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

     

       1564
       1564
       +
       	if !ok {

     

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

     

       1566
       1566
       +
       		page = pagination.FirstPage()

     

       1567
       1567
       +
       	}

     

       1568
       1568
       +
       

     

       1423
       1569
        
       	user := s.auth.GetUser(r)

     

       1424
       1570
        
       	f, err := fullyResolvedRepo(r)

     

       1425
       1571
        
       	if err != nil {

     
···

       1427
       1573
        
       		return

     

       1428
       1574
        
       	}

     

       1429
       1575
        
       

     

       1430
       1430
       -
       	issues, err := db.GetIssues(s.db, f.RepoAt, isOpen)

     

       1576
       1576
       +
       	issues, err := db.GetIssues(s.db, f.RepoAt, isOpen, page)

     

       1431
       1577
        
       	if err != nil {

     

       1432
       1578
        
       		log.Println("failed to get issues", err)

     

       1433
       1579
        
       		s.pages.Notice(w, "issues", "Failed to load issues. Try again later.")

     
···

       1454
       1600
        
       		Issues:          issues,

     

       1455
       1601
        
       		DidHandleMap:    didHandleMap,

     

       1456
       1602
        
       		FilteringByOpen: isOpen,

     

       1603
       1603
       +
       		Page:            page,

     

       1457
       1604
        
       	})

     

       1458
       1605
        
       	return

     

       1459
       1606
        
       }

     
···

       1512
       1659
        
       		resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{

     

       1513
       1660
        
       			Collection: tangled.RepoIssueNSID,

     

       1514
       1661
        
       			Repo:       user.Did,

     

       1515
       1515
       -
       			Rkey:       s.TID(),

     

       1662
       1662
       +
       			Rkey:       appview.TID(),

     

       1516
       1663
        
       			Record: &lexutil.LexiconTypeDecoder{

     

       1517
       1664
        
       				Val: &tangled.RepoIssue{

     

       1518
       1665
        
       					Repo:    atUri,

     
···

       1580
       1727
        
       

     

       1581
       1728
        
       		forkName := fmt.Sprintf("%s", f.RepoName)

     

       1582
       1729
        
       

     

       1730
       1730
       +
       		// this check is *only* to see if the forked repo name already exists

     

       1731
       1731
       +
       		// in the user's account.

     

       1583
       1732
        
       		existingRepo, err := db.GetRepo(s.db, user.Did, f.RepoName)

     

       1584
       1584
       -
       		if err == nil && existingRepo != nil {

     

       1733
       1733
       +
       		if err != nil {

     

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

     

       1735
       1735
       +
       				// no existing repo with this name found, we can use the name as is

     

       1736
       1736
       +
       			} else {

     

       1737
       1737
       +
       				log.Println("error fetching existing repo from db", err)

     

       1738
       1738
       +
       				s.pages.Notice(w, "repo", "Failed to fork this repository. Try again later.")

     

       1739
       1739
       +
       				return

     

       1740
       1740
       +
       			}

     

       1741
       1741
       +
       		} else if existingRepo != nil {

     

       1742
       1742
       +
       			// repo with this name already exists, append random string

     

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

     

       1586
       1744
        
       		}

     

       1587
       1587
       -
       

     

       1588
       1745
        
       		secret, err := db.GetRegistrationKey(s.db, knot)

     

       1589
       1746
        
       		if err != nil {

     

       1590
       1747
        
       			s.pages.Notice(w, "repo", fmt.Sprintf("No registration key found for knot %s.", knot))

     
···

       1593
       1750
        
       

     

       1594
       1751
        
       		client, err := NewSignedClient(knot, secret, s.config.Dev)

     

       1595
       1752
        
       		if err != nil {

     

       1596
       1596
       -
       			s.pages.Notice(w, "repo", "Failed to connect to knot server.")

     

       1753
       1753
       +
       			s.pages.Notice(w, "repo", "Failed to reach knot server.")

     

       1597
       1754
        
       			return

     

       1598
       1755
        
       		}

     

       1599
       1756
        
       

     
···

       1603
       1760
        
       		} else {

     

       1604
       1761
        
       			uri = "https"

     

       1605
       1762
        
       		}

     

       1606
       1606
       -
       		sourceUrl := fmt.Sprintf("%s://%s/%s/%s", uri, knot, f.OwnerDid(), f.RepoName)

     

       1763
       1763
       +
       		sourceUrl := fmt.Sprintf("%s://%s/%s/%s", uri, f.Knot, f.OwnerDid(), f.RepoName)

     

       1607
       1764
        
       		sourceAt := f.RepoAt.String()

     

       1608
       1765
        
       

     

       1609
       1609
       -
       		rkey := s.TID()

     

       1766
       1766
       +
       		rkey := appview.TID()

     

       1610
       1767
        
       		repo := &db.Repo{

     

       1611
       1768
        
       			Did:    user.Did,

     

       1612
       1769
        
       			Name:   forkName,

+1 -1

appview/state/repo_util.go

···

       58
       58
        
       

     

       59
       59
        
       func RolesInRepo(s *State, u *auth.User, f *FullyResolvedRepo) pages.RolesInRepo {

     

       60
       60
        
       	if u != nil {

     

       61
       61
       -
       		r := s.enforcer.GetPermissionsInRepo(u.Did, f.Knot, f.OwnerSlashRepo())

     

       61
       61
       +
       		r := s.enforcer.GetPermissionsInRepo(u.Did, f.Knot, f.DidSlashRepo())

     

       62
       62
        
       		return pages.RolesInRepo{r}

     

       63
       63
        
       	} else {

     

       64
       64
        
       		return pages.RolesInRepo{}

+29 -23

appview/state/router.go

···

       5
       5
        
       	"strings"

     

       6
       6
        
       

     

       7
       7
        
       	"github.com/go-chi/chi/v5"

     

       8
       8
       +
       	"tangled.sh/tangled.sh/core/appview/middleware"

     

       9
       9
       +
       	"tangled.sh/tangled.sh/core/appview/settings"

     

       8
       10
        
       	"tangled.sh/tangled.sh/core/appview/state/userutil"

     

       9
       11
        
       )

     

       10
       12
        
       

     
···

       66
       68
        
       			r.Get("/blob/{ref}/raw/*", s.RepoBlobRaw)

     

       67
       69
        
       

     

       68
       70
        
       			r.Route("/issues", func(r chi.Router) {

     

       69
       69
       -
       				r.Get("/", s.RepoIssues)

     

       71
       71
       +
       				r.With(middleware.Paginate).Get("/", s.RepoIssues)

     

       70
       72
        
       				r.Get("/{issue}", s.RepoSingleIssue)

     

       71
       73
        
       

     

       72
       74
        
       				r.Group(func(r chi.Router) {

     

       73
       73
       -
       					r.Use(AuthMiddleware(s))

     

       75
       75
       +
       					r.Use(middleware.AuthMiddleware(s.auth))

     

       74
       76
        
       					r.Get("/new", s.NewIssue)

     

       75
       77
        
       					r.Post("/new", s.NewIssue)

     

       76
       78
        
       					r.Post("/{issue}/comment", s.NewIssueComment)

     
···

       86
       88
        
       			})

     

       87
       89
        
       

     

       88
       90
        
       			r.Route("/fork", func(r chi.Router) {

     

       89
       89
       -
       				r.Use(AuthMiddleware(s))

     

       91
       91
       +
       				r.Use(middleware.AuthMiddleware(s.auth))

     

       90
       92
        
       				r.Get("/", s.ForkRepo)

     

       91
       93
        
       				r.Post("/", s.ForkRepo)

     

       92
       94
        
       			})

     

       93
       95
        
       

     

       94
       96
        
       			r.Route("/pulls", func(r chi.Router) {

     

       95
       97
        
       				r.Get("/", s.RepoPulls)

     

       96
       96
       -
       				r.With(AuthMiddleware(s)).Route("/new", func(r chi.Router) {

     

       98
       98
       +
       				r.With(middleware.AuthMiddleware(s.auth)).Route("/new", func(r chi.Router) {

     

       97
       99
        
       					r.Get("/", s.NewPull)

     

       98
       100
        
       					r.Get("/patch-upload", s.PatchUploadFragment)

     

       101
       101
       +
       					r.Post("/validate-patch", s.ValidatePatch)

     

       99
       102
        
       					r.Get("/compare-branches", s.CompareBranchesFragment)

     

       100
       103
        
       					r.Get("/compare-forks", s.CompareForksFragment)

     

       101
       104
        
       					r.Get("/fork-branches", s.CompareForksBranchesFragment)

     
···

       108
       111
        
       

     

       109
       112
        
       					r.Route("/round/{round}", func(r chi.Router) {

     

       110
       113
        
       						r.Get("/", s.RepoPullPatch)

     

       114
       114
       +
       						r.Get("/interdiff", s.RepoPullInterdiff)

     

       111
       115
        
       						r.Get("/actions", s.PullActions)

     

       112
       112
       -
       						r.With(AuthMiddleware(s)).Route("/comment", func(r chi.Router) {

     

       116
       116
       +
       						r.With(middleware.AuthMiddleware(s.auth)).Route("/comment", func(r chi.Router) {

     

       113
       117
        
       							r.Get("/", s.PullComment)

     

       114
       118
        
       							r.Post("/", s.PullComment)

     

       115
       119
        
       						})

     
···

       120
       124
        
       					})

     

       121
       125
        
       

     

       122
       126
        
       					r.Group(func(r chi.Router) {

     

       123
       123
       -
       						r.Use(AuthMiddleware(s))

     

       127
       127
       +
       						r.Use(middleware.AuthMiddleware(s.auth))

     

       124
       128
        
       						r.Route("/resubmit", func(r chi.Router) {

     

       125
       129
        
       							r.Get("/", s.ResubmitPull)

     

       126
       130
        
       							r.Post("/", s.ResubmitPull)

     
···

       143
       147
        
       

     

       144
       148
        
       			// settings routes, needs auth

     

       145
       149
        
       			r.Group(func(r chi.Router) {

     

       146
       146
       -
       				r.Use(AuthMiddleware(s))

     

       150
       150
       +
       				r.Use(middleware.AuthMiddleware(s.auth))

     

       147
       151
        
       				// repo description can only be edited by owner

     

       148
       152
        
       				r.With(RepoPermissionMiddleware(s, "repo:owner")).Route("/description", func(r chi.Router) {

     

       149
       153
        
       					r.Put("/", s.RepoDescription)

     
···

       153
       157
        
       				r.With(RepoPermissionMiddleware(s, "repo:settings")).Route("/settings", func(r chi.Router) {

     

       154
       158
        
       					r.Get("/", s.RepoSettings)

     

       155
       159
        
       					r.With(RepoPermissionMiddleware(s, "repo:invite")).Put("/collaborator", s.AddCollaborator)

     

       160
       160
       +
       					r.With(RepoPermissionMiddleware(s, "repo:delete")).Delete("/delete", s.DeleteRepo)

     

       156
       161
        
       					r.Put("/branches/default", s.SetDefaultBranch)

     

       157
       162
        
       				})

     

       158
       163
        
       			})

     
···

       173
       178
        
       

     

       174
       179
        
       	r.Get("/", s.Timeline)

     

       175
       180
        
       

     

       176
       176
       -
       	r.With(AuthMiddleware(s)).Post("/logout", s.Logout)

     

       181
       181
       +
       	r.With(middleware.AuthMiddleware(s.auth)).Post("/logout", s.Logout)

     

       177
       182
        
       

     

       178
       183
        
       	r.Route("/login", func(r chi.Router) {

     

       179
       184
        
       		r.Get("/", s.Login)

     
···

       181
       186
        
       	})

     

       182
       187
        
       

     

       183
       188
        
       	r.Route("/knots", func(r chi.Router) {

     

       184
       184
       -
       		r.Use(AuthMiddleware(s))

     

       189
       189
       +
       		r.Use(middleware.AuthMiddleware(s.auth))

     

       185
       190
        
       		r.Get("/", s.Knots)

     

       186
       191
        
       		r.Post("/key", s.RegistrationKey)

     

       187
       192
        
       

     
···

       199
       204
        
       

     

       200
       205
        
       	r.Route("/repo", func(r chi.Router) {

     

       201
       206
        
       		r.Route("/new", func(r chi.Router) {

     

       202
       202
       -
       			r.Use(AuthMiddleware(s))

     

       207
       207
       +
       			r.Use(middleware.AuthMiddleware(s.auth))

     

       203
       208
        
       			r.Get("/", s.NewRepo)

     

       204
       209
        
       			r.Post("/", s.NewRepo)

     

       205
       210
        
       		})

     

       206
       211
        
       		// r.Post("/import", s.ImportRepo)

     

       207
       212
        
       	})

     

       208
       213
        
       

     

       209
       209
       -
       	r.With(AuthMiddleware(s)).Route("/follow", func(r chi.Router) {

     

       214
       214
       +
       	r.With(middleware.AuthMiddleware(s.auth)).Route("/follow", func(r chi.Router) {

     

       210
       215
        
       		r.Post("/", s.Follow)

     

       211
       216
        
       		r.Delete("/", s.Follow)

     

       212
       217
        
       	})

     

       213
       218
        
       

     

       214
       214
       -
       	r.With(AuthMiddleware(s)).Route("/star", func(r chi.Router) {

     

       219
       219
       +
       	r.With(middleware.AuthMiddleware(s.auth)).Route("/star", func(r chi.Router) {

     

       215
       220
        
       		r.Post("/", s.Star)

     

       216
       221
        
       		r.Delete("/", s.Star)

     

       217
       222
        
       	})

     

       218
       223
        
       

     

       219
       219
       -
       	r.Route("/settings", func(r chi.Router) {

     

       220
       220
       -
       		r.Use(AuthMiddleware(s))

     

       221
       221
       -
       		r.Get("/", s.Settings)

     

       222
       222
       -
       		r.Put("/keys", s.SettingsKeys)

     

       223
       223
       -
       		r.Delete("/keys", s.SettingsKeys)

     

       224
       224
       -
       		r.Put("/emails", s.SettingsEmails)

     

       225
       225
       -
       		r.Delete("/emails", s.SettingsEmails)

     

       226
       226
       -
       		r.Get("/emails/verify", s.SettingsEmailsVerify)

     

       227
       227
       -
       		r.Post("/emails/verify/resend", s.SettingsEmailsVerifyResend)

     

       228
       228
       -
       		r.Post("/emails/primary", s.SettingsEmailsPrimary)

     

       229
       229
       -
       	})

     

       224
       224
       +
       	r.Mount("/settings", s.SettingsRouter())

     

       230
       225
        
       

     

       231
       226
        
       	r.Get("/keys/{user}", s.Keys)

     

       232
       227
        
       

     
···

       235
       230
        
       	})

     

       236
       231
        
       	return r

     

       237
       232
        
       }

     

       233
       233
       +
       

     

       234
       234
       +
       func (s *State) SettingsRouter() http.Handler {

     

       235
       235
       +
       	settings := &settings.Settings{

     

       236
       236
       +
       		Db:     s.db,

     

       237
       237
       +
       		Auth:   s.auth,

     

       238
       238
       +
       		Pages:  s.pages,

     

       239
       239
       +
       		Config: s.config,

     

       240
       240
       +
       	}

     

       241
       241
       +
       

     

       242
       242
       +
       	return settings.Router()

     

       243
       243
       +
       }

-416

appview/state/settings.go

···

       1
       1
       -
       package state

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"database/sql"

     

       5
       5
       -
       	"errors"

     

       6
       6
       -
       	"fmt"

     

       7
       7
       -
       	"log"

     

       8
       8
       -
       	"net/http"

     

       9
       9
       -
       	"net/url"

     

       10
       10
       -
       	"strings"

     

       11
       11
       -
       	"time"

     

       12
       12
       -
       

     

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

     

       14
       14
       -
       	lexutil "github.com/bluesky-social/indigo/lex/util"

     

       15
       15
       -
       	"github.com/gliderlabs/ssh"

     

       16
       16
       -
       	"github.com/google/uuid"

     

       17
       17
       -
       	"tangled.sh/tangled.sh/core/api/tangled"

     

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

     

       19
       19
       -
       	"tangled.sh/tangled.sh/core/appview/email"

     

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

     

       21
       21
       -
       )

     

       22
       22
       -
       

     

       23
       23
       -
       func (s *State) Settings(w http.ResponseWriter, r *http.Request) {

     

       24
       24
       -
       	user := s.auth.GetUser(r)

     

       25
       25
       -
       	pubKeys, err := db.GetPublicKeys(s.db, user.Did)

     

       26
       26
       -
       	if err != nil {

     

       27
       27
       -
       		log.Println(err)

     

       28
       28
       -
       	}

     

       29
       29
       -
       

     

       30
       30
       -
       	emails, err := db.GetAllEmails(s.db, user.Did)

     

       31
       31
       -
       	if err != nil {

     

       32
       32
       -
       		log.Println(err)

     

       33
       33
       -
       	}

     

       34
       34
       -
       

     

       35
       35
       -
       	s.pages.Settings(w, pages.SettingsParams{

     

       36
       36
       -
       		LoggedInUser: user,

     

       37
       37
       -
       		PubKeys:      pubKeys,

     

       38
       38
       -
       		Emails:       emails,

     

       39
       39
       -
       	})

     

       40
       40
       -
       }

     

       41
       41
       -
       

     

       42
       42
       -
       // buildVerificationEmail creates an email.Email struct for verification emails

     

       43
       43
       -
       func (s *State) buildVerificationEmail(emailAddr, did, code string) email.Email {

     

       44
       44
       -
       	verifyURL := s.verifyUrl(did, emailAddr, code)

     

       45
       45
       -
       

     

       46
       46
       -
       	return email.Email{

     

       47
       47
       -
       		APIKey:  s.config.ResendApiKey,

     

       48
       48
       -
       		From:    "noreply@notifs.tangled.sh",

     

       49
       49
       -
       		To:      emailAddr,

     

       50
       50
       -
       		Subject: "Verify your Tangled email",

     

       51
       51
       -
       		Text: `Click the link below (or copy and paste it into your browser) to verify your email address.

     

       52
       52
       -
       ` + verifyURL,

     

       53
       53
       -
       		Html: `<p>Click the link (or copy and paste it into your browser) to verify your email address.</p>

     

       54
       54
       -
       <p><a href="` + verifyURL + `">` + verifyURL + `</a></p>`,

     

       55
       55
       -
       	}

     

       56
       56
       -
       }

     

       57
       57
       -
       

     

       58
       58
       -
       // sendVerificationEmail handles the common logic for sending verification emails

     

       59
       59
       -
       func (s *State) sendVerificationEmail(w http.ResponseWriter, did, emailAddr, code string, errorContext string) error {

     

       60
       60
       -
       	emailToSend := s.buildVerificationEmail(emailAddr, did, code)

     

       61
       61
       -
       

     

       62
       62
       -
       	err := email.SendEmail(emailToSend)

     

       63
       63
       -
       	if err != nil {

     

       64
       64
       -
       		log.Printf("sending email: %s", err)

     

       65
       65
       -
       		s.pages.Notice(w, "settings-emails-error", fmt.Sprintf("Unable to send verification email at this moment, try again later. %s", errorContext))

     

       66
       66
       -
       		return err

     

       67
       67
       -
       	}

     

       68
       68
       -
       

     

       69
       69
       -
       	return nil

     

       70
       70
       -
       }

     

       71
       71
       -
       

     

       72
       72
       -
       func (s *State) SettingsEmails(w http.ResponseWriter, r *http.Request) {

     

       73
       73
       -
       	switch r.Method {

     

       74
       74
       -
       	case http.MethodGet:

     

       75
       75
       -
       		s.pages.Notice(w, "settings-emails", "Unimplemented.")

     

       76
       76
       -
       		log.Println("unimplemented")

     

       77
       77
       -
       		return

     

       78
       78
       -
       	case http.MethodPut:

     

       79
       79
       -
       		did := s.auth.GetDid(r)

     

       80
       80
       -
       		emAddr := r.FormValue("email")

     

       81
       81
       -
       		emAddr = strings.TrimSpace(emAddr)

     

       82
       82
       -
       

     

       83
       83
       -
       		if !email.IsValidEmail(emAddr) {

     

       84
       84
       -
       			s.pages.Notice(w, "settings-emails-error", "Invalid email address.")

     

       85
       85
       -
       			return

     

       86
       86
       -
       		}

     

       87
       87
       -
       

     

       88
       88
       -
       		// check if email already exists in database

     

       89
       89
       -
       		existingEmail, err := db.GetEmail(s.db, did, emAddr)

     

       90
       90
       -
       		if err != nil && !errors.Is(err, sql.ErrNoRows) {

     

       91
       91
       -
       			log.Printf("checking for existing email: %s", err)

     

       92
       92
       -
       			s.pages.Notice(w, "settings-emails-error", "Unable to add email at this moment, try again later.")

     

       93
       93
       -
       			return

     

       94
       94
       -
       		}

     

       95
       95
       -
       

     

       96
       96
       -
       		if err == nil {

     

       97
       97
       -
       			if existingEmail.Verified {

     

       98
       98
       -
       				s.pages.Notice(w, "settings-emails-error", "This email is already verified.")

     

       99
       99
       -
       				return

     

       100
       100
       -
       			}

     

       101
       101
       -
       

     

       102
       102
       -
       			s.pages.Notice(w, "settings-emails-error", "This email is already added but not verified. Check your inbox for the verification link.")

     

       103
       103
       -
       			return

     

       104
       104
       -
       		}

     

       105
       105
       -
       

     

       106
       106
       -
       		code := uuid.New().String()

     

       107
       107
       -
       

     

       108
       108
       -
       		// Begin transaction

     

       109
       109
       -
       		tx, err := s.db.Begin()

     

       110
       110
       -
       		if err != nil {

     

       111
       111
       -
       			log.Printf("failed to start transaction: %s", err)

     

       112
       112
       -
       			s.pages.Notice(w, "settings-emails-error", "Unable to add email at this moment, try again later.")

     

       113
       113
       -
       			return

     

       114
       114
       -
       		}

     

       115
       115
       -
       		defer tx.Rollback()

     

       116
       116
       -
       

     

       117
       117
       -
       		if err := db.AddEmail(tx, db.Email{

     

       118
       118
       -
       			Did:              did,

     

       119
       119
       -
       			Address:          emAddr,

     

       120
       120
       -
       			Verified:         false,

     

       121
       121
       -
       			VerificationCode: code,

     

       122
       122
       -
       		}); err != nil {

     

       123
       123
       -
       			log.Printf("adding email: %s", err)

     

       124
       124
       -
       			s.pages.Notice(w, "settings-emails-error", "Unable to add email at this moment, try again later.")

     

       125
       125
       -
       			return

     

       126
       126
       -
       		}

     

       127
       127
       -
       

     

       128
       128
       -
       		if err := s.sendVerificationEmail(w, did, emAddr, code, ""); err != nil {

     

       129
       129
       -
       			return

     

       130
       130
       -
       		}

     

       131
       131
       -
       

     

       132
       132
       -
       		// Commit transaction

     

       133
       133
       -
       		if err := tx.Commit(); err != nil {

     

       134
       134
       -
       			log.Printf("failed to commit transaction: %s", err)

     

       135
       135
       -
       			s.pages.Notice(w, "settings-emails-error", "Unable to add email at this moment, try again later.")

     

       136
       136
       -
       			return

     

       137
       137
       -
       		}

     

       138
       138
       -
       

     

       139
       139
       -
       		s.pages.Notice(w, "settings-emails-success", "Click the link in the email we sent you to verify your email address.")

     

       140
       140
       -
       		return

     

       141
       141
       -
       	case http.MethodDelete:

     

       142
       142
       -
       		did := s.auth.GetDid(r)

     

       143
       143
       -
       		emailAddr := r.FormValue("email")

     

       144
       144
       -
       		emailAddr = strings.TrimSpace(emailAddr)

     

       145
       145
       -
       

     

       146
       146
       -
       		// Begin transaction

     

       147
       147
       -
       		tx, err := s.db.Begin()

     

       148
       148
       -
       		if err != nil {

     

       149
       149
       -
       			log.Printf("failed to start transaction: %s", err)

     

       150
       150
       -
       			s.pages.Notice(w, "settings-emails-error", "Unable to delete email at this moment, try again later.")

     

       151
       151
       -
       			return

     

       152
       152
       -
       		}

     

       153
       153
       -
       		defer tx.Rollback()

     

       154
       154
       -
       

     

       155
       155
       -
       		if err := db.DeleteEmail(tx, did, emailAddr); err != nil {

     

       156
       156
       -
       			log.Printf("deleting email: %s", err)

     

       157
       157
       -
       			s.pages.Notice(w, "settings-emails-error", "Unable to delete email at this moment, try again later.")

     

       158
       158
       -
       			return

     

       159
       159
       -
       		}

     

       160
       160
       -
       

     

       161
       161
       -
       		// Commit transaction

     

       162
       162
       -
       		if err := tx.Commit(); err != nil {

     

       163
       163
       -
       			log.Printf("failed to commit transaction: %s", err)

     

       164
       164
       -
       			s.pages.Notice(w, "settings-emails-error", "Unable to delete email at this moment, try again later.")

     

       165
       165
       -
       			return

     

       166
       166
       -
       		}

     

       167
       167
       -
       

     

       168
       168
       -
       		s.pages.HxLocation(w, "/settings")

     

       169
       169
       -
       		return

     

       170
       170
       -
       	}

     

       171
       171
       -
       }

     

       172
       172
       -
       

     

       173
       173
       -
       func (s *State) verifyUrl(did string, email string, code string) string {

     

       174
       174
       -
       	var appUrl string

     

       175
       175
       -
       	if s.config.Dev {

     

       176
       176
       -
       		appUrl = "http://" + s.config.ListenAddr

     

       177
       177
       -
       	} else {

     

       178
       178
       -
       		appUrl = "https://tangled.sh"

     

       179
       179
       -
       	}

     

       180
       180
       -
       

     

       181
       181
       -
       	return fmt.Sprintf("%s/settings/emails/verify?did=%s&email=%s&code=%s", appUrl, url.QueryEscape(did), url.QueryEscape(email), url.QueryEscape(code))

     

       182
       182
       -
       }

     

       183
       183
       -
       

     

       184
       184
       -
       func (s *State) SettingsEmailsVerify(w http.ResponseWriter, r *http.Request) {

     

       185
       185
       -
       	q := r.URL.Query()

     

       186
       186
       -
       

     

       187
       187
       -
       	// Get the parameters directly from the query

     

       188
       188
       -
       	emailAddr := q.Get("email")

     

       189
       189
       -
       	did := q.Get("did")

     

       190
       190
       -
       	code := q.Get("code")

     

       191
       191
       -
       

     

       192
       192
       -
       	valid, err := db.CheckValidVerificationCode(s.db, did, emailAddr, code)

     

       193
       193
       -
       	if err != nil {

     

       194
       194
       -
       		log.Printf("checking email verification: %s", err)

     

       195
       195
       -
       		s.pages.Notice(w, "settings-emails-error", "Error verifying email. Please try again later.")

     

       196
       196
       -
       		return

     

       197
       197
       -
       	}

     

       198
       198
       -
       

     

       199
       199
       -
       	if !valid {

     

       200
       200
       -
       		s.pages.Notice(w, "settings-emails-error", "Invalid verification code. Please request a new verification email.")

     

       201
       201
       -
       		return

     

       202
       202
       -
       	}

     

       203
       203
       -
       

     

       204
       204
       -
       	// Mark email as verified in the database

     

       205
       205
       -
       	if err := db.MarkEmailVerified(s.db, did, emailAddr); err != nil {

     

       206
       206
       -
       		log.Printf("marking email as verified: %s", err)

     

       207
       207
       -
       		s.pages.Notice(w, "settings-emails-error", "Error updating email verification status. Please try again later.")

     

       208
       208
       -
       		return

     

       209
       209
       -
       	}

     

       210
       210
       -
       

     

       211
       211
       -
       	http.Redirect(w, r, "/settings", http.StatusSeeOther)

     

       212
       212
       -
       }

     

       213
       213
       -
       

     

       214
       214
       -
       func (s *State) SettingsEmailsVerifyResend(w http.ResponseWriter, r *http.Request) {

     

       215
       215
       -
       	if r.Method != http.MethodPost {

     

       216
       216
       -
       		s.pages.Notice(w, "settings-emails-error", "Invalid request method.")

     

       217
       217
       -
       		return

     

       218
       218
       -
       	}

     

       219
       219
       -
       

     

       220
       220
       -
       	did := s.auth.GetDid(r)

     

       221
       221
       -
       	emAddr := r.FormValue("email")

     

       222
       222
       -
       	emAddr = strings.TrimSpace(emAddr)

     

       223
       223
       -
       

     

       224
       224
       -
       	if !email.IsValidEmail(emAddr) {

     

       225
       225
       -
       		s.pages.Notice(w, "settings-emails-error", "Invalid email address.")

     

       226
       226
       -
       		return

     

       227
       227
       -
       	}

     

       228
       228
       -
       

     

       229
       229
       -
       	// Check if email exists and is unverified

     

       230
       230
       -
       	existingEmail, err := db.GetEmail(s.db, did, emAddr)

     

       231
       231
       -
       	if err != nil {

     

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

     

       233
       233
       -
       			s.pages.Notice(w, "settings-emails-error", "Email not found. Please add it first.")

     

       234
       234
       -
       		} else {

     

       235
       235
       -
       			log.Printf("checking for existing email: %s", err)

     

       236
       236
       -
       			s.pages.Notice(w, "settings-emails-error", "Unable to resend verification email at this moment, try again later.")

     

       237
       237
       -
       		}

     

       238
       238
       -
       		return

     

       239
       239
       -
       	}

     

       240
       240
       -
       

     

       241
       241
       -
       	if existingEmail.Verified {

     

       242
       242
       -
       		s.pages.Notice(w, "settings-emails-error", "This email is already verified.")

     

       243
       243
       -
       		return

     

       244
       244
       -
       	}

     

       245
       245
       -
       

     

       246
       246
       -
       	// Check if last verification email was sent less than 10 minutes ago

     

       247
       247
       -
       	if existingEmail.LastSent != nil {

     

       248
       248
       -
       		timeSinceLastSent := time.Since(*existingEmail.LastSent)

     

       249
       249
       -
       		if timeSinceLastSent < 10*time.Minute {

     

       250
       250
       -
       			waitTime := 10*time.Minute - timeSinceLastSent

     

       251
       251
       -
       			s.pages.Notice(w, "settings-emails-error", fmt.Sprintf("Please wait %d minutes before requesting another verification email.", int(waitTime.Minutes()+1)))

     

       252
       252
       -
       			return

     

       253
       253
       -
       		}

     

       254
       254
       -
       	}

     

       255
       255
       -
       

     

       256
       256
       -
       	// Generate new verification code

     

       257
       257
       -
       	code := uuid.New().String()

     

       258
       258
       -
       

     

       259
       259
       -
       	// Begin transaction

     

       260
       260
       -
       	tx, err := s.db.Begin()

     

       261
       261
       -
       	if err != nil {

     

       262
       262
       -
       		log.Printf("failed to start transaction: %s", err)

     

       263
       263
       -
       		s.pages.Notice(w, "settings-emails-error", "Unable to resend verification email at this moment, try again later.")

     

       264
       264
       -
       		return

     

       265
       265
       -
       	}

     

       266
       266
       -
       	defer tx.Rollback()

     

       267
       267
       -
       

     

       268
       268
       -
       	// Update the verification code and last sent time

     

       269
       269
       -
       	if err := db.UpdateVerificationCode(tx, did, emAddr, code); err != nil {

     

       270
       270
       -
       		log.Printf("updating email verification: %s", err)

     

       271
       271
       -
       		s.pages.Notice(w, "settings-emails-error", "Unable to resend verification email at this moment, try again later.")

     

       272
       272
       -
       		return

     

       273
       273
       -
       	}

     

       274
       274
       -
       

     

       275
       275
       -
       	// Send verification email

     

       276
       276
       -
       	if err := s.sendVerificationEmail(w, did, emAddr, code, ""); err != nil {

     

       277
       277
       -
       		return

     

       278
       278
       -
       	}

     

       279
       279
       -
       

     

       280
       280
       -
       	// Commit transaction

     

       281
       281
       -
       	if err := tx.Commit(); err != nil {

     

       282
       282
       -
       		log.Printf("failed to commit transaction: %s", err)

     

       283
       283
       -
       		s.pages.Notice(w, "settings-emails-error", "Unable to resend verification email at this moment, try again later.")

     

       284
       284
       -
       		return

     

       285
       285
       -
       	}

     

       286
       286
       -
       

     

       287
       287
       -
       	s.pages.Notice(w, "settings-emails-success", "Verification email resent. Click the link in the email we sent you to verify your email address.")

     

       288
       288
       -
       }

     

       289
       289
       -
       

     

       290
       290
       -
       func (s *State) SettingsEmailsPrimary(w http.ResponseWriter, r *http.Request) {

     

       291
       291
       -
       	did := s.auth.GetDid(r)

     

       292
       292
       -
       	emailAddr := r.FormValue("email")

     

       293
       293
       -
       	emailAddr = strings.TrimSpace(emailAddr)

     

       294
       294
       -
       

     

       295
       295
       -
       	if emailAddr == "" {

     

       296
       296
       -
       		s.pages.Notice(w, "settings-emails-error", "Email address cannot be empty.")

     

       297
       297
       -
       		return

     

       298
       298
       -
       	}

     

       299
       299
       -
       

     

       300
       300
       -
       	if err := db.MakeEmailPrimary(s.db, did, emailAddr); err != nil {

     

       301
       301
       -
       		log.Printf("setting primary email: %s", err)

     

       302
       302
       -
       		s.pages.Notice(w, "settings-emails-error", "Error setting primary email. Please try again later.")

     

       303
       303
       -
       		return

     

       304
       304
       -
       	}

     

       305
       305
       -
       

     

       306
       306
       -
       	s.pages.HxLocation(w, "/settings")

     

       307
       307
       -
       }

     

       308
       308
       -
       

     

       309
       309
       -
       func (s *State) SettingsKeys(w http.ResponseWriter, r *http.Request) {

     

       310
       310
       -
       	switch r.Method {

     

       311
       311
       -
       	case http.MethodGet:

     

       312
       312
       -
       		s.pages.Notice(w, "settings-keys", "Unimplemented.")

     

       313
       313
       -
       		log.Println("unimplemented")

     

       314
       314
       -
       		return

     

       315
       315
       -
       	case http.MethodPut:

     

       316
       316
       -
       		did := s.auth.GetDid(r)

     

       317
       317
       -
       		key := r.FormValue("key")

     

       318
       318
       -
       		key = strings.TrimSpace(key)

     

       319
       319
       -
       		name := r.FormValue("name")

     

       320
       320
       -
       		client, _ := s.auth.AuthorizedClient(r)

     

       321
       321
       -
       

     

       322
       322
       -
       		_, _, _, _, err := ssh.ParseAuthorizedKey([]byte(key))

     

       323
       323
       -
       		if err != nil {

     

       324
       324
       -
       			log.Printf("parsing public key: %s", err)

     

       325
       325
       -
       			s.pages.Notice(w, "settings-keys", "That doesn't look like a valid public key. Make sure it's a <strong>public</strong> key.")

     

       326
       326
       -
       			return

     

       327
       327
       -
       		}

     

       328
       328
       -
       

     

       329
       329
       -
       		rkey := s.TID()

     

       330
       330
       -
       

     

       331
       331
       -
       		tx, err := s.db.Begin()

     

       332
       332
       -
       		if err != nil {

     

       333
       333
       -
       			log.Printf("failed to start tx; adding public key: %s", err)

     

       334
       334
       -
       			s.pages.Notice(w, "settings-keys", "Unable to add public key at this moment, try again later.")

     

       335
       335
       -
       			return

     

       336
       336
       -
       		}

     

       337
       337
       -
       		defer tx.Rollback()

     

       338
       338
       -
       

     

       339
       339
       -
       		if err := db.AddPublicKey(tx, did, name, key, rkey); err != nil {

     

       340
       340
       -
       			log.Printf("adding public key: %s", err)

     

       341
       341
       -
       			s.pages.Notice(w, "settings-keys", "Failed to add public key.")

     

       342
       342
       -
       			return

     

       343
       343
       -
       		}

     

       344
       344
       -
       

     

       345
       345
       -
       		// store in pds too

     

       346
       346
       -
       		resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{

     

       347
       347
       -
       			Collection: tangled.PublicKeyNSID,

     

       348
       348
       -
       			Repo:       did,

     

       349
       349
       -
       			Rkey:       rkey,

     

       350
       350
       -
       			Record: &lexutil.LexiconTypeDecoder{

     

       351
       351
       -
       				Val: &tangled.PublicKey{

     

       352
       352
       -
       					Created: time.Now().Format(time.RFC3339),

     

       353
       353
       -
       					Key:     key,

     

       354
       354
       -
       					Name:    name,

     

       355
       355
       -
       				}},

     

       356
       356
       -
       		})

     

       357
       357
       -
       		// invalid record

     

       358
       358
       -
       		if err != nil {

     

       359
       359
       -
       			log.Printf("failed to create record: %s", err)

     

       360
       360
       -
       			s.pages.Notice(w, "settings-keys", "Failed to create record.")

     

       361
       361
       -
       			return

     

       362
       362
       -
       		}

     

       363
       363
       -
       

     

       364
       364
       -
       		log.Println("created atproto record: ", resp.Uri)

     

       365
       365
       -
       

     

       366
       366
       -
       		err = tx.Commit()

     

       367
       367
       -
       		if err != nil {

     

       368
       368
       -
       			log.Printf("failed to commit tx; adding public key: %s", err)

     

       369
       369
       -
       			s.pages.Notice(w, "settings-keys", "Unable to add public key at this moment, try again later.")

     

       370
       370
       -
       			return

     

       371
       371
       -
       		}

     

       372
       372
       -
       

     

       373
       373
       -
       		s.pages.HxLocation(w, "/settings")

     

       374
       374
       -
       		return

     

       375
       375
       -
       

     

       376
       376
       -
       	case http.MethodDelete:

     

       377
       377
       -
       		did := s.auth.GetDid(r)

     

       378
       378
       -
       		q := r.URL.Query()

     

       379
       379
       -
       

     

       380
       380
       -
       		name := q.Get("name")

     

       381
       381
       -
       		rkey := q.Get("rkey")

     

       382
       382
       -
       		key := q.Get("key")

     

       383
       383
       -
       

     

       384
       384
       -
       		log.Println(name)

     

       385
       385
       -
       		log.Println(rkey)

     

       386
       386
       -
       		log.Println(key)

     

       387
       387
       -
       

     

       388
       388
       -
       		client, _ := s.auth.AuthorizedClient(r)

     

       389
       389
       -
       

     

       390
       390
       -
       		if err := db.RemovePublicKey(s.db, did, name, key); err != nil {

     

       391
       391
       -
       			log.Printf("removing public key: %s", err)

     

       392
       392
       -
       			s.pages.Notice(w, "settings-keys", "Failed to remove public key.")

     

       393
       393
       -
       			return

     

       394
       394
       -
       		}

     

       395
       395
       -
       

     

       396
       396
       -
       		if rkey != "" {

     

       397
       397
       -
       			// remove from pds too

     

       398
       398
       -
       			_, err := comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{

     

       399
       399
       -
       				Collection: tangled.PublicKeyNSID,

     

       400
       400
       -
       				Repo:       did,

     

       401
       401
       -
       				Rkey:       rkey,

     

       402
       402
       -
       			})

     

       403
       403
       -
       

     

       404
       404
       -
       			// invalid record

     

       405
       405
       -
       			if err != nil {

     

       406
       406
       -
       				log.Printf("failed to delete record from PDS: %s", err)

     

       407
       407
       -
       				s.pages.Notice(w, "settings-keys", "Failed to remove key from PDS.")

     

       408
       408
       -
       				return

     

       409
       409
       -
       			}

     

       410
       410
       -
       		}

     

       411
       411
       -
       		log.Println("deleted successfully")

     

       412
       412
       -
       

     

       413
       413
       -
       		s.pages.HxLocation(w, "/settings")

     

       414
       414
       -
       		return

     

       415
       415
       -
       	}

     

       416
       416
       -
       }

+44 -5

appview/state/signer.go

···

       7
       7
        
       	"encoding/hex"

     

       8
       8
        
       	"encoding/json"

     

       9
       9
        
       	"fmt"

     

       10
       10
       +
       	"io"

     

       11
       11
       +
       	"log"

     

       10
       12
        
       	"net/http"

     

       11
       13
        
       	"net/url"

     

       12
       14
        
       	"time"

     
···

       351
       353
        
       	return us.client.Do(req)

     

       352
       354
        
       }

     

       353
       355
        
       

     

       354
       354
       -
       func (us *UnsignedClient) Capabilities(ownerDid, repoName string) (*http.Response, error) {

     

       356
       356
       +
       func (us *UnsignedClient) Capabilities() (*types.Capabilities, error) {

     

       355
       357
        
       	const (

     

       356
       358
        
       		Method   = "GET"

     

       357
       359
        
       		Endpoint = "/capabilities"

     
···

       362
       364
        
       		return nil, err

     

       363
       365
        
       	}

     

       364
       366
        
       

     

       365
       365
       -
       	return us.client.Do(req)

     

       367
       367
       +
       	resp, err := us.client.Do(req)

     

       368
       368
       +
       	if err != nil {

     

       369
       369
       +
       		return nil, err

     

       370
       370
       +
       	}

     

       371
       371
       +
       	defer resp.Body.Close()

     

       372
       372
       +
       

     

       373
       373
       +
       	var capabilities types.Capabilities

     

       374
       374
       +
       	if err := json.NewDecoder(resp.Body).Decode(&capabilities); err != nil {

     

       375
       375
       +
       		return nil, err

     

       376
       376
       +
       	}

     

       377
       377
       +
       

     

       378
       378
       +
       	return &capabilities, nil

     

       366
       379
        
       }

     

       367
       380
        
       

     

       368
       368
       -
       func (us *UnsignedClient) Compare(ownerDid, repoName, rev1, rev2 string) (*http.Response, error) {

     

       381
       381
       +
       func (us *UnsignedClient) Compare(ownerDid, repoName, rev1, rev2 string) (*types.RepoFormatPatchResponse, error) {

     

       369
       382
        
       	const (

     

       370
       383
        
       		Method = "GET"

     

       371
       384
        
       	)

     
···

       374
       387
        
       

     

       375
       388
        
       	req, err := us.newRequest(Method, endpoint, nil)

     

       376
       389
        
       	if err != nil {

     

       377
       377
       -
       		return nil, err

     

       390
       390
       +
       		return nil, fmt.Errorf("Failed to create request.")

     

       391
       391
       +
       	}

     

       392
       392
       +
       

     

       393
       393
       +
       	compareResp, err := us.client.Do(req)

     

       394
       394
       +
       	if err != nil {

     

       395
       395
       +
       		return nil, fmt.Errorf("Failed to create request.")

     

       396
       396
       +
       	}

     

       397
       397
       +
       	defer compareResp.Body.Close()

     

       398
       398
       +
       

     

       399
       399
       +
       	switch compareResp.StatusCode {

     

       400
       400
       +
       	case 404:

     

       401
       401
       +
       	case 400:

     

       402
       402
       +
       		return nil, fmt.Errorf("Branch comparisons not supported on this knot.")

     

       403
       403
       +
       	}

     

       404
       404
       +
       

     

       405
       405
       +
       	respBody, err := io.ReadAll(compareResp.Body)

     

       406
       406
       +
       	if err != nil {

     

       407
       407
       +
       		log.Println("failed to compare across branches")

     

       408
       408
       +
       		return nil, fmt.Errorf("Failed to compare branches.")

     

       409
       409
       +
       	}

     

       410
       410
       +
       	defer compareResp.Body.Close()

     

       411
       411
       +
       

     

       412
       412
       +
       	var formatPatchResponse types.RepoFormatPatchResponse

     

       413
       413
       +
       	err = json.Unmarshal(respBody, &formatPatchResponse)

     

       414
       414
       +
       	if err != nil {

     

       415
       415
       +
       		log.Println("failed to unmarshal format-patch response", err)

     

       416
       416
       +
       		return nil, fmt.Errorf("failed to compare branches.")

     

       378
       417
        
       	}

     

       379
       418
        
       

     

       380
       380
       -
       	return us.client.Do(req)

     

       419
       419
       +
       	return &formatPatchResponse, nil

     

       381
       420
        
       }

+2 -1

appview/state/star.go

···

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

     

       10
       10
        
       	lexutil "github.com/bluesky-social/indigo/lex/util"

     

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

     

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

     

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

     

       13
       14
        
       	"tangled.sh/tangled.sh/core/appview/pages"

     

       14
       15
        
       )

     
···

       33
       34
        
       	switch r.Method {

     

       34
       35
        
       	case http.MethodPost:

     

       35
       36
        
       		createdAt := time.Now().Format(time.RFC3339)

     

       36
       36
       -
       		rkey := s.TID()

     

       37
       37
       +
       		rkey := appview.TID()

     

       37
       38
        
       		resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{

     

       38
       39
        
       			Collection: tangled.FeedStarNSID,

     

       39
       40
        
       			Repo:       currentUser.Did,

+5 -5

appview/state/state.go

···

       55
       55
        
       

     

       56
       56
        
       	clock := syntax.NewTIDClock(0)

     

       57
       57
        
       

     

       58
       58
       -
       	pgs := pages.NewPages()

     

       58
       58
       +
       	pgs := pages.NewPages(config.Dev)

     

       59
       59
        
       

     

       60
       60
        
       	resolver := appview.NewResolver()

     

       61
       61
        
       

     
···

       91
       91
        
       	return state, nil

     

       92
       92
        
       }

     

       93
       93
        
       

     

       94
       94
       -
       func (s *State) TID() string {

     

       95
       95
       -
       	return s.tidClock.Next().String()

     

       94
       94
       +
       func TID(c *syntax.TIDClock) string {

     

       95
       95
       +
       	return c.Next().String()

     

       96
       96
        
       }

     

       97
       97
        
       

     

       98
       98
        
       func (s *State) Login(w http.ResponseWriter, r *http.Request) {

     
···

       522
       522
        
       	resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{

     

       523
       523
        
       		Collection: tangled.KnotMemberNSID,

     

       524
       524
        
       		Repo:       currentUser.Did,

     

       525
       525
       -
       		Rkey:       s.TID(),

     

       525
       525
       +
       		Rkey:       appview.TID(),

     

       526
       526
        
       		Record: &lexutil.LexiconTypeDecoder{

     

       527
       527
        
       			Val: &tangled.KnotMember{

     

       528
       528
        
       				Member:  memberIdent.DID.String(),

     
···

       646
       646
        
       			return

     

       647
       647
        
       		}

     

       648
       648
        
       

     

       649
       649
       -
       		rkey := s.TID()

     

       649
       649
       +
       		rkey := appview.TID()

     

       650
       650
        
       		repo := &db.Repo{

     

       651
       651
        
       			Did:         user.Did,

     

       652
       652
        
       			Name:        repoName,

+11

appview/tid.go

···

       1
       1
       +
       package appview

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       5
       5
       +
       )

     

       6
       6
       +
       

     

       7
       7
       +
       var c *syntax.TIDClock = syntax.NewTIDClock(0)

     

       8
       8
       +
       

     

       9
       9
       +
       func TID() string {

     

       10
       10
       +
       	return c.Next().String()

     

       11
       11
       +
       }

+38

cmd/combinediff/main.go

···

       1
       1
       +
       package main

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"fmt"

     

       5
       5
       +
       	"os"

     

       6
       6
       +
       

     

       7
       7
       +
       	"github.com/bluekeyes/go-gitdiff/gitdiff"

     

       8
       8
       +
       	"tangled.sh/tangled.sh/core/patchutil"

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       func main() {

     

       12
       12
       +
       	if len(os.Args) != 3 {

     

       13
       13
       +
       		fmt.Println("Usage: combinediff <patch1> <patch2>")

     

       14
       14
       +
       		os.Exit(1)

     

       15
       15
       +
       	}

     

       16
       16
       +
       

     

       17
       17
       +
       	patch1, err := os.Open(os.Args[1])

     

       18
       18
       +
       	if err != nil {

     

       19
       19
       +
       		fmt.Println(err)

     

       20
       20
       +
       	}

     

       21
       21
       +
       	patch2, err := os.Open(os.Args[2])

     

       22
       22
       +
       	if err != nil {

     

       23
       23
       +
       		fmt.Println(err)

     

       24
       24
       +
       	}

     

       25
       25
       +
       

     

       26
       26
       +
       	files1, _, err := gitdiff.Parse(patch1)

     

       27
       27
       +
       	if err != nil {

     

       28
       28
       +
       		fmt.Println(err)

     

       29
       29
       +
       	}

     

       30
       30
       +
       

     

       31
       31
       +
       	files2, _, err := gitdiff.Parse(patch2)

     

       32
       32
       +
       	if err != nil {

     

       33
       33
       +
       		fmt.Println(err)

     

       34
       34
       +
       	}

     

       35
       35
       +
       

     

       36
       36
       +
       	combined := patchutil.CombineDiff(files1, files2)

     

       37
       37
       +
       	fmt.Println(combined)

     

       38
       38
       +
       }

+38

cmd/interdiff/main.go

···

       1
       1
       +
       package main

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"fmt"

     

       5
       5
       +
       	"os"

     

       6
       6
       +
       

     

       7
       7
       +
       	"github.com/bluekeyes/go-gitdiff/gitdiff"

     

       8
       8
       +
       	"tangled.sh/tangled.sh/core/patchutil"

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       func main() {

     

       12
       12
       +
       	if len(os.Args) != 3 {

     

       13
       13
       +
       		fmt.Println("Usage: interdiff <patch1> <patch2>")

     

       14
       14
       +
       		os.Exit(1)

     

       15
       15
       +
       	}

     

       16
       16
       +
       

     

       17
       17
       +
       	patch1, err := os.Open(os.Args[1])

     

       18
       18
       +
       	if err != nil {

     

       19
       19
       +
       		fmt.Println(err)

     

       20
       20
       +
       	}

     

       21
       21
       +
       	patch2, err := os.Open(os.Args[2])

     

       22
       22
       +
       	if err != nil {

     

       23
       23
       +
       		fmt.Println(err)

     

       24
       24
       +
       	}

     

       25
       25
       +
       

     

       26
       26
       +
       	files1, _, err := gitdiff.Parse(patch1)

     

       27
       27
       +
       	if err != nil {

     

       28
       28
       +
       		fmt.Println(err)

     

       29
       29
       +
       	}

     

       30
       30
       +
       

     

       31
       31
       +
       	files2, _, err := gitdiff.Parse(patch2)

     

       32
       32
       +
       	if err != nil {

     

       33
       33
       +
       		fmt.Println(err)

     

       34
       34
       +
       	}

     

       35
       35
       +
       

     

       36
       36
       +
       	interDiffResult := patchutil.Interdiff(files1, files2)

     

       37
       37
       +
       	fmt.Println(interDiffResult)

     

       38
       38
       +
       }

+52

docker/Dockerfile

···

       1
       1
       +
       FROM docker.io/golang:1.24-alpine3.21 AS build

     

       2
       2
       +
       

     

       3
       3
       +
       ENV CGO_ENABLED=1

     

       4
       4
       +
       

     

       5
       5
       +
       RUN apk add --no-cache gcc musl-dev

     

       6
       6
       +
       

     

       7
       7
       +
       WORKDIR /usr/src/app

     

       8
       8
       +
       

     

       9
       9
       +
       COPY go.mod go.sum ./

     

       10
       10
       +
       RUN go mod download

     

       11
       11
       +
       

     

       12
       12
       +
       COPY . .

     

       13
       13
       +
       RUN go build -v \

     

       14
       14
       +
           -o /usr/local/bin/knotserver \

     

       15
       15
       +
           -ldflags='-s -w -extldflags "-static"' \

     

       16
       16
       +
           ./cmd/knotserver && \

     

       17
       17
       +
           go build -v \

     

       18
       18
       +
           -o /usr/local/bin/keyfetch \

     

       19
       19
       +
           ./cmd/keyfetch && \

     

       20
       20
       +
           go build -v \

     

       21
       21
       +
           -o /usr/local/bin/repoguard \

     

       22
       22
       +
           ./cmd/repoguard

     

       23
       23
       +
       

     

       24
       24
       +
       FROM docker.io/alpine:3.21

     

       25
       25
       +
       

     

       26
       26
       +
       LABEL org.opencontainers.image.title=Tangled

     

       27
       27
       +
       LABEL org.opencontainers.image.description="Tangled is a decentralized and open code collaboration platform, built on atproto."

     

       28
       28
       +
       LABEL org.opencontainers.image.vendor=Tangled.sh

     

       29
       29
       +
       LABEL org.opencontainers.image.licenses=MIT

     

       30
       30
       +
       LABEL org.opencontainers.image.url=https://tangled.sh

     

       31
       31
       +
       LABEL org.opencontainers.image.source=https://tangled.sh/@tangled.sh/core

     

       32
       32
       +
       

     

       33
       33
       +
       RUN apk add --no-cache shadow s6-overlay execline openssh git && \

     

       34
       34
       +
           adduser --disabled-password git && \

     

       35
       35
       +
           # We need to set password anyway since otherwise ssh won't work

     

       36
       36
       +
           head -c 32 /dev/random | base64 | tr -dc 'a-zA-Z0-9' | passwd git --stdin && \

     

       37
       37
       +
           mkdir /app && mkdir /home/git/repositories

     

       38
       38
       +
       

     

       39
       39
       +
       COPY --from=build /usr/local/bin/knotserver /usr/local/bin

     

       40
       40
       +
       COPY --from=build /usr/local/bin/keyfetch /usr/local/libexec/tangled-keyfetch

     

       41
       41
       +
       COPY --from=build /usr/local/bin/repoguard /home/git/repoguard

     

       42
       42
       +
       COPY docker/rootfs/ .

     

       43
       43
       +
       

     

       44
       44
       +
       RUN chown root:root /usr/local/libexec/tangled-keyfetch && \

     

       45
       45
       +
           chmod 755 /usr/local/libexec/tangled-keyfetch && \

     

       46
       46
       +
           chown git:git /home/git/repoguard && \

     

       47
       47
       +
           chown git:git /app && chown git:git /home/git/repositories

     

       48
       48
       +
       

     

       49
       49
       +
       EXPOSE 22

     

       50
       50
       +
       EXPOSE 5555

     

       51
       51
       +
       

     

       52
       52
       +
       ENTRYPOINT ["/init"]

+17

docker/docker-compose.yml

···

       1
       1
       +
       services:

     

       2
       2
       +
         knot:

     

       3
       3
       +
           build:

     

       4
       4
       +
             context: ..

     

       5
       5
       +
             dockerfile: docker/Dockerfile

     

       6
       6
       +
           environment:

     

       7
       7
       +
             KNOT_SERVER_HOSTNAME: ${KNOT_SERVER_HOSTNAME}

     

       8
       8
       +
             KNOT_SERVER_SECRET: ${KNOT_SERVER_SECRET}

     

       9
       9
       +
             KNOT_SERVER_DB_PATH: "/app/knotserver.db"

     

       10
       10
       +
             KNOT_REPO_SCAN_PATH: "/home/git/repositories"

     

       11
       11
       +
           volumes:

     

       12
       12
       +
             - "./keys:/etc/ssh/keys"

     

       13
       13
       +
             - "./repositories:/home/git/repositories"

     

       14
       14
       +
             - "./server:/app"

     

       15
       15
       +
           ports:

     

       16
       16
       +
             - "5555:5555"

     

       17
       17
       +
             - "2222:22"

docker/rootfs/etc/s6-overlay/s6-rc.d/create-sshd-host-keys/type

···

       1
       1
       +
       oneshot

docker/rootfs/etc/s6-overlay/s6-rc.d/create-sshd-host-keys/up

···

       1
       1
       +
       /etc/s6-overlay/scripts/create-sshd-host-keys

docker/rootfs/etc/s6-overlay/s6-rc.d/knotserver/dependencies.d/base