comparing sl/uvpzuszrulvq and op/tywmwstmotyk on julien.rbrt.fr/tangled-core

+1 -1

.air/knot.toml

···

       4
       4
        
       [build]

     

       5
       5
        
       cmd = 'go build -ldflags "-X tangled.org/core/knotserver.version=$(git describe --tags --long)" -o out/knot.out cmd/knot/main.go'

     

       6
       6
        
       bin = "out/knot.out"

     

       7
       7
       -
       args_bin = "server"

     

       7
       7
       +
       args_bin = ["server"]

     

       8
       8
        
       

     

       9
       9
        
       include_ext = ["go"]

     

       10
       10
        
       exclude_dir = ["avatar", "camo", "indexes", "nix", "tmp"]

+39 -2

appview/db/db.go

···

       569
       569
        
       		-- indexes for better performance

     

       570
       570
        
       		create index if not exists idx_notifications_recipient_created on notifications(recipient_did, created desc);

     

       571
       571
        
       		create index if not exists idx_notifications_recipient_read on notifications(recipient_did, read);

     

       572
       572
       -
       		create index if not exists idx_stars_created on stars(created);

     

       573
       573
       -
       		create index if not exists idx_stars_repo_at_created on stars(repo_at, created);

     

       574
       572
        
       	`)

     

       575
       573
        
       	if err != nil {

     

       576
       574
        
       		return nil, err

     
···

       1124
       1122
        
       	runMigration(conn, logger, "add-usermentioned-preference", func(tx *sql.Tx) error {

     

       1125
       1123
        
       		_, err := tx.Exec(`

     

       1126
       1124
        
       			alter table notification_preferences add column user_mentioned integer not null default 1;

     

       1125
       1125
       +
       		`)

     

       1126
       1126
       +
       		return err

     

       1127
       1127
       +
       	})

     

       1128
       1128
       +
       

     

       1129
       1129
       +
       	// remove the foreign key constraints from stars.

     

       1130
       1130
       +
       	runMigration(conn, logger, "generalize-stars-subject", func(tx *sql.Tx) error {

     

       1131
       1131
       +
       		_, err := tx.Exec(`

     

       1132
       1132
       +
       			create table stars_new (

     

       1133
       1133
       +
       				id integer primary key autoincrement,

     

       1134
       1134
       +
       				did text not null,

     

       1135
       1135
       +
       				rkey text not null,

     

       1136
       1136
       +
       

     

       1137
       1137
       +
       				subject_at text not null,

     

       1138
       1138
       +
       

     

       1139
       1139
       +
       				created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),

     

       1140
       1140
       +
       				unique(did, rkey),

     

       1141
       1141
       +
       				unique(did, subject_at)

     

       1142
       1142
       +
       			);

     

       1143
       1143
       +
       

     

       1144
       1144
       +
       			insert into stars_new (

     

       1145
       1145
       +
       				id,

     

       1146
       1146
       +
       				did,

     

       1147
       1147
       +
       				rkey,

     

       1148
       1148
       +
       				subject_at,

     

       1149
       1149
       +
       				created

     

       1150
       1150
       +
       			)

     

       1151
       1151
       +
       			select

     

       1152
       1152
       +
       				id,

     

       1153
       1153
       +
       				starred_by_did,

     

       1154
       1154
       +
       				rkey,

     

       1155
       1155
       +
       				repo_at,

     

       1156
       1156
       +
       				created

     

       1157
       1157
       +
       			from stars;

     

       1158
       1158
       +
       

     

       1159
       1159
       +
       			drop table stars;

     

       1160
       1160
       +
       			alter table stars_new rename to stars;

     

       1161
       1161
       +
       

     

       1162
       1162
       +
       			create index if not exists idx_stars_created on stars(created);

     

       1163
       1163
       +
       			create index if not exists idx_stars_subject_at_created on stars(subject_at, created);

     

       1127
       1164
        
       		`)

     

       1128
       1165
        
       		return err

     

       1129
       1166
        
       	})

+4 -2

appview/db/pipeline.go

···

       168
       168
        
       

     

       169
       169
        
       // this is a mega query, but the most useful one:

     

       170
       170
        
       // get N pipelines, for each one get the latest status of its N workflows

     

       171
       171
       -
       func GetPipelineStatuses(e Execer, filters ...filter) ([]models.Pipeline, error) {

     

       171
       171
       +
       func GetPipelineStatuses(e Execer, limit int, filters ...filter) ([]models.Pipeline, error) {

     

       172
       172
        
       	var conditions []string

     

       173
       173
        
       	var args []any

     

       174
       174
        
       	for _, filter := range filters {

     
···

       205
       205
        
       		join

     

       206
       206
        
       			triggers t ON p.trigger_id = t.id

     

       207
       207
        
       		%s

     

       208
       208
       -
       	`, whereClause)

     

       208
       208
       +
       		order by p.created desc

     

       209
       209
       +
       		limit %d

     

       210
       210
       +
       	`, whereClause, limit)

     

       209
       211
        
       

     

       210
       212
        
       	rows, err := e.Query(query, args...)

     

       211
       213
        
       	if err != nil {

+3 -3

appview/db/repos.go

···

       208
       208
        
       

     

       209
       209
        
       	starCountQuery := fmt.Sprintf(

     

       210
       210
        
       		`select

     

       211
       211
       -
       			repo_at, count(1)

     

       211
       211
       +
       			subject_at, count(1)

     

       212
       212
        
       		from stars

     

       213
       213
       -
       		where repo_at in (%s)

     

       214
       214
       -
       		group by repo_at`,

     

       213
       213
       +
       		where subject_at in (%s)

     

       214
       214
       +
       		group by subject_at`,

     

       215
       215
        
       		inClause,

     

       216
       216
        
       	)

     

       217
       217
        
       	rows, err = e.Query(starCountQuery, args...)

+39 -99

appview/db/star.go

···

       14
       14
        
       )

     

       15
       15
        
       

     

       16
       16
        
       func AddStar(e Execer, star *models.Star) error {

     

       17
       17
       -
       	query := `insert or ignore into stars (starred_by_did, repo_at, rkey) values (?, ?, ?)`

     

       17
       17
       +
       	query := `insert or ignore into stars (did, subject_at, rkey) values (?, ?, ?)`

     

       18
       18
        
       	_, err := e.Exec(

     

       19
       19
        
       		query,

     

       20
       20
       -
       		star.StarredByDid,

     

       20
       20
       +
       		star.Did,

     

       21
       21
        
       		star.RepoAt.String(),

     

       22
       22
        
       		star.Rkey,

     

       23
       23
        
       	)

     
···

       25
       25
        
       }

     

       26
       26
        
       

     

       27
       27
        
       // Get a star record

     

       28
       28
       -
       func GetStar(e Execer, starredByDid string, repoAt syntax.ATURI) (*models.Star, error) {

     

       28
       28
       +
       func GetStar(e Execer, did string, subjectAt syntax.ATURI) (*models.Star, error) {

     

       29
       29
        
       	query := `

     

       30
       30
       -
       	select starred_by_did, repo_at, created, rkey

     

       30
       30
       +
       	select did, subject_at, created, rkey

     

       31
       31
        
       	from stars

     

       32
       32
       -
       	where starred_by_did = ? and repo_at = ?`

     

       33
       33
       -
       	row := e.QueryRow(query, starredByDid, repoAt)

     

       32
       32
       +
       	where did = ? and subject_at = ?`

     

       33
       33
       +
       	row := e.QueryRow(query, did, subjectAt)

     

       34
       34
        
       

     

       35
       35
        
       	var star models.Star

     

       36
       36
        
       	var created string

     

       37
       37
       -
       	err := row.Scan(&star.StarredByDid, &star.RepoAt, &created, &star.Rkey)

     

       37
       37
       +
       	err := row.Scan(&star.Did, &star.RepoAt, &created, &star.Rkey)

     

       38
       38
        
       	if err != nil {

     

       39
       39
        
       		return nil, err

     

       40
       40
        
       	}

     
···

       51
       51
        
       }

     

       52
       52
        
       

     

       53
       53
        
       // Remove a star

     

       54
       54
       -
       func DeleteStar(e Execer, starredByDid string, repoAt syntax.ATURI) error {

     

       55
       55
       -
       	_, err := e.Exec(`delete from stars where starred_by_did = ? and repo_at = ?`, starredByDid, repoAt)

     

       54
       54
       +
       func DeleteStar(e Execer, did string, subjectAt syntax.ATURI) error {

     

       55
       55
       +
       	_, err := e.Exec(`delete from stars where did = ? and subject_at = ?`, did, subjectAt)

     

       56
       56
        
       	return err

     

       57
       57
        
       }

     

       58
       58
        
       

     

       59
       59
        
       // Remove a star

     

       60
       60
       -
       func DeleteStarByRkey(e Execer, starredByDid string, rkey string) error {

     

       61
       61
       -
       	_, err := e.Exec(`delete from stars where starred_by_did = ? and rkey = ?`, starredByDid, rkey)

     

       60
       60
       +
       func DeleteStarByRkey(e Execer, did string, rkey string) error {

     

       61
       61
       +
       	_, err := e.Exec(`delete from stars where did = ? and rkey = ?`, did, rkey)

     

       62
       62
        
       	return err

     

       63
       63
        
       }

     

       64
       64
        
       

     

       65
       65
       -
       func GetStarCount(e Execer, repoAt syntax.ATURI) (int, error) {

     

       65
       65
       +
       func GetStarCount(e Execer, subjectAt syntax.ATURI) (int, error) {

     

       66
       66
        
       	stars := 0

     

       67
       67
        
       	err := e.QueryRow(

     

       68
       68
       -
       		`select count(starred_by_did) from stars where repo_at = ?`, repoAt).Scan(&stars)

     

       68
       68
       +
       		`select count(did) from stars where subject_at = ?`, subjectAt).Scan(&stars)

     

       69
       69
        
       	if err != nil {

     

       70
       70
        
       		return 0, err

     

       71
       71
        
       	}

     
···

       89
       89
        
       	}

     

       90
       90
        
       

     

       91
       91
        
       	query := fmt.Sprintf(`

     

       92
       92
       -
       		SELECT repo_at

     

       92
       92
       +
       		SELECT subject_at

     

       93
       93
        
       		FROM stars

     

       94
       94
       -
       		WHERE starred_by_did = ? AND repo_at IN (%s)

     

       94
       94
       +
       		WHERE did = ? AND subject_at IN (%s)

     

       95
       95
        
       	`, strings.Join(placeholders, ","))

     

       96
       96
        
       

     

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

     
···

       118
       118
        
       	return result, nil

     

       119
       119
        
       }

     

       120
       120
        
       

     

       121
       121
       -
       func GetStarStatus(e Execer, userDid string, repoAt syntax.ATURI) bool {

     

       122
       122
       -
       	statuses, err := getStarStatuses(e, userDid, []syntax.ATURI{repoAt})

     

       121
       121
       +
       func GetStarStatus(e Execer, userDid string, subjectAt syntax.ATURI) bool {

     

       122
       122
       +
       	statuses, err := getStarStatuses(e, userDid, []syntax.ATURI{subjectAt})

     

       123
       123
        
       	if err != nil {

     

       124
       124
        
       		return false

     

       125
       125
        
       	}

     

       126
       126
       -
       	return statuses[repoAt.String()]

     

       126
       126
       +
       	return statuses[subjectAt.String()]

     

       127
       127
        
       }

     

       128
       128
        
       

     

       129
       129
        
       // GetStarStatuses returns a map of repo URIs to star status for a given user

     

       130
       130
       -
       func GetStarStatuses(e Execer, userDid string, repoAts []syntax.ATURI) (map[string]bool, error) {

     

       131
       131
       -
       	return getStarStatuses(e, userDid, repoAts)

     

       130
       130
       +
       func GetStarStatuses(e Execer, userDid string, subjectAts []syntax.ATURI) (map[string]bool, error) {

     

       131
       131
       +
       	return getStarStatuses(e, userDid, subjectAts)

     

       132
       132
        
       }

     

       133
       133
       -
       func GetStars(e Execer, limit int, filters ...filter) ([]models.Star, error) {

     

       133
       133
       +
       

     

       134
       134
       +
       // GetRepoStars return a list of stars each holding target repository.

     

       135
       135
       +
       // If there isn't known repo with starred at-uri, those stars will be ignored.

     

       136
       136
       +
       func GetRepoStars(e Execer, limit int, filters ...filter) ([]models.RepoStar, error) {

     

       134
       137
        
       	var conditions []string

     

       135
       138
        
       	var args []any

     

       136
       139
        
       	for _, filter := range filters {

     
···

       149
       152
        
       	}

     

       150
       153
        
       

     

       151
       154
        
       	repoQuery := fmt.Sprintf(

     

       152
       152
       -
       		`select starred_by_did, repo_at, created, rkey

     

       155
       155
       +
       		`select did, subject_at, created, rkey

     

       153
       156
        
       		from stars

     

       154
       157
        
       		%s

     

       155
       158
        
       		order by created desc

     
···

       166
       169
        
       	for rows.Next() {

     

       167
       170
        
       		var star models.Star

     

       168
       171
        
       		var created string

     

       169
       169
       -
       		err := rows.Scan(&star.StarredByDid, &star.RepoAt, &created, &star.Rkey)

     

       172
       172
       +
       		err := rows.Scan(&star.Did, &star.RepoAt, &created, &star.Rkey)

     

       170
       173
        
       		if err != nil {

     

       171
       174
        
       			return nil, err

     

       172
       175
        
       		}

     
···

       197
       200
        
       		return nil, err

     

       198
       201
        
       	}

     

       199
       202
        
       

     

       203
       203
       +
       	var repoStars []models.RepoStar

     

       200
       204
        
       	for _, r := range repos {

     

       201
       205
        
       		if stars, ok := starMap[string(r.RepoAt())]; ok {

     

       202
       202
       -
       			for i := range stars {

     

       203
       203
       -
       				stars[i].Repo = &r

     

       206
       206
       +
       			for _, star := range stars {

     

       207
       207
       +
       				repoStars = append(repoStars, models.RepoStar{

     

       208
       208
       +
       					Star: star,

     

       209
       209
       +
       					Repo: &r,

     

       210
       210
       +
       				})

     

       204
       211
        
       			}

     

       205
       212
        
       		}

     

       206
       213
        
       	}

     

       207
       214
        
       

     

       208
       208
       -
       	var stars []models.Star

     

       209
       209
       -
       	for _, s := range starMap {

     

       210
       210
       -
       		stars = append(stars, s...)

     

       211
       211
       -
       	}

     

       212
       212
       -
       

     

       213
       213
       -
       	slices.SortFunc(stars, func(a, b models.Star) int {

     

       215
       215
       +
       	slices.SortFunc(repoStars, func(a, b models.RepoStar) int {

     

       214
       216
        
       		if a.Created.After(b.Created) {

     

       215
       217
        
       			return -1

     

       216
       218
        
       		}

     
···

       220
       222
        
       		return 0

     

       221
       223
        
       	})

     

       222
       224
        
       

     

       223
       223
       -
       	return stars, nil

     

       225
       225
       +
       	return repoStars, nil

     

       224
       226
        
       }

     

       225
       227
        
       

     

       226
       228
        
       func CountStars(e Execer, filters ...filter) (int64, error) {

     
···

       247
       249
        
       	return count, nil

     

       248
       250
        
       }

     

       249
       251
        
       

     

       250
       250
       -
       func GetAllStars(e Execer, limit int) ([]models.Star, error) {

     

       251
       251
       -
       	var stars []models.Star

     

       252
       252
       -
       

     

       253
       253
       -
       	rows, err := e.Query(`

     

       254
       254
       -
       		select

     

       255
       255
       -
       			s.starred_by_did,

     

       256
       256
       -
       			s.repo_at,

     

       257
       257
       -
       			s.rkey,

     

       258
       258
       -
       			s.created,

     

       259
       259
       -
       			r.did,

     

       260
       260
       -
       			r.name,

     

       261
       261
       -
       			r.knot,

     

       262
       262
       -
       			r.rkey,

     

       263
       263
       -
       			r.created

     

       264
       264
       -
       		from stars s

     

       265
       265
       -
       		join repos r on s.repo_at = r.at_uri

     

       266
       266
       -
       	`)

     

       267
       267
       -
       

     

       268
       268
       -
       	if err != nil {

     

       269
       269
       -
       		return nil, err

     

       270
       270
       -
       	}

     

       271
       271
       -
       	defer rows.Close()

     

       272
       272
       -
       

     

       273
       273
       -
       	for rows.Next() {

     

       274
       274
       -
       		var star models.Star

     

       275
       275
       -
       		var repo models.Repo

     

       276
       276
       -
       		var starCreatedAt, repoCreatedAt string

     

       277
       277
       -
       

     

       278
       278
       -
       		if err := rows.Scan(

     

       279
       279
       -
       			&star.StarredByDid,

     

       280
       280
       -
       			&star.RepoAt,

     

       281
       281
       -
       			&star.Rkey,

     

       282
       282
       -
       			&starCreatedAt,

     

       283
       283
       -
       			&repo.Did,

     

       284
       284
       -
       			&repo.Name,

     

       285
       285
       -
       			&repo.Knot,

     

       286
       286
       -
       			&repo.Rkey,

     

       287
       287
       -
       			&repoCreatedAt,

     

       288
       288
       -
       		); err != nil {

     

       289
       289
       -
       			return nil, err

     

       290
       290
       -
       		}

     

       291
       291
       -
       

     

       292
       292
       -
       		star.Created, err = time.Parse(time.RFC3339, starCreatedAt)

     

       293
       293
       -
       		if err != nil {

     

       294
       294
       -
       			star.Created = time.Now()

     

       295
       295
       -
       		}

     

       296
       296
       -
       		repo.Created, err = time.Parse(time.RFC3339, repoCreatedAt)

     

       297
       297
       -
       		if err != nil {

     

       298
       298
       -
       			repo.Created = time.Now()

     

       299
       299
       -
       		}

     

       300
       300
       -
       		star.Repo = &repo

     

       301
       301
       -
       

     

       302
       302
       -
       		stars = append(stars, star)

     

       303
       303
       -
       	}

     

       304
       304
       -
       

     

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

     

       306
       306
       -
       		return nil, err

     

       307
       307
       -
       	}

     

       308
       308
       -
       

     

       309
       309
       -
       	return stars, nil

     

       310
       310
       -
       }

     

       311
       311
       -
       

     

       312
       252
        
       // GetTopStarredReposLastWeek returns the top 8 most starred repositories from the last week

     

       313
       253
        
       func GetTopStarredReposLastWeek(e Execer) ([]models.Repo, error) {

     

       314
       254
        
       	// first, get the top repo URIs by star count from the last week

     

       315
       255
        
       	query := `

     

       316
       256
        
       		with recent_starred_repos as (

     

       317
       317
       -
       			select distinct repo_at

     

       257
       257
       +
       			select distinct subject_at

     

       318
       258
        
       			from stars

     

       319
       259
        
       			where created >= datetime('now', '-7 days')

     

       320
       260
        
       		),

     

       321
       261
        
       		repo_star_counts as (

     

       322
       262
        
       			select

     

       323
       323
       -
       				s.repo_at,

     

       263
       263
       +
       				s.subject_at,

     

       324
       264
        
       				count(*) as stars_gained_last_week

     

       325
       265
        
       			from stars s

     

       326
       326
       -
       			join recent_starred_repos rsr on s.repo_at = rsr.repo_at

     

       266
       266
       +
       			join recent_starred_repos rsr on s.subject_at = rsr.subject_at

     

       327
       267
        
       			where s.created >= datetime('now', '-7 days')

     

       328
       328
       -
       			group by s.repo_at

     

       268
       268
       +
       			group by s.subject_at

     

       329
       269
        
       		)

     

       330
       330
       -
       		select rsc.repo_at

     

       270
       270
       +
       		select rsc.subject_at

     

       331
       271
        
       		from repo_star_counts rsc

     

       332
       272
        
       		order by rsc.stars_gained_last_week desc

     

       333
       273
        
       		limit 8

+3 -13

appview/db/timeline.go

···

       146
       146
        
       func getTimelineStars(e Execer, limit int, loggedInUserDid string, userIsFollowing []string) ([]models.TimelineEvent, error) {

     

       147
       147
        
       	filters := make([]filter, 0)

     

       148
       148
        
       	if userIsFollowing != nil {

     

       149
       149
       -
       		filters = append(filters, FilterIn("starred_by_did", userIsFollowing))

     

       149
       149
       +
       		filters = append(filters, FilterIn("did", userIsFollowing))

     

       150
       150
        
       	}

     

       151
       151
        
       

     

       152
       152
       -
       	stars, err := GetStars(e, limit, filters...)

     

       152
       152
       +
       	stars, err := GetRepoStars(e, limit, filters...)

     

       153
       153
        
       	if err != nil {

     

       154
       154
        
       		return nil, err

     

       155
       155
        
       	}

     

       156
       156
        
       

     

       157
       157
       -
       	// filter star records without a repo

     

       158
       158
       -
       	n := 0

     

       159
       159
       -
       	for _, s := range stars {

     

       160
       160
       -
       		if s.Repo != nil {

     

       161
       161
       -
       			stars[n] = s

     

       162
       162
       -
       			n++

     

       163
       163
       -
       		}

     

       164
       164
       -
       	}

     

       165
       165
       -
       	stars = stars[:n]

     

       166
       166
       -
       

     

       167
       157
        
       	var repos []models.Repo

     

       168
       158
        
       	for _, s := range stars {

     

       169
       159
        
       		repos = append(repos, *s.Repo)

     
···

       179
       169
        
       		isStarred, starCount := getRepoStarInfo(s.Repo, starStatuses)

     

       180
       170
        
       

     

       181
       171
        
       		events = append(events, models.TimelineEvent{

     

       182
       182
       -
       			Star:      &s,

     

       172
       172
       +
       			RepoStar:  &s,

     

       183
       173
        
       			EventAt:   s.Created,

     

       184
       174
        
       			IsStarred: isStarred,

     

       185
       175
        
       			StarCount: starCount,

+3 -3

appview/ingester.go

···

       121
       121
        
       			return err

     

       122
       122
        
       		}

     

       123
       123
        
       		err = db.AddStar(i.Db, &models.Star{

     

       124
       124
       -
       			StarredByDid: did,

     

       125
       125
       -
       			RepoAt:       subjectUri,

     

       126
       126
       -
       			Rkey:         e.Commit.RKey,

     

       124
       124
       +
       			Did:    did,

     

       125
       125
       +
       			RepoAt: subjectUri,

     

       126
       126
       +
       			Rkey:   e.Commit.RKey,

     

       127
       127
        
       		})

     

       128
       128
        
       	case jmodels.CommitOperationDelete:

     

       129
       129
        
       		err = db.DeleteStarByRkey(i.Db, did, e.Commit.RKey)

+14 -5

appview/models/star.go

···

       7
       7
        
       )

     

       8
       8
        
       

     

       9
       9
        
       type Star struct {

     

       10
       10
       -
       	StarredByDid string

     

       11
       11
       -
       	RepoAt       syntax.ATURI

     

       12
       12
       -
       	Created      time.Time

     

       13
       13
       -
       	Rkey         string

     

       10
       10
       +
       	Did     string

     

       11
       11
       +
       	RepoAt  syntax.ATURI

     

       12
       12
       +
       	Created time.Time

     

       13
       13
       +
       	Rkey    string

     

       14
       14
       +
       }

     

       14
       15
        
       

     

       15
       15
       -
       	// optionally, populate this when querying for reverse mappings

     

       16
       16
       +
       // RepoStar is used for reverse mapping to repos

     

       17
       17
       +
       type RepoStar struct {

     

       18
       18
       +
       	Star

     

       16
       19
        
       	Repo *Repo

     

       17
       20
        
       }

     

       21
       21
       +
       

     

       22
       22
       +
       // StringStar is used for reverse mapping to strings

     

       23
       23
       +
       type StringStar struct {

     

       24
       24
       +
       	Star

     

       25
       25
       +
       	String *String

     

       26
       26
       +
       }

+1 -1

appview/models/string.go

···

       22
       22
        
       	Edited      *time.Time

     

       23
       23
        
       }

     

       24
       24
        
       

     

       25
       25
       -
       func (s *String) StringAt() syntax.ATURI {

     

       25
       25
       +
       func (s *String) AtUri() syntax.ATURI {

     

       26
       26
        
       	return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", s.Did, tangled.StringNSID, s.Rkey))

     

       27
       27
        
       }

     

       28
       28

+1 -1

appview/models/timeline.go

···

       5
       5
        
       type TimelineEvent struct {

     

       6
       6
        
       	*Repo

     

       7
       7
        
       	*Follow

     

       8
       8
       -
       	*Star

     

       8
       8
       +
       	*RepoStar

     

       9
       9
        
       

     

       10
       10
        
       	EventAt time.Time

     

       11
       11

+6 -1

appview/notify/db/db.go

···

       7
       7
        
       	"slices"

     

       8
       8
        
       

     

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

     

       10
       10
       +
       	"tangled.org/core/api/tangled"

     

       10
       11
        
       	"tangled.org/core/appview/db"

     

       11
       12
        
       	"tangled.org/core/appview/models"

     

       12
       13
        
       	"tangled.org/core/appview/notify"

     
···

       36
       37
        
       }

     

       37
       38
        
       

     

       38
       39
        
       func (n *databaseNotifier) NewStar(ctx context.Context, star *models.Star) {

     

       40
       40
       +
       	if star.RepoAt.Collection().String() != tangled.RepoNSID {

     

       41
       41
       +
       		// skip string stars for now

     

       42
       42
       +
       		return

     

       43
       43
       +
       	}

     

       39
       44
        
       	var err error

     

       40
       45
        
       	repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(star.RepoAt)))

     

       41
       46
        
       	if err != nil {

     
···

       43
       48
        
       		return

     

       44
       49
        
       	}

     

       45
       50
        
       

     

       46
       46
       -
       	actorDid := syntax.DID(star.StarredByDid)

     

       51
       51
       +
       	actorDid := syntax.DID(star.Did)

     

       47
       52
        
       	recipients := []syntax.DID{syntax.DID(repo.Did)}

     

       48
       53
        
       	eventType := models.NotificationTypeRepoStarred

     

       49
       54
        
       	entityType := "repo"

+2 -2

appview/notify/posthog/notifier.go

···

       37
       37
        
       

     

       38
       38
        
       func (n *posthogNotifier) NewStar(ctx context.Context, star *models.Star) {

     

       39
       39
        
       	err := n.client.Enqueue(posthog.Capture{

     

       40
       40
       -
       		DistinctId: star.StarredByDid,

     

       40
       40
       +
       		DistinctId: star.Did,

     

       41
       41
        
       		Event:      "star",

     

       42
       42
        
       		Properties: posthog.Properties{"repo_at": star.RepoAt.String()},

     

       43
       43
        
       	})

     
···

       48
       48
        
       

     

       49
       49
        
       func (n *posthogNotifier) DeleteStar(ctx context.Context, star *models.Star) {

     

       50
       50
        
       	err := n.client.Enqueue(posthog.Capture{

     

       51
       51
       -
       		DistinctId: star.StarredByDid,

     

       51
       51
       +
       		DistinctId: star.Did,

     

       52
       52
        
       		Event:      "unstar",

     

       53
       53
        
       		Properties: posthog.Properties{"repo_at": star.RepoAt.String()},

     

       54
       54
        
       	})

+2 -2

appview/oauth/handler.go

···

       24
       24
        
       

     

       25
       25
        
       	r.Get("/oauth/client-metadata.json", o.clientMetadata)

     

       26
       26
        
       	r.Get("/oauth/jwks.json", o.jwks)

     

       27
       27
       -
       	r.Get("/oauth/callback", o.Callback)

     

       27
       27
       +
       	r.Get("/oauth/callback", o.callback)

     

       28
       28
        
       	return r

     

       29
       29
        
       }

     

       30
       30
        
       

     
···

       50
       50
        
       	}

     

       51
       51
        
       }

     

       52
       52
        
       

     

       53
       53
       -
       func (o *OAuth) Callback(w http.ResponseWriter, r *http.Request) {

     

       53
       53
       +
       func (o *OAuth) callback(w http.ResponseWriter, r *http.Request) {

     

       54
       54
        
       	ctx := r.Context()

     

       55
       55
        
       	l := o.Logger.With("query", r.URL.Query())

     

       56
       56

+15 -2

appview/oauth/oauth.go

···

       202
       202
        
       	exp     int64

     

       203
       203
        
       	lxm     string

     

       204
       204
        
       	dev     bool

     

       205
       205
       +
       	timeout time.Duration

     

       205
       206
        
       }

     

       206
       207
        
       

     

       207
       208
        
       type ServiceClientOpt func(*ServiceClientOpts)

     

       209
       209
       +
       

     

       210
       210
       +
       func DefaultServiceClientOpts() ServiceClientOpts {

     

       211
       211
       +
       	return ServiceClientOpts{

     

       212
       212
       +
       		timeout: time.Second * 5,

     

       213
       213
       +
       	}

     

       214
       214
       +
       }

     

       208
       215
        
       

     

       209
       216
        
       func WithService(service string) ServiceClientOpt {

     

       210
       217
        
       	return func(s *ServiceClientOpts) {

     
···

       233
       240
        
       	}

     

       234
       241
        
       }

     

       235
       242
        
       

     

       243
       243
       +
       func WithTimeout(timeout time.Duration) ServiceClientOpt {

     

       244
       244
       +
       	return func(s *ServiceClientOpts) {

     

       245
       245
       +
       		s.timeout = timeout

     

       246
       246
       +
       	}

     

       247
       247
       +
       }

     

       248
       248
       +
       

     

       236
       249
        
       func (s *ServiceClientOpts) Audience() string {

     

       237
       250
        
       	return fmt.Sprintf("did:web:%s", s.service)

     

       238
       251
        
       }

     
···

       247
       260
        
       }

     

       248
       261
        
       

     

       249
       262
        
       func (o *OAuth) ServiceClient(r *http.Request, os ...ServiceClientOpt) (*xrpc.Client, error) {

     

       250
       250
       -
       	opts := ServiceClientOpts{}

     

       263
       263
       +
       	opts := DefaultServiceClientOpts()

     

       251
       264
        
       	for _, o := range os {

     

       252
       265
        
       		o(&opts)

     

       253
       266
        
       	}

     
···

       274
       287
        
       		},

     

       275
       288
        
       		Host: opts.Host(),

     

       276
       289
        
       		Client: &http.Client{

     

       277
       277
       -
       			Timeout: time.Second * 5,

     

       290
       290
       +
       			Timeout: opts.timeout,

     

       278
       291
        
       		},

     

       279
       292
        
       	}, nil

     

       280
       293
        
       }

