+30

api/tangled/repodeleteBranch.go

··· 1 1 + // Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT. 2 2 + 3 3 + package tangled 4 4 + 5 5 + // schema: sh.tangled.repo.deleteBranch 6 6 + 7 7 + import ( 8 8 + "context" 9 9 + 10 10 + "github.com/bluesky-social/indigo/lex/util" 11 11 + ) 12 12 + 13 13 + const ( 14 14 + RepoDeleteBranchNSID = "sh.tangled.repo.deleteBranch" 15 15 + ) 16 16 + 17 17 + // RepoDeleteBranch_Input is the input argument to a sh.tangled.repo.deleteBranch call. 18 18 + type RepoDeleteBranch_Input struct { 19 19 + Branch string `json:"branch" cborgen:"branch"` 20 20 + Repo string `json:"repo" cborgen:"repo"` 21 21 + } 22 22 + 23 23 + // RepoDeleteBranch calls the XRPC method "sh.tangled.repo.deleteBranch". 24 24 + func RepoDeleteBranch(ctx context.Context, c util.LexClient, input *RepoDeleteBranch_Input) error { 25 25 + if err := c.LexDo(ctx, util.Procedure, "application/json", "sh.tangled.repo.deleteBranch", nil, input, nil); err != nil { 26 26 + return err 27 27 + } 28 28 + 29 29 + return nil 30 30 + }

+140

appview/db/db.go

··· 954 954 return err 955 955 }) 956 956 957 957 + // add generated at_uri column to pulls table 958 958 + // 959 959 + // this requires a full table recreation because stored columns 960 960 + // cannot be added via alter 961 961 + // 962 962 + // disable foreign-keys for the next migration 963 963 + conn.ExecContext(ctx, "pragma foreign_keys = off;") 964 964 + runMigration(conn, "add-at-uri-to-pulls", func(tx *sql.Tx) error { 965 965 + _, err := tx.Exec(` 966 966 + create table if not exists pulls_new ( 967 967 + -- identifiers 968 968 + id integer primary key autoincrement, 969 969 + pull_id integer not null, 970 970 + at_uri text generated always as ('at://' || owner_did || '/' || 'sh.tangled.repo.pull' || '/' || rkey) stored, 971 971 + 972 972 + -- at identifiers 973 973 + repo_at text not null, 974 974 + owner_did text not null, 975 975 + rkey text not null, 976 976 + 977 977 + -- content 978 978 + title text not null, 979 979 + body text not null, 980 980 + target_branch text not null, 981 981 + state integer not null default 0 check (state in (0, 1, 2, 3)), -- closed, open, merged, deleted 982 982 + 983 983 + -- source info 984 984 + source_branch text, 985 985 + source_repo_at text, 986 986 + 987 987 + -- stacking 988 988 + stack_id text, 989 989 + change_id text, 990 990 + parent_change_id text, 991 991 + 992 992 + -- meta 993 993 + created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 994 994 + 995 995 + -- constraints 996 996 + unique(repo_at, pull_id), 997 997 + unique(at_uri), 998 998 + foreign key (repo_at) references repos(at_uri) on delete cascade 999 999 + ); 1000 1000 + `) 1001 1001 + if err != nil { 1002 1002 + return err 1003 1003 + } 1004 1004 + 1005 1005 + // transfer data 1006 1006 + _, err = tx.Exec(` 1007 1007 + insert into pulls_new ( 1008 1008 + id, pull_id, repo_at, owner_did, rkey, 1009 1009 + title, body, target_branch, state, 1010 1010 + source_branch, source_repo_at, 1011 1011 + stack_id, change_id, parent_change_id, 1012 1012 + created 1013 1013 + ) 1014 1014 + select 1015 1015 + id, pull_id, repo_at, owner_did, rkey, 1016 1016 + title, body, target_branch, state, 1017 1017 + source_branch, source_repo_at, 1018 1018 + stack_id, change_id, parent_change_id, 1019 1019 + created 1020 1020 + from pulls; 1021 1021 + `) 1022 1022 + if err != nil { 1023 1023 + return err 1024 1024 + } 1025 1025 + 1026 1026 + // drop old table 1027 1027 + _, err = tx.Exec(`drop table pulls`) 1028 1028 + if err != nil { 1029 1029 + return err 1030 1030 + } 1031 1031 + 1032 1032 + // rename new table 1033 1033 + _, err = tx.Exec(`alter table pulls_new rename to pulls`) 1034 1034 + return err 1035 1035 + }) 1036 1036 + conn.ExecContext(ctx, "pragma foreign_keys = on;") 1037 1037 + 1038 1038 + // remove repo_at and pull_id from pull_submissions and replace with pull_at 1039 1039 + // 1040 1040 + // this requires a full table recreation because stored columns 1041 1041 + // cannot be added via alter 1042 1042 + // 1043 1043 + // disable foreign-keys for the next migration 1044 1044 + conn.ExecContext(ctx, "pragma foreign_keys = off;") 1045 1045 + runMigration(conn, "remove-repo-at-pull-id-from-pull-submissions", func(tx *sql.Tx) error { 1046 1046 + _, err := tx.Exec(` 1047 1047 + create table if not exists pull_submissions_new ( 1048 1048 + -- identifiers 1049 1049 + id integer primary key autoincrement, 1050 1050 + pull_at text not null, 1051 1051 + 1052 1052 + -- content, these are immutable, and require a resubmission to update 1053 1053 + round_number integer not null default 0, 1054 1054 + patch text, 1055 1055 + source_rev text, 1056 1056 + 1057 1057 + -- meta 1058 1058 + created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')), 1059 1059 + 1060 1060 + -- constraints 1061 1061 + unique(pull_at, round_number), 1062 1062 + foreign key (pull_at) references pulls(at_uri) on delete cascade 1063 1063 + ); 1064 1064 + `) 1065 1065 + if err != nil { 1066 1066 + return err 1067 1067 + } 1068 1068 + 1069 1069 + // transfer data, constructing pull_at from pulls table 1070 1070 + _, err = tx.Exec(` 1071 1071 + insert into pull_submissions_new (id, pull_at, round_number, patch, created) 1072 1072 + select 1073 1073 + ps.id, 1074 1074 + 'at://' || p.owner_did || '/sh.tangled.repo.pull/' || p.rkey, 1075 1075 + ps.round_number, 1076 1076 + ps.patch, 1077 1077 + ps.created 1078 1078 + from pull_submissions ps 1079 1079 + join pulls p on ps.repo_at = p.repo_at and ps.pull_id = p.pull_id; 1080 1080 + `) 1081 1081 + if err != nil { 1082 1082 + return err 1083 1083 + } 1084 1084 + 1085 1085 + // drop old table 1086 1086 + _, err = tx.Exec(`drop table pull_submissions`) 1087 1087 + if err != nil { 1088 1088 + return err 1089 1089 + } 1090 1090 + 1091 1091 + // rename new table 1092 1092 + _, err = tx.Exec(`alter table pull_submissions_new rename to pull_submissions`) 1093 1093 + return err 1094 1094 + }) 1095 1095 + conn.ExecContext(ctx, "pragma foreign_keys = on;") 1096 1096 + 957 1097 return &DB{db}, nil 958 1098 } 959 1099

+13 -9

appview/db/email.go

··· 71 71 return did, nil 72 72 } 73 73 74 74 - func GetEmailToDid(e Execer, ems []string, isVerifiedFilter bool) (map[string]string, error) { 75 75 - if len(ems) == 0 { 74 74 + func GetEmailToDid(e Execer, emails []string, isVerifiedFilter bool) (map[string]string, error) { 75 75 + if len(emails) == 0 { 76 76 return make(map[string]string), nil 77 77 } 78 78 ··· 80 80 if isVerifiedFilter { 81 81 verifiedFilter = 1 82 82 } 83 83 + 84 84 + assoc := make(map[string]string) 83 85 84 86 // Create placeholders for the IN clause 85 85 - placeholders := make([]string, len(ems)) 86 86 - args := make([]any, len(ems)+1) 87 87 + placeholders := make([]string, 0, len(emails)) 88 88 + args := make([]any, 1, len(emails)+1) 87 89 88 90 args[0] = verifiedFilter 89 89 - for i, em := range ems { 90 90 - placeholders[i] = "?" 91 91 - args[i+1] = em 91 91 + for _, email := range emails { 92 92 + if strings.HasPrefix(email, "did:") { 93 93 + assoc[email] = email 94 94 + continue 95 95 + } 96 96 + placeholders = append(placeholders, "?") 97 97 + args = append(args, email) 92 98 } 93 99 94 100 query := ` ··· 104 110 return nil, err 105 111 } 106 112 defer rows.Close() 107 107 - 108 108 - assoc := make(map[string]string) 109 113 110 114 for rows.Next() { 111 115 var email, did string

+34

appview/db/language.go

··· 1 1 package db 2 2 3 3 import ( 4 4 + "database/sql" 4 5 "fmt" 5 6 "strings" 6 7 8 8 + "github.com/bluesky-social/indigo/atproto/syntax" 7 9 "tangled.org/core/appview/models" 8 10 ) 9 11 ··· 82 84 83 85 return nil 84 86 } 87 87 + 88 88 + func DeleteRepoLanguages(e Execer, filters ...filter) error { 89 89 + var conditions []string 90 90 + var args []any 91 91 + for _, filter := range filters { 92 92 + conditions = append(conditions, filter.Condition()) 93 93 + args = append(args, filter.Arg()...) 94 94 + } 95 95 + 96 96 + whereClause := "" 97 97 + if conditions != nil { 98 98 + whereClause = " where " + strings.Join(conditions, " and ") 99 99 + } 100 100 + 101 101 + query := fmt.Sprintf(`delete from repo_languages %s`, whereClause) 102 102 + 103 103 + _, err := e.Exec(query, args...) 104 104 + return err 105 105 + } 106 106 + 107 107 + func UpdateRepoLanguages(tx *sql.Tx, repoAt syntax.ATURI, ref string, langs []models.RepoLanguage) error { 108 108 + err := DeleteRepoLanguages( 109 109 + tx, 110 110 + FilterEq("repo_at", repoAt), 111 111 + FilterEq("ref", ref), 112 112 + ) 113 113 + if err != nil { 114 114 + return fmt.Errorf("failed to delete existing languages: %w", err) 115 115 + } 116 116 + 117 117 + return InsertRepoLanguages(tx, langs) 118 118 + }

+18 -25

appview/db/notifications.go

··· 3 3 import ( 4 4 "context" 5 5 "database/sql" 6 6 + "errors" 6 7 "fmt" 8 8 + "strings" 7 9 "time" 8 10 9 11 "tangled.org/core/appview/models" ··· 248 250 return GetNotificationsPaginated(e, pagination.FirstPage(), filters...) 249 251 } 250 252 251 251 - // GetNotifications retrieves notifications for a user with pagination (legacy method for backward compatibility) 252 252 - func (d *DB) GetNotifications(ctx context.Context, userDID string, limit, offset int) ([]*models.Notification, error) { 253 253 - page := pagination.Page{Limit: limit, Offset: offset} 254 254 - return GetNotificationsPaginated(d.DB, page, FilterEq("recipient_did", userDID)) 255 255 - } 253 253 + func CountNotifications(e Execer, filters ...filter) (int64, error) { 254 254 + var conditions []string 255 255 + var args []any 256 256 + for _, filter := range filters { 257 257 + conditions = append(conditions, filter.Condition()) 258 258 + args = append(args, filter.Arg()...) 259 259 + } 256 260 257 257 - // GetNotificationsWithEntities retrieves notifications with entities for a user with pagination 258 258 - func (d *DB) GetNotificationsWithEntities(ctx context.Context, userDID string, limit, offset int) ([]*models.NotificationWithEntity, error) { 259 259 - page := pagination.Page{Limit: limit, Offset: offset} 260 260 - return GetNotificationsWithEntities(d.DB, page, FilterEq("recipient_did", userDID)) 261 261 - } 261 261 + whereClause := "" 262 262 + if conditions != nil { 263 263 + whereClause = " where " + strings.Join(conditions, " and ") 264 264 + } 262 265 263 263 - func (d *DB) GetUnreadNotificationCount(ctx context.Context, userDID string) (int, error) { 264 264 - recipientFilter := FilterEq("recipient_did", userDID) 265 265 - readFilter := FilterEq("read", 0) 266 266 - 267 267 - query := fmt.Sprintf(` 268 268 - SELECT COUNT(*) 269 269 - FROM notifications 270 270 - WHERE %s AND %s 271 271 - `, recipientFilter.Condition(), readFilter.Condition()) 272 272 - 273 273 - args := append(recipientFilter.Arg(), readFilter.Arg()...) 266 266 + query := fmt.Sprintf(`select count(1) from notifications %s`, whereClause) 267 267 + var count int64 268 268 + err := e.QueryRow(query, args...).Scan(&count) 274 269 275 275 - var count int 276 276 - err := d.DB.QueryRowContext(ctx, query, args...).Scan(&count) 277 277 - if err != nil { 278 278 - return 0, fmt.Errorf("failed to get unread count: %w", err) 270 270 + if !errors.Is(err, sql.ErrNoRows) && err != nil { 271 271 + return 0, err 279 272 } 280 273 281 274 return count, nil

+145 -229

appview/db/pulls.go

··· 1 1 package db 2 2 3 3 import ( 4 4 + "cmp" 4 5 "database/sql" 6 6 + "errors" 5 7 "fmt" 6 6 - "log" 8 8 + "maps" 9 9 + "slices" 7 10 "sort" 8 11 "strings" 9 12 "time" ··· 87 90 pull.ID = int(id) 88 91 89 92 _, err = tx.Exec(` 90 90 - insert into pull_submissions (pull_id, repo_at, round_number, patch, source_rev) 91 91 - values (?, ?, ?, ?, ?) 92 92 - `, pull.PullId, pull.RepoAt, 0, pull.Submissions[0].Patch, pull.Submissions[0].SourceRev) 93 93 + insert into pull_submissions (pull_at, round_number, patch, source_rev) 94 94 + values (?, ?, ?, ?) 95 95 + `, pull.PullAt(), 0, pull.Submissions[0].Patch, pull.Submissions[0].SourceRev) 93 96 return err 94 97 } 95 98 ··· 108 111 } 109 112 110 113 func GetPullsWithLimit(e Execer, limit int, filters ...filter) ([]*models.Pull, error) { 111 111 - pulls := make(map[int]*models.Pull) 114 114 + pulls := make(map[syntax.ATURI]*models.Pull) 112 115 113 116 var conditions []string 114 117 var args []any ··· 211 214 pull.ParentChangeId = parentChangeId.String 212 215 } 213 216 214 214 - pulls[pull.PullId] = &pull 217 217 + pulls[pull.PullAt()] = &pull 215 218 } 216 219 217 217 - // get latest round no. for each pull 218 218 - inClause := strings.TrimSuffix(strings.Repeat("?, ", len(pulls)), ", ") 219 219 - submissionsQuery := fmt.Sprintf(` 220 220 - select 221 221 - id, pull_id, round_number, patch, created, source_rev 222 222 - from 223 223 - pull_submissions 224 224 - where 225 225 - repo_at in (%s) and pull_id in (%s) 226 226 - `, inClause, inClause) 227 227 - 228 228 - args = make([]any, len(pulls)*2) 229 229 - idx := 0 220 220 + var pullAts []syntax.ATURI 230 221 for _, p := range pulls { 231 231 - args[idx] = p.RepoAt 232 232 - idx += 1 222 222 + pullAts = append(pullAts, p.PullAt()) 233 223 } 234 234 - for _, p := range pulls { 235 235 - args[idx] = p.PullId 236 236 - idx += 1 237 237 - } 238 238 - submissionsRows, err := e.Query(submissionsQuery, args...) 224 224 + submissionsMap, err := GetPullSubmissions(e, FilterIn("pull_at", pullAts)) 239 225 if err != nil { 240 240 - return nil, err 226 226 + return nil, fmt.Errorf("failed to get submissions: %w", err) 241 227 } 242 242 - defer submissionsRows.Close() 243 228 244 244 - for submissionsRows.Next() { 245 245 - var s models.PullSubmission 246 246 - var sourceRev sql.NullString 247 247 - var createdAt string 248 248 - err := submissionsRows.Scan( 249 249 - &s.ID, 250 250 - &s.PullId, 251 251 - &s.RoundNumber, 252 252 - &s.Patch, 253 253 - &createdAt, 254 254 - &sourceRev, 255 255 - ) 256 256 - if err != nil { 257 257 - return nil, err 229 229 + for pullAt, submissions := range submissionsMap { 230 230 + if p, ok := pulls[pullAt]; ok { 231 231 + p.Submissions = submissions 258 232 } 233 233 + } 259 234 260 260 - createdTime, err := time.Parse(time.RFC3339, createdAt) 261 261 - if err != nil { 262 262 - return nil, err 235 235 + // collect allLabels for each issue 236 236 + allLabels, err := GetLabels(e, FilterIn("subject", pullAts)) 237 237 + if err != nil { 238 238 + return nil, fmt.Errorf("failed to query labels: %w", err) 239 239 + } 240 240 + for pullAt, labels := range allLabels { 241 241 + if p, ok := pulls[pullAt]; ok { 242 242 + p.Labels = labels 263 243 } 264 264 - s.Created = createdTime 244 244 + } 265 245 266 266 - if sourceRev.Valid { 267 267 - s.SourceRev = sourceRev.String 246 246 + // collect pull source for all pulls that need it 247 247 + var sourceAts []syntax.ATURI 248 248 + for _, p := range pulls { 249 249 + if p.PullSource != nil && p.PullSource.RepoAt != nil { 250 250 + sourceAts = append(sourceAts, *p.PullSource.RepoAt) 268 251 } 269 269 - 270 270 - if p, ok := pulls[s.PullId]; ok { 271 271 - p.Submissions = make([]*models.PullSubmission, s.RoundNumber+1) 272 272 - p.Submissions[s.RoundNumber] = &s 273 273 - } 252 252 + } 253 253 + sourceRepos, err := GetRepos(e, 0, FilterIn("at_uri", sourceAts)) 254 254 + if err != nil && !errors.Is(err, sql.ErrNoRows) { 255 255 + return nil, fmt.Errorf("failed to get source repos: %w", err) 274 256 } 275 275 - if err := rows.Err(); err != nil { 276 276 - return nil, err 257 257 + sourceRepoMap := make(map[syntax.ATURI]*models.Repo) 258 258 + for _, r := range sourceRepos { 259 259 + sourceRepoMap[r.RepoAt()] = &r 277 260 } 278 278 - 279 279 - // get comment count on latest submission on each pull 280 280 - inClause = strings.TrimSuffix(strings.Repeat("?, ", len(pulls)), ", ") 281 281 - commentsQuery := fmt.Sprintf(` 282 282 - select 283 283 - count(id), pull_id 284 284 - from 285 285 - pull_comments 286 286 - where 287 287 - submission_id in (%s) 288 288 - group by 289 289 - submission_id 290 290 - `, inClause) 291 291 - 292 292 - args = []any{} 293 261 for _, p := range pulls { 294 294 - args = append(args, p.Submissions[p.LastRoundNumber()].ID) 295 295 - } 296 296 - commentsRows, err := e.Query(commentsQuery, args...) 297 297 - if err != nil { 298 298 - return nil, err 299 299 - } 300 300 - defer commentsRows.Close() 301 301 - 302 302 - for commentsRows.Next() { 303 303 - var commentCount, pullId int 304 304 - err := commentsRows.Scan( 305 305 - &commentCount, 306 306 - &pullId, 307 307 - ) 308 308 - if err != nil { 309 309 - return nil, err 262 262 + if p.PullSource != nil && p.PullSource.RepoAt != nil { 263 263 + if sourceRepo, ok := sourceRepoMap[*p.PullSource.RepoAt]; ok { 264 264 + p.PullSource.Repo = sourceRepo 265 265 + } 310 266 } 311 311 - if p, ok := pulls[pullId]; ok { 312 312 - p.Submissions[p.LastRoundNumber()].Comments = make([]models.PullComment, commentCount) 313 313 - } 314 314 - } 315 315 - if err := rows.Err(); err != nil { 316 316 - return nil, err 317 267 } 318 268 319 269 orderedByPullId := []*models.Pull{} ··· 332 282 } 333 283 334 284 func GetPull(e Execer, repoAt syntax.ATURI, pullId int) (*models.Pull, error) { 335 335 - query := ` 336 336 - select 337 337 - id, 338 338 - owner_did, 339 339 - pull_id, 340 340 - created, 341 341 - title, 342 342 - state, 343 343 - target_branch, 344 344 - repo_at, 345 345 - body, 346 346 - rkey, 347 347 - source_branch, 348 348 - source_repo_at, 349 349 - stack_id, 350 350 - change_id, 351 351 - parent_change_id 352 352 - from 353 353 - pulls 354 354 - where 355 355 - repo_at = ? and pull_id = ? 356 356 - ` 357 357 - row := e.QueryRow(query, repoAt, pullId) 358 358 - 359 359 - var pull models.Pull 360 360 - var createdAt string 361 361 - var sourceBranch, sourceRepoAt, stackId, changeId, parentChangeId sql.NullString 362 362 - err := row.Scan( 363 363 - &pull.ID, 364 364 - &pull.OwnerDid, 365 365 - &pull.PullId, 366 366 - &createdAt, 367 367 - &pull.Title, 368 368 - &pull.State, 369 369 - &pull.TargetBranch, 370 370 - &pull.RepoAt, 371 371 - &pull.Body, 372 372 - &pull.Rkey, 373 373 - &sourceBranch, 374 374 - &sourceRepoAt, 375 375 - &stackId, 376 376 - &changeId, 377 377 - &parentChangeId, 378 378 - ) 285 285 + pulls, err := GetPullsWithLimit(e, 1, FilterEq("repo_at", repoAt), FilterEq("pull_id", pullId)) 379 286 if err != nil { 380 287 return nil, err 381 288 } 382 382 - 383 383 - createdTime, err := time.Parse(time.RFC3339, createdAt) 384 384 - if err != nil { 385 385 - return nil, err 289 289 + if pulls == nil { 290 290 + return nil, sql.ErrNoRows 386 291 } 387 387 - pull.Created = createdTime 388 292 389 389 - // populate source 390 390 - if sourceBranch.Valid { 391 391 - pull.PullSource = &models.PullSource{ 392 392 - Branch: sourceBranch.String, 393 393 - } 394 394 - if sourceRepoAt.Valid { 395 395 - sourceRepoAtParsed, err := syntax.ParseATURI(sourceRepoAt.String) 396 396 - if err != nil { 397 397 - return nil, err 398 398 - } 399 399 - pull.PullSource.RepoAt = &sourceRepoAtParsed 400 400 - } 293 293 + return pulls[0], nil 294 294 + } 295 295 + 296 296 + // mapping from pull -> pull submissions 297 297 + func GetPullSubmissions(e Execer, filters ...filter) (map[syntax.ATURI][]*models.PullSubmission, error) { 298 298 + var conditions []string 299 299 + var args []any 300 300 + for _, filter := range filters { 301 301 + conditions = append(conditions, filter.Condition()) 302 302 + args = append(args, filter.Arg()...) 401 303 } 402 304 403 403 - if stackId.Valid { 404 404 - pull.StackId = stackId.String 405 405 - } 406 406 - if changeId.Valid { 407 407 - pull.ChangeId = changeId.String 408 408 - } 409 409 - if parentChangeId.Valid { 410 410 - pull.ParentChangeId = parentChangeId.String 305 305 + whereClause := "" 306 306 + if conditions != nil { 307 307 + whereClause = " where " + strings.Join(conditions, " and ") 411 308 } 412 309 413 413 - submissionsQuery := ` 310 310 + query := fmt.Sprintf(` 414 311 select 415 415 - id, pull_id, repo_at, round_number, patch, created, source_rev 312 312 + id, 313 313 + pull_at, 314 314 + round_number, 315 315 + patch, 316 316 + created, 317 317 + source_rev 416 318 from 417 319 pull_submissions 418 418 - where 419 419 - repo_at = ? and pull_id = ? 420 420 - ` 421 421 - submissionsRows, err := e.Query(submissionsQuery, repoAt, pullId) 320 320 + %s 321 321 + order by 322 322 + round_number asc 323 323 + `, whereClause) 324 324 + 325 325 + rows, err := e.Query(query, args...) 422 326 if err != nil { 423 327 return nil, err 424 328 } 425 425 - defer submissionsRows.Close() 329 329 + defer rows.Close() 426 330 427 427 - submissionsMap := make(map[int]*models.PullSubmission) 331 331 + submissionMap := make(map[int]*models.PullSubmission) 428 332 429 429 - for submissionsRows.Next() { 333 333 + for rows.Next() { 430 334 var submission models.PullSubmission 431 431 - var submissionCreatedStr string 432 432 - var submissionSourceRev sql.NullString 433 433 - err := submissionsRows.Scan( 335 335 + var createdAt string 336 336 + var sourceRev sql.NullString 337 337 + err := rows.Scan( 434 338 &submission.ID, 435 435 - &submission.PullId, 436 436 - &submission.RepoAt, 339 339 + &submission.PullAt, 437 340 &submission.RoundNumber, 438 341 &submission.Patch, 439 439 - &submissionCreatedStr, 440 440 - &submissionSourceRev, 342 342 + &createdAt, 343 343 + &sourceRev, 441 344 ) 442 345 if err != nil { 443 346 return nil, err 444 347 } 445 348 446 446 - submissionCreatedTime, err := time.Parse(time.RFC3339, submissionCreatedStr) 349 349 + createdTime, err := time.Parse(time.RFC3339, createdAt) 447 350 if err != nil { 448 351 return nil, err 449 352 } 450 450 - submission.Created = submissionCreatedTime 353 353 + submission.Created = createdTime 451 354 452 452 - if submissionSourceRev.Valid { 453 453 - submission.SourceRev = submissionSourceRev.String 355 355 + if sourceRev.Valid { 356 356 + submission.SourceRev = sourceRev.String 454 357 } 455 358 456 456 - submissionsMap[submission.ID] = &submission 359 359 + submissionMap[submission.ID] = &submission 360 360 + } 361 361 + 362 362 + if err := rows.Err(); err != nil { 363 363 + return nil, err 457 364 } 458 458 - if err = submissionsRows.Close(); err != nil { 365 365 + 366 366 + // Get comments for all submissions using GetPullComments 367 367 + submissionIds := slices.Collect(maps.Keys(submissionMap)) 368 368 + comments, err := GetPullComments(e, FilterIn("submission_id", submissionIds)) 369 369 + if err != nil { 459 370 return nil, err 460 371 } 461 461 - if len(submissionsMap) == 0 { 462 462 - return &pull, nil 372 372 + for _, comment := range comments { 373 373 + if submission, ok := submissionMap[comment.SubmissionId]; ok { 374 374 + submission.Comments = append(submission.Comments, comment) 375 375 + } 376 376 + } 377 377 + 378 378 + // group the submissions by pull_at 379 379 + m := make(map[syntax.ATURI][]*models.PullSubmission) 380 380 + for _, s := range submissionMap { 381 381 + m[s.PullAt] = append(m[s.PullAt], s) 463 382 } 464 383 384 384 + // sort each one by round number 385 385 + for _, s := range m { 386 386 + slices.SortFunc(s, func(a, b *models.PullSubmission) int { 387 387 + return cmp.Compare(a.RoundNumber, b.RoundNumber) 388 388 + }) 389 389 + } 390 390 + 391 391 + return m, nil 392 392 + } 393 393 + 394 394 + func GetPullComments(e Execer, filters ...filter) ([]models.PullComment, error) { 395 395 + var conditions []string 465 396 var args []any 466 466 - for k := range submissionsMap { 467 467 - args = append(args, k) 397 397 + for _, filter := range filters { 398 398 + conditions = append(conditions, filter.Condition()) 399 399 + args = append(args, filter.Arg()...) 468 400 } 469 469 - inClause := strings.TrimSuffix(strings.Repeat("?, ", len(submissionsMap)), ", ") 470 470 - commentsQuery := fmt.Sprintf(` 401 401 + 402 402 + whereClause := "" 403 403 + if conditions != nil { 404 404 + whereClause = " where " + strings.Join(conditions, " and ") 405 405 + } 406 406 + 407 407 + query := fmt.Sprintf(` 471 408 select 472 409 id, 473 410 pull_id, ··· 479 416 created 480 417 from 481 418 pull_comments 482 482 - where 483 483 - submission_id IN (%s) 419 419 + %s 484 420 order by 485 421 created asc 486 486 - `, inClause) 487 487 - commentsRows, err := e.Query(commentsQuery, args...) 422 422 + `, whereClause) 423 423 + 424 424 + rows, err := e.Query(query, args...) 488 425 if err != nil { 489 426 return nil, err 490 427 } 491 491 - defer commentsRows.Close() 428 428 + defer rows.Close() 492 429 493 493 - for commentsRows.Next() { 430 430 + var comments []models.PullComment 431 431 + for rows.Next() { 494 432 var comment models.PullComment 495 495 - var commentCreatedStr string 496 496 - err := commentsRows.Scan( 433 433 + var createdAt string 434 434 + err := rows.Scan( 497 435 &comment.ID, 498 436 &comment.PullId, 499 437 &comment.SubmissionId, ··· 501 439 &comment.OwnerDid, 502 440 &comment.CommentAt, 503 441 &comment.Body, 504 504 - &commentCreatedStr, 442 442 + &createdAt, 505 443 ) 506 444 if err != nil { 507 445 return nil, err 508 446 } 509 447 510 510 - commentCreatedTime, err := time.Parse(time.RFC3339, commentCreatedStr) 511 511 - if err != nil { 512 512 - return nil, err 448 448 + if t, err := time.Parse(time.RFC3339, createdAt); err == nil { 449 449 + comment.Created = t 513 450 } 514 514 - comment.Created = commentCreatedTime 515 451 516 516 - // Add the comment to its submission 517 517 - if submission, ok := submissionsMap[comment.SubmissionId]; ok { 518 518 - submission.Comments = append(submission.Comments, comment) 519 519 - } 452 452 + comments = append(comments, comment) 453 453 + } 520 454 521 521 - } 522 522 - if err = commentsRows.Err(); err != nil { 455 455 + if err := rows.Err(); err != nil { 523 456 return nil, err 524 457 } 525 458 526 526 - var pullSourceRepo *models.Repo 527 527 - if pull.PullSource != nil { 528 528 - if pull.PullSource.RepoAt != nil { 529 529 - pullSourceRepo, err = GetRepoByAtUri(e, pull.PullSource.RepoAt.String()) 530 530 - if err != nil { 531 531 - log.Printf("failed to get repo by at uri: %v", err) 532 532 - } else { 533 533 - pull.PullSource.Repo = pullSourceRepo 534 534 - } 535 535 - } 536 536 - } 537 537 - 538 538 - pull.Submissions = make([]*models.PullSubmission, len(submissionsMap)) 539 539 - for _, submission := range submissionsMap { 540 540 - pull.Submissions[submission.RoundNumber] = submission 541 541 - } 542 542 - 543 543 - return &pull, nil 459 459 + return comments, nil 544 460 } 545 461 546 462 // timeframe here is directly passed into the sql query filter, and any ··· 677 593 func ResubmitPull(e Execer, pull *models.Pull, newPatch, sourceRev string) error { 678 594 newRoundNumber := len(pull.Submissions) 679 595 _, err := e.Exec(` 680 680 - insert into pull_submissions (pull_id, repo_at, round_number, patch, source_rev) 681 681 - values (?, ?, ?, ?, ?) 682 682 - `, pull.PullId, pull.RepoAt, newRoundNumber, newPatch, sourceRev) 596 596 + insert into pull_submissions (pull_at, round_number, patch, source_rev) 597 597 + values (?, ?, ?, ?) 598 598 + `, pull.PullAt(), newRoundNumber, newPatch, sourceRev) 683 599 684 600 return err 685 601 }

+34 -7

appview/db/reaction.go

··· 62 62 return count, nil 63 63 } 64 64 65 65 - func GetReactionCountMap(e Execer, threadAt syntax.ATURI) (map[models.ReactionKind]int, error) { 66 66 - countMap := map[models.ReactionKind]int{} 65 65 + func GetReactionMap(e Execer, userLimit int, threadAt syntax.ATURI) (map[models.ReactionKind]models.ReactionDisplayData, error) { 66 66 + query := ` 67 67 + select kind, reacted_by_did, 68 68 + row_number() over (partition by kind order by created asc) as rn, 69 69 + count(*) over (partition by kind) as total 70 70 + from reactions 71 71 + where thread_at = ? 72 72 + order by kind, created asc` 73 73 + 74 74 + rows, err := e.Query(query, threadAt) 75 75 + if err != nil { 76 76 + return nil, err 77 77 + } 78 78 + defer rows.Close() 79 79 + 80 80 + reactionMap := map[models.ReactionKind]models.ReactionDisplayData{} 67 81 for _, kind := range models.OrderedReactionKinds { 68 68 - count, err := GetReactionCount(e, threadAt, kind) 69 69 - if err != nil { 70 70 - return map[models.ReactionKind]int{}, nil 82 82 + reactionMap[kind] = models.ReactionDisplayData{Count: 0, Users: []string{}} 83 83 + } 84 84 + 85 85 + for rows.Next() { 86 86 + var kind models.ReactionKind 87 87 + var did string 88 88 + var rn, total int 89 89 + if err := rows.Scan(&kind, &did, &rn, &total); err != nil { 90 90 + return nil, err 71 91 } 72 72 - countMap[kind] = count 92 92 + 93 93 + data := reactionMap[kind] 94 94 + data.Count = total 95 95 + if userLimit > 0 && rn <= userLimit { 96 96 + data.Users = append(data.Users, did) 97 97 + } 98 98 + reactionMap[kind] = data 73 99 } 74 74 - return countMap, nil 100 100 + 101 101 + return reactionMap, rows.Err() 75 102 } 76 103 77 104 func GetReactionStatus(e Execer, userDid string, threadAt syntax.ATURI, kind models.ReactionKind) bool {

+38 -10

appview/db/timeline.go

··· 9 9 10 10 // TODO: this gathers heterogenous events from different sources and aggregates 11 11 // them in code; if we did this entirely in sql, we could order and limit and paginate easily 12 12 - func MakeTimeline(e Execer, limit int, loggedInUserDid string) ([]models.TimelineEvent, error) { 12 12 + func MakeTimeline(e Execer, limit int, loggedInUserDid string, limitToUsersIsFollowing bool) ([]models.TimelineEvent, error) { 13 13 var events []models.TimelineEvent 14 14 15 15 - repos, err := getTimelineRepos(e, limit, loggedInUserDid) 15 15 + var userIsFollowing []string 16 16 + if limitToUsersIsFollowing { 17 17 + following, err := GetFollowing(e, loggedInUserDid) 18 18 + if err != nil { 19 19 + return nil, err 20 20 + } 21 21 + 22 22 + userIsFollowing = make([]string, 0, len(following)) 23 23 + for _, follow := range following { 24 24 + userIsFollowing = append(userIsFollowing, follow.SubjectDid) 25 25 + } 26 26 + } 27 27 + 28 28 + repos, err := getTimelineRepos(e, limit, loggedInUserDid, userIsFollowing) 16 29 if err != nil { 17 30 return nil, err 18 31 } 19 32 20 20 - stars, err := getTimelineStars(e, limit, loggedInUserDid) 33 33 + stars, err := getTimelineStars(e, limit, loggedInUserDid, userIsFollowing) 21 34 if err != nil { 22 35 return nil, err 23 36 } 24 37 25 25 - follows, err := getTimelineFollows(e, limit, loggedInUserDid) 38 38 + follows, err := getTimelineFollows(e, limit, loggedInUserDid, userIsFollowing) 26 39 if err != nil { 27 40 return nil, err 28 41 } ··· 70 83 return isStarred, starCount 71 84 } 72 85 73 73 - func getTimelineRepos(e Execer, limit int, loggedInUserDid string) ([]models.TimelineEvent, error) { 74 74 - repos, err := GetRepos(e, limit) 86 86 + func getTimelineRepos(e Execer, limit int, loggedInUserDid string, userIsFollowing []string) ([]models.TimelineEvent, error) { 87 87 + filters := make([]filter, 0) 88 88 + if userIsFollowing != nil { 89 89 + filters = append(filters, FilterIn("did", userIsFollowing)) 90 90 + } 91 91 + 92 92 + repos, err := GetRepos(e, limit, filters...) 75 93 if err != nil { 76 94 return nil, err 77 95 } ··· 125 143 return events, nil 126 144 } 127 145 128 128 - func getTimelineStars(e Execer, limit int, loggedInUserDid string) ([]models.TimelineEvent, error) { 129 129 - stars, err := GetStars(e, limit) 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)) 150 150 + } 151 151 + 152 152 + stars, err := GetStars(e, limit, filters...) 130 153 if err != nil { 131 154 return nil, err 132 155 } ··· 166 189 return events, nil 167 190 } 168 191 169 169 - func getTimelineFollows(e Execer, limit int, loggedInUserDid string) ([]models.TimelineEvent, error) { 170 170 - follows, err := GetFollows(e, limit) 192 192 + func getTimelineFollows(e Execer, limit int, loggedInUserDid string, userIsFollowing []string) ([]models.TimelineEvent, error) { 193 193 + filters := make([]filter, 0) 194 194 + if userIsFollowing != nil { 195 195 + filters = append(filters, FilterIn("user_did", userIsFollowing)) 196 196 + } 197 197 + 198 198 + follows, err := GetFollows(e, limit, filters...) 171 199 if err != nil { 172 200 return nil, err 173 201 }

+18 -14

appview/issues/issues.go

··· 12 12 "time" 13 13 14 14 comatproto "github.com/bluesky-social/indigo/api/atproto" 15 15 + atpclient "github.com/bluesky-social/indigo/atproto/client" 15 16 "github.com/bluesky-social/indigo/atproto/syntax" 16 17 lexutil "github.com/bluesky-social/indigo/lex/util" 17 18 "github.com/go-chi/chi/v5" ··· 26 27 "tangled.org/core/appview/pagination" 27 28 "tangled.org/core/appview/reporesolver" 28 29 "tangled.org/core/appview/validator" 29 29 - "tangled.org/core/appview/xrpcclient" 30 30 "tangled.org/core/idresolver" 31 31 tlog "tangled.org/core/log" 32 32 "tangled.org/core/tid" ··· 83 83 return 84 84 } 85 85 86 86 - reactionCountMap, err := db.GetReactionCountMap(rp.db, issue.AtUri()) 86 86 + reactionMap, err := db.GetReactionMap(rp.db, 20, issue.AtUri()) 87 87 if err != nil { 88 88 l.Error("failed to get issue reactions", "err", err) 89 89 } ··· 115 115 Issue: issue, 116 116 CommentList: issue.CommentList(), 117 117 OrderedReactionKinds: models.OrderedReactionKinds, 118 118 - Reactions: reactionCountMap, 118 118 + Reactions: reactionMap, 119 119 UserReacted: userReactions, 120 120 LabelDefs: defs, 121 121 }) ··· 166 166 return 167 167 } 168 168 169 169 - ex, err := client.RepoGetRecord(r.Context(), "", tangled.RepoIssueNSID, user.Did, newIssue.Rkey) 169 169 + ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoIssueNSID, user.Did, newIssue.Rkey) 170 170 if err != nil { 171 171 l.Error("failed to get record", "err", err) 172 172 rp.pages.Notice(w, noticeId, "Failed to edit issue, no record found on PDS.") 173 173 return 174 174 } 175 175 176 176 - _, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 176 176 + _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 177 177 Collection: tangled.RepoIssueNSID, 178 178 Repo: user.Did, 179 179 Rkey: newIssue.Rkey, ··· 241 241 rp.pages.Notice(w, "issue-comment", "Failed to delete comment.") 242 242 return 243 243 } 244 244 - _, err = client.RepoDeleteRecord(r.Context(), &comatproto.RepoDeleteRecord_Input{ 244 244 + _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 245 245 Collection: tangled.RepoIssueNSID, 246 246 Repo: issue.Did, 247 247 Rkey: issue.Rkey, ··· 408 408 } 409 409 410 410 // create a record first 411 411 - resp, err := client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 411 411 + resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 412 412 Collection: tangled.RepoIssueCommentNSID, 413 413 Repo: comment.Did, 414 414 Rkey: comment.Rkey, ··· 559 559 // rkey is optional, it was introduced later 560 560 if newComment.Rkey != "" { 561 561 // update the record on pds 562 562 - ex, err := client.RepoGetRecord(r.Context(), "", tangled.RepoIssueCommentNSID, user.Did, comment.Rkey) 562 562 + ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoIssueCommentNSID, user.Did, comment.Rkey) 563 563 if err != nil { 564 564 log.Println("failed to get record", "err", err, "did", newComment.Did, "rkey", newComment.Rkey) 565 565 rp.pages.Notice(w, fmt.Sprintf("comment-%s-status", commentId), "Failed to update description, no record found on PDS.") 566 566 return 567 567 } 568 568 569 569 - _, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 569 569 + _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 570 570 Collection: tangled.RepoIssueCommentNSID, 571 571 Repo: user.Did, 572 572 Rkey: newComment.Rkey, ··· 733 733 rp.pages.Notice(w, "issue-comment", "Failed to delete comment.") 734 734 return 735 735 } 736 736 - _, err = client.RepoDeleteRecord(r.Context(), &comatproto.RepoDeleteRecord_Input{ 736 736 + _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 737 737 Collection: tangled.RepoIssueCommentNSID, 738 738 Repo: user.Did, 739 739 Rkey: comment.Rkey, ··· 798 798 return 799 799 } 800 800 801 801 - labelDefs, err := db.GetLabelDefinitions(rp.db, db.FilterIn("at_uri", f.Repo.Labels)) 801 801 + labelDefs, err := db.GetLabelDefinitions( 802 802 + rp.db, 803 803 + db.FilterIn("at_uri", f.Repo.Labels), 804 804 + db.FilterContains("scope", tangled.RepoIssueNSID), 805 805 + ) 802 806 if err != nil { 803 807 log.Println("failed to fetch labels", err) 804 808 rp.pages.Error503(w) ··· 861 865 rp.pages.Notice(w, "issues", "Failed to create issue.") 862 866 return 863 867 } 864 864 - resp, err := client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 868 868 + resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 865 869 Collection: tangled.RepoIssueNSID, 866 870 Repo: user.Did, 867 871 Rkey: issue.Rkey, ··· 919 923 // this is used to rollback changes made to the PDS 920 924 // 921 925 // it is a no-op if the provided ATURI is empty 922 922 - func rollbackRecord(ctx context.Context, aturi string, xrpcc *xrpcclient.Client) error { 926 926 + func rollbackRecord(ctx context.Context, aturi string, client *atpclient.APIClient) error { 923 927 if aturi == "" { 924 928 return nil 925 929 } ··· 930 934 repo := parsed.Authority().String() 931 935 rkey := parsed.RecordKey().String() 932 936 933 933 - _, err := xrpcc.RepoDeleteRecord(ctx, &comatproto.RepoDeleteRecord_Input{ 937 937 + _, err := comatproto.RepoDeleteRecord(ctx, client, &comatproto.RepoDeleteRecord_Input{ 934 938 Collection: collection, 935 939 Repo: repo, 936 940 Rkey: rkey,

+6 -6

appview/knots/knots.go

··· 185 185 return 186 186 } 187 187 188 188 - ex, _ := client.RepoGetRecord(r.Context(), "", tangled.KnotNSID, user.Did, domain) 188 188 + ex, _ := comatproto.RepoGetRecord(r.Context(), client, "", tangled.KnotNSID, user.Did, domain) 189 189 var exCid *string 190 190 if ex != nil { 191 191 exCid = ex.Cid 192 192 } 193 193 194 194 // re-announce by registering under same rkey 195 195 - _, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 195 195 + _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 196 196 Collection: tangled.KnotNSID, 197 197 Repo: user.Did, 198 198 Rkey: domain, ··· 323 323 return 324 324 } 325 325 326 326 - _, err = client.RepoDeleteRecord(r.Context(), &comatproto.RepoDeleteRecord_Input{ 326 326 + _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 327 327 Collection: tangled.KnotNSID, 328 328 Repo: user.Did, 329 329 Rkey: domain, ··· 431 431 return 432 432 } 433 433 434 434 - ex, _ := client.RepoGetRecord(r.Context(), "", tangled.KnotNSID, user.Did, domain) 434 434 + ex, _ := comatproto.RepoGetRecord(r.Context(), client, "", tangled.KnotNSID, user.Did, domain) 435 435 var exCid *string 436 436 if ex != nil { 437 437 exCid = ex.Cid 438 438 } 439 439 440 440 // ignore the error here 441 441 - _, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 441 441 + _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 442 442 Collection: tangled.KnotNSID, 443 443 Repo: user.Did, 444 444 Rkey: domain, ··· 555 555 556 556 rkey := tid.TID() 557 557 558 558 - _, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 558 558 + _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 559 559 Collection: tangled.KnotMemberNSID, 560 560 Repo: user.Did, 561 561 Rkey: rkey,

+9 -9

appview/labels/labels.go

··· 9 9 "net/http" 10 10 "time" 11 11 12 12 - comatproto "github.com/bluesky-social/indigo/api/atproto" 13 13 - "github.com/bluesky-social/indigo/atproto/syntax" 14 14 - lexutil "github.com/bluesky-social/indigo/lex/util" 15 15 - "github.com/go-chi/chi/v5" 16 16 - 17 12 "tangled.org/core/api/tangled" 18 13 "tangled.org/core/appview/db" 19 14 "tangled.org/core/appview/middleware" ··· 21 16 "tangled.org/core/appview/oauth" 22 17 "tangled.org/core/appview/pages" 23 18 "tangled.org/core/appview/validator" 24 24 - "tangled.org/core/appview/xrpcclient" 25 19 "tangled.org/core/log" 26 20 "tangled.org/core/rbac" 27 21 "tangled.org/core/tid" 22 22 + 23 23 + comatproto "github.com/bluesky-social/indigo/api/atproto" 24 24 + atpclient "github.com/bluesky-social/indigo/atproto/client" 25 25 + "github.com/bluesky-social/indigo/atproto/syntax" 26 26 + lexutil "github.com/bluesky-social/indigo/lex/util" 27 27 + "github.com/go-chi/chi/v5" 28 28 ) 29 29 30 30 type Labels struct { ··· 196 196 return 197 197 } 198 198 199 199 - resp, err := client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 199 199 + resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 200 200 Collection: tangled.LabelOpNSID, 201 201 Repo: did, 202 202 Rkey: rkey, ··· 252 252 // this is used to rollback changes made to the PDS 253 253 // 254 254 // it is a no-op if the provided ATURI is empty 255 255 - func rollbackRecord(ctx context.Context, aturi string, xrpcc *xrpcclient.Client) error { 255 255 + func rollbackRecord(ctx context.Context, aturi string, client *atpclient.APIClient) error { 256 256 if aturi == "" { 257 257 return nil 258 258 } ··· 263 263 repo := parsed.Authority().String() 264 264 rkey := parsed.RecordKey().String() 265 265 266 266 - _, err := xrpcc.RepoDeleteRecord(ctx, &comatproto.RepoDeleteRecord_Input{ 266 266 + _, err := comatproto.RepoDeleteRecord(ctx, client, &comatproto.RepoDeleteRecord_Input{ 267 267 Collection: collection, 268 268 Repo: repo, 269 269 Rkey: rkey,

+5 -14

appview/middleware/middleware.go

··· 43 43 44 44 type middlewareFunc func(http.Handler) http.Handler 45 45 46 46 - func (mw *Middleware) TryRefreshSession() middlewareFunc { 47 47 - return func(next http.Handler) http.Handler { 48 48 - return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { 49 49 - _, _, _ = mw.oauth.GetSession(r) 50 50 - next.ServeHTTP(w, r) 51 51 - }) 52 52 - } 53 53 - } 54 54 - 55 55 - func AuthMiddleware(a *oauth.OAuth) middlewareFunc { 46 46 + func AuthMiddleware(o *oauth.OAuth) middlewareFunc { 56 47 return func(next http.Handler) http.Handler { 57 48 return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { 58 49 returnURL := "/" ··· 72 63 } 73 64 } 74 65 75 75 - _, auth, err := a.GetSession(r) 66 66 + sess, err := o.ResumeSession(r) 76 67 if err != nil { 77 77 - log.Println("not logged in, redirecting", "err", err) 68 68 + log.Println("failed to resume session, redirecting...", "err", err, "url", r.URL.String()) 78 69 redirectFunc(w, r) 79 70 return 80 71 } 81 72 82 82 - if !auth { 83 83 - log.Printf("not logged in, redirecting") 73 73 + if sess == nil { 74 74 + log.Printf("session is nil, redirecting...") 84 75 redirectFunc(w, r) 85 76 return 86 77 }

+14 -13

appview/models/label.go

··· 461 461 return result 462 462 } 463 463 464 464 + var ( 465 465 + LabelWontfix = fmt.Sprintf("at://%s/%s/%s", consts.TangledDid, tangled.LabelDefinitionNSID, "wontfix") 466 466 + LabelDuplicate = fmt.Sprintf("at://%s/%s/%s", consts.TangledDid, tangled.LabelDefinitionNSID, "duplicate") 467 467 + LabelAssignee = fmt.Sprintf("at://%s/%s/%s", consts.TangledDid, tangled.LabelDefinitionNSID, "assignee") 468 468 + LabelGoodFirstIssue = fmt.Sprintf("at://%s/%s/%s", consts.TangledDid, tangled.LabelDefinitionNSID, "good-first-issue") 469 469 + LabelDocumentation = fmt.Sprintf("at://%s/%s/%s", consts.TangledDid, tangled.LabelDefinitionNSID, "documentation") 470 470 + ) 471 471 + 464 472 func DefaultLabelDefs() []string { 465 465 - rkeys := []string{ 466 466 - "wontfix", 467 467 - "duplicate", 468 468 - "assignee", 469 469 - "good-first-issue", 470 470 - "documentation", 473 473 + return []string{ 474 474 + LabelWontfix, 475 475 + LabelDuplicate, 476 476 + LabelAssignee, 477 477 + LabelGoodFirstIssue, 478 478 + LabelDocumentation, 471 479 } 472 472 - 473 473 - defs := make([]string, len(rkeys)) 474 474 - for i, r := range rkeys { 475 475 - defs[i] = fmt.Sprintf("at://%s/%s/%s", consts.TangledDid, tangled.LabelDefinitionNSID, r) 476 476 - } 477 477 - 478 478 - return defs 479 480 } 480 481 481 482 func FetchDefaultDefs(r *idresolver.Resolver) ([]LabelDefinition, error) {

+29 -1

appview/models/notifications.go

··· 1 1 package models 2 2 3 3 - import "time" 3 3 + import ( 4 4 + "time" 5 5 + ) 4 6 5 7 type NotificationType string 6 8 ··· 30 32 RepoId *int64 31 33 IssueId *int64 32 34 PullId *int64 35 35 + } 36 36 + 37 37 + // lucide icon that represents this notification 38 38 + func (n *Notification) Icon() string { 39 39 + switch n.Type { 40 40 + case NotificationTypeRepoStarred: 41 41 + return "star" 42 42 + case NotificationTypeIssueCreated: 43 43 + return "circle-dot" 44 44 + case NotificationTypeIssueCommented: 45 45 + return "message-square" 46 46 + case NotificationTypeIssueClosed: 47 47 + return "ban" 48 48 + case NotificationTypePullCreated: 49 49 + return "git-pull-request-create" 50 50 + case NotificationTypePullCommented: 51 51 + return "message-square" 52 52 + case NotificationTypePullMerged: 53 53 + return "git-merge" 54 54 + case NotificationTypePullClosed: 55 55 + return "git-pull-request-closed" 56 56 + case NotificationTypeFollowed: 57 57 + return "user-plus" 58 58 + default: 59 59 + return "" 60 60 + } 33 61 } 34 62 35 63 type NotificationWithEntity struct {

+51 -4

appview/models/pull.go

··· 77 77 PullSource *PullSource 78 78 79 79 // optionally, populate this when querying for reverse mappings 80 80 - Repo *Repo 80 80 + Labels LabelState 81 81 + Repo *Repo 81 82 } 82 83 83 84 func (p Pull) AsRecord() tangled.RepoPull { ··· 125 126 126 127 type PullSubmission struct { 127 128 // ids 128 128 - ID int 129 129 - PullId int 129 129 + ID int 130 130 131 131 // at ids 132 132 - RepoAt syntax.ATURI 132 132 + PullAt syntax.ATURI 133 133 134 134 // content 135 135 RoundNumber int ··· 207 207 return p.StackId != "" 208 208 } 209 209 210 210 + func (p *Pull) Participants() []string { 211 211 + participantSet := make(map[string]struct{}) 212 212 + participants := []string{} 213 213 + 214 214 + addParticipant := func(did string) { 215 215 + if _, exists := participantSet[did]; !exists { 216 216 + participantSet[did] = struct{}{} 217 217 + participants = append(participants, did) 218 218 + } 219 219 + } 220 220 + 221 221 + addParticipant(p.OwnerDid) 222 222 + 223 223 + for _, s := range p.Submissions { 224 224 + for _, sp := range s.Participants() { 225 225 + addParticipant(sp) 226 226 + } 227 227 + } 228 228 + 229 229 + return participants 230 230 + } 231 231 + 210 232 func (s PullSubmission) IsFormatPatch() bool { 211 233 return patchutil.IsFormatPatch(s.Patch) 212 234 } ··· 219 241 } 220 242 221 243 return patches 244 244 + } 245 245 + 246 246 + func (s *PullSubmission) Participants() []string { 247 247 + participantSet := make(map[string]struct{}) 248 248 + participants := []string{} 249 249 + 250 250 + addParticipant := func(did string) { 251 251 + if _, exists := participantSet[did]; !exists { 252 252 + participantSet[did] = struct{}{} 253 253 + participants = append(participants, did) 254 254 + } 255 255 + } 256 256 + 257 257 + addParticipant(s.PullAt.Authority().String()) 258 258 + 259 259 + for _, c := range s.Comments { 260 260 + addParticipant(c.OwnerDid) 261 261 + } 262 262 + 263 263 + return participants 222 264 } 223 265 224 266 type Stack []*Pull ··· 308 350 309 351 return mergeable 310 352 } 353 353 + 354 354 + type BranchDeleteStatus struct { 355 355 + Repo *Repo 356 356 + Branch string 357 357 + }

+5

appview/models/reaction.go

··· 55 55 Rkey string 56 56 Kind ReactionKind 57 57 } 58 58 + 59 59 + type ReactionDisplayData struct { 60 60 + Count int 61 61 + Users []string 62 62 + }

+5

appview/models/repo.go

··· 86 86 RepoAt syntax.ATURI 87 87 LabelAt syntax.ATURI 88 88 } 89 89 + 90 90 + type RepoGroup struct { 91 91 + Repo *Repo 92 92 + Issues []Issue 93 93 + }

+41 -48

appview/notifications/notifications.go

··· 10 10 "tangled.org/core/appview/middleware" 11 11 "tangled.org/core/appview/oauth" 12 12 "tangled.org/core/appview/pages" 13 13 + "tangled.org/core/appview/pagination" 13 14 ) 14 15 15 16 type Notifications struct { ··· 29 30 func (n *Notifications) Router(mw *middleware.Middleware) http.Handler { 30 31 r := chi.NewRouter() 31 32 32 32 - r.Use(middleware.AuthMiddleware(n.oauth)) 33 33 + r.Get("/count", n.getUnreadCount) 33 34 34 34 - r.Get("/", n.notificationsPage) 35 35 - 36 36 - r.Get("/count", n.getUnreadCount) 37 37 - r.Post("/{id}/read", n.markRead) 38 38 - r.Post("/read-all", n.markAllRead) 39 39 - r.Delete("/{id}", n.deleteNotification) 35 35 + r.Group(func(r chi.Router) { 36 36 + r.Use(middleware.AuthMiddleware(n.oauth)) 37 37 + r.With(middleware.Paginate).Get("/", n.notificationsPage) 38 38 + r.Post("/{id}/read", n.markRead) 39 39 + r.Post("/read-all", n.markAllRead) 40 40 + r.Delete("/{id}", n.deleteNotification) 41 41 + }) 40 42 41 43 return r 42 44 } 43 45 44 46 func (n *Notifications) notificationsPage(w http.ResponseWriter, r *http.Request) { 45 45 - userDid := n.oauth.GetDid(r) 47 47 + user := n.oauth.GetUser(r) 46 48 47 47 - limitStr := r.URL.Query().Get("limit") 48 48 - offsetStr := r.URL.Query().Get("offset") 49 49 - 50 50 - limit := 20 // default 51 51 - if limitStr != "" { 52 52 - if l, err := strconv.Atoi(limitStr); err == nil && l > 0 && l <= 100 { 53 53 - limit = l 54 54 - } 49 49 + page, ok := r.Context().Value("page").(pagination.Page) 50 50 + if !ok { 51 51 + log.Println("failed to get page") 52 52 + page = pagination.FirstPage() 55 53 } 56 54 57 57 - offset := 0 // default 58 58 - if offsetStr != "" { 59 59 - if o, err := strconv.Atoi(offsetStr); err == nil && o >= 0 { 60 60 - offset = o 61 61 - } 55 55 + total, err := db.CountNotifications( 56 56 + n.db, 57 57 + db.FilterEq("recipient_did", user.Did), 58 58 + ) 59 59 + if err != nil { 60 60 + log.Println("failed to get total notifications:", err) 61 61 + n.pages.Error500(w) 62 62 + return 62 63 } 63 64 64 64 - notifications, err := n.db.GetNotificationsWithEntities(r.Context(), userDid, limit+1, offset) 65 65 + notifications, err := db.GetNotificationsWithEntities( 66 66 + n.db, 67 67 + page, 68 68 + db.FilterEq("recipient_did", user.Did), 69 69 + ) 65 70 if err != nil { 66 71 log.Println("failed to get notifications:", err) 67 72 n.pages.Error500(w) 68 73 return 69 74 } 70 75 71 71 - hasMore := len(notifications) > limit 72 72 - if hasMore { 73 73 - notifications = notifications[:limit] 74 74 - } 75 75 - 76 76 - err = n.db.MarkAllNotificationsRead(r.Context(), userDid) 76 76 + err = n.db.MarkAllNotificationsRead(r.Context(), user.Did) 77 77 if err != nil { 78 78 log.Println("failed to mark notifications as read:", err) 79 79 } 80 80 81 81 unreadCount := 0 82 82 83 83 - user := n.oauth.GetUser(r) 84 84 - if user == nil { 85 85 - http.Error(w, "Failed to get user", http.StatusInternalServerError) 86 86 - return 87 87 - } 88 88 - 89 89 - params := pages.NotificationsParams{ 83 83 + n.pages.Notifications(w, pages.NotificationsParams{ 90 84 LoggedInUser: user, 91 85 Notifications: notifications, 92 86 UnreadCount: unreadCount, 93 93 - HasMore: hasMore, 94 94 - NextOffset: offset + limit, 95 95 - Limit: limit, 96 96 - } 97 97 - 98 98 - err = n.pages.Notifications(w, params) 99 99 - if err != nil { 100 100 - log.Println("failed to load notifs:", err) 101 101 - n.pages.Error500(w) 102 102 - return 103 103 - } 87 87 + Page: page, 88 88 + Total: total, 89 89 + }) 104 90 } 105 91 106 92 func (n *Notifications) getUnreadCount(w http.ResponseWriter, r *http.Request) { 107 107 - userDid := n.oauth.GetDid(r) 93 93 + user := n.oauth.GetUser(r) 94 94 + if user == nil { 95 95 + return 96 96 + } 108 97 109 109 - count, err := n.db.GetUnreadNotificationCount(r.Context(), userDid) 98 98 + count, err := db.CountNotifications( 99 99 + n.db, 100 100 + db.FilterEq("recipient_did", user.Did), 101 101 + db.FilterEq("read", 0), 102 102 + ) 110 103 if err != nil { 111 104 http.Error(w, "Failed to get unread count", http.StatusInternalServerError) 112 105 return

+8 -48

appview/notify/db/db.go

··· 30 30 31 31 func (n *databaseNotifier) NewStar(ctx context.Context, star *models.Star) { 32 32 var err error 33 33 - repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(star.RepoAt))) 33 33 + repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(star.RepoAt))) 34 34 if err != nil { 35 35 log.Printf("NewStar: failed to get repos: %v", err) 36 36 return 37 37 } 38 38 - if len(repos) == 0 { 39 39 - log.Printf("NewStar: no repo found for %s", star.RepoAt) 40 40 - return 41 41 - } 42 42 - repo := repos[0] 43 38 44 39 // don't notify yourself 45 40 if repo.Did == star.StarredByDid { ··· 76 71 } 77 72 78 73 func (n *databaseNotifier) NewIssue(ctx context.Context, issue *models.Issue) { 79 79 - repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(issue.RepoAt))) 74 74 + repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(issue.RepoAt))) 80 75 if err != nil { 81 76 log.Printf("NewIssue: failed to get repos: %v", err) 82 77 return 83 78 } 84 84 - if len(repos) == 0 { 85 85 - log.Printf("NewIssue: no repo found for %s", issue.RepoAt) 86 86 - return 87 87 - } 88 88 - repo := repos[0] 89 79 90 80 if repo.Did == issue.Did { 91 81 return ··· 129 119 } 130 120 issue := issues[0] 131 121 132 132 - repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(issue.RepoAt))) 122 122 + repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(issue.RepoAt))) 133 123 if err != nil { 134 124 log.Printf("NewIssueComment: failed to get repos: %v", err) 135 125 return 136 126 } 137 137 - if len(repos) == 0 { 138 138 - log.Printf("NewIssueComment: no repo found for %s", issue.RepoAt) 139 139 - return 140 140 - } 141 141 - repo := repos[0] 142 127 143 128 recipients := make(map[string]bool) 144 129 ··· 211 196 } 212 197 213 198 func (n *databaseNotifier) NewPull(ctx context.Context, pull *models.Pull) { 214 214 - repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(pull.RepoAt))) 199 199 + repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(pull.RepoAt))) 215 200 if err != nil { 216 201 log.Printf("NewPull: failed to get repos: %v", err) 217 202 return 218 203 } 219 219 - if len(repos) == 0 { 220 220 - log.Printf("NewPull: no repo found for %s", pull.RepoAt) 221 221 - return 222 222 - } 223 223 - repo := repos[0] 224 204 225 205 if repo.Did == pull.OwnerDid { 226 206 return ··· 266 246 } 267 247 pull := pulls[0] 268 248 269 269 - repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", comment.RepoAt)) 249 249 + repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", comment.RepoAt)) 270 250 if err != nil { 271 251 log.Printf("NewPullComment: failed to get repos: %v", err) 272 252 return 273 253 } 274 274 - if len(repos) == 0 { 275 275 - log.Printf("NewPullComment: no repo found for %s", comment.RepoAt) 276 276 - return 277 277 - } 278 278 - repo := repos[0] 279 254 280 255 recipients := make(map[string]bool) 281 256 ··· 335 310 336 311 func (n *databaseNotifier) NewIssueClosed(ctx context.Context, issue *models.Issue) { 337 312 // Get repo details 338 338 - repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(issue.RepoAt))) 313 313 + repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(issue.RepoAt))) 339 314 if err != nil { 340 315 log.Printf("NewIssueClosed: failed to get repos: %v", err) 341 316 return 342 317 } 343 343 - if len(repos) == 0 { 344 344 - log.Printf("NewIssueClosed: no repo found for %s", issue.RepoAt) 345 345 - return 346 346 - } 347 347 - repo := repos[0] 348 318 349 319 // Don't notify yourself 350 320 if repo.Did == issue.Did { ··· 380 350 381 351 func (n *databaseNotifier) NewPullMerged(ctx context.Context, pull *models.Pull) { 382 352 // Get repo details 383 383 - repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(pull.RepoAt))) 353 353 + repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(pull.RepoAt))) 384 354 if err != nil { 385 355 log.Printf("NewPullMerged: failed to get repos: %v", err) 386 356 return 387 357 } 388 388 - if len(repos) == 0 { 389 389 - log.Printf("NewPullMerged: no repo found for %s", pull.RepoAt) 390 390 - return 391 391 - } 392 392 - repo := repos[0] 393 358 394 359 // Don't notify yourself 395 360 if repo.Did == pull.OwnerDid { ··· 425 390 426 391 func (n *databaseNotifier) NewPullClosed(ctx context.Context, pull *models.Pull) { 427 392 // Get repo details 428 428 - repos, err := db.GetRepos(n.db, 1, db.FilterEq("at_uri", string(pull.RepoAt))) 393 393 + repo, err := db.GetRepo(n.db, db.FilterEq("at_uri", string(pull.RepoAt))) 429 394 if err != nil { 430 395 log.Printf("NewPullClosed: failed to get repos: %v", err) 431 396 return 432 397 } 433 433 - if len(repos) == 0 { 434 434 - log.Printf("NewPullClosed: no repo found for %s", pull.RepoAt) 435 435 - return 436 436 - } 437 437 - repo := repos[0] 438 398 439 399 // Don't notify yourself 440 400 if repo.Did == pull.OwnerDid {

-24

appview/oauth/client/oauth_client.go

··· 1 1 - package client 2 2 - 3 3 - import ( 4 4 - oauth "tangled.sh/icyphox.sh/atproto-oauth" 5 5 - "tangled.sh/icyphox.sh/atproto-oauth/helpers" 6 6 - ) 7 7 - 8 8 - type OAuthClient struct { 9 9 - *oauth.Client 10 10 - } 11 11 - 12 12 - func NewClient(clientId, clientJwk, redirectUri string) (*OAuthClient, error) { 13 13 - k, err := helpers.ParseJWKFromBytes([]byte(clientJwk)) 14 14 - if err != nil { 15 15 - return nil, err 16 16 - } 17 17 - 18 18 - cli, err := oauth.NewClient(oauth.ClientArgs{ 19 19 - ClientId: clientId, 20 20 - ClientJwk: k, 21 21 - RedirectUri: redirectUri, 22 22 - }) 23 23 - return &OAuthClient{cli}, err 24 24 - }

+2 -1

appview/oauth/consts.go

··· 1 1 package oauth 2 2 3 3 const ( 4 4 - SessionName = "appview-session" 4 4 + SessionName = "appview-session-v2" 5 5 SessionHandle = "handle" 6 6 SessionDid = "did" 7 7 + SessionId = "id" 7 8 SessionPds = "pds" 8 9 SessionAccessJwt = "accessJwt" 9 10 SessionRefreshJwt = "refreshJwt"

-538

appview/oauth/handler/handler.go

··· 1 1 - package oauth 2 2 - 3 3 - import ( 4 4 - "bytes" 5 5 - "context" 6 6 - "encoding/json" 7 7 - "fmt" 8 8 - "log" 9 9 - "net/http" 10 10 - "net/url" 11 11 - "slices" 12 12 - "strings" 13 13 - "time" 14 14 - 15 15 - "github.com/go-chi/chi/v5" 16 16 - "github.com/gorilla/sessions" 17 17 - "github.com/lestrrat-go/jwx/v2/jwk" 18 18 - "github.com/posthog/posthog-go" 19 19 - tangled "tangled.org/core/api/tangled" 20 20 - sessioncache "tangled.org/core/appview/cache/session" 21 21 - "tangled.org/core/appview/config" 22 22 - "tangled.org/core/appview/db" 23 23 - "tangled.org/core/appview/middleware" 24 24 - "tangled.org/core/appview/oauth" 25 25 - "tangled.org/core/appview/oauth/client" 26 26 - "tangled.org/core/appview/pages" 27 27 - "tangled.org/core/consts" 28 28 - "tangled.org/core/idresolver" 29 29 - "tangled.org/core/rbac" 30 30 - "tangled.org/core/tid" 31 31 - "tangled.sh/icyphox.sh/atproto-oauth/helpers" 32 32 - ) 33 33 - 34 34 - const ( 35 35 - oauthScope = "atproto transition:generic" 36 36 - ) 37 37 - 38 38 - type OAuthHandler struct { 39 39 - config *config.Config 40 40 - pages *pages.Pages 41 41 - idResolver *idresolver.Resolver 42 42 - sess *sessioncache.SessionStore 43 43 - db *db.DB 44 44 - store *sessions.CookieStore 45 45 - oauth *oauth.OAuth 46 46 - enforcer *rbac.Enforcer 47 47 - posthog posthog.Client 48 48 - } 49 49 - 50 50 - func New( 51 51 - config *config.Config, 52 52 - pages *pages.Pages, 53 53 - idResolver *idresolver.Resolver, 54 54 - db *db.DB, 55 55 - sess *sessioncache.SessionStore, 56 56 - store *sessions.CookieStore, 57 57 - oauth *oauth.OAuth, 58 58 - enforcer *rbac.Enforcer, 59 59 - posthog posthog.Client, 60 60 - ) *OAuthHandler { 61 61 - return &OAuthHandler{ 62 62 - config: config, 63 63 - pages: pages, 64 64 - idResolver: idResolver, 65 65 - db: db, 66 66 - sess: sess, 67 67 - store: store, 68 68 - oauth: oauth, 69 69 - enforcer: enforcer, 70 70 - posthog: posthog, 71 71 - } 72 72 - } 73 73 - 74 74 - func (o *OAuthHandler) Router() http.Handler { 75 75 - r := chi.NewRouter() 76 76 - 77 77 - r.Get("/login", o.login) 78 78 - r.Post("/login", o.login) 79 79 - 80 80 - r.With(middleware.AuthMiddleware(o.oauth)).Post("/logout", o.logout) 81 81 - 82 82 - r.Get("/oauth/client-metadata.json", o.clientMetadata) 83 83 - r.Get("/oauth/jwks.json", o.jwks) 84 84 - r.Get("/oauth/callback", o.callback) 85 85 - return r 86 86 - } 87 87 - 88 88 - func (o *OAuthHandler) clientMetadata(w http.ResponseWriter, r *http.Request) { 89 89 - w.Header().Set("Content-Type", "application/json") 90 90 - w.WriteHeader(http.StatusOK) 91 91 - json.NewEncoder(w).Encode(o.oauth.ClientMetadata()) 92 92 - } 93 93 - 94 94 - func (o *OAuthHandler) jwks(w http.ResponseWriter, r *http.Request) { 95 95 - jwks := o.config.OAuth.Jwks 96 96 - pubKey, err := pubKeyFromJwk(jwks) 97 97 - if err != nil { 98 98 - log.Printf("error parsing public key: %v", err) 99 99 - http.Error(w, err.Error(), http.StatusInternalServerError) 100 100 - return 101 101 - } 102 102 - 103 103 - response := helpers.CreateJwksResponseObject(pubKey) 104 104 - 105 105 - w.Header().Set("Content-Type", "application/json") 106 106 - w.WriteHeader(http.StatusOK) 107 107 - json.NewEncoder(w).Encode(response) 108 108 - } 109 109 - 110 110 - func (o *OAuthHandler) login(w http.ResponseWriter, r *http.Request) { 111 111 - switch r.Method { 112 112 - case http.MethodGet: 113 113 - returnURL := r.URL.Query().Get("return_url") 114 114 - o.pages.Login(w, pages.LoginParams{ 115 115 - ReturnUrl: returnURL, 116 116 - }) 117 117 - case http.MethodPost: 118 118 - handle := r.FormValue("handle") 119 119 - 120 120 - // when users copy their handle from bsky.app, it tends to have these characters around it: 121 121 - // 122 122 - // @nelind.dk: 123 123 - // \u202a ensures that the handle is always rendered left to right and 124 124 - // \u202c reverts that so the rest of the page renders however it should 125 125 - handle = strings.TrimPrefix(handle, "\u202a") 126 126 - handle = strings.TrimSuffix(handle, "\u202c") 127 127 - 128 128 - // `@` is harmless 129 129 - handle = strings.TrimPrefix(handle, "@") 130 130 - 131 131 - // basic handle validation 132 132 - if !strings.Contains(handle, ".") { 133 133 - log.Println("invalid handle format", "raw", handle) 134 134 - o.pages.Notice(w, "login-msg", fmt.Sprintf("\"%s\" is an invalid handle. Did you mean %s.bsky.social?", handle, handle)) 135 135 - return 136 136 - } 137 137 - 138 138 - resolved, err := o.idResolver.ResolveIdent(r.Context(), handle) 139 139 - if err != nil { 140 140 - log.Println("failed to resolve handle:", err) 141 141 - o.pages.Notice(w, "login-msg", fmt.Sprintf("\"%s\" is an invalid handle.", handle)) 142 142 - return 143 143 - } 144 144 - self := o.oauth.ClientMetadata() 145 145 - oauthClient, err := client.NewClient( 146 146 - self.ClientID, 147 147 - o.config.OAuth.Jwks, 148 148 - self.RedirectURIs[0], 149 149 - ) 150 150 - 151 151 - if err != nil { 152 152 - log.Println("failed to create oauth client:", err) 153 153 - o.pages.Notice(w, "login-msg", "Failed to authenticate. Try again later.") 154 154 - return 155 155 - } 156 156 - 157 157 - authServer, err := oauthClient.ResolvePdsAuthServer(r.Context(), resolved.PDSEndpoint()) 158 158 - if err != nil { 159 159 - log.Println("failed to resolve auth server:", err) 160 160 - o.pages.Notice(w, "login-msg", "Failed to authenticate. Try again later.") 161 161 - return 162 162 - } 163 163 - 164 164 - authMeta, err := oauthClient.FetchAuthServerMetadata(r.Context(), authServer) 165 165 - if err != nil { 166 166 - log.Println("failed to fetch auth server metadata:", err) 167 167 - o.pages.Notice(w, "login-msg", "Failed to authenticate. Try again later.") 168 168 - return 169 169 - } 170 170 - 171 171 - dpopKey, err := helpers.GenerateKey(nil) 172 172 - if err != nil { 173 173 - log.Println("failed to generate dpop key:", err) 174 174 - o.pages.Notice(w, "login-msg", "Failed to authenticate. Try again later.") 175 175 - return 176 176 - } 177 177 - 178 178 - dpopKeyJson, err := json.Marshal(dpopKey) 179 179 - if err != nil { 180 180 - log.Println("failed to marshal dpop key:", err) 181 181 - o.pages.Notice(w, "login-msg", "Failed to authenticate. Try again later.") 182 182 - return 183 183 - } 184 184 - 185 185 - parResp, err := oauthClient.SendParAuthRequest(r.Context(), authServer, authMeta, handle, oauthScope, dpopKey) 186 186 - if err != nil { 187 187 - log.Println("failed to send par auth request:", err) 188 188 - o.pages.Notice(w, "login-msg", "Failed to authenticate. Try again later.") 189 189 - return 190 190 - } 191 191 - 192 192 - err = o.sess.SaveRequest(r.Context(), sessioncache.OAuthRequest{ 193 193 - Did: resolved.DID.String(), 194 194 - PdsUrl: resolved.PDSEndpoint(), 195 195 - Handle: handle, 196 196 - AuthserverIss: authMeta.Issuer, 197 197 - PkceVerifier: parResp.PkceVerifier, 198 198 - DpopAuthserverNonce: parResp.DpopAuthserverNonce, 199 199 - DpopPrivateJwk: string(dpopKeyJson), 200 200 - State: parResp.State, 201 201 - ReturnUrl: r.FormValue("return_url"), 202 202 - }) 203 203 - if err != nil { 204 204 - log.Println("failed to save oauth request:", err) 205 205 - o.pages.Notice(w, "login-msg", "Failed to authenticate. Try again later.") 206 206 - return 207 207 - } 208 208 - 209 209 - u, _ := url.Parse(authMeta.AuthorizationEndpoint) 210 210 - query := url.Values{} 211 211 - query.Add("client_id", self.ClientID) 212 212 - query.Add("request_uri", parResp.RequestUri) 213 213 - u.RawQuery = query.Encode() 214 214 - o.pages.HxRedirect(w, u.String()) 215 215 - } 216 216 - } 217 217 - 218 218 - func (o *OAuthHandler) callback(w http.ResponseWriter, r *http.Request) { 219 219 - state := r.FormValue("state") 220 220 - 221 221 - oauthRequest, err := o.sess.GetRequestByState(r.Context(), state) 222 222 - if err != nil { 223 223 - log.Println("failed to get oauth request:", err) 224 224 - o.pages.Notice(w, "login-msg", "Failed to authenticate. Try again later.") 225 225 - return 226 226 - } 227 227 - 228 228 - defer func() { 229 229 - err := o.sess.DeleteRequestByState(r.Context(), state) 230 230 - if err != nil { 231 231 - log.Println("failed to delete oauth request for state:", state, err) 232 232 - } 233 233 - }() 234 234 - 235 235 - error := r.FormValue("error") 236 236 - errorDescription := r.FormValue("error_description") 237 237 - if error != "" || errorDescription != "" { 238 238 - log.Printf("error: %s, %s", error, errorDescription) 239 239 - o.pages.Notice(w, "login-msg", "Failed to authenticate. Try again later.") 240 240 - return 241 241 - } 242 242 - 243 243 - code := r.FormValue("code") 244 244 - if code == "" { 245 245 - log.Println("missing code for state: ", state) 246 246 - o.pages.Notice(w, "login-msg", "Failed to authenticate. Try again later.") 247 247 - return 248 248 - } 249 249 - 250 250 - iss := r.FormValue("iss") 251 251 - if iss == "" { 252 252 - log.Println("missing iss for state: ", state) 253 253 - o.pages.Notice(w, "login-msg", "Failed to authenticate. Try again later.") 254 254 - return 255 255 - } 256 256 - 257 257 - if iss != oauthRequest.AuthserverIss { 258 258 - log.Println("mismatched iss:", iss, "!=", oauthRequest.AuthserverIss, "for state:", state) 259 259 - o.pages.Notice(w, "login-msg", "Failed to authenticate. Try again later.") 260 260 - return 261 261 - } 262 262 - 263 263 - self := o.oauth.ClientMetadata() 264 264 - 265 265 - oauthClient, err := client.NewClient( 266 266 - self.ClientID, 267 267 - o.config.OAuth.Jwks, 268 268 - self.RedirectURIs[0], 269 269 - ) 270 270 - 271 271 - if err != nil { 272 272 - log.Println("failed to create oauth client:", err) 273 273 - o.pages.Notice(w, "login-msg", "Failed to authenticate. Try again later.") 274 274 - return 275 275 - } 276 276 - 277 277 - jwk, err := helpers.ParseJWKFromBytes([]byte(oauthRequest.DpopPrivateJwk)) 278 278 - if err != nil { 279 279 - log.Println("failed to parse jwk:", err) 280 280 - o.pages.Notice(w, "login-msg", "Failed to authenticate. Try again later.") 281 281 - return 282 282 - } 283 283 - 284 284 - tokenResp, err := oauthClient.InitialTokenRequest( 285 285 - r.Context(), 286 286 - code, 287 287 - oauthRequest.AuthserverIss, 288 288 - oauthRequest.PkceVerifier, 289 289 - oauthRequest.DpopAuthserverNonce, 290 290 - jwk, 291 291 - ) 292 292 - if err != nil { 293 293 - log.Println("failed to get token:", err) 294 294 - o.pages.Notice(w, "login-msg", "Failed to authenticate. Try again later.") 295 295 - return 296 296 - } 297 297 - 298 298 - if tokenResp.Scope != oauthScope { 299 299 - log.Println("scope doesn't match:", tokenResp.Scope) 300 300 - o.pages.Notice(w, "login-msg", "Failed to authenticate. Try again later.") 301 301 - return 302 302 - } 303 303 - 304 304 - err = o.oauth.SaveSession(w, r, *oauthRequest, tokenResp) 305 305 - if err != nil { 306 306 - log.Println("failed to save session:", err) 307 307 - o.pages.Notice(w, "login-msg", "Failed to authenticate. Try again later.") 308 308 - return 309 309 - } 310 310 - 311 311 - log.Println("session saved successfully") 312 312 - go o.addToDefaultKnot(oauthRequest.Did) 313 313 - go o.addToDefaultSpindle(oauthRequest.Did) 314 314 - 315 315 - if !o.config.Core.Dev { 316 316 - err = o.posthog.Enqueue(posthog.Capture{ 317 317 - DistinctId: oauthRequest.Did, 318 318 - Event: "signin", 319 319 - }) 320 320 - if err != nil { 321 321 - log.Println("failed to enqueue posthog event:", err) 322 322 - } 323 323 - } 324 324 - 325 325 - returnUrl := oauthRequest.ReturnUrl 326 326 - if returnUrl == "" { 327 327 - returnUrl = "/" 328 328 - } 329 329 - 330 330 - http.Redirect(w, r, returnUrl, http.StatusFound) 331 331 - } 332 332 - 333 333 - func (o *OAuthHandler) logout(w http.ResponseWriter, r *http.Request) { 334 334 - err := o.oauth.ClearSession(r, w) 335 335 - if err != nil { 336 336 - log.Println("failed to clear session:", err) 337 337 - http.Redirect(w, r, "/", http.StatusFound) 338 338 - return 339 339 - } 340 340 - 341 341 - log.Println("session cleared successfully") 342 342 - o.pages.HxRedirect(w, "/login") 343 343 - } 344 344 - 345 345 - func pubKeyFromJwk(jwks string) (jwk.Key, error) { 346 346 - k, err := helpers.ParseJWKFromBytes([]byte(jwks)) 347 347 - if err != nil { 348 348 - return nil, err 349 349 - } 350 350 - pubKey, err := k.PublicKey() 351 351 - if err != nil { 352 352 - return nil, err 353 353 - } 354 354 - return pubKey, nil 355 355 - } 356 356 - 357 357 - func (o *OAuthHandler) addToDefaultSpindle(did string) { 358 358 - // use the tangled.sh app password to get an accessJwt 359 359 - // and create an sh.tangled.spindle.member record with that 360 360 - spindleMembers, err := db.GetSpindleMembers( 361 361 - o.db, 362 362 - db.FilterEq("instance", "spindle.tangled.sh"), 363 363 - db.FilterEq("subject", did), 364 364 - ) 365 365 - if err != nil { 366 366 - log.Printf("failed to get spindle members for did %s: %v", did, err) 367 367 - return 368 368 - } 369 369 - 370 370 - if len(spindleMembers) != 0 { 371 371 - log.Printf("did %s is already a member of the default spindle", did) 372 372 - return 373 373 - } 374 374 - 375 375 - log.Printf("adding %s to default spindle", did) 376 376 - session, err := o.createAppPasswordSession(o.config.Core.AppPassword, consts.TangledDid) 377 377 - if err != nil { 378 378 - log.Printf("failed to create session: %s", err) 379 379 - return 380 380 - } 381 381 - 382 382 - record := tangled.SpindleMember{ 383 383 - LexiconTypeID: "sh.tangled.spindle.member", 384 384 - Subject: did, 385 385 - Instance: consts.DefaultSpindle, 386 386 - CreatedAt: time.Now().Format(time.RFC3339), 387 387 - } 388 388 - 389 389 - if err := session.putRecord(record, tangled.SpindleMemberNSID); err != nil { 390 390 - log.Printf("failed to add member to default spindle: %s", err) 391 391 - return 392 392 - } 393 393 - 394 394 - log.Printf("successfully added %s to default spindle", did) 395 395 - } 396 396 - 397 397 - func (o *OAuthHandler) addToDefaultKnot(did string) { 398 398 - // use the tangled.sh app password to get an accessJwt 399 399 - // and create an sh.tangled.spindle.member record with that 400 400 - 401 401 - allKnots, err := o.enforcer.GetKnotsForUser(did) 402 402 - if err != nil { 403 403 - log.Printf("failed to get knot members for did %s: %v", did, err) 404 404 - return 405 405 - } 406 406 - 407 407 - if slices.Contains(allKnots, consts.DefaultKnot) { 408 408 - log.Printf("did %s is already a member of the default knot", did) 409 409 - return 410 410 - } 411 411 - 412 412 - log.Printf("adding %s to default knot", did) 413 413 - session, err := o.createAppPasswordSession(o.config.Core.TmpAltAppPassword, consts.IcyDid) 414 414 - if err != nil { 415 415 - log.Printf("failed to create session: %s", err) 416 416 - return 417 417 - } 418 418 - 419 419 - record := tangled.KnotMember{ 420 420 - LexiconTypeID: "sh.tangled.knot.member", 421 421 - Subject: did, 422 422 - Domain: consts.DefaultKnot, 423 423 - CreatedAt: time.Now().Format(time.RFC3339), 424 424 - } 425 425 - 426 426 - if err := session.putRecord(record, tangled.KnotMemberNSID); err != nil { 427 427 - log.Printf("failed to add member to default knot: %s", err) 428 428 - return 429 429 - } 430 430 - 431 431 - if err := o.enforcer.AddKnotMember(consts.DefaultKnot, did); err != nil { 432 432 - log.Printf("failed to set up enforcer rules: %s", err) 433 433 - return 434 434 - } 435 435 - 436 436 - log.Printf("successfully added %s to default Knot", did) 437 437 - } 438 438 - 439 439 - // create a session using apppasswords 440 440 - type session struct { 441 441 - AccessJwt string `json:"accessJwt"` 442 442 - PdsEndpoint string 443 443 - Did string 444 444 - } 445 445 - 446 446 - func (o *OAuthHandler) createAppPasswordSession(appPassword, did string) (*session, error) { 447 447 - if appPassword == "" { 448 448 - return nil, fmt.Errorf("no app password configured, skipping member addition") 449 449 - } 450 450 - 451 451 - resolved, err := o.idResolver.ResolveIdent(context.Background(), did) 452 452 - if err != nil { 453 453 - return nil, fmt.Errorf("failed to resolve tangled.sh DID %s: %v", did, err) 454 454 - } 455 455 - 456 456 - pdsEndpoint := resolved.PDSEndpoint() 457 457 - if pdsEndpoint == "" { 458 458 - return nil, fmt.Errorf("no PDS endpoint found for tangled.sh DID %s", did) 459 459 - } 460 460 - 461 461 - sessionPayload := map[string]string{ 462 462 - "identifier": did, 463 463 - "password": appPassword, 464 464 - } 465 465 - sessionBytes, err := json.Marshal(sessionPayload) 466 466 - if err != nil { 467 467 - return nil, fmt.Errorf("failed to marshal session payload: %v", err) 468 468 - } 469 469 - 470 470 - sessionURL := pdsEndpoint + "/xrpc/com.atproto.server.createSession" 471 471 - sessionReq, err := http.NewRequestWithContext(context.Background(), "POST", sessionURL, bytes.NewBuffer(sessionBytes)) 472 472 - if err != nil { 473 473 - return nil, fmt.Errorf("failed to create session request: %v", err) 474 474 - } 475 475 - sessionReq.Header.Set("Content-Type", "application/json") 476 476 - 477 477 - client := &http.Client{Timeout: 30 * time.Second} 478 478 - sessionResp, err := client.Do(sessionReq) 479 479 - if err != nil { 480 480 - return nil, fmt.Errorf("failed to create session: %v", err) 481 481 - } 482 482 - defer sessionResp.Body.Close() 483 483 - 484 484 - if sessionResp.StatusCode != http.StatusOK { 485 485 - return nil, fmt.Errorf("failed to create session: HTTP %d", sessionResp.StatusCode) 486 486 - } 487 487 - 488 488 - var session session 489 489 - if err := json.NewDecoder(sessionResp.Body).Decode(&session); err != nil { 490 490 - return nil, fmt.Errorf("failed to decode session response: %v", err) 491 491 - } 492 492 - 493 493 - session.PdsEndpoint = pdsEndpoint 494 494 - session.Did = did 495 495 - 496 496 - return &session, nil 497 497 - } 498 498 - 499 499 - func (s *session) putRecord(record any, collection string) error { 500 500 - recordBytes, err := json.Marshal(record) 501 501 - if err != nil { 502 502 - return fmt.Errorf("failed to marshal knot member record: %w", err) 503 503 - } 504 504 - 505 505 - payload := map[string]any{ 506 506 - "repo": s.Did, 507 507 - "collection": collection, 508 508 - "rkey": tid.TID(), 509 509 - "record": json.RawMessage(recordBytes), 510 510 - } 511 511 - 512 512 - payloadBytes, err := json.Marshal(payload) 513 513 - if err != nil { 514 514 - return fmt.Errorf("failed to marshal request payload: %w", err) 515 515 - } 516 516 - 517 517 - url := s.PdsEndpoint + "/xrpc/com.atproto.repo.putRecord" 518 518 - req, err := http.NewRequestWithContext(context.Background(), "POST", url, bytes.NewBuffer(payloadBytes)) 519 519 - if err != nil { 520 520 - return fmt.Errorf("failed to create HTTP request: %w", err) 521 521 - } 522 522 - 523 523 - req.Header.Set("Content-Type", "application/json") 524 524 - req.Header.Set("Authorization", "Bearer "+s.AccessJwt) 525 525 - 526 526 - client := &http.Client{Timeout: 30 * time.Second} 527 527 - resp, err := client.Do(req) 528 528 - if err != nil { 529 529 - return fmt.Errorf("failed to add user to default service: %w", err) 530 530 - } 531 531 - defer resp.Body.Close() 532 532 - 533 533 - if resp.StatusCode != http.StatusOK { 534 534 - return fmt.Errorf("failed to add user to default service: HTTP %d", resp.StatusCode) 535 535 - } 536 536 - 537 537 - return nil 538 538 - }

+65

appview/oauth/handler.go

··· 1 1 + package oauth 2 2 + 3 3 + import ( 4 4 + "encoding/json" 5 5 + "log" 6 6 + "net/http" 7 7 + 8 8 + "github.com/go-chi/chi/v5" 9 9 + "github.com/lestrrat-go/jwx/v2/jwk" 10 10 + ) 11 11 + 12 12 + func (o *OAuth) Router() http.Handler { 13 13 + r := chi.NewRouter() 14 14 + 15 15 + r.Get("/oauth/client-metadata.json", o.clientMetadata) 16 16 + r.Get("/oauth/jwks.json", o.jwks) 17 17 + r.Get("/oauth/callback", o.callback) 18 18 + return r 19 19 + } 20 20 + 21 21 + func (o *OAuth) clientMetadata(w http.ResponseWriter, r *http.Request) { 22 22 + doc := o.ClientApp.Config.ClientMetadata() 23 23 + doc.JWKSURI = &o.JwksUri 24 24 + 25 25 + w.Header().Set("Content-Type", "application/json") 26 26 + if err := json.NewEncoder(w).Encode(doc); err != nil { 27 27 + http.Error(w, err.Error(), http.StatusInternalServerError) 28 28 + return 29 29 + } 30 30 + } 31 31 + 32 32 + func (o *OAuth) jwks(w http.ResponseWriter, r *http.Request) { 33 33 + jwks := o.Config.OAuth.Jwks 34 34 + pubKey, err := pubKeyFromJwk(jwks) 35 35 + if err != nil { 36 36 + log.Printf("error parsing public key: %v", err) 37 37 + http.Error(w, err.Error(), http.StatusInternalServerError) 38 38 + return 39 39 + } 40 40 + 41 41 + response := map[string]any{ 42 42 + "keys": []jwk.Key{pubKey}, 43 43 + } 44 44 + 45 45 + w.Header().Set("Content-Type", "application/json") 46 46 + w.WriteHeader(http.StatusOK) 47 47 + json.NewEncoder(w).Encode(response) 48 48 + } 49 49 + 50 50 + func (o *OAuth) callback(w http.ResponseWriter, r *http.Request) { 51 51 + ctx := r.Context() 52 52 + 53 53 + sessData, err := o.ClientApp.ProcessCallback(ctx, r.URL.Query()) 54 54 + if err != nil { 55 55 + http.Error(w, err.Error(), http.StatusInternalServerError) 56 56 + return 57 57 + } 58 58 + 59 59 + if err := o.SaveSession(w, r, sessData); err != nil { 60 60 + http.Error(w, err.Error(), http.StatusInternalServerError) 61 61 + return 62 62 + } 63 63 + 64 64 + http.Redirect(w, r, "/", http.StatusFound) 65 65 + }

+107 -202

appview/oauth/oauth.go

··· 1 1 package oauth 2 2 3 3 import ( 4 4 + "errors" 4 5 "fmt" 5 5 - "log" 6 6 "net/http" 7 7 - "net/url" 8 7 "time" 9 8 10 10 - indigo_xrpc "github.com/bluesky-social/indigo/xrpc" 9 9 + comatproto "github.com/bluesky-social/indigo/api/atproto" 10 10 + "github.com/bluesky-social/indigo/atproto/auth/oauth" 11 11 + atpclient "github.com/bluesky-social/indigo/atproto/client" 12 12 + "github.com/bluesky-social/indigo/atproto/syntax" 13 13 + xrpc "github.com/bluesky-social/indigo/xrpc" 11 14 "github.com/gorilla/sessions" 12 12 - sessioncache "tangled.org/core/appview/cache/session" 15 15 + "github.com/lestrrat-go/jwx/v2/jwk" 13 16 "tangled.org/core/appview/config" 14 14 - "tangled.org/core/appview/oauth/client" 15 15 - xrpc "tangled.org/core/appview/xrpcclient" 16 16 - oauth "tangled.sh/icyphox.sh/atproto-oauth" 17 17 - "tangled.sh/icyphox.sh/atproto-oauth/helpers" 18 17 ) 19 18 20 20 - type OAuth struct { 21 21 - store *sessions.CookieStore 22 22 - config *config.Config 23 23 - sess *sessioncache.SessionStore 24 24 - } 19 19 + func New(config *config.Config) (*OAuth, error) { 20 20 + 21 21 + var oauthConfig oauth.ClientConfig 22 22 + var clientUri string 25 23 26 26 - func NewOAuth(config *config.Config, sess *sessioncache.SessionStore) *OAuth { 27 27 - return &OAuth{ 28 28 - store: sessions.NewCookieStore([]byte(config.Core.CookieSecret)), 29 29 - config: config, 30 30 - sess: sess, 24 24 + if config.Core.Dev { 25 25 + clientUri = "http://127.0.0.1:3000" 26 26 + callbackUri := clientUri + "/oauth/callback" 27 27 + oauthConfig = oauth.NewLocalhostConfig(callbackUri, []string{"atproto", "transition:generic"}) 28 28 + } else { 29 29 + clientUri = config.Core.AppviewHost 30 30 + clientId := fmt.Sprintf("%s/oauth/client-metadata.json", clientUri) 31 31 + callbackUri := clientUri + "/oauth/callback" 32 32 + oauthConfig = oauth.NewPublicConfig(clientId, callbackUri, []string{"atproto", "transition:generic"}) 31 33 } 34 34 + 35 35 + jwksUri := clientUri + "/oauth/jwks.json" 36 36 + 37 37 + authStore, err := NewRedisStore(config.Redis.ToURL()) 38 38 + if err != nil { 39 39 + return nil, err 40 40 + } 41 41 + 42 42 + sessStore := sessions.NewCookieStore([]byte(config.Core.CookieSecret)) 43 43 + 44 44 + return &OAuth{ 45 45 + ClientApp: oauth.NewClientApp(&oauthConfig, authStore), 46 46 + Config: config, 47 47 + SessStore: sessStore, 48 48 + JwksUri: jwksUri, 49 49 + }, nil 32 50 } 33 51 34 34 - func (o *OAuth) Stores() *sessions.CookieStore { 35 35 - return o.store 52 52 + type OAuth struct { 53 53 + ClientApp *oauth.ClientApp 54 54 + SessStore *sessions.CookieStore 55 55 + Config *config.Config 56 56 + JwksUri string 36 57 } 37 58 38 38 - func (o *OAuth) SaveSession(w http.ResponseWriter, r *http.Request, oreq sessioncache.OAuthRequest, oresp *oauth.TokenResponse) error { 59 59 + func (o *OAuth) SaveSession(w http.ResponseWriter, r *http.Request, sessData *oauth.ClientSessionData) error { 39 60 // first we save the did in the user session 40 40 - userSession, err := o.store.Get(r, SessionName) 61 61 + userSession, err := o.SessStore.Get(r, SessionName) 41 62 if err != nil { 42 63 return err 43 64 } 44 65 45 45 - userSession.Values[SessionDid] = oreq.Did 46 46 - userSession.Values[SessionHandle] = oreq.Handle 47 47 - userSession.Values[SessionPds] = oreq.PdsUrl 66 66 + userSession.Values[SessionDid] = sessData.AccountDID.String() 67 67 + userSession.Values[SessionPds] = sessData.HostURL 68 68 + userSession.Values[SessionId] = sessData.SessionID 48 69 userSession.Values[SessionAuthenticated] = true 49 49 - err = userSession.Save(r, w) 70 70 + return userSession.Save(r, w) 71 71 + } 72 72 + 73 73 + func (o *OAuth) ResumeSession(r *http.Request) (*oauth.ClientSession, error) { 74 74 + userSession, err := o.SessStore.Get(r, SessionName) 50 75 if err != nil { 51 51 - return fmt.Errorf("error saving user session: %w", err) 76 76 + return nil, fmt.Errorf("error getting user session: %w", err) 52 77 } 53 53 - 54 54 - // then save the whole thing in the db 55 55 - session := sessioncache.OAuthSession{ 56 56 - Did: oreq.Did, 57 57 - Handle: oreq.Handle, 58 58 - PdsUrl: oreq.PdsUrl, 59 59 - DpopAuthserverNonce: oreq.DpopAuthserverNonce, 60 60 - AuthServerIss: oreq.AuthserverIss, 61 61 - DpopPrivateJwk: oreq.DpopPrivateJwk, 62 62 - AccessJwt: oresp.AccessToken, 63 63 - RefreshJwt: oresp.RefreshToken, 64 64 - Expiry: time.Now().Add(time.Duration(oresp.ExpiresIn) * time.Second).Format(time.RFC3339), 78 78 + if userSession.IsNew { 79 79 + return nil, fmt.Errorf("no session available for user") 65 80 } 66 81 67 67 - return o.sess.SaveSession(r.Context(), session) 68 68 - } 69 69 - 70 70 - func (o *OAuth) ClearSession(r *http.Request, w http.ResponseWriter) error { 71 71 - userSession, err := o.store.Get(r, SessionName) 72 72 - if err != nil || userSession.IsNew { 73 73 - return fmt.Errorf("error getting user session (or new session?): %w", err) 82 82 + d := userSession.Values[SessionDid].(string) 83 83 + sessDid, err := syntax.ParseDID(d) 84 84 + if err != nil { 85 85 + return nil, fmt.Errorf("malformed DID in session cookie '%s': %w", d, err) 74 86 } 75 87 76 76 - did := userSession.Values[SessionDid].(string) 88 88 + sessId := userSession.Values[SessionId].(string) 77 89 78 78 - err = o.sess.DeleteSession(r.Context(), did) 90 90 + clientSess, err := o.ClientApp.ResumeSession(r.Context(), sessDid, sessId) 79 91 if err != nil { 80 80 - return fmt.Errorf("error deleting oauth session: %w", err) 92 92 + return nil, fmt.Errorf("failed to resume session: %w", err) 81 93 } 82 94 83 83 - userSession.Options.MaxAge = -1 84 84 - 85 85 - return userSession.Save(r, w) 95 95 + return clientSess, nil 86 96 } 87 97 88 88 - func (o *OAuth) GetSession(r *http.Request) (*sessioncache.OAuthSession, bool, error) { 89 89 - userSession, err := o.store.Get(r, SessionName) 90 90 - if err != nil || userSession.IsNew { 91 91 - return nil, false, fmt.Errorf("error getting user session (or new session?): %w", err) 98 98 + func (o *OAuth) DeleteSession(w http.ResponseWriter, r *http.Request) error { 99 99 + userSession, err := o.SessStore.Get(r, SessionName) 100 100 + if err != nil { 101 101 + return fmt.Errorf("error getting user session: %w", err) 92 102 } 93 93 - 94 94 - did := userSession.Values[SessionDid].(string) 95 95 - auth := userSession.Values[SessionAuthenticated].(bool) 96 96 - 97 97 - session, err := o.sess.GetSession(r.Context(), did) 98 98 - if err != nil { 99 99 - return nil, false, fmt.Errorf("error getting oauth session: %w", err) 103 103 + if userSession.IsNew { 104 104 + return fmt.Errorf("no session available for user") 100 105 } 101 106 102 102 - expiry, err := time.Parse(time.RFC3339, session.Expiry) 107 107 + d := userSession.Values[SessionDid].(string) 108 108 + sessDid, err := syntax.ParseDID(d) 103 109 if err != nil { 104 104 - return nil, false, fmt.Errorf("error parsing expiry time: %w", err) 110 110 + return fmt.Errorf("malformed DID in session cookie '%s': %w", d, err) 105 111 } 106 106 - if time.Until(expiry) <= 5*time.Minute { 107 107 - privateJwk, err := helpers.ParseJWKFromBytes([]byte(session.DpopPrivateJwk)) 108 108 - if err != nil { 109 109 - return nil, false, err 110 110 - } 111 112 112 112 - self := o.ClientMetadata() 113 113 + sessId := userSession.Values[SessionId].(string) 113 114 114 114 - oauthClient, err := client.NewClient( 115 115 - self.ClientID, 116 116 - o.config.OAuth.Jwks, 117 117 - self.RedirectURIs[0], 118 118 - ) 115 115 + // delete the session 116 116 + err1 := o.ClientApp.Logout(r.Context(), sessDid, sessId) 119 117 120 120 - if err != nil { 121 121 - return nil, false, err 122 122 - } 118 118 + // remove the cookie 119 119 + userSession.Options.MaxAge = -1 120 120 + err2 := o.SessStore.Save(r, w, userSession) 123 121 124 124 - resp, err := oauthClient.RefreshTokenRequest(r.Context(), session.RefreshJwt, session.AuthServerIss, session.DpopAuthserverNonce, privateJwk) 125 125 - if err != nil { 126 126 - return nil, false, err 127 127 - } 122 122 + return errors.Join(err1, err2) 123 123 + } 128 124 129 129 - newExpiry := time.Now().Add(time.Duration(resp.ExpiresIn) * time.Second).Format(time.RFC3339) 130 130 - err = o.sess.RefreshSession(r.Context(), did, resp.AccessToken, resp.RefreshToken, newExpiry) 131 131 - if err != nil { 132 132 - return nil, false, fmt.Errorf("error refreshing oauth session: %w", err) 133 133 - } 134 134 - 135 135 - // update the current session 136 136 - session.AccessJwt = resp.AccessToken 137 137 - session.RefreshJwt = resp.RefreshToken 138 138 - session.DpopAuthserverNonce = resp.DpopAuthserverNonce 139 139 - session.Expiry = newExpiry 125 125 + func pubKeyFromJwk(jwks string) (jwk.Key, error) { 126 126 + k, err := jwk.ParseKey([]byte(jwks)) 127 127 + if err != nil { 128 128 + return nil, err 129 129 + } 130 130 + pubKey, err := k.PublicKey() 131 131 + if err != nil { 132 132 + return nil, err 140 133 } 141 141 - 142 142 - return session, auth, nil 134 134 + return pubKey, nil 143 135 } 144 136 145 137 type User struct { 146 146 - Handle string 147 147 - Did string 148 148 - Pds string 138 138 + Did string 139 139 + Pds string 149 140 } 150 141 151 151 - func (a *OAuth) GetUser(r *http.Request) *User { 152 152 - clientSession, err := a.store.Get(r, SessionName) 142 142 + func (o *OAuth) GetUser(r *http.Request) *User { 143 143 + sess, err := o.SessStore.Get(r, SessionName) 153 144 154 154 - if err != nil || clientSession.IsNew { 145 145 + if err != nil || sess.IsNew { 155 146 return nil 156 147 } 157 148 158 149 return &User{ 159 159 - Handle: clientSession.Values[SessionHandle].(string), 160 160 - Did: clientSession.Values[SessionDid].(string), 161 161 - Pds: clientSession.Values[SessionPds].(string), 150 150 + Did: sess.Values[SessionDid].(string), 151 151 + Pds: sess.Values[SessionPds].(string), 162 152 } 163 153 } 164 154 165 165 - func (a *OAuth) GetDid(r *http.Request) string { 166 166 - clientSession, err := a.store.Get(r, SessionName) 167 167 - 168 168 - if err != nil || clientSession.IsNew { 169 169 - return "" 155 155 + func (o *OAuth) GetDid(r *http.Request) string { 156 156 + if u := o.GetUser(r); u != nil { 157 157 + return u.Did 170 158 } 171 159 172 172 - return clientSession.Values[SessionDid].(string) 160 160 + return "" 173 161 } 174 162 175 175 - func (o *OAuth) AuthorizedClient(r *http.Request) (*xrpc.Client, error) { 176 176 - session, auth, err := o.GetSession(r) 163 163 + func (o *OAuth) AuthorizedClient(r *http.Request) (*atpclient.APIClient, error) { 164 164 + session, err := o.ResumeSession(r) 177 165 if err != nil { 178 166 return nil, fmt.Errorf("error getting session: %w", err) 179 167 } 180 180 - if !auth { 181 181 - return nil, fmt.Errorf("not authorized") 182 182 - } 183 183 - 184 184 - client := &oauth.XrpcClient{ 185 185 - OnDpopPdsNonceChanged: func(did, newNonce string) { 186 186 - err := o.sess.UpdateNonce(r.Context(), did, newNonce) 187 187 - if err != nil { 188 188 - log.Printf("error updating dpop pds nonce: %v", err) 189 189 - } 190 190 - }, 191 191 - } 192 192 - 193 193 - privateJwk, err := helpers.ParseJWKFromBytes([]byte(session.DpopPrivateJwk)) 194 194 - if err != nil { 195 195 - return nil, fmt.Errorf("error parsing private jwk: %w", err) 196 196 - } 197 197 - 198 198 - xrpcClient := xrpc.NewClient(client, &oauth.XrpcAuthedRequestArgs{ 199 199 - Did: session.Did, 200 200 - PdsUrl: session.PdsUrl, 201 201 - DpopPdsNonce: session.PdsUrl, 202 202 - AccessToken: session.AccessJwt, 203 203 - Issuer: session.AuthServerIss, 204 204 - DpopPrivateJwk: privateJwk, 205 205 - }) 206 206 - 207 207 - return xrpcClient, nil 168 168 + return session.APIClient(), nil 208 169 } 209 170 210 210 - // use this to create a client to communicate with knots or spindles 211 211 - // 212 171 // this is a higher level abstraction on ServerGetServiceAuth 213 172 type ServiceClientOpts struct { 214 173 service string ··· 259 218 return scheme + s.service 260 219 } 261 220 262 262 - func (o *OAuth) ServiceClient(r *http.Request, os ...ServiceClientOpt) (*indigo_xrpc.Client, error) { 221 221 + func (o *OAuth) ServiceClient(r *http.Request, os ...ServiceClientOpt) (*xrpc.Client, error) { 263 222 opts := ServiceClientOpts{} 264 223 for _, o := range os { 265 224 o(&opts) 266 225 } 267 226 268 268 - authorizedClient, err := o.AuthorizedClient(r) 227 227 + client, err := o.AuthorizedClient(r) 269 228 if err != nil { 270 229 return nil, err 271 230 } ··· 276 235 opts.exp = sixty 277 236 } 278 237 279 279 - resp, err := authorizedClient.ServerGetServiceAuth(r.Context(), opts.Audience(), opts.exp, opts.lxm) 238 238 + resp, err := comatproto.ServerGetServiceAuth(r.Context(), client, opts.Audience(), opts.exp, opts.lxm) 280 239 if err != nil { 281 240 return nil, err 282 241 } 283 242 284 284 - return &indigo_xrpc.Client{ 285 285 - Auth: &indigo_xrpc.AuthInfo{ 243 243 + return &xrpc.Client{ 244 244 + Auth: &xrpc.AuthInfo{ 286 245 AccessJwt: resp.Token, 287 246 }, 288 247 Host: opts.Host(), ··· 291 250 }, 292 251 }, nil 293 252 } 294 294 - 295 295 - type ClientMetadata struct { 296 296 - ClientID string `json:"client_id"` 297 297 - ClientName string `json:"client_name"` 298 298 - SubjectType string `json:"subject_type"` 299 299 - ClientURI string `json:"client_uri"` 300 300 - RedirectURIs []string `json:"redirect_uris"` 301 301 - GrantTypes []string `json:"grant_types"` 302 302 - ResponseTypes []string `json:"response_types"` 303 303 - ApplicationType string `json:"application_type"` 304 304 - DpopBoundAccessTokens bool `json:"dpop_bound_access_tokens"` 305 305 - JwksURI string `json:"jwks_uri"` 306 306 - Scope string `json:"scope"` 307 307 - TokenEndpointAuthMethod string `json:"token_endpoint_auth_method"` 308 308 - TokenEndpointAuthSigningAlg string `json:"token_endpoint_auth_signing_alg"` 309 309 - } 310 310 - 311 311 - func (o *OAuth) ClientMetadata() ClientMetadata { 312 312 - makeRedirectURIs := func(c string) []string { 313 313 - return []string{fmt.Sprintf("%s/oauth/callback", c)} 314 314 - } 315 315 - 316 316 - clientURI := o.config.Core.AppviewHost 317 317 - clientID := fmt.Sprintf("%s/oauth/client-metadata.json", clientURI) 318 318 - redirectURIs := makeRedirectURIs(clientURI) 319 319 - 320 320 - if o.config.Core.Dev { 321 321 - clientURI = "http://127.0.0.1:3000" 322 322 - redirectURIs = makeRedirectURIs(clientURI) 323 323 - 324 324 - query := url.Values{} 325 325 - query.Add("redirect_uri", redirectURIs[0]) 326 326 - query.Add("scope", "atproto transition:generic") 327 327 - clientID = fmt.Sprintf("http://localhost?%s", query.Encode()) 328 328 - } 329 329 - 330 330 - jwksURI := fmt.Sprintf("%s/oauth/jwks.json", clientURI) 331 331 - 332 332 - return ClientMetadata{ 333 333 - ClientID: clientID, 334 334 - ClientName: "Tangled", 335 335 - SubjectType: "public", 336 336 - ClientURI: clientURI, 337 337 - RedirectURIs: redirectURIs, 338 338 - GrantTypes: []string{"authorization_code", "refresh_token"}, 339 339 - ResponseTypes: []string{"code"}, 340 340 - ApplicationType: "web", 341 341 - DpopBoundAccessTokens: true, 342 342 - JwksURI: jwksURI, 343 343 - Scope: "atproto transition:generic", 344 344 - TokenEndpointAuthMethod: "private_key_jwt", 345 345 - TokenEndpointAuthSigningAlg: "ES256", 346 346 - } 347 347 - }

+147

appview/oauth/store.go

··· 1 1 + package oauth 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "encoding/json" 6 6 + "fmt" 7 7 + "time" 8 8 + 9 9 + "github.com/bluesky-social/indigo/atproto/auth/oauth" 10 10 + "github.com/bluesky-social/indigo/atproto/syntax" 11 11 + "github.com/redis/go-redis/v9" 12 12 + ) 13 13 + 14 14 + // redis-backed implementation of ClientAuthStore. 15 15 + type RedisStore struct { 16 16 + client *redis.Client 17 17 + SessionTTL time.Duration 18 18 + AuthRequestTTL time.Duration 19 19 + } 20 20 + 21 21 + var _ oauth.ClientAuthStore = &RedisStore{} 22 22 + 23 23 + func NewRedisStore(redisURL string) (*RedisStore, error) { 24 24 + opts, err := redis.ParseURL(redisURL) 25 25 + if err != nil { 26 26 + return nil, fmt.Errorf("failed to parse redis URL: %w", err) 27 27 + } 28 28 + 29 29 + client := redis.NewClient(opts) 30 30 + 31 31 + // test the connection 32 32 + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) 33 33 + defer cancel() 34 34 + 35 35 + if err := client.Ping(ctx).Err(); err != nil { 36 36 + return nil, fmt.Errorf("failed to connect to redis: %w", err) 37 37 + } 38 38 + 39 39 + return &RedisStore{ 40 40 + client: client, 41 41 + SessionTTL: 30 * 24 * time.Hour, // 30 days 42 42 + AuthRequestTTL: 10 * time.Minute, // 10 minutes 43 43 + }, nil 44 44 + } 45 45 + 46 46 + func (r *RedisStore) Close() error { 47 47 + return r.client.Close() 48 48 + } 49 49 + 50 50 + func sessionKey(did syntax.DID, sessionID string) string { 51 51 + return fmt.Sprintf("oauth:session:%s:%s", did, sessionID) 52 52 + } 53 53 + 54 54 + func authRequestKey(state string) string { 55 55 + return fmt.Sprintf("oauth:auth_request:%s", state) 56 56 + } 57 57 + 58 58 + func (r *RedisStore) GetSession(ctx context.Context, did syntax.DID, sessionID string) (*oauth.ClientSessionData, error) { 59 59 + key := sessionKey(did, sessionID) 60 60 + data, err := r.client.Get(ctx, key).Bytes() 61 61 + if err == redis.Nil { 62 62 + return nil, fmt.Errorf("session not found: %s", did) 63 63 + } 64 64 + if err != nil { 65 65 + return nil, fmt.Errorf("failed to get session: %w", err) 66 66 + } 67 67 + 68 68 + var sess oauth.ClientSessionData 69 69 + if err := json.Unmarshal(data, &sess); err != nil { 70 70 + return nil, fmt.Errorf("failed to unmarshal session: %w", err) 71 71 + } 72 72 + 73 73 + return &sess, nil 74 74 + } 75 75 + 76 76 + func (r *RedisStore) SaveSession(ctx context.Context, sess oauth.ClientSessionData) error { 77 77 + key := sessionKey(sess.AccountDID, sess.SessionID) 78 78 + 79 79 + data, err := json.Marshal(sess) 80 80 + if err != nil { 81 81 + return fmt.Errorf("failed to marshal session: %w", err) 82 82 + } 83 83 + 84 84 + if err := r.client.Set(ctx, key, data, r.SessionTTL).Err(); err != nil { 85 85 + return fmt.Errorf("failed to save session: %w", err) 86 86 + } 87 87 + 88 88 + return nil 89 89 + } 90 90 + 91 91 + func (r *RedisStore) DeleteSession(ctx context.Context, did syntax.DID, sessionID string) error { 92 92 + key := sessionKey(did, sessionID) 93 93 + if err := r.client.Del(ctx, key).Err(); err != nil { 94 94 + return fmt.Errorf("failed to delete session: %w", err) 95 95 + } 96 96 + return nil 97 97 + } 98 98 + 99 99 + func (r *RedisStore) GetAuthRequestInfo(ctx context.Context, state string) (*oauth.AuthRequestData, error) { 100 100 + key := authRequestKey(state) 101 101 + data, err := r.client.Get(ctx, key).Bytes() 102 102 + if err == redis.Nil { 103 103 + return nil, fmt.Errorf("request info not found: %s", state) 104 104 + } 105 105 + if err != nil { 106 106 + return nil, fmt.Errorf("failed to get auth request: %w", err) 107 107 + } 108 108 + 109 109 + var req oauth.AuthRequestData 110 110 + if err := json.Unmarshal(data, &req); err != nil { 111 111 + return nil, fmt.Errorf("failed to unmarshal auth request: %w", err) 112 112 + } 113 113 + 114 114 + return &req, nil 115 115 + } 116 116 + 117 117 + func (r *RedisStore) SaveAuthRequestInfo(ctx context.Context, info oauth.AuthRequestData) error { 118 118 + key := authRequestKey(info.State) 119 119 + 120 120 + // check if already exists (to match MemStore behavior) 121 121 + exists, err := r.client.Exists(ctx, key).Result() 122 122 + if err != nil { 123 123 + return fmt.Errorf("failed to check auth request existence: %w", err) 124 124 + } 125 125 + if exists > 0 { 126 126 + return fmt.Errorf("auth request already saved for state %s", info.State) 127 127 + } 128 128 + 129 129 + data, err := json.Marshal(info) 130 130 + if err != nil { 131 131 + return fmt.Errorf("failed to marshal auth request: %w", err) 132 132 + } 133 133 + 134 134 + if err := r.client.Set(ctx, key, data, r.AuthRequestTTL).Err(); err != nil { 135 135 + return fmt.Errorf("failed to save auth request: %w", err) 136 136 + } 137 137 + 138 138 + return nil 139 139 + } 140 140 + 141 141 + func (r *RedisStore) DeleteAuthRequestInfo(ctx context.Context, state string) error { 142 142 + key := authRequestKey(state) 143 143 + if err := r.client.Del(ctx, key).Err(); err != nil { 144 144 + return fmt.Errorf("failed to delete auth request: %w", err) 145 145 + } 146 146 + return nil 147 147 + }

+7 -7

appview/pages/funcmap.go

··· 265 265 return nil 266 266 }, 267 267 "i": func(name string, classes ...string) template.HTML { 268 268 - data, err := icon(name, classes) 268 268 + data, err := p.icon(name, classes) 269 269 if err != nil { 270 270 log.Printf("icon %s does not exist", name) 271 271 - data, _ = icon("airplay", classes) 271 271 + data, _ = p.icon("airplay", classes) 272 272 } 273 273 return template.HTML(data) 274 274 }, 275 275 - "cssContentHash": CssContentHash, 275 275 + "cssContentHash": p.CssContentHash, 276 276 "fileTree": filetree.FileTree, 277 277 "pathEscape": func(s string) string { 278 278 return url.PathEscape(s) ··· 283 283 }, 284 284 285 285 "tinyAvatar": func(handle string) string { 286 286 - return p.avatarUri(handle, "tiny") 286 286 + return p.AvatarUrl(handle, "tiny") 287 287 }, 288 288 "fullAvatar": func(handle string) string { 289 289 - return p.avatarUri(handle, "") 289 289 + return p.AvatarUrl(handle, "") 290 290 }, 291 291 "langColor": enry.GetColor, 292 292 "layoutSide": func() string { ··· 310 310 } 311 311 } 312 312 313 313 - func (p *Pages) avatarUri(handle, size string) string { 313 313 + func (p *Pages) AvatarUrl(handle, size string) string { 314 314 handle = strings.TrimPrefix(handle, "@") 315 315 316 316 secret := p.avatar.SharedSecret ··· 325 325 return fmt.Sprintf("%s/%s/%s?%s", p.avatar.Host, signature, handle, sizeArg) 326 326 } 327 327 328 328 - func icon(name string, classes []string) (template.HTML, error) { 328 328 + func (p *Pages) icon(name string, classes []string) (template.HTML, error) { 329 329 iconPath := filepath.Join("static", "icons", name) 330 330 331 331 if filepath.Ext(name) == "" {

+6 -1

appview/pages/markup/markdown.go

··· 5 5 "bytes" 6 6 "fmt" 7 7 "io" 8 8 + "io/fs" 8 9 "net/url" 9 10 "path" 10 11 "strings" ··· 20 21 "github.com/yuin/goldmark/renderer/html" 21 22 "github.com/yuin/goldmark/text" 22 23 "github.com/yuin/goldmark/util" 24 24 + callout "gitlab.com/staticnoise/goldmark-callout" 23 25 htmlparse "golang.org/x/net/html" 24 26 25 27 "tangled.org/core/api/tangled" ··· 45 47 IsDev bool 46 48 RendererType RendererType 47 49 Sanitizer Sanitizer 50 50 + Files fs.FS 48 51 } 49 52 50 53 func (rctx *RenderContext) RenderMarkdown(source string) string { ··· 62 65 extension.WithFootnoteIDPrefix([]byte("footnote")), 63 66 ), 64 67 treeblood.MathML(), 68 68 + callout.CalloutExtention, 65 69 ), 66 70 goldmark.WithParserOptions( 67 71 parser.WithAutoHeadingID(), ··· 140 144 func visitNode(ctx *RenderContext, node *htmlparse.Node) { 141 145 switch node.Type { 142 146 case htmlparse.ElementNode: 143 143 - if node.Data == "img" || node.Data == "source" { 147 147 + switch node.Data { 148 148 + case "img", "source": 144 149 for i, attr := range node.Attr { 145 150 if attr.Key != "src" { 146 151 continue

+3

appview/pages/markup/sanitizer.go

··· 114 114 policy.AllowNoAttrs().OnElements(mathElements...) 115 115 policy.AllowAttrs(mathAttrs...).OnElements(mathElements...) 116 116 117 117 + // goldmark-callout 118 118 + policy.AllowAttrs("data-callout").OnElements("details") 119 119 + 117 120 return policy 118 121 } 119 122

+45 -25

appview/pages/pages.go

··· 61 61 CamoUrl: config.Camo.Host, 62 62 CamoSecret: config.Camo.SharedSecret, 63 63 Sanitizer: markup.NewSanitizer(), 64 64 + Files: Files, 64 65 } 65 66 66 67 p := &Pages{ ··· 306 307 LoggedInUser *oauth.User 307 308 Timeline []models.TimelineEvent 308 309 Repos []models.Repo 310 310 + GfiLabel *models.LabelDefinition 309 311 } 310 312 311 313 func (p *Pages) Timeline(w io.Writer, params TimelineParams) error { 312 314 return p.execute("timeline/timeline", w, params) 313 315 } 314 316 317 317 + type GoodFirstIssuesParams struct { 318 318 + LoggedInUser *oauth.User 319 319 + Issues []models.Issue 320 320 + RepoGroups []*models.RepoGroup 321 321 + LabelDefs map[string]*models.LabelDefinition 322 322 + GfiLabel *models.LabelDefinition 323 323 + Page pagination.Page 324 324 + } 325 325 + 326 326 + func (p *Pages) GoodFirstIssues(w io.Writer, params GoodFirstIssuesParams) error { 327 327 + return p.execute("goodfirstissues/index", w, params) 328 328 + } 329 329 + 315 330 type UserProfileSettingsParams struct { 316 331 LoggedInUser *oauth.User 317 332 Tabs []map[string]any ··· 326 341 LoggedInUser *oauth.User 327 342 Notifications []*models.NotificationWithEntity 328 343 UnreadCount int 329 329 - HasMore bool 330 330 - NextOffset int 331 331 - Limit int 344 344 + Page pagination.Page 345 345 + Total int64 332 346 } 333 347 334 348 func (p *Pages) Notifications(w io.Writer, params NotificationsParams) error { ··· 344 358 } 345 359 346 360 type NotificationCountParams struct { 347 347 - Count int 361 361 + Count int64 348 362 } 349 363 350 364 func (p *Pages) NotificationCount(w io.Writer, params NotificationCountParams) error { ··· 972 986 LabelDefs map[string]*models.LabelDefinition 973 987 974 988 OrderedReactionKinds []models.ReactionKind 975 975 - Reactions map[models.ReactionKind]int 989 989 + Reactions map[models.ReactionKind]models.ReactionDisplayData 976 990 UserReacted map[models.ReactionKind]bool 977 991 } 978 992 ··· 997 1011 ThreadAt syntax.ATURI 998 1012 Kind models.ReactionKind 999 1013 Count int 1014 1014 + Users []string 1000 1015 IsReacted bool 1001 1016 } 1002 1017 ··· 1087 1102 FilteringBy models.PullState 1088 1103 Stacks map[string]models.Stack 1089 1104 Pipelines map[string]models.Pipeline 1105 1105 + LabelDefs map[string]*models.LabelDefinition 1090 1106 } 1091 1107 1092 1108 func (p *Pages) RepoPulls(w io.Writer, params RepoPullsParams) error { ··· 1113 1129 } 1114 1130 1115 1131 type RepoSinglePullParams struct { 1116 1116 - LoggedInUser *oauth.User 1117 1117 - RepoInfo repoinfo.RepoInfo 1118 1118 - Active string 1119 1119 - Pull *models.Pull 1120 1120 - Stack models.Stack 1121 1121 - AbandonedPulls []*models.Pull 1122 1122 - MergeCheck types.MergeCheckResponse 1123 1123 - ResubmitCheck ResubmitResult 1124 1124 - Pipelines map[string]models.Pipeline 1132 1132 + LoggedInUser *oauth.User 1133 1133 + RepoInfo repoinfo.RepoInfo 1134 1134 + Active string 1135 1135 + Pull *models.Pull 1136 1136 + Stack models.Stack 1137 1137 + AbandonedPulls []*models.Pull 1138 1138 + BranchDeleteStatus *models.BranchDeleteStatus 1139 1139 + MergeCheck types.MergeCheckResponse 1140 1140 + ResubmitCheck ResubmitResult 1141 1141 + Pipelines map[string]models.Pipeline 1125 1142 1126 1143 OrderedReactionKinds []models.ReactionKind 1127 1127 - Reactions map[models.ReactionKind]int 1144 1144 + Reactions map[models.ReactionKind]models.ReactionDisplayData 1128 1145 UserReacted map[models.ReactionKind]bool 1146 1146 + 1147 1147 + LabelDefs map[string]*models.LabelDefinition 1129 1148 } 1130 1149 1131 1150 func (p *Pages) RepoSinglePull(w io.Writer, params RepoSinglePullParams) error { ··· 1215 1234 } 1216 1235 1217 1236 type PullActionsParams struct { 1218 1218 - LoggedInUser *oauth.User 1219 1219 - RepoInfo repoinfo.RepoInfo 1220 1220 - Pull *models.Pull 1221 1221 - RoundNumber int 1222 1222 - MergeCheck types.MergeCheckResponse 1223 1223 - ResubmitCheck ResubmitResult 1224 1224 - Stack models.Stack 1237 1237 + LoggedInUser *oauth.User 1238 1238 + RepoInfo repoinfo.RepoInfo 1239 1239 + Pull *models.Pull 1240 1240 + RoundNumber int 1241 1241 + MergeCheck types.MergeCheckResponse 1242 1242 + ResubmitCheck ResubmitResult 1243 1243 + BranchDeleteStatus *models.BranchDeleteStatus 1244 1244 + Stack models.Stack 1225 1245 } 1226 1246 1227 1247 func (p *Pages) PullActionsFragment(w io.Writer, params PullActionsParams) error { ··· 1458 1478 return http.StripPrefix("/static/", http.FileServer(http.Dir("appview/pages/static"))) 1459 1479 } 1460 1480 1461 1461 - sub, err := fs.Sub(Files, "static") 1481 1481 + sub, err := fs.Sub(p.embedFS, "static") 1462 1482 if err != nil { 1463 1483 p.logger.Error("no static dir found? that's crazy", "err", err) 1464 1484 panic(err) ··· 1481 1501 }) 1482 1502 } 1483 1503 1484 1484 - func CssContentHash() string { 1485 1485 - cssFile, err := Files.Open("static/tw.css") 1504 1504 + func (p *Pages) CssContentHash() string { 1505 1505 + cssFile, err := p.embedFS.Open("static/tw.css") 1486 1506 if err != nil { 1487 1507 slog.Debug("Error opening CSS file", "err", err) 1488 1508 return ""

+44

appview/pages/templates/fragments/dolly/silhouette.svg

··· 1 1 + <svg 2 2 + version="1.1" 3 3 + id="svg1" 4 4 + width="32" 5 5 + height="32" 6 6 + viewBox="0 0 25 25" 7 7 + sodipodi:docname="tangled_dolly_silhouette.png" 8 8 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 9 9 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 10 10 + xmlns="http://www.w3.org/2000/svg" 11 11 + xmlns:svg="http://www.w3.org/2000/svg"> 12 12 + <title>Dolly</title> 13 13 + <defs 14 14 + id="defs1" /> 15 15 + <sodipodi:namedview 16 16 + id="namedview1" 17 17 + pagecolor="#ffffff" 18 18 + bordercolor="#000000" 19 19 + borderopacity="0.25" 20 20 + inkscape:showpageshadow="2" 21 21 + inkscape:pageopacity="0.0" 22 22 + inkscape:pagecheckerboard="true" 23 23 + inkscape:deskcolor="#d1d1d1"> 24 24 + <inkscape:page 25 25 + x="0" 26 26 + y="0" 27 27 + width="25" 28 28 + height="25" 29 29 + id="page2" 30 30 + margin="0" 31 31 + bleed="0" /> 32 32 + </sodipodi:namedview> 33 33 + <g 34 34 + inkscape:groupmode="layer" 35 35 + inkscape:label="Image" 36 36 + id="g1"> 37 37 + <path 38 38 + class="dolly" 39 39 + fill="currentColor" 40 40 + style="stroke-width:1.12248" 41 41 + d="m 16.208435,23.914069 c -0.06147,-0.02273 -0.147027,-0.03034 -0.190158,-0.01691 -0.197279,0.06145 -1.31068,-0.230493 -1.388819,-0.364153 -0.01956,-0.03344 -0.163274,-0.134049 -0.319377,-0.223561 -0.550395,-0.315603 -1.010951,-0.696643 -1.428383,-1.181771 -0.264598,-0.307509 -0.597257,-0.785384 -0.597257,-0.857979 0,-0.0216 -0.02841,-0.06243 -0.06313,-0.0907 -0.04977,-0.04053 -0.160873,0.0436 -0.52488,0.397463 -0.479803,0.466432 -0.78924,0.689475 -1.355603,0.977118 -0.183693,0.0933 -0.323426,0.179989 -0.310516,0.192658 0.02801,0.02748 -0.7656391,0.270031 -1.209129,0.369517 -0.5378332,0.120647 -1.6341809,0.08626 -1.9721503,-0.06186 C 6.7977157,23.031391 6.56735,22.957551 6.3371134,22.889782 4.9717169,22.487902 3.7511914,21.481518 3.1172396,20.234838 2.6890391,19.392772 2.5582276,18.827446 2.5610489,17.831154 2.5639589,16.802192 2.7366641,16.125844 3.2142117,15.273187 3.3040457,15.112788 3.3713143,14.976533 3.3636956,14.9704 3.3560756,14.9643 3.2459634,14.90305 3.1189994,14.834381 1.7582586,14.098312 0.77760984,12.777439 0.44909837,11.23818 0.33531456,10.705039 0.33670119,9.7067968 0.45195381,9.1778795 0.72259241,7.9359287 1.3827188,6.8888436 2.4297498,6.0407205 2.6856126,5.8334648 3.2975489,5.4910878 3.6885849,5.3364049 L 4.0584319,5.190106 4.2333984,4.860432 C 4.8393906,3.7186139 5.8908314,2.7968028 7.1056396,2.3423025 7.7690673,2.0940921 8.2290216,2.0150935 9.01853,2.0137575 c 0.9625627,-0.00163 1.629181,0.1532762 2.485864,0.5776514 l 0.271744,0.1346134 0.42911,-0.3607688 c 1.082666,-0.9102346 2.185531,-1.3136811 3.578383,-1.3090327 0.916696,0.00306 1.573918,0.1517893 2.356121,0.5331927 1.465948,0.7148 2.54506,2.0625628 2.865177,3.57848 l 0.07653,0.362429 0.515095,0.2556611 c 1.022872,0.5076874 1.756122,1.1690944 2.288361,2.0641468 0.401896,0.6758594 0.537303,1.0442682 0.675505,1.8378683 0.288575,1.6570823 -0.266229,3.3548023 -1.490464,4.5608743 -0.371074,0.36557 -0.840205,0.718265 -1.203442,0.904754 -0.144112,0.07398 -0.271303,0.15826 -0.282647,0.187269 -0.01134,0.02901 0.02121,0.142764 0.07234,0.25279 0.184248,0.396467 0.451371,1.331823 0.619371,2.168779 0.463493,2.30908 -0.754646,4.693707 -2.92278,5.721632 -0.479538,0.227352 -0.717629,0.309322 -1.144194,0.39393 -0.321869,0.06383 -1.850573,0.09139 -2.000174,0.03604 z M 12.25443,18.636956 c 0.739923,-0.24652 1.382521,-0.718922 1.874623,-1.37812 0.0752,-0.100718 0.213883,-0.275851 0.308198,-0.389167 0.09432,-0.113318 0.210136,-0.271056 0.257381,-0.350531 0.416347,-0.700389 0.680936,-1.176102 0.766454,-1.378041 0.05594,-0.132087 0.114653,-0.239607 0.130477,-0.238929 0.01583,6.79e-4 0.08126,0.08531 0.145412,0.188069 0.178029,0.285173 0.614305,0.658998 0.868158,0.743878 0.259802,0.08686 0.656158,0.09598 0.911369,0.02095 0.213812,-0.06285 0.507296,-0.298016 0.645179,-0.516947 0.155165,-0.246374 0.327989,-0.989595 0.327989,-1.410501 0,-1.26718 -0.610975,-3.143405 -1.237774,-3.801045 -0.198483,-0.2082486 -0.208557,-0.2319396 -0.208557,-0.4904655 0,-0.2517771 -0.08774,-0.5704927 -0.258476,-0.938956 C 16.694963,8.50313 16.375697,8.1377479 16.135846,7.9543702 L 15.932296,7.7987471 15.683004,7.9356529 C 15.131767,8.2383821 14.435638,8.1945733 13.943459,7.8261812 L 13.782862,7.7059758 13.686773,7.8908012 C 13.338849,8.5600578 12.487087,8.8811064 11.743178,8.6233891 11.487199,8.5347109 11.358897,8.4505994 11.063189,8.1776138 L 10.69871,7.8411436 10.453484,8.0579255 C 10.318608,8.1771557 10.113778,8.3156283 9.9983037,8.3656417 9.7041488,8.4930449 9.1808299,8.5227884 8.8979004,8.4281886 8.7754792,8.3872574 8.6687415,8.3537661 8.6607053,8.3537661 c -0.03426,0 -0.3092864,0.3066098 -0.3791974,0.42275 -0.041935,0.069664 -0.1040482,0.1266636 -0.1380294,0.1266636 -0.1316419,0 -0.4197402,0.1843928 -0.6257041,0.4004735 -0.1923125,0.2017571 -0.6853701,0.9036038 -0.8926582,1.2706578 -0.042662,0.07554 -0.1803555,0.353687 -0.3059848,0.618091 -0.1256293,0.264406 -0.3270073,0.686768 -0.4475067,0.938581 -0.1204992,0.251816 -0.2469926,0.519654 -0.2810961,0.595199 -0.2592829,0.574347 -0.285919,1.391094 -0.057822,1.77304 0.1690683,0.283105 0.4224039,0.480895 0.7285507,0.568809 0.487122,0.139885 0.9109638,-0.004 1.6013422,-0.543768 l 0.4560939,-0.356568 0.0036,0.172041 c 0.01635,0.781837 0.1831084,1.813183 0.4016641,2.484154 0.1160449,0.356262 0.3781448,0.83968 0.5614081,1.035462 0.2171883,0.232025 0.7140951,0.577268 1.0100284,0.701749 0.121485,0.0511 0.351032,0.110795 0.510105,0.132647 0.396966,0.05452 1.2105,0.02265 1.448934,-0.05679 z" 42 42 + id="path1" /> 43 43 + </g> 44 44 + </svg>

+167

appview/pages/templates/goodfirstissues/index.html

··· 1 1 + {{ define "title" }}good first issues{{ end }} 2 2 + 3 3 + {{ define "extrameta" }} 4 4 + <meta property="og:title" content="good first issues · tangled" /> 5 5 + <meta property="og:type" content="object" /> 6 6 + <meta property="og:url" content="https://tangled.org/goodfirstissues" /> 7 7 + <meta property="og:description" content="Find good first issues to contribute to open source projects" /> 8 8 + {{ end }} 9 9 + 10 10 + {{ define "content" }} 11 11 + <div class="grid grid-cols-10"> 12 12 + <header class="col-span-full md:col-span-10 px-6 py-2 text-center flex flex-col items-center justify-center py-8"> 13 13 + <h1 class="scale-150 dark:text-white mb-4"> 14 14 + {{ template "labels/fragments/label" (dict "def" .GfiLabel "val" "" "withPrefix" true) }} 15 15 + </h1> 16 16 + <p class="text-gray-600 dark:text-gray-400 mb-2"> 17 17 + Find beginner-friendly issues across all repositories to get started with open source contributions. 18 18 + </p> 19 19 + </header> 20 20 + 21 21 + <div class="col-span-full md:col-span-10 space-y-6"> 22 22 + {{ if eq (len .RepoGroups) 0 }} 23 23 + <div class="bg-white dark:bg-gray-800 drop-shadow-sm rounded p-6 md:px-10"> 24 24 + <div class="text-center py-16"> 25 25 + <div class="text-gray-500 dark:text-gray-400 mb-4"> 26 26 + {{ i "circle-dot" "w-16 h-16 mx-auto" }} 27 27 + </div> 28 28 + <h3 class="text-xl font-medium text-gray-900 dark:text-white mb-2">No good first issues available</h3> 29 29 + <p class="text-gray-600 dark:text-gray-400 mb-3 max-w-md mx-auto"> 30 30 + There are currently no open issues labeled as "good-first-issue" across all repositories. 31 31 + </p> 32 32 + <p class="text-gray-500 dark:text-gray-500 text-sm max-w-md mx-auto"> 33 33 + Repository maintainers can add the "good-first-issue" label to beginner-friendly issues to help newcomers get started. 34 34 + </p> 35 35 + </div> 36 36 + </div> 37 37 + {{ else }} 38 38 + {{ range .RepoGroups }} 39 39 + <div class="mb-4 gap-1 flex flex-col drop-shadow-sm rounded bg-white dark:bg-gray-800"> 40 40 + <div class="flex px-6 pt-4 flex-row gap-1 items-center justify-between flex-wrap"> 41 41 + <div class="font-medium dark:text-white flex items-center justify-between"> 42 42 + <div class="flex items-center min-w-0 flex-1 mr-2"> 43 43 + {{ if .Repo.Source }} 44 44 + {{ i "git-fork" "w-4 h-4 mr-1.5 shrink-0" }} 45 45 + {{ else }} 46 46 + {{ i "book-marked" "w-4 h-4 mr-1.5 shrink-0" }} 47 47 + {{ end }} 48 48 + {{ $repoOwner := resolve .Repo.Did }} 49 49 + <a href="/{{ $repoOwner }}/{{ .Repo.Name }}" class="truncate min-w-0">{{ $repoOwner }}/{{ .Repo.Name }}</a> 50 50 + </div> 51 51 + </div> 52 52 + 53 53 + 54 54 + {{ if .Repo.RepoStats }} 55 55 + <div class="text-gray-400 text-sm font-mono inline-flex gap-4"> 56 56 + {{ with .Repo.RepoStats.Language }} 57 57 + <div class="flex gap-2 items-center text-sm"> 58 58 + {{ template "repo/fragments/colorBall" (dict "color" (langColor .)) }} 59 59 + <span>{{ . }}</span> 60 60 + </div> 61 61 + {{ end }} 62 62 + {{ with .Repo.RepoStats.StarCount }} 63 63 + <div class="flex gap-1 items-center text-sm"> 64 64 + {{ i "star" "w-3 h-3 fill-current" }} 65 65 + <span>{{ . }}</span> 66 66 + </div> 67 67 + {{ end }} 68 68 + {{ with .Repo.RepoStats.IssueCount.Open }} 69 69 + <div class="flex gap-1 items-center text-sm"> 70 70 + {{ i "circle-dot" "w-3 h-3" }} 71 71 + <span>{{ . }}</span> 72 72 + </div> 73 73 + {{ end }} 74 74 + {{ with .Repo.RepoStats.PullCount.Open }} 75 75 + <div class="flex gap-1 items-center text-sm"> 76 76 + {{ i "git-pull-request" "w-3 h-3" }} 77 77 + <span>{{ . }}</span> 78 78 + </div> 79 79 + {{ end }} 80 80 + </div> 81 81 + {{ end }} 82 82 + </div> 83 83 + 84 84 + {{ with .Repo.Description }} 85 85 + <div class="pl-6 pb-2 text-gray-600 dark:text-gray-300 text-sm line-clamp-2"> 86 86 + {{ . | description }} 87 87 + </div> 88 88 + {{ end }} 89 89 + 90 90 + {{ if gt (len .Issues) 0 }} 91 91 + <div class="grid grid-cols-1 rounded-b border-b border-t border-gray-200 dark:border-gray-900 divide-y divide-gray-200 dark:divide-gray-900"> 92 92 + {{ range .Issues }} 93 93 + <a href="/{{ resolve .Repo.Did }}/{{ .Repo.Name }}/issues/{{ .IssueId }}" class="no-underline hover:no-underline hover:bg-gray-100/25 hover:dark:bg-gray-700/25"> 94 94 + <div class="py-2 px-6"> 95 95 + <div class="flex-grow min-w-0 w-full"> 96 96 + <div class="flex text-sm items-center justify-between w-full"> 97 97 + <div class="flex items-center gap-2 min-w-0 flex-1 pr-2"> 98 98 + <span class="truncate text-sm text-gray-800 dark:text-gray-200"> 99 99 + <span class="text-gray-500 dark:text-gray-400">#{{ .IssueId }}</span> 100 100 + {{ .Title | description }} 101 101 + </span> 102 102 + </div> 103 103 + <div class="flex-shrink-0 flex items-center gap-2 text-gray-500 dark:text-gray-400"> 104 104 + <span> 105 105 + <div class="inline-flex items-center gap-1"> 106 106 + {{ i "message-square" "w-3 h-3" }} 107 107 + {{ len .Comments }} 108 108 + </div> 109 109 + </span> 110 110 + <span class="before:content-['·'] before:select-none"></span> 111 111 + <span class="text-sm"> 112 112 + {{ template "repo/fragments/shortTimeAgo" .Created }} 113 113 + </span> 114 114 + <div class="hidden md:inline-flex md:gap-1"> 115 115 + {{ $labelState := .Labels }} 116 116 + {{ range $k, $d := $.LabelDefs }} 117 117 + {{ range $v, $s := $labelState.GetValSet $d.AtUri.String }} 118 118 + {{ template "labels/fragments/label" (dict "def" $d "val" $v "withPrefix" true) }} 119 119 + {{ end }} 120 120 + {{ end }} 121 121 + </div> 122 122 + </div> 123 123 + </div> 124 124 + </div> 125 125 + </div> 126 126 + </a> 127 127 + {{ end }} 128 128 + </div> 129 129 + {{ end }} 130 130 + </div> 131 131 + {{ end }} 132 132 + 133 133 + {{ if or (gt .Page.Offset 0) (eq (len .RepoGroups) .Page.Limit) }} 134 134 + <div class="flex justify-center mt-8"> 135 135 + <div class="flex gap-2"> 136 136 + {{ if gt .Page.Offset 0 }} 137 137 + {{ $prev := .Page.Previous }} 138 138 + <a 139 139 + class="btn flex items-center gap-2 no-underline hover:no-underline dark:text-white dark:hover:bg-gray-700" 140 140 + hx-boost="true" 141 141 + href="/goodfirstissues?offset={{ $prev.Offset }}&limit={{ $prev.Limit }}" 142 142 + > 143 143 + {{ i "chevron-left" "w-4 h-4" }} 144 144 + previous 145 145 + </a> 146 146 + {{ else }} 147 147 + <div></div> 148 148 + {{ end }} 149 149 + 150 150 + {{ if eq (len .RepoGroups) .Page.Limit }} 151 151 + {{ $next := .Page.Next }} 152 152 + <a 153 153 + class="btn flex items-center gap-2 no-underline hover:no-underline dark:text-white dark:hover:bg-gray-700" 154 154 + hx-boost="true" 155 155 + href="/goodfirstissues?offset={{ $next.Offset }}&limit={{ $next.Limit }}" 156 156 + > 157 157 + next 158 158 + {{ i "chevron-right" "w-4 h-4" }} 159 159 + </a> 160 160 + {{ end }} 161 161 + </div> 162 162 + </div> 163 163 + {{ end }} 164 164 + {{ end }} 165 165 + </div> 166 166 + </div> 167 167 + {{ end }}

+1 -1

appview/pages/templates/labels/fragments/label.html

··· 2 2 {{ $d := .def }} 3 3 {{ $v := .val }} 4 4 {{ $withPrefix := .withPrefix }} 5 5 - <span class="flex items-center gap-2 font-normal normal-case rounded py-1 px-2 border border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-800 text-sm"> 5 5 + <span class="w-fit flex items-center gap-2 font-normal normal-case rounded py-1 px-2 border border-gray-200 dark:border-gray-700 bg-white dark:bg-gray-800 text-sm"> 6 6 {{ template "repo/fragments/colorBall" (dict "color" $d.GetColor) }} 7 7 8 8 {{ $lhs := printf "%s" $d.Name }}

+16 -12

appview/pages/templates/layouts/base.html

··· 14 14 <link rel="preconnect" href="https://avatar.tangled.sh" /> 15 15 <link rel="preconnect" href="https://camo.tangled.sh" /> 16 16 17 17 + <!-- pwa manifest --> 18 18 + <link rel="manifest" href="/pwa-manifest.json" /> 19 19 + 17 20 <!-- preload main font --> 18 21 <link rel="preload" href="/static/fonts/InterVariable.woff2" as="font" type="font/woff2" crossorigin /> 19 22 ··· 21 24 <title>{{ block "title" . }}{{ end }} · tangled</title> 22 25 {{ block "extrameta" . }}{{ end }} 23 26 </head> 24 24 - <body class="min-h-screen grid grid-cols-1 grid-rows-[min-content_auto_min-content] gap-4 bg-slate-100 dark:bg-gray-900 dark:text-white transition-colors duration-200" 25 25 - style="grid-template-columns: minmax(1rem, 1fr) minmax(auto, 1024px) minmax(1rem, 1fr);"> 27 27 + <body class="min-h-screen flex flex-col gap-4 bg-slate-100 dark:bg-gray-900 dark:text-white transition-colors duration-200"> 26 28 {{ block "topbarLayout" . }} 27 27 - <header class="px-1 col-span-full md:col-span-1 md:col-start-2" style="z-index: 20;"> 29 29 + <header class="w-full col-span-full md:col-span-1 md:col-start-2" style="z-index: 20;"> 28 30 29 31 {{ if .LoggedInUser }} 30 32 <div id="upgrade-banner" ··· 38 40 {{ end }} 39 41 40 42 {{ block "mainLayout" . }} 41 41 - <div class="px-1 col-span-full md:col-span-1 md:col-start-2 flex flex-col gap-4"> 42 42 - {{ block "contentLayout" . }} 43 43 - <main class="col-span-1 md:col-span-8"> 43 43 + <div class="flex-grow"> 44 44 + <div class="max-w-screen-lg mx-auto flex flex-col gap-4"> 45 45 + {{ block "contentLayout" . }} 46 46 + <main> 44 47 {{ block "content" . }}{{ end }} 45 48 </main> 46 46 - {{ end }} 47 47 - 48 48 - {{ block "contentAfterLayout" . }} 49 49 - <main class="col-span-1 md:col-span-8"> 49 49 + {{ end }} 50 50 + 51 51 + {{ block "contentAfterLayout" . }} 52 52 + <main> 50 53 {{ block "contentAfter" . }}{{ end }} 51 54 </main> 52 52 - {{ end }} 55 55 + {{ end }} 56 56 + </div> 53 57 </div> 54 58 {{ end }} 55 59 56 60 {{ block "footerLayout" . }} 57 57 - <footer class="px-1 col-span-full md:col-span-1 md:col-start-2 mt-12"> 61 61 + <footer class="mt-12"> 58 62 {{ template "layouts/fragments/footer" . }} 59 63 </footer> 60 64 {{ end }}

+87 -34

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

··· 1 1 {{ define "layouts/fragments/footer" }} 2 2 - <div class="w-full p-4 md:p-8 bg-white dark:bg-gray-800 rounded-t drop-shadow-sm"> 3 3 - <div class="container mx-auto max-w-7xl px-4"> 4 4 - <div class="flex flex-col lg:flex-row justify-between items-start text-gray-600 dark:text-gray-400 text-sm gap-8"> 5 5 - <div class="mb-4 md:mb-0"> 6 6 - <a href="/" hx-boost="true" class="flex gap-2 font-semibold italic no-underline hover:no-underline"> 7 7 - {{ template "fragments/logotypeSmall" }} 8 8 - </a> 9 9 - </div> 2 2 + <div class="w-full p-8 bg-white dark:bg-gray-800"> 3 3 + <div class="mx-auto px-4"> 4 4 + <div class="flex flex-col text-gray-600 dark:text-gray-400 gap-8"> 5 5 + <!-- Desktop layout: grid with 3 columns --> 6 6 + <div class="hidden lg:grid lg:grid-cols-[1fr_minmax(0,1024px)_1fr] lg:gap-8 lg:items-start"> 7 7 + <!-- Left section --> 8 8 + <div> 9 9 + <a href="/" hx-boost="true" class="flex gap-2 font-semibold italic no-underline hover:no-underline"> 10 10 + {{ template "fragments/logotypeSmall" }} 11 11 + </a> 12 12 + </div> 13 13 + 14 14 + {{ $headerStyle := "text-gray-900 dark:text-gray-200 font-bold text-sm uppercase tracking-wide mb-1" }} 15 15 + {{ $linkStyle := "text-gray-500 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-200 hover:underline inline-flex gap-1 items-center" }} 16 16 + {{ $iconStyle := "w-4 h-4 flex-shrink-0" }} 17 17 + 18 18 + <!-- Center section with max-width --> 19 19 + <div class="grid grid-cols-4 gap-2"> 20 20 + <div class="flex flex-col gap-1"> 21 21 + <div class="{{ $headerStyle }}">legal</div> 22 22 + <a href="/terms" class="{{ $linkStyle }}">{{ i "file-text" $iconStyle }} terms of service</a> 23 23 + <a href="/privacy" class="{{ $linkStyle }}">{{ i "shield" $iconStyle }} privacy policy</a> 24 24 + </div> 25 25 + 26 26 + <div class="flex flex-col gap-1"> 27 27 + <div class="{{ $headerStyle }}">resources</div> 28 28 + <a href="https://blog.tangled.org" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ i "book-open" $iconStyle }} blog</a> 29 29 + <a href="https://tangled.org/@tangled.org/core/tree/master/docs" class="{{ $linkStyle }}">{{ i "book" $iconStyle }} docs</a> 30 30 + <a href="https://tangled.org/@tangled.org/core" class="{{ $linkStyle }}">{{ i "code" $iconStyle }} source</a> 31 31 + <a href="https://tangled.org/brand" class="{{ $linkStyle }}">{{ i "paintbrush" $iconStyle }} brand</a> 32 32 + </div> 10 33 11 11 - {{ $headerStyle := "text-gray-900 dark:text-gray-200 font-bold text-xs uppercase tracking-wide mb-1" }} 12 12 - {{ $linkStyle := "text-gray-500 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-200 hover:underline inline-flex gap-1 items-center" }} 13 13 - {{ $iconStyle := "w-4 h-4 flex-shrink-0" }} 14 14 - <div class="grid grid-cols-1 sm:grid-cols-1 md:grid-cols-4 sm:gap-6 md:gap-2 gap-6 flex-1"> 15 15 - <div class="flex flex-col gap-1"> 16 16 - <div class="{{ $headerStyle }}">legal</div> 17 17 - <a href="/terms" class="{{ $linkStyle }}">{{ i "file-text" $iconStyle }} terms of service</a> 18 18 - <a href="/privacy" class="{{ $linkStyle }}">{{ i "shield" $iconStyle }} privacy policy</a> 34 34 + <div class="flex flex-col gap-1"> 35 35 + <div class="{{ $headerStyle }}">social</div> 36 36 + <a href="https://chat.tangled.org" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ i "message-circle" $iconStyle }} discord</a> 37 37 + <a href="https://web.libera.chat/#tangled" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ i "hash" $iconStyle }} irc</a> 38 38 + <a href="https://bsky.app/profile/tangled.org" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ template "user/fragments/bluesky" $iconStyle }} bluesky</a> 39 39 + </div> 40 40 + 41 41 + <div class="flex flex-col gap-1"> 42 42 + <div class="{{ $headerStyle }}">contact</div> 43 43 + <a href="mailto:team@tangled.org" class="{{ $linkStyle }}">{{ i "mail" "w-4 h-4 flex-shrink-0" }} team@tangled.org</a> 44 44 + <a href="mailto:security@tangled.org" class="{{ $linkStyle }}">{{ i "shield-check" "w-4 h-4 flex-shrink-0" }} security@tangled.org</a> 45 45 + </div> 19 46 </div> 20 47 21 21 - <div class="flex flex-col gap-1"> 22 22 - <div class="{{ $headerStyle }}">resources</div> 23 23 - <a href="https://blog.tangled.org" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ i "book-open" $iconStyle }} blog</a> 24 24 - <a href="https://tangled.org/@tangled.org/core/tree/master/docs" class="{{ $linkStyle }}">{{ i "book" $iconStyle }} docs</a> 25 25 - <a href="https://tangled.org/@tangled.org/core" class="{{ $linkStyle }}">{{ i "code" $iconStyle }} source</a> 26 26 - <a href="https://tangled.org/@tangled.org/core" class="{{ $linkStyle }}">{{ i "paintbrush" $iconStyle }} brand</a> 48 48 + <!-- Right section --> 49 49 + <div class="text-right"> 50 50 + <div class="text-xs">&copy; 2025 Tangled Labs Oy. All rights reserved.</div> 27 51 </div> 52 52 + </div> 28 53 29 29 - <div class="flex flex-col gap-1"> 30 30 - <div class="{{ $headerStyle }}">social</div> 31 31 - <a href="https://chat.tangled.org" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ i "message-circle" $iconStyle }} discord</a> 32 32 - <a href="https://web.libera.chat/#tangled" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ i "hash" $iconStyle }} irc</a> 33 33 - <a href="https://bsky.app/profile/tangled.org" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ template "user/fragments/bluesky" $iconStyle }} bluesky</a> 54 54 + <!-- Mobile layout: stacked --> 55 55 + <div class="lg:hidden flex flex-col gap-8"> 56 56 + {{ $headerStyle := "text-gray-900 dark:text-gray-200 font-bold text-xs uppercase tracking-wide mb-1" }} 57 57 + {{ $linkStyle := "text-gray-500 dark:text-gray-400 hover:text-gray-900 dark:hover:text-gray-200 hover:underline inline-flex gap-1 items-center" }} 58 58 + {{ $iconStyle := "w-4 h-4 flex-shrink-0" }} 59 59 + 60 60 + <div class="mb-4 md:mb-0"> 61 61 + <a href="/" hx-boost="true" class="flex gap-2 font-semibold italic no-underline hover:no-underline"> 62 62 + {{ template "fragments/logotypeSmall" }} 63 63 + </a> 34 64 </div> 35 65 36 36 - <div class="flex flex-col gap-1"> 37 37 - <div class="{{ $headerStyle }}">contact</div> 38 38 - <a href="mailto:team@tangled.org" class="{{ $linkStyle }}">{{ i "mail" "w-4 h-4 flex-shrink-0" }} team@tangled.org</a> 39 39 - <a href="mailto:security@tangled.org" class="{{ $linkStyle }}">{{ i "shield-check" "w-4 h-4 flex-shrink-0" }} security@tangled.org</a> 66 66 + <div class="grid grid-cols-1 sm:grid-cols-1 md:grid-cols-4 sm:gap-6 md:gap-2 gap-6"> 67 67 + <div class="flex flex-col gap-1"> 68 68 + <div class="{{ $headerStyle }}">legal</div> 69 69 + <a href="/terms" class="{{ $linkStyle }}">{{ i "file-text" $iconStyle }} terms of service</a> 70 70 + <a href="/privacy" class="{{ $linkStyle }}">{{ i "shield" $iconStyle }} privacy policy</a> 71 71 + </div> 72 72 + 73 73 + <div class="flex flex-col gap-1"> 74 74 + <div class="{{ $headerStyle }}">resources</div> 75 75 + <a href="https://blog.tangled.org" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ i "book-open" $iconStyle }} blog</a> 76 76 + <a href="https://tangled.org/@tangled.org/core/tree/master/docs" class="{{ $linkStyle }}">{{ i "book" $iconStyle }} docs</a> 77 77 + <a href="https://tangled.org/@tangled.org/core" class="{{ $linkStyle }}">{{ i "code" $iconStyle }} source</a> 78 78 + <a href="https://tangled.org/brand" class="{{ $linkStyle }}">{{ i "paintbrush" $iconStyle }} brand</a> 79 79 + </div> 80 80 + 81 81 + <div class="flex flex-col gap-1"> 82 82 + <div class="{{ $headerStyle }}">social</div> 83 83 + <a href="https://chat.tangled.org" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ i "message-circle" $iconStyle }} discord</a> 84 84 + <a href="https://web.libera.chat/#tangled" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ i "hash" $iconStyle }} irc</a> 85 85 + <a href="https://bsky.app/profile/tangled.org" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ template "user/fragments/bluesky" $iconStyle }} bluesky</a> 86 86 + </div> 87 87 + 88 88 + <div class="flex flex-col gap-1"> 89 89 + <div class="{{ $headerStyle }}">contact</div> 90 90 + <a href="mailto:team@tangled.org" class="{{ $linkStyle }}">{{ i "mail" "w-4 h-4 flex-shrink-0" }} team@tangled.org</a> 91 91 + <a href="mailto:security@tangled.org" class="{{ $linkStyle }}">{{ i "shield-check" "w-4 h-4 flex-shrink-0" }} security@tangled.org</a> 92 92 + </div> 40 93 </div> 41 41 - </div> 42 94 43 43 - <div class="text-center lg:text-right flex-shrink-0"> 44 44 - <div class="text-xs">&copy; 2025 Tangled Labs Oy. All rights reserved.</div> 95 95 + <div class="text-center"> 96 96 + <div class="text-xs">&copy; 2025 Tangled Labs Oy. All rights reserved.</div> 97 97 + </div> 45 98 </div> 46 99 </div> 47 100 </div>

+2 -2

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

··· 1 1 {{ define "layouts/fragments/topbar" }} 2 2 - <nav class="space-x-4 px-6 py-2 rounded-b bg-white dark:bg-gray-800 dark:text-white drop-shadow-sm"> 2 2 + <nav class="mx-auto space-x-4 px-6 py-2 rounded-b dark:text-white drop-shadow-sm bg-white dark:bg-gray-800"> 3 3 <div class="flex justify-between p-0 items-center"> 4 4 <div id="left-items"> 5 5 <a href="/" hx-boost="true" class="text-2xl no-underline hover:no-underline flex items-center gap-2"> ··· 51 51 <summary 52 52 class="cursor-pointer list-none flex items-center gap-1" 53 53 > 54 54 - {{ $user := didOrHandle .Did .Handle }} 54 54 + {{ $user := .Did }} 55 55 <img 56 56 src="{{ tinyAvatar $user }}" 57 57 alt=""

+68 -199

appview/pages/templates/notifications/fragments/item.html

··· 1 1 {{define "notifications/fragments/item"}} 2 2 - <div class="border border-gray-200 dark:border-gray-700 rounded-sm p-3 hover:bg-gray-50 dark:hover:bg-gray-700 transition-colors {{if not .Read}}bg-blue-50 dark:bg-blue-900/20{{end}}"> 3 3 - {{if .Issue}} 4 4 - {{template "issueNotification" .}} 5 5 - {{else if .Pull}} 6 6 - {{template "pullNotification" .}} 7 7 - {{else if .Repo}} 8 8 - {{template "repoNotification" .}} 9 9 - {{else if eq .Type "followed"}} 10 10 - {{template "followNotification" .}} 11 11 - {{else}} 12 12 - {{template "genericNotification" .}} 13 13 - {{end}} 14 14 - </div> 15 15 - {{end}} 16 16 - 17 17 - {{define "issueNotification"}} 18 18 - {{$url := printf "/%s/%s/issues/%d" (resolve .Repo.Did) .Repo.Name .Issue.IssueId}} 19 19 - <a 20 20 - href="{{$url}}" 21 21 - class="block no-underline hover:no-underline text-inherit -m-3 p-3" 22 22 - > 23 23 - <div class="flex items-center justify-between"> 24 24 - <div class="min-w-0 flex-1"> 25 25 - <!-- First line: icon + actor action --> 26 26 - <div class="flex items-center gap-2 text-gray-900 dark:text-white"> 27 27 - {{if eq .Type "issue_created"}} 28 28 - <span class="text-green-600 dark:text-green-500"> 29 29 - {{ i "circle-dot" "w-4 h-4" }} 30 30 - </span> 31 31 - {{else if eq .Type "issue_commented"}} 32 32 - <span class="text-gray-500 dark:text-gray-400"> 33 33 - {{ i "message-circle" "w-4 h-4" }} 34 34 - </span> 35 35 - {{else if eq .Type "issue_closed"}} 36 36 - <span class="text-gray-500 dark:text-gray-400"> 37 37 - {{ i "ban" "w-4 h-4" }} 38 38 - </span> 39 39 - {{end}} 40 40 - {{template "user/fragments/picHandle" (resolve .ActorDid)}} 41 41 - {{if eq .Type "issue_created"}} 42 42 - <span class="text-gray-500 dark:text-gray-400">opened issue</span> 43 43 - {{else if eq .Type "issue_commented"}} 44 44 - <span class="text-gray-500 dark:text-gray-400">commented on issue</span> 45 45 - {{else if eq .Type "issue_closed"}} 46 46 - <span class="text-gray-500 dark:text-gray-400">closed issue</span> 47 47 - {{end}} 48 48 - {{if not .Read}} 49 49 - <div class="w-2 h-2 bg-blue-500 rounded-full flex-shrink-0 ml-1"></div> 50 50 - {{end}} 2 2 + <a href="{{ template "notificationUrl" . }}" class="block no-underline hover:no-underline"> 3 3 + <div 4 4 + class=" 5 5 + w-full mx-auto rounded drop-shadow-sm dark:text-white bg-white dark:bg-gray-800 px-2 md:px-6 py-4 transition-colors 6 6 + {{if not .Read}}bg-blue-50 dark:bg-blue-800/20 border border-blue-500 dark:border-sky-800{{end}} 7 7 + flex gap-2 items-center 8 8 + "> 9 9 + {{ template "notificationIcon" . }} 10 10 + <div class="flex-1 w-full flex flex-col gap-1"> 11 11 + <span>{{ template "notificationHeader" . }}</span> 12 12 + <span class="text-sm text-gray-500 dark:text-gray-400">{{ template "notificationSummary" . }}</span> 51 13 </div> 52 14 53 53 - <div class="text-sm text-gray-600 dark:text-gray-400 mt-0.5 ml-6 flex items-center gap-1"> 54 54 - <span class="text-gray-500 dark:text-gray-400">#{{.Issue.IssueId}}</span> 55 55 - <span class="text-gray-900 dark:text-white truncate">{{.Issue.Title}}</span> 56 56 - <span>on</span> 57 57 - <span class="font-medium text-gray-900 dark:text-white">{{resolve .Repo.Did}}/{{.Repo.Name}}</span> 58 58 - </div> 59 15 </div> 60 60 - 61 61 - <div class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0 ml-2"> 62 62 - {{ template "repo/fragments/time" .Created }} 63 63 - </div> 64 64 - </div> 65 65 - </a> 16 16 + </a> 66 17 {{end}} 67 18 68 68 - {{define "pullNotification"}} 69 69 - {{$url := printf "/%s/%s/pulls/%d" (resolve .Repo.Did) .Repo.Name .Pull.PullId}} 70 70 - <a 71 71 - href="{{$url}}" 72 72 - class="block no-underline hover:no-underline text-inherit -m-3 p-3" 73 73 - > 74 74 - <div class="flex items-center justify-between"> 75 75 - <div class="min-w-0 flex-1"> 76 76 - <div class="flex items-center gap-2 text-gray-900 dark:text-white"> 77 77 - {{if eq .Type "pull_created"}} 78 78 - <span class="text-green-600 dark:text-green-500"> 79 79 - {{ i "git-pull-request-create" "w-4 h-4" }} 80 80 - </span> 81 81 - {{else if eq .Type "pull_commented"}} 82 82 - <span class="text-gray-500 dark:text-gray-400"> 83 83 - {{ i "message-circle" "w-4 h-4" }} 84 84 - </span> 85 85 - {{else if eq .Type "pull_merged"}} 86 86 - <span class="text-purple-600 dark:text-purple-500"> 87 87 - {{ i "git-merge" "w-4 h-4" }} 88 88 - </span> 89 89 - {{else if eq .Type "pull_closed"}} 90 90 - <span class="text-red-600 dark:text-red-500"> 91 91 - {{ i "git-pull-request-closed" "w-4 h-4" }} 92 92 - </span> 93 93 - {{end}} 94 94 - {{template "user/fragments/picHandle" (resolve .ActorDid)}} 95 95 - {{if eq .Type "pull_created"}} 96 96 - <span class="text-gray-500 dark:text-gray-400">opened pull request</span> 97 97 - {{else if eq .Type "pull_commented"}} 98 98 - <span class="text-gray-500 dark:text-gray-400">commented on pull request</span> 99 99 - {{else if eq .Type "pull_merged"}} 100 100 - <span class="text-gray-500 dark:text-gray-400">merged pull request</span> 101 101 - {{else if eq .Type "pull_closed"}} 102 102 - <span class="text-gray-500 dark:text-gray-400">closed pull request</span> 103 103 - {{end}} 104 104 - {{if not .Read}} 105 105 - <div class="w-2 h-2 bg-blue-500 rounded-full flex-shrink-0 ml-1"></div> 106 106 - {{end}} 107 107 - </div> 108 108 - 109 109 - <div class="text-sm text-gray-600 dark:text-gray-400 mt-0.5 ml-6 flex items-center gap-1"> 110 110 - <span class="text-gray-500 dark:text-gray-400">#{{.Pull.PullId}}</span> 111 111 - <span class="text-gray-900 dark:text-white truncate">{{.Pull.Title}}</span> 112 112 - <span>on</span> 113 113 - <span class="font-medium text-gray-900 dark:text-white">{{resolve .Repo.Did}}/{{.Repo.Name}}</span> 114 114 - </div> 115 115 - </div> 116 116 - 117 117 - <div class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0 ml-2"> 118 118 - {{ template "repo/fragments/time" .Created }} 19 19 + {{ define "notificationIcon" }} 20 20 + <div class="flex-shrink-0 max-h-full w-16 h-16 relative"> 21 21 + <img class="object-cover rounded-full p-2" src="{{ fullAvatar .ActorDid }}" /> 22 22 + <div class="absolute border-2 border-white dark:border-gray-800 bg-gray-200 dark:bg-gray-700 bottom-1 right-1 rounded-full p-2 flex items-center justify-center z-10"> 23 23 + {{ i .Icon "size-3 text-black dark:text-white" }} 119 24 </div> 120 25 </div> 121 121 - </a> 122 122 - {{end}} 26 26 + {{ end }} 123 27 124 124 - {{define "repoNotification"}} 125 125 - {{$url := printf "/%s/%s" (resolve .Repo.Did) .Repo.Name}} 126 126 - <a 127 127 - href="{{$url}}" 128 128 - class="block no-underline hover:no-underline text-inherit -m-3 p-3" 129 129 - > 130 130 - <div class="flex items-center justify-between"> 131 131 - <div class="flex items-center gap-2 min-w-0 flex-1"> 132 132 - <span class="text-yellow-500 dark:text-yellow-400"> 133 133 - {{ i "star" "w-4 h-4" }} 134 134 - </span> 28 28 + {{ define "notificationHeader" }} 29 29 + {{ $actor := resolve .ActorDid }} 135 30 136 136 - <div class="min-w-0 flex-1"> 137 137 - <!-- Single line for stars: actor action subject --> 138 138 - <div class="flex items-center gap-1 text-gray-900 dark:text-white"> 139 139 - {{template "user/fragments/picHandle" (resolve .ActorDid)}} 140 140 - <span class="text-gray-500 dark:text-gray-400">starred</span> 141 141 - <span class="font-medium">{{resolve .Repo.Did}}/{{.Repo.Name}}</span> 142 142 - {{if not .Read}} 143 143 - <div class="w-2 h-2 bg-blue-500 rounded-full flex-shrink-0 ml-1"></div> 144 144 - {{end}} 145 145 - </div> 146 146 - </div> 147 147 - </div> 31 31 + <span class="text-black dark:text-white w-fit">{{ $actor }}</span> 32 32 + {{ if eq .Type "repo_starred" }} 33 33 + starred <span class="text-black dark:text-white">{{ resolve .Repo.Did }}/{{ .Repo.Name }}</span> 34 34 + {{ else if eq .Type "issue_created" }} 35 35 + opened an issue 36 36 + {{ else if eq .Type "issue_commented" }} 37 37 + commented on an issue 38 38 + {{ else if eq .Type "issue_closed" }} 39 39 + closed an issue 40 40 + {{ else if eq .Type "pull_created" }} 41 41 + created a pull request 42 42 + {{ else if eq .Type "pull_commented" }} 43 43 + commented on a pull request 44 44 + {{ else if eq .Type "pull_merged" }} 45 45 + merged a pull request 46 46 + {{ else if eq .Type "pull_closed" }} 47 47 + closed a pull request 48 48 + {{ else if eq .Type "followed" }} 49 49 + followed you 50 50 + {{ else }} 51 51 + {{ end }} 52 52 + {{ end }} 148 53 149 149 - <div class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0 ml-2"> 150 150 - {{ template "repo/fragments/time" .Created }} 151 151 - </div> 152 152 - </div> 153 153 - </a> 154 154 - {{end}} 54 54 + {{ define "notificationSummary" }} 55 55 + {{ if eq .Type "repo_starred" }} 56 56 + <!-- no summary --> 57 57 + {{ else if .Issue }} 58 58 + #{{.Issue.IssueId}} {{.Issue.Title}} on {{resolve .Repo.Did}}/{{.Repo.Name}} 59 59 + {{ else if .Pull }} 60 60 + #{{.Pull.PullId}} {{.Pull.Title}} on {{resolve .Repo.Did}}/{{.Repo.Name}} 61 61 + {{ else if eq .Type "followed" }} 62 62 + <!-- no summary --> 63 63 + {{ else }} 64 64 + {{ end }} 65 65 + {{ end }} 155 66 156 156 - {{define "followNotification"}} 157 157 - {{$url := printf "/%s" (resolve .ActorDid)}} 158 158 - <a 159 159 - href="{{$url}}" 160 160 - class="block no-underline hover:no-underline text-inherit -m-3 p-3" 161 161 - > 162 162 - <div class="flex items-center justify-between"> 163 163 - <div class="flex items-center gap-2 min-w-0 flex-1"> 164 164 - <span class="text-blue-600 dark:text-blue-400"> 165 165 - {{ i "user-plus" "w-4 h-4" }} 166 166 - </span> 167 167 - 168 168 - <div class="min-w-0 flex-1"> 169 169 - <div class="flex items-center gap-1 text-gray-900 dark:text-white"> 170 170 - {{template "user/fragments/picHandle" (resolve .ActorDid)}} 171 171 - <span class="text-gray-500 dark:text-gray-400">followed you</span> 172 172 - {{if not .Read}} 173 173 - <div class="w-2 h-2 bg-blue-500 rounded-full flex-shrink-0 ml-1"></div> 174 174 - {{end}} 175 175 - </div> 176 176 - </div> 177 177 - </div> 178 178 - 179 179 - <div class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0 ml-2"> 180 180 - {{ template "repo/fragments/time" .Created }} 181 181 - </div> 182 182 - </div> 183 183 - </a> 184 184 - {{end}} 185 185 - 186 186 - {{define "genericNotification"}} 187 187 - <a 188 188 - href="#" 189 189 - class="block no-underline hover:no-underline text-inherit -m-3 p-3" 190 190 - > 191 191 - <div class="flex items-center justify-between"> 192 192 - <div class="flex items-center gap-2 min-w-0 flex-1"> 193 193 - <span class="{{if not .Read}}text-blue-600 dark:text-blue-400{{else}}text-gray-500 dark:text-gray-400{{end}}"> 194 194 - {{ i "bell" "w-4 h-4" }} 195 195 - </span> 67 67 + {{ define "notificationUrl" }} 68 68 + {{ $url := "" }} 69 69 + {{ if eq .Type "repo_starred" }} 70 70 + {{$url = printf "/%s/%s" (resolve .Repo.Did) .Repo.Name}} 71 71 + {{ else if .Issue }} 72 72 + {{$url = printf "/%s/%s/issues/%d" (resolve .Repo.Did) .Repo.Name .Issue.IssueId}} 73 73 + {{ else if .Pull }} 74 74 + {{$url = printf "/%s/%s/pulls/%d" (resolve .Repo.Did) .Repo.Name .Pull.PullId}} 75 75 + {{ else if eq .Type "followed" }} 76 76 + {{$url = printf "/%s" (resolve .ActorDid)}} 77 77 + {{ else }} 78 78 + {{ end }} 196 79 197 197 - <div class="min-w-0 flex-1"> 198 198 - <div class="flex items-center gap-1 text-gray-900 dark:text-white"> 199 199 - <span>New notification</span> 200 200 - {{if not .Read}} 201 201 - <div class="w-2 h-2 bg-blue-500 rounded-full flex-shrink-0 ml-1"></div> 202 202 - {{end}} 203 203 - </div> 204 204 - </div> 205 205 - </div> 206 206 - 207 207 - <div class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0 ml-2"> 208 208 - {{ template "repo/fragments/time" .Created }} 209 209 - </div> 210 210 - </div> 211 211 - </a> 212 212 - {{end}} 80 80 + {{ $url }} 81 81 + {{ end }}

+44 -25

appview/pages/templates/notifications/list.html

··· 1 1 {{ define "title" }}notifications{{ end }} 2 2 3 3 {{ define "content" }} 4 4 - <div class="p-6"> 5 5 - <div class="flex items-center justify-between mb-4"> 4 4 + <div class="px-6 py-4"> 5 5 + <div class="flex items-center justify-between"> 6 6 <p class="text-xl font-bold dark:text-white">Notifications</p> 7 7 <a href="/settings/notifications" class="flex items-center gap-2"> 8 8 {{ i "settings" "w-4 h-4" }} ··· 11 11 </div> 12 12 </div> 13 13 14 14 - <div class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white"> 15 15 - {{if .Notifications}} 16 16 - <div class="flex flex-col gap-4" id="notifications-list"> 17 17 - {{range .Notifications}} 18 18 - {{template "notifications/fragments/item" .}} 19 19 - {{end}} 20 20 - </div> 14 14 + {{if .Notifications}} 15 15 + <div class="flex flex-col gap-2" id="notifications-list"> 16 16 + {{range .Notifications}} 17 17 + {{template "notifications/fragments/item" .}} 18 18 + {{end}} 19 19 + </div> 21 20 22 22 - {{if .HasMore}} 23 23 - <div class="mt-6 text-center"> 24 24 - <button 25 25 - class="btn gap-2 group" 26 26 - hx-get="/notifications?offset={{.NextOffset}}&limit={{.Limit}}" 27 27 - hx-target="#notifications-list" 28 28 - hx-swap="beforeend" 29 29 - > 30 30 - {{ i "chevron-down" "w-4 h-4 group-[.htmx-request]:hidden" }} 31 31 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 32 32 - Load more 33 33 - </button> 34 34 - </div> 35 35 - {{end}} 36 36 - {{else}} 21 21 + {{else}} 22 22 + <div class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white"> 37 23 <div class="text-center py-12"> 38 24 <div class="w-16 h-16 mx-auto mb-4 text-gray-300 dark:text-gray-600"> 39 25 {{ i "bell-off" "w-16 h-16" }} ··· 41 27 <h3 class="text-lg font-medium text-gray-900 dark:text-white mb-2">No notifications</h3> 42 28 <p class="text-gray-600 dark:text-gray-400">When you receive notifications, they'll appear here.</p> 43 29 </div> 44 44 - {{end}} 30 30 + </div> 31 31 + {{end}} 32 32 + 33 33 + {{ template "pagination" . }} 34 34 + {{ end }} 35 35 + 36 36 + {{ define "pagination" }} 37 37 + <div class="flex justify-end mt-4 gap-2"> 38 38 + {{ if gt .Page.Offset 0 }} 39 39 + {{ $prev := .Page.Previous }} 40 40 + <a 41 41 + class="btn flex items-center gap-2 no-underline hover:no-underline dark:text-white dark:hover:bg-gray-700" 42 42 + hx-boost="true" 43 43 + href = "/notifications?offset={{ $prev.Offset }}&limit={{ $prev.Limit }}" 44 44 + > 45 45 + {{ i "chevron-left" "w-4 h-4" }} 46 46 + previous 47 47 + </a> 48 48 + {{ else }} 49 49 + <div></div> 50 50 + {{ end }} 51 51 + 52 52 + {{ $next := .Page.Next }} 53 53 + {{ if lt $next.Offset .Total }} 54 54 + {{ $next := .Page.Next }} 55 55 + <a 56 56 + class="btn flex items-center gap-2 no-underline hover:no-underline dark:text-white dark:hover:bg-gray-700" 57 57 + hx-boost="true" 58 58 + href = "/notifications?offset={{ $next.Offset }}&limit={{ $next.Limit }}" 59 59 + > 60 60 + next 61 61 + {{ i "chevron-right" "w-4 h-4" }} 62 62 + </a> 63 63 + {{ end }} 45 64 </div> 46 65 {{ end }}

+3 -3

appview/pages/templates/repo/commit.html

··· 80 80 {{end}} 81 81 82 82 {{ define "topbarLayout" }} 83 83 - <header class="px-1 col-span-full" style="z-index: 20;"> 83 83 + <header class="col-span-full" style="z-index: 20;"> 84 84 {{ template "layouts/fragments/topbar" . }} 85 85 </header> 86 86 {{ end }} 87 87 88 88 {{ define "mainLayout" }} 89 89 - <div class="px-1 col-span-full flex flex-col gap-4"> 89 89 + <div class="px-1 flex-grow col-span-full flex flex-col gap-4"> 90 90 {{ block "contentLayout" . }} 91 91 {{ block "content" . }}{{ end }} 92 92 {{ end }} ··· 105 105 {{ end }} 106 106 107 107 {{ define "footerLayout" }} 108 108 - <footer class="px-1 col-span-full mt-12"> 108 108 + <footer class="col-span-full mt-12"> 109 109 {{ template "layouts/fragments/footer" . }} 110 110 </footer> 111 111 {{ end }}

+7

appview/pages/templates/repo/fork.html

··· 6 6 </div> 7 7 <div class="p-6 bg-white dark:bg-gray-800 drop-shadow-sm rounded"> 8 8 <form hx-post="/{{ .RepoInfo.FullName }}/fork" class="space-y-12" hx-swap="none" hx-indicator="#spinner"> 9 9 + 10 10 + <fieldset class="space-y-3"> 11 11 + <legend for="repo_name" class="dark:text-white">Repository name</legend> 12 12 + <input type="text" id="repo_name" name="repo_name" value="{{ .RepoInfo.Name }}" 13 13 + class="w-full p-2 border rounded bg-gray-100 dark:bg-gray-700 dark:text-white dark:border-gray-600" /> 14 14 + </fieldset> 15 15 + 9 16 <fieldset class="space-y-3"> 10 17 <legend class="dark:text-white">Select a knot to fork into</legend> 11 18 <div class="space-y-2">

+1 -1

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

··· 1 1 {{ define "repo/fragments/cloneDropdown" }} 2 2 {{ $knot := .RepoInfo.Knot }} 3 3 {{ if eq $knot "knot1.tangled.sh" }} 4 4 - {{ $knot = "tangled.sh" }} 4 4 + {{ $knot = "tangled.org" }} 5 5 {{ end }} 6 6 7 7 <details id="clone-dropdown" class="relative inline-block text-left group">

+1 -1

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

··· 1 1 {{ define "repo/fragments/labelPanel" }} 2 2 - <div id="label-panel" class="flex flex-col gap-6"> 2 2 + <div id="label-panel" class="flex flex-col gap-6 px-2 md:px-0"> 3 3 {{ template "basicLabels" . }} 4 4 {{ template "kvLabels" . }} 5 5 </div>

+9 -1

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

··· 2 2 {{ $title := or .Title .RepoInfo.FullName }} 3 3 {{ $description := or .Description .RepoInfo.Description }} 4 4 {{ $url := or .Url (printf "https://tangled.org/%s" .RepoInfo.FullName) }} 5 5 - 5 5 + {{ $imageUrl := printf "https://tangled.org/%s/opengraph" .RepoInfo.FullName }} 6 6 7 7 <meta property="og:title" content="{{ unescapeHtml $title }}" /> 8 8 <meta property="og:type" content="object" /> 9 9 <meta property="og:url" content="{{ $url }}" /> 10 10 <meta property="og:description" content="{{ $description }}" /> 11 11 + <meta property="og:image" content="{{ $imageUrl }}" /> 12 12 + <meta property="og:image:width" content="1200" /> 13 13 + <meta property="og:image:height" content="600" /> 14 14 + 15 15 + <meta name="twitter:card" content="summary_large_image" /> 16 16 + <meta name="twitter:title" content="{{ unescapeHtml $title }}" /> 17 17 + <meta name="twitter:description" content="{{ $description }}" /> 18 18 + <meta name="twitter:image" content="{{ $imageUrl }}" /> 11 19 {{ end }}

+26

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

··· 1 1 + {{ define "repo/fragments/participants" }} 2 2 + {{ $all := . }} 3 3 + {{ $ps := take $all 5 }} 4 4 + <div class="px-2 md:px-0"> 5 5 + <div class="py-1 flex items-center text-sm"> 6 6 + <span class="font-bold text-gray-500 dark:text-gray-400 capitalize">Participants</span> 7 7 + <span class="bg-gray-200 dark:bg-gray-700 rounded py-1/2 px-1 ml-1">{{ len $all }}</span> 8 8 + </div> 9 9 + <div class="flex items-center -space-x-3 mt-2"> 10 10 + {{ $c := "z-50 z-40 z-30 z-20 z-10" }} 11 11 + {{ range $i, $p := $ps }} 12 12 + <img 13 13 + src="{{ tinyAvatar . }}" 14 14 + alt="" 15 15 + class="rounded-full h-8 w-8 mr-1 border-2 border-gray-100 dark:border-gray-900 z-{{sub 5 $i}}0" 16 16 + /> 17 17 + {{ end }} 18 18 + 19 19 + {{ if gt (len $all) 5 }} 20 20 + <span class="pl-4 text-gray-500 dark:text-gray-400 text-sm"> 21 21 + +{{ sub (len $all) 5 }} 22 22 + </span> 23 23 + {{ end }} 24 24 + </div> 25 25 + </div> 26 26 + {{ end }}

+6 -1

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

··· 2 2 <button 3 3 id="reactIndi-{{ .Kind }}" 4 4 class="flex justify-center items-center min-w-8 min-h-8 rounded border 5 5 - leading-4 px-3 gap-1 5 5 + leading-4 px-3 gap-1 relative group 6 6 {{ if eq .Count 0 }} 7 7 hidden 8 8 {{ end }} ··· 20 20 dark:hover:border-gray-600 21 21 {{ end }} 22 22 " 23 23 + {{ if gt (length .Users) 0 }} 24 24 + title="{{ range $i, $did := .Users }}{{ if ne $i 0 }}, {{ end }}{{ resolve $did }}{{ end }}{{ if gt .Count (length .Users) }}, and {{ sub .Count (length .Users) }} more{{ end }}" 25 25 + {{ else }} 26 26 + title="{{ .Kind }}" 27 27 + {{ end }} 23 28 {{ if .IsReacted }} 24 29 hx-delete="/react?subject={{ .ThreadAt }}&kind={{ .Kind }}" 25 30 {{ else }}

+63

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

··· 1 1 + {{ define "repo/issues/fragments/globalIssueListing" }} 2 2 + <div class="flex flex-col gap-2"> 3 3 + {{ range .Issues }} 4 4 + <div class="rounded drop-shadow-sm bg-white px-6 py-4 dark:bg-gray-800 dark:border-gray-700"> 5 5 + <div class="pb-2 mb-3"> 6 6 + <div class="flex items-center gap-3 mb-2"> 7 7 + <a 8 8 + href="/{{ resolve .Repo.Did }}/{{ .Repo.Name }}" 9 9 + class="text-blue-600 dark:text-blue-400 font-medium hover:underline text-sm" 10 10 + > 11 11 + {{ resolve .Repo.Did }}/{{ .Repo.Name }} 12 12 + </a> 13 13 + </div> 14 14 + <a 15 15 + href="/{{ resolve .Repo.Did }}/{{ .Repo.Name }}/issues/{{ .IssueId }}" 16 16 + class="no-underline hover:underline" 17 17 + > 18 18 + {{ .Title | description }} 19 19 + <span class="text-gray-500">#{{ .IssueId }}</span> 20 20 + </a> 21 21 + </div> 22 22 + <div class="text-sm text-gray-500 dark:text-gray-400 flex flex-wrap items-center gap-1"> 23 23 + {{ $bgColor := "bg-gray-800 dark:bg-gray-700" }} 24 24 + {{ $icon := "ban" }} 25 25 + {{ $state := "closed" }} 26 26 + {{ if .Open }} 27 27 + {{ $bgColor = "bg-green-600 dark:bg-green-700" }} 28 28 + {{ $icon = "circle-dot" }} 29 29 + {{ $state = "open" }} 30 30 + {{ end }} 31 31 + 32 32 + <span class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }} text-sm"> 33 33 + {{ i $icon "w-3 h-3 mr-1.5 text-white dark:text-white" }} 34 34 + <span class="text-white dark:text-white">{{ $state }}</span> 35 35 + </span> 36 36 + 37 37 + <span class="ml-1"> 38 38 + {{ template "user/fragments/picHandleLink" .Did }} 39 39 + </span> 40 40 + 41 41 + <span class="before:content-['·']"> 42 42 + {{ template "repo/fragments/time" .Created }} 43 43 + </span> 44 44 + 45 45 + <span class="before:content-['·']"> 46 46 + {{ $s := "s" }} 47 47 + {{ if eq (len .Comments) 1 }} 48 48 + {{ $s = "" }} 49 49 + {{ end }} 50 50 + <a href="/{{ resolve .Repo.Did }}/{{ .Repo.Name }}/issues/{{ .IssueId }}" class="text-gray-500 dark:text-gray-400">{{ len .Comments }} comment{{$s}}</a> 51 51 + </span> 52 52 + 53 53 + {{ $state := .Labels }} 54 54 + {{ range $k, $d := $.LabelDefs }} 55 55 + {{ range $v, $s := $state.GetValSet $d.AtUri.String }} 56 56 + {{ template "labels/fragments/label" (dict "def" $d "val" $v "withPrefix" true) }} 57 57 + {{ end }} 58 58 + {{ end }} 59 59 + </div> 60 60 + </div> 61 61 + {{ end }} 62 62 + </div> 63 63 + {{ end }}

+55

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

··· 1 1 + {{ define "repo/issues/fragments/issueListing" }} 2 2 + <div class="flex flex-col gap-2"> 3 3 + {{ range .Issues }} 4 4 + <div class="rounded drop-shadow-sm bg-white px-6 py-4 dark:bg-gray-800 dark:border-gray-700"> 5 5 + <div class="pb-2"> 6 6 + <a 7 7 + href="/{{ $.RepoPrefix }}/issues/{{ .IssueId }}" 8 8 + class="no-underline hover:underline" 9 9 + > 10 10 + {{ .Title | description }} 11 11 + <span class="text-gray-500">#{{ .IssueId }}</span> 12 12 + </a> 13 13 + </div> 14 14 + <div class="text-sm text-gray-500 dark:text-gray-400 flex flex-wrap items-center gap-1"> 15 15 + {{ $bgColor := "bg-gray-800 dark:bg-gray-700" }} 16 16 + {{ $icon := "ban" }} 17 17 + {{ $state := "closed" }} 18 18 + {{ if .Open }} 19 19 + {{ $bgColor = "bg-green-600 dark:bg-green-700" }} 20 20 + {{ $icon = "circle-dot" }} 21 21 + {{ $state = "open" }} 22 22 + {{ end }} 23 23 + 24 24 + <span class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }} text-sm"> 25 25 + {{ i $icon "w-3 h-3 mr-1.5 text-white dark:text-white" }} 26 26 + <span class="text-white dark:text-white">{{ $state }}</span> 27 27 + </span> 28 28 + 29 29 + <span class="ml-1"> 30 30 + {{ template "user/fragments/picHandleLink" .Did }} 31 31 + </span> 32 32 + 33 33 + <span class="before:content-['·']"> 34 34 + {{ template "repo/fragments/time" .Created }} 35 35 + </span> 36 36 + 37 37 + <span class="before:content-['·']"> 38 38 + {{ $s := "s" }} 39 39 + {{ if eq (len .Comments) 1 }} 40 40 + {{ $s = "" }} 41 41 + {{ end }} 42 42 + <a href="/{{ $.RepoPrefix }}/issues/{{ .IssueId }}" class="text-gray-500 dark:text-gray-400">{{ len .Comments }} comment{{$s}}</a> 43 43 + </span> 44 44 + 45 45 + {{ $state := .Labels }} 46 46 + {{ range $k, $d := $.LabelDefs }} 47 47 + {{ range $v, $s := $state.GetValSet $d.AtUri.String }} 48 48 + {{ template "labels/fragments/label" (dict "def" $d "val" $v "withPrefix" true) }} 49 49 + {{ end }} 50 50 + {{ end }} 51 51 + </div> 52 52 + </div> 53 53 + {{ end }} 54 54 + </div> 55 55 + {{ end }}

+7 -2

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

··· 138 138 </div> 139 139 </form> 140 140 {{ else }} 141 141 - <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-4 px-4 relative w-fit"> 142 142 - <a href="/login" class="underline">login</a> to join the discussion 141 141 + <div class="bg-amber-50 dark:bg-amber-900 border border-amber-500 rounded drop-shadow-sm p-6 relative flex gap-2 items-center"> 142 142 + <a href="/signup" class="btn-create py-0 hover:no-underline hover:text-white flex items-center gap-2"> 143 143 + sign up 144 144 + </a> 145 145 + <span class="text-gray-500 dark:text-gray-400">or</span> 146 146 + <a href="/login" class="underline">login</a> 147 147 + to add to the discussion 143 148 </div> 144 149 {{ end }} 145 150 {{ end }}

+5 -29

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

··· 22 22 "Defs" $.LabelDefs 23 23 "Subject" $.Issue.AtUri 24 24 "State" $.Issue.Labels) }} 25 25 - {{ template "issueParticipants" . }} 25 25 + {{ template "repo/fragments/participants" $.Issue.Participants }} 26 26 </div> 27 27 </div> 28 28 {{ end }} ··· 110 110 <div class="flex items-center gap-2"> 111 111 {{ template "repo/fragments/reactionsPopUp" .OrderedReactionKinds }} 112 112 {{ range $kind := .OrderedReactionKinds }} 113 113 + {{ $reactionData := index $.Reactions $kind }} 113 114 {{ 114 115 template "repo/fragments/reaction" 115 116 (dict 116 117 "Kind" $kind 117 117 - "Count" (index $.Reactions $kind) 118 118 + "Count" $reactionData.Count 118 119 "IsReacted" (index $.UserReacted $kind) 119 119 - "ThreadAt" $.Issue.AtUri) 120 120 + "ThreadAt" $.Issue.AtUri 121 121 + "Users" $reactionData.Users) 120 122 }} 121 123 {{ end }} 122 124 </div> 123 125 {{ end }} 124 126 125 125 - {{ define "issueParticipants" }} 126 126 - {{ $all := .Issue.Participants }} 127 127 - {{ $ps := take $all 5 }} 128 128 - <div> 129 129 - <div class="py-1 flex items-center text-sm"> 130 130 - <span class="font-bold text-gray-500 dark:text-gray-400 capitalize">Participants</span> 131 131 - <span class="bg-gray-200 dark:bg-gray-700 rounded py-1/2 px-1 ml-1">{{ len $all }}</span> 132 132 - </div> 133 133 - <div class="flex items-center -space-x-3 mt-2"> 134 134 - {{ $c := "z-50 z-40 z-30 z-20 z-10" }} 135 135 - {{ range $i, $p := $ps }} 136 136 - <img 137 137 - src="{{ tinyAvatar . }}" 138 138 - alt="" 139 139 - class="rounded-full h-8 w-8 mr-1 border-2 border-gray-100 dark:border-gray-900 z-{{sub 5 $i}}0" 140 140 - /> 141 141 - {{ end }} 142 142 - 143 143 - {{ if gt (len $all) 5 }} 144 144 - <span class="pl-4 text-gray-500 dark:text-gray-400 text-sm"> 145 145 - +{{ sub (len $all) 5 }} 146 146 - </span> 147 147 - {{ end }} 148 148 - </div> 149 149 - </div> 150 150 - {{ end }} 151 127 152 128 {{ define "repoAfter" }} 153 129 <div class="flex flex-col gap-4 mt-4">

+2 -52

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

··· 37 37 {{ end }} 38 38 39 39 {{ define "repoAfter" }} 40 40 - <div class="flex flex-col gap-2 mt-2"> 41 41 - {{ range .Issues }} 42 42 - <div class="rounded drop-shadow-sm bg-white px-6 py-4 dark:bg-gray-800 dark:border-gray-700"> 43 43 - <div class="pb-2"> 44 44 - <a 45 45 - href="/{{ $.RepoInfo.FullName }}/issues/{{ .IssueId }}" 46 46 - class="no-underline hover:underline" 47 47 - > 48 48 - {{ .Title | description }} 49 49 - <span class="text-gray-500">#{{ .IssueId }}</span> 50 50 - </a> 51 51 - </div> 52 52 - <div class="text-sm text-gray-500 dark:text-gray-400 flex flex-wrap items-center gap-1"> 53 53 - {{ $bgColor := "bg-gray-800 dark:bg-gray-700" }} 54 54 - {{ $icon := "ban" }} 55 55 - {{ $state := "closed" }} 56 56 - {{ if .Open }} 57 57 - {{ $bgColor = "bg-green-600 dark:bg-green-700" }} 58 58 - {{ $icon = "circle-dot" }} 59 59 - {{ $state = "open" }} 60 60 - {{ end }} 61 61 - 62 62 - <span class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }} text-sm"> 63 63 - {{ i $icon "w-3 h-3 mr-1.5 text-white dark:text-white" }} 64 64 - <span class="text-white dark:text-white">{{ $state }}</span> 65 65 - </span> 66 66 - 67 67 - <span class="ml-1"> 68 68 - {{ template "user/fragments/picHandleLink" .Did }} 69 69 - </span> 70 70 - 71 71 - <span class="before:content-['·']"> 72 72 - {{ template "repo/fragments/time" .Created }} 73 73 - </span> 74 74 - 75 75 - <span class="before:content-['·']"> 76 76 - {{ $s := "s" }} 77 77 - {{ if eq (len .Comments) 1 }} 78 78 - {{ $s = "" }} 79 79 - {{ end }} 80 80 - <a href="/{{ $.RepoInfo.FullName }}/issues/{{ .IssueId }}" class="text-gray-500 dark:text-gray-400">{{ len .Comments }} comment{{$s}}</a> 81 81 - </span> 82 82 - 83 83 - {{ $state := .Labels }} 84 84 - {{ range $k, $d := $.LabelDefs }} 85 85 - {{ range $v, $s := $state.GetValSet $d.AtUri.String }} 86 86 - {{ template "labels/fragments/label" (dict "def" $d "val" $v "withPrefix" true) }} 87 87 - {{ end }} 88 88 - {{ end }} 89 89 - </div> 90 90 - </div> 91 91 - {{ end }} 40 40 + <div class="mt-2"> 41 41 + {{ template "repo/issues/fragments/issueListing" (dict "Issues" .Issues "RepoPrefix" .RepoInfo.FullName "LabelDefs" .LabelDefs) }} 92 42 </div> 93 43 {{ block "pagination" . }} {{ end }} 94 44 {{ end }}

+11

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

··· 33 33 <span>comment</span> 34 34 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 35 35 </button> 36 36 + {{ if .BranchDeleteStatus }} 37 37 + <button 38 38 + hx-delete="/{{ .BranchDeleteStatus.Repo.Did }}/{{ .BranchDeleteStatus.Repo.Name }}/branches" 39 39 + hx-vals='{"branch": "{{ .BranchDeleteStatus.Branch }}" }' 40 40 + hx-swap="none" 41 41 + class="btn p-2 flex items-center gap-2 no-underline hover:no-underline group text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300"> 42 42 + {{ i "git-branch" "w-4 h-4" }} 43 43 + <span>delete branch</span> 44 44 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 45 45 + </button> 46 46 + {{ end }} 36 47 {{ if and $isPushAllowed $isOpen $isLastRound }} 37 48 {{ $disabled := "" }} 38 49 {{ if $isConflicted }}

+4 -2

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

··· 66 66 <div class="flex items-center gap-2 mt-2"> 67 67 {{ template "repo/fragments/reactionsPopUp" . }} 68 68 {{ range $kind := . }} 69 69 + {{ $reactionData := index $.Reactions $kind }} 69 70 {{ 70 71 template "repo/fragments/reaction" 71 72 (dict 72 73 "Kind" $kind 73 73 - "Count" (index $.Reactions $kind) 74 74 + "Count" $reactionData.Count 74 75 "IsReacted" (index $.UserReacted $kind) 75 75 - "ThreadAt" $.Pull.PullAt) 76 76 + "ThreadAt" $.Pull.PullAt 77 77 + "Users" $reactionData.Users) 76 78 }} 77 79 {{ end }} 78 80 </div>

+1 -1

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

··· 3 3 id="pull-comment-card-{{ .RoundNumber }}" 4 4 class="bg-white dark:bg-gray-800 rounded drop-shadow-sm p-4 relative w-full flex flex-col gap-2"> 5 5 <div class="text-sm text-gray-500 dark:text-gray-400"> 6 6 - {{ didOrHandle .LoggedInUser.Did .LoggedInUser.Handle }} 6 6 + {{ resolve .LoggedInUser.Did }} 7 7 </div> 8 8 <form 9 9 hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/comment"

+1 -14

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

··· 28 28 29 29 {{ end }} 30 30 31 31 - {{ define "topbarLayout" }} 32 32 - <header class="px-1 col-span-full" style="z-index: 20;"> 33 33 - {{ template "layouts/fragments/topbar" . }} 34 34 - </header> 35 35 - {{ end }} 36 36 - 37 31 {{ define "mainLayout" }} 38 38 - <div class="px-1 col-span-full flex flex-col gap-4"> 32 32 + <div class="px-1 col-span-full flex-grow flex flex-col gap-4"> 39 33 {{ block "contentLayout" . }} 40 34 {{ block "content" . }}{{ end }} 41 35 {{ end }} ··· 52 46 {{ end }} 53 47 </div> 54 48 {{ end }} 55 55 - 56 56 - {{ define "footerLayout" }} 57 57 - <footer class="px-1 col-span-full mt-12"> 58 58 - {{ template "layouts/fragments/footer" . }} 59 59 - </footer> 60 60 - {{ end }} 61 61 - 62 49 63 50 {{ define "contentAfter" }} 64 51 {{ template "repo/fragments/interdiff" (list .RepoInfo.FullName .Interdiff .DiffOpts) }}

+1 -13

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

··· 34 34 </section> 35 35 {{ end }} 36 36 37 37 - {{ define "topbarLayout" }} 38 38 - <header class="px-1 col-span-full" style="z-index: 20;"> 39 39 - {{ template "layouts/fragments/topbar" . }} 40 40 - </header> 41 41 - {{ end }} 42 42 - 43 37 {{ define "mainLayout" }} 44 44 - <div class="px-1 col-span-full flex flex-col gap-4"> 38 38 + <div class="px-1 col-span-full flex-grow flex flex-col gap-4"> 45 39 {{ block "contentLayout" . }} 46 40 {{ block "content" . }}{{ end }} 47 41 {{ end }} ··· 57 51 </div> 58 52 {{ end }} 59 53 </div> 60 60 - {{ end }} 61 61 - 62 62 - {{ define "footerLayout" }} 63 63 - <footer class="px-1 col-span-full mt-12"> 64 64 - {{ template "layouts/fragments/footer" . }} 65 65 - </footer> 66 54 {{ end }} 67 55 68 56 {{ define "contentAfter" }}

+47 -16

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

··· 9 9 {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }} 10 10 {{ end }} 11 11 12 12 + {{ define "repoContentLayout" }} 13 13 + <div class="grid grid-cols-1 md:grid-cols-10 gap-4 w-full"> 14 14 + <div class="col-span-1 md:col-span-8"> 15 15 + <section class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto dark:text-white"> 16 16 + {{ block "repoContent" . }}{{ end }} 17 17 + </section> 18 18 + {{ block "repoAfter" . }}{{ end }} 19 19 + </div> 20 20 + <div class="col-span-1 md:col-span-2 flex flex-col gap-6"> 21 21 + {{ template "repo/fragments/labelPanel" 22 22 + (dict "RepoInfo" $.RepoInfo 23 23 + "Defs" $.LabelDefs 24 24 + "Subject" $.Pull.PullAt 25 25 + "State" $.Pull.Labels) }} 26 26 + {{ template "repo/fragments/participants" $.Pull.Participants }} 27 27 + </div> 28 28 + </div> 29 29 + {{ end }} 12 30 13 31 {{ define "repoContent" }} 14 32 {{ template "repo/pulls/fragments/pullHeader" . }} ··· 39 57 {{ with $item }} 40 58 <details {{ if eq $idx $lastIdx }}open{{ end }}> 41 59 <summary id="round-#{{ .RoundNumber }}" class="list-none cursor-pointer"> 42 42 - <div class="flex flex-wrap gap-2 items-center"> 60 60 + <div class="flex flex-wrap gap-2 items-stretch"> 43 61 <!-- round number --> 44 62 <div class="rounded bg-white dark:bg-gray-800 drop-shadow-sm px-3 py-2 dark:text-white"> 45 63 <span class="flex items-center">{{ i "hash" "w-4 h-4" }}{{ .RoundNumber }}</span> 46 64 </div> 47 65 <!-- round summary --> 48 48 - <div class="rounded drop-shadow-sm bg-white dark:bg-gray-800 p-2 text-gray-500 dark:text-gray-400"> 66 66 + <div class="flex-1 rounded drop-shadow-sm bg-white dark:bg-gray-800 p-2 text-gray-500 dark:text-gray-400"> 49 67 <span class="gap-1 flex items-center"> 50 68 {{ $owner := resolve $.Pull.OwnerDid }} 51 69 {{ $re := "re" }} ··· 72 90 <span class="hidden md:inline">diff</span> 73 91 {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 74 92 </a> 75 75 - {{ if not (eq .RoundNumber 0) }} 76 76 - <a class="btn flex items-center gap-2 no-underline hover:no-underline p-2 group" 77 77 - hx-boost="true" 78 78 - href="/{{ $.RepoInfo.FullName }}/pulls/{{ $.Pull.PullId }}/round/{{.RoundNumber}}/interdiff"> 79 79 - {{ i "chevrons-left-right-ellipsis" "w-4 h-4 rotate-90" }} 80 80 - <span class="hidden md:inline">interdiff</span> 81 81 - {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 82 82 - </a> 93 93 + {{ if ne $idx 0 }} 94 94 + <a class="btn flex items-center gap-2 no-underline hover:no-underline p-2 group" 95 95 + hx-boost="true" 96 96 + href="/{{ $.RepoInfo.FullName }}/pulls/{{ $.Pull.PullId }}/round/{{.RoundNumber}}/interdiff"> 97 97 + {{ i "chevrons-left-right-ellipsis" "w-4 h-4 rotate-90" }} 98 98 + <span class="hidden md:inline">interdiff</span> 99 99 + {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }} 100 100 + </a> 101 101 + {{ end }} 83 102 <span id="interdiff-error-{{.RoundNumber}}"></span> 84 84 - {{ end }} 85 103 </div> 86 104 </summary> 87 105 ··· 146 164 147 165 <div class="md:pl-[3.5rem] flex flex-col gap-2 mt-2 relative"> 148 166 {{ range $cidx, $c := .Comments }} 149 149 - <div id="comment-{{$c.ID}}" class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-2 px-4 relative w-full md:max-w-3/5 md:w-fit"> 167 167 + <div id="comment-{{$c.ID}}" class="bg-white dark:bg-gray-800 rounded drop-shadow-sm py-2 px-4 relative w-full"> 150 168 {{ if gt $cidx 0 }} 151 169 <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div> 152 170 {{ end }} ··· 169 187 {{ end }} 170 188 171 189 {{ if $.LoggedInUser }} 172 172 - {{ template "repo/pulls/fragments/pullActions" (dict "LoggedInUser" $.LoggedInUser "Pull" $.Pull "RepoInfo" $.RepoInfo "RoundNumber" .RoundNumber "MergeCheck" $.MergeCheck "ResubmitCheck" $.ResubmitCheck "Stack" $.Stack) }} 190 190 + {{ template "repo/pulls/fragments/pullActions" 191 191 + (dict 192 192 + "LoggedInUser" $.LoggedInUser 193 193 + "Pull" $.Pull 194 194 + "RepoInfo" $.RepoInfo 195 195 + "RoundNumber" .RoundNumber 196 196 + "MergeCheck" $.MergeCheck 197 197 + "ResubmitCheck" $.ResubmitCheck 198 198 + "BranchDeleteStatus" $.BranchDeleteStatus 199 199 + "Stack" $.Stack) }} 173 200 {{ else }} 174 174 - <div class="bg-white dark:bg-gray-800 rounded drop-shadow-sm px-6 py-4 w-fit dark:text-white"> 175 175 - <div class="absolute left-8 -top-2 w-px h-2 bg-gray-300 dark:bg-gray-600"></div> 176 176 - <a href="/login" class="underline">login</a> to join the discussion 201 201 + <div class="bg-amber-50 dark:bg-amber-900 border border-amber-500 rounded drop-shadow-sm p-2 relative flex gap-2 items-center w-fit"> 202 202 + <a href="/signup" class="btn-create py-0 hover:no-underline hover:text-white flex items-center gap-2"> 203 203 + sign up 204 204 + </a> 205 205 + <span class="text-gray-500 dark:text-gray-400">or</span> 206 206 + <a href="/login" class="underline">login</a> 207 207 + to add to the discussion 177 208 </div> 178 209 {{ end }} 179 210 </div>

+7

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

··· 108 108 <span class="before:content-['·']"></span> 109 109 {{ template "repo/pipelines/fragments/pipelineSymbol" $pipeline }} 110 110 {{ end }} 111 111 + 112 112 + {{ $state := .Labels }} 113 113 + {{ range $k, $d := $.LabelDefs }} 114 114 + {{ range $v, $s := $state.GetValSet $d.AtUri.String }} 115 115 + {{ template "labels/fragments/label" (dict "def" $d "val" $v "withPrefix" true) }} 116 116 + {{ end }} 117 117 + {{ end }} 111 118 </div> 112 119 </div> 113 120 {{ if .StackId }}

+30

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

··· 1 1 + {{ define "timeline/fragments/goodfirstissues" }} 2 2 + {{ if .GfiLabel }} 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 7 + <p> 8 8 + Make your first contribution to an open-source project this October. 9 9 + <em>good-first-issue</em> helps new contributors find easy ways to 10 10 + start contributing to open-source projects. 11 11 + </p> 12 12 + <span class="flex items-center gap-2 text-purple-500 dark:text-purple-400"> 13 13 + Browse issues {{ i "arrow-right" "size-4" }} 14 14 + </span> 15 15 + </div> 16 16 + <div class="hidden md:block relative px-16 scale-150"> 17 17 + <div class="relative opacity-60"> 18 18 + {{ template "labels/fragments/label" (dict "def" .GfiLabel "val" "" "withPrefix" true) }} 19 19 + </div> 20 20 + <div class="relative -mt-4 ml-2 opacity-80"> 21 21 + {{ template "labels/fragments/label" (dict "def" .GfiLabel "val" "" "withPrefix" true) }} 22 22 + </div> 23 23 + <div class="relative -mt-4 ml-4"> 24 24 + {{ template "labels/fragments/label" (dict "def" .GfiLabel "val" "" "withPrefix" true) }} 25 25 + </div> 26 26 + </div> 27 27 + </div> 28 28 + </a> 29 29 + {{ end }} 30 30 + {{ end }}

+1

appview/pages/templates/timeline/home.html

··· 12 12 <div class="flex flex-col gap-4"> 13 13 {{ template "timeline/fragments/hero" . }} 14 14 {{ template "features" . }} 15 15 + {{ template "timeline/fragments/goodfirstissues" . }} 15 16 {{ template "timeline/fragments/trending" . }} 16 17 {{ template "timeline/fragments/timeline" . }} 17 18 <div class="flex justify-end">

+1

appview/pages/templates/timeline/timeline.html

··· 13 13 {{ template "timeline/fragments/hero" . }} 14 14 {{ end }} 15 15 16 16 + {{ template "timeline/fragments/goodfirstissues" . }} 16 17 {{ template "timeline/fragments/trending" . }} 17 18 {{ template "timeline/fragments/timeline" . }} 18 19 {{ end }}

+1

appview/pages/templates/user/completeSignup.html

··· 20 20 content="complete your signup for tangled" 21 21 /> 22 22 <script src="/static/htmx.min.js"></script> 23 23 + <link rel="manifest" href="/pwa-manifest.json" /> 23 24 <link 24 25 rel="stylesheet" 25 26 href="/static/tw.css?{{ cssContentHash }}"

+1

appview/pages/templates/user/login.html

··· 8 8 <meta property="og:url" content="https://tangled.org/login" /> 9 9 <meta property="og:description" content="login to for tangled" /> 10 10 <script src="/static/htmx.min.js"></script> 11 11 + <link rel="manifest" href="/pwa-manifest.json" /> 11 12 <link rel="stylesheet" href="/static/tw.css?{{ cssContentHash }}" type="text/css" /> 12 13 <title>login &middot; tangled</title> 13 14 </head>

+1 -3

appview/pages/templates/user/settings/profile.html

··· 33 33 <div class="flex flex-wrap text-sm items-center gap-1 text-gray-500 dark:text-gray-400"> 34 34 <span>Handle</span> 35 35 </div> 36 36 - {{ if .LoggedInUser.Handle }} 37 36 <span class="font-bold"> 38 38 - @{{ .LoggedInUser.Handle }} 37 37 + {{ resolve .LoggedInUser.Did }} 39 38 </span> 40 40 - {{ end }} 41 39 </div> 42 40 </div> 43 41 <div class="flex items-center justify-between p-4">

+3 -2

appview/pages/templates/user/signup.html

··· 8 8 <meta property="og:url" content="https://tangled.org/signup" /> 9 9 <meta property="og:description" content="sign up for tangled" /> 10 10 <script src="/static/htmx.min.js"></script> 11 11 + <link rel="manifest" href="/pwa-manifest.json" /> 11 12 <link rel="stylesheet" href="/static/tw.css?{{ cssContentHash }}" type="text/css" /> 12 13 <title>sign up &middot; tangled</title> 13 14 ··· 41 42 invite code, desired username, and password in the next 42 43 page to complete your registration. 43 44 </span> 44 44 - <div class="w-full mt-4"> 45 45 - <div class="cf-turnstile" data-sitekey="{{ .CloudflareSiteKey }}"></div> 45 45 + <div class="w-full mt-4 text-center"> 46 46 + <div class="cf-turnstile" data-sitekey="{{ .CloudflareSiteKey }}"></div> 46 47 </div> 47 48 <button class="btn text-base w-full my-2 mt-6" type="submit" id="signup-button" tabindex="7" > 48 49 <span>join now</span>

+1 -1

appview/pagination/page.go

··· 8 8 func FirstPage() Page { 9 9 return Page{ 10 10 Offset: 0, 11 11 - Limit: 10, 11 11 + Limit: 30, 12 12 } 13 13 } 14 14

+2 -1

appview/pipelines/pipelines.go

··· 48 48 ) *Pipelines { 49 49 logger := log.New("pipelines") 50 50 51 51 - return &Pipelines{oauth: oauth, 51 51 + return &Pipelines{ 52 52 + oauth: oauth, 52 53 repoResolver: repoResolver, 53 54 pages: pages, 54 55 idResolver: idResolver,

+119 -30

appview/pulls/pulls.go

··· 98 98 } 99 99 100 100 mergeCheckResponse := s.mergeCheck(r, f, pull, stack) 101 101 + branchDeleteStatus := s.branchDeleteStatus(r, f, pull) 101 102 resubmitResult := pages.Unknown 102 103 if user.Did == pull.OwnerDid { 103 104 resubmitResult = s.resubmitCheck(r, f, pull, stack) 104 105 } 105 106 106 107 s.pages.PullActionsFragment(w, pages.PullActionsParams{ 107 107 - LoggedInUser: user, 108 108 - RepoInfo: f.RepoInfo(user), 109 109 - Pull: pull, 110 110 - RoundNumber: roundNumber, 111 111 - MergeCheck: mergeCheckResponse, 112 112 - ResubmitCheck: resubmitResult, 113 113 - Stack: stack, 108 108 + LoggedInUser: user, 109 109 + RepoInfo: f.RepoInfo(user), 110 110 + Pull: pull, 111 111 + RoundNumber: roundNumber, 112 112 + MergeCheck: mergeCheckResponse, 113 113 + ResubmitCheck: resubmitResult, 114 114 + BranchDeleteStatus: branchDeleteStatus, 115 115 + Stack: stack, 114 116 }) 115 117 return 116 118 } ··· 153 155 } 154 156 155 157 mergeCheckResponse := s.mergeCheck(r, f, pull, stack) 158 158 + branchDeleteStatus := s.branchDeleteStatus(r, f, pull) 156 159 resubmitResult := pages.Unknown 157 160 if user != nil && user.Did == pull.OwnerDid { 158 161 resubmitResult = s.resubmitCheck(r, f, pull, stack) ··· 189 192 m[p.Sha] = p 190 193 } 191 194 192 192 - reactionCountMap, err := db.GetReactionCountMap(s.db, pull.PullAt()) 195 195 + reactionMap, err := db.GetReactionMap(s.db, 20, pull.PullAt()) 193 196 if err != nil { 194 197 log.Println("failed to get pull reactions") 195 198 s.pages.Notice(w, "pulls", "Failed to load pull. Try again later.") ··· 200 203 userReactions = db.GetReactionStatusMap(s.db, user.Did, pull.PullAt()) 201 204 } 202 205 206 206 + labelDefs, err := db.GetLabelDefinitions( 207 207 + s.db, 208 208 + db.FilterIn("at_uri", f.Repo.Labels), 209 209 + db.FilterContains("scope", tangled.RepoPullNSID), 210 210 + ) 211 211 + if err != nil { 212 212 + log.Println("failed to fetch labels", err) 213 213 + s.pages.Error503(w) 214 214 + return 215 215 + } 216 216 + 217 217 + defs := make(map[string]*models.LabelDefinition) 218 218 + for _, l := range labelDefs { 219 219 + defs[l.AtUri().String()] = &l 220 220 + } 221 221 + 203 222 s.pages.RepoSinglePull(w, pages.RepoSinglePullParams{ 204 204 - LoggedInUser: user, 205 205 - RepoInfo: repoInfo, 206 206 - Pull: pull, 207 207 - Stack: stack, 208 208 - AbandonedPulls: abandonedPulls, 209 209 - MergeCheck: mergeCheckResponse, 210 210 - ResubmitCheck: resubmitResult, 211 211 - Pipelines: m, 223 223 + LoggedInUser: user, 224 224 + RepoInfo: repoInfo, 225 225 + Pull: pull, 226 226 + Stack: stack, 227 227 + AbandonedPulls: abandonedPulls, 228 228 + BranchDeleteStatus: branchDeleteStatus, 229 229 + MergeCheck: mergeCheckResponse, 230 230 + ResubmitCheck: resubmitResult, 231 231 + Pipelines: m, 212 232 213 233 OrderedReactionKinds: models.OrderedReactionKinds, 214 214 - Reactions: reactionCountMap, 234 234 + Reactions: reactionMap, 215 235 UserReacted: userReactions, 236 236 + 237 237 + LabelDefs: defs, 216 238 }) 217 239 } 218 240 ··· 283 305 return result 284 306 } 285 307 308 308 + func (s *Pulls) branchDeleteStatus(r *http.Request, f *reporesolver.ResolvedRepo, pull *models.Pull) *models.BranchDeleteStatus { 309 309 + if pull.State != models.PullMerged { 310 310 + return nil 311 311 + } 312 312 + 313 313 + user := s.oauth.GetUser(r) 314 314 + if user == nil { 315 315 + return nil 316 316 + } 317 317 + 318 318 + var branch string 319 319 + var repo *models.Repo 320 320 + // check if the branch exists 321 321 + // NOTE: appview could cache branches/tags etc. for every repo by listening for gitRefUpdates 322 322 + if pull.IsBranchBased() { 323 323 + branch = pull.PullSource.Branch 324 324 + repo = &f.Repo 325 325 + } else if pull.IsForkBased() { 326 326 + branch = pull.PullSource.Branch 327 327 + repo = pull.PullSource.Repo 328 328 + } else { 329 329 + return nil 330 330 + } 331 331 + 332 332 + scheme := "http" 333 333 + if !s.config.Core.Dev { 334 334 + scheme = "https" 335 335 + } 336 336 + host := fmt.Sprintf("%s://%s", scheme, repo.Knot) 337 337 + xrpcc := &indigoxrpc.Client{ 338 338 + Host: host, 339 339 + } 340 340 + 341 341 + resp, err := tangled.RepoBranch(r.Context(), xrpcc, branch, fmt.Sprintf("%s/%s", repo.Did, repo.Name)) 342 342 + if xrpcerr := xrpcclient.HandleXrpcErr(err); xrpcerr != nil { 343 343 + return nil 344 344 + } 345 345 + 346 346 + return &models.BranchDeleteStatus{ 347 347 + Repo: repo, 348 348 + Branch: resp.Name, 349 349 + } 350 350 + } 351 351 + 286 352 func (s *Pulls) resubmitCheck(r *http.Request, f *reporesolver.ResolvedRepo, pull *models.Pull, stack models.Stack) pages.ResubmitResult { 287 353 if pull.State == models.PullMerged || pull.State == models.PullDeleted || pull.PullSource == nil { 288 354 return pages.Unknown ··· 557 623 m[p.Sha] = p 558 624 } 559 625 626 626 + labelDefs, err := db.GetLabelDefinitions( 627 627 + s.db, 628 628 + db.FilterIn("at_uri", f.Repo.Labels), 629 629 + db.FilterContains("scope", tangled.RepoPullNSID), 630 630 + ) 631 631 + if err != nil { 632 632 + log.Println("failed to fetch labels", err) 633 633 + s.pages.Error503(w) 634 634 + return 635 635 + } 636 636 + 637 637 + defs := make(map[string]*models.LabelDefinition) 638 638 + for _, l := range labelDefs { 639 639 + defs[l.AtUri().String()] = &l 640 640 + } 641 641 + 560 642 s.pages.RepoPulls(w, pages.RepoPullsParams{ 561 643 LoggedInUser: s.oauth.GetUser(r), 562 644 RepoInfo: f.RepoInfo(user), 563 645 Pulls: pulls, 646 646 + LabelDefs: defs, 564 647 FilteringBy: state, 565 648 Stacks: stacks, 566 649 Pipelines: m, ··· 630 713 s.pages.Notice(w, "pull-comment", "Failed to create comment.") 631 714 return 632 715 } 633 633 - atResp, err := client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 716 716 + atResp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 634 717 Collection: tangled.RepoPullCommentNSID, 635 718 Repo: user.Did, 636 719 Rkey: tid.TID(), ··· 1058 1141 1059 1142 // We've already checked earlier if it's diff-based and title is empty, 1060 1143 // so if it's still empty now, it's intentionally skipped owing to format-patch. 1061 1061 - if title == "" { 1144 1144 + if title == "" || body == "" { 1062 1145 formatPatches, err := patchutil.ExtractPatches(patch) 1063 1146 if err != nil { 1064 1147 s.pages.Notice(w, "pull", fmt.Sprintf("Failed to extract patches: %v", err)) ··· 1069 1152 return 1070 1153 } 1071 1154 1072 1072 - title = formatPatches[0].Title 1073 1073 - body = formatPatches[0].Body 1155 1155 + if title == "" { 1156 1156 + title = formatPatches[0].Title 1157 1157 + } 1158 1158 + if body == "" { 1159 1159 + body = formatPatches[0].Body 1160 1160 + } 1074 1161 } 1075 1162 1076 1163 rkey := tid.TID() ··· 1103 1190 return 1104 1191 } 1105 1192 1106 1106 - _, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 1193 1193 + _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 1107 1194 Collection: tangled.RepoPullNSID, 1108 1195 Repo: user.Did, 1109 1196 Rkey: rkey, ··· 1114 1201 Repo: string(f.RepoAt()), 1115 1202 Branch: targetBranch, 1116 1203 }, 1117 1117 - Patch: patch, 1118 1118 - Source: recordPullSource, 1204 1204 + Patch: patch, 1205 1205 + Source: recordPullSource, 1206 1206 + CreatedAt: time.Now().Format(time.RFC3339), 1119 1207 }, 1120 1208 }, 1121 1209 }) ··· 1200 1288 } 1201 1289 writes = append(writes, &write) 1202 1290 } 1203 1203 - _, err = client.RepoApplyWrites(r.Context(), &comatproto.RepoApplyWrites_Input{ 1291 1291 + _, err = comatproto.RepoApplyWrites(r.Context(), client, &comatproto.RepoApplyWrites_Input{ 1204 1292 Repo: user.Did, 1205 1293 Writes: writes, 1206 1294 }) ··· 1731 1819 return 1732 1820 } 1733 1821 1734 1734 - ex, err := client.RepoGetRecord(r.Context(), "", tangled.RepoPullNSID, user.Did, pull.Rkey) 1822 1822 + ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoPullNSID, user.Did, pull.Rkey) 1735 1823 if err != nil { 1736 1824 // failed to get record 1737 1825 s.pages.Notice(w, "resubmit-error", "Failed to update pull, no record found on PDS.") ··· 1754 1842 } 1755 1843 } 1756 1844 1757 1757 - _, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 1845 1845 + _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 1758 1846 Collection: tangled.RepoPullNSID, 1759 1847 Repo: user.Did, 1760 1848 Rkey: pull.Rkey, ··· 1766 1854 Repo: string(f.RepoAt()), 1767 1855 Branch: pull.TargetBranch, 1768 1856 }, 1769 1769 - Patch: patch, // new patch 1770 1770 - Source: recordPullSource, 1857 1857 + Patch: patch, // new patch 1858 1858 + Source: recordPullSource, 1859 1859 + CreatedAt: time.Now().Format(time.RFC3339), 1771 1860 }, 1772 1861 }, 1773 1862 }) ··· 2026 2115 return 2027 2116 } 2028 2117 2029 2029 - _, err = client.RepoApplyWrites(r.Context(), &comatproto.RepoApplyWrites_Input{ 2118 2118 + _, err = comatproto.RepoApplyWrites(r.Context(), client, &comatproto.RepoApplyWrites_Input{ 2030 2119 Repo: user.Did, 2031 2120 Writes: writes, 2032 2121 })

+11 -10

appview/repo/artifact.go

··· 10 10 "net/url" 11 11 "time" 12 12 13 13 - comatproto "github.com/bluesky-social/indigo/api/atproto" 14 14 - lexutil "github.com/bluesky-social/indigo/lex/util" 15 15 - indigoxrpc "github.com/bluesky-social/indigo/xrpc" 16 16 - "github.com/dustin/go-humanize" 17 17 - "github.com/go-chi/chi/v5" 18 18 - "github.com/go-git/go-git/v5/plumbing" 19 19 - "github.com/ipfs/go-cid" 20 13 "tangled.org/core/api/tangled" 21 14 "tangled.org/core/appview/db" 22 15 "tangled.org/core/appview/models" ··· 25 18 "tangled.org/core/appview/xrpcclient" 26 19 "tangled.org/core/tid" 27 20 "tangled.org/core/types" 21 21 + 22 22 + comatproto "github.com/bluesky-social/indigo/api/atproto" 23 23 + lexutil "github.com/bluesky-social/indigo/lex/util" 24 24 + indigoxrpc "github.com/bluesky-social/indigo/xrpc" 25 25 + "github.com/dustin/go-humanize" 26 26 + "github.com/go-chi/chi/v5" 27 27 + "github.com/go-git/go-git/v5/plumbing" 28 28 + "github.com/ipfs/go-cid" 28 29 ) 29 30 30 31 // TODO: proper statuses here on early exit ··· 60 61 return 61 62 } 62 63 63 63 - uploadBlobResp, err := client.RepoUploadBlob(r.Context(), file) 64 64 + uploadBlobResp, err := comatproto.RepoUploadBlob(r.Context(), client, file) 64 65 if err != nil { 65 66 log.Println("failed to upload blob", err) 66 67 rp.pages.Notice(w, "upload", "Failed to upload blob to your PDS. Try again later.") ··· 72 73 rkey := tid.TID() 73 74 createdAt := time.Now() 74 75 75 75 - putRecordResp, err := client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 76 76 + putRecordResp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 76 77 Collection: tangled.RepoArtifactNSID, 77 78 Repo: user.Did, 78 79 Rkey: rkey, ··· 249 250 return 250 251 } 251 252 252 252 - _, err = client.RepoDeleteRecord(r.Context(), &comatproto.RepoDeleteRecord_Input{ 253 253 + _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 253 254 Collection: tangled.RepoArtifactNSID, 254 255 Repo: user.Did, 255 256 Rkey: artifact.Rkey,

+12 -1

appview/repo/index.go

··· 200 200 }) 201 201 } 202 202 203 203 + tx, err := rp.db.Begin() 204 204 + if err != nil { 205 205 + return nil, err 206 206 + } 207 207 + defer tx.Rollback() 208 208 + 203 209 // update appview's cache 204 204 - err = db.InsertRepoLanguages(rp.db, langs) 210 210 + err = db.UpdateRepoLanguages(tx, f.RepoAt(), currentRef, langs) 205 211 if err != nil { 206 212 // non-fatal 207 213 log.Println("failed to cache lang results", err) 214 214 + } 215 215 + 216 216 + err = tx.Commit() 217 217 + if err != nil { 218 218 + return nil, err 208 219 } 209 220 } 210 221

+500

appview/repo/ogcard/card.go

··· 1 1 + // Copyright 2024 The Forgejo Authors. All rights reserved. 2 2 + // Copyright 2025 The Tangled Authors -- repurposed for Tangled use. 3 3 + // SPDX-License-Identifier: MIT 4 4 + 5 5 + package ogcard 6 6 + 7 7 + import ( 8 8 + "bytes" 9 9 + "fmt" 10 10 + "image" 11 11 + "image/color" 12 12 + "io" 13 13 + "log" 14 14 + "math" 15 15 + "net/http" 16 16 + "strings" 17 17 + "sync" 18 18 + "time" 19 19 + 20 20 + "github.com/goki/freetype" 21 21 + "github.com/goki/freetype/truetype" 22 22 + "github.com/srwiley/oksvg" 23 23 + "github.com/srwiley/rasterx" 24 24 + "golang.org/x/image/draw" 25 25 + "golang.org/x/image/font" 26 26 + "tangled.org/core/appview/pages" 27 27 + 28 28 + _ "golang.org/x/image/webp" // for processing webp images 29 29 + ) 30 30 + 31 31 + type Card struct { 32 32 + Img *image.RGBA 33 33 + Font *truetype.Font 34 34 + Margin int 35 35 + Width int 36 36 + Height int 37 37 + } 38 38 + 39 39 + var fontCache = sync.OnceValues(func() (*truetype.Font, error) { 40 40 + interVar, err := pages.Files.ReadFile("static/fonts/InterVariable.ttf") 41 41 + if err != nil { 42 42 + return nil, err 43 43 + } 44 44 + return truetype.Parse(interVar) 45 45 + }) 46 46 + 47 47 + // DefaultSize returns the default size for a card 48 48 + func DefaultSize() (int, int) { 49 49 + return 1200, 600 50 50 + } 51 51 + 52 52 + // NewCard creates a new card with the given dimensions in pixels 53 53 + func NewCard(width, height int) (*Card, error) { 54 54 + img := image.NewRGBA(image.Rect(0, 0, width, height)) 55 55 + draw.Draw(img, img.Bounds(), image.NewUniform(color.White), image.Point{}, draw.Src) 56 56 + 57 57 + font, err := fontCache() 58 58 + if err != nil { 59 59 + return nil, err 60 60 + } 61 61 + 62 62 + return &Card{ 63 63 + Img: img, 64 64 + Font: font, 65 65 + Margin: 0, 66 66 + Width: width, 67 67 + Height: height, 68 68 + }, nil 69 69 + } 70 70 + 71 71 + // Split splits the card horizontally or vertically by a given percentage; the first card returned has the percentage 72 72 + // size, and the second card has the remainder. Both cards draw to a subsection of the same image buffer. 73 73 + func (c *Card) Split(vertical bool, percentage int) (*Card, *Card) { 74 74 + bounds := c.Img.Bounds() 75 75 + bounds = image.Rect(bounds.Min.X+c.Margin, bounds.Min.Y+c.Margin, bounds.Max.X-c.Margin, bounds.Max.Y-c.Margin) 76 76 + if vertical { 77 77 + mid := (bounds.Dx() * percentage / 100) + bounds.Min.X 78 78 + subleft := c.Img.SubImage(image.Rect(bounds.Min.X, bounds.Min.Y, mid, bounds.Max.Y)).(*image.RGBA) 79 79 + subright := c.Img.SubImage(image.Rect(mid, bounds.Min.Y, bounds.Max.X, bounds.Max.Y)).(*image.RGBA) 80 80 + return &Card{Img: subleft, Font: c.Font, Width: subleft.Bounds().Dx(), Height: subleft.Bounds().Dy()}, 81 81 + &Card{Img: subright, Font: c.Font, Width: subright.Bounds().Dx(), Height: subright.Bounds().Dy()} 82 82 + } 83 83 + mid := (bounds.Dy() * percentage / 100) + bounds.Min.Y 84 84 + subtop := c.Img.SubImage(image.Rect(bounds.Min.X, bounds.Min.Y, bounds.Max.X, mid)).(*image.RGBA) 85 85 + subbottom := c.Img.SubImage(image.Rect(bounds.Min.X, mid, bounds.Max.X, bounds.Max.Y)).(*image.RGBA) 86 86 + return &Card{Img: subtop, Font: c.Font, Width: subtop.Bounds().Dx(), Height: subtop.Bounds().Dy()}, 87 87 + &Card{Img: subbottom, Font: c.Font, Width: subbottom.Bounds().Dx(), Height: subbottom.Bounds().Dy()} 88 88 + } 89 89 + 90 90 + // SetMargin sets the margins for the card 91 91 + func (c *Card) SetMargin(margin int) { 92 92 + c.Margin = margin 93 93 + } 94 94 + 95 95 + type ( 96 96 + VAlign int64 97 97 + HAlign int64 98 98 + ) 99 99 + 100 100 + const ( 101 101 + Top VAlign = iota 102 102 + Middle 103 103 + Bottom 104 104 + ) 105 105 + 106 106 + const ( 107 107 + Left HAlign = iota 108 108 + Center 109 109 + Right 110 110 + ) 111 111 + 112 112 + // DrawText draws text within the card, respecting margins and alignment 113 113 + func (c *Card) DrawText(text string, textColor color.Color, sizePt float64, valign VAlign, halign HAlign) ([]string, error) { 114 114 + ft := freetype.NewContext() 115 115 + ft.SetDPI(72) 116 116 + ft.SetFont(c.Font) 117 117 + ft.SetFontSize(sizePt) 118 118 + ft.SetClip(c.Img.Bounds()) 119 119 + ft.SetDst(c.Img) 120 120 + ft.SetSrc(image.NewUniform(textColor)) 121 121 + 122 122 + face := truetype.NewFace(c.Font, &truetype.Options{Size: sizePt, DPI: 72}) 123 123 + fontHeight := ft.PointToFixed(sizePt).Ceil() 124 124 + 125 125 + bounds := c.Img.Bounds() 126 126 + bounds = image.Rect(bounds.Min.X+c.Margin, bounds.Min.Y+c.Margin, bounds.Max.X-c.Margin, bounds.Max.Y-c.Margin) 127 127 + boxWidth, boxHeight := bounds.Size().X, bounds.Size().Y 128 128 + // draw.Draw(c.Img, bounds, image.NewUniform(color.Gray{128}), image.Point{}, draw.Src) // Debug draw box 129 129 + 130 130 + // Try to apply wrapping to this text; we'll find the most text that will fit into one line, record that line, move 131 131 + // on. We precalculate each line before drawing so that we can support valign="middle" correctly which requires 132 132 + // knowing the total height, which is related to how many lines we'll have. 133 133 + lines := make([]string, 0) 134 134 + textWords := strings.Split(text, " ") 135 135 + currentLine := "" 136 136 + heightTotal := 0 137 137 + 138 138 + for { 139 139 + if len(textWords) == 0 { 140 140 + // Ran out of words. 141 141 + if currentLine != "" { 142 142 + heightTotal += fontHeight 143 143 + lines = append(lines, currentLine) 144 144 + } 145 145 + break 146 146 + } 147 147 + 148 148 + nextWord := textWords[0] 149 149 + proposedLine := currentLine 150 150 + if proposedLine != "" { 151 151 + proposedLine += " " 152 152 + } 153 153 + proposedLine += nextWord 154 154 + 155 155 + proposedLineWidth := font.MeasureString(face, proposedLine) 156 156 + if proposedLineWidth.Ceil() > boxWidth { 157 157 + // no, proposed line is too big; we'll use the last "currentLine" 158 158 + heightTotal += fontHeight 159 159 + if currentLine != "" { 160 160 + lines = append(lines, currentLine) 161 161 + currentLine = "" 162 162 + // leave nextWord in textWords and keep going 163 163 + } else { 164 164 + // just nextWord by itself doesn't fit on a line; well, we can't skip it, but we'll consume it 165 165 + // regardless as a line by itself. It will be clipped by the drawing routine. 166 166 + lines = append(lines, nextWord) 167 167 + textWords = textWords[1:] 168 168 + } 169 169 + } else { 170 170 + // yes, it will fit 171 171 + currentLine = proposedLine 172 172 + textWords = textWords[1:] 173 173 + } 174 174 + } 175 175 + 176 176 + textY := 0 177 177 + switch valign { 178 178 + case Top: 179 179 + textY = fontHeight 180 180 + case Bottom: 181 181 + textY = boxHeight - heightTotal + fontHeight 182 182 + case Middle: 183 183 + textY = ((boxHeight - heightTotal) / 2) + fontHeight 184 184 + } 185 185 + 186 186 + for _, line := range lines { 187 187 + lineWidth := font.MeasureString(face, line) 188 188 + 189 189 + textX := 0 190 190 + switch halign { 191 191 + case Left: 192 192 + textX = 0 193 193 + case Right: 194 194 + textX = boxWidth - lineWidth.Ceil() 195 195 + case Center: 196 196 + textX = (boxWidth - lineWidth.Ceil()) / 2 197 197 + } 198 198 + 199 199 + pt := freetype.Pt(bounds.Min.X+textX, bounds.Min.Y+textY) 200 200 + _, err := ft.DrawString(line, pt) 201 201 + if err != nil { 202 202 + return nil, err 203 203 + } 204 204 + 205 205 + textY += fontHeight 206 206 + } 207 207 + 208 208 + return lines, nil 209 209 + } 210 210 + 211 211 + // DrawTextAt draws text at a specific position with the given alignment 212 212 + func (c *Card) DrawTextAt(text string, x, y int, textColor color.Color, sizePt float64, valign VAlign, halign HAlign) error { 213 213 + _, err := c.DrawTextAtWithWidth(text, x, y, textColor, sizePt, valign, halign) 214 214 + return err 215 215 + } 216 216 + 217 217 + // DrawTextAtWithWidth draws text at a specific position and returns the text width 218 218 + func (c *Card) DrawTextAtWithWidth(text string, x, y int, textColor color.Color, sizePt float64, valign VAlign, halign HAlign) (int, error) { 219 219 + ft := freetype.NewContext() 220 220 + ft.SetDPI(72) 221 221 + ft.SetFont(c.Font) 222 222 + ft.SetFontSize(sizePt) 223 223 + ft.SetClip(c.Img.Bounds()) 224 224 + ft.SetDst(c.Img) 225 225 + ft.SetSrc(image.NewUniform(textColor)) 226 226 + 227 227 + face := truetype.NewFace(c.Font, &truetype.Options{Size: sizePt, DPI: 72}) 228 228 + fontHeight := ft.PointToFixed(sizePt).Ceil() 229 229 + lineWidth := font.MeasureString(face, text) 230 230 + textWidth := lineWidth.Ceil() 231 231 + 232 232 + // Adjust position based on alignment 233 233 + adjustedX := x 234 234 + adjustedY := y 235 235 + 236 236 + switch halign { 237 237 + case Left: 238 238 + // x is already at the left position 239 239 + case Right: 240 240 + adjustedX = x - textWidth 241 241 + case Center: 242 242 + adjustedX = x - textWidth/2 243 243 + } 244 244 + 245 245 + switch valign { 246 246 + case Top: 247 247 + adjustedY = y + fontHeight 248 248 + case Bottom: 249 249 + adjustedY = y 250 250 + case Middle: 251 251 + adjustedY = y + fontHeight/2 252 252 + } 253 253 + 254 254 + pt := freetype.Pt(adjustedX, adjustedY) 255 255 + _, err := ft.DrawString(text, pt) 256 256 + return textWidth, err 257 257 + } 258 258 + 259 259 + // DrawBoldText draws bold text by rendering multiple times with slight offsets 260 260 + func (c *Card) DrawBoldText(text string, x, y int, textColor color.Color, sizePt float64, valign VAlign, halign HAlign) (int, error) { 261 261 + // Draw the text multiple times with slight offsets to create bold effect 262 262 + offsets := []struct{ dx, dy int }{ 263 263 + {0, 0}, // original 264 264 + {1, 0}, // right 265 265 + {0, 1}, // down 266 266 + {1, 1}, // diagonal 267 267 + } 268 268 + 269 269 + var width int 270 270 + for _, offset := range offsets { 271 271 + w, err := c.DrawTextAtWithWidth(text, x+offset.dx, y+offset.dy, textColor, sizePt, valign, halign) 272 272 + if err != nil { 273 273 + return 0, err 274 274 + } 275 275 + if width == 0 { 276 276 + width = w 277 277 + } 278 278 + } 279 279 + return width, nil 280 280 + } 281 281 + 282 282 + // DrawSVGIcon draws an SVG icon from the embedded files at the specified position 283 283 + func (c *Card) DrawSVGIcon(svgPath string, x, y, size int, iconColor color.Color) error { 284 284 + svgData, err := pages.Files.ReadFile(svgPath) 285 285 + if err != nil { 286 286 + return fmt.Errorf("failed to read SVG file %s: %w", svgPath, err) 287 287 + } 288 288 + 289 289 + // Convert color to hex string for SVG 290 290 + rgba, isRGBA := iconColor.(color.RGBA) 291 291 + if !isRGBA { 292 292 + r, g, b, a := iconColor.RGBA() 293 293 + rgba = color.RGBA{uint8(r >> 8), uint8(g >> 8), uint8(b >> 8), uint8(a >> 8)} 294 294 + } 295 295 + colorHex := fmt.Sprintf("#%02x%02x%02x", rgba.R, rgba.G, rgba.B) 296 296 + 297 297 + // Replace currentColor with our desired color in the SVG 298 298 + svgString := string(svgData) 299 299 + svgString = strings.ReplaceAll(svgString, "currentColor", colorHex) 300 300 + 301 301 + // Make the stroke thicker 302 302 + svgString = strings.ReplaceAll(svgString, `stroke-width="2"`, `stroke-width="3"`) 303 303 + 304 304 + // Parse SVG 305 305 + icon, err := oksvg.ReadIconStream(strings.NewReader(svgString)) 306 306 + if err != nil { 307 307 + return fmt.Errorf("failed to parse SVG %s: %w", svgPath, err) 308 308 + } 309 309 + 310 310 + // Set the icon size 311 311 + w, h := float64(size), float64(size) 312 312 + icon.SetTarget(0, 0, w, h) 313 313 + 314 314 + // Create a temporary RGBA image for the icon 315 315 + iconImg := image.NewRGBA(image.Rect(0, 0, size, size)) 316 316 + 317 317 + // Create scanner and rasterizer 318 318 + scanner := rasterx.NewScannerGV(size, size, iconImg, iconImg.Bounds()) 319 319 + raster := rasterx.NewDasher(size, size, scanner) 320 320 + 321 321 + // Draw the icon 322 322 + icon.Draw(raster, 1.0) 323 323 + 324 324 + // Draw the icon onto the card at the specified position 325 325 + bounds := c.Img.Bounds() 326 326 + destRect := image.Rect(x, y, x+size, y+size) 327 327 + 328 328 + // Make sure we don't draw outside the card bounds 329 329 + if destRect.Max.X > bounds.Max.X { 330 330 + destRect.Max.X = bounds.Max.X 331 331 + } 332 332 + if destRect.Max.Y > bounds.Max.Y { 333 333 + destRect.Max.Y = bounds.Max.Y 334 334 + } 335 335 + 336 336 + draw.Draw(c.Img, destRect, iconImg, image.Point{}, draw.Over) 337 337 + 338 338 + return nil 339 339 + } 340 340 + 341 341 + // DrawImage fills the card with an image, scaled to maintain the original aspect ratio and centered with respect to the non-filled dimension 342 342 + func (c *Card) DrawImage(img image.Image) { 343 343 + bounds := c.Img.Bounds() 344 344 + targetRect := image.Rect(bounds.Min.X+c.Margin, bounds.Min.Y+c.Margin, bounds.Max.X-c.Margin, bounds.Max.Y-c.Margin) 345 345 + srcBounds := img.Bounds() 346 346 + srcAspect := float64(srcBounds.Dx()) / float64(srcBounds.Dy()) 347 347 + targetAspect := float64(targetRect.Dx()) / float64(targetRect.Dy()) 348 348 + 349 349 + var scale float64 350 350 + if srcAspect > targetAspect { 351 351 + // Image is wider than target, scale by width 352 352 + scale = float64(targetRect.Dx()) / float64(srcBounds.Dx()) 353 353 + } else { 354 354 + // Image is taller or equal, scale by height 355 355 + scale = float64(targetRect.Dy()) / float64(srcBounds.Dy()) 356 356 + } 357 357 + 358 358 + newWidth := int(math.Round(float64(srcBounds.Dx()) * scale)) 359 359 + newHeight := int(math.Round(float64(srcBounds.Dy()) * scale)) 360 360 + 361 361 + // Center the image within the target rectangle 362 362 + offsetX := (targetRect.Dx() - newWidth) / 2 363 363 + offsetY := (targetRect.Dy() - newHeight) / 2 364 364 + 365 365 + scaledRect := image.Rect(targetRect.Min.X+offsetX, targetRect.Min.Y+offsetY, targetRect.Min.X+offsetX+newWidth, targetRect.Min.Y+offsetY+newHeight) 366 366 + draw.CatmullRom.Scale(c.Img, scaledRect, img, srcBounds, draw.Over, nil) 367 367 + } 368 368 + 369 369 + func fallbackImage() image.Image { 370 370 + // can't usage image.Uniform(color.White) because it's infinitely sized causing a panic in the scaler in DrawImage 371 371 + img := image.NewRGBA(image.Rect(0, 0, 1, 1)) 372 372 + img.Set(0, 0, color.White) 373 373 + return img 374 374 + } 375 375 + 376 376 + // As defensively as possible, attempt to load an image from a presumed external and untrusted URL 377 377 + func (c *Card) fetchExternalImage(url string) (image.Image, bool) { 378 378 + // Use a short timeout; in the event of any failure we'll be logging and returning a placeholder, but we don't want 379 379 + // this rendering process to be slowed down 380 380 + client := &http.Client{ 381 381 + Timeout: 1 * time.Second, // 1 second timeout 382 382 + } 383 383 + 384 384 + resp, err := client.Get(url) 385 385 + if err != nil { 386 386 + log.Printf("error when fetching external image from %s: %v", url, err) 387 387 + return nil, false 388 388 + } 389 389 + defer resp.Body.Close() 390 390 + 391 391 + if resp.StatusCode != http.StatusOK { 392 392 + log.Printf("non-OK error code when fetching external image from %s: %s", url, resp.Status) 393 393 + return nil, false 394 394 + } 395 395 + 396 396 + contentType := resp.Header.Get("Content-Type") 397 397 + // Support content types are in-sync with the allowed custom avatar file types 398 398 + if contentType != "image/png" && contentType != "image/jpeg" && contentType != "image/gif" && contentType != "image/webp" { 399 399 + log.Printf("fetching external image returned unsupported Content-Type which was ignored: %s", contentType) 400 400 + return nil, false 401 401 + } 402 402 + 403 403 + body := resp.Body 404 404 + bodyBytes, err := io.ReadAll(body) 405 405 + if err != nil { 406 406 + log.Printf("error when fetching external image from %s: %v", url, err) 407 407 + return nil, false 408 408 + } 409 409 + 410 410 + bodyBuffer := bytes.NewReader(bodyBytes) 411 411 + _, imgType, err := image.DecodeConfig(bodyBuffer) 412 412 + if err != nil { 413 413 + log.Printf("error when decoding external image from %s: %v", url, err) 414 414 + return nil, false 415 415 + } 416 416 + 417 417 + // Verify that we have a match between actual data understood in the image body and the reported Content-Type 418 418 + if (contentType == "image/png" && imgType != "png") || 419 419 + (contentType == "image/jpeg" && imgType != "jpeg") || 420 420 + (contentType == "image/gif" && imgType != "gif") || 421 421 + (contentType == "image/webp" && imgType != "webp") { 422 422 + log.Printf("while fetching external image, mismatched image body (%s) and Content-Type (%s)", imgType, contentType) 423 423 + return nil, false 424 424 + } 425 425 + 426 426 + _, err = bodyBuffer.Seek(0, io.SeekStart) // reset for actual decode 427 427 + if err != nil { 428 428 + log.Printf("error w/ bodyBuffer.Seek") 429 429 + return nil, false 430 430 + } 431 431 + img, _, err := image.Decode(bodyBuffer) 432 432 + if err != nil { 433 433 + log.Printf("error when decoding external image from %s: %v", url, err) 434 434 + return nil, false 435 435 + } 436 436 + 437 437 + return img, true 438 438 + } 439 439 + 440 440 + func (c *Card) DrawExternalImage(url string) { 441 441 + image, ok := c.fetchExternalImage(url) 442 442 + if !ok { 443 443 + image = fallbackImage() 444 444 + } 445 445 + c.DrawImage(image) 446 446 + } 447 447 + 448 448 + // DrawCircularExternalImage draws an external image as a circle at the specified position 449 449 + func (c *Card) DrawCircularExternalImage(url string, x, y, size int) error { 450 450 + img, ok := c.fetchExternalImage(url) 451 451 + if !ok { 452 452 + img = fallbackImage() 453 453 + } 454 454 + 455 455 + // Create a circular mask 456 456 + circle := image.NewRGBA(image.Rect(0, 0, size, size)) 457 457 + center := size / 2 458 458 + radius := float64(size / 2) 459 459 + 460 460 + // Scale the source image to fit the circle 461 461 + srcBounds := img.Bounds() 462 462 + scaledImg := image.NewRGBA(image.Rect(0, 0, size, size)) 463 463 + draw.CatmullRom.Scale(scaledImg, scaledImg.Bounds(), img, srcBounds, draw.Src, nil) 464 464 + 465 465 + // Draw the image with circular clipping 466 466 + for cy := 0; cy < size; cy++ { 467 467 + for cx := 0; cx < size; cx++ { 468 468 + // Calculate distance from center 469 469 + dx := float64(cx - center) 470 470 + dy := float64(cy - center) 471 471 + distance := math.Sqrt(dx*dx + dy*dy) 472 472 + 473 473 + // Only draw pixels within the circle 474 474 + if distance <= radius { 475 475 + circle.Set(cx, cy, scaledImg.At(cx, cy)) 476 476 + } 477 477 + } 478 478 + } 479 479 + 480 480 + // Draw the circle onto the card 481 481 + bounds := c.Img.Bounds() 482 482 + destRect := image.Rect(x, y, x+size, y+size) 483 483 + 484 484 + // Make sure we don't draw outside the card bounds 485 485 + if destRect.Max.X > bounds.Max.X { 486 486 + destRect.Max.X = bounds.Max.X 487 487 + } 488 488 + if destRect.Max.Y > bounds.Max.Y { 489 489 + destRect.Max.Y = bounds.Max.Y 490 490 + } 491 491 + 492 492 + draw.Draw(c.Img, destRect, circle, image.Point{}, draw.Over) 493 493 + 494 494 + return nil 495 495 + } 496 496 + 497 497 + // DrawRect draws a rect with the given color 498 498 + func (c *Card) DrawRect(startX, startY, endX, endY int, color color.Color) { 499 499 + draw.Draw(c.Img, image.Rect(startX, startY, endX, endY), &image.Uniform{color}, image.Point{}, draw.Src) 500 500 + }

+376

appview/repo/opengraph.go

··· 1 1 + package repo 2 2 + 3 3 + import ( 4 4 + "bytes" 5 5 + "context" 6 6 + "encoding/hex" 7 7 + "fmt" 8 8 + "image/color" 9 9 + "image/png" 10 10 + "log" 11 11 + "net/http" 12 12 + "sort" 13 13 + "strings" 14 14 + 15 15 + "github.com/go-enry/go-enry/v2" 16 16 + "tangled.org/core/appview/db" 17 17 + "tangled.org/core/appview/models" 18 18 + "tangled.org/core/appview/repo/ogcard" 19 19 + "tangled.org/core/types" 20 20 + ) 21 21 + 22 22 + func (rp *Repo) drawRepoSummaryCard(repo *models.Repo, languageStats []types.RepoLanguageDetails) (*ogcard.Card, error) { 23 23 + width, height := ogcard.DefaultSize() 24 24 + mainCard, err := ogcard.NewCard(width, height) 25 25 + if err != nil { 26 26 + return nil, err 27 27 + } 28 28 + 29 29 + // Split: content area (75%) and language bar + icons (25%) 30 30 + contentCard, bottomArea := mainCard.Split(false, 75) 31 31 + 32 32 + // Add padding to content 33 33 + contentCard.SetMargin(50) 34 34 + 35 35 + // Split content horizontally: main content (80%) and avatar area (20%) 36 36 + mainContent, avatarArea := contentCard.Split(true, 80) 37 37 + 38 38 + // Split main content: 50% for name/description, 50% for spacing 39 39 + topSection, _ := mainContent.Split(false, 50) 40 40 + 41 41 + // Split top section: 40% for repo name, 60% for description 42 42 + repoNameCard, descriptionCard := topSection.Split(false, 50) 43 43 + 44 44 + // Draw repo name with owner in regular and repo name in bold 45 45 + repoNameCard.SetMargin(10) 46 46 + var ownerHandle string 47 47 + owner, err := rp.idResolver.ResolveIdent(context.Background(), repo.Did) 48 48 + if err != nil { 49 49 + ownerHandle = repo.Did 50 50 + } else { 51 51 + ownerHandle = "@" + owner.Handle.String() 52 52 + } 53 53 + 54 54 + // Draw repo name with wrapping support 55 55 + repoNameCard.SetMargin(10) 56 56 + bounds := repoNameCard.Img.Bounds() 57 57 + startX := bounds.Min.X + repoNameCard.Margin 58 58 + startY := bounds.Min.Y + repoNameCard.Margin 59 59 + currentX := startX 60 60 + textColor := color.RGBA{88, 96, 105, 255} 61 61 + 62 62 + // Draw owner handle in gray 63 63 + ownerWidth, err := repoNameCard.DrawTextAtWithWidth(ownerHandle, currentX, startY, textColor, 54, ogcard.Top, ogcard.Left) 64 64 + if err != nil { 65 65 + return nil, err 66 66 + } 67 67 + currentX += ownerWidth 68 68 + 69 69 + // Draw separator 70 70 + sepWidth, err := repoNameCard.DrawTextAtWithWidth(" / ", currentX, startY, textColor, 54, ogcard.Top, ogcard.Left) 71 71 + if err != nil { 72 72 + return nil, err 73 73 + } 74 74 + currentX += sepWidth 75 75 + 76 76 + // Draw repo name in bold 77 77 + _, err = repoNameCard.DrawBoldText(repo.Name, currentX, startY, color.Black, 54, ogcard.Top, ogcard.Left) 78 78 + if err != nil { 79 79 + return nil, err 80 80 + } 81 81 + 82 82 + // Draw description (DrawText handles multi-line wrapping automatically) 83 83 + descriptionCard.SetMargin(10) 84 84 + description := repo.Description 85 85 + if len(description) > 70 { 86 86 + description = description[:70] + "…" 87 87 + } 88 88 + 89 89 + _, err = descriptionCard.DrawText(description, color.RGBA{88, 96, 105, 255}, 36, ogcard.Top, ogcard.Left) 90 90 + if err != nil { 91 91 + log.Printf("failed to draw description: %v", err) 92 92 + return nil, err 93 93 + } 94 94 + 95 95 + // Draw avatar circle on the right side 96 96 + avatarBounds := avatarArea.Img.Bounds() 97 97 + avatarSize := min(avatarBounds.Dx(), avatarBounds.Dy()) - 20 // Leave some margin 98 98 + if avatarSize > 220 { 99 99 + avatarSize = 220 100 100 + } 101 101 + avatarX := avatarBounds.Min.X + (avatarBounds.Dx() / 2) - (avatarSize / 2) 102 102 + avatarY := avatarBounds.Min.Y + 20 103 103 + 104 104 + // Get avatar URL and draw it 105 105 + avatarURL := rp.pages.AvatarUrl(ownerHandle, "256") 106 106 + err = avatarArea.DrawCircularExternalImage(avatarURL, avatarX, avatarY, avatarSize) 107 107 + if err != nil { 108 108 + log.Printf("failed to draw avatar (non-fatal): %v", err) 109 109 + } 110 110 + 111 111 + // Split bottom area: icons area (65%) and language bar (35%) 112 112 + iconsArea, languageBarCard := bottomArea.Split(false, 75) 113 113 + 114 114 + // Split icons area: left side for stats (80%), right side for dolly (20%) 115 115 + statsArea, dollyArea := iconsArea.Split(true, 80) 116 116 + 117 117 + // Draw stats with icons in the stats area 118 118 + starsText := repo.RepoStats.StarCount 119 119 + issuesText := repo.RepoStats.IssueCount.Open 120 120 + pullRequestsText := repo.RepoStats.PullCount.Open 121 121 + 122 122 + iconColor := color.RGBA{88, 96, 105, 255} 123 123 + iconSize := 36 124 124 + textSize := 36.0 125 125 + 126 126 + // Position stats in the middle of the stats area 127 127 + statsBounds := statsArea.Img.Bounds() 128 128 + statsX := statsBounds.Min.X + 60 // left padding 129 129 + statsY := statsBounds.Min.Y 130 130 + currentX = statsX 131 131 + labelSize := 22.0 132 132 + // Draw star icon, count, and label 133 133 + // Align icon baseline with text baseline 134 134 + iconBaselineOffset := int(textSize) / 2 135 135 + err = statsArea.DrawSVGIcon("static/icons/star.svg", currentX, statsY+iconBaselineOffset-iconSize/2, iconSize, iconColor) 136 136 + if err != nil { 137 137 + log.Printf("failed to draw star icon: %v", err) 138 138 + } 139 139 + starIconX := currentX 140 140 + currentX += iconSize + 15 141 141 + 142 142 + starText := fmt.Sprintf("%d", starsText) 143 143 + err = statsArea.DrawTextAt(starText, currentX, statsY+iconBaselineOffset, iconColor, textSize, ogcard.Middle, ogcard.Left) 144 144 + if err != nil { 145 145 + log.Printf("failed to draw star text: %v", err) 146 146 + } 147 147 + starTextWidth := len(starText) * 20 148 148 + starGroupWidth := iconSize + 15 + starTextWidth 149 149 + 150 150 + // Draw "stars" label below and centered under the icon+text group 151 151 + labelY := statsY + iconSize + 15 152 152 + labelX := starIconX + starGroupWidth/2 153 153 + err = iconsArea.DrawTextAt("stars", labelX, labelY, iconColor, labelSize, ogcard.Top, ogcard.Center) 154 154 + if err != nil { 155 155 + log.Printf("failed to draw stars label: %v", err) 156 156 + } 157 157 + 158 158 + currentX += starTextWidth + 50 159 159 + 160 160 + // Draw issues icon, count, and label 161 161 + issueStartX := currentX 162 162 + err = statsArea.DrawSVGIcon("static/icons/circle-dot.svg", currentX, statsY+iconBaselineOffset-iconSize/2, iconSize, iconColor) 163 163 + if err != nil { 164 164 + log.Printf("failed to draw circle-dot icon: %v", err) 165 165 + } 166 166 + currentX += iconSize + 15 167 167 + 168 168 + issueText := fmt.Sprintf("%d", issuesText) 169 169 + err = statsArea.DrawTextAt(issueText, currentX, statsY+iconBaselineOffset, iconColor, textSize, ogcard.Middle, ogcard.Left) 170 170 + if err != nil { 171 171 + log.Printf("failed to draw issue text: %v", err) 172 172 + } 173 173 + issueTextWidth := len(issueText) * 20 174 174 + issueGroupWidth := iconSize + 15 + issueTextWidth 175 175 + 176 176 + // Draw "issues" label below and centered under the icon+text group 177 177 + labelX = issueStartX + issueGroupWidth/2 178 178 + err = iconsArea.DrawTextAt("issues", labelX, labelY, iconColor, labelSize, ogcard.Top, ogcard.Center) 179 179 + if err != nil { 180 180 + log.Printf("failed to draw issues label: %v", err) 181 181 + } 182 182 + 183 183 + currentX += issueTextWidth + 50 184 184 + 185 185 + // Draw pull request icon, count, and label 186 186 + prStartX := currentX 187 187 + err = statsArea.DrawSVGIcon("static/icons/git-pull-request.svg", currentX, statsY+iconBaselineOffset-iconSize/2, iconSize, iconColor) 188 188 + if err != nil { 189 189 + log.Printf("failed to draw git-pull-request icon: %v", err) 190 190 + } 191 191 + currentX += iconSize + 15 192 192 + 193 193 + prText := fmt.Sprintf("%d", pullRequestsText) 194 194 + err = statsArea.DrawTextAt(prText, currentX, statsY+iconBaselineOffset, iconColor, textSize, ogcard.Middle, ogcard.Left) 195 195 + if err != nil { 196 196 + log.Printf("failed to draw PR text: %v", err) 197 197 + } 198 198 + prTextWidth := len(prText) * 20 199 199 + prGroupWidth := iconSize + 15 + prTextWidth 200 200 + 201 201 + // Draw "pulls" label below and centered under the icon+text group 202 202 + labelX = prStartX + prGroupWidth/2 203 203 + err = iconsArea.DrawTextAt("pulls", labelX, labelY, iconColor, labelSize, ogcard.Top, ogcard.Center) 204 204 + if err != nil { 205 205 + log.Printf("failed to draw pulls label: %v", err) 206 206 + } 207 207 + 208 208 + dollyBounds := dollyArea.Img.Bounds() 209 209 + dollySize := 90 210 210 + dollyX := dollyBounds.Min.X + (dollyBounds.Dx() / 2) - (dollySize / 2) 211 211 + dollyY := statsY + iconBaselineOffset - dollySize/2 + 25 212 212 + dollyColor := color.RGBA{180, 180, 180, 255} // light gray 213 213 + err = dollyArea.DrawSVGIcon("templates/fragments/dolly/silhouette.svg", dollyX, dollyY, dollySize, dollyColor) 214 214 + if err != nil { 215 215 + log.Printf("dolly silhouette not available (this is ok): %v", err) 216 216 + } 217 217 + 218 218 + // Draw language bar at bottom 219 219 + err = drawLanguagesCard(languageBarCard, languageStats) 220 220 + if err != nil { 221 221 + log.Printf("failed to draw language bar: %v", err) 222 222 + return nil, err 223 223 + } 224 224 + 225 225 + return mainCard, nil 226 226 + } 227 227 + 228 228 + // hexToColor converts a hex color to a go color 229 229 + func hexToColor(colorStr string) (*color.RGBA, error) { 230 230 + colorStr = strings.TrimLeft(colorStr, "#") 231 231 + 232 232 + b, err := hex.DecodeString(colorStr) 233 233 + if err != nil { 234 234 + return nil, err 235 235 + } 236 236 + 237 237 + if len(b) < 3 { 238 238 + return nil, fmt.Errorf("expected at least 3 bytes from DecodeString, got %d", len(b)) 239 239 + } 240 240 + 241 241 + clr := color.RGBA{b[0], b[1], b[2], 255} 242 242 + 243 243 + return &clr, nil 244 244 + } 245 245 + 246 246 + func drawLanguagesCard(card *ogcard.Card, languageStats []types.RepoLanguageDetails) error { 247 247 + bounds := card.Img.Bounds() 248 248 + cardWidth := bounds.Dx() 249 249 + 250 250 + if len(languageStats) == 0 { 251 251 + // Draw a light gray bar if no languages detected 252 252 + card.DrawRect(bounds.Min.X, bounds.Min.Y, bounds.Max.X, bounds.Max.Y, color.RGBA{225, 228, 232, 255}) 253 253 + return nil 254 254 + } 255 255 + 256 256 + // Limit to top 5 languages for the visual bar 257 257 + displayLanguages := languageStats 258 258 + if len(displayLanguages) > 5 { 259 259 + displayLanguages = displayLanguages[:5] 260 260 + } 261 261 + 262 262 + currentX := bounds.Min.X 263 263 + 264 264 + for _, lang := range displayLanguages { 265 265 + var langColor *color.RGBA 266 266 + var err error 267 267 + 268 268 + if lang.Color != "" { 269 269 + langColor, err = hexToColor(lang.Color) 270 270 + if err != nil { 271 271 + // Fallback to a default color 272 272 + langColor = &color.RGBA{149, 157, 165, 255} 273 273 + } 274 274 + } else { 275 275 + // Default color if no color specified 276 276 + langColor = &color.RGBA{149, 157, 165, 255} 277 277 + } 278 278 + 279 279 + langWidth := float32(cardWidth) * (lang.Percentage / 100) 280 280 + card.DrawRect(currentX, bounds.Min.Y, currentX+int(langWidth), bounds.Max.Y, langColor) 281 281 + currentX += int(langWidth) 282 282 + } 283 283 + 284 284 + // Fill remaining space with the last color (if any gap due to rounding) 285 285 + if currentX < bounds.Max.X && len(displayLanguages) > 0 { 286 286 + lastLang := displayLanguages[len(displayLanguages)-1] 287 287 + var lastColor *color.RGBA 288 288 + var err error 289 289 + 290 290 + if lastLang.Color != "" { 291 291 + lastColor, err = hexToColor(lastLang.Color) 292 292 + if err != nil { 293 293 + lastColor = &color.RGBA{149, 157, 165, 255} 294 294 + } 295 295 + } else { 296 296 + lastColor = &color.RGBA{149, 157, 165, 255} 297 297 + } 298 298 + card.DrawRect(currentX, bounds.Min.Y, bounds.Max.X, bounds.Max.Y, lastColor) 299 299 + } 300 300 + 301 301 + return nil 302 302 + } 303 303 + 304 304 + func (rp *Repo) RepoOpenGraphSummary(w http.ResponseWriter, r *http.Request) { 305 305 + f, err := rp.repoResolver.Resolve(r) 306 306 + if err != nil { 307 307 + log.Println("failed to get repo and knot", err) 308 308 + return 309 309 + } 310 310 + 311 311 + // Get language stats directly from database 312 312 + var languageStats []types.RepoLanguageDetails 313 313 + langs, err := db.GetRepoLanguages( 314 314 + rp.db, 315 315 + db.FilterEq("repo_at", f.RepoAt()), 316 316 + db.FilterEq("is_default_ref", 1), 317 317 + ) 318 318 + if err != nil { 319 319 + log.Printf("failed to get language stats from db: %v", err) 320 320 + // non-fatal, continue without language stats 321 321 + } else if len(langs) > 0 { 322 322 + var total int64 323 323 + for _, l := range langs { 324 324 + total += l.Bytes 325 325 + } 326 326 + 327 327 + for _, l := range langs { 328 328 + percentage := float32(l.Bytes) / float32(total) * 100 329 329 + color := enry.GetColor(l.Language) 330 330 + languageStats = append(languageStats, types.RepoLanguageDetails{ 331 331 + Name: l.Language, 332 332 + Percentage: percentage, 333 333 + Color: color, 334 334 + }) 335 335 + } 336 336 + 337 337 + sort.Slice(languageStats, func(i, j int) bool { 338 338 + if languageStats[i].Name == enry.OtherLanguage { 339 339 + return false 340 340 + } 341 341 + if languageStats[j].Name == enry.OtherLanguage { 342 342 + return true 343 343 + } 344 344 + if languageStats[i].Percentage != languageStats[j].Percentage { 345 345 + return languageStats[i].Percentage > languageStats[j].Percentage 346 346 + } 347 347 + return languageStats[i].Name < languageStats[j].Name 348 348 + }) 349 349 + } 350 350 + 351 351 + card, err := rp.drawRepoSummaryCard(&f.Repo, languageStats) 352 352 + if err != nil { 353 353 + log.Println("failed to draw repo summary card", err) 354 354 + http.Error(w, "failed to draw repo summary card", http.StatusInternalServerError) 355 355 + return 356 356 + } 357 357 + 358 358 + var imageBuffer bytes.Buffer 359 359 + err = png.Encode(&imageBuffer, card.Img) 360 360 + if err != nil { 361 361 + log.Println("failed to encode repo summary card", err) 362 362 + http.Error(w, "failed to encode repo summary card", http.StatusInternalServerError) 363 363 + return 364 364 + } 365 365 + 366 366 + imageBytes := imageBuffer.Bytes() 367 367 + 368 368 + w.Header().Set("Content-Type", "image/png") 369 369 + w.Header().Set("Cache-Control", "public, max-age=3600") // 1 hour 370 370 + w.WriteHeader(http.StatusOK) 371 371 + _, err = w.Write(imageBytes) 372 372 + if err != nil { 373 373 + log.Println("failed to write repo summary card", err) 374 374 + return 375 375 + } 376 376 + }

+86 -42

appview/repo/repo.go

··· 17 17 "strings" 18 18 "time" 19 19 20 20 - comatproto "github.com/bluesky-social/indigo/api/atproto" 21 21 - lexutil "github.com/bluesky-social/indigo/lex/util" 22 22 - indigoxrpc "github.com/bluesky-social/indigo/xrpc" 23 20 "tangled.org/core/api/tangled" 24 21 "tangled.org/core/appview/commitverify" 25 22 "tangled.org/core/appview/config" ··· 40 37 "tangled.org/core/types" 41 38 "tangled.org/core/xrpc/serviceauth" 42 39 40 40 + comatproto "github.com/bluesky-social/indigo/api/atproto" 41 41 + atpclient "github.com/bluesky-social/indigo/atproto/client" 42 42 + "github.com/bluesky-social/indigo/atproto/syntax" 43 43 + lexutil "github.com/bluesky-social/indigo/lex/util" 44 44 + indigoxrpc "github.com/bluesky-social/indigo/xrpc" 43 45 securejoin "github.com/cyphar/filepath-securejoin" 44 46 "github.com/go-chi/chi/v5" 45 47 "github.com/go-git/go-git/v5/plumbing" 46 46 - 47 47 - "github.com/bluesky-social/indigo/atproto/syntax" 48 48 ) 49 49 50 50 type Repo struct { ··· 307 307 // this is a bit of a pain because the golang atproto impl does not allow nil SwapRecord field 308 308 // 309 309 // SwapRecord is optional and should happen automagically, but given that it does not, we have to perform two requests 310 310 - ex, err := client.RepoGetRecord(r.Context(), "", tangled.RepoNSID, newRepo.Did, newRepo.Rkey) 310 310 + ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoNSID, newRepo.Did, newRepo.Rkey) 311 311 if err != nil { 312 312 // failed to get record 313 313 rp.pages.Notice(w, "repo-notice", "Failed to update description, no record found on PDS.") 314 314 return 315 315 } 316 316 - _, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 316 316 + _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 317 317 Collection: tangled.RepoNSID, 318 318 Repo: newRepo.Did, 319 319 Rkey: newRepo.Rkey, ··· 628 628 }) 629 629 } 630 630 631 631 + func (rp *Repo) DeleteBranch(w http.ResponseWriter, r *http.Request) { 632 632 + f, err := rp.repoResolver.Resolve(r) 633 633 + if err != nil { 634 634 + log.Println("failed to get repo and knot", err) 635 635 + return 636 636 + } 637 637 + 638 638 + noticeId := "delete-branch-error" 639 639 + fail := func(msg string, err error) { 640 640 + log.Println(msg, "err", err) 641 641 + rp.pages.Notice(w, noticeId, msg) 642 642 + } 643 643 + 644 644 + branch := r.FormValue("branch") 645 645 + if branch == "" { 646 646 + fail("No branch provided.", nil) 647 647 + return 648 648 + } 649 649 + 650 650 + client, err := rp.oauth.ServiceClient( 651 651 + r, 652 652 + oauth.WithService(f.Knot), 653 653 + oauth.WithLxm(tangled.RepoDeleteBranchNSID), 654 654 + oauth.WithDev(rp.config.Core.Dev), 655 655 + ) 656 656 + if err != nil { 657 657 + fail("Failed to connect to knotserver", nil) 658 658 + return 659 659 + } 660 660 + 661 661 + err = tangled.RepoDeleteBranch( 662 662 + r.Context(), 663 663 + client, 664 664 + &tangled.RepoDeleteBranch_Input{ 665 665 + Branch: branch, 666 666 + Repo: f.RepoAt().String(), 667 667 + }, 668 668 + ) 669 669 + if err := xrpcclient.HandleXrpcErr(err); err != nil { 670 670 + fail(fmt.Sprintf("Failed to delete branch: %s", err), err) 671 671 + return 672 672 + } 673 673 + log.Println("deleted branch from knot", "branch", branch, "repo", f.RepoAt()) 674 674 + 675 675 + rp.pages.HxRefresh(w) 676 676 + } 677 677 + 631 678 func (rp *Repo) RepoBlob(w http.ResponseWriter, r *http.Request) { 632 679 f, err := rp.repoResolver.Resolve(r) 633 680 if err != nil { ··· 863 910 user := rp.oauth.GetUser(r) 864 911 l := rp.logger.With("handler", "EditSpindle") 865 912 l = l.With("did", user.Did) 866 866 - l = l.With("handle", user.Handle) 867 913 868 914 errorId := "operation-error" 869 915 fail := func(msg string, err error) { ··· 916 962 return 917 963 } 918 964 919 919 - ex, err := client.RepoGetRecord(r.Context(), "", tangled.RepoNSID, newRepo.Did, newRepo.Rkey) 965 965 + ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoNSID, newRepo.Did, newRepo.Rkey) 920 966 if err != nil { 921 967 fail("Failed to update spindle, no record found on PDS.", err) 922 968 return 923 969 } 924 924 - _, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 970 970 + _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 925 971 Collection: tangled.RepoNSID, 926 972 Repo: newRepo.Did, 927 973 Rkey: newRepo.Rkey, ··· 951 997 user := rp.oauth.GetUser(r) 952 998 l := rp.logger.With("handler", "AddLabel") 953 999 l = l.With("did", user.Did) 954 954 - l = l.With("handle", user.Handle) 955 1000 956 1001 f, err := rp.repoResolver.Resolve(r) 957 1002 if err != nil { ··· 1020 1065 1021 1066 // emit a labelRecord 1022 1067 labelRecord := label.AsRecord() 1023 1023 - resp, err := client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 1068 1068 + resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 1024 1069 Collection: tangled.LabelDefinitionNSID, 1025 1070 Repo: label.Did, 1026 1071 Rkey: label.Rkey, ··· 1043 1088 newRepo.Labels = append(newRepo.Labels, aturi) 1044 1089 repoRecord := newRepo.AsRecord() 1045 1090 1046 1046 - ex, err := client.RepoGetRecord(r.Context(), "", tangled.RepoNSID, newRepo.Did, newRepo.Rkey) 1091 1091 + ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoNSID, newRepo.Did, newRepo.Rkey) 1047 1092 if err != nil { 1048 1093 fail("Failed to update labels, no record found on PDS.", err) 1049 1094 return 1050 1095 } 1051 1051 - _, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 1096 1096 + _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 1052 1097 Collection: tangled.RepoNSID, 1053 1098 Repo: newRepo.Did, 1054 1099 Rkey: newRepo.Rkey, ··· 1111 1156 user := rp.oauth.GetUser(r) 1112 1157 l := rp.logger.With("handler", "DeleteLabel") 1113 1158 l = l.With("did", user.Did) 1114 1114 - l = l.With("handle", user.Handle) 1115 1159 1116 1160 f, err := rp.repoResolver.Resolve(r) 1117 1161 if err != nil { ··· 1141 1185 } 1142 1186 1143 1187 // delete label record from PDS 1144 1144 - _, err = client.RepoDeleteRecord(r.Context(), &comatproto.RepoDeleteRecord_Input{ 1188 1188 + _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 1145 1189 Collection: tangled.LabelDefinitionNSID, 1146 1190 Repo: label.Did, 1147 1191 Rkey: label.Rkey, ··· 1163 1207 newRepo.Labels = updated 1164 1208 repoRecord := newRepo.AsRecord() 1165 1209 1166 1166 - ex, err := client.RepoGetRecord(r.Context(), "", tangled.RepoNSID, newRepo.Did, newRepo.Rkey) 1210 1210 + ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoNSID, newRepo.Did, newRepo.Rkey) 1167 1211 if err != nil { 1168 1212 fail("Failed to update labels, no record found on PDS.", err) 1169 1213 return 1170 1214 } 1171 1171 - _, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 1215 1215 + _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 1172 1216 Collection: tangled.RepoNSID, 1173 1217 Repo: newRepo.Did, 1174 1218 Rkey: newRepo.Rkey, ··· 1220 1264 user := rp.oauth.GetUser(r) 1221 1265 l := rp.logger.With("handler", "SubscribeLabel") 1222 1266 l = l.With("did", user.Did) 1223 1223 - l = l.With("handle", user.Handle) 1224 1267 1225 1268 f, err := rp.repoResolver.Resolve(r) 1226 1269 if err != nil { ··· 1261 1304 return 1262 1305 } 1263 1306 1264 1264 - ex, err := client.RepoGetRecord(r.Context(), "", tangled.RepoNSID, f.Repo.Did, f.Repo.Rkey) 1307 1307 + ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoNSID, f.Repo.Did, f.Repo.Rkey) 1265 1308 if err != nil { 1266 1309 fail("Failed to update labels, no record found on PDS.", err) 1267 1310 return 1268 1311 } 1269 1269 - _, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 1312 1312 + _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 1270 1313 Collection: tangled.RepoNSID, 1271 1314 Repo: newRepo.Did, 1272 1315 Rkey: newRepo.Rkey, ··· 1307 1350 user := rp.oauth.GetUser(r) 1308 1351 l := rp.logger.With("handler", "UnsubscribeLabel") 1309 1352 l = l.With("did", user.Did) 1310 1310 - l = l.With("handle", user.Handle) 1311 1353 1312 1354 f, err := rp.repoResolver.Resolve(r) 1313 1355 if err != nil { ··· 1350 1392 return 1351 1393 } 1352 1394 1353 1353 - ex, err := client.RepoGetRecord(r.Context(), "", tangled.RepoNSID, f.Repo.Did, f.Repo.Rkey) 1395 1395 + ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.RepoNSID, f.Repo.Did, f.Repo.Rkey) 1354 1396 if err != nil { 1355 1397 fail("Failed to update labels, no record found on PDS.", err) 1356 1398 return 1357 1399 } 1358 1358 - _, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 1400 1400 + _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 1359 1401 Collection: tangled.RepoNSID, 1360 1402 Repo: newRepo.Did, 1361 1403 Rkey: newRepo.Rkey, ··· 1479 1521 user := rp.oauth.GetUser(r) 1480 1522 l := rp.logger.With("handler", "AddCollaborator") 1481 1523 l = l.With("did", user.Did) 1482 1482 - l = l.With("handle", user.Handle) 1483 1524 1484 1525 f, err := rp.repoResolver.Resolve(r) 1485 1526 if err != nil { ··· 1526 1567 currentUser := rp.oauth.GetUser(r) 1527 1568 rkey := tid.TID() 1528 1569 createdAt := time.Now() 1529 1529 - resp, err := client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 1570 1570 + resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 1530 1571 Collection: tangled.RepoCollaboratorNSID, 1531 1572 Repo: currentUser.Did, 1532 1573 Rkey: rkey, ··· 1617 1658 } 1618 1659 1619 1660 // remove record from pds 1620 1620 - xrpcClient, err := rp.oauth.AuthorizedClient(r) 1661 1661 + atpClient, err := rp.oauth.AuthorizedClient(r) 1621 1662 if err != nil { 1622 1663 log.Println("failed to get authorized client", err) 1623 1664 return 1624 1665 } 1625 1625 - _, err = xrpcClient.RepoDeleteRecord(r.Context(), &comatproto.RepoDeleteRecord_Input{ 1666 1666 + _, err = comatproto.RepoDeleteRecord(r.Context(), atpClient, &comatproto.RepoDeleteRecord_Input{ 1626 1667 Collection: tangled.RepoNSID, 1627 1668 Repo: user.Did, 1628 1669 Rkey: f.Rkey, ··· 1764 1805 func (rp *Repo) Secrets(w http.ResponseWriter, r *http.Request) { 1765 1806 user := rp.oauth.GetUser(r) 1766 1807 l := rp.logger.With("handler", "Secrets") 1767 1767 - l = l.With("handle", user.Handle) 1768 1808 l = l.With("did", user.Did) 1769 1809 1770 1810 f, err := rp.repoResolver.Resolve(r) ··· 2129 2169 } 2130 2170 2131 2171 // choose a name for a fork 2132 2132 - forkName := f.Name 2172 2172 + forkName := r.FormValue("repo_name") 2173 2173 + if forkName == "" { 2174 2174 + rp.pages.Notice(w, "repo", "Repository name cannot be empty.") 2175 2175 + return 2176 2176 + } 2177 2177 + 2133 2178 // this check is *only* to see if the forked repo name already exists 2134 2179 // in the user's account. 2135 2180 existingRepo, err := db.GetRepo( 2136 2181 rp.db, 2137 2182 db.FilterEq("did", user.Did), 2138 2138 - db.FilterEq("name", f.Name), 2183 2183 + db.FilterEq("name", forkName), 2139 2184 ) 2140 2185 if err != nil { 2141 2141 - if errors.Is(err, sql.ErrNoRows) { 2142 2142 - // no existing repo with this name found, we can use the name as is 2143 2143 - } else { 2186 2186 + if !errors.Is(err, sql.ErrNoRows) { 2144 2187 log.Println("error fetching existing repo from db", "err", err) 2145 2188 rp.pages.Notice(w, "repo", "Failed to fork this repository. Try again later.") 2146 2189 return 2147 2190 } 2148 2191 } else if existingRepo != nil { 2149 2149 - // repo with this name already exists, append random string 2150 2150 - forkName = fmt.Sprintf("%s-%s", forkName, randomString(3)) 2192 2192 + // repo with this name already exists 2193 2193 + rp.pages.Notice(w, "repo", "A repository with this name already exists.") 2194 2194 + return 2151 2195 } 2152 2196 l = l.With("forkName", forkName) 2153 2197 ··· 2175 2219 } 2176 2220 record := repo.AsRecord() 2177 2221 2178 2178 - xrpcClient, err := rp.oauth.AuthorizedClient(r) 2222 2222 + atpClient, err := rp.oauth.AuthorizedClient(r) 2179 2223 if err != nil { 2180 2224 l.Error("failed to create xrpcclient", "err", err) 2181 2225 rp.pages.Notice(w, "repo", "Failed to fork repository.") 2182 2226 return 2183 2227 } 2184 2228 2185 2185 - atresp, err := xrpcClient.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 2229 2229 + atresp, err := comatproto.RepoPutRecord(r.Context(), atpClient, &comatproto.RepoPutRecord_Input{ 2186 2230 Collection: tangled.RepoNSID, 2187 2231 Repo: user.Did, 2188 2232 Rkey: rkey, ··· 2214 2258 rollback := func() { 2215 2259 err1 := tx.Rollback() 2216 2260 err2 := rp.enforcer.E.LoadPolicy() 2217 2217 - err3 := rollbackRecord(context.Background(), aturi, xrpcClient) 2261 2261 + err3 := rollbackRecord(context.Background(), aturi, atpClient) 2218 2262 2219 2263 // ignore txn complete errors, this is okay 2220 2264 if errors.Is(err1, sql.ErrTxDone) { ··· 2287 2331 aturi = "" 2288 2332 2289 2333 rp.notifier.NewRepo(r.Context(), repo) 2290 2290 - rp.pages.HxLocation(w, fmt.Sprintf("/@%s/%s", user.Handle, forkName)) 2334 2334 + rp.pages.HxLocation(w, fmt.Sprintf("/@%s/%s", user.Did, forkName)) 2291 2335 } 2292 2336 } 2293 2337 2294 2338 // this is used to rollback changes made to the PDS 2295 2339 // 2296 2340 // it is a no-op if the provided ATURI is empty 2297 2297 - func rollbackRecord(ctx context.Context, aturi string, xrpcc *xrpcclient.Client) error { 2341 2341 + func rollbackRecord(ctx context.Context, aturi string, client *atpclient.APIClient) error { 2298 2342 if aturi == "" { 2299 2343 return nil 2300 2344 } ··· 2305 2349 repo := parsed.Authority().String() 2306 2350 rkey := parsed.RecordKey().String() 2307 2351 2308 2308 - _, err := xrpcc.RepoDeleteRecord(ctx, &comatproto.RepoDeleteRecord_Input{ 2352 2352 + _, err := comatproto.RepoDeleteRecord(ctx, client, &comatproto.RepoDeleteRecord_Input{ 2309 2353 Collection: collection, 2310 2354 Repo: repo, 2311 2355 Rkey: rkey,

+2

appview/repo/router.go

··· 10 10 func (rp *Repo) Router(mw *middleware.Middleware) http.Handler { 11 11 r := chi.NewRouter() 12 12 r.Get("/", rp.RepoIndex) 13 13 + r.Get("/opengraph", rp.RepoOpenGraphSummary) 13 14 r.Get("/feed.atom", rp.RepoAtomFeed) 14 15 r.Get("/commits/{ref}", rp.RepoLog) 15 16 r.Route("/tree/{ref}", func(r chi.Router) { ··· 18 19 }) 19 20 r.Get("/commit/{ref}", rp.RepoCommit) 20 21 r.Get("/branches", rp.RepoBranches) 22 22 + r.Delete("/branches", rp.DeleteBranch) 21 23 r.Route("/tags", func(r chi.Router) { 22 24 r.Get("/", rp.RepoTags) 23 25 r.Route("/{tag}", func(r chi.Router) {

+2 -2

appview/settings/settings.go

··· 470 470 } 471 471 472 472 // store in pds too 473 473 - resp, err := client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 473 473 + resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 474 474 Collection: tangled.PublicKeyNSID, 475 475 Repo: did, 476 476 Rkey: rkey, ··· 527 527 528 528 if rkey != "" { 529 529 // remove from pds too 530 530 - _, err := client.RepoDeleteRecord(r.Context(), &comatproto.RepoDeleteRecord_Input{ 530 530 + _, err := comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 531 531 Collection: tangled.PublicKeyNSID, 532 532 Repo: did, 533 533 Rkey: rkey,

+1 -3

appview/signup/signup.go

··· 20 20 "tangled.org/core/appview/models" 21 21 "tangled.org/core/appview/pages" 22 22 "tangled.org/core/appview/state/userutil" 23 23 - "tangled.org/core/appview/xrpcclient" 24 23 "tangled.org/core/idresolver" 25 24 ) 26 25 ··· 29 28 db *db.DB 30 29 cf *dns.Cloudflare 31 30 posthog posthog.Client 32 32 - xrpc *xrpcclient.Client 33 31 idResolver *idresolver.Resolver 34 32 pages *pages.Pages 35 33 l *slog.Logger ··· 133 131 noticeId := "signup-msg" 134 132 135 133 if err := s.validateCaptcha(cfToken, r); err != nil { 136 136 - s.l.Warn("turnstile validation failed", "error", err) 134 134 + s.l.Warn("turnstile validation failed", "error", err, "email", emailId) 137 135 s.pages.Notice(w, noticeId, "Captcha validation failed.") 138 136 return 139 137 }

+5 -5

appview/spindles/spindles.go

··· 189 189 return 190 190 } 191 191 192 192 - ex, _ := client.RepoGetRecord(r.Context(), "", tangled.SpindleNSID, user.Did, instance) 192 192 + ex, _ := comatproto.RepoGetRecord(r.Context(), client, "", tangled.SpindleNSID, user.Did, instance) 193 193 var exCid *string 194 194 if ex != nil { 195 195 exCid = ex.Cid 196 196 } 197 197 198 198 // re-announce by registering under same rkey 199 199 - _, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 199 199 + _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 200 200 Collection: tangled.SpindleNSID, 201 201 Repo: user.Did, 202 202 Rkey: instance, ··· 332 332 return 333 333 } 334 334 335 335 - _, err = client.RepoDeleteRecord(r.Context(), &comatproto.RepoDeleteRecord_Input{ 335 335 + _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 336 336 Collection: tangled.SpindleNSID, 337 337 Repo: user.Did, 338 338 Rkey: instance, ··· 542 542 return 543 543 } 544 544 545 545 - _, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 545 545 + _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 546 546 Collection: tangled.SpindleMemberNSID, 547 547 Repo: user.Did, 548 548 Rkey: rkey, ··· 683 683 } 684 684 685 685 // remove from pds 686 686 - _, err = client.RepoDeleteRecord(r.Context(), &comatproto.RepoDeleteRecord_Input{ 686 686 + _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 687 687 Collection: tangled.SpindleMemberNSID, 688 688 Repo: user.Did, 689 689 Rkey: members[0].Rkey,

+2 -2

appview/state/follow.go

··· 43 43 case http.MethodPost: 44 44 createdAt := time.Now().Format(time.RFC3339) 45 45 rkey := tid.TID() 46 46 - resp, err := client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 46 46 + resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 47 47 Collection: tangled.GraphFollowNSID, 48 48 Repo: currentUser.Did, 49 49 Rkey: rkey, ··· 88 88 return 89 89 } 90 90 91 91 - _, err = client.RepoDeleteRecord(r.Context(), &comatproto.RepoDeleteRecord_Input{ 91 91 + _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 92 92 Collection: tangled.GraphFollowNSID, 93 93 Repo: currentUser.Did, 94 94 Rkey: follow.Rkey,

+151

appview/state/gfi.go

··· 1 1 + package state 2 2 + 3 3 + import ( 4 4 + "fmt" 5 5 + "log" 6 6 + "net/http" 7 7 + "sort" 8 8 + 9 9 + "github.com/bluesky-social/indigo/atproto/syntax" 10 10 + "tangled.org/core/api/tangled" 11 11 + "tangled.org/core/appview/db" 12 12 + "tangled.org/core/appview/models" 13 13 + "tangled.org/core/appview/pages" 14 14 + "tangled.org/core/appview/pagination" 15 15 + "tangled.org/core/consts" 16 16 + ) 17 17 + 18 18 + func (s *State) GoodFirstIssues(w http.ResponseWriter, r *http.Request) { 19 19 + user := s.oauth.GetUser(r) 20 20 + 21 21 + page, ok := r.Context().Value("page").(pagination.Page) 22 22 + if !ok { 23 23 + page = pagination.FirstPage() 24 24 + } 25 25 + 26 26 + goodFirstIssueLabel := fmt.Sprintf("at://%s/%s/%s", consts.TangledDid, tangled.LabelDefinitionNSID, "good-first-issue") 27 27 + 28 28 + repoLabels, err := db.GetRepoLabels(s.db, db.FilterEq("label_at", goodFirstIssueLabel)) 29 29 + if err != nil { 30 30 + log.Println("failed to get repo labels", err) 31 31 + s.pages.Error503(w) 32 32 + return 33 33 + } 34 34 + 35 35 + if len(repoLabels) == 0 { 36 36 + s.pages.GoodFirstIssues(w, pages.GoodFirstIssuesParams{ 37 37 + LoggedInUser: user, 38 38 + RepoGroups: []*models.RepoGroup{}, 39 39 + LabelDefs: make(map[string]*models.LabelDefinition), 40 40 + Page: page, 41 41 + }) 42 42 + return 43 43 + } 44 44 + 45 45 + repoUris := make([]string, 0, len(repoLabels)) 46 46 + for _, rl := range repoLabels { 47 47 + repoUris = append(repoUris, rl.RepoAt.String()) 48 48 + } 49 49 + 50 50 + allIssues, err := db.GetIssuesPaginated( 51 51 + s.db, 52 52 + pagination.Page{ 53 53 + Limit: 500, 54 54 + }, 55 55 + db.FilterIn("repo_at", repoUris), 56 56 + db.FilterEq("open", 1), 57 57 + ) 58 58 + if err != nil { 59 59 + log.Println("failed to get issues", err) 60 60 + s.pages.Error503(w) 61 61 + return 62 62 + } 63 63 + 64 64 + var goodFirstIssues []models.Issue 65 65 + for _, issue := range allIssues { 66 66 + if issue.Labels.ContainsLabel(goodFirstIssueLabel) { 67 67 + goodFirstIssues = append(goodFirstIssues, issue) 68 68 + } 69 69 + } 70 70 + 71 71 + repoGroups := make(map[syntax.ATURI]*models.RepoGroup) 72 72 + for _, issue := range goodFirstIssues { 73 73 + if group, exists := repoGroups[issue.Repo.RepoAt()]; exists { 74 74 + group.Issues = append(group.Issues, issue) 75 75 + } else { 76 76 + repoGroups[issue.Repo.RepoAt()] = &models.RepoGroup{ 77 77 + Repo: issue.Repo, 78 78 + Issues: []models.Issue{issue}, 79 79 + } 80 80 + } 81 81 + } 82 82 + 83 83 + var sortedGroups []*models.RepoGroup 84 84 + for _, group := range repoGroups { 85 85 + sortedGroups = append(sortedGroups, group) 86 86 + } 87 87 + 88 88 + sort.Slice(sortedGroups, func(i, j int) bool { 89 89 + iIsTangled := sortedGroups[i].Repo.Did == consts.TangledDid 90 90 + jIsTangled := sortedGroups[j].Repo.Did == consts.TangledDid 91 91 + 92 92 + // If one is tangled and the other isn't, non-tangled comes first 93 93 + if iIsTangled != jIsTangled { 94 94 + return jIsTangled // true if j is tangled (i should come first) 95 95 + } 96 96 + 97 97 + // Both tangled or both not tangled: sort by name 98 98 + return sortedGroups[i].Repo.Name < sortedGroups[j].Repo.Name 99 99 + }) 100 100 + 101 101 + groupStart := page.Offset 102 102 + groupEnd := page.Offset + page.Limit 103 103 + if groupStart > len(sortedGroups) { 104 104 + groupStart = len(sortedGroups) 105 105 + } 106 106 + if groupEnd > len(sortedGroups) { 107 107 + groupEnd = len(sortedGroups) 108 108 + } 109 109 + 110 110 + paginatedGroups := sortedGroups[groupStart:groupEnd] 111 111 + 112 112 + var allIssuesFromGroups []models.Issue 113 113 + for _, group := range paginatedGroups { 114 114 + allIssuesFromGroups = append(allIssuesFromGroups, group.Issues...) 115 115 + } 116 116 + 117 117 + var allLabelDefs []models.LabelDefinition 118 118 + if len(allIssuesFromGroups) > 0 { 119 119 + labelDefUris := make(map[string]bool) 120 120 + for _, issue := range allIssuesFromGroups { 121 121 + for labelDefUri := range issue.Labels.Inner() { 122 122 + labelDefUris[labelDefUri] = true 123 123 + } 124 124 + } 125 125 + 126 126 + uriList := make([]string, 0, len(labelDefUris)) 127 127 + for uri := range labelDefUris { 128 128 + uriList = append(uriList, uri) 129 129 + } 130 130 + 131 131 + if len(uriList) > 0 { 132 132 + allLabelDefs, err = db.GetLabelDefinitions(s.db, db.FilterIn("at_uri", uriList)) 133 133 + if err != nil { 134 134 + log.Println("failed to fetch labels", err) 135 135 + } 136 136 + } 137 137 + } 138 138 + 139 139 + labelDefsMap := make(map[string]*models.LabelDefinition) 140 140 + for i := range allLabelDefs { 141 141 + labelDefsMap[allLabelDefs[i].AtUri().String()] = &allLabelDefs[i] 142 142 + } 143 143 + 144 144 + s.pages.GoodFirstIssues(w, pages.GoodFirstIssuesParams{ 145 145 + LoggedInUser: user, 146 146 + RepoGroups: paginatedGroups, 147 147 + LabelDefs: labelDefsMap, 148 148 + Page: page, 149 149 + GfiLabel: labelDefsMap[goodFirstIssueLabel], 150 150 + }) 151 151 + }

+14 -1

appview/state/knotstream.go

··· 172 172 }) 173 173 } 174 174 175 175 - return db.InsertRepoLanguages(d, langs) 175 175 + tx, err := d.Begin() 176 176 + if err != nil { 177 177 + return err 178 178 + } 179 179 + defer tx.Rollback() 180 180 + 181 181 + // update appview's cache 182 182 + err = db.UpdateRepoLanguages(tx, repo.RepoAt(), ref.Short(), langs) 183 183 + if err != nil { 184 184 + fmt.Printf("failed; %s\n", err) 185 185 + // non-fatal 186 186 + } 187 187 + 188 188 + return tx.Commit() 176 189 } 177 190 178 191 func ingestPipeline(d *db.DB, source ec.Source, msg ec.Message) error {

+63

appview/state/login.go

··· 1 1 + package state 2 2 + 3 3 + import ( 4 4 + "fmt" 5 5 + "log" 6 6 + "net/http" 7 7 + "strings" 8 8 + 9 9 + "tangled.org/core/appview/pages" 10 10 + ) 11 11 + 12 12 + func (s *State) Login(w http.ResponseWriter, r *http.Request) { 13 13 + switch r.Method { 14 14 + case http.MethodGet: 15 15 + returnURL := r.URL.Query().Get("return_url") 16 16 + s.pages.Login(w, pages.LoginParams{ 17 17 + ReturnUrl: returnURL, 18 18 + }) 19 19 + case http.MethodPost: 20 20 + handle := r.FormValue("handle") 21 21 + 22 22 + // when users copy their handle from bsky.app, it tends to have these characters around it: 23 23 + // 24 24 + // @nelind.dk: 25 25 + // \u202a ensures that the handle is always rendered left to right and 26 26 + // \u202c reverts that so the rest of the page renders however it should 27 27 + handle = strings.TrimPrefix(handle, "\u202a") 28 28 + handle = strings.TrimSuffix(handle, "\u202c") 29 29 + 30 30 + // `@` is harmless 31 31 + handle = strings.TrimPrefix(handle, "@") 32 32 + 33 33 + // basic handle validation 34 34 + if !strings.Contains(handle, ".") { 35 35 + log.Println("invalid handle format", "raw", handle) 36 36 + s.pages.Notice( 37 37 + w, 38 38 + "login-msg", 39 39 + fmt.Sprintf("\"%s\" is an invalid handle. Did you mean %s.bsky.social or %s.tngl.sh?", handle, handle, handle), 40 40 + ) 41 41 + return 42 42 + } 43 43 + 44 44 + redirectURL, err := s.oauth.ClientApp.StartAuthFlow(r.Context(), handle) 45 45 + if err != nil { 46 46 + http.Error(w, err.Error(), http.StatusInternalServerError) 47 47 + return 48 48 + } 49 49 + 50 50 + s.pages.HxRedirect(w, redirectURL) 51 51 + } 52 52 + } 53 53 + 54 54 + func (s *State) Logout(w http.ResponseWriter, r *http.Request) { 55 55 + err := s.oauth.DeleteSession(w, r) 56 56 + if err != nil { 57 57 + log.Println("failed to logout", "err", err) 58 58 + } else { 59 59 + log.Println("logged out successfully") 60 60 + } 61 61 + 62 62 + s.pages.HxRedirect(w, "/login") 63 63 + }

+2 -2

appview/state/profile.go

··· 634 634 vanityStats = append(vanityStats, string(v.Kind)) 635 635 } 636 636 637 637 - ex, _ := client.RepoGetRecord(r.Context(), "", tangled.ActorProfileNSID, user.Did, "self") 637 637 + ex, _ := comatproto.RepoGetRecord(r.Context(), client, "", tangled.ActorProfileNSID, user.Did, "self") 638 638 var cid *string 639 639 if ex != nil { 640 640 cid = ex.Cid 641 641 } 642 642 643 643 - _, err = client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 643 643 + _, err = comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 644 644 Collection: tangled.ActorProfileNSID, 645 645 Repo: user.Did, 646 646 Rkey: "self",

+11 -9

appview/state/reaction.go

··· 7 7 8 8 comatproto "github.com/bluesky-social/indigo/api/atproto" 9 9 "github.com/bluesky-social/indigo/atproto/syntax" 10 10 - 11 10 lexutil "github.com/bluesky-social/indigo/lex/util" 11 11 + 12 12 "tangled.org/core/api/tangled" 13 13 "tangled.org/core/appview/db" 14 14 "tangled.org/core/appview/models" ··· 47 47 case http.MethodPost: 48 48 createdAt := time.Now().Format(time.RFC3339) 49 49 rkey := tid.TID() 50 50 - resp, err := client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 50 50 + resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 51 51 Collection: tangled.FeedReactionNSID, 52 52 Repo: currentUser.Did, 53 53 Rkey: rkey, ··· 70 70 return 71 71 } 72 72 73 73 - count, err := db.GetReactionCount(s.db, subjectUri, reactionKind) 73 73 + reactionMap, err := db.GetReactionMap(s.db, 20, subjectUri) 74 74 if err != nil { 75 75 - log.Println("failed to get reaction count for ", subjectUri) 75 75 + log.Println("failed to get reactions for ", subjectUri) 76 76 } 77 77 78 78 log.Println("created atproto record: ", resp.Uri) ··· 80 80 s.pages.ThreadReactionFragment(w, pages.ThreadReactionFragmentParams{ 81 81 ThreadAt: subjectUri, 82 82 Kind: reactionKind, 83 83 - Count: count, 83 83 + Count: reactionMap[reactionKind].Count, 84 84 + Users: reactionMap[reactionKind].Users, 84 85 IsReacted: true, 85 86 }) 86 87 ··· 92 93 return 93 94 } 94 95 95 95 - _, err = client.RepoDeleteRecord(r.Context(), &comatproto.RepoDeleteRecord_Input{ 96 96 + _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 96 97 Collection: tangled.FeedReactionNSID, 97 98 Repo: currentUser.Did, 98 99 Rkey: reaction.Rkey, ··· 109 110 // this is not an issue, the firehose event might have already done this 110 111 } 111 112 112 112 - count, err := db.GetReactionCount(s.db, subjectUri, reactionKind) 113 113 + reactionMap, err := db.GetReactionMap(s.db, 20, subjectUri) 113 114 if err != nil { 114 114 - log.Println("failed to get reaction count for ", subjectUri) 115 115 + log.Println("failed to get reactions for ", subjectUri) 115 116 return 116 117 } 117 118 118 119 s.pages.ThreadReactionFragment(w, pages.ThreadReactionFragmentParams{ 119 120 ThreadAt: subjectUri, 120 121 Kind: reactionKind, 121 121 - Count: count, 122 122 + Count: reactionMap[reactionKind].Count, 123 123 + Users: reactionMap[reactionKind].Users, 122 124 IsReacted: false, 123 125 }) 124 126

+9 -10

appview/state/router.go

··· 5 5 "strings" 6 6 7 7 "github.com/go-chi/chi/v5" 8 8 - "github.com/gorilla/sessions" 9 8 "tangled.org/core/appview/issues" 10 9 "tangled.org/core/appview/knots" 11 10 "tangled.org/core/appview/labels" 12 11 "tangled.org/core/appview/middleware" 13 12 "tangled.org/core/appview/notifications" 14 14 - oauthhandler "tangled.org/core/appview/oauth/handler" 15 13 "tangled.org/core/appview/pipelines" 16 14 "tangled.org/core/appview/pulls" 17 15 "tangled.org/core/appview/repo" ··· 34 32 s.pages, 35 33 ) 36 34 37 37 - router.Use(middleware.TryRefreshSession()) 38 35 router.Get("/favicon.svg", s.Favicon) 39 36 router.Get("/favicon.ico", s.Favicon) 37 37 + router.Get("/pwa-manifest.json", s.PWAManifest) 38 38 + router.Get("/robots.txt", s.RobotsTxt) 40 39 41 40 userRouter := s.UserRouter(&middleware) 42 41 standardRouter := s.StandardRouter(&middleware) ··· 122 121 // special-case handler for serving tangled.org/core 123 122 r.Get("/core", s.Core()) 124 123 124 124 + r.Get("/login", s.Login) 125 125 + r.Post("/login", s.Login) 126 126 + r.Post("/logout", s.Logout) 127 127 + 125 128 r.Route("/repo", func(r chi.Router) { 126 129 r.Route("/new", func(r chi.Router) { 127 130 r.Use(middleware.AuthMiddleware(s.oauth)) ··· 131 134 // r.Post("/import", s.ImportRepo) 132 135 }) 133 136 137 137 + r.Get("/goodfirstissues", s.GoodFirstIssues) 138 138 + 134 139 r.With(middleware.AuthMiddleware(s.oauth)).Route("/follow", func(r chi.Router) { 135 140 r.Post("/", s.Follow) 136 141 r.Delete("/", s.Follow) ··· 161 166 r.Mount("/notifications", s.NotificationsRouter(mw)) 162 167 163 168 r.Mount("/signup", s.SignupRouter()) 164 164 - r.Mount("/", s.OAuthRouter()) 169 169 + r.Mount("/", s.oauth.Router()) 165 170 166 171 r.Get("/keys/{user}", s.Keys) 167 172 r.Get("/terms", s.TermsOfService) ··· 186 191 187 192 http.Redirect(w, r, "/@tangled.org/core", http.StatusFound) 188 193 } 189 189 - } 190 190 - 191 191 - func (s *State) OAuthRouter() http.Handler { 192 192 - store := sessions.NewCookieStore([]byte(s.config.Core.CookieSecret)) 193 193 - oauth := oauthhandler.New(s.config, s.pages, s.idResolver, s.db, s.sess, store, s.oauth, s.enforcer, s.posthog) 194 194 - return oauth.Router() 195 194 } 196 195 197 196 func (s *State) SettingsRouter() http.Handler {

+2 -2

appview/state/star.go

··· 40 40 case http.MethodPost: 41 41 createdAt := time.Now().Format(time.RFC3339) 42 42 rkey := tid.TID() 43 43 - resp, err := client.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 43 43 + resp, err := comatproto.RepoPutRecord(r.Context(), client, &comatproto.RepoPutRecord_Input{ 44 44 Collection: tangled.FeedStarNSID, 45 45 Repo: currentUser.Did, 46 46 Rkey: rkey, ··· 92 92 return 93 93 } 94 94 95 95 - _, err = client.RepoDeleteRecord(r.Context(), &comatproto.RepoDeleteRecord_Input{ 95 95 + _, err = comatproto.RepoDeleteRecord(r.Context(), client, &comatproto.RepoDeleteRecord_Input{ 96 96 Collection: tangled.FeedStarNSID, 97 97 Repo: currentUser.Did, 98 98 Rkey: star.Rkey,

+68 -20

appview/state/state.go

··· 11 11 "strings" 12 12 "time" 13 13 14 14 - comatproto "github.com/bluesky-social/indigo/api/atproto" 15 15 - "github.com/bluesky-social/indigo/atproto/syntax" 16 16 - lexutil "github.com/bluesky-social/indigo/lex/util" 17 17 - securejoin "github.com/cyphar/filepath-securejoin" 18 18 - "github.com/go-chi/chi/v5" 19 19 - "github.com/posthog/posthog-go" 20 14 "tangled.org/core/api/tangled" 21 15 "tangled.org/core/appview" 22 16 "tangled.org/core/appview/cache" ··· 38 32 tlog "tangled.org/core/log" 39 33 "tangled.org/core/rbac" 40 34 "tangled.org/core/tid" 35 35 + 36 36 + comatproto "github.com/bluesky-social/indigo/api/atproto" 37 37 + atpclient "github.com/bluesky-social/indigo/atproto/client" 38 38 + "github.com/bluesky-social/indigo/atproto/syntax" 39 39 + lexutil "github.com/bluesky-social/indigo/lex/util" 40 40 + securejoin "github.com/cyphar/filepath-securejoin" 41 41 + "github.com/go-chi/chi/v5" 42 42 + "github.com/posthog/posthog-go" 41 43 ) 42 44 43 45 type State struct { ··· 75 77 res = idresolver.DefaultResolver() 76 78 } 77 79 78 78 - pgs := pages.NewPages(config, res) 80 80 + pages := pages.NewPages(config, res) 79 81 cache := cache.New(config.Redis.Addr) 80 82 sess := session.New(cache) 81 81 - oauth := oauth.NewOAuth(config, sess) 83 83 + oauth2, err := oauth.New(config) 84 84 + if err != nil { 85 85 + return nil, fmt.Errorf("failed to start oauth handler: %w", err) 86 86 + } 82 87 validator := validator.New(d, res, enforcer) 83 88 84 89 posthog, err := posthog.NewWithConfig(config.Posthog.ApiKey, posthog.Config{Endpoint: config.Posthog.Endpoint}) ··· 162 167 state := &State{ 163 168 d, 164 169 notifier, 165 165 - oauth, 170 170 + oauth2, 166 171 enforcer, 167 167 - pgs, 172 172 + pages, 168 173 sess, 169 174 res, 170 175 posthog, ··· 198 203 s.pages.Favicon(w) 199 204 } 200 205 206 206 + func (s *State) RobotsTxt(w http.ResponseWriter, r *http.Request) { 207 207 + w.Header().Set("Content-Type", "text/plain") 208 208 + w.Header().Set("Cache-Control", "public, max-age=86400") // one day 209 209 + 210 210 + robotsTxt := `User-agent: * 211 211 + Allow: / 212 212 + ` 213 213 + w.Write([]byte(robotsTxt)) 214 214 + } 215 215 + 216 216 + // https://developer.mozilla.org/en-US/docs/Web/Progressive_web_apps/Manifest 217 217 + const manifestJson = `{ 218 218 + "name": "tangled", 219 219 + "description": "tightly-knit social coding.", 220 220 + "icons": [ 221 221 + { 222 222 + "src": "/favicon.svg", 223 223 + "sizes": "144x144" 224 224 + } 225 225 + ], 226 226 + "start_url": "/", 227 227 + "id": "org.tangled", 228 228 + 229 229 + "display": "standalone", 230 230 + "background_color": "#111827", 231 231 + "theme_color": "#111827" 232 232 + }` 233 233 + 234 234 + func (p *State) PWAManifest(w http.ResponseWriter, r *http.Request) { 235 235 + w.Header().Set("Content-Type", "application/json") 236 236 + w.Write([]byte(manifestJson)) 237 237 + } 238 238 + 201 239 func (s *State) TermsOfService(w http.ResponseWriter, r *http.Request) { 202 240 user := s.oauth.GetUser(r) 203 241 s.pages.TermsOfService(w, pages.TermsOfServiceParams{ ··· 230 268 func (s *State) Timeline(w http.ResponseWriter, r *http.Request) { 231 269 user := s.oauth.GetUser(r) 232 270 271 271 + // TODO: set this flag based on the UI 272 272 + filtered := false 273 273 + 233 274 var userDid string 234 275 if user != nil { 235 276 userDid = user.Did 236 277 } 237 237 - timeline, err := db.MakeTimeline(s.db, 50, userDid) 278 278 + timeline, err := db.MakeTimeline(s.db, 50, userDid, filtered) 238 279 if err != nil { 239 280 log.Println(err) 240 281 s.pages.Notice(w, "timeline", "Uh oh! Failed to load timeline.") ··· 247 288 return 248 289 } 249 290 291 291 + gfiLabel, err := db.GetLabelDefinition(s.db, db.FilterEq("at_uri", models.LabelGoodFirstIssue)) 292 292 + if err != nil { 293 293 + // non-fatal 294 294 + } 295 295 + 250 296 s.pages.Timeline(w, pages.TimelineParams{ 251 297 LoggedInUser: user, 252 298 Timeline: timeline, 253 299 Repos: repos, 300 300 + GfiLabel: gfiLabel, 254 301 }) 255 302 } 256 303 ··· 262 309 263 310 l := s.logger.With("handler", "UpgradeBanner") 264 311 l = l.With("did", user.Did) 265 265 - l = l.With("handle", user.Handle) 266 312 267 313 regs, err := db.GetRegistrations( 268 314 s.db, ··· 293 339 } 294 340 295 341 func (s *State) Home(w http.ResponseWriter, r *http.Request) { 296 296 - timeline, err := db.MakeTimeline(s.db, 5, "") 342 342 + // TODO: set this flag based on the UI 343 343 + filtered := false 344 344 + 345 345 + timeline, err := db.MakeTimeline(s.db, 5, "", filtered) 297 346 if err != nil { 298 347 log.Println(err) 299 348 s.pages.Notice(w, "timeline", "Uh oh! Failed to load timeline.") ··· 402 451 403 452 user := s.oauth.GetUser(r) 404 453 l = l.With("did", user.Did) 405 405 - l = l.With("handle", user.Handle) 406 454 407 455 // form validation 408 456 domain := r.FormValue("domain") ··· 466 514 } 467 515 record := repo.AsRecord() 468 516 469 469 - xrpcClient, err := s.oauth.AuthorizedClient(r) 517 517 + atpClient, err := s.oauth.AuthorizedClient(r) 470 518 if err != nil { 471 519 l.Info("PDS write failed", "err", err) 472 520 s.pages.Notice(w, "repo", "Failed to write record to PDS.") 473 521 return 474 522 } 475 523 476 476 - atresp, err := xrpcClient.RepoPutRecord(r.Context(), &comatproto.RepoPutRecord_Input{ 524 524 + atresp, err := comatproto.RepoPutRecord(r.Context(), atpClient, &comatproto.RepoPutRecord_Input{ 477 525 Collection: tangled.RepoNSID, 478 526 Repo: user.Did, 479 527 Rkey: rkey, ··· 505 553 rollback := func() { 506 554 err1 := tx.Rollback() 507 555 err2 := s.enforcer.E.LoadPolicy() 508 508 - err3 := rollbackRecord(context.Background(), aturi, xrpcClient) 556 556 + err3 := rollbackRecord(context.Background(), aturi, atpClient) 509 557 510 558 // ignore txn complete errors, this is okay 511 559 if errors.Is(err1, sql.ErrTxDone) { ··· 578 626 aturi = "" 579 627 580 628 s.notifier.NewRepo(r.Context(), repo) 581 581 - s.pages.HxLocation(w, fmt.Sprintf("/@%s/%s", user.Handle, repoName)) 629 629 + s.pages.HxLocation(w, fmt.Sprintf("/@%s/%s", user.Did, repoName)) 582 630 } 583 631 } 584 632 585 633 // this is used to rollback changes made to the PDS 586 634 // 587 635 // it is a no-op if the provided ATURI is empty 588 588 - func rollbackRecord(ctx context.Context, aturi string, xrpcc *xrpcclient.Client) error { 636 636 + func rollbackRecord(ctx context.Context, aturi string, client *atpclient.APIClient) error { 589 637 if aturi == "" { 590 638 return nil 591 639 } ··· 596 644 repo := parsed.Authority().String() 597 645 rkey := parsed.RecordKey().String() 598 646 599 599 - _, err := xrpcc.RepoDeleteRecord(ctx, &comatproto.RepoDeleteRecord_Input{ 647 647 + _, err := comatproto.RepoDeleteRecord(ctx, client, &comatproto.RepoDeleteRecord_Input{ 600 648 Collection: collection, 601 649 Repo: repo, 602 650 Rkey: rkey,

+9 -7

appview/strings/strings.go

··· 22 22 "github.com/bluesky-social/indigo/api/atproto" 23 23 "github.com/bluesky-social/indigo/atproto/identity" 24 24 "github.com/bluesky-social/indigo/atproto/syntax" 25 25 - lexutil "github.com/bluesky-social/indigo/lex/util" 26 25 "github.com/go-chi/chi/v5" 26 26 + 27 27 + comatproto "github.com/bluesky-social/indigo/api/atproto" 28 28 + lexutil "github.com/bluesky-social/indigo/lex/util" 27 29 ) 28 30 29 31 type Strings struct { ··· 254 256 } 255 257 256 258 // first replace the existing record in the PDS 257 257 - ex, err := client.RepoGetRecord(r.Context(), "", tangled.StringNSID, entry.Did.String(), entry.Rkey) 259 259 + ex, err := comatproto.RepoGetRecord(r.Context(), client, "", tangled.StringNSID, entry.Did.String(), entry.Rkey) 258 260 if err != nil { 259 261 fail("Failed to updated existing record.", err) 260 262 return 261 263 } 262 262 - resp, err := client.RepoPutRecord(r.Context(), &atproto.RepoPutRecord_Input{ 264 264 + resp, err := comatproto.RepoPutRecord(r.Context(), client, &atproto.RepoPutRecord_Input{ 263 265 Collection: tangled.StringNSID, 264 266 Repo: entry.Did.String(), 265 267 Rkey: entry.Rkey, ··· 284 286 s.Notifier.EditString(r.Context(), &entry) 285 287 286 288 // if that went okay, redir to the string 287 287 - s.Pages.HxRedirect(w, "/strings/"+user.Handle+"/"+entry.Rkey) 289 289 + s.Pages.HxRedirect(w, "/strings/"+user.Did+"/"+entry.Rkey) 288 290 } 289 291 290 292 } ··· 336 338 return 337 339 } 338 340 339 339 - resp, err := client.RepoPutRecord(r.Context(), &atproto.RepoPutRecord_Input{ 341 341 + resp, err := comatproto.RepoPutRecord(r.Context(), client, &atproto.RepoPutRecord_Input{ 340 342 Collection: tangled.StringNSID, 341 343 Repo: user.Did, 342 344 Rkey: string.Rkey, ··· 360 362 s.Notifier.NewString(r.Context(), &string) 361 363 362 364 // successful 363 363 - s.Pages.HxRedirect(w, "/strings/"+user.Handle+"/"+string.Rkey) 365 365 + s.Pages.HxRedirect(w, "/strings/"+user.Did+"/"+string.Rkey) 364 366 } 365 367 } 366 368 ··· 403 405 404 406 s.Notifier.DeleteString(r.Context(), user.Did, rkey) 405 407 406 406 - s.Pages.HxRedirect(w, "/strings/"+user.Handle) 408 408 + s.Pages.HxRedirect(w, "/strings/"+user.Did) 407 409 } 408 410 409 411 func (s *Strings) comment(w http.ResponseWriter, r *http.Request) {

-99

appview/xrpcclient/xrpc.go

··· 1 1 package xrpcclient 2 2 3 3 import ( 4 4 - "bytes" 5 5 - "context" 6 4 "errors" 7 7 - "io" 8 5 "net/http" 9 6 10 10 - "github.com/bluesky-social/indigo/api/atproto" 11 11 - "github.com/bluesky-social/indigo/xrpc" 12 7 indigoxrpc "github.com/bluesky-social/indigo/xrpc" 13 13 - oauth "tangled.sh/icyphox.sh/atproto-oauth" 14 8 ) 15 9 16 10 var ( ··· 19 13 ErrXrpcFailed = errors.New("xrpc request failed") 20 14 ErrXrpcInvalid = errors.New("invalid xrpc request") 21 15 ) 22 22 - 23 23 - type Client struct { 24 24 - *oauth.XrpcClient 25 25 - authArgs *oauth.XrpcAuthedRequestArgs 26 26 - } 27 27 - 28 28 - func NewClient(client *oauth.XrpcClient, authArgs *oauth.XrpcAuthedRequestArgs) *Client { 29 29 - return &Client{ 30 30 - XrpcClient: client, 31 31 - authArgs: authArgs, 32 32 - } 33 33 - } 34 34 - 35 35 - func (c *Client) RepoPutRecord(ctx context.Context, input *atproto.RepoPutRecord_Input) (*atproto.RepoPutRecord_Output, error) { 36 36 - var out atproto.RepoPutRecord_Output 37 37 - if err := c.Do(ctx, c.authArgs, xrpc.Procedure, "application/json", "com.atproto.repo.putRecord", nil, input, &out); err != nil { 38 38 - return nil, err 39 39 - } 40 40 - 41 41 - return &out, nil 42 42 - } 43 43 - 44 44 - func (c *Client) RepoApplyWrites(ctx context.Context, input *atproto.RepoApplyWrites_Input) (*atproto.RepoApplyWrites_Output, error) { 45 45 - var out atproto.RepoApplyWrites_Output 46 46 - if err := c.Do(ctx, c.authArgs, xrpc.Procedure, "application/json", "com.atproto.repo.applyWrites", nil, input, &out); err != nil { 47 47 - return nil, err 48 48 - } 49 49 - 50 50 - return &out, nil 51 51 - } 52 52 - 53 53 - func (c *Client) RepoGetRecord(ctx context.Context, cid string, collection string, repo string, rkey string) (*atproto.RepoGetRecord_Output, error) { 54 54 - var out atproto.RepoGetRecord_Output 55 55 - 56 56 - params := map[string]interface{}{ 57 57 - "cid": cid, 58 58 - "collection": collection, 59 59 - "repo": repo, 60 60 - "rkey": rkey, 61 61 - } 62 62 - if err := c.Do(ctx, c.authArgs, xrpc.Query, "", "com.atproto.repo.getRecord", params, nil, &out); err != nil { 63 63 - return nil, err 64 64 - } 65 65 - 66 66 - return &out, nil 67 67 - } 68 68 - 69 69 - func (c *Client) RepoUploadBlob(ctx context.Context, input io.Reader) (*atproto.RepoUploadBlob_Output, error) { 70 70 - var out atproto.RepoUploadBlob_Output 71 71 - if err := c.Do(ctx, c.authArgs, xrpc.Procedure, "*/*", "com.atproto.repo.uploadBlob", nil, input, &out); err != nil { 72 72 - return nil, err 73 73 - } 74 74 - 75 75 - return &out, nil 76 76 - } 77 77 - 78 78 - func (c *Client) SyncGetBlob(ctx context.Context, cid string, did string) ([]byte, error) { 79 79 - buf := new(bytes.Buffer) 80 80 - 81 81 - params := map[string]interface{}{ 82 82 - "cid": cid, 83 83 - "did": did, 84 84 - } 85 85 - if err := c.Do(ctx, c.authArgs, xrpc.Query, "", "com.atproto.sync.getBlob", params, nil, buf); err != nil { 86 86 - return nil, err 87 87 - } 88 88 - 89 89 - return buf.Bytes(), nil 90 90 - } 91 91 - 92 92 - func (c *Client) RepoDeleteRecord(ctx context.Context, input *atproto.RepoDeleteRecord_Input) (*atproto.RepoDeleteRecord_Output, error) { 93 93 - var out atproto.RepoDeleteRecord_Output 94 94 - if err := c.Do(ctx, c.authArgs, xrpc.Procedure, "application/json", "com.atproto.repo.deleteRecord", nil, input, &out); err != nil { 95 95 - return nil, err 96 96 - } 97 97 - 98 98 - return &out, nil 99 99 - } 100 100 - 101 101 - func (c *Client) ServerGetServiceAuth(ctx context.Context, aud string, exp int64, lxm string) (*atproto.ServerGetServiceAuth_Output, error) { 102 102 - var out atproto.ServerGetServiceAuth_Output 103 103 - 104 104 - params := map[string]interface{}{ 105 105 - "aud": aud, 106 106 - "exp": exp, 107 107 - "lxm": lxm, 108 108 - } 109 109 - if err := c.Do(ctx, c.authArgs, xrpc.Query, "", "com.atproto.server.getServiceAuth", params, nil, &out); err != nil { 110 110 - return nil, err 111 111 - } 112 112 - 113 113 - return &out, nil 114 114 - } 115 16 116 17 // produces a more manageable error 117 18 func HandleXrpcErr(err error) error {

+1 -1

cmd/genjwks/main.go

··· 1 1 - // adapted from https://tangled.sh/icyphox.sh/atproto-oauth 1 1 + // adapted from https://tangled.org/anirudh.fi/atproto-oauth 2 2 3 3 package main 4 4

+1 -1

docs/spindle/pipeline.md

··· 21 21 - `manual`: The workflow can be triggered manually. 22 22 - `branch`: This is a **required** field that defines which branches the workflow should run for. If used with the `push` event, commits to the branch(es) listed here will trigger the workflow. If used with the `pull_request` event, updates to pull requests targeting the branch(es) listed here will trigger the workflow. This field has no effect with the `manual` event. 23 23 24 24 - For example, if you'd like define a workflow that runs when commits are pushed to the `main` and `develop` branches, or when pull requests that target the `main` branch are updated, or manually, you can do so with: 24 24 + For example, if you'd like to define a workflow that runs when commits are pushed to the `main` and `develop` branches, or when pull requests that target the `main` branch are updated, or manually, you can do so with: 25 25 26 26 ```yaml 27 27 when:

+10 -6

go.mod

··· 8 8 github.com/alecthomas/chroma/v2 v2.15.0 9 9 github.com/avast/retry-go/v4 v4.6.1 10 10 github.com/bluekeyes/go-gitdiff v0.8.1 11 11 - github.com/bluesky-social/indigo v0.0.0-20250724221105-5827c8fb61bb 11 11 + github.com/bluesky-social/indigo v0.0.0-20251003000214-3259b215110e 12 12 github.com/bluesky-social/jetstream v0.0.0-20241210005130-ea96859b93d1 13 13 github.com/carlmjohnson/versioninfo v0.22.5 14 14 github.com/casbin/casbin/v2 v2.103.0 ··· 21 21 github.com/go-chi/chi/v5 v5.2.0 22 22 github.com/go-enry/go-enry/v2 v2.9.2 23 23 github.com/go-git/go-git/v5 v5.14.0 24 24 + github.com/goki/freetype v1.0.5 24 25 github.com/google/uuid v1.6.0 25 26 github.com/gorilla/feeds v1.2.0 26 27 github.com/gorilla/sessions v1.4.0 ··· 36 37 github.com/redis/go-redis/v9 v9.7.3 37 38 github.com/resend/resend-go/v2 v2.15.0 38 39 github.com/sethvargo/go-envconfig v1.1.0 40 40 + github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c 41 41 + github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef 39 42 github.com/stretchr/testify v1.10.0 40 43 github.com/urfave/cli/v3 v3.3.3 41 44 github.com/whyrusleeping/cbor-gen v0.3.1 42 45 github.com/wyatt915/goldmark-treeblood v0.0.0-20250825231212-5dcbdb2f4b57 43 43 - github.com/yuin/goldmark v1.7.12 46 46 + github.com/yuin/goldmark v1.7.13 44 47 github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc 45 48 golang.org/x/crypto v0.40.0 49 49 + golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b 50 50 + golang.org/x/image v0.31.0 46 51 golang.org/x/net v0.42.0 47 47 - golang.org/x/sync v0.16.0 52 52 + golang.org/x/sync v0.17.0 48 53 golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da 49 54 gopkg.in/yaml.v3 v3.0.1 50 50 - tangled.sh/icyphox.sh/atproto-oauth v0.0.0-20250724194903-28e660378cb1 51 55 ) 52 56 53 57 require ( ··· 156 160 github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect 157 161 github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect 158 162 github.com/wyatt915/treeblood v0.1.15 // indirect 163 163 + gitlab.com/staticnoise/goldmark-callout v0.0.0-20240609120641-6366b799e4ab // indirect 159 164 gitlab.com/yawning/secp256k1-voi v0.0.0-20230925100816-f2616030848b // indirect 160 165 gitlab.com/yawning/tuplehash v0.0.0-20230713102510-df83abbf9a02 // indirect 161 166 go.opentelemetry.io/auto/sdk v1.1.0 // indirect ··· 168 173 go.uber.org/atomic v1.11.0 // indirect 169 174 go.uber.org/multierr v1.11.0 // indirect 170 175 go.uber.org/zap v1.27.0 // indirect 171 171 - golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect 172 176 golang.org/x/sys v0.34.0 // indirect 173 173 - golang.org/x/text v0.27.0 // indirect 177 177 + golang.org/x/text v0.29.0 // indirect 174 178 golang.org/x/time v0.12.0 // indirect 175 179 google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect 176 180 google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect

+18 -12

go.sum

··· 23 23 github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= 24 24 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= 25 25 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= 26 26 - github.com/bluesky-social/indigo v0.0.0-20250724221105-5827c8fb61bb h1:BqMNDZMfXwiRTJ6NvQotJ0qInn37JH5U8E+TF01CFHQ= 27 27 - github.com/bluesky-social/indigo v0.0.0-20250724221105-5827c8fb61bb/go.mod h1:0XUyOCRtL4/OiyeqMTmr6RlVHQMDgw3LS7CfibuZR5Q= 26 26 + github.com/bluesky-social/indigo v0.0.0-20251003000214-3259b215110e h1:IutKPwmbU0LrYqw03EuwJtMdAe67rDTrL1U8S8dicRU= 27 27 + github.com/bluesky-social/indigo v0.0.0-20251003000214-3259b215110e/go.mod h1:n6QE1NDPFoi7PRbMUZmc2y7FibCqiVU4ePpsvhHUBR8= 28 28 github.com/bluesky-social/jetstream v0.0.0-20241210005130-ea96859b93d1 h1:CFvRtYNSnWRAi/98M3O466t9dYuwtesNbu6FVPymRrA= 29 29 github.com/bluesky-social/jetstream v0.0.0-20241210005130-ea96859b93d1/go.mod h1:WiYEeyJSdUwqoaZ71KJSpTblemUCpwJfh5oVXplK6T4= 30 30 github.com/bmatcuk/doublestar/v4 v4.6.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc= ··· 136 136 github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= 137 137 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= 138 138 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= 139 139 + github.com/goki/freetype v1.0.5 h1:yi2lQeUhXnBgSMqYd0vVmPw6RnnfIeTP3N4uvaJXd7A= 140 140 + github.com/goki/freetype v1.0.5/go.mod h1:wKmKxddbzKmeci9K96Wknn5kjTWLyfC8tKOqAFbEX8E= 139 141 github.com/golang-jwt/jwt/v5 v5.2.3 h1:kkGXqQOBSDDWRhWNXTFpqGSCMyh/PLnqUvMGJPDJDs0= 140 142 github.com/golang-jwt/jwt/v5 v5.2.3/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk= 141 143 github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 h1:f+oWsMOmNPc8JmEHVZIycC7hBoQxHH9pNKQORJNozsQ= ··· 243 245 github.com/ipfs/go-log/v2 v2.6.0/go.mod h1:p+Efr3qaY5YXpx9TX7MoLCSEZX5boSWj9wh86P5HJa8= 244 246 github.com/ipfs/go-metrics-interface v0.3.0 h1:YwG7/Cy4R94mYDUuwsBfeziJCVm9pBMJ6q/JR9V40TU= 245 247 github.com/ipfs/go-metrics-interface v0.3.0/go.mod h1:OxxQjZDGocXVdyTPocns6cOLwHieqej/jos7H4POwoY= 246 246 - github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= 247 247 - github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= 248 248 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= 249 249 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= 250 250 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= ··· 399 399 github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM= 400 400 github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= 401 401 github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= 402 402 + github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c h1:km8GpoQut05eY3GiYWEedbTT0qnSxrCjsVbb7yKY1KE= 403 403 + github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c/go.mod h1:cNQ3dwVJtS5Hmnjxy6AgTPd0Inb3pW05ftPSX7NZO7Q= 404 404 + github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef h1:Ch6Q+AZUxDBCVqdkI8FSpFyZDtCVBc2VmejdNrm5rRQ= 405 405 + github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef/go.mod h1:nXTWP6+gD5+LUJ8krVhhoeHjvHTutPxMYl5SvkcnJNE= 402 406 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= 403 407 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= 404 408 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= ··· 436 440 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= 437 441 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= 438 442 github.com/yuin/goldmark v1.4.15/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= 439 439 - github.com/yuin/goldmark v1.7.12 h1:YwGP/rrea2/CnCtUHgjuolG/PnMxdQtPMO5PvaE2/nY= 440 440 - github.com/yuin/goldmark v1.7.12/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg= 443 443 + github.com/yuin/goldmark v1.7.13 h1:GPddIs617DnBLFFVJFgpo1aBfe/4xcvMc3SB5t/D0pA= 444 444 + github.com/yuin/goldmark v1.7.13/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg= 441 445 github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc h1:+IAOyRda+RLrxa1WC7umKOZRsGq4QrFFMYApOeHzQwQ= 442 446 github.com/yuin/goldmark-highlighting/v2 v2.0.0-20230729083705-37449abec8cc/go.mod h1:ovIvrum6DQJA4QsJSovrkC4saKHQVs7TvcaeO8AIl5I= 447 447 + gitlab.com/staticnoise/goldmark-callout v0.0.0-20240609120641-6366b799e4ab h1:gK9tS6QJw5F0SIhYJnGG2P83kuabOdmWBbSmZhJkz2A= 448 448 + gitlab.com/staticnoise/goldmark-callout v0.0.0-20240609120641-6366b799e4ab/go.mod h1:SPu13/NPe1kMrbGoJldQwqtpNhXsmIuHCfm/aaGjU0c= 443 449 gitlab.com/yawning/secp256k1-voi v0.0.0-20230925100816-f2616030848b h1:CzigHMRySiX3drau9C6Q5CAbNIApmLdat5jPMqChvDA= 444 450 gitlab.com/yawning/secp256k1-voi v0.0.0-20230925100816-f2616030848b/go.mod h1:/y/V339mxv2sZmYYR64O07VuCpdNZqCTwO8ZcouTMI8= 445 451 gitlab.com/yawning/tuplehash v0.0.0-20230713102510-df83abbf9a02 h1:qwDnMxjkyLmAFgcfgTnfJrmYKWhHnci3GjDqcZp1M3Q= ··· 489 495 golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY= 490 496 golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b h1:M2rDM6z3Fhozi9O7NWsxAkg/yqS/lQJ6PmkyIV3YP+o= 491 497 golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b/go.mod h1:3//PLf8L/X+8b4vuAfHzxeRUl04Adcb341+IGKfnqS8= 498 498 + golang.org/x/image v0.31.0 h1:mLChjE2MV6g1S7oqbXC0/UcKijjm5fnJLUYKIYrLESA= 499 499 + golang.org/x/image v0.31.0/go.mod h1:R9ec5Lcp96v9FTF+ajwaH3uGxPH4fKfHHAVbUILxghA= 492 500 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= 493 501 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= 494 502 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= ··· 528 536 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 529 537 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 530 538 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 531 531 - golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= 532 532 - golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= 539 539 + golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= 540 540 + golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= 533 541 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= 534 542 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= 535 543 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ··· 583 591 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= 584 592 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= 585 593 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= 586 586 - golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4= 587 587 - golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU= 594 594 + golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk= 595 595 + golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= 588 596 golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE= 589 597 golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= 590 598 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= ··· 652 660 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= 653 661 lukechampine.com/blake3 v1.4.1 h1:I3Smz7gso8w4/TunLKec6K2fn+kyKtDxr/xcQEN84Wg= 654 662 lukechampine.com/blake3 v1.4.1/go.mod h1:QFosUxmjB8mnrWFSNwKmvxHpfY72bmD2tQ0kBMM3kwo= 655 655 - tangled.sh/icyphox.sh/atproto-oauth v0.0.0-20250724194903-28e660378cb1 h1:z1os1aRIqeo5e8d0Tx7hk+LH8OdZZeIOY0zw9VB/ZoU= 656 656 - tangled.sh/icyphox.sh/atproto-oauth v0.0.0-20250724194903-28e660378cb1/go.mod h1:+oQi9S6IIDll0nxLZVhuzOPX8WKLCYEnE6M5kUKupDg= 657 663 tangled.sh/oppi.li/go-gitdiff v0.8.2 h1:pASJJNWaFn6EmEIUNNjHZQ3stRu6BqTO2YyjKvTcxIc= 658 664 tangled.sh/oppi.li/go-gitdiff v0.8.2/go.mod h1:WWAk1Mc6EgWarCrPFO+xeYlujPu98VuLW3Tu+B/85AE=

+71 -12

input.css

··· 134 134 } 135 135 136 136 .prose hr { 137 137 - @apply my-2; 137 137 + @apply my-2; 138 138 } 139 139 140 140 .prose li:has(input) { 141 141 - @apply list-none; 141 141 + @apply list-none; 142 142 } 143 143 144 144 .prose ul:has(input) { 145 145 - @apply pl-2; 145 145 + @apply pl-2; 146 146 } 147 147 148 148 .prose .heading .anchor { 149 149 - @apply no-underline mx-2 opacity-0; 149 149 + @apply no-underline mx-2 opacity-0; 150 150 } 151 151 152 152 .prose .heading:hover .anchor { 153 153 - @apply opacity-70; 153 153 + @apply opacity-70; 154 154 } 155 155 156 156 .prose .heading .anchor:hover { 157 157 - @apply opacity-70; 157 157 + @apply opacity-70; 158 158 } 159 159 160 160 .prose a.footnote-backref { 161 161 - @apply no-underline; 161 161 + @apply no-underline; 162 162 } 163 163 164 164 .prose li { 165 165 - @apply my-0 py-0; 165 165 + @apply my-0 py-0; 166 166 } 167 167 168 168 - .prose ul, .prose ol { 169 169 - @apply my-1 py-0; 168 168 + .prose ul, 169 169 + .prose ol { 170 170 + @apply my-1 py-0; 170 171 } 171 172 172 173 .prose img { ··· 176 177 } 177 178 178 179 .prose input { 179 179 - @apply inline-block my-0 mb-1 mx-1; 180 180 + @apply inline-block my-0 mb-1 mx-1; 180 181 } 181 182 182 183 .prose input[type="checkbox"] { 183 184 @apply disabled:accent-blue-500 checked:accent-blue-500 disabled:checked:accent-blue-500; 184 185 } 186 186 + 187 187 + /* Base callout */ 188 188 + details[data-callout] { 189 189 + @apply border-l-4 pl-3 py-2 text-gray-800 dark:text-gray-200 my-4; 190 190 + } 191 191 + 192 192 + details[data-callout] > summary { 193 193 + @apply font-bold cursor-pointer mb-1; 194 194 + } 195 195 + 196 196 + details[data-callout] > .callout-content { 197 197 + @apply text-sm leading-snug; 198 198 + } 199 199 + 200 200 + /* Note (blue) */ 201 201 + details[data-callout="note" i] { 202 202 + @apply border-blue-400 dark:border-blue-500; 203 203 + } 204 204 + details[data-callout="note" i] > summary { 205 205 + @apply text-blue-700 dark:text-blue-400; 206 206 + } 207 207 + 208 208 + /* Important (purple) */ 209 209 + details[data-callout="important" i] { 210 210 + @apply border-purple-400 dark:border-purple-500; 211 211 + } 212 212 + details[data-callout="important" i] > summary { 213 213 + @apply text-purple-700 dark:text-purple-400; 214 214 + } 215 215 + 216 216 + /* Warning (yellow) */ 217 217 + details[data-callout="warning" i] { 218 218 + @apply border-yellow-400 dark:border-yellow-500; 219 219 + } 220 220 + details[data-callout="warning" i] > summary { 221 221 + @apply text-yellow-700 dark:text-yellow-400; 222 222 + } 223 223 + 224 224 + /* Caution (red) */ 225 225 + details[data-callout="caution" i] { 226 226 + @apply border-red-400 dark:border-red-500; 227 227 + } 228 228 + details[data-callout="caution" i] > summary { 229 229 + @apply text-red-700 dark:text-red-400; 230 230 + } 231 231 + 232 232 + /* Tip (green) */ 233 233 + details[data-callout="tip" i] { 234 234 + @apply border-green-400 dark:border-green-500; 235 235 + } 236 236 + details[data-callout="tip" i] > summary { 237 237 + @apply text-green-700 dark:text-green-400; 238 238 + } 239 239 + 240 240 + /* Optional: hide the disclosure arrow like GitHub */ 241 241 + details[data-callout] > summary::-webkit-details-marker { 242 242 + display: none; 243 243 + } 185 244 } 186 245 @layer utilities { 187 246 .error { ··· 228 287 } 229 288 /* LineHighlight */ 230 289 .chroma .hl { 231 231 - @apply bg-amber-400/30 dark:bg-amber-500/20; 290 290 + @apply bg-amber-400/30 dark:bg-amber-500/20; 232 291 } 233 292 234 293 /* LineNumbersTable */

+1 -1

knotserver/config/config.go

··· 41 41 Repo Repo `env:",prefix=KNOT_REPO_"` 42 42 Server Server `env:",prefix=KNOT_SERVER_"` 43 43 Git Git `env:",prefix=KNOT_GIT_"` 44 44 - AppViewEndpoint string `env:"APPVIEW_ENDPOINT, default=https://tangled.sh"` 44 44 + AppViewEndpoint string `env:"APPVIEW_ENDPOINT, default=https://tangled.org"` 45 45 } 46 46 47 47 func Load(ctx context.Context) (*Config, error) {

+5

knotserver/git/branch.go

··· 110 110 slices.Reverse(branches) 111 111 return branches, nil 112 112 } 113 113 + 114 114 + func (g *GitRepo) DeleteBranch(branch string) error { 115 115 + ref := plumbing.NewBranchReferenceName(branch) 116 116 + return g.r.Storer.RemoveReference(ref) 117 117 + }

+11

knotserver/git/git.go

··· 71 71 return &g, nil 72 72 } 73 73 74 74 + // re-open a repository and update references 75 75 + func (g *GitRepo) Refresh() error { 76 76 + refreshed, err := PlainOpen(g.path) 77 77 + if err != nil { 78 78 + return err 79 79 + } 80 80 + 81 81 + *g = *refreshed 82 82 + return nil 83 83 + } 84 84 + 74 85 func (g *GitRepo) Commits(offset, limit int) ([]*object.Commit, error) { 75 86 commits := []*object.Commit{} 76 87

+150 -37

knotserver/git/merge.go

··· 4 4 "bytes" 5 5 "crypto/sha256" 6 6 "fmt" 7 7 + "log" 7 8 "os" 8 9 "os/exec" 9 10 "regexp" ··· 12 13 "github.com/dgraph-io/ristretto" 13 14 "github.com/go-git/go-git/v5" 14 15 "github.com/go-git/go-git/v5/plumbing" 16 16 + "tangled.org/core/patchutil" 17 17 + "tangled.org/core/types" 15 18 ) 16 19 17 20 type MergeCheckCache struct { ··· 32 35 mergeCheckCache = MergeCheckCache{cache} 33 36 } 34 37 35 35 - func (m *MergeCheckCache) cacheKey(g *GitRepo, patch []byte, targetBranch string) string { 38 38 + func (m *MergeCheckCache) cacheKey(g *GitRepo, patch string, targetBranch string) string { 36 39 sep := byte(':') 37 40 hash := sha256.Sum256(fmt.Append([]byte{}, g.path, sep, g.h.String(), sep, patch, sep, targetBranch)) 38 41 return fmt.Sprintf("%x", hash) ··· 49 52 } 50 53 } 51 54 52 52 - func (m *MergeCheckCache) Set(g *GitRepo, patch []byte, targetBranch string, mergeCheck error) { 55 55 + func (m *MergeCheckCache) Set(g *GitRepo, patch string, targetBranch string, mergeCheck error) { 53 56 key := m.cacheKey(g, patch, targetBranch) 54 57 val := m.cacheVal(mergeCheck) 55 58 m.cache.Set(key, val, 0) 56 59 } 57 60 58 58 - func (m *MergeCheckCache) Get(g *GitRepo, patch []byte, targetBranch string) (error, bool) { 61 61 + func (m *MergeCheckCache) Get(g *GitRepo, patch string, targetBranch string) (error, bool) { 59 62 key := m.cacheKey(g, patch, targetBranch) 60 63 if val, ok := m.cache.Get(key); ok { 61 64 if val == struct{}{} { ··· 104 107 return fmt.Sprintf("merge failed: %s", e.Message) 105 108 } 106 109 107 107 - func (g *GitRepo) createTempFileWithPatch(patchData []byte) (string, error) { 110 110 + func (g *GitRepo) createTempFileWithPatch(patchData string) (string, error) { 108 111 tmpFile, err := os.CreateTemp("", "git-patch-*.patch") 109 112 if err != nil { 110 113 return "", fmt.Errorf("failed to create temporary patch file: %w", err) 111 114 } 112 115 113 113 - if _, err := tmpFile.Write(patchData); err != nil { 116 116 + if _, err := tmpFile.Write([]byte(patchData)); err != nil { 114 117 tmpFile.Close() 115 118 os.Remove(tmpFile.Name()) 116 119 return "", fmt.Errorf("failed to write patch data to temporary file: %w", err) ··· 162 165 return nil 163 166 } 164 167 165 165 - func (g *GitRepo) applyPatch(tmpDir, patchFile string, opts MergeOptions) error { 168 168 + func (g *GitRepo) applyPatch(patchData, patchFile string, opts MergeOptions) error { 166 169 var stderr bytes.Buffer 167 170 var cmd *exec.Cmd 168 171 169 172 // configure default git user before merge 170 170 - exec.Command("git", "-C", tmpDir, "config", "user.name", opts.CommitterName).Run() 171 171 - exec.Command("git", "-C", tmpDir, "config", "user.email", opts.CommitterEmail).Run() 172 172 - exec.Command("git", "-C", tmpDir, "config", "advice.mergeConflict", "false").Run() 173 173 + exec.Command("git", "-C", g.path, "config", "user.name", opts.CommitterName).Run() 174 174 + exec.Command("git", "-C", g.path, "config", "user.email", opts.CommitterEmail).Run() 175 175 + exec.Command("git", "-C", g.path, "config", "advice.mergeConflict", "false").Run() 173 176 174 177 // if patch is a format-patch, apply using 'git am' 175 178 if opts.FormatPatch { 176 176 - cmd = exec.Command("git", "-C", tmpDir, "am", patchFile) 177 177 - } else { 178 178 - // else, apply using 'git apply' and commit it manually 179 179 - applyCmd := exec.Command("git", "-C", tmpDir, "apply", patchFile) 180 180 - applyCmd.Stderr = &stderr 181 181 - if err := applyCmd.Run(); err != nil { 182 182 - return fmt.Errorf("patch application failed: %s", stderr.String()) 183 183 - } 179 179 + return g.applyMailbox(patchData) 180 180 + } 184 181 185 185 - stageCmd := exec.Command("git", "-C", tmpDir, "add", ".") 186 186 - if err := stageCmd.Run(); err != nil { 187 187 - return fmt.Errorf("failed to stage changes: %w", err) 188 188 - } 182 182 + // else, apply using 'git apply' and commit it manually 183 183 + applyCmd := exec.Command("git", "-C", g.path, "apply", patchFile) 184 184 + applyCmd.Stderr = &stderr 185 185 + if err := applyCmd.Run(); err != nil { 186 186 + return fmt.Errorf("patch application failed: %s", stderr.String()) 187 187 + } 189 188 190 190 - commitArgs := []string{"-C", tmpDir, "commit"} 189 189 + stageCmd := exec.Command("git", "-C", g.path, "add", ".") 190 190 + if err := stageCmd.Run(); err != nil { 191 191 + return fmt.Errorf("failed to stage changes: %w", err) 192 192 + } 191 193 192 192 - // Set author if provided 193 193 - authorName := opts.AuthorName 194 194 - authorEmail := opts.AuthorEmail 194 194 + commitArgs := []string{"-C", g.path, "commit"} 195 195 196 196 - if authorName != "" && authorEmail != "" { 197 197 - commitArgs = append(commitArgs, "--author", fmt.Sprintf("%s <%s>", authorName, authorEmail)) 198 198 - } 199 199 - // else, will default to knot's global user.name & user.email configured via `KNOT_GIT_USER_*` env variables 196 196 + // Set author if provided 197 197 + authorName := opts.AuthorName 198 198 + authorEmail := opts.AuthorEmail 200 199 201 201 - commitArgs = append(commitArgs, "-m", opts.CommitMessage) 200 200 + if authorName != "" && authorEmail != "" { 201 201 + commitArgs = append(commitArgs, "--author", fmt.Sprintf("%s <%s>", authorName, authorEmail)) 202 202 + } 203 203 + // else, will default to knot's global user.name & user.email configured via `KNOT_GIT_USER_*` env variables 202 204 203 203 - if opts.CommitBody != "" { 204 204 - commitArgs = append(commitArgs, "-m", opts.CommitBody) 205 205 - } 205 205 + commitArgs = append(commitArgs, "-m", opts.CommitMessage) 206 206 207 207 - cmd = exec.Command("git", commitArgs...) 207 207 + if opts.CommitBody != "" { 208 208 + commitArgs = append(commitArgs, "-m", opts.CommitBody) 208 209 } 210 210 + 211 211 + cmd = exec.Command("git", commitArgs...) 209 212 210 213 cmd.Stderr = &stderr 211 214 ··· 216 219 return nil 217 220 } 218 221 219 219 - func (g *GitRepo) MergeCheck(patchData []byte, targetBranch string) error { 222 222 + func (g *GitRepo) applyMailbox(patchData string) error { 223 223 + fps, err := patchutil.ExtractPatches(patchData) 224 224 + if err != nil { 225 225 + return fmt.Errorf("failed to extract patches: %w", err) 226 226 + } 227 227 + 228 228 + // apply each patch one by one 229 229 + // update the newly created commit object to add the change-id header 230 230 + total := len(fps) 231 231 + for i, p := range fps { 232 232 + newCommit, err := g.applySingleMailbox(p) 233 233 + if err != nil { 234 234 + return err 235 235 + } 236 236 + 237 237 + log.Printf("applying mailbox patch %d/%d: committed %s\n", i+1, total, newCommit.String()) 238 238 + } 239 239 + 240 240 + return nil 241 241 + } 242 242 + 243 243 + func (g *GitRepo) applySingleMailbox(singlePatch types.FormatPatch) (plumbing.Hash, error) { 244 244 + tmpPatch, err := g.createTempFileWithPatch(singlePatch.Raw) 245 245 + if err != nil { 246 246 + return plumbing.ZeroHash, fmt.Errorf("failed to create temporary patch file for singluar mailbox patch: %w", err) 247 247 + } 248 248 + 249 249 + var stderr bytes.Buffer 250 250 + cmd := exec.Command("git", "-C", g.path, "am", tmpPatch) 251 251 + cmd.Stderr = &stderr 252 252 + 253 253 + head, err := g.r.Head() 254 254 + if err != nil { 255 255 + return plumbing.ZeroHash, err 256 256 + } 257 257 + log.Println("head before apply", head.Hash().String()) 258 258 + 259 259 + if err := cmd.Run(); err != nil { 260 260 + return plumbing.ZeroHash, fmt.Errorf("patch application failed: %s", stderr.String()) 261 261 + } 262 262 + 263 263 + if err := g.Refresh(); err != nil { 264 264 + return plumbing.ZeroHash, fmt.Errorf("failed to refresh repository state: %w", err) 265 265 + } 266 266 + 267 267 + head, err = g.r.Head() 268 268 + if err != nil { 269 269 + return plumbing.ZeroHash, err 270 270 + } 271 271 + log.Println("head after apply", head.Hash().String()) 272 272 + 273 273 + newHash := head.Hash() 274 274 + if changeId, err := singlePatch.ChangeId(); err != nil { 275 275 + // no change ID 276 276 + } else if updatedHash, err := g.setChangeId(head.Hash(), changeId); err != nil { 277 277 + return plumbing.ZeroHash, err 278 278 + } else { 279 279 + newHash = updatedHash 280 280 + } 281 281 + 282 282 + return newHash, nil 283 283 + } 284 284 + 285 285 + func (g *GitRepo) setChangeId(hash plumbing.Hash, changeId string) (plumbing.Hash, error) { 286 286 + log.Printf("updating change ID of %s to %s\n", hash.String(), changeId) 287 287 + obj, err := g.r.CommitObject(hash) 288 288 + if err != nil { 289 289 + return plumbing.ZeroHash, fmt.Errorf("failed to get commit object for hash %s: %w", hash.String(), err) 290 290 + } 291 291 + 292 292 + // write the change-id header 293 293 + obj.ExtraHeaders["change-id"] = []byte(changeId) 294 294 + 295 295 + // create a new object 296 296 + dest := g.r.Storer.NewEncodedObject() 297 297 + if err := obj.Encode(dest); err != nil { 298 298 + return plumbing.ZeroHash, fmt.Errorf("failed to create new object: %w", err) 299 299 + } 300 300 + 301 301 + // store the new object 302 302 + newHash, err := g.r.Storer.SetEncodedObject(dest) 303 303 + if err != nil { 304 304 + return plumbing.ZeroHash, fmt.Errorf("failed to store new object: %w", err) 305 305 + } 306 306 + 307 307 + log.Printf("hash changed from %s to %s\n", obj.Hash.String(), newHash.String()) 308 308 + 309 309 + // find the branch that HEAD is pointing to 310 310 + ref, err := g.r.Head() 311 311 + if err != nil { 312 312 + return plumbing.ZeroHash, fmt.Errorf("failed to fetch HEAD: %w", err) 313 313 + } 314 314 + 315 315 + // and update that branch to point to new commit 316 316 + if ref.Name().IsBranch() { 317 317 + err = g.r.Storer.SetReference(plumbing.NewHashReference(ref.Name(), newHash)) 318 318 + if err != nil { 319 319 + return plumbing.ZeroHash, fmt.Errorf("failed to update HEAD: %w", err) 320 320 + } 321 321 + } 322 322 + 323 323 + // new hash of commit 324 324 + return newHash, nil 325 325 + } 326 326 + 327 327 + func (g *GitRepo) MergeCheck(patchData string, targetBranch string) error { 220 328 if val, ok := mergeCheckCache.Get(g, patchData, targetBranch); ok { 221 329 return val 222 330 } ··· 244 352 return result 245 353 } 246 354 247 247 - func (g *GitRepo) MergeWithOptions(patchData []byte, targetBranch string, opts MergeOptions) error { 355 355 + func (g *GitRepo) MergeWithOptions(patchData string, targetBranch string, opts MergeOptions) error { 248 356 patchFile, err := g.createTempFileWithPatch(patchData) 249 357 if err != nil { 250 358 return &ErrMerge{ ··· 263 371 } 264 372 defer os.RemoveAll(tmpDir) 265 373 266 266 - if err := g.applyPatch(tmpDir, patchFile, opts); err != nil { 374 374 + tmpRepo, err := PlainOpen(tmpDir) 375 375 + if err != nil { 376 376 + return err 377 377 + } 378 378 + 379 379 + if err := tmpRepo.applyPatch(patchData, patchFile, opts); err != nil { 267 380 return err 268 381 } 269 382

+46

knotserver/internal.go

··· 13 13 securejoin "github.com/cyphar/filepath-securejoin" 14 14 "github.com/go-chi/chi/v5" 15 15 "github.com/go-chi/chi/v5/middleware" 16 16 + "github.com/go-git/go-git/v5/plumbing" 16 17 "tangled.org/core/api/tangled" 17 18 "tangled.org/core/hook" 19 19 + "tangled.org/core/idresolver" 18 20 "tangled.org/core/knotserver/config" 19 21 "tangled.org/core/knotserver/db" 20 22 "tangled.org/core/knotserver/git" ··· 118 120 // non-fatal 119 121 } 120 122 123 123 + if (line.NewSha.String() != line.OldSha.String()) && line.OldSha.IsZero() { 124 124 + msg, err := h.replyCompare(line, gitUserDid, gitRelativeDir, repoName, r.Context()) 125 125 + if err != nil { 126 126 + l.Error("failed to reply with compare link", "err", err, "line", line, "did", gitUserDid, "repo", gitRelativeDir) 127 127 + // non-fatal 128 128 + } else { 129 129 + for msgLine := range msg { 130 130 + resp.Messages = append(resp.Messages, msg[msgLine]) 131 131 + } 132 132 + } 133 133 + } 134 134 + 121 135 err = h.triggerPipeline(&resp.Messages, line, gitUserDid, repoDid, repoName, pushOptions) 122 136 if err != nil { 123 137 l.Error("failed to trigger pipeline", "err", err, "line", line, "did", gitUserDid, "repo", gitRelativeDir) ··· 126 140 } 127 141 128 142 writeJSON(w, resp) 143 143 + } 144 144 + 145 145 + func (h *InternalHandle) replyCompare(line git.PostReceiveLine, gitUserDid string, gitRelativeDir string, repoName string, ctx context.Context) ([]string, error) { 146 146 + l := h.l.With("handler", "replyCompare") 147 147 + userIdent, err := idresolver.DefaultResolver().ResolveIdent(ctx, gitUserDid) 148 148 + user := gitUserDid 149 149 + if err != nil { 150 150 + l.Error("Failed to fetch user identity", "err", err) 151 151 + // non-fatal 152 152 + } else { 153 153 + user = userIdent.Handle.String() 154 154 + } 155 155 + gr, err := git.PlainOpen(gitRelativeDir) 156 156 + if err != nil { 157 157 + l.Error("Failed to open git repository", "err", err) 158 158 + return []string{}, err 159 159 + } 160 160 + defaultBranch, err := gr.FindMainBranch() 161 161 + if err != nil { 162 162 + l.Error("Failed to fetch default branch", "err", err) 163 163 + return []string{}, err 164 164 + } 165 165 + if line.Ref == plumbing.NewBranchReferenceName(defaultBranch).String() { 166 166 + return []string{}, nil 167 167 + } 168 168 + ZWS := "\u200B" 169 169 + var msg []string 170 170 + msg = append(msg, ZWS) 171 171 + msg = append(msg, fmt.Sprintf("Create a PR pointing to %s", defaultBranch)) 172 172 + msg = append(msg, fmt.Sprintf("\t%s/%s/%s/compare/%s...%s", h.c.AppViewEndpoint, user, repoName, defaultBranch, strings.TrimPrefix(line.Ref, "refs/heads/"))) 173 173 + msg = append(msg, ZWS) 174 174 + return msg, nil 129 175 } 130 176 131 177 func (h *InternalHandle) insertRefUpdate(line git.PostReceiveLine, gitUserDid, repoDid, repoName string) error {

+87

knotserver/xrpc/delete_branch.go

··· 1 1 + package xrpc 2 2 + 3 3 + import ( 4 4 + "encoding/json" 5 5 + "fmt" 6 6 + "net/http" 7 7 + 8 8 + comatproto "github.com/bluesky-social/indigo/api/atproto" 9 9 + "github.com/bluesky-social/indigo/atproto/syntax" 10 10 + "github.com/bluesky-social/indigo/xrpc" 11 11 + securejoin "github.com/cyphar/filepath-securejoin" 12 12 + "tangled.org/core/api/tangled" 13 13 + "tangled.org/core/knotserver/git" 14 14 + "tangled.org/core/rbac" 15 15 + 16 16 + xrpcerr "tangled.org/core/xrpc/errors" 17 17 + ) 18 18 + 19 19 + func (x *Xrpc) DeleteBranch(w http.ResponseWriter, r *http.Request) { 20 20 + l := x.Logger 21 21 + fail := func(e xrpcerr.XrpcError) { 22 22 + l.Error("failed", "kind", e.Tag, "error", e.Message) 23 23 + writeError(w, e, http.StatusBadRequest) 24 24 + } 25 25 + 26 26 + actorDid, ok := r.Context().Value(ActorDid).(syntax.DID) 27 27 + if !ok { 28 28 + fail(xrpcerr.MissingActorDidError) 29 29 + return 30 30 + } 31 31 + 32 32 + var data tangled.RepoDeleteBranch_Input 33 33 + if err := json.NewDecoder(r.Body).Decode(&data); err != nil { 34 34 + fail(xrpcerr.GenericError(err)) 35 35 + return 36 36 + } 37 37 + 38 38 + // unfortunately we have to resolve repo-at here 39 39 + repoAt, err := syntax.ParseATURI(data.Repo) 40 40 + if err != nil { 41 41 + fail(xrpcerr.InvalidRepoError(data.Repo)) 42 42 + return 43 43 + } 44 44 + 45 45 + // resolve this aturi to extract the repo record 46 46 + ident, err := x.Resolver.ResolveIdent(r.Context(), repoAt.Authority().String()) 47 47 + if err != nil || ident.Handle.IsInvalidHandle() { 48 48 + fail(xrpcerr.GenericError(fmt.Errorf("failed to resolve handle: %w", err))) 49 49 + return 50 50 + } 51 51 + 52 52 + xrpcc := xrpc.Client{Host: ident.PDSEndpoint()} 53 53 + resp, err := comatproto.RepoGetRecord(r.Context(), &xrpcc, "", tangled.RepoNSID, repoAt.Authority().String(), repoAt.RecordKey().String()) 54 54 + if err != nil { 55 55 + fail(xrpcerr.GenericError(err)) 56 56 + return 57 57 + } 58 58 + 59 59 + repo := resp.Value.Val.(*tangled.Repo) 60 60 + didPath, err := securejoin.SecureJoin(actorDid.String(), repo.Name) 61 61 + if err != nil { 62 62 + fail(xrpcerr.GenericError(err)) 63 63 + return 64 64 + } 65 65 + 66 66 + if ok, err := x.Enforcer.IsPushAllowed(actorDid.String(), rbac.ThisServer, didPath); !ok || err != nil { 67 67 + l.Error("insufficent permissions", "did", actorDid.String()) 68 68 + writeError(w, xrpcerr.AccessControlError(actorDid.String()), http.StatusUnauthorized) 69 69 + return 70 70 + } 71 71 + 72 72 + path, _ := securejoin.SecureJoin(x.Config.Repo.ScanPath, didPath) 73 73 + gr, err := git.PlainOpen(path) 74 74 + if err != nil { 75 75 + fail(xrpcerr.GenericError(err)) 76 76 + return 77 77 + } 78 78 + 79 79 + err = gr.DeleteBranch(data.Branch) 80 80 + if err != nil { 81 81 + l.Error("deleting branch", "error", err.Error(), "branch", data.Branch) 82 82 + writeError(w, xrpcerr.GitError(err), http.StatusInternalServerError) 83 83 + return 84 84 + } 85 85 + 86 86 + w.WriteHeader(http.StatusOK) 87 87 + }

+1 -1

knotserver/xrpc/merge.go

··· 85 85 mo.CommitterEmail = x.Config.Git.UserEmail 86 86 mo.FormatPatch = patchutil.IsFormatPatch(data.Patch) 87 87 88 88 - err = gr.MergeWithOptions([]byte(data.Patch), data.Branch, mo) 88 88 + err = gr.MergeWithOptions(data.Patch, data.Branch, mo) 89 89 if err != nil { 90 90 var mergeErr *git.ErrMerge 91 91 if errors.As(err, &mergeErr) {

+1 -1

knotserver/xrpc/merge_check.go

··· 51 51 return 52 52 } 53 53 54 54 - err = gr.MergeCheck([]byte(data.Patch), data.Branch) 54 54 + err = gr.MergeCheck(data.Patch, data.Branch) 55 55 56 56 response := tangled.RepoMergeCheck_Output{ 57 57 Is_conflicted: false,

+1

knotserver/xrpc/xrpc.go

··· 38 38 r.Use(x.ServiceAuth.VerifyServiceAuth) 39 39 40 40 r.Post("/"+tangled.RepoSetDefaultBranchNSID, x.SetDefaultBranch) 41 41 + r.Post("/"+tangled.RepoDeleteBranchNSID, x.DeleteBranch) 41 42 r.Post("/"+tangled.RepoCreateNSID, x.CreateRepo) 42 43 r.Post("/"+tangled.RepoDeleteNSID, x.DeleteRepo) 43 44 r.Post("/"+tangled.RepoForkStatusNSID, x.ForkStatus)

+30

lexicons/repo/deleteBranch.json

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "sh.tangled.repo.deleteBranch", 4 4 + "defs": { 5 5 + "main": { 6 6 + "type": "procedure", 7 7 + "description": "Delete a branch on this repository", 8 8 + "input": { 9 9 + "encoding": "application/json", 10 10 + "schema": { 11 11 + "type": "object", 12 12 + "required": [ 13 13 + "repo", 14 14 + "branch" 15 15 + ], 16 16 + "properties": { 17 17 + "repo": { 18 18 + "type": "string", 19 19 + "format": "at-uri" 20 20 + }, 21 21 + "branch": { 22 22 + "type": "string" 23 23 + } 24 24 + } 25 25 + } 26 26 + } 27 27 + } 28 28 + } 29 29 + } 30 30 +

+23 -11

nix/gomod2nix.toml

··· 40 40 hash = "sha256-GWm5i1ukuBukV0GMF1rffpbOSSXZdfg6/0pABMiGzLQ=" 41 41 replaced = "tangled.sh/oppi.li/go-gitdiff" 42 42 [mod."github.com/bluesky-social/indigo"] 43 43 - version = "v0.0.0-20250724221105-5827c8fb61bb" 44 44 - hash = "sha256-uDYmzP4/mT7xP62LIL4QIOlkaKWS/IT1uho+udyVOAI=" 43 43 + version = "v0.0.0-20251003000214-3259b215110e" 44 44 + hash = "sha256-qi/GrquJznbLnnHVpd7IqoryCESbi6xE4X1SiEM2qlo=" 45 45 [mod."github.com/bluesky-social/jetstream"] 46 46 version = "v0.0.0-20241210005130-ea96859b93d1" 47 47 hash = "sha256-AiapbrkjXboIKc5QNiWH0KyNs0zKnn6UlGwWFlkUfm0=" ··· 163 163 [mod."github.com/gogo/protobuf"] 164 164 version = "v1.3.2" 165 165 hash = "sha256-pogILFrrk+cAtb0ulqn9+gRZJ7sGnnLLdtqITvxvG6c=" 166 166 + [mod."github.com/goki/freetype"] 167 167 + version = "v1.0.5" 168 168 + hash = "sha256-8ILVMx5w1/nV88RZPoG45QJ0jH1YEPJGLpZQdBJFqIs=" 166 169 [mod."github.com/golang-jwt/jwt/v5"] 167 170 version = "v5.2.3" 168 171 hash = "sha256-dY2avNPPS3xokn5E+VCLxXcQk7DsM7err2QGrG0nXKo=" ··· 407 410 [mod."github.com/spaolacci/murmur3"] 408 411 version = "v1.1.0" 409 412 hash = "sha256-RWD4PPrlAsZZ8Xy356MBxpj+/NZI7w2XOU14Ob7/Y9M=" 413 413 + [mod."github.com/srwiley/oksvg"] 414 414 + version = "v0.0.0-20221011165216-be6e8873101c" 415 415 + hash = "sha256-lZb6Y8HkrDpx9pxS+QQTcXI2MDSSv9pUyVTat59OrSk=" 416 416 + [mod."github.com/srwiley/rasterx"] 417 417 + version = "v0.0.0-20220730225603-2ab79fcdd4ef" 418 418 + hash = "sha256-/XmSE/J+f6FLWXGvljh6uBK71uoCAK3h82XQEQ1Ki68=" 410 419 [mod."github.com/stretchr/testify"] 411 420 version = "v1.10.0" 412 421 hash = "sha256-fJ4gnPr0vnrOhjQYQwJ3ARDKPsOtA7d4olQmQWR+wpI=" ··· 432 441 version = "v0.1.15" 433 442 hash = "sha256-hb99exdkoY2Qv8WdDxhwgPXGbEYimUr6wFtPXEvcO9g=" 434 443 [mod."github.com/yuin/goldmark"] 435 435 - version = "v1.7.12" 436 436 - hash = "sha256-thLYBS4woL2X5qRdo7vP+xCvjlGRDU0jXtDCUt6vvWM=" 444 444 + version = "v1.7.13" 445 445 + hash = "sha256-vBCxZrPYPc8x/nvAAv3Au59dCCyfS80Vw3/a9EXK7TE=" 437 446 [mod."github.com/yuin/goldmark-highlighting/v2"] 438 447 version = "v2.0.0-20230729083705-37449abec8cc" 439 448 hash = "sha256-HpiwU7jIeDUAg2zOpTIiviQir8dpRPuXYh2nqFFccpg=" 449 449 + [mod."gitlab.com/staticnoise/goldmark-callout"] 450 450 + version = "v0.0.0-20240609120641-6366b799e4ab" 451 451 + hash = "sha256-CgqBIYAuSmL2hcFu5OW18nWWaSy3pp3CNp5jlWzBX44=" 440 452 [mod."gitlab.com/yawning/secp256k1-voi"] 441 453 version = "v0.0.0-20230925100816-f2616030848b" 442 454 hash = "sha256-X8INg01LTg13iOuwPI3uOhPN7r01sPZtmtwJ2sudjCA=" ··· 479 491 [mod."golang.org/x/exp"] 480 492 version = "v0.0.0-20250620022241-b7579e27df2b" 481 493 hash = "sha256-IsDTeuWLj4UkPO4NhWTvFeZ22WNtlxjoWiyAJh6zdig=" 494 494 + [mod."golang.org/x/image"] 495 495 + version = "v0.31.0" 496 496 + hash = "sha256-ZFTlu9+4QToPPLA8C5UcG2eq/lQylq81RoG/WtYo9rg=" 482 497 [mod."golang.org/x/net"] 483 498 version = "v0.42.0" 484 499 hash = "sha256-YxileisIIez+kcAI+21kY5yk0iRuEqti2YdmS8jvP2s=" 485 500 [mod."golang.org/x/sync"] 486 486 - version = "v0.16.0" 487 487 - hash = "sha256-sqKDRESeMzLe0jWGWltLZL/JIgrn0XaIeBWCzVN3Bks=" 501 501 + version = "v0.17.0" 502 502 + hash = "sha256-M85lz4hK3/fzmcUViAp/CowHSxnr3BHSO7pjHp1O6i0=" 488 503 [mod."golang.org/x/sys"] 489 504 version = "v0.34.0" 490 505 hash = "sha256-5rZ7p8IaGli5X1sJbfIKOcOEwY4c0yQhinJPh2EtK50=" 491 506 [mod."golang.org/x/text"] 492 492 - version = "v0.27.0" 493 493 - hash = "sha256-VX0rOh6L3qIvquKSGjfZQFU8URNtGvkNvxE7OZtboW8=" 507 507 + version = "v0.29.0" 508 508 + hash = "sha256-2cWBtJje+Yc+AnSgCANqBlIwnOMZEGkpQ2cFI45VfLI=" 494 509 [mod."golang.org/x/time"] 495 510 version = "v0.12.0" 496 511 hash = "sha256-Cp3oxrCMH2wyxjzr5SHVmyhgaoUuSl56Uy00Q7DYEpw=" ··· 527 542 [mod."lukechampine.com/blake3"] 528 543 version = "v1.4.1" 529 544 hash = "sha256-HaZGo9L44ptPsgxIhvKy3+0KZZm1+xt+cZC1rDQA9Yc=" 530 530 - [mod."tangled.sh/icyphox.sh/atproto-oauth"] 531 531 - version = "v0.0.0-20250724194903-28e660378cb1" 532 532 - hash = "sha256-z7huwCTTHqLb1hxQW62lz9GQ3Orqt4URfeOVhQVd1f8="

+1

nix/pkgs/appview-static-files.nix

··· 22 22 cp -rf ${lucide-src}/*.svg icons/ 23 23 cp -f ${inter-fonts-src}/web/InterVariable*.woff2 fonts/ 24 24 cp -f ${inter-fonts-src}/web/InterDisplay*.woff2 fonts/ 25 25 + cp -f ${inter-fonts-src}/InterVariable*.ttf fonts/ 25 26 cp -f ${ibm-plex-mono-src}/fonts/complete/woff2/IBMPlexMono*.woff2 fonts/ 26 27 # tailwindcss -c $src/tailwind.config.js -i $src/input.css -o tw.css won't work 27 28 # for whatever reason (produces broken css), so we are doing this instead

+1 -1

nix/pkgs/knot-unwrapped.nix

··· 4 4 sqlite-lib, 5 5 src, 6 6 }: let 7 7 - version = "1.9.0-alpha"; 7 7 + version = "1.9.1-alpha"; 8 8 in 9 9 buildGoApplication { 10 10 pname = "knot";