-10

appview/oauth/session.go

···

       1
       1
       -
       package oauth

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"net/http"

     

       5
       5
       -
       

     

       6
       6
       -
       	"github.com/bluesky-social/indigo/atproto/auth/oauth"

     

       7
       7
       -
       )

     

       8
       8
       -
       

     

       9
       9
       -
       func (o *OAuth) SaveSession2(w http.ResponseWriter, r *http.Request, sessData *oauth.ClientSessionData) {

     

       10
       10
       -
       }

+1 -1

appview/pages/markup/extension/atlink.go

···

       89
       89
        
       	if entering {

     

       90
       90
        
       		w.WriteString(`<a href="/@`)

     

       91
       91
        
       		w.WriteString(n.(*AtNode).Handle)

     

       92
       92
       -
       		w.WriteString(`" class="mention">`)

     

       92
       92
       +
       		w.WriteString(`" class="mention font-bold">`)

     

       93
       93
        
       	} else {

     

       94
       94
        
       		w.WriteString("</a>")

     

       95
       95
        
       	}

+1 -1

appview/pages/markup/markdown.go

···

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

     

       250
       250
        
       

     

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

     

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

     

       252
       252
       +
       		url.QueryEscape(repoName), url.QueryEscape(rctx.RepoInfo.Ref), actualPath)

     

       253
       253
        
       

     

       254
       254
        
       	parsedURL := &url.URL{

     

       255
       255
        
       		Scheme:   scheme,

+8 -6

appview/pages/pages.go

···

       625
       625
        
       	return p.executePlain("user/fragments/editPins", w, params)

     

       626
       626
        
       }

     

       627
       627
        
       

     

       628
       628
       -
       type RepoStarFragmentParams struct {

     

       628
       628
       +
       type StarBtnFragmentParams struct {

     

       629
       629
        
       	IsStarred bool

     

       630
       630
       -
       	RepoAt    syntax.ATURI

     

       631
       631
       -
       	Stats     models.RepoStats

     

       630
       630
       +
       	SubjectAt syntax.ATURI

     

       631
       631
       +
       	StarCount int

     

       632
       632
        
       }

     

       633
       633
        
       

     

       634
       634
       -
       func (p *Pages) RepoStarFragment(w io.Writer, params RepoStarFragmentParams) error {

     

       635
       635
       -
       	return p.executePlain("repo/fragments/repoStar", w, params)

     

       634
       634
       +
       func (p *Pages) StarBtnFragment(w io.Writer, params StarBtnFragmentParams) error {

     

       635
       635
       +
       	return p.executePlain("fragments/starBtn", w, params)

     

       636
       636
        
       }

     

       637
       637
        
       

     

       638
       638
        
       type RepoIndexParams struct {

     
···

       1376
       1376
        
       	ShowRendered     bool

     

       1377
       1377
        
       	RenderToggle     bool

     

       1378
       1378
        
       	RenderedContents template.HTML

     

       1379
       1379
       -
       	String           models.String

     

       1379
       1379
       +
       	String           *models.String

     

       1380
       1380
        
       	Stats            models.StringStats

     

       1381
       1381
       +
       	IsStarred        bool

     

       1382
       1382
       +
       	StarCount        int

     

       1381
       1383
        
       	Owner            identity.Identity

     

       1382
       1384
        
       }

     

       1383
       1385

+28

appview/pages/templates/fragments/starBtn.html

···

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

     

       2
       2
       +
           <button

     

       3
       3
       +
               id="starBtn"

     

       4
       4
       +
               class="btn disabled:opacity-50 disabled:cursor-not-allowed flex gap-2 items-center group"

     

       5
       5
       +
               data-star-subject-at="{{ .SubjectAt }}"

     

       6
       6
       +
               {{ if .IsStarred }}

     

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

     

       8
       8
       +
               {{ else }}

     

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

     

       10
       10
       +
               {{ end }}

     

       11
       11
       +
       

     

       12
       12
       +
               hx-trigger="click"

     

       13
       13
       +
               hx-target="this"

     

       14
       14
       +
               hx-swap="outerHTML"

     

       15
       15
       +
               hx-swap-oob='outerHTML:#starBtn[data-star-subject-at="{{ .SubjectAt }}"]'

     

       16
       16
       +
               hx-disabled-elt="#starBtn"

     

       17
       17
       +
           >

     

       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
       +
                   {{ .StarCount }}

     

       25
       25
       +
               </span>

     

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

     

       27
       27
       +
           </button>

     

       28
       28
       +
       {{ end }}

+4 -1

appview/pages/templates/layouts/repobase.html

···

       49
       49
        
               </div>

     

       50
       50
        
       

     

       51
       51
        
               <div class="w-full sm:w-fit grid grid-cols-3 gap-2 z-auto">

     

       52
       52
       -
                 {{ template "repo/fragments/repoStar" .RepoInfo }}

     

       52
       52
       +
                 {{ template "fragments/starBtn"

     

       53
       53
       +
                   (dict "SubjectAt" .RepoInfo.RepoAt

     

       54
       54
       +
                         "IsStarred" .RepoInfo.IsStarred

     

       55
       55
       +
                         "StarCount" .RepoInfo.Stats.StarCount) }}

     

       53
       56
        
                 <a

     

       54
       57
        
                   class="btn text-sm no-underline hover:no-underline flex items-center gap-2 group"

     

       55
       58
        
                   hx-boost="true"

+3 -1

appview/pages/templates/repo/blob.html

···

       99
       99
        
               {{ end }}

     

       100
       100
        
             </div>

     

       101
       101
        
           {{ else if .BlobView.ContentType.IsCode }}

     

       102
       102
       -
             <div id="blob-contents" class="whitespace-pre peer-target:bg-yellow-200 dark:peer-target:bg-yellow-900">{{ code .BlobView.Contents .Path | escapeHtml }}</div>

     

       102
       102
       +
             <div class="overflow-auto relative">

     

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

     

       104
       104
       +
             </div>

     

       103
       105
        
           {{ end }}

     

       104
       106
        
           {{ template "fragments/multiline-select" }}

     

       105
       107
        
       {{ end }}

+1 -1

appview/pages/templates/repo/compare/compare.html

···

       17
       17
        
       {{ end }}

     

       18
       18
        
       

     

       19
       19
        
       {{ define "mainLayout" }}

     

       20
       20
       -
         <div class="px-1 col-span-full flex flex-col gap-4">

     

       20
       20
       +
         <div class="px-1 flex-grow col-span-full flex flex-col gap-4">

     

       21
       21
        
           {{ block "contentLayout" . }}

     

       22
       22
        
             {{ block "content" . }}{{ end }}

     

       23
       23
        
           {{ end }}

appview/pages/templates/repo/fork.html

···

       25
       25
        
                       value="{{ . }}"

     

       26
       26
        
                       class="mr-2"

     

       27
       27
        
                       id="domain-{{ . }}"

     

       28
       28
       +
                       {{if eq (len $.Knots) 1}}checked{{end}}                

     

       28
       29
        
                       />

     

       29
       30
        
                   <label for="domain-{{ . }}" class="dark:text-white">{{ . }}</label>

     

       30
       31
        
                 </div>

-26

appview/pages/templates/repo/fragments/repoStar.html

···

       1
       1
       -
       {{ define "repo/fragments/repoStar" }}

     

       2
       2
       -
           <button

     

       3
       3
       -
               id="starBtn"

     

       4
       4
       -
               class="btn disabled:opacity-50 disabled:cursor-not-allowed flex gap-2 items-center group"

     

       5
       5
       -
               {{ if .IsStarred }}

     

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

     

       7
       7
       -
               {{ else }}

     

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

     

       9
       9
       -
               {{ end }}

     

       10
       10
       -
       

     

       11
       11
       -
               hx-trigger="click"

     

       12
       12
       -
               hx-target="this"

     

       13
       13
       -
               hx-swap="outerHTML"

     

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

     

       15
       15
       -
           >

     

       16
       16
       -
               {{ if .IsStarred }}

     

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

     

       18
       18
       -
               {{ else }}

     

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

     

       20
       20
       -
               {{ end }}

     

       21
       21
       -
               <span class="text-sm">

     

       22
       22
       -
                   {{ .Stats.StarCount }}

     

       23
       23
       -
               </span>

     

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

     

       25
       25
       -
           </button>

     

       26
       26
       -
       {{ end }}

+19 -8

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

···

       30
       30
        
         <div class="grid gap-2 grid-cols-[auto_1fr_auto] grid-row-2">

     

       31
       31
        
           <form class="flex relative col-span-3 sm:col-span-1 sm:col-start-2" method="GET">

     

       32
       32
        
             <input type="hidden" name="state" value="{{ if .FilteringByOpen }}open{{ else }}closed{{ end }}">

     

       33
       33
       -
             <div class="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400 pointer-events-none">

     

       34
       34
       -
               {{ i "search" "w-4 h-4" }}

     

       33
       33
       +
             <div class="flex-1 flex relative">

     

       34
       34
       +
               <input

     

       35
       35
       +
                 class="flex-1 py-1 pl-2 pr-10 mr-[-1px] rounded-r-none focus:border-0 focus:outline-none focus:ring focus:ring-blue-400 ring-inset peer"

     

       36
       36
       +
                 type="text"

     

       37
       37
       +
                 name="q"

     

       38
       38
       +
                 value="{{ .FilterQuery }}"

     

       39
       39
       +
                 placeholder=" "

     

       40
       40
       +
               >

     

       41
       41
       +
               <a

     

       42
       42
       +
                 href="?state={{ if .FilteringByOpen }}open{{ else }}closed{{ end }}"

     

       43
       43
       +
                 class="absolute right-3 top-1/2 -translate-y-1/2 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 hidden peer-[:not(:placeholder-shown)]:block"

     

       44
       44
       +
               >

     

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

     

       46
       46
       +
               </a>

     

       35
       47
        
             </div>

     

       36
       36
       -
             <input class="flex-1 p-1 pl-10 pr-10 peer" type="text" name="q" value="{{ .FilterQuery }}" placeholder=" ">

     

       37
       37
       -
             <a

     

       38
       38
       -
               href="?state={{ if .FilteringByOpen }}open{{ else }}closed{{ end }}"

     

       39
       39
       -
               class="absolute right-3 top-1/2 -translate-y-1/2 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 hidden peer-[:not(:placeholder-shown)]:block"

     

       48
       48
       +
             <button

     

       49
       49
       +
               type="submit"

     

       50
       50
       +
               class="p-2 text-gray-400 border rounded-r border-gray-400 dark:border-gray-600"

     

       40
       51
        
             >

     

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

     

       42
       42
       -
             </a>

     

       52
       52
       +
               {{ i "search" "w-4 h-4" }}

     

       53
       53
       +
             </button>

     

       43
       54
        
           </form>

     

       44
       55
        
           <div class="sm:row-start-1">

     

       45
       56
        
             {{ template "fragments/tabSelector" (dict "Name" "state" "Values" $values "Active" $active) }}

appview/pages/templates/repo/new.html

···

       155
       155
        
                   class="mr-2"

     

       156
       156
        
                   id="domain-{{ . }}"

     

       157
       157
        
                   required

     

       158
       158
       +
                   {{if eq (len $.Knots) 1}}checked{{end}}

     

       158
       159
        
                 />

     

       159
       160
        
                 <label for="domain-{{ . }}" class="dark:text-white lowercase">{{ . }}</label>

     

       160
       161
        
               </div>

+19 -8

appview/pages/templates/repo/pulls/pulls.html

···

       36
       36
        
         <div class="grid gap-2 grid-cols-[auto_1fr_auto] grid-row-2">

     

       37
       37
        
           <form class="flex relative col-span-3 sm:col-span-1 sm:col-start-2" method="GET">

     

       38
       38
        
             <input type="hidden" name="state" value="{{ .FilteringBy.String }}">

     

       39
       39
       -
             <div class="absolute left-3 top-1/2 -translate-y-1/2 text-gray-400 pointer-events-none">

     

       40
       40
       -
               {{ i "search" "w-4 h-4" }}

     

       39
       39
       +
             <div class="flex-1 flex relative">

     

       40
       40
       +
               <input

     

       41
       41
       +
                 class="flex-1 py-1 pl-2 pr-10 mr-[-1px] rounded-r-none focus:border-0 focus:outline-none focus:ring focus:ring-blue-400 ring-inset peer"

     

       42
       42
       +
                 type="text"

     

       43
       43
       +
                 name="q"

     

       44
       44
       +
                 value="{{ .FilterQuery }}"

     

       45
       45
       +
                 placeholder=" "

     

       46
       46
       +
               >

     

       47
       47
       +
               <a

     

       48
       48
       +
                 href="?state={{ .FilteringBy.String }}"

     

       49
       49
       +
                 class="absolute right-3 top-1/2 -translate-y-1/2 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 hidden peer-[:not(:placeholder-shown)]:block"

     

       50
       50
       +
               >

     

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

     

       52
       52
       +
               </a>

     

       41
       53
        
             </div>

     

       42
       42
       -
             <input class="flex-1 p-1 pl-10 pr-10 peer" type="text" name="q" value="{{ .FilterQuery }}" placeholder=" ">

     

       43
       43
       -
             <a

     

       44
       44
       -
               href="?state={{ .FilteringBy.String }}"

     

       45
       45
       -
               class="absolute right-3 top-1/2 -translate-y-1/2 text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 hidden peer-[:not(:placeholder-shown)]:block"

     

       54
       54
       +
             <button

     

       55
       55
       +
               type="submit"

     

       56
       56
       +
               class="p-2 text-gray-400 border rounded-r border-gray-400 dark:border-gray-600"

     

       46
       57
        
             >

     

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

     

       48
       48
       -
             </a>

     

       58
       58
       +
               {{ i "search" "w-4 h-4" }}

     

       59
       59
       +
             </button>

     

       49
       60
        
           </form>

     

       50
       61
        
           <div class="sm:row-start-1">

     

       51
       62
        
             {{ template "fragments/tabSelector" (dict "Name" "state" "Values" $values "Active" $active) }}

+1 -1

appview/pages/templates/repo/settings/general.html

···

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

     

       59
       59
        
               </button>

     

       60
       60
        
             </div>

     

       61
       61
       -
           <fieldset>

     

       61
       61
       +
           </fieldset>

     

       62
       62
        
         </form>

     

       63
       63
        
       {{ end }}

     

       64
       64

+8 -4

appview/pages/templates/strings/string.html

···

       17
       17
        
               <span class="select-none">/</span>

     

       18
       18
        
               <a href="/strings/{{ $ownerId }}/{{ .String.Rkey }}" class="font-bold">{{ .String.Filename }}</a>

     

       19
       19
        
             </div>

     

       20
       20
       -
             {{ if and .LoggedInUser (eq .LoggedInUser.Did .String.Did) }}

     

       21
       21
       -
               <div class="flex gap-2 text-base">

     

       20
       20
       +
             <div class="flex gap-2 text-base">

     

       21
       21
       +
               {{ if and .LoggedInUser (eq .LoggedInUser.Did .String.Did) }}

     

       22
       22
        
                 <a class="btn flex items-center gap-2 no-underline hover:no-underline p-2 group"

     

       23
       23
        
                    hx-boost="true"

     

       24
       24
        
                    href="/strings/{{ .String.Did }}/{{ .String.Rkey }}/edit">

     
···

       37
       37
        
                   <span class="hidden md:inline">delete</span>

     

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

     

       39
       39
        
                 </button>

     

       40
       40
       -
               </div>

     

       41
       41
       -
             {{ end }}

     

       40
       40
       +
               {{ end }}

     

       41
       41
       +
               {{ template "fragments/starBtn"

     

       42
       42
       +
                 (dict "SubjectAt" .String.AtUri

     

       43
       43
       +
                       "IsStarred" .IsStarred

     

       44
       44
       +
                       "StarCount" .StarCount) }}

     

       45
       45
       +
             </div>

     

       42
       46
        
           </div>

     

       43
       47
        
           <span>

     

       44
       48
        
             {{ with .String.Description }}

+1 -2

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

···

       3
       3
        
           <a href="/goodfirstissues" class="no-underline hover:no-underline">

     

       4
       4
        
             <div class="flex items-center justify-between gap-2 bg-purple-200 dark:bg-purple-900 border border-purple-400 dark:border-purple-500 rounded mb-4 py-4 px-6 ">

     

       5
       5
        
               <div class="flex-1 flex flex-col gap-2">

     

       6
       6
       -
                 <div class="text-purple-500 dark:text-purple-400">Oct 2025</div>

     

       7
       6
        
                 <p>

     

       8
       8
       -
                   Make your first contribution to an open-source project this October.

     

       7
       7
       +
                   Make your first contribution to an open-source project.

     

       9
       8
        
                   <em>good-first-issue</em> helps new contributors find easy ways to

     

       10
       9
        
                   start contributing to open-source projects.

     

       11
       10
        
                 </p>

+5 -5

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

···

       14
       14
        
                       <div class="flex flex-col divide-y divide-gray-200 dark:divide-gray-700 border border-gray-200 dark:border-gray-700 rounded-sm">

     

       15
       15
        
                         {{ if .Repo }}

     

       16
       16
        
                           {{ template "timeline/fragments/repoEvent" (list $ .) }}

     

       17
       17
       -
                         {{ else if .Star }}

     

       17
       17
       +
                         {{ else if .RepoStar }}

     

       18
       18
        
                           {{ template "timeline/fragments/starEvent" (list $ .) }}

     

       19
       19
        
                         {{ else if .Follow }}

     

       20
       20
        
                           {{ template "timeline/fragments/followEvent" (list $ .) }}

     
···

       52
       52
        
             <span class="text-gray-700 dark:text-gray-400 text-xs">{{ template "repo/fragments/time" $repo.Created }}</span>

     

       53
       53
        
           </div>

     

       54
       54
        
         {{ with $repo }}

     

       55
       55
       -
           {{ template "user/fragments/repoCard" (list $root . true true (dict "IsStarred" $event.IsStarred "RepoAt" .RepoAt "Stats" (dict "StarCount" $event.StarCount))) }}

     

       55
       55
       +
           {{ template "user/fragments/repoCard" (list $root . true true (dict "IsStarred" $event.IsStarred "SubjectAt" .RepoAt "StarCount" $event.StarCount)) }}

     

       56
       56
        
         {{ end }}

     

       57
       57
        
       {{ end }}

     

       58
       58
        
       

     

       59
       59
        
       {{ define "timeline/fragments/starEvent" }}

     

       60
       60
        
         {{ $root := index . 0 }}

     

       61
       61
        
         {{ $event := index . 1 }}

     

       62
       62
       -
         {{ $star := $event.Star }}

     

       62
       62
       +
         {{ $star := $event.RepoStar }}

     

       63
       63
        
         {{ with $star }}

     

       64
       64
       -
           {{ $starrerHandle :=  resolve .StarredByDid }}

     

       64
       64
       +
           {{ $starrerHandle := resolve .Did }}

     

       65
       65
        
           {{ $repoOwnerHandle :=  resolve .Repo.Did }}

     

       66
       66
        
           <div class="pl-6 py-2 bg-white dark:bg-gray-800 text-gray-600 dark:text-gray-300 flex flex-wrap items-center gap-2 text-sm">

     

       67
       67
        
               {{ template "user/fragments/picHandleLink" $starrerHandle }}

     
···

       72
       72
        
               <span class="text-gray-700 dark:text-gray-400 text-xs">{{ template "repo/fragments/time" .Created }}</span>

     

       73
       73
        
           </div>

     

       74
       74
        
           {{ with .Repo }}

     

       75
       75
       -
             {{ template "user/fragments/repoCard" (list $root . true true (dict "IsStarred" $event.IsStarred "RepoAt" .RepoAt "Stats" (dict "StarCount" $event.StarCount))) }}

     

       75
       75
       +
             {{ template "user/fragments/repoCard" (list $root . true true (dict "IsStarred" $event.IsStarred "SubjectAt" .RepoAt "StarCount" $event.StarCount)) }}

     

       76
       76
        
           {{ end }}

     

       77
       77
        
         {{ end }}

     

       78
       78
        
       {{ end }}

-1

appview/pages/templates/user/fragments/editBio.html

···

       31
       31
        
                 class="py-1 px-1 w-full"

     

       32
       32
        
                 name="pronouns"

     

       33
       33
        
                 placeholder="they/them"

     

       34
       34
       -
                 pattern="[a-zA-Z]{1,6}[\/\s\-][a-zA-Z]{1,6}"

     

       35
       34
        
                 value="{{ $pronouns }}"

     

       36
       35
        
               >

     

       37
       36
        
             </div>

+2 -1

appview/pages/templates/user/fragments/repoCard.html

···

       1
       1
        
       {{ define "user/fragments/repoCard" }}

     

       2
       2
       +
         {{/* root, repo, fullName [,starButton [,starData]] */}}

     

       2
       3
        
         {{ $root := index . 0 }}

     

       3
       4
        
         {{ $repo := index . 1 }}

     

       4
       5
        
         {{ $fullName := index . 2 }}

     
···

       29
       30
        
               </div>

     

       30
       31
        
               {{ if and $starButton $root.LoggedInUser }}

     

       31
       32
        
               <div class="shrink-0">

     

       32
       32
       -
                 {{ template "repo/fragments/repoStar" $starData }}

     

       33
       33
       +
                 {{ template "fragments/starBtn" $starData }}

     

       33
       34
        
               </div>

     

       34
       35
        
               {{ end }}

     

       35
       36
        
             </div>

appview/pipelines/pipelines.go

···

       82
       82
        
       

     

       83
       83
        
       	ps, err := db.GetPipelineStatuses(

     

       84
       84
        
       		p.db,

     

       85
       85
       +
       		30,

     

       85
       86
        
       		db.FilterEq("repo_owner", repoInfo.OwnerDid),

     

       86
       87
        
       		db.FilterEq("repo_name", repoInfo.Name),

     

       87
       88
        
       		db.FilterEq("knot", repoInfo.Knot),

     
···

       124
       125
        
       

     

       125
       126
        
       	ps, err := db.GetPipelineStatuses(

     

       126
       127
        
       		p.db,

     

       128
       128
       +
       		1,

     

       127
       129
        
       		db.FilterEq("repo_owner", repoInfo.OwnerDid),

     

       128
       130
        
       		db.FilterEq("repo_name", repoInfo.Name),

     

       129
       131
        
       		db.FilterEq("knot", repoInfo.Knot),

     
···

       193
       195
        
       

     

       194
       196
        
       	ps, err := db.GetPipelineStatuses(

     

       195
       197
        
       		p.db,

     

       198
       198
       +
       		1,

     

       196
       199
        
       		db.FilterEq("repo_owner", repoInfo.OwnerDid),

     

       197
       200
        
       		db.FilterEq("repo_name", repoInfo.Name),

     

       198
       201
        
       		db.FilterEq("knot", repoInfo.Knot),

appview/pulls/pulls.go

···

       178
       178
        
       

     

       179
       179
        
       	ps, err := db.GetPipelineStatuses(

     

       180
       180
        
       		s.db,

     

       181
       181
       +
       		len(shas),

     

       181
       182
        
       		db.FilterEq("repo_owner", repoInfo.OwnerDid),

     

       182
       183
        
       		db.FilterEq("repo_name", repoInfo.Name),

     

       183
       184
        
       		db.FilterEq("knot", repoInfo.Knot),

     
···

       648
       649
        
       	repoInfo := f.RepoInfo(user)

     

       649
       650
        
       	ps, err := db.GetPipelineStatuses(

     

       650
       651
        
       		s.db,

     

       652
       652
       +
       		len(shas),

     

       651
       653
        
       		db.FilterEq("repo_owner", repoInfo.OwnerDid),

     

       652
       654
        
       		db.FilterEq("repo_name", repoInfo.Name),

     

       653
       655
        
       		db.FilterEq("knot", repoInfo.Knot),

+14 -10

appview/repo/compare.go

···

       116
       116
        
       	}

     

       117
       117
        
       

     

       118
       118
        
       	// if user is navigating to one of

     

       119
       119
       -
       	//   /compare/{base}/{head}

     

       120
       119
        
       	//   /compare/{base}...{head}

     

       121
       121
       -
       	base := chi.URLParam(r, "base")

     

       122
       122
       -
       	head := chi.URLParam(r, "head")

     

       123
       123
       -
       	if base == "" && head == "" {

     

       124
       124
       -
       		rest := chi.URLParam(r, "*") // master...feature/xyz

     

       125
       125
       -
       		parts := strings.SplitN(rest, "...", 2)

     

       126
       126
       -
       		if len(parts) == 2 {

     

       127
       127
       -
       			base = parts[0]

     

       128
       128
       -
       			head = parts[1]

     

       129
       129
       -
       		}

     

       120
       120
       +
       	//   /compare/{base}/{head}

     

       121
       121
       +
       	var base, head string

     

       122
       122
       +
       	rest := chi.URLParam(r, "*")

     

       123
       123
       +
       

     

       124
       124
       +
       	var parts []string

     

       125
       125
       +
       	if strings.Contains(rest, "...") {

     

       126
       126
       +
       		parts = strings.SplitN(rest, "...", 2)

     

       127
       127
       +
       	} else if strings.Contains(rest, "/") {

     

       128
       128
       +
       		parts = strings.SplitN(rest, "/", 2)

     

       129
       129
       +
       	}

     

       130
       130
       +
       

     

       131
       131
       +
       	if len(parts) == 2 {

     

       132
       132
       +
       		base = parts[0]

     

       133
       133
       +
       		head = parts[1]

     

       130
       134
        
       	}

     

       131
       135
        
       

     

       132
       136
        
       	base, _ = url.PathUnescape(base)

appview/repo/repo.go

···

       1130
       1130
        
       		}

     

       1131
       1131
        
       		defer rollback()

     

       1132
       1132
        
       

     

       1133
       1133
       +
       		// TODO: this could coordinate better with the knot to recieve a clone status

     

       1133
       1134
        
       		client, err := rp.oauth.ServiceClient(

     

       1134
       1135
        
       			r,

     

       1135
       1136
        
       			oauth.WithService(targetKnot),

     

       1136
       1137
        
       			oauth.WithLxm(tangled.RepoCreateNSID),

     

       1137
       1138
        
       			oauth.WithDev(rp.config.Core.Dev),

     

       1139
       1139
       +
       			oauth.WithTimeout(time.Second*20), // big repos take time to clone

     

       1138
       1140
        
       		)

     

       1139
       1141
        
       		if err != nil {

     

       1140
       1142
        
       			l.Error("could not create service client", "err", err)

+1 -14

appview/repo/repo_util.go

···

       1
       1
        
       package repo

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"crypto/rand"

     

       5
       5
       -
       	"math/big"

     

       6
       4
        
       	"slices"

     

       7
       5
        
       	"sort"

     

       8
       6
        
       	"strings"

     
···

       90
       88
        
       	return

     

       91
       89
        
       }

     

       92
       90
        
       

     

       93
       93
       -
       func randomString(n int) string {

     

       94
       94
       -
       	const letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"

     

       95
       95
       -
       	result := make([]byte, n)

     

       96
       96
       -
       

     

       97
       97
       -
       	for i := 0; i < n; i++ {

     

       98
       98
       -
       		n, _ := rand.Int(rand.Reader, big.NewInt(int64(len(letters))))

     

       99
       99
       -
       		result[i] = letters[n.Int64()]

     

       100
       100
       -
       	}

     

       101
       101
       -
       

     

       102
       102
       -
       	return string(result)

     

       103
       103
       -
       }

     

       104
       104
       -
       

     

       105
       91
        
       // grab pipelines from DB and munge that into a hashmap with commit sha as key

     

       106
       92
        
       //

     

       107
       93
        
       // golang is so blessed that it requires 35 lines of imperative code for this

     
···

       118
       104
        
       

     

       119
       105
        
       	ps, err := db.GetPipelineStatuses(

     

       120
       106
        
       		d,

     

       107
       107
       +
       		len(shas),

     

       121
       108
        
       		db.FilterEq("repo_owner", repoInfo.OwnerDid),

     

       122
       109
        
       		db.FilterEq("repo_name", repoInfo.Name),

     

       123
       110
        
       		db.FilterEq("knot", repoInfo.Knot),

-1

appview/repo/router.go

···

       61
       61
        
       		// for example:

     

       62
       62
        
       		//   /compare/master...some/feature

     

       63
       63
        
       		//   /compare/master...example.com:another/feature <- this is a fork

     

       64
       64
       -
       		r.Get("/{base}/{head}", rp.Compare)

     

       65
       64
        
       		r.Get("/*", rp.Compare)

     

       66
       65
        
       	})

     

       67
       66

-271

appview/service/issue/issue.go

···

       1
       1
       -
       package issue

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"context"

     

       5
       5
       -
       	"errors"

     

       6
       6
       -
       	"log/slog"

     

       7
       7
       -
       	"time"

     

       8
       8
       -
       

     

       9
       9
       -
       	"github.com/bluesky-social/indigo/api/atproto"

     

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

     

       11
       11
       -
       	lexutil "github.com/bluesky-social/indigo/lex/util"

     

       12
       12
       -
       	"tangled.org/core/api/tangled"

     

       13
       13
       -
       	"tangled.org/core/appview/config"

     

       14
       14
       -
       	"tangled.org/core/appview/db"

     

       15
       15
       -
       	issues_indexer "tangled.org/core/appview/indexer/issues"

     

       16
       16
       -
       	"tangled.org/core/appview/models"

     

       17
       17
       -
       	"tangled.org/core/appview/notify"

     

       18
       18
       -
       	"tangled.org/core/appview/pages/markup"

     

       19
       19
       -
       	"tangled.org/core/appview/session"

     

       20
       20
       -
       	"tangled.org/core/appview/validator"

     

       21
       21
       -
       	"tangled.org/core/idresolver"

     

       22
       22
       -
       	"tangled.org/core/tid"

     

       23
       23
       -
       )

     

       24
       24
       -
       

     

       25
       25
       -
       type Service struct {

     

       26
       26
       -
       	config     *config.Config

     

       27
       27
       -
       	db         *db.DB

     

       28
       28
       -
       	indexer    *issues_indexer.Indexer

     

       29
       29
       -
       	logger     *slog.Logger

     

       30
       30
       -
       	notifier   notify.Notifier

     

       31
       31
       -
       	idResolver *idresolver.Resolver

     

       32
       32
       -
       	validator  *validator.Validator

     

       33
       33
       -
       }

     

       34
       34
       -
       

     

       35
       35
       -
       func NewService(

     

       36
       36
       -
       	logger *slog.Logger,

     

       37
       37
       -
       	config *config.Config,

     

       38
       38
       -
       	db *db.DB,

     

       39
       39
       -
       	notifier notify.Notifier,

     

       40
       40
       -
       	idResolver *idresolver.Resolver,

     

       41
       41
       -
       	indexer *issues_indexer.Indexer,

     

       42
       42
       -
       	validator *validator.Validator,

     

       43
       43
       -
       ) Service {

     

       44
       44
       -
       	return Service{

     

       45
       45
       -
       		config,

     

       46
       46
       -
       		db,

     

       47
       47
       -
       		indexer,

     

       48
       48
       -
       		logger,

     

       49
       49
       -
       		notifier,

     

       50
       50
       -
       		idResolver,

     

       51
       51
       -
       		validator,

     

       52
       52
       -
       	}

     

       53
       53
       -
       }

     

       54
       54
       -
       

     

       55
       55
       -
       var (

     

       56
       56
       -
       	ErrUnAuthorized   = errors.New("unauthorized operation")

     

       57
       57
       -
       	ErrDatabaseFail   = errors.New("db op fail")

     

       58
       58
       -
       	ErrPDSFail        = errors.New("pds op fail")

     

       59
       59
       -
       	ErrValidationFail = errors.New("issue validation fail")

     

       60
       60
       -
       )

     

       61
       61
       -
       

     

       62
       62
       -
       func (s *Service) NewIssue(ctx context.Context, repo *models.Repo, title, body string) (*models.Issue, error) {

     

       63
       63
       -
       	l := s.logger.With("method", "NewIssue")

     

       64
       64
       -
       	sess := session.FromContext(ctx)

     

       65
       65
       -
       	if sess == nil {

     

       66
       66
       -
       		l.Error("user session is missing in context")

     

       67
       67
       -
       		return nil, ErrUnAuthorized

     

       68
       68
       -
       	}

     

       69
       69
       -
       	authorDid := sess.Data.AccountDID

     

       70
       70
       -
       	l = l.With("did", authorDid)

     

       71
       71
       -
       

     

       72
       72
       -
       	// mentions, references := s.refResolver.Resolve(ctx, body)

     

       73
       73
       -
       	mentions := func() []syntax.DID {

     

       74
       74
       -
       		rawMentions := markup.FindUserMentions(body)

     

       75
       75
       -
       		idents := s.idResolver.ResolveIdents(ctx, rawMentions)

     

       76
       76
       -
       		l.Debug("parsed mentions", "raw", rawMentions, "idents", idents)

     

       77
       77
       -
       		var mentions []syntax.DID

     

       78
       78
       -
       		for _, ident := range idents {

     

       79
       79
       -
       			if ident != nil && !ident.Handle.IsInvalidHandle() {

     

       80
       80
       -
       				mentions = append(mentions, ident.DID)

     

       81
       81
       -
       			}

     

       82
       82
       -
       		}

     

       83
       83
       -
       		return mentions

     

       84
       84
       -
       	}()

     

       85
       85
       -
       

     

       86
       86
       -
       	issue := models.Issue{

     

       87
       87
       -
       		RepoAt:  repo.RepoAt(),

     

       88
       88
       -
       		Rkey:    tid.TID(),

     

       89
       89
       -
       		Title:   title,

     

       90
       90
       -
       		Body:    body,

     

       91
       91
       -
       		Open:    true,

     

       92
       92
       -
       		Did:     authorDid.String(),

     

       93
       93
       -
       		Created: time.Now(),

     

       94
       94
       -
       		Repo:    repo,

     

       95
       95
       -
       	}

     

       96
       96
       -
       

     

       97
       97
       -
       	if err := s.validator.ValidateIssue(&issue); err != nil {

     

       98
       98
       -
       		l.Error("validation error", "err", err)

     

       99
       99
       -
       		return nil, ErrValidationFail

     

       100
       100
       -
       	}

     

       101
       101
       -
       

     

       102
       102
       -
       	tx, err := s.db.BeginTx(ctx, nil)

     

       103
       103
       -
       	if err != nil {

     

       104
       104
       -
       		l.Error("db.BeginTx failed", "err", err)

     

       105
       105
       -
       		return nil, ErrDatabaseFail

     

       106
       106
       -
       	}

     

       107
       107
       -
       	defer tx.Rollback()

     

       108
       108
       -
       

     

       109
       109
       -
       	if err := db.PutIssue(tx, &issue); err != nil {

     

       110
       110
       -
       		l.Error("db.PutIssue failed", "err", err)

     

       111
       111
       -
       		return nil, ErrDatabaseFail

     

       112
       112
       -
       	}

     

       113
       113
       -
       

     

       114
       114
       -
       	atpclient := sess.APIClient()

     

       115
       115
       -
       	record := issue.AsRecord()

     

       116
       116
       -
       	_, err = atproto.RepoPutRecord(ctx, atpclient, &atproto.RepoPutRecord_Input{

     

       117
       117
       -
       		Repo:       authorDid.String(),

     

       118
       118
       -
       		Collection: tangled.RepoIssueNSID,

     

       119
       119
       -
       		Rkey:       issue.Rkey,

     

       120
       120
       -
       		Record: &lexutil.LexiconTypeDecoder{

     

       121
       121
       -
       			Val: &record,

     

       122
       122
       -
       		},

     

       123
       123
       -
       	})

     

       124
       124
       -
       	if err != nil {

     

       125
       125
       -
       		l.Error("atproto.RepoPutRecord failed", "err", err)

     

       126
       126
       -
       		return nil, ErrPDSFail

     

       127
       127
       -
       	}

     

       128
       128
       -
       	if err = tx.Commit(); err != nil {

     

       129
       129
       -
       		l.Error("tx.Commit failed", "err", err)

     

       130
       130
       -
       		return nil, ErrDatabaseFail

     

       131
       131
       -
       	}

     

       132
       132
       -
       

     

       133
       133
       -
       	s.notifier.NewIssue(ctx, &issue, mentions)

     

       134
       134
       -
       	return &issue, nil

     

       135
       135
       -
       }

     

       136
       136
       -
       

     

       137
       137
       -
       func (s *Service) GetIssues(ctx context.Context, repo *models.Repo, searchOpts models.IssueSearchOptions) ([]models.Issue, error) {

     

       138
       138
       -
       	l := s.logger.With("method", "EditIssue")

     

       139
       139
       -
       

     

       140
       140
       -
       	var issues []models.Issue

     

       141
       141
       -
       	var err error

     

       142
       142
       -
       	if searchOpts.Keyword != "" {

     

       143
       143
       -
       		res, err := s.indexer.Search(ctx, searchOpts)

     

       144
       144
       -
       		if err != nil {

     

       145
       145
       -
       			l.Error("failed to search for issues", "err", err)

     

       146
       146
       -
       			return nil, err

     

       147
       147
       -
       		}

     

       148
       148
       -
       		l.Debug("searched issues with indexer", "count", len(res.Hits))

     

       149
       149
       -
       		issues, err = db.GetIssues(s.db, db.FilterIn("id", res.Hits))

     

       150
       150
       -
       		if err != nil {

     

       151
       151
       -
       			l.Error("failed to get issues", "err", err)

     

       152
       152
       -
       			return nil, err

     

       153
       153
       -
       		}

     

       154
       154
       -
       	} else {

     

       155
       155
       -
       		openInt := 0

     

       156
       156
       -
       		if searchOpts.IsOpen {

     

       157
       157
       -
       			openInt = 1

     

       158
       158
       -
       		}

     

       159
       159
       -
       		issues, err = db.GetIssuesPaginated(

     

       160
       160
       -
       			s.db,

     

       161
       161
       -
       			searchOpts.Page,

     

       162
       162
       -
       			db.FilterEq("repo_at", repo.RepoAt()),

     

       163
       163
       -
       			db.FilterEq("open", openInt),

     

       164
       164
       -
       		)

     

       165
       165
       -
       		if err != nil {

     

       166
       166
       -
       			l.Error("failed to get issues", "err", err)

     

       167
       167
       -
       			return nil, err

     

       168
       168
       -
       		}

     

       169
       169
       -
       	}

     

       170
       170
       -
       

     

       171
       171
       -
       	return issues, nil

     

       172
       172
       -
       }

     

       173
       173
       -
       

     

       174
       174
       -
       func (s *Service) EditIssue(ctx context.Context, issue *models.Issue) error {

     

       175
       175
       -
       	l := s.logger.With("method", "EditIssue")

     

       176
       176
       -
       	sess := session.FromContext(ctx)

     

       177
       177
       -
       	if sess == nil {

     

       178
       178
       -
       		l.Error("user session is missing in context")

     

       179
       179
       -
       		return ErrUnAuthorized

     

       180
       180
       -
       	}

     

       181
       181
       -
       	authorDid := sess.Data.AccountDID

     

       182
       182
       -
       	l = l.With("did", authorDid)

     

       183
       183
       -
       

     

       184
       184
       -
       	if err := s.validator.ValidateIssue(issue); err != nil {

     

       185
       185
       -
       		l.Error("validation error", "err", err)

     

       186
       186
       -
       		return ErrValidationFail

     

       187
       187
       -
       	}

     

       188
       188
       -
       

     

       189
       189
       -
       	tx, err := s.db.BeginTx(ctx, nil)

     

       190
       190
       -
       	if err != nil {

     

       191
       191
       -
       		l.Error("db.BeginTx failed", "err", err)

     

       192
       192
       -
       		return ErrDatabaseFail

     

       193
       193
       -
       	}

     

       194
       194
       -
       	defer tx.Rollback()

     

       195
       195
       -
       

     

       196
       196
       -
       	if err := db.PutIssue(tx, issue); err != nil {

     

       197
       197
       -
       		l.Error("db.PutIssue failed", "err", err)

     

       198
       198
       -
       		return ErrDatabaseFail

     

       199
       199
       -
       	}

     

       200
       200
       -
       

     

       201
       201
       -
       	atpclient := sess.APIClient()

     

       202
       202
       -
       	record := issue.AsRecord()

     

       203
       203
       -
       

     

       204
       204
       -
       	ex, err := atproto.RepoGetRecord(ctx, atpclient, "", tangled.RepoIssueNSID, issue.Did, issue.Rkey)

     

       205
       205
       -
       	if err != nil {

     

       206
       206
       -
       		l.Error("atproto.RepoGetRecord failed", "err", err)

     

       207
       207
       -
       		return ErrPDSFail

     

       208
       208
       -
       	}

     

       209
       209
       -
       	_, err = atproto.RepoPutRecord(ctx, atpclient, &atproto.RepoPutRecord_Input{

     

       210
       210
       -
       		Collection: tangled.RepoIssueNSID,

     

       211
       211
       -
       		SwapRecord: ex.Cid,

     

       212
       212
       -
       		Record: &lexutil.LexiconTypeDecoder{

     

       213
       213
       -
       			Val: &record,

     

       214
       214
       -
       		},

     

       215
       215
       -
       	})

     

       216
       216
       -
       	if err != nil {

     

       217
       217
       -
       		l.Error("atproto.RepoPutRecord failed", "err", err)

     

       218
       218
       -
       		return ErrPDSFail

     

       219
       219
       -
       	}

     

       220
       220
       -
       

     

       221
       221
       -
       	if err = tx.Commit(); err != nil {

     

       222
       222
       -
       		l.Error("tx.Commit failed", "err", err)

     

       223
       223
       -
       		return ErrDatabaseFail

     

       224
       224
       -
       	}

     

       225
       225
       -
       

     

       226
       226
       -
       	// TODO: notify PutIssue

     

       227
       227
       -
       

     

       228
       228
       -
       	return nil

     

       229
       229
       -
       }

     

       230
       230
       -
       

     

       231
       231
       -
       func (s *Service) DeleteIssue(ctx context.Context, issue *models.Issue) error {

     

       232
       232
       -
       	l := s.logger.With("method", "DeleteIssue")

     

       233
       233
       -
       	sess := session.FromContext(ctx)

     

       234
       234
       -
       	if sess == nil {

     

       235
       235
       -
       		l.Error("user session is missing in context")

     

       236
       236
       -
       		return ErrUnAuthorized

     

       237
       237
       -
       	}

     

       238
       238
       -
       	authorDid := sess.Data.AccountDID

     

       239
       239
       -
       	l = l.With("did", authorDid)

     

       240
       240
       -
       

     

       241
       241
       -
       	tx, err := s.db.BeginTx(ctx, nil)

     

       242
       242
       -
       	if err != nil {

     

       243
       243
       -
       		l.Error("db.BeginTx failed", "err", err)

     

       244
       244
       -
       		return ErrDatabaseFail

     

       245
       245
       -
       	}

     

       246
       246
       -
       	defer tx.Rollback()

     

       247
       247
       -
       

     

       248
       248
       -
       	if err := db.DeleteIssues(tx, db.FilterEq("id", issue.Id)); err != nil {

     

       249
       249
       -
       		l.Error("db.DeleteIssues failed", "err", err)

     

       250
       250
       -
       		return ErrDatabaseFail

     

       251
       251
       -
       	}

     

       252
       252
       -
       

     

       253
       253
       -
       	atpclient := sess.APIClient()

     

       254
       254
       -
       	_, err = atproto.RepoDeleteRecord(ctx, atpclient, &atproto.RepoDeleteRecord_Input{

     

       255
       255
       -
       		Collection: tangled.RepoIssueNSID,

     

       256
       256
       -
       		Repo:       issue.Did,

     

       257
       257
       -
       		Rkey:       issue.Rkey,

     

       258
       258
       -
       	})

     

       259
       259
       -
       	if err != nil {

     

       260
       260
       -
       		l.Error("atproto.RepoDeleteRecord failed", "err", err)

     

       261
       261
       -
       		return ErrPDSFail

     

       262
       262
       -
       	}

     

       263
       263
       -
       

     

       264
       264
       -
       	if err := tx.Commit(); err != nil {

     

       265
       265
       -
       		l.Error("tx.Commit failed", "err", err)

     

       266
       266
       -
       		return ErrDatabaseFail

     

       267
       267
       -
       	}

     

       268
       268
       -
       

     

       269
       269
       -
       	s.notifier.DeleteIssue(ctx, issue)

     

       270
       270
       -
       	return nil

     

       271
       271
       -
       }

-15

appview/service/issue/state.go

···

       1
       1
       -
       package issue

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"context"

     

       5
       5
       -
       

     

       6
       6
       -
       	"tangled.org/core/appview/models"

     

       7
       7
       -
       )

     

       8
       8
       -
       

     

       9
       9
       -
       func (s *Service) CloseIssue(ctx context.Context, iusse *models.Issue) error {

     

       10
       10
       -
       	panic("unimplemented")

     

       11
       11
       -
       }

     

       12
       12
       -
       

     

       13
       13
       -
       func (s *Service) ReopenIssue(ctx context.Context, iusse *models.Issue) error {

     

       14
       14
       -
       	panic("unimplemented")

     

       15
       15
       -
       }

-83

appview/service/repo/repo.go

···

       1
       1
       -
       package repo

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"context"

     

       5
       5
       -
       	"fmt"

     

       6
       6
       -
       	"log/slog"

     

       7
       7
       -
       	"time"

     

       8
       8
       -
       

     

       9
       9
       -
       	"github.com/bluesky-social/indigo/api/atproto"

     

       10
       10
       -
       	"github.com/bluesky-social/indigo/atproto/auth/oauth"

     

       11
       11
       -
       	"tangled.org/core/api/tangled"

     

       12
       12
       -
       	"tangled.org/core/appview/config"

     

       13
       13
       -
       	"tangled.org/core/appview/db"

     

       14
       14
       -
       	"tangled.org/core/appview/models"

     

       15
       15
       -
       	"tangled.org/core/rbac"

     

       16
       16
       -
       	"tangled.org/core/tid"

     

       17
       17
       -
       )

     

       18
       18
       -
       

     

       19
       19
       -
       type Service struct {

     

       20
       20
       -
       	logger   *slog.Logger

     

       21
       21
       -
       	config   *config.Config

     

       22
       22
       -
       	db       *db.DB

     

       23
       23
       -
       	enforcer *rbac.Enforcer

     

       24
       24
       -
       }

     

       25
       25
       -
       

     

       26
       26
       -
       func NewService(

     

       27
       27
       -
       	logger *slog.Logger,

     

       28
       28
       -
       	config *config.Config,

     

       29
       29
       -
       	db *db.DB,

     

       30
       30
       -
       	enforcer *rbac.Enforcer,

     

       31
       31
       -
       ) Service {

     

       32
       32
       -
       	return Service{

     

       33
       33
       -
       		logger,

     

       34
       34
       -
       		config,

     

       35
       35
       -
       		db,

     

       36
       36
       -
       		enforcer,

     

       37
       37
       -
       	}

     

       38
       38
       -
       }

     

       39
       39
       -
       

     

       40
       40
       -
       // NewRepo creates a repository

     

       41
       41
       -
       // It expects atproto session to be passed in `ctx`

     

       42
       42
       -
       func (s *Service) NewRepo(ctx context.Context, name, description, knot string) error {

     

       43
       43
       -
       	l := s.logger.With("method", "NewRepo")

     

       44
       44
       -
       	sess := fromContext(ctx)

     

       45
       45
       -
       

     

       46
       46
       -
       	ownerDid := sess.Data.AccountDID

     

       47
       47
       -
       	l = l.With("did", ownerDid)

     

       48
       48
       -
       

     

       49
       49
       -
       	repo := models.Repo{

     

       50
       50
       -
       		Did:         ownerDid.String(),

     

       51
       51
       -
       		Name:        name,

     

       52
       52
       -
       		Knot:        knot,

     

       53
       53
       -
       		Rkey:        tid.TID(),

     

       54
       54
       -
       		Description: description,

     

       55
       55
       -
       		Created:     time.Now(),

     

       56
       56
       -
       		Labels:      s.config.Label.DefaultLabelDefs,

     

       57
       57
       -
       	}

     

       58
       58
       -
       	l = l.With("aturi", repo.RepoAt())

     

       59
       59
       -
       

     

       60
       60
       -
       	tx, err := s.db.BeginTx(ctx, nil)

     

       61
       61
       -
       	if err != nil {

     

       62
       62
       -
       		return fmt.Errorf("db.BeginTx: %w", err)

     

       63
       63
       -
       	}

     

       64
       64
       -
       	defer tx.Rollback()

     

       65
       65
       -
       

     

       66
       66
       -
       	atpclient := sess.APIClient()

     

       67
       67
       -
       	_, err = atproto.RepoPutRecord(ctx, atpclient, &atproto.RepoPutRecord_Input{

     

       68
       68
       -
       		Collection: tangled.RepoNSID,

     

       69
       69
       -
       		Repo:       repo.Did,

     

       70
       70
       -
       	})

     

       71
       71
       -
       	if err != nil {

     

       72
       72
       -
       		return fmt.Errorf("atproto.RepoPutRecord: %w", err)

     

       73
       73
       -
       	}

     

       74
       74
       -
       	l.Info("wrote to PDS")

     

       75
       75
       -
       

     

       76
       76
       -
       	// knotclient, err := s.oauth.ServiceClient(

     

       77
       77
       -
       	// )

     

       78
       78
       -
       	panic("unimplemented")

     

       79
       79
       -
       }

     

       80
       80
       -
       

     

       81
       81
       -
       func fromContext(ctx context.Context) oauth.ClientSession {

     

       82
       82
       -
       	panic("todo")

     

       83
       83
       -
       }

-81

appview/service/repo/repoinfo.go

···

       1
       1
       -
       package repo

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"context"

     

       5
       5
       -
       

     

       6
       6
       -
       	"tangled.org/core/appview/db"

     

       7
       7
       -
       	"tangled.org/core/appview/models"

     

       8
       8
       -
       	"tangled.org/core/appview/oauth"

     

       9
       9
       -
       	"tangled.org/core/appview/pages/repoinfo"

     

       10
       10
       -
       )

     

       11
       11
       -
       

     

       12
       12
       -
       // GetRepoInfo converts given `Repo` to `RepoInfo` object.

     

       13
       13
       -
       // The `user` can be nil.

     

       14
       14
       -
       func (s *Service) GetRepoInfo(ctx context.Context, baseRepo *models.Repo, user *oauth.User) (*repoinfo.RepoInfo, error) {

     

       15
       15
       -
       	var (

     

       16
       16
       -
       		repoAt    = baseRepo.RepoAt()

     

       17
       17
       -
       		isStarred = false

     

       18
       18
       -
       		roles     = repoinfo.RolesInRepo{}

     

       19
       19
       -
       	)

     

       20
       20
       -
       	if user != nil {

     

       21
       21
       -
       		isStarred = db.GetStarStatus(s.db, user.Did, repoAt)

     

       22
       22
       -
       		roles.Roles = s.enforcer.GetPermissionsInRepo(user.Did, baseRepo.Knot, baseRepo.DidSlashRepo())

     

       23
       23
       -
       	}

     

       24
       24
       -
       

     

       25
       25
       -
       	stats := baseRepo.RepoStats

     

       26
       26
       -
       	if stats == nil {

     

       27
       27
       -
       		starCount, err := db.GetStarCount(s.db, repoAt)

     

       28
       28
       -
       		if err != nil {

     

       29
       29
       -
       			return nil, err

     

       30
       30
       -
       		}

     

       31
       31
       -
       		issueCount, err := db.GetIssueCount(s.db, repoAt)

     

       32
       32
       -
       		if err != nil {

     

       33
       33
       -
       			return nil, err

     

       34
       34
       -
       		}

     

       35
       35
       -
       		pullCount, err := db.GetPullCount(s.db, repoAt)

     

       36
       36
       -
       		if err != nil {

     

       37
       37
       -
       			return nil, err

     

       38
       38
       -
       		}

     

       39
       39
       -
       		stats = &models.RepoStats{

     

       40
       40
       -
       			StarCount:  starCount,

     

       41
       41
       -
       			IssueCount: issueCount,

     

       42
       42
       -
       			PullCount:  pullCount,

     

       43
       43
       -
       		}

     

       44
       44
       -
       	}

     

       45
       45
       -
       

     

       46
       46
       -
       	var sourceRepo *models.Repo

     

       47
       47
       -
       	var err error

     

       48
       48
       -
       	if baseRepo.Source != "" {

     

       49
       49
       -
       		sourceRepo, err = db.GetRepoByAtUri(s.db, baseRepo.Source)

     

       50
       50
       -
       		if err != nil {

     

       51
       51
       -
       			return nil, err

     

       52
       52
       -
       		}

     

       53
       53
       -
       	}

     

       54
       54
       -
       

     

       55
       55
       -
       	repoInfo := &repoinfo.RepoInfo{

     

       56
       56
       -
       		// ok this is basically a models.Repo

     

       57
       57
       -
       		OwnerDid:    baseRepo.Did,

     

       58
       58
       -
       		OwnerHandle: "", // TODO: shouldn't use

     

       59
       59
       -
       		Name:        baseRepo.Name,

     

       60
       60
       -
       		Rkey:        baseRepo.Rkey,

     

       61
       61
       -
       		Description: baseRepo.Description,

     

       62
       62
       -
       		Website:     baseRepo.Website,

     

       63
       63
       -
       		Topics:      baseRepo.Topics,

     

       64
       64
       -
       		Knot:        baseRepo.Knot,

     

       65
       65
       -
       		Spindle:     baseRepo.Spindle,

     

       66
       66
       -
       		Stats:       *stats,

     

       67
       67
       -
       

     

       68
       68
       -
       		// fork repo upstream

     

       69
       69
       -
       		Source: sourceRepo,

     

       70
       70
       -
       

     

       71
       71
       -
       		// repo path (context)

     

       72
       72
       -
       		CurrentDir: "",

     

       73
       73
       -
       		Ref:        "",

     

       74
       74
       -
       

     

       75
       75
       -
       		// info related to the session

     

       76
       76
       -
       		IsStarred: isStarred,

     

       77
       77
       -
       		Roles:     roles,

     

       78
       78
       -
       	}

     

       79
       79
       -
       

     

       80
       80
       -
       	return repoInfo, nil

     

       81
       81
       -
       }

-29

appview/session/context.go

···

       1
       1
       -
       package session

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"context"

     

       5
       5
       -
       

     

       6
       6
       -
       	toauth "tangled.org/core/appview/oauth"

     

       7
       7
       -
       )

     

       8
       8
       -
       

     

       9
       9
       -
       type ctxKey struct{}

     

       10
       10
       -
       

     

       11
       11
       -
       func IntoContext(ctx context.Context, sess Session) context.Context {

     

       12
       12
       -
       	return context.WithValue(ctx, ctxKey{}, &sess)

     

       13
       13
       -
       }

     

       14
       14
       -
       

     

       15
       15
       -
       func FromContext(ctx context.Context) *Session {

     

       16
       16
       -
       	sess, ok := ctx.Value(ctxKey{}).(*Session)

     

       17
       17
       -
       	if !ok {

     

       18
       18
       -
       		return nil

     

       19
       19
       -
       	}

     

       20
       20
       -
       	return sess

     

       21
       21
       -
       }

     

       22
       22
       -
       

     

       23
       23
       -
       func UserFromContext(ctx context.Context) *toauth.User {

     

       24
       24
       -
       	sess := FromContext(ctx)

     

       25
       25
       -
       	if sess == nil {

     

       26
       26
       -
       		return nil

     

       27
       27
       -
       	}

     

       28
       28
       -
       	return sess.User()

     

       29
       29
       -
       }

-24

appview/session/session.go

···

       1
       1
       -
       package session

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"github.com/bluesky-social/indigo/atproto/auth/oauth"

     

       5
       5
       -
       	toauth "tangled.org/core/appview/oauth"

     

       6
       6
       -
       )

     

       7
       7
       -
       

     

       8
       8
       -
       // Session is a lightweight wrapper over indigo-oauth ClientSession

     

       9
       9
       -
       type Session struct {

     

       10
       10
       -
       	*oauth.ClientSession

     

       11
       11
       -
       }

     

       12
       12
       -
       

     

       13
       13
       -
       func New(atSess *oauth.ClientSession) Session {

     

       14
       14
       -
       	return Session{

     

       15
       15
       -
       		atSess,

     

       16
       16
       -
       	}

     

       17
       17
       -
       }

     

       18
       18
       -
       

     

       19
       19
       -
       func (s *Session) User() *toauth.User {

     

       20
       20
       -
       	return &toauth.User{

     

       21
       21
       -
       		Did: string(s.Data.AccountDID),

     

       22
       22
       -
       		Pds: s.Data.HostURL,

     

       23
       23
       -
       	}

     

       24
       24
       -
       }

-62

appview/state/legacy_bridge.go

···

       1
       1
       -
       package state

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"log/slog"

     

       5
       5
       -
       

     

       6
       6
       -
       	"tangled.org/core/appview/config"

     

       7
       7
       -
       	"tangled.org/core/appview/db"

     

       8
       8
       -
       	"tangled.org/core/appview/indexer"

     

       9
       9
       -
       	"tangled.org/core/appview/issues"

     

       10
       10
       -
       	"tangled.org/core/appview/middleware"

     

       11
       11
       -
       	"tangled.org/core/appview/notify"

     

       12
       12
       -
       	"tangled.org/core/appview/oauth"

     

       13
       13
       -
       	"tangled.org/core/appview/pages"

     

       14
       14
       -
       	"tangled.org/core/appview/validator"

     

       15
       15
       -
       	"tangled.org/core/idresolver"

     

       16
       16
       -
       	"tangled.org/core/log"

     

       17
       17
       -
       	"tangled.org/core/rbac"

     

       18
       18
       -
       )

     

       19
       19
       -
       

     

       20
       20
       -
       // Expose exposes private fields in `State`. This is used to bridge between

     

       21
       21
       -
       // legacy web routers and new architecture

     

       22
       22
       -
       func (s *State) Expose() (

     

       23
       23
       -
       	*config.Config,

     

       24
       24
       -
       	*db.DB,

     

       25
       25
       -
       	*rbac.Enforcer,

     

       26
       26
       -
       	*idresolver.Resolver,

     

       27
       27
       -
       	*indexer.Indexer,

     

       28
       28
       -
       	*slog.Logger,

     

       29
       29
       -
       	notify.Notifier,

     

       30
       30
       -
       	*oauth.OAuth,

     

       31
       31
       -
       	*pages.Pages,

     

       32
       32
       -
       	*validator.Validator,

     

       33
       33
       -
       ) {

     

       34
       34
       -
       	return s.config, s.db, s.enforcer, s.idResolver, s.indexer, s.logger, s.notifier, s.oauth, s.pages, s.validator

     

       35
       35
       -
       }

     

       36
       36
       -
       

     

       37
       37
       -
       func (s *State) ExposeIssue() *issues.Issues {

     

       38
       38
       -
       	return issues.New(

     

       39
       39
       -
       		s.oauth,

     

       40
       40
       -
       		s.repoResolver,

     

       41
       41
       -
       		s.pages,

     

       42
       42
       -
       		s.idResolver,

     

       43
       43
       -
       		s.db,

     

       44
       44
       -
       		s.config,

     

       45
       45
       -
       		s.notifier,

     

       46
       46
       -
       		s.validator,

     

       47
       47
       -
       		s.indexer.Issues,

     

       48
       48
       -
       		log.SubLogger(s.logger, "issues"),

     

       49
       49
       -
       	)

     

       50
       50
       -
       }

     

       51
       51
       -
       

     

       52
       52
       -
       func (s *State) Middleware() *middleware.Middleware {

     

       53
       53
       -
       	mw := middleware.New(

     

       54
       54
       -
       		s.oauth,

     

       55
       55
       -
       		s.db,

     

       56
       56
       -
       		s.enforcer,

     

       57
       57
       -
       		s.repoResolver,

     

       58
       58
       -
       		s.idResolver,

     

       59
       59
       -
       		s.pages,

     

       60
       60
       -
       	)

     

       61
       61
       -
       	return &mw

     

       62
       62
       -
       }

+3 -5

appview/state/profile.go

···

       66
       66
        
       		return nil, fmt.Errorf("failed to get string count: %w", err)

     

       67
       67
        
       	}

     

       68
       68
        
       

     

       69
       69
       -
       	starredCount, err := db.CountStars(s.db, db.FilterEq("starred_by_did", did))

     

       69
       69
       +
       	starredCount, err := db.CountStars(s.db, db.FilterEq("did", did))

     

       70
       70
        
       	if err != nil {

     

       71
       71
        
       		return nil, fmt.Errorf("failed to get starred repo count: %w", err)

     

       72
       72
        
       	}

     
···

       211
       211
        
       	}

     

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

     

       213
       213
        
       

     

       214
       214
       -
       	stars, err := db.GetStars(s.db, 0, db.FilterEq("starred_by_did", profile.UserDid))

     

       214
       214
       +
       	stars, err := db.GetRepoStars(s.db, 0, db.FilterEq("did", profile.UserDid))

     

       215
       215
        
       	if err != nil {

     

       216
       216
        
       		l.Error("failed to get stars", "err", err)

     

       217
       217
        
       		s.pages.Error500(w)

     
···

       219
       219
        
       	}

     

       220
       220
        
       	var repos []models.Repo

     

       221
       221
        
       	for _, s := range stars {

     

       222
       222
       -
       		if s.Repo != nil {

     

       223
       223
       -
       			repos = append(repos, *s.Repo)

     

       224
       224
       -
       		}

     

       222
       222
       +
       		repos = append(repos, *s.Repo)

     

       225
       223
        
       	}

     

       226
       224
        
       

     

       227
       225
        
       	err = s.pages.ProfileStarred(w, pages.ProfileStarredParams{

+9 -13

appview/state/star.go

···

       57
       57
        
       		log.Println("created atproto record: ", resp.Uri)

     

       58
       58
        
       

     

       59
       59
        
       		star := &models.Star{

     

       60
       60
       -
       			StarredByDid: currentUser.Did,

     

       61
       61
       -
       			RepoAt:       subjectUri,

     

       62
       62
       -
       			Rkey:         rkey,

     

       60
       60
       +
       			Did:    currentUser.Did,

     

       61
       61
       +
       			RepoAt: subjectUri,

     

       62
       62
       +
       			Rkey:   rkey,

     

       63
       63
        
       		}

     

       64
       64
        
       

     

       65
       65
        
       		err = db.AddStar(s.db, star)

     
···

       75
       75
        
       

     

       76
       76
        
       		s.notifier.NewStar(r.Context(), star)

     

       77
       77
        
       

     

       78
       78
       -
       		s.pages.RepoStarFragment(w, pages.RepoStarFragmentParams{

     

       78
       78
       +
       		s.pages.StarBtnFragment(w, pages.StarBtnFragmentParams{

     

       79
       79
        
       			IsStarred: true,

     

       80
       80
       -
       			RepoAt:    subjectUri,

     

       81
       81
       -
       			Stats: models.RepoStats{

     

       82
       82
       -
       				StarCount: starCount,

     

       83
       83
       -
       			},

     

       80
       80
       +
       			SubjectAt: subjectUri,

     

       81
       81
       +
       			StarCount: starCount,

     

       84
       82
        
       		})

     

       85
       83
        
       

     

       86
       84
        
       		return

     
···

       117
       115
        
       

     

       118
       116
        
       		s.notifier.DeleteStar(r.Context(), star)

     

       119
       117
        
       

     

       120
       120
       -
       		s.pages.RepoStarFragment(w, pages.RepoStarFragmentParams{

     

       118
       118
       +
       		s.pages.StarBtnFragment(w, pages.StarBtnFragmentParams{

     

       121
       119
        
       			IsStarred: false,

     

       122
       122
       -
       			RepoAt:    subjectUri,

     

       123
       123
       -
       			Stats: models.RepoStats{

     

       124
       124
       -
       				StarCount: starCount,

     

       125
       125
       -
       			},

     

       120
       120
       +
       			SubjectAt: subjectUri,

     

       121
       121
       +
       			StarCount: starCount,

     

       126
       122
        
       		})

     

       127
       123
        
       

     

       128
       124
        
       		return

+14 -2

appview/strings/strings.go

···

       148
       148
        
       		showRendered = r.URL.Query().Get("code") != "true"

     

       149
       149
        
       	}

     

       150
       150
        
       

     

       151
       151
       +
       	starCount, err := db.GetStarCount(s.Db, string.AtUri())

     

       152
       152
       +
       	if err != nil {

     

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

     

       154
       154
       +
       	}

     

       155
       155
       +
       	user := s.OAuth.GetUser(r)

     

       156
       156
       +
       	isStarred := false

     

       157
       157
       +
       	if user != nil {

     

       158
       158
       +
       		isStarred = db.GetStarStatus(s.Db, user.Did, string.AtUri())

     

       159
       159
       +
       	}

     

       160
       160
       +
       

     

       151
       161
        
       	s.Pages.SingleString(w, pages.SingleStringParams{

     

       152
       152
       -
       		LoggedInUser: s.OAuth.GetUser(r),

     

       162
       162
       +
       		LoggedInUser: user,

     

       153
       163
        
       		RenderToggle: renderToggle,

     

       154
       164
        
       		ShowRendered: showRendered,

     

       155
       155
       -
       		String:       string,

     

       165
       165
       +
       		String:       &string,

     

       156
       166
        
       		Stats:        string.Stats(),

     

       167
       167
       +
       		IsStarred:    isStarred,

     

       168
       168
       +
       		StarCount:    starCount,

     

       157
       169
        
       		Owner:        id,

     

       158
       170
        
       	})

     

       159
       171
        
       }

-23

appview/web/handler/oauth_client_metadata.go

···

       1
       1
       -
       package handler

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       5
       -
       	"net/http"

     

       6
       6
       -
       

     

       7
       7
       -
       	"tangled.org/core/appview/oauth"

     

       8
       8
       -
       )

     

       9
       9
       -
       

     

       10
       10
       -
       func OauthClientMetadata(o *oauth.OAuth) http.HandlerFunc {

     

       11
       11
       -
       	return func(w http.ResponseWriter, r *http.Request) {

     

       12
       12
       -
       		doc := o.ClientApp.Config.ClientMetadata()

     

       13
       13
       -
       		doc.JWKSURI = &o.JwksUri

     

       14
       14
       -
       		doc.ClientName = &o.ClientName

     

       15
       15
       -
       		doc.ClientURI = &o.ClientUri

     

       16
       16
       -
       

     

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

     

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

     

       19
       19
       -
       			http.Error(w, err.Error(), http.StatusInternalServerError)

     

       20
       20
       -
       			return

     

       21
       21
       -
       		}

     

       22
       22
       -
       	}

     

       23
       23
       -
       }

-19

appview/web/handler/oauth_jwks.go

···

       1
       1
       -
       package handler

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"encoding/json"

     

       5
       5
       -
       	"net/http"

     

       6
       6
       -
       

     

       7
       7
       -
       	"tangled.org/core/appview/oauth"

     

       8
       8
       -
       )

     

       9
       9
       -
       

     

       10
       10
       -
       func OauthJwks(o *oauth.OAuth) http.HandlerFunc {

     

       11
       11
       -
       	return func(w http.ResponseWriter, r *http.Request) {

     

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

     

       13
       13
       -
       		body := o.ClientApp.Config.PublicJWKS()

     

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

     

       15
       15
       -
       			http.Error(w, err.Error(), http.StatusInternalServerError)

     

       16
       16
       -
       			return

     

       17
       17
       -
       		}

     

       18
       18
       -
       	}

     

       19
       19
       -
       }

-80

appview/web/handler/user_repo_issues.go

···

       1
       1
       -
       package handler

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"net/http"

     

       5
       5
       -
       

     

       6
       6
       -
       	"tangled.org/core/api/tangled"

     

       7
       7
       -
       	"tangled.org/core/appview/db"

     

       8
       8
       -
       	"tangled.org/core/appview/models"

     

       9
       9
       -
       	"tangled.org/core/appview/pages"

     

       10
       10
       -
       	"tangled.org/core/appview/pagination"

     

       11
       11
       -
       	isvc "tangled.org/core/appview/service/issue"

     

       12
       12
       -
       	rsvc "tangled.org/core/appview/service/repo"

     

       13
       13
       -
       	"tangled.org/core/appview/session"

     

       14
       14
       -
       	"tangled.org/core/appview/web/request"

     

       15
       15
       -
       	"tangled.org/core/log"

     

       16
       16
       -
       )

     

       17
       17
       -
       

     

       18
       18
       -
       func RepoIssues(is isvc.Service, rs rsvc.Service, p *pages.Pages, d *db.DB) http.HandlerFunc {

     

       19
       19
       -
       	return func(w http.ResponseWriter, r *http.Request) {

     

       20
       20
       -
       		ctx := r.Context()

     

       21
       21
       -
       		l := log.FromContext(ctx).With("handler", "RepoIssues")

     

       22
       22
       -
       		repo, ok := request.RepoFromContext(ctx)

     

       23
       23
       -
       		if !ok {

     

       24
       24
       -
       			l.Error("malformed request")

     

       25
       25
       -
       			p.Error503(w)

     

       26
       26
       -
       			return

     

       27
       27
       -
       		}

     

       28
       28
       -
       

     

       29
       29
       -
       		query := r.URL.Query()

     

       30
       30
       -
       		searchOpts := models.IssueSearchOptions{

     

       31
       31
       -
       			RepoAt:  repo.RepoAt().String(),

     

       32
       32
       -
       			Keyword: query.Get("q"),

     

       33
       33
       -
       			IsOpen:  query.Get("state") != "closed",

     

       34
       34
       -
       			Page:    pagination.FromContext(ctx),

     

       35
       35
       -
       		}

     

       36
       36
       -
       

     

       37
       37
       -
       		issues, err := is.GetIssues(ctx, repo, searchOpts)

     

       38
       38
       -
       		if err != nil {

     

       39
       39
       -
       			l.Error("failed to get issues")

     

       40
       40
       -
       			p.Error503(w)

     

       41
       41
       -
       			return

     

       42
       42
       -
       		}

     

       43
       43
       -
       

     

       44
       44
       -
       		// render page

     

       45
       45
       -
       		err = func() error {

     

       46
       46
       -
       			user := session.UserFromContext(ctx)

     

       47
       47
       -
       			repoinfo, err := rs.GetRepoInfo(ctx, repo, user)

     

       48
       48
       -
       			if err != nil {

     

       49
       49
       -
       				return err

     

       50
       50
       -
       			}

     

       51
       51
       -
       			labelDefs, err := db.GetLabelDefinitions(

     

       52
       52
       -
       				d,

     

       53
       53
       -
       				db.FilterIn("at_uri", repo.Labels),

     

       54
       54
       -
       				db.FilterContains("scope", tangled.RepoIssueNSID),

     

       55
       55
       -
       			)

     

       56
       56
       -
       			if err != nil {

     

       57
       57
       -
       				return err

     

       58
       58
       -
       			}

     

       59
       59
       -
       			defs := make(map[string]*models.LabelDefinition)

     

       60
       60
       -
       			for _, l := range labelDefs {

     

       61
       61
       -
       				defs[l.AtUri().String()] = &l

     

       62
       62
       -
       			}

     

       63
       63
       -
       			return p.RepoIssues(w, pages.RepoIssuesParams{

     

       64
       64
       -
       				LoggedInUser: user,

     

       65
       65
       -
       				RepoInfo:     *repoinfo,

     

       66
       66
       -
       

     

       67
       67
       -
       				Issues:          issues,

     

       68
       68
       -
       				LabelDefs:       defs,

     

       69
       69
       -
       				FilteringByOpen: searchOpts.IsOpen,

     

       70
       70
       -
       				FilterQuery:     searchOpts.Keyword,

     

       71
       71
       -
       				Page:            searchOpts.Page,

     

       72
       72
       -
       			})

     

       73
       73
       -
       		}()

     

       74
       74
       -
       		if err != nil {

     

       75
       75
       -
       			l.Error("failed to render", "err", err)

     

       76
       76
       -
       			p.Error503(w)

     

       77
       77
       -
       			return

     

       78
       78
       -
       		}

     

       79
       79
       -
       	}

     

       80
       80
       -
       }

-65

appview/web/handler/user_repo_issues_issue.go

···

       1
       1
       -
       package handler

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"net/http"

     

       5
       5
       -
       

     

       6
       6
       -
       	"tangled.org/core/appview/pages"

     

       7
       7
       -
       	isvc "tangled.org/core/appview/service/issue"

     

       8
       8
       -
       	rsvc "tangled.org/core/appview/service/repo"

     

       9
       9
       -
       	"tangled.org/core/appview/session"

     

       10
       10
       -
       	"tangled.org/core/appview/web/request"

     

       11
       11
       -
       	"tangled.org/core/log"

     

       12
       12
       -
       )

     

       13
       13
       -
       

     

       14
       14
       -
       func Issue(s isvc.Service, rs rsvc.Service, p *pages.Pages) http.HandlerFunc {

     

       15
       15
       -
       	return func(w http.ResponseWriter, r *http.Request) {

     

       16
       16
       -
       		ctx := r.Context()

     

       17
       17
       -
       		l := log.FromContext(ctx).With("handler", "Issue")

     

       18
       18
       -
       		issue, ok := request.IssueFromContext(ctx)

     

       19
       19
       -
       		if !ok {

     

       20
       20
       -
       			l.Error("malformed request, failed to get issue")

     

       21
       21
       -
       			p.Error503(w)

     

       22
       22
       -
       			return

     

       23
       23
       -
       		}

     

       24
       24
       -
       

     

       25
       25
       -
       		// render

     

       26
       26
       -
       		err := func() error {

     

       27
       27
       -
       			user := session.UserFromContext(ctx)

     

       28
       28
       -
       			repoinfo, err := rs.GetRepoInfo(ctx, issue.Repo, user)

     

       29
       29
       -
       			if err != nil {

     

       30
       30
       -
       				return err

     

       31
       31
       -
       			}

     

       32
       32
       -
       			return p.RepoSingleIssue(w, pages.RepoSingleIssueParams{

     

       33
       33
       -
       				LoggedInUser: user,

     

       34
       34
       -
       				RepoInfo:     *repoinfo,

     

       35
       35
       -
       				Issue:        issue,

     

       36
       36
       -
       			})

     

       37
       37
       -
       		}()

     

       38
       38
       -
       		if err != nil {

     

       39
       39
       -
       			l.Error("failed to render", "err", err)

     

       40
       40
       -
       			p.Error503(w)

     

       41
       41
       -
       			return

     

       42
       42
       -
       		}

     

       43
       43
       -
       	}

     

       44
       44
       -
       }

     

       45
       45
       -
       

     

       46
       46
       -
       func IssueDelete(s isvc.Service, p *pages.Pages) http.HandlerFunc {

     

       47
       47
       -
       	noticeId := "issue-actions-error"

     

       48
       48
       -
       	return func(w http.ResponseWriter, r *http.Request) {

     

       49
       49
       -
       		ctx := r.Context()

     

       50
       50
       -
       		l := log.FromContext(ctx).With("handler", "IssueDelete")

     

       51
       51
       -
       		issue, ok := request.IssueFromContext(ctx)

     

       52
       52
       -
       		if !ok {

     

       53
       53
       -
       			l.Error("failed to get issue")

     

       54
       54
       -
       			// TODO: 503 error with more detailed messages

     

       55
       55
       -
       			p.Error503(w)

     

       56
       56
       -
       			return

     

       57
       57
       -
       		}

     

       58
       58
       -
       		err := s.DeleteIssue(ctx, issue)

     

       59
       59
       -
       		if err != nil {

     

       60
       60
       -
       			p.Notice(w, noticeId, "failed to delete issue")

     

       61
       61
       -
       			return

     

       62
       62
       -
       		}

     

       63
       63
       -
       		p.HxLocation(w, "/")

     

       64
       64
       -
       	}

     

       65
       65
       -
       }

-13

appview/web/handler/user_repo_issues_issue_close.go

···

       1
       1
       -
       package handler

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"net/http"

     

       5
       5
       -
       

     

       6
       6
       -
       	"tangled.org/core/appview/service/issue"

     

       7
       7
       -
       )

     

       8
       8
       -
       

     

       9
       9
       -
       func CloseIssue(s issue.Service) http.HandlerFunc {

     

       10
       10
       -
       	return func(w http.ResponseWriter, r *http.Request) {

     

       11
       11
       -
       		panic("unimplemented")

     

       12
       12
       -
       	}

     

       13
       13
       -
       }

-77

appview/web/handler/user_repo_issues_issue_edit.go

···

       1
       1
       -
       package handler

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"errors"

     

       5
       5
       -
       	"net/http"

     

       6
       6
       -
       

     

       7
       7
       -
       	"tangled.org/core/appview/pages"

     

       8
       8
       -
       	isvc "tangled.org/core/appview/service/issue"

     

       9
       9
       -
       	rsvc "tangled.org/core/appview/service/repo"

     

       10
       10
       -
       	"tangled.org/core/appview/session"

     

       11
       11
       -
       	"tangled.org/core/appview/web/request"

     

       12
       12
       -
       	"tangled.org/core/log"

     

       13
       13
       -
       )

     

       14
       14
       -
       

     

       15
       15
       -
       func IssueEdit(is isvc.Service, rs rsvc.Service, p *pages.Pages) http.HandlerFunc {

     

       16
       16
       -
       	return func(w http.ResponseWriter, r *http.Request) {

     

       17
       17
       -
       		ctx := r.Context()

     

       18
       18
       -
       		l := log.FromContext(ctx).With("handler", "IssueEdit")

     

       19
       19
       -
       		issue, ok := request.IssueFromContext(ctx)

     

       20
       20
       -
       		if !ok {

     

       21
       21
       -
       			l.Error("malformed request, failed to get issue")

     

       22
       22
       -
       			p.Error503(w)

     

       23
       23
       -
       			return

     

       24
       24
       -
       		}

     

       25
       25
       -
       

     

       26
       26
       -
       		// render

     

       27
       27
       -
       		err := func() error {

     

       28
       28
       -
       			user := session.UserFromContext(ctx)

     

       29
       29
       -
       			repoinfo, err := rs.GetRepoInfo(ctx, issue.Repo, user)

     

       30
       30
       -
       			if err != nil {

     

       31
       31
       -
       				return err

     

       32
       32
       -
       			}

     

       33
       33
       -
       			return p.EditIssueFragment(w, pages.EditIssueParams{

     

       34
       34
       -
       				LoggedInUser: user,

     

       35
       35
       -
       				RepoInfo:     *repoinfo,

     

       36
       36
       -
       

     

       37
       37
       -
       				Issue: issue,

     

       38
       38
       -
       			})

     

       39
       39
       -
       		}()

     

       40
       40
       -
       		if err != nil {

     

       41
       41
       -
       			l.Error("failed to render", "err", err)

     

       42
       42
       -
       			p.Error503(w)

     

       43
       43
       -
       			return

     

       44
       44
       -
       		}

     

       45
       45
       -
       	}

     

       46
       46
       -
       }

     

       47
       47
       -
       

     

       48
       48
       -
       func IssueEditPost(is isvc.Service, p *pages.Pages) http.HandlerFunc {

     

       49
       49
       -
       	noticeId := "issues"

     

       50
       50
       -
       	return func(w http.ResponseWriter, r *http.Request) {

     

       51
       51
       -
       		ctx := r.Context()

     

       52
       52
       -
       		l := log.FromContext(ctx).With("handler", "IssueEdit")

     

       53
       53
       -
       		issue, ok := request.IssueFromContext(ctx)

     

       54
       54
       -
       		if !ok {

     

       55
       55
       -
       			l.Error("malformed request, failed to get issue")

     

       56
       56
       -
       			p.Error503(w)

     

       57
       57
       -
       			return

     

       58
       58
       -
       		}

     

       59
       59
       -
       

     

       60
       60
       -
       		newIssue := *issue

     

       61
       61
       -
       		newIssue.Title = r.FormValue("title")

     

       62
       62
       -
       		newIssue.Body = r.FormValue("body")

     

       63
       63
       -
       

     

       64
       64
       -
       		err := is.EditIssue(ctx, &newIssue)

     

       65
       65
       -
       		if err != nil {

     

       66
       66
       -
       			if errors.Is(err, isvc.ErrDatabaseFail) {

     

       67
       67
       -
       				p.Notice(w, noticeId, "Failed to edit issue.")

     

       68
       68
       -
       			} else if errors.Is(err, isvc.ErrPDSFail) {

     

       69
       69
       -
       				p.Notice(w, noticeId, "Failed to edit issue.")

     

       70
       70
       -
       			} else {

     

       71
       71
       -
       				p.Notice(w, noticeId, "Failed to edit issue.")

     

       72
       72
       -
       			}

     

       73
       73
       -
       		}

     

       74
       74
       -
       

     

       75
       75
       -
       		p.HxRefresh(w)

     

       76
       76
       -
       	}

     

       77
       77
       -
       }

-13

appview/web/handler/user_repo_issues_issue_opengraph.go

···

       1
       1
       -
       package handler

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"net/http"

     

       5
       5
       -
       

     

       6
       6
       -
       	"tangled.org/core/appview/service/issue"

     

       7
       7
       -
       )

     

       8
       8
       -
       

     

       9
       9
       -
       func IssueOpenGraph(s issue.Service) http.HandlerFunc {

     

       10
       10
       -
       	return func(w http.ResponseWriter, r *http.Request) {

     

       11
       11
       -
       		panic("unimplemented")

     

       12
       12
       -
       	}

     

       13
       13
       -
       }

-13

appview/web/handler/user_repo_issues_issue_reopen.go

···

       1
       1
       -
       package handler

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"net/http"

     

       5
       5
       -
       

     

       6
       6
       -
       	"tangled.org/core/appview/service/issue"

     

       7
       7
       -
       )

     

       8
       8
       -
       

     

       9
       9
       -
       func ReopenIssue(s issue.Service) http.HandlerFunc {

     

       10
       10
       -
       	return func(w http.ResponseWriter, r *http.Request) {

     

       11
       11
       -
       		panic("unimplemented")

     

       12
       12
       -
       	}

     

       13
       13
       -
       }

-74

appview/web/handler/user_repo_issues_new.go

···

       1
       1
       -
       package handler

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"errors"

     

       5
       5
       -
       	"fmt"

     

       6
       6
       -
       	"net/http"

     

       7
       7
       -
       

     

       8
       8
       -
       	"tangled.org/core/appview/pages"

     

       9
       9
       -
       	isvc "tangled.org/core/appview/service/issue"

     

       10
       10
       -
       	rsvc "tangled.org/core/appview/service/repo"

     

       11
       11
       -
       	"tangled.org/core/appview/session"

     

       12
       12
       -
       	"tangled.org/core/appview/web/request"

     

       13
       13
       -
       	"tangled.org/core/log"

     

       14
       14
       -
       )

     

       15
       15
       -
       

     

       16
       16
       -
       func NewIssue(rs rsvc.Service, p *pages.Pages) http.HandlerFunc {

     

       17
       17
       -
       	return func(w http.ResponseWriter, r *http.Request) {

     

       18
       18
       -
       		ctx := r.Context()

     

       19
       19
       -
       		l := log.FromContext(ctx).With("handler", "NewIssue")

     

       20
       20
       -
       

     

       21
       21
       -
       		// render

     

       22
       22
       -
       		err := func() error {

     

       23
       23
       -
       			user := session.UserFromContext(ctx)

     

       24
       24
       -
       			repo, ok := request.RepoFromContext(ctx)

     

       25
       25
       -
       			if !ok {

     

       26
       26
       -
       				return fmt.Errorf("malformed request")

     

       27
       27
       -
       			}

     

       28
       28
       -
       			repoinfo, err := rs.GetRepoInfo(ctx, repo, user)

     

       29
       29
       -
       			if err != nil {

     

       30
       30
       -
       				return err

     

       31
       31
       -
       			}

     

       32
       32
       -
       			return p.RepoNewIssue(w, pages.RepoNewIssueParams{

     

       33
       33
       -
       				LoggedInUser: user,

     

       34
       34
       -
       				RepoInfo:     *repoinfo,

     

       35
       35
       -
       			})

     

       36
       36
       -
       		}()

     

       37
       37
       -
       		if err != nil {

     

       38
       38
       -
       			l.Error("failed to render", "err", err)

     

       39
       39
       -
       			p.Error503(w)

     

       40
       40
       -
       			return

     

       41
       41
       -
       		}

     

       42
       42
       -
       	}

     

       43
       43
       -
       }

     

       44
       44
       -
       

     

       45
       45
       -
       func NewIssuePost(is isvc.Service, p *pages.Pages) http.HandlerFunc {

     

       46
       46
       -
       	noticeId := "issues"

     

       47
       47
       -
       	return func(w http.ResponseWriter, r *http.Request) {

     

       48
       48
       -
       		ctx := r.Context()

     

       49
       49
       -
       		l := log.FromContext(ctx).With("handler", "NewIssuePost")

     

       50
       50
       -
       		repo, ok := request.RepoFromContext(ctx)

     

       51
       51
       -
       		if !ok {

     

       52
       52
       -
       			l.Error("malformed request, failed to get repo")

     

       53
       53
       -
       			// TODO: 503 error with more detailed messages

     

       54
       54
       -
       			p.Error503(w)

     

       55
       55
       -
       			return

     

       56
       56
       -
       		}

     

       57
       57
       -
       		var (

     

       58
       58
       -
       			title = r.FormValue("title")

     

       59
       59
       -
       			body  = r.FormValue("body")

     

       60
       60
       -
       		)

     

       61
       61
       -
       

     

       62
       62
       -
       		_, err := is.NewIssue(ctx, repo, title, body)

     

       63
       63
       -
       		if err != nil {

     

       64
       64
       -
       			if errors.Is(err, isvc.ErrDatabaseFail) {

     

       65
       65
       -
       				p.Notice(w, noticeId, "Failed to create issue.")

     

       66
       66
       -
       			} else if errors.Is(err, isvc.ErrPDSFail) {

     

       67
       67
       -
       				p.Notice(w, noticeId, "Failed to create issue.")

     

       68
       68
       -
       			} else {

     

       69
       69
       -
       				p.Notice(w, noticeId, "Failed to create issue.")

     

       70
       70
       -
       			}

     

       71
       71
       -
       		}

     

       72
       72
       -
       		p.HxLocation(w, "/")

     

       73
       73
       -
       	}

     

       74
       74
       -
       }

-67

appview/web/middleware/auth.go

···

       1
       1
       -
       package middleware

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"fmt"

     

       5
       5
       -
       	"net/http"

     

       6
       6
       -
       	"net/url"

     

       7
       7
       -
       

     

       8
       8
       -
       	"tangled.org/core/appview/oauth"

     

       9
       9
       -
       	"tangled.org/core/appview/session"

     

       10
       10
       -
       	"tangled.org/core/log"

     

       11
       11
       -
       )

     

       12
       12
       -
       

     

       13
       13
       -
       // WithSession resumes atp session from cookie, ensure it's not malformed and

     

       14
       14
       -
       // pass the session through context

     

       15
       15
       -
       func WithSession(o *oauth.OAuth) middlewareFunc {

     

       16
       16
       -
       	return func(next http.Handler) http.Handler {

     

       17
       17
       -
       		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       18
       18
       -
       			atSess, err := o.ResumeSession(r)

     

       19
       19
       -
       			if err != nil {

     

       20
       20
       -
       				next.ServeHTTP(w, r)

     

       21
       21
       -
       				return

     

       22
       22
       -
       			}

     

       23
       23
       -
       

     

       24
       24
       -
       			sess := session.New(atSess)

     

       25
       25
       -
       

     

       26
       26
       -
       			ctx := session.IntoContext(r.Context(), sess)

     

       27
       27
       -
       			next.ServeHTTP(w, r.WithContext(ctx))

     

       28
       28
       -
       		})

     

       29
       29
       -
       	}

     

       30
       30
       -
       }

     

       31
       31
       -
       

     

       32
       32
       -
       // AuthMiddleware ensures the request is authorized and redirect to login page

     

       33
       33
       -
       // when unauthorized

     

       34
       34
       -
       func AuthMiddleware() middlewareFunc {

     

       35
       35
       -
       	return func(next http.Handler) http.Handler {

     

       36
       36
       -
       		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       37
       37
       -
       			ctx := r.Context()

     

       38
       38
       -
       			l := log.FromContext(ctx)

     

       39
       39
       -
       

     

       40
       40
       -
       			returnURL := "/"

     

       41
       41
       -
       			if u, err := url.Parse(r.Header.Get("Referer")); err == nil {

     

       42
       42
       -
       				returnURL = u.RequestURI()

     

       43
       43
       -
       			}

     

       44
       44
       -
       

     

       45
       45
       -
       			loginURL := fmt.Sprintf("/login?return_url=%s", url.QueryEscape(returnURL))

     

       46
       46
       -
       

     

       47
       47
       -
       			redirectFunc := func(w http.ResponseWriter, r *http.Request) {

     

       48
       48
       -
       				http.Redirect(w, r, loginURL, http.StatusTemporaryRedirect)

     

       49
       49
       -
       			}

     

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

     

       51
       51
       -
       				redirectFunc = func(w http.ResponseWriter, _ *http.Request) {

     

       52
       52
       -
       					w.Header().Set("HX-Redirect", loginURL)

     

       53
       53
       -
       					w.WriteHeader(http.StatusOK)

     

       54
       54
       -
       				}

     

       55
       55
       -
       			}

     

       56
       56
       -
       

     

       57
       57
       -
       			sess := session.FromContext(ctx)

     

       58
       58
       -
       			if sess == nil {

     

       59
       59
       -
       				l.Debug("no session, redirecting...")

     

       60
       60
       -
       				redirectFunc(w, r)

     

       61
       61
       -
       				return

     

       62
       62
       -
       			}

     

       63
       63
       -
       

     

       64
       64
       -
       			next.ServeHTTP(w, r)

     

       65
       65
       -
       		})

     

       66
       66
       -
       	}

     

       67
       67
       -
       }

-30

appview/web/middleware/ensuredidorhandle.go

···

       1
       1
       -
       package middleware

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"net/http"

     

       5
       5
       -
       

     

       6
       6
       -
       	"github.com/go-chi/chi/v5"

     

       7
       7
       -
       	"tangled.org/core/appview/pages"

     

       8
       8
       -
       	"tangled.org/core/appview/state/userutil"

     

       9
       9
       -
       )

     

       10
       10
       -
       

     

       11
       11
       -
       // EnsureDidOrHandle ensures the "user" url param is valid did/handle format.

     

       12
       12
       -
       // If not, respond with 404

     

       13
       13
       -
       func EnsureDidOrHandle(p *pages.Pages) middlewareFunc {

     

       14
       14
       -
       	return func(next http.Handler) http.Handler {

     

       15
       15
       -
       		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       16
       16
       -
       			user := chi.URLParam(r, "user")

     

       17
       17
       -
       

     

       18
       18
       -
       			// if using a DID or handle, just continue as per usual

     

       19
       19
       -
       			if userutil.IsDid(user) || userutil.IsHandle(user) {

     

       20
       20
       -
       				next.ServeHTTP(w, r)

     

       21
       21
       -
       				return

     

       22
       22
       -
       			}

     

       23
       23
       -
       

     

       24
       24
       -
       			// TODO: run Normalize middleware from here

     

       25
       25
       -
       

     

       26
       26
       -
       			p.Error404(w)

     

       27
       27
       -
       			return

     

       28
       28
       -
       		})

     

       29
       29
       -
       	}

     

       30
       30
       -
       }

-18

appview/web/middleware/log.go

···

       1
       1
       -
       package middleware

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"log/slog"

     

       5
       5
       -
       	"net/http"

     

       6
       6
       -
       

     

       7
       7
       -
       	"tangled.org/core/log"

     

       8
       8
       -
       )

     

       9
       9
       -
       

     

       10
       10
       -
       func WithLogger(l *slog.Logger) middlewareFunc {

     

       11
       11
       -
       	return func(next http.Handler) http.Handler {

     

       12
       12
       -
       		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       13
       13
       -
       			// NOTE: can add some metadata here

     

       14
       14
       -
       			ctx := log.IntoContext(r.Context(), l)

     

       15
       15
       -
       			next.ServeHTTP(w, r.WithContext(ctx))

     

       16
       16
       -
       		})

     

       17
       17
       -
       	}

     

       18
       18
       -
       }

-7

appview/web/middleware/middleware.go

···

       1
       1
       -
       package middleware

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"net/http"

     

       5
       5
       -
       )

     

       6
       6
       -
       

     

       7
       7
       -
       type middlewareFunc func(http.Handler) http.Handler

-50

appview/web/middleware/normalize.go

···

       1
       1
       -
       package middleware

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"net/http"

     

       5
       5
       -
       	"strings"

     

       6
       6
       -
       

     

       7
       7
       -
       	"github.com/go-chi/chi/v5"

     

       8
       8
       -
       	"tangled.org/core/appview/state/userutil"

     

       9
       9
       -
       )

     

       10
       10
       -
       

     

       11
       11
       -
       func Normalize() middlewareFunc {

     

       12
       12
       -
       	return func(next http.Handler) http.Handler {

     

       13
       13
       -
       		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       14
       14
       -
       			pat := chi.URLParam(r, "*")

     

       15
       15
       -
       			pathParts := strings.SplitN(pat, "/", 2)

     

       16
       16
       -
       			if len(pathParts) == 0 {

     

       17
       17
       -
       				next.ServeHTTP(w, r)

     

       18
       18
       -
       				return

     

       19
       19
       -
       			}

     

       20
       20
       -
       

     

       21
       21
       -
       			firstPart := pathParts[0]

     

       22
       22
       -
       

     

       23
       23
       -
       			// if using a flattened DID (like you would in go modules), unflatten

     

       24
       24
       -
       			if userutil.IsFlattenedDid(firstPart) {

     

       25
       25
       -
       				unflattenedDid := userutil.UnflattenDid(firstPart)

     

       26
       26
       -
       				redirectPath := strings.Join(append([]string{unflattenedDid}, pathParts[1:]...), "/")

     

       27
       27
       -
       

     

       28
       28
       -
       				redirectURL := *r.URL

     

       29
       29
       -
       				redirectURL.Path = "/" + redirectPath

     

       30
       30
       -
       

     

       31
       31
       -
       				http.Redirect(w, r, redirectURL.String(), http.StatusFound)

     

       32
       32
       -
       				return

     

       33
       33
       -
       			}

     

       34
       34
       -
       

     

       35
       35
       -
       			// if using a handle with @, rewrite to work without @

     

       36
       36
       -
       			if normalized := strings.TrimPrefix(firstPart, "@"); userutil.IsHandle(normalized) {

     

       37
       37
       -
       				redirectPath := strings.Join(append([]string{normalized}, pathParts[1:]...), "/")

     

       38
       38
       -
       

     

       39
       39
       -
       				redirectURL := *r.URL

     

       40
       40
       -
       				redirectURL.Path = "/" + redirectPath

     

       41
       41
       -
       

     

       42
       42
       -
       				http.Redirect(w, r, redirectURL.String(), http.StatusFound)

     

       43
       43
       -
       				return

     

       44
       44
       -
       			}

     

       45
       45
       -
       

     

       46
       46
       -
       			next.ServeHTTP(w, r)

     

       47
       47
       -
       			return

     

       48
       48
       -
       		})

     

       49
       49
       -
       	}

     

       50
       50
       -
       }

-38

appview/web/middleware/paginate.go

···

       1
       1
       -
       package middleware

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"log"

     

       5
       5
       -
       	"net/http"

     

       6
       6
       -
       	"strconv"

     

       7
       7
       -
       

     

       8
       8
       -
       	"tangled.org/core/appview/pagination"

     

       9
       9
       -
       )

     

       10
       10
       -
       

     

       11
       11
       -
       func Paginate(next http.Handler) http.Handler {

     

       12
       12
       -
       	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       13
       13
       -
       		page := pagination.FirstPage()

     

       14
       14
       -
       

     

       15
       15
       -
       		offsetVal := r.URL.Query().Get("offset")

     

       16
       16
       -
       		if offsetVal != "" {

     

       17
       17
       -
       			offset, err := strconv.Atoi(offsetVal)

     

       18
       18
       -
       			if err != nil {

     

       19
       19
       -
       				log.Println("invalid offset")

     

       20
       20
       -
       			} else {

     

       21
       21
       -
       				page.Offset = offset

     

       22
       22
       -
       			}

     

       23
       23
       -
       		}

     

       24
       24
       -
       

     

       25
       25
       -
       		limitVal := r.URL.Query().Get("limit")

     

       26
       26
       -
       		if limitVal != "" {

     

       27
       27
       -
       			limit, err := strconv.Atoi(limitVal)

     

       28
       28
       -
       			if err != nil {

     

       29
       29
       -
       				log.Println("invalid limit")

     

       30
       30
       -
       			} else {

     

       31
       31
       -
       				page.Limit = limit

     

       32
       32
       -
       			}

     

       33
       33
       -
       		}

     

       34
       34
       -
       

     

       35
       35
       -
       		ctx := pagination.IntoContext(r.Context(), page)

     

       36
       36
       -
       		next.ServeHTTP(w, r.WithContext(ctx))

     

       37
       37
       -
       	})

     

       38
       38
       -
       }

-120

appview/web/middleware/resolve.go

···

       1
       1
       -
       package middleware

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"context"

     

       5
       5
       -
       	"net/http"

     

       6
       6
       -
       	"strconv"

     

       7
       7
       -
       	"strings"

     

       8
       8
       -
       

     

       9
       9
       -
       	"github.com/go-chi/chi/v5"

     

       10
       10
       -
       	"tangled.org/core/appview/db"

     

       11
       11
       -
       	"tangled.org/core/appview/pages"

     

       12
       12
       -
       	"tangled.org/core/appview/web/request"

     

       13
       13
       -
       	"tangled.org/core/idresolver"

     

       14
       14
       -
       	"tangled.org/core/log"

     

       15
       15
       -
       )

     

       16
       16
       -
       

     

       17
       17
       -
       func ResolveIdent(

     

       18
       18
       -
       	idResolver *idresolver.Resolver,

     

       19
       19
       -
       	pages *pages.Pages,

     

       20
       20
       -
       ) middlewareFunc {

     

       21
       21
       -
       	return func(next http.Handler) http.Handler {

     

       22
       22
       -
       		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       23
       23
       -
       			ctx := r.Context()

     

       24
       24
       -
       			l := log.FromContext(ctx)

     

       25
       25
       -
       			didOrHandle := chi.URLParam(r, "user")

     

       26
       26
       -
       			didOrHandle = strings.TrimPrefix(didOrHandle, "@")

     

       27
       27
       -
       

     

       28
       28
       -
       			id, err := idResolver.ResolveIdent(ctx, didOrHandle)

     

       29
       29
       -
       			if err != nil {

     

       30
       30
       -
       				// invalid did or handle

     

       31
       31
       -
       				l.Warn("failed to resolve did/handle", "handle", didOrHandle, "err", err)

     

       32
       32
       -
       				pages.Error404(w)

     

       33
       33
       -
       				return

     

       34
       34
       -
       			}

     

       35
       35
       -
       

     

       36
       36
       -
       			ctx = request.WithOwner(ctx, id)

     

       37
       37
       -
       			// TODO: reomove this later

     

       38
       38
       -
       			ctx = context.WithValue(ctx, "resolvedId", *id)

     

       39
       39
       -
       

     

       40
       40
       -
       			next.ServeHTTP(w, r.WithContext(ctx))

     

       41
       41
       -
       		})

     

       42
       42
       -
       	}

     

       43
       43
       -
       }

     

       44
       44
       -
       

     

       45
       45
       -
       func ResolveRepo(

     

       46
       46
       -
       	e *db.DB,

     

       47
       47
       -
       	pages *pages.Pages,

     

       48
       48
       -
       ) middlewareFunc {

     

       49
       49
       -
       	return func(next http.Handler) http.Handler {

     

       50
       50
       -
       		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       51
       51
       -
       			ctx := r.Context()

     

       52
       52
       -
       			l := log.FromContext(ctx)

     

       53
       53
       -
       			repoName := chi.URLParam(r, "repo")

     

       54
       54
       -
       			repoOwner, ok := request.OwnerFromContext(ctx)

     

       55
       55
       -
       			if !ok {

     

       56
       56
       -
       				l.Error("malformed middleware")

     

       57
       57
       -
       				w.WriteHeader(http.StatusInternalServerError)

     

       58
       58
       -
       				return

     

       59
       59
       -
       			}

     

       60
       60
       -
       

     

       61
       61
       -
       			repo, err := db.GetRepo(

     

       62
       62
       -
       				e,

     

       63
       63
       -
       				db.FilterEq("did", repoOwner.DID.String()),

     

       64
       64
       -
       				db.FilterEq("name", repoName),

     

       65
       65
       -
       			)

     

       66
       66
       -
       			if err != nil {

     

       67
       67
       -
       				l.Warn("failed to resolve repo", "err", err)

     

       68
       68
       -
       				pages.ErrorKnot404(w)

     

       69
       69
       -
       				return

     

       70
       70
       -
       			}

     

       71
       71
       -
       

     

       72
       72
       -
       			// TODO: pass owner id into repository object

     

       73
       73
       -
       

     

       74
       74
       -
       			ctx = request.WithRepo(ctx, repo)

     

       75
       75
       -
       			// TODO: reomove this later

     

       76
       76
       -
       			ctx = context.WithValue(ctx, "repo", repo)

     

       77
       77
       -
       

     

       78
       78
       -
       			next.ServeHTTP(w, r.WithContext(ctx))

     

       79
       79
       -
       		})

     

       80
       80
       -
       	}

     

       81
       81
       -
       }

     

       82
       82
       -
       

     

       83
       83
       -
       func ResolveIssue(

     

       84
       84
       -
       	e *db.DB,

     

       85
       85
       -
       	pages *pages.Pages,

     

       86
       86
       -
       ) middlewareFunc {

     

       87
       87
       -
       	return func(next http.Handler) http.Handler {

     

       88
       88
       -
       		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

     

       89
       89
       -
       			ctx := r.Context()

     

       90
       90
       -
       			l := log.FromContext(ctx)

     

       91
       91
       -
       			issueIdStr := chi.URLParam(r, "issue")

     

       92
       92
       -
       			issueId, err := strconv.Atoi(issueIdStr)

     

       93
       93
       -
       			if err != nil {

     

       94
       94
       -
       				l.Warn("failed to fully resolve issue ID", "err", err)

     

       95
       95
       -
       				pages.Error404(w)

     

       96
       96
       -
       				return

     

       97
       97
       -
       			}

     

       98
       98
       -
       			repo, ok := request.RepoFromContext(ctx)

     

       99
       99
       -
       			if !ok {

     

       100
       100
       -
       				l.Error("malformed middleware")

     

       101
       101
       -
       				w.WriteHeader(http.StatusInternalServerError)

     

       102
       102
       -
       				return

     

       103
       103
       -
       			}

     

       104
       104
       -
       

     

       105
       105
       -
       			issue, err := db.GetIssue(e, repo.RepoAt(), issueId)

     

       106
       106
       -
       			if err != nil {

     

       107
       107
       -
       				l.Warn("failed to resolve issue", "err", err)

     

       108
       108
       -
       				pages.ErrorKnot404(w)

     

       109
       109
       -
       				return

     

       110
       110
       -
       			}

     

       111
       111
       -
       			issue.Repo = repo

     

       112
       112
       -
       

     

       113
       113
       -
       			ctx = request.WithIssue(ctx, issue)

     

       114
       114
       -
       			// TODO: reomove this later

     

       115
       115
       -
       			ctx = context.WithValue(ctx, "issue", issue)

     

       116
       116
       -
       

     

       117
       117
       -
       			next.ServeHTTP(w, r.WithContext(ctx))

     

       118
       118
       -
       		})

     

       119
       119
       -
       	}

     

       120
       120
       -
       }

-39

appview/web/request/context.go

···

       1
       1
       -
       package request

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"context"

     

       5
       5
       -
       

     

       6
       6
       -
       	"github.com/bluesky-social/indigo/atproto/identity"

     

       7
       7
       -
       	"tangled.org/core/appview/models"

     

       8
       8
       -
       )

     

       9
       9
       -
       

     

       10
       10
       -
       type ctxKeyOwner struct{}

     

       11
       11
       -
       type ctxKeyRepo struct{}

     

       12
       12
       -
       type ctxKeyIssue struct{}

     

       13
       13
       -
       

     

       14
       14
       -
       func WithOwner(ctx context.Context, owner *identity.Identity) context.Context {

     

       15
       15
       -
       	return context.WithValue(ctx, ctxKeyOwner{}, owner)

     

       16
       16
       -
       }

     

       17
       17
       -
       

     

       18
       18
       -
       func OwnerFromContext(ctx context.Context) (*identity.Identity, bool) {

     

       19
       19
       -
       	owner, ok := ctx.Value(ctxKeyOwner{}).(*identity.Identity)

     

       20
       20
       -
       	return owner, ok

     

       21
       21
       -
       }

     

       22
       22
       -
       

     

       23
       23
       -
       func WithRepo(ctx context.Context, repo *models.Repo) context.Context {

     

       24
       24
       -
       	return context.WithValue(ctx, ctxKeyRepo{}, repo)

     

       25
       25
       -
       }

     

       26
       26
       -
       

     

       27
       27
       -
       func RepoFromContext(ctx context.Context) (*models.Repo, bool) {

     

       28
       28
       -
       	repo, ok := ctx.Value(ctxKeyRepo{}).(*models.Repo)

     

       29
       29
       -
       	return repo, ok

     

       30
       30
       -
       }

     

       31
       31
       -
       

     

       32
       32
       -
       func WithIssue(ctx context.Context, issue *models.Issue) context.Context {

     

       33
       33
       -
       	return context.WithValue(ctx, ctxKeyIssue{}, issue)

     

       34
       34
       -
       }

     

       35
       35
       -
       

     

       36
       36
       -
       func IssueFromContext(ctx context.Context) (*models.Issue, bool) {

     

       37
       37
       -
       	issue, ok := ctx.Value(ctxKeyIssue{}).(*models.Issue)

     

       38
       38
       -
       	return issue, ok

     

       39
       39
       -
       }

-213

appview/web/routes.go

···

       1
       1
       -
       package web

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"log/slog"

     

       5
       5
       -
       	"net/http"

     

       6
       6
       -
       

     

       7
       7
       -
       	"github.com/go-chi/chi/v5"

     

       8
       8
       -
       	"tangled.org/core/appview/config"

     

       9
       9
       -
       	"tangled.org/core/appview/db"

     

       10
       10
       -
       	"tangled.org/core/appview/indexer"

     

       11
       11
       -
       	"tangled.org/core/appview/notify"

     

       12
       12
       -
       	"tangled.org/core/appview/oauth"

     

       13
       13
       -
       	"tangled.org/core/appview/pages"

     

       14
       14
       -
       	isvc "tangled.org/core/appview/service/issue"

     

       15
       15
       -
       	rsvc "tangled.org/core/appview/service/repo"

     

       16
       16
       -
       	"tangled.org/core/appview/state"

     

       17
       17
       -
       	"tangled.org/core/appview/validator"

     

       18
       18
       -
       	"tangled.org/core/appview/web/handler"

     

       19
       19
       -
       	"tangled.org/core/appview/web/middleware"

     

       20
       20
       -
       	"tangled.org/core/idresolver"

     

       21
       21
       -
       	"tangled.org/core/rbac"

     

       22
       22
       -
       )

     

       23
       23
       -
       

     

       24
       24
       -
       // Rules

     

       25
       25
       -
       // - Use single function for each endpoints (unless it doesn't make sense.)

     

       26
       26
       -
       // - Name handler files following the related path (ancestor paths can be

     

       27
       27
       -
       //   trimmed.)

     

       28
       28
       -
       // - Pass dependencies to each handlers, don't create structs with shared

     

       29
       29
       -
       //   dependencies unless it serves some domain-specific roles like

     

       30
       30
       -
       //   service/issue. Same rule goes to middlewares.

     

       31
       31
       -
       

     

       32
       32
       -
       // RouterFromState creates a web router from `state.State`. This exist to

     

       33
       33
       -
       // bridge between legacy web routers under `State` and new architecture

     

       34
       34
       -
       func RouterFromState(s *state.State) http.Handler {

     

       35
       35
       -
       	config, db, enforcer, idResolver, indexer, logger, notifier, oauth, pages, validator := s.Expose()

     

       36
       36
       -
       

     

       37
       37
       -
       	return Router(

     

       38
       38
       -
       		logger,

     

       39
       39
       -
       		config,

     

       40
       40
       -
       		db,

     

       41
       41
       -
       		enforcer,

     

       42
       42
       -
       		idResolver,

     

       43
       43
       -
       		indexer,

     

       44
       44
       -
       		notifier,

     

       45
       45
       -
       		oauth,

     

       46
       46
       -
       		pages,

     

       47
       47
       -
       		validator,

     

       48
       48
       -
       		s,

     

       49
       49
       -
       	)

     

       50
       50
       -
       }

     

       51
       51
       -
       

     

       52
       52
       -
       func Router(

     

       53
       53
       -
       	// NOTE: put base dependencies (db, idResolver, oauth etc)

     

       54
       54
       -
       	logger *slog.Logger,

     

       55
       55
       -
       	config *config.Config,

     

       56
       56
       -
       	db *db.DB,

     

       57
       57
       -
       	enforcer *rbac.Enforcer,

     

       58
       58
       -
       	idResolver *idresolver.Resolver,

     

       59
       59
       -
       	indexer *indexer.Indexer,

     

       60
       60
       -
       	notifier notify.Notifier,

     

       61
       61
       -
       	oauth *oauth.OAuth,

     

       62
       62
       -
       	pages *pages.Pages,

     

       63
       63
       -
       	validator *validator.Validator,

     

       64
       64
       -
       	// to use legacy web handlers. will be removed later

     

       65
       65
       -
       	s *state.State,

     

       66
       66
       -
       ) http.Handler {

     

       67
       67
       -
       	repo := rsvc.NewService(

     

       68
       68
       -
       		logger,

     

       69
       69
       -
       		config,

     

       70
       70
       -
       		db,

     

       71
       71
       -
       		enforcer,

     

       72
       72
       -
       	)

     

       73
       73
       -
       	issue := isvc.NewService(

     

       74
       74
       -
       		logger,

     

       75
       75
       -
       		config,

     

       76
       76
       -
       		db,

     

       77
       77
       -
       		notifier,

     

       78
       78
       -
       		idResolver,

     

       79
       79
       -
       		indexer.Issues,

     

       80
       80
       -
       		validator,

     

       81
       81
       -
       	)

     

       82
       82
       -
       

     

       83
       83
       -
       	i := s.ExposeIssue()

     

       84
       84
       -
       

     

       85
       85
       -
       	r := chi.NewRouter()

     

       86
       86
       -
       

     

       87
       87
       -
       	mw := s.Middleware()

     

       88
       88
       -
       	auth := middleware.AuthMiddleware()

     

       89
       89
       -
       

     

       90
       90
       -
       	r.Use(middleware.WithLogger(logger))

     

       91
       91
       -
       	r.Use(middleware.WithSession(oauth))

     

       92
       92
       -
       

     

       93
       93
       -
       	r.Use(middleware.Normalize())

     

       94
       94
       -
       

     

       95
       95
       -
       	r.Get("/favicon.svg", s.Favicon)

     

       96
       96
       -
       	r.Get("/favicon.ico", s.Favicon)

     

       97
       97
       -
       	r.Get("/pwa-manifest.json", s.PWAManifest)

     

       98
       98
       -
       	r.Get("/robots.txt", s.RobotsTxt)

     

       99
       99
       -
       

     

       100
       100
       -
       	r.Handle("/static/*", pages.Static())

     

       101
       101
       -
       

     

       102
       102
       -
       	r.Get("/", s.HomeOrTimeline)

     

       103
       103
       -
       	r.Get("/timeline", s.Timeline)

     

       104
       104
       -
       	r.Get("/upgradeBanner", s.UpgradeBanner)

     

       105
       105
       -
       

     

       106
       106
       -
       	r.Get("/terms", s.TermsOfService)

     

       107
       107
       -
       	r.Get("/privacy", s.PrivacyPolicy)

     

       108
       108
       -
       	r.Get("/brand", s.Brand)

     

       109
       109
       -
       	// special-case handler for serving tangled.org/core

     

       110
       110
       -
       	r.Get("/core", s.Core())

     

       111
       111
       -
       

     

       112
       112
       -
       	r.Get("/login", s.Login)

     

       113
       113
       -
       	r.Post("/login", s.Login)

     

       114
       114
       -
       	r.Post("/logout", s.Logout)

     

       115
       115
       -
       

     

       116
       116
       -
       	r.Get("/goodfirstissues", s.GoodFirstIssues)

     

       117
       117
       -
       

     

       118
       118
       -
       	r.With(auth).Get("/repo/new", s.NewRepo)

     

       119
       119
       -
       	r.With(auth).Post("/repo/new", s.NewRepo)

     

       120
       120
       -
       

     

       121
       121
       -
       	r.With(auth).Post("/follow", s.Follow)

     

       122
       122
       -
       	r.With(auth).Delete("/follow", s.Follow)

     

       123
       123
       -
       

     

       124
       124
       -
       	r.With(auth).Post("/star", s.Star)

     

       125
       125
       -
       	r.With(auth).Delete("/star", s.Star)

     

       126
       126
       -
       

     

       127
       127
       -
       	r.With(auth).Post("/react", s.React)

     

       128
       128
       -
       	r.With(auth).Delete("/react", s.React)

     

       129
       129
       -
       

     

       130
       130
       -
       	r.With(auth).Get("/profile/edit-bio", s.EditBioFragment)

     

       131
       131
       -
       	r.With(auth).Get("/profile/edit-pins", s.EditPinsFragment)

     

       132
       132
       -
       	r.With(auth).Post("/profile/bio", s.UpdateProfileBio)

     

       133
       133
       -
       	r.With(auth).Post("/profile/pins", s.UpdateProfilePins)

     

       134
       134
       -
       

     

       135
       135
       -
       	r.Mount("/settings", s.SettingsRouter())

     

       136
       136
       -
       	r.Mount("/strings", s.StringsRouter(mw))

     

       137
       137
       -
       	r.Mount("/knots", s.KnotsRouter())

     

       138
       138
       -
       	r.Mount("/spindles", s.SpindlesRouter())

     

       139
       139
       -
       	r.Mount("/notifications", s.NotificationsRouter(mw))

     

       140
       140
       -
       

     

       141
       141
       -
       	r.Mount("/signup", s.SignupRouter())

     

       142
       142
       -
       	r.Get("/oauth/client-metadata.json", handler.OauthClientMetadata(oauth))

     

       143
       143
       -
       	r.Get("/oauth/jwks.json", handler.OauthJwks(oauth))

     

       144
       144
       -
       	r.Get("/oauth/callback", oauth.Callback)

     

       145
       145
       -
       

     

       146
       146
       -
       	// special-case handler. should replace with xrpc later

     

       147
       147
       -
       	r.Get("/keys/{user}", s.Keys)

     

       148
       148
       -
       

     

       149
       149
       -
       	r.HandleFunc("/@*", func(w http.ResponseWriter, r *http.Request) {

     

       150
       150
       -
       		http.Redirect(w, r, "/"+chi.URLParam(r, "*"), http.StatusFound)

     

       151
       151
       -
       	})

     

       152
       152
       -
       

     

       153
       153
       -
       	r.Route("/{user}", func(r chi.Router) {

     

       154
       154
       -
       		r.Use(middleware.EnsureDidOrHandle(pages))

     

       155
       155
       -
       		r.Use(middleware.ResolveIdent(idResolver, pages))

     

       156
       156
       -
       

     

       157
       157
       -
       		r.Get("/", s.Profile)

     

       158
       158
       -
       		r.Get("/feed.atom", s.AtomFeedPage)

     

       159
       159
       -
       

     

       160
       160
       -
       		r.Route("/{repo}", func(r chi.Router) {

     

       161
       161
       -
       			r.Use(middleware.ResolveRepo(db, pages))

     

       162
       162
       -
       

     

       163
       163
       -
       			r.Mount("/", s.RepoRouter(mw))

     

       164
       164
       -
       

     

       165
       165
       -
       			// /{user}/{repo}/issues/*

     

       166
       166
       -
       			r.With(middleware.Paginate).Get("/issues", handler.RepoIssues(issue, repo, pages, db))

     

       167
       167
       -
       			r.With(auth).Get("/issues/new", handler.NewIssue(repo, pages))

     

       168
       168
       -
       			r.With(auth).Post("/issues/new", handler.NewIssuePost(issue, pages))

     

       169
       169
       -
       			r.Route("/issues/{issue}", func(r chi.Router) {

     

       170
       170
       -
       				r.Use(middleware.ResolveIssue(db, pages))

     

       171
       171
       -
       

     

       172
       172
       -
       				r.Get("/", handler.Issue(issue, repo, pages))

     

       173
       173
       -
       				r.Get("/opengraph", i.IssueOpenGraphSummary)

     

       174
       174
       -
       

     

       175
       175
       -
       				r.With(auth).Delete("/", handler.IssueDelete(issue, pages))

     

       176
       176
       -
       

     

       177
       177
       -
       				r.With(auth).Get("/edit", handler.IssueEdit(issue, repo, pages))

     

       178
       178
       -
       				r.With(auth).Post("/edit", handler.IssueEditPost(issue, pages))

     

       179
       179
       -
       

     

       180
       180
       -
       				// r.With(auth).Post("/close", handler.CloseIssue(issue))

     

       181
       181
       -
       				// r.With(auth).Post("/reopen", handler.ReopenIssue(issue))

     

       182
       182
       -
       

     

       183
       183
       -
       				r.With(auth).Post("/close", i.CloseIssue)

     

       184
       184
       -
       				r.With(auth).Post("/reopen", i.ReopenIssue)

     

       185
       185
       -
       

     

       186
       186
       -
       				r.With(auth).Post("/comment", i.NewIssueComment)

     

       187
       187
       -
       				r.With(auth).Route("/comment/{commentId}/", func(r chi.Router) {

     

       188
       188
       -
       					r.Get("/", i.IssueComment)

     

       189
       189
       -
       					r.Delete("/", i.DeleteIssueComment)

     

       190
       190
       -
       					r.Get("/edit", i.EditIssueComment)

     

       191
       191
       -
       					r.Post("/edit", i.EditIssueComment)

     

       192
       192
       -
       					r.Get("/reply", i.ReplyIssueComment)

     

       193
       193
       -
       					r.Get("/replyPlaceholder", i.ReplyIssueCommentPlaceholder)

     

       194
       194
       -
       				})

     

       195
       195
       -
       			})

     

       196
       196
       -
       

     

       197
       197
       -
       			r.Mount("/pulls", s.PullsRouter(mw))

     

       198
       198
       -
       			r.Mount("/pipelines", s.PipelinesRouter())

     

       199
       199
       -
       			r.Mount("/labels", s.LabelsRouter())

     

       200
       200
       -
       

     

       201
       201
       -
       			// These routes get proxied to the knot

     

       202
       202
       -
       			r.Get("/info/refs", s.InfoRefs)

     

       203
       203
       -
       			r.Post("/git-upload-pack", s.UploadPack)

     

       204
       204
       -
       			r.Post("/git-receive-pack", s.ReceivePack)

     

       205
       205
       -
       		})

     

       206
       206
       -
       	})

     

       207
       207
       -
       

     

       208
       208
       -
       	r.NotFound(func(w http.ResponseWriter, r *http.Request) {

     

       209
       209
       -
       		pages.Error404(w)

     

       210
       210
       -
       	})

     

       211
       211
       -
       

     

       212
       212
       -
       	return r

     

       213
       213
       -
       }

+1 -2

cmd/appview/main.go

···

       7
       7
        
       

     

       8
       8
        
       	"tangled.org/core/appview/config"

     

       9
       9
        
       	"tangled.org/core/appview/state"

     

       10
       10
       -
       	"tangled.org/core/appview/web"

     

       11
       10
        
       	tlog "tangled.org/core/log"

     

       12
       11
        
       )

     

       13
       12
        
       

     
···

       36
       35
        
       

     

       37
       36
        
       	logger.Info("starting server", "address", c.Core.ListenAddr)

     

       38
       37
        
       

     

       39
       39
       -
       	if err := http.ListenAndServe(c.Core.ListenAddr, web.RouterFromState(state)); err != nil {

     

       38
       38
       +
       	if err := http.ListenAndServe(c.Core.ListenAddr, state.Router()); err != nil {

     

       40
       39
        
       		logger.Error("failed to start appview", "err", err)

     

       41
       40
        
       	}

     

       42
       41
        
       }

+1 -1

nix/pkgs/knot-unwrapped.nix

···

       4
       4
        
         sqlite-lib,

     

       5
       5
        
         src,

     

       6
       6
        
       }: let

     

       7
       7
       -
         version = "1.9.1-alpha";

     

       7
       7
       +
         version = "1.11.0-alpha";

     

       8
       8
        
       in

     

       9
       9
        
         buildGoApplication {

     

       10
       10
        
           pname = "knot";

+1 -1

spindle/engines/nixery/engine.go

···

       109
       109
        
       	setup := &setupSteps{}

     

       110
       110
        
       

     

       111
       111
        
       	setup.addStep(nixConfStep())

     

       112
       112
       -
       	setup.addStep(cloneStep(twf, *tpl.TriggerMetadata, e.cfg.Server.Dev))

     

       112
       112
       +
       	setup.addStep(models.BuildCloneStep(twf, *tpl.TriggerMetadata, e.cfg.Server.Dev))

     

       113
       113
        
       	// this step could be empty

     

       114
       114
        
       	if s := dependencyStep(dwf.Dependencies); s != nil {

     

       115
       115
        
       		setup.addStep(*s)

-73

spindle/engines/nixery/setup_steps.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"fmt"

     

       5
       5
       -
       	"path"

     

       6
       5
        
       	"strings"

     

       7
       7
       -
       

     

       8
       8
       -
       	"tangled.org/core/api/tangled"

     

       9
       9
       -
       	"tangled.org/core/workflow"

     

       10
       6
        
       )

     

       11
       7
        
       

     

       12
       8
        
       func nixConfStep() Step {

     
···

       17
       13
        
       		command: setupCmd,

     

       18
       14
        
       		name:    "Configure Nix",

     

       19
       15
        
       	}

     

       20
       20
       -
       }

     

       21
       21
       -
       

     

       22
       22
       -
       // cloneOptsAsSteps processes clone options and adds corresponding steps

     

       23
       23
       -
       // to the beginning of the workflow's step list if cloning is not skipped.

     

       24
       24
       -
       //

     

       25
       25
       -
       // the steps to do here are:

     

       26
       26
       -
       // - git init

     

       27
       27
       -
       // - git remote add origin <url>

     

       28
       28
       -
       // - git fetch --depth=<d> --recurse-submodules=<yes|no> <sha>

     

       29
       29
       -
       // - git checkout FETCH_HEAD

     

       30
       30
       -
       func cloneStep(twf tangled.Pipeline_Workflow, tr tangled.Pipeline_TriggerMetadata, dev bool) Step {

     

       31
       31
       -
       	if twf.Clone.Skip {

     

       32
       32
       -
       		return Step{}

     

       33
       33
       -
       	}

     

       34
       34
       -
       

     

       35
       35
       -
       	var commands []string

     

       36
       36
       -
       

     

       37
       37
       -
       	// initialize git repo in workspace

     

       38
       38
       -
       	commands = append(commands, "git init")

     

       39
       39
       -
       

     

       40
       40
       -
       	// add repo as git remote

     

       41
       41
       -
       	scheme := "https://"

     

       42
       42
       -
       	if dev {

     

       43
       43
       -
       		scheme = "http://"

     

       44
       44
       -
       		tr.Repo.Knot = strings.ReplaceAll(tr.Repo.Knot, "localhost", "host.docker.internal")

     

       45
       45
       -
       	}

     

       46
       46
       -
       	url := scheme + path.Join(tr.Repo.Knot, tr.Repo.Did, tr.Repo.Repo)

     

       47
       47
       -
       	commands = append(commands, fmt.Sprintf("git remote add origin %s", url))

     

       48
       48
       -
       

     

       49
       49
       -
       	// run git fetch

     

       50
       50
       -
       	{

     

       51
       51
       -
       		var fetchArgs []string

     

       52
       52
       -
       

     

       53
       53
       -
       		// default clone depth is 1

     

       54
       54
       -
       		depth := 1

     

       55
       55
       -
       		if twf.Clone.Depth > 1 {

     

       56
       56
       -
       			depth = int(twf.Clone.Depth)

     

       57
       57
       -
       		}

     

       58
       58
       -
       		fetchArgs = append(fetchArgs, fmt.Sprintf("--depth=%d", depth))

     

       59
       59
       -
       

     

       60
       60
       -
       		// optionally recurse submodules

     

       61
       61
       -
       		if twf.Clone.Submodules {

     

       62
       62
       -
       			fetchArgs = append(fetchArgs, "--recurse-submodules=yes")

     

       63
       63
       -
       		}

     

       64
       64
       -
       

     

       65
       65
       -
       		// set remote to fetch from

     

       66
       66
       -
       		fetchArgs = append(fetchArgs, "origin")

     

       67
       67
       -
       

     

       68
       68
       -
       		// set revision to checkout

     

       69
       69
       -
       		switch workflow.TriggerKind(tr.Kind) {

     

       70
       70
       -
       		case workflow.TriggerKindManual:

     

       71
       71
       -
       			// TODO: unimplemented

     

       72
       72
       -
       		case workflow.TriggerKindPush:

     

       73
       73
       -
       			fetchArgs = append(fetchArgs, tr.Push.NewSha)

     

       74
       74
       -
       		case workflow.TriggerKindPullRequest:

     

       75
       75
       -
       			fetchArgs = append(fetchArgs, tr.PullRequest.SourceSha)

     

       76
       76
       -
       		}

     

       77
       77
       -
       

     

       78
       78
       -
       		commands = append(commands, fmt.Sprintf("git fetch %s", strings.Join(fetchArgs, " ")))

     

       79
       79
       -
       	}

     

       80
       80
       -
       

     

       81
       81
       -
       	// run git checkout

     

       82
       82
       -
       	commands = append(commands, "git checkout FETCH_HEAD")

     

       83
       83
       -
       

     

       84
       84
       -
       	cloneStep := Step{

     

       85
       85
       -
       		command: strings.Join(commands, "\n"),

     

       86
       86
       -
       		name:    "Clone repository into workspace",

     

       87
       87
       -
       	}

     

       88
       88
       -
       	return cloneStep

     

       89
       16
        
       }

     

       90
       17
        
       

     

       91
       18
        
       // dependencyStep processes dependencies defined in the workflow.

+151

spindle/models/clone.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"fmt"

     

       5
       5
       +
       	"strings"

     

       6
       6
       +
       

     

       7
       7
       +
       	"tangled.org/core/api/tangled"

     

       8
       8
       +
       	"tangled.org/core/workflow"

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       type CloneStep struct {

     

       12
       12
       +
       	name     string

     

       13
       13
       +
       	kind     StepKind

     

       14
       14
       +
       	commands []string

     

       15
       15
       +
       }

     

       16
       16
       +
       

     

       17
       17
       +
       func (s CloneStep) Name() string {

     

       18
       18
       +
       	return s.name

     

       19
       19
       +
       }

     

       20
       20
       +
       

     

       21
       21
       +
       func (s CloneStep) Commands() []string {

     

       22
       22
       +
       	return s.commands

     

       23
       23
       +
       }

     

       24
       24
       +
       

     

       25
       25
       +
       func (s CloneStep) Command() string {

     

       26
       26
       +
       	return strings.Join(s.commands, "\n")

     

       27
       27
       +
       }

     

       28
       28
       +
       

     

       29
       29
       +
       func (s CloneStep) Kind() StepKind {

     

       30
       30
       +
       	return s.kind

     

       31
       31
       +
       }

     

       32
       32
       +
       

     

       33
       33
       +
       // BuildCloneStep generates git clone commands.

     

       34
       34
       +
       // The caller must ensure the current working directory is set to the desired

     

       35
       35
       +
       // workspace directory before executing these commands.

     

       36
       36
       +
       //

     

       37
       37
       +
       // The generated commands are:

     

       38
       38
       +
       // - git init

     

       39
       39
       +
       // - git remote add origin <url>

     

       40
       40
       +
       // - git fetch --depth=<d> --recurse-submodules=<yes|no> <sha>

     

       41
       41
       +
       // - git checkout FETCH_HEAD

     

       42
       42
       +
       //

     

       43
       43
       +
       // Supports all trigger types (push, PR, manual) and clone options.

     

       44
       44
       +
       func BuildCloneStep(twf tangled.Pipeline_Workflow, tr tangled.Pipeline_TriggerMetadata, dev bool) CloneStep {

     

       45
       45
       +
       	if twf.Clone != nil && twf.Clone.Skip {

     

       46
       46
       +
       		return CloneStep{}

     

       47
       47
       +
       	}

     

       48
       48
       +
       

     

       49
       49
       +
       	commitSHA, err := extractCommitSHA(tr)

     

       50
       50
       +
       	if err != nil {

     

       51
       51
       +
       		return CloneStep{

     

       52
       52
       +
       			kind:     StepKindSystem,

     

       53
       53
       +
       			name:     "Clone repository into workspace (error)",

     

       54
       54
       +
       			commands: []string{fmt.Sprintf("echo 'Failed to get clone info: %s' && exit 1", err.Error())},

     

       55
       55
       +
       		}

     

       56
       56
       +
       	}

     

       57
       57
       +
       

     

       58
       58
       +
       	repoURL := buildRepoURL(tr, dev)

     

       59
       59
       +
       

     

       60
       60
       +
       	var cloneOpts tangled.Pipeline_CloneOpts

     

       61
       61
       +
       	if twf.Clone != nil {

     

       62
       62
       +
       		cloneOpts = *twf.Clone

     

       63
       63
       +
       	}

     

       64
       64
       +
       	fetchArgs := buildFetchArgs(cloneOpts, commitSHA)

     

       65
       65
       +
       

     

       66
       66
       +
       	return CloneStep{

     

       67
       67
       +
       		kind: StepKindSystem,

     

       68
       68
       +
       		name: "Clone repository into workspace",

     

       69
       69
       +
       		commands: []string{

     

       70
       70
       +
       			"git init",

     

       71
       71
       +
       			fmt.Sprintf("git remote add origin %s", repoURL),

     

       72
       72
       +
       			fmt.Sprintf("git fetch %s", strings.Join(fetchArgs, " ")),

     

       73
       73
       +
       			"git checkout FETCH_HEAD",

     

       74
       74
       +
       		},

     

       75
       75
       +
       	}

     

       76
       76
       +
       }

     

       77
       77
       +
       

     

       78
       78
       +
       // extractCommitSHA extracts the commit SHA from trigger metadata based on trigger type

     

       79
       79
       +
       func extractCommitSHA(tr tangled.Pipeline_TriggerMetadata) (string, error) {

     

       80
       80
       +
       	switch workflow.TriggerKind(tr.Kind) {

     

       81
       81
       +
       	case workflow.TriggerKindPush:

     

       82
       82
       +
       		if tr.Push == nil {

     

       83
       83
       +
       			return "", fmt.Errorf("push trigger metadata is nil")

     

       84
       84
       +
       		}

     

       85
       85
       +
       		return tr.Push.NewSha, nil

     

       86
       86
       +
       

     

       87
       87
       +
       	case workflow.TriggerKindPullRequest:

     

       88
       88
       +
       		if tr.PullRequest == nil {

     

       89
       89
       +
       			return "", fmt.Errorf("pull request trigger metadata is nil")

     

       90
       90
       +
       		}

     

       91
       91
       +
       		return tr.PullRequest.SourceSha, nil

     

       92
       92
       +
       

     

       93
       93
       +
       	case workflow.TriggerKindManual:

     

       94
       94
       +
       		// Manual triggers don't have an explicit SHA in the metadata

     

       95
       95
       +
       		// For now, return empty string - could be enhanced to fetch from default branch

     

       96
       96
       +
       		// TODO: Implement manual trigger SHA resolution (fetch default branch HEAD)

     

       97
       97
       +
       		return "", nil

     

       98
       98
       +
       

     

       99
       99
       +
       	default:

     

       100
       100
       +
       		return "", fmt.Errorf("unknown trigger kind: %s", tr.Kind)

     

       101
       101
       +
       	}

     

       102
       102
       +
       }

     

       103
       103
       +
       

     

       104
       104
       +
       // buildRepoURL constructs the repository URL from trigger metadata

     

       105
       105
       +
       func buildRepoURL(tr tangled.Pipeline_TriggerMetadata, devMode bool) string {

     

       106
       106
       +
       	if tr.Repo == nil {

     

       107
       107
       +
       		return ""

     

       108
       108
       +
       	}

     

       109
       109
       +
       

     

       110
       110
       +
       	// Determine protocol

     

       111
       111
       +
       	scheme := "https://"

     

       112
       112
       +
       	if devMode {

     

       113
       113
       +
       		scheme = "http://"

     

       114
       114
       +
       	}

     

       115
       115
       +
       

     

       116
       116
       +
       	// Get host from knot

     

       117
       117
       +
       	host := tr.Repo.Knot

     

       118
       118
       +
       

     

       119
       119
       +
       	// In dev mode, replace localhost with host.docker.internal for Docker networking

     

       120
       120
       +
       	if devMode && strings.Contains(host, "localhost") {

     

       121
       121
       +
       		host = strings.ReplaceAll(host, "localhost", "host.docker.internal")

     

       122
       122
       +
       	}

     

       123
       123
       +
       

     

       124
       124
       +
       	// Build URL: {scheme}{knot}/{did}/{repo}

     

       125
       125
       +
       	return fmt.Sprintf("%s%s/%s/%s", scheme, host, tr.Repo.Did, tr.Repo.Repo)

     

       126
       126
       +
       }

     

       127
       127
       +
       

     

       128
       128
       +
       // buildFetchArgs constructs the arguments for git fetch based on clone options

     

       129
       129
       +
       func buildFetchArgs(clone tangled.Pipeline_CloneOpts, sha string) []string {

     

       130
       130
       +
       	args := []string{}

     

       131
       131
       +
       

     

       132
       132
       +
       	// Set fetch depth (default to 1 for shallow clone)

     

       133
       133
       +
       	depth := clone.Depth

     

       134
       134
       +
       	if depth == 0 {

     

       135
       135
       +
       		depth = 1

     

       136
       136
       +
       	}

     

       137
       137
       +
       	args = append(args, fmt.Sprintf("--depth=%d", depth))

     

       138
       138
       +
       

     

       139
       139
       +
       	// Add submodules if requested

     

       140
       140
       +
       	if clone.Submodules {

     

       141
       141
       +
       		args = append(args, "--recurse-submodules=yes")

     

       142
       142
       +
       	}

     

       143
       143
       +
       

     

       144
       144
       +
       	// Add remote and SHA

     

       145
       145
       +
       	args = append(args, "origin")

     

       146
       146
       +
       	if sha != "" {

     

       147
       147
       +
       		args = append(args, sha)

     

       148
       148
       +
       	}

     

       149
       149
       +
       

     

       150
       150
       +
       	return args

     

       151
       151
       +
       }

+371

spindle/models/clone_test.go

···

       1
       1
       +
       package models

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"strings"

     

       5
       5
       +
       	"testing"

     

       6
       6
       +
       

     

       7
       7
       +
       	"tangled.org/core/api/tangled"

     

       8
       8
       +
       	"tangled.org/core/workflow"

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       func TestBuildCloneStep_PushTrigger(t *testing.T) {

     

       12
       12
       +
       	twf := tangled.Pipeline_Workflow{

     

       13
       13
       +
       		Clone: &tangled.Pipeline_CloneOpts{

     

       14
       14
       +
       			Depth:      1,

     

       15
       15
       +
       			Submodules: false,

     

       16
       16
       +
       			Skip:       false,

     

       17
       17
       +
       		},

     

       18
       18
       +
       	}

     

       19
       19
       +
       	tr := tangled.Pipeline_TriggerMetadata{

     

       20
       20
       +
       		Kind: string(workflow.TriggerKindPush),

     

       21
       21
       +
       		Push: &tangled.Pipeline_PushTriggerData{

     

       22
       22
       +
       			NewSha: "abc123",

     

       23
       23
       +
       			OldSha: "def456",

     

       24
       24
       +
       			Ref:    "refs/heads/main",

     

       25
       25
       +
       		},

     

       26
       26
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       27
       27
       +
       			Knot: "example.com",

     

       28
       28
       +
       			Did:  "did:plc:user123",

     

       29
       29
       +
       			Repo: "my-repo",

     

       30
       30
       +
       		},

     

       31
       31
       +
       	}

     

       32
       32
       +
       

     

       33
       33
       +
       	step := BuildCloneStep(twf, tr, false)

     

       34
       34
       +
       

     

       35
       35
       +
       	if step.Kind() != StepKindSystem {

     

       36
       36
       +
       		t.Errorf("Expected StepKindSystem, got %v", step.Kind())

     

       37
       37
       +
       	}

     

       38
       38
       +
       

     

       39
       39
       +
       	if step.Name() != "Clone repository into workspace" {

     

       40
       40
       +
       		t.Errorf("Expected 'Clone repository into workspace', got '%s'", step.Name())

     

       41
       41
       +
       	}

     

       42
       42
       +
       

     

       43
       43
       +
       	commands := step.Commands()

     

       44
       44
       +
       	if len(commands) != 4 {

     

       45
       45
       +
       		t.Errorf("Expected 4 commands, got %d", len(commands))

     

       46
       46
       +
       	}

     

       47
       47
       +
       

     

       48
       48
       +
       	// Verify commands contain expected git operations

     

       49
       49
       +
       	allCmds := strings.Join(commands, " ")

     

       50
       50
       +
       	if !strings.Contains(allCmds, "git init") {

     

       51
       51
       +
       		t.Error("Commands should contain 'git init'")

     

       52
       52
       +
       	}

     

       53
       53
       +
       	if !strings.Contains(allCmds, "git remote add origin") {

     

       54
       54
       +
       		t.Error("Commands should contain 'git remote add origin'")

     

       55
       55
       +
       	}

     

       56
       56
       +
       	if !strings.Contains(allCmds, "git fetch") {

     

       57
       57
       +
       		t.Error("Commands should contain 'git fetch'")

     

       58
       58
       +
       	}

     

       59
       59
       +
       	if !strings.Contains(allCmds, "abc123") {

     

       60
       60
       +
       		t.Error("Commands should contain commit SHA")

     

       61
       61
       +
       	}

     

       62
       62
       +
       	if !strings.Contains(allCmds, "git checkout FETCH_HEAD") {

     

       63
       63
       +
       		t.Error("Commands should contain 'git checkout FETCH_HEAD'")

     

       64
       64
       +
       	}

     

       65
       65
       +
       	if !strings.Contains(allCmds, "https://example.com/did:plc:user123/my-repo") {

     

       66
       66
       +
       		t.Error("Commands should contain expected repo URL")

     

       67
       67
       +
       	}

     

       68
       68
       +
       }

     

       69
       69
       +
       

     

       70
       70
       +
       func TestBuildCloneStep_PullRequestTrigger(t *testing.T) {

     

       71
       71
       +
       	twf := tangled.Pipeline_Workflow{

     

       72
       72
       +
       		Clone: &tangled.Pipeline_CloneOpts{

     

       73
       73
       +
       			Depth: 1,

     

       74
       74
       +
       			Skip:  false,

     

       75
       75
       +
       		},

     

       76
       76
       +
       	}

     

       77
       77
       +
       	tr := tangled.Pipeline_TriggerMetadata{

     

       78
       78
       +
       		Kind: string(workflow.TriggerKindPullRequest),

     

       79
       79
       +
       		PullRequest: &tangled.Pipeline_PullRequestTriggerData{

     

       80
       80
       +
       			SourceSha:    "pr-sha-789",

     

       81
       81
       +
       			SourceBranch: "feature-branch",

     

       82
       82
       +
       			TargetBranch: "main",

     

       83
       83
       +
       			Action:       "opened",

     

       84
       84
       +
       		},

     

       85
       85
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       86
       86
       +
       			Knot: "example.com",

     

       87
       87
       +
       			Did:  "did:plc:user123",

     

       88
       88
       +
       			Repo: "my-repo",

     

       89
       89
       +
       		},

     

       90
       90
       +
       	}

     

       91
       91
       +
       

     

       92
       92
       +
       	step := BuildCloneStep(twf, tr, false)

     

       93
       93
       +
       

     

       94
       94
       +
       	allCmds := strings.Join(step.Commands(), " ")

     

       95
       95
       +
       	if !strings.Contains(allCmds, "pr-sha-789") {

     

       96
       96
       +
       		t.Error("Commands should contain PR commit SHA")

     

       97
       97
       +
       	}

     

       98
       98
       +
       }

     

       99
       99
       +
       

     

       100
       100
       +
       func TestBuildCloneStep_ManualTrigger(t *testing.T) {

     

       101
       101
       +
       	twf := tangled.Pipeline_Workflow{

     

       102
       102
       +
       		Clone: &tangled.Pipeline_CloneOpts{

     

       103
       103
       +
       			Depth: 1,

     

       104
       104
       +
       			Skip:  false,

     

       105
       105
       +
       		},

     

       106
       106
       +
       	}

     

       107
       107
       +
       	tr := tangled.Pipeline_TriggerMetadata{

     

       108
       108
       +
       		Kind: string(workflow.TriggerKindManual),

     

       109
       109
       +
       		Manual: &tangled.Pipeline_ManualTriggerData{

     

       110
       110
       +
       			Inputs: nil,

     

       111
       111
       +
       		},

     

       112
       112
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       113
       113
       +
       			Knot: "example.com",

     

       114
       114
       +
       			Did:  "did:plc:user123",

     

       115
       115
       +
       			Repo: "my-repo",

     

       116
       116
       +
       		},

     

       117
       117
       +
       	}

     

       118
       118
       +
       

     

       119
       119
       +
       	step := BuildCloneStep(twf, tr, false)

     

       120
       120
       +
       

     

       121
       121
       +
       	// Manual triggers don't have a SHA yet (TODO), so git fetch won't include a SHA

     

       122
       122
       +
       	allCmds := strings.Join(step.Commands(), " ")

     

       123
       123
       +
       	// Should still have basic git commands

     

       124
       124
       +
       	if !strings.Contains(allCmds, "git init") {

     

       125
       125
       +
       		t.Error("Commands should contain 'git init'")

     

       126
       126
       +
       	}

     

       127
       127
       +
       	if !strings.Contains(allCmds, "git fetch") {

     

       128
       128
       +
       		t.Error("Commands should contain 'git fetch'")

     

       129
       129
       +
       	}

     

       130
       130
       +
       }

     

       131
       131
       +
       

     

       132
       132
       +
       func TestBuildCloneStep_SkipFlag(t *testing.T) {

     

       133
       133
       +
       	twf := tangled.Pipeline_Workflow{

     

       134
       134
       +
       		Clone: &tangled.Pipeline_CloneOpts{

     

       135
       135
       +
       			Skip: true,

     

       136
       136
       +
       		},

     

       137
       137
       +
       	}

     

       138
       138
       +
       	tr := tangled.Pipeline_TriggerMetadata{

     

       139
       139
       +
       		Kind: string(workflow.TriggerKindPush),

     

       140
       140
       +
       		Push: &tangled.Pipeline_PushTriggerData{

     

       141
       141
       +
       			NewSha: "abc123",

     

       142
       142
       +
       		},

     

       143
       143
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       144
       144
       +
       			Knot: "example.com",

     

       145
       145
       +
       			Did:  "did:plc:user123",

     

       146
       146
       +
       			Repo: "my-repo",

     

       147
       147
       +
       		},

     

       148
       148
       +
       	}

     

       149
       149
       +
       

     

       150
       150
       +
       	step := BuildCloneStep(twf, tr, false)

     

       151
       151
       +
       

     

       152
       152
       +
       	// Empty step when skip is true

     

       153
       153
       +
       	if step.Name() != "" {

     

       154
       154
       +
       		t.Error("Expected empty step name when Skip is true")

     

       155
       155
       +
       	}

     

       156
       156
       +
       	if len(step.Commands()) != 0 {

     

       157
       157
       +
       		t.Errorf("Expected no commands when Skip is true, got %d commands", len(step.Commands()))

     

       158
       158
       +
       	}

     

       159
       159
       +
       }

     

       160
       160
       +
       

     

       161
       161
       +
       func TestBuildCloneStep_DevMode(t *testing.T) {

     

       162
       162
       +
       	twf := tangled.Pipeline_Workflow{

     

       163
       163
       +
       		Clone: &tangled.Pipeline_CloneOpts{

     

       164
       164
       +
       			Depth: 1,

     

       165
       165
       +
       			Skip:  false,

     

       166
       166
       +
       		},

     

       167
       167
       +
       	}

     

       168
       168
       +
       	tr := tangled.Pipeline_TriggerMetadata{

     

       169
       169
       +
       		Kind: string(workflow.TriggerKindPush),

     

       170
       170
       +
       		Push: &tangled.Pipeline_PushTriggerData{

     

       171
       171
       +
       			NewSha: "abc123",

     

       172
       172
       +
       		},

     

       173
       173
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       174
       174
       +
       			Knot: "localhost:3000",

     

       175
       175
       +
       			Did:  "did:plc:user123",

     

       176
       176
       +
       			Repo: "my-repo",

     

       177
       177
       +
       		},

     

       178
       178
       +
       	}

     

       179
       179
       +
       

     

       180
       180
       +
       	step := BuildCloneStep(twf, tr, true)

     

       181
       181
       +
       

     

       182
       182
       +
       	// In dev mode, should use http:// and replace localhost with host.docker.internal

     

       183
       183
       +
       	allCmds := strings.Join(step.Commands(), " ")

     

       184
       184
       +
       	expectedURL := "http://host.docker.internal:3000/did:plc:user123/my-repo"

     

       185
       185
       +
       	if !strings.Contains(allCmds, expectedURL) {

     

       186
       186
       +
       		t.Errorf("Expected dev mode URL '%s' in commands", expectedURL)

     

       187
       187
       +
       	}

     

       188
       188
       +
       }

     

       189
       189
       +
       

     

       190
       190
       +
       func TestBuildCloneStep_DepthAndSubmodules(t *testing.T) {

     

       191
       191
       +
       	twf := tangled.Pipeline_Workflow{

     

       192
       192
       +
       		Clone: &tangled.Pipeline_CloneOpts{

     

       193
       193
       +
       			Depth:      10,

     

       194
       194
       +
       			Submodules: true,

     

       195
       195
       +
       			Skip:       false,

     

       196
       196
       +
       		},

     

       197
       197
       +
       	}

     

       198
       198
       +
       	tr := tangled.Pipeline_TriggerMetadata{

     

       199
       199
       +
       		Kind: string(workflow.TriggerKindPush),

     

       200
       200
       +
       		Push: &tangled.Pipeline_PushTriggerData{

     

       201
       201
       +
       			NewSha: "abc123",

     

       202
       202
       +
       		},

     

       203
       203
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       204
       204
       +
       			Knot: "example.com",

     

       205
       205
       +
       			Did:  "did:plc:user123",

     

       206
       206
       +
       			Repo: "my-repo",

     

       207
       207
       +
       		},

     

       208
       208
       +
       	}

     

       209
       209
       +
       

     

       210
       210
       +
       	step := BuildCloneStep(twf, tr, false)

     

       211
       211
       +
       

     

       212
       212
       +
       	allCmds := strings.Join(step.Commands(), " ")

     

       213
       213
       +
       	if !strings.Contains(allCmds, "--depth=10") {

     

       214
       214
       +
       		t.Error("Commands should contain '--depth=10'")

     

       215
       215
       +
       	}

     

       216
       216
       +
       

     

       217
       217
       +
       	if !strings.Contains(allCmds, "--recurse-submodules=yes") {

     

       218
       218
       +
       		t.Error("Commands should contain '--recurse-submodules=yes'")

     

       219
       219
       +
       	}

     

       220
       220
       +
       }

     

       221
       221
       +
       

     

       222
       222
       +
       func TestBuildCloneStep_DefaultDepth(t *testing.T) {

     

       223
       223
       +
       	twf := tangled.Pipeline_Workflow{

     

       224
       224
       +
       		Clone: &tangled.Pipeline_CloneOpts{

     

       225
       225
       +
       			Depth: 0, // Default should be 1

     

       226
       226
       +
       			Skip:  false,

     

       227
       227
       +
       		},

     

       228
       228
       +
       	}

     

       229
       229
       +
       	tr := tangled.Pipeline_TriggerMetadata{

     

       230
       230
       +
       		Kind: string(workflow.TriggerKindPush),

     

       231
       231
       +
       		Push: &tangled.Pipeline_PushTriggerData{

     

       232
       232
       +
       			NewSha: "abc123",

     

       233
       233
       +
       		},

     

       234
       234
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       235
       235
       +
       			Knot: "example.com",

     

       236
       236
       +
       			Did:  "did:plc:user123",

     

       237
       237
       +
       			Repo: "my-repo",

     

       238
       238
       +
       		},

     

       239
       239
       +
       	}

     

       240
       240
       +
       

     

       241
       241
       +
       	step := BuildCloneStep(twf, tr, false)

     

       242
       242
       +
       

     

       243
       243
       +
       	allCmds := strings.Join(step.Commands(), " ")

     

       244
       244
       +
       	if !strings.Contains(allCmds, "--depth=1") {

     

       245
       245
       +
       		t.Error("Commands should default to '--depth=1'")

     

       246
       246
       +
       	}

     

       247
       247
       +
       }

     

       248
       248
       +
       

     

       249
       249
       +
       func TestBuildCloneStep_NilPushData(t *testing.T) {

     

       250
       250
       +
       	twf := tangled.Pipeline_Workflow{

     

       251
       251
       +
       		Clone: &tangled.Pipeline_CloneOpts{

     

       252
       252
       +
       			Depth: 1,

     

       253
       253
       +
       			Skip:  false,

     

       254
       254
       +
       		},

     

       255
       255
       +
       	}

     

       256
       256
       +
       	tr := tangled.Pipeline_TriggerMetadata{

     

       257
       257
       +
       		Kind: string(workflow.TriggerKindPush),

     

       258
       258
       +
       		Push: nil, // Nil push data should create error step

     

       259
       259
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       260
       260
       +
       			Knot: "example.com",

     

       261
       261
       +
       			Did:  "did:plc:user123",

     

       262
       262
       +
       			Repo: "my-repo",

     

       263
       263
       +
       		},

     

       264
       264
       +
       	}

     

       265
       265
       +
       

     

       266
       266
       +
       	step := BuildCloneStep(twf, tr, false)

     

       267
       267
       +
       

     

       268
       268
       +
       	// Should return an error step

     

       269
       269
       +
       	if !strings.Contains(step.Name(), "error") {

     

       270
       270
       +
       		t.Error("Expected error in step name when push data is nil")

     

       271
       271
       +
       	}

     

       272
       272
       +
       

     

       273
       273
       +
       	allCmds := strings.Join(step.Commands(), " ")

     

       274
       274
       +
       	if !strings.Contains(allCmds, "Failed to get clone info") {

     

       275
       275
       +
       		t.Error("Commands should contain error message")

     

       276
       276
       +
       	}

     

       277
       277
       +
       	if !strings.Contains(allCmds, "exit 1") {

     

       278
       278
       +
       		t.Error("Commands should exit with error")

     

       279
       279
       +
       	}

     

       280
       280
       +
       }

     

       281
       281
       +
       

     

       282
       282
       +
       func TestBuildCloneStep_NilPRData(t *testing.T) {

     

       283
       283
       +
       	twf := tangled.Pipeline_Workflow{

     

       284
       284
       +
       		Clone: &tangled.Pipeline_CloneOpts{

     

       285
       285
       +
       			Depth: 1,

     

       286
       286
       +
       			Skip:  false,

     

       287
       287
       +
       		},

     

       288
       288
       +
       	}

     

       289
       289
       +
       	tr := tangled.Pipeline_TriggerMetadata{

     

       290
       290
       +
       		Kind:        string(workflow.TriggerKindPullRequest),

     

       291
       291
       +
       		PullRequest: nil, // Nil PR data should create error step

     

       292
       292
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       293
       293
       +
       			Knot: "example.com",

     

       294
       294
       +
       			Did:  "did:plc:user123",

     

       295
       295
       +
       			Repo: "my-repo",

     

       296
       296
       +
       		},

     

       297
       297
       +
       	}

     

       298
       298
       +
       

     

       299
       299
       +
       	step := BuildCloneStep(twf, tr, false)

     

       300
       300
       +
       

     

       301
       301
       +
       	// Should return an error step

     

       302
       302
       +
       	if !strings.Contains(step.Name(), "error") {

     

       303
       303
       +
       		t.Error("Expected error in step name when pull request data is nil")

     

       304
       304
       +
       	}

     

       305
       305
       +
       

     

       306
       306
       +
       	allCmds := strings.Join(step.Commands(), " ")

     

       307
       307
       +
       	if !strings.Contains(allCmds, "Failed to get clone info") {

     

       308
       308
       +
       		t.Error("Commands should contain error message")

     

       309
       309
       +
       	}

     

       310
       310
       +
       }

     

       311
       311
       +
       

     

       312
       312
       +
       func TestBuildCloneStep_UnknownTriggerKind(t *testing.T) {

     

       313
       313
       +
       	twf := tangled.Pipeline_Workflow{

     

       314
       314
       +
       		Clone: &tangled.Pipeline_CloneOpts{

     

       315
       315
       +
       			Depth: 1,

     

       316
       316
       +
       			Skip:  false,

     

       317
       317
       +
       		},

     

       318
       318
       +
       	}

     

       319
       319
       +
       	tr := tangled.Pipeline_TriggerMetadata{

     

       320
       320
       +
       		Kind: "unknown_trigger",

     

       321
       321
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       322
       322
       +
       			Knot: "example.com",

     

       323
       323
       +
       			Did:  "did:plc:user123",

     

       324
       324
       +
       			Repo: "my-repo",

     

       325
       325
       +
       		},

     

       326
       326
       +
       	}

     

       327
       327
       +
       

     

       328
       328
       +
       	step := BuildCloneStep(twf, tr, false)

     

       329
       329
       +
       

     

       330
       330
       +
       	// Should return an error step

     

       331
       331
       +
       	if !strings.Contains(step.Name(), "error") {

     

       332
       332
       +
       		t.Error("Expected error in step name for unknown trigger kind")

     

       333
       333
       +
       	}

     

       334
       334
       +
       

     

       335
       335
       +
       	allCmds := strings.Join(step.Commands(), " ")

     

       336
       336
       +
       	if !strings.Contains(allCmds, "unknown trigger kind") {

     

       337
       337
       +
       		t.Error("Commands should contain error message about unknown trigger kind")

     

       338
       338
       +
       	}

     

       339
       339
       +
       }

     

       340
       340
       +
       

     

       341
       341
       +
       func TestBuildCloneStep_NilCloneOpts(t *testing.T) {

     

       342
       342
       +
       	twf := tangled.Pipeline_Workflow{

     

       343
       343
       +
       		Clone: nil, // Nil clone options should use defaults

     

       344
       344
       +
       	}

     

       345
       345
       +
       	tr := tangled.Pipeline_TriggerMetadata{

     

       346
       346
       +
       		Kind: string(workflow.TriggerKindPush),

     

       347
       347
       +
       		Push: &tangled.Pipeline_PushTriggerData{

     

       348
       348
       +
       			NewSha: "abc123",

     

       349
       349
       +
       		},

     

       350
       350
       +
       		Repo: &tangled.Pipeline_TriggerRepo{

     

       351
       351
       +
       			Knot: "example.com",

     

       352
       352
       +
       			Did:  "did:plc:user123",

     

       353
       353
       +
       			Repo: "my-repo",

     

       354
       354
       +
       		},

     

       355
       355
       +
       	}

     

       356
       356
       +
       

     

       357
       357
       +
       	step := BuildCloneStep(twf, tr, false)

     

       358
       358
       +
       

     

       359
       359
       +
       	// Should still work with default options

     

       360
       360
       +
       	if step.Kind() != StepKindSystem {

     

       361
       361
       +
       		t.Errorf("Expected StepKindSystem, got %v", step.Kind())

     

       362
       362
       +
       	}

     

       363
       363
       +
       

     

       364
       364
       +
       	allCmds := strings.Join(step.Commands(), " ")

     

       365
       365
       +
       	if !strings.Contains(allCmds, "--depth=1") {

     

       366
       366
       +
       		t.Error("Commands should default to '--depth=1' when Clone is nil")

     

       367
       367
       +
       	}

     

       368
       368
       +
       	if !strings.Contains(allCmds, "git init") {

     

       369
       369
       +
       		t.Error("Commands should contain 'git init'")

     

       370
       370
       +
       	}

     

       371
       371
       +
       }

+15 -7

spindle/secrets/openbao.go

···

       13
       13
        
       )

     

       14
       14
        
       

     

       15
       15
        
       type OpenBaoManager struct {

     

       16
       16
       -
       	client    *vault.Client

     

       17
       17
       -
       	mountPath string

     

       18
       18
       -
       	logger    *slog.Logger

     

       16
       16
       +
       	client            *vault.Client

     

       17
       17
       +
       	mountPath         string

     

       18
       18
       +
       	logger            *slog.Logger

     

       19
       19
       +
       	connectionTimeout time.Duration

     

       19
       20
        
       }

     

       20
       21
        
       

     

       21
       22
        
       type OpenBaoManagerOpt func(*OpenBaoManager)

     
···

       26
       27
        
       	}

     

       27
       28
        
       }

     

       28
       29
        
       

     

       30
       30
       +
       func WithConnectionTimeout(timeout time.Duration) OpenBaoManagerOpt {

     

       31
       31
       +
       	return func(v *OpenBaoManager) {

     

       32
       32
       +
       		v.connectionTimeout = timeout

     

       33
       33
       +
       	}

     

       34
       34
       +
       }

     

       35
       35
       +
       

     

       29
       36
        
       // NewOpenBaoManager creates a new OpenBao manager that connects to a Bao Proxy

     

       30
       37
        
       // The proxyAddress should point to the local Bao Proxy (e.g., "http://127.0.0.1:8200")

     

       31
       38
        
       // The proxy handles all authentication automatically via Auto-Auth

     
···

       43
       50
        
       	}

     

       44
       51
        
       

     

       45
       52
        
       	manager := &OpenBaoManager{

     

       46
       46
       -
       		client:    client,

     

       47
       47
       -
       		mountPath: "spindle", // default KV v2 mount path

     

       48
       48
       -
       		logger:    logger,

     

       53
       53
       +
       		client:            client,

     

       54
       54
       +
       		mountPath:         "spindle", // default KV v2 mount path

     

       55
       55
       +
       		logger:            logger,

     

       56
       56
       +
       		connectionTimeout: 10 * time.Second, // default connection timeout

     

       49
       57
        
       	}

     

       50
       58
        
       

     

       51
       59
        
       	for _, opt := range opts {

     
···

       62
       70
        
       

     

       63
       71
        
       // testConnection verifies that we can connect to the proxy

     

       64
       72
        
       func (v *OpenBaoManager) testConnection() error {

     

       65
       65
       -
       	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)

     

       73
       73
       +
       	ctx, cancel := context.WithTimeout(context.Background(), v.connectionTimeout)

     

       66
       74
        
       	defer cancel()

     

       67
       75
        
       

     

       68
       76
        
       	// try token self-lookup as a quick way to verify proxy works

+5 -2

spindle/secrets/openbao_test.go

···

       152
       152
        
       	for _, tt := range tests {

     

       153
       153
        
       		t.Run(tt.name, func(t *testing.T) {

     

       154
       154
        
       			logger := slog.New(slog.NewTextHandler(os.Stderr, nil))

     

       155
       155
       -
       			manager, err := NewOpenBaoManager(tt.proxyAddr, logger, tt.opts...)

     

       155
       155
       +
       			// Use shorter timeout for tests to avoid long waits

     

       156
       156
       +
       			opts := append(tt.opts, WithConnectionTimeout(1*time.Second))

     

       157
       157
       +
       			manager, err := NewOpenBaoManager(tt.proxyAddr, logger, opts...)

     

       156
       158
        
       

     

       157
       159
        
       			if tt.expectError {

     

       158
       160
        
       				assert.Error(t, err)

     
···

       596
       598
        
       

     

       597
       599
        
       			// All these will fail because no real proxy is running

     

       598
       600
        
       			// but we can test that the configuration is properly accepted

     

       599
       599
       -
       			manager, err := NewOpenBaoManager(tt.proxyAddr, logger)

     

       601
       601
       +
       			// Use shorter timeout for tests to avoid long waits

     

       602
       602
       +
       			manager, err := NewOpenBaoManager(tt.proxyAddr, logger, WithConnectionTimeout(1*time.Second))

     

       600
       603
        
       			assert.Error(t, err) // Expected because no real proxy

     

       601
       604
        
       			assert.Nil(t, manager)

     

       602
       605
        
       			assert.Contains(t, err.Error(), "failed to connect to bao proxy")

Compare changes