comparing 8ccc8b6c0547206efa60c447c59d2ac4cf08f5cb and master on nel.pet/core

+10

api/tangled/repotree.go

···

       31
       31
        
       	Files  []*RepoTree_TreeEntry `json:"files" cborgen:"files"`

     

       32
       32
        
       	// parent: The parent path in the tree

     

       33
       33
        
       	Parent *string `json:"parent,omitempty" cborgen:"parent,omitempty"`

     

       34
       34
       +
       	// readme: Readme for this file tree

     

       35
       35
       +
       	Readme *RepoTree_Readme `json:"readme,omitempty" cborgen:"readme,omitempty"`

     

       34
       36
        
       	// ref: The git reference used

     

       35
       37
        
       	Ref string `json:"ref" cborgen:"ref"`

     

       38
       38
       +
       }

     

       39
       39
       +
       

     

       40
       40
       +
       // RepoTree_Readme is a "readme" in the sh.tangled.repo.tree schema.

     

       41
       41
       +
       type RepoTree_Readme struct {

     

       42
       42
       +
       	// contents: Contents of the readme file

     

       43
       43
       +
       	Contents string `json:"contents" cborgen:"contents"`

     

       44
       44
       +
       	// filename: Name of the readme file

     

       45
       45
       +
       	Filename string `json:"filename" cborgen:"filename"`

     

       36
       46
        
       }

     

       37
       47
        
       

     

       38
       48
        
       // RepoTree_TreeEntry is a "treeEntry" in the sh.tangled.repo.tree schema.

+4 -2

appview/config/config.go

···

       72
       72
        
       }

     

       73
       73
        
       

     

       74
       74
        
       type Cloudflare struct {

     

       75
       75
       -
       	ApiToken string `env:"API_TOKEN"`

     

       76
       76
       -
       	ZoneId   string `env:"ZONE_ID"`

     

       75
       75
       +
       	ApiToken           string `env:"API_TOKEN"`

     

       76
       76
       +
       	ZoneId             string `env:"ZONE_ID"`

     

       77
       77
       +
       	TurnstileSiteKey   string `env:"TURNSTILE_SITE_KEY"`

     

       78
       78
       +
       	TurnstileSecretKey string `env:"TURNSTILE_SECRET_KEY"`

     

       77
       79
        
       }

     

       78
       80
        
       

     

       79
       81
        
       func (cfg RedisConfig) ToURL() string {

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

+5 -1

appview/issues/issues.go

···

       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)

+3 -3

appview/labels/labels.go

···

       162
       162
        
       		}

     

       163
       163
        
       	}

     

       164
       164
        
       

     

       165
       165
       -
       	// reduce the opset

     

       166
       166
       -
       	labelOps = models.ReduceLabelOps(labelOps)

     

       167
       167
       -
       

     

       168
       165
        
       	for i := range labelOps {

     

       169
       166
        
       		def := actx.Defs[labelOps[i].OperandKey]

     

       170
       167
        
       		if err := l.validator.ValidateLabelOp(def, repo, &labelOps[i]); err != nil {

     
···

       172
       169
        
       			return

     

       173
       170
        
       		}

     

       174
       171
        
       	}

     

       172
       172
       +
       

     

       173
       173
       +
       	// reduce the opset

     

       174
       174
       +
       	labelOps = models.ReduceLabelOps(labelOps)

     

       175
       175
        
       

     

       176
       176
        
       	// next, apply all ops introduced in this request and filter out ones that are no-ops

     

       177
       177
        
       	validLabelOps := labelOps[:0]

+1 -5

appview/middleware/middleware.go

···

       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
       -
       			_, auth, err := mw.oauth.GetSession(r)

     

       50
       50
       -
       			if err != nil {

     

       51
       51
       -
       				log.Println("could not refresh session", "err", err, "auth", auth)

     

       52
       52
       -
       			}

     

       53
       53
       -
       

     

       49
       49
       +
       			_, _, _ = mw.oauth.GetSession(r)

     

       54
       50
        
       			next.ServeHTTP(w, r)

     

       55
       51
        
       		})

     

       56
       52
        
       	}

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

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

+30 -35

appview/notifications/notifications.go

···

       1
       1
        
       package notifications

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       +
       	"fmt"

     

       4
       5
        
       	"log"

     

       5
       6
        
       	"net/http"

     

       6
       7
        
       	"strconv"

     
···

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

     

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

     

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

     

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

     

       13
       15
        
       )

     

       14
       16
        
       

     

       15
       17
        
       type Notifications struct {

     
···

       31
       33
        
       

     

       32
       34
        
       	r.Use(middleware.AuthMiddleware(n.oauth))

     

       33
       35
        
       

     

       34
       34
       -
       	r.Get("/", n.notificationsPage)

     

       36
       36
       +
       	r.With(middleware.Paginate).Get("/", n.notificationsPage)

     

       35
       37
        
       

     

       36
       38
        
       	r.Get("/count", n.getUnreadCount)

     

       37
       39
        
       	r.Post("/{id}/read", n.markRead)

     
···

       44
       46
        
       func (n *Notifications) notificationsPage(w http.ResponseWriter, r *http.Request) {

     

       45
       47
        
       	userDid := n.oauth.GetDid(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", userDid),

     

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

     

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

     

       70
       70
       -
       

     

       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)

     
···

       86
       86
        
       		return

     

       87
       87
        
       	}

     

       88
       88
        
       

     

       89
       89
       -
       	params := pages.NotificationsParams{

     

       89
       89
       +
       	fmt.Println(n.pages.Notifications(w, pages.NotificationsParams{

     

       90
       90
        
       		LoggedInUser:  user,

     

       91
       91
        
       		Notifications: notifications,

     

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

     

       93
       93
       +
       		Page:          page,

     

       94
       94
       +
       		Total:         total,

     

       95
       95
       +
       	}))

     

       104
       96
        
       }

     

       105
       97
        
       

     

       106
       98
        
       func (n *Notifications) getUnreadCount(w http.ResponseWriter, r *http.Request) {

     

       107
       107
       -
       	userDid := n.oauth.GetDid(r)

     

       108
       108
       -
       

     

       109
       109
       -
       	count, err := n.db.GetUnreadNotificationCount(r.Context(), userDid)

     

       99
       99
       +
       	user := n.oauth.GetUser(r)

     

       100
       100
       +
       	count, err := db.CountNotifications(

     

       101
       101
       +
       		n.db,

     

       102
       102
       +
       		db.FilterEq("recipient_did", user.Did),

     

       103
       103
       +
       		db.FilterEq("read", 0),

     

       104
       104
       +
       	)

     

       110
       105
        
       	if err != nil {

     

       111
       106
        
       		http.Error(w, "Failed to get unread count", http.StatusInternalServerError)

     

       112
       107
        
       		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 {

+156

appview/pages/legal/privacy.md

···

       1
       1
       +
       **Last updated:** September 26, 2025

     

       2
       2
       +
       

     

       3
       3
       +
       This Privacy Policy describes how Tangled ("we," "us," or "our")

     

       4
       4
       +
       collects, uses, and shares your personal information when you use our

     

       5
       5
       +
       platform and services (the "Service").

     

       6
       6
       +
       

     

       7
       7
       +
       ## 1. Information We Collect

     

       8
       8
       +
       

     

       9
       9
       +
       ### Account Information

     

       10
       10
       +
       

     

       11
       11
       +
       When you create an account, we collect:

     

       12
       12
       +
       

     

       13
       13
       +
       - Your chosen username

     

       14
       14
       +
       - Email address

     

       15
       15
       +
       - Profile information you choose to provide

     

       16
       16
       +
       - Authentication data

     

       17
       17
       +
       

     

       18
       18
       +
       ### Content and Activity

     

       19
       19
       +
       

     

       20
       20
       +
       We store:

     

       21
       21
       +
       

     

       22
       22
       +
       - Code repositories and associated metadata

     

       23
       23
       +
       - Issues, pull requests, and comments

     

       24
       24
       +
       - Activity logs and usage patterns

     

       25
       25
       +
       - Public keys for authentication

     

       26
       26
       +
       

     

       27
       27
       +
       ## 2. Data Location and Hosting

     

       28
       28
       +
       

     

       29
       29
       +
       ### EU Data Hosting

     

       30
       30
       +
       

     

       31
       31
       +
       **All Tangled service data is hosted within the European Union.**

     

       32
       32
       +
       Specifically:

     

       33
       33
       +
       

     

       34
       34
       +
       - **Personal Data Servers (PDS):** Accounts hosted on Tangled PDS

     

       35
       35
       +
         (*.tngl.sh) are located in Finland

     

       36
       36
       +
       - **Application Data:** All other service data is stored on EU-based

     

       37
       37
       +
         servers

     

       38
       38
       +
       - **Data Processing:** All data processing occurs within EU

     

       39
       39
       +
         jurisdiction

     

       40
       40
       +
       

     

       41
       41
       +
       ### External PDS Notice

     

       42
       42
       +
       

     

       43
       43
       +
       **Important:** If your account is hosted on Bluesky's PDS or other

     

       44
       44
       +
       self-hosted Personal Data Servers (not *.tngl.sh), we do not control

     

       45
       45
       +
       that data. The data protection, storage location, and privacy

     

       46
       46
       +
       practices for such accounts are governed by the respective PDS

     

       47
       47
       +
       provider's policies, not this Privacy Policy. We only control data

     

       48
       48
       +
       processing within our own services and infrastructure.

     

       49
       49
       +
       

     

       50
       50
       +
       ## 3. Third-Party Data Processors

     

       51
       51
       +
       

     

       52
       52
       +
       We only share your data with the following third-party processors:

     

       53
       53
       +
       

     

       54
       54
       +
       ### Resend (Email Services)

     

       55
       55
       +
       

     

       56
       56
       +
       - **Purpose:** Sending transactional emails (account verification,

     

       57
       57
       +
         notifications)

     

       58
       58
       +
       - **Data Shared:** Email address and necessary message content

     

       59
       59
       +
       

     

       60
       60
       +
       ### Cloudflare (Image Caching)

     

       61
       61
       +
       

     

       62
       62
       +
       - **Purpose:** Caching and optimizing image delivery

     

       63
       63
       +
       - **Data Shared:** Public images and associated metadata for caching

     

       64
       64
       +
         purposes

     

       65
       65
       +
       

     

       66
       66
       +
       ### Posthog (Usage Metrics Tracking)

     

       67
       67
       +
       

     

       68
       68
       +
       - **Purpose:** Tracking usage and platform metrics

     

       69
       69
       +
       - **Data Shared:** Anonymous usage data, IP addresses, DIDs, and browser

     

       70
       70
       +
         information

     

       71
       71
       +
       

     

       72
       72
       +
       ## 4. How We Use Your Information

     

       73
       73
       +
       

     

       74
       74
       +
       We use your information to:

     

       75
       75
       +
       

     

       76
       76
       +
       - Provide and maintain the Service

     

       77
       77
       +
       - Process your transactions and requests

     

       78
       78
       +
       - Send you technical notices and support messages

     

       79
       79
       +
       - Improve and develop new features

     

       80
       80
       +
       - Ensure security and prevent fraud

     

       81
       81
       +
       - Comply with legal obligations

     

       82
       82
       +
       

     

       83
       83
       +
       ## 5. Data Sharing and Disclosure

     

       84
       84
       +
       

     

       85
       85
       +
       We do not sell, trade, or rent your personal information. We may share

     

       86
       86
       +
       your information only in the following circumstances:

     

       87
       87
       +
       

     

       88
       88
       +
       - With the third-party processors listed above

     

       89
       89
       +
       - When required by law or legal process

     

       90
       90
       +
       - To protect our rights, property, or safety, or that of our users

     

       91
       91
       +
       - In connection with a merger, acquisition, or sale of assets (with

     

       92
       92
       +
         appropriate protections)

     

       93
       93
       +
       

     

       94
       94
       +
       ## 6. Data Security

     

       95
       95
       +
       

     

       96
       96
       +
       We implement appropriate technical and organizational measures to

     

       97
       97
       +
       protect your personal information against unauthorized access,

     

       98
       98
       +
       alteration, disclosure, or destruction. However, no method of

     

       99
       99
       +
       transmission over the Internet is 100% secure.

     

       100
       100
       +
       

     

       101
       101
       +
       ## 7. Data Retention

     

       102
       102
       +
       

     

       103
       103
       +
       We retain your personal information for as long as necessary to provide

     

       104
       104
       +
       the Service and fulfill the purposes outlined in this Privacy Policy,

     

       105
       105
       +
       unless a longer retention period is required by law.

     

       106
       106
       +
       

     

       107
       107
       +
       ## 8. Your Rights

     

       108
       108
       +
       

     

       109
       109
       +
       Under applicable data protection laws, you have the right to:

     

       110
       110
       +
       

     

       111
       111
       +
       - Access your personal information

     

       112
       112
       +
       - Correct inaccurate information

     

       113
       113
       +
       - Request deletion of your information

     

       114
       114
       +
       - Object to processing of your information

     

       115
       115
       +
       - Data portability

     

       116
       116
       +
       - Withdraw consent (where applicable)

     

       117
       117
       +
       

     

       118
       118
       +
       ## 9. Cookies and Tracking

     

       119
       119
       +
       

     

       120
       120
       +
       We use cookies and similar technologies to:

     

       121
       121
       +
       

     

       122
       122
       +
       - Maintain your login session

     

       123
       123
       +
       - Remember your preferences

     

       124
       124
       +
       - Analyze usage patterns to improve the Service

     

       125
       125
       +
       

     

       126
       126
       +
       You can control cookie settings through your browser preferences.

     

       127
       127
       +
       

     

       128
       128
       +
       ## 10. Children's Privacy

     

       129
       129
       +
       

     

       130
       130
       +
       The Service is not intended for children under 16 years of age. We do

     

       131
       131
       +
       not knowingly collect personal information from children under 16. If

     

       132
       132
       +
       we become aware that we have collected such information, we will take

     

       133
       133
       +
       steps to delete it.

     

       134
       134
       +
       

     

       135
       135
       +
       ## 11. International Data Transfers

     

       136
       136
       +
       

     

       137
       137
       +
       While all our primary data processing occurs within the EU, some of our

     

       138
       138
       +
       third-party processors may process data outside the EU. When this

     

       139
       139
       +
       occurs, we ensure appropriate safeguards are in place, such as Standard

     

       140
       140
       +
       Contractual Clauses or adequacy decisions.

     

       141
       141
       +
       

     

       142
       142
       +
       ## 12. Changes to This Privacy Policy

     

       143
       143
       +
       

     

       144
       144
       +
       We may update this Privacy Policy from time to time. We will notify you

     

       145
       145
       +
       of any changes by posting the new Privacy Policy on this page and

     

       146
       146
       +
       updating the "Last updated" date.

     

       147
       147
       +
       

     

       148
       148
       +
       ## 13. Contact Information

     

       149
       149
       +
       

     

       150
       150
       +
       If you have any questions about this Privacy Policy or wish to exercise

     

       151
       151
       +
       your rights, please contact us through our platform or via email.

     

       152
       152
       +
       

     

       153
       153
       +
       ---

     

       154
       154
       +
       

     

       155
       155
       +
       This Privacy Policy complies with the EU General Data Protection

     

       156
       156
       +
       Regulation (GDPR) and other applicable data protection laws.

+107

appview/pages/legal/terms.md

···

       1
       1
       +
       **Last updated:** September 26, 2025

     

       2
       2
       +
       

     

       3
       3
       +
       Welcome to Tangled. These Terms of Service ("Terms") govern your access

     

       4
       4
       +
       to and use of the Tangled platform and services (the "Service")

     

       5
       5
       +
       operated by us ("Tangled," "we," "us," or "our").

     

       6
       6
       +
       

     

       7
       7
       +
       ## 1. Acceptance of Terms

     

       8
       8
       +
       

     

       9
       9
       +
       By accessing or using our Service, you agree to be bound by these Terms.

     

       10
       10
       +
       If you disagree with any part of these terms, then you may not access

     

       11
       11
       +
       the Service.

     

       12
       12
       +
       

     

       13
       13
       +
       ## 2. Account Registration

     

       14
       14
       +
       

     

       15
       15
       +
       To use certain features of the Service, you must register for an

     

       16
       16
       +
       account. You agree to provide accurate, current, and complete

     

       17
       17
       +
       information during the registration process and to update such

     

       18
       18
       +
       information to keep it accurate, current, and complete.

     

       19
       19
       +
       

     

       20
       20
       +
       ## 3. Account Termination

     

       21
       21
       +
       

     

       22
       22
       +
       > **Important Notice**

     

       23
       23
       +
       >

     

       24
       24
       +
       > **We reserve the right to terminate, suspend, or restrict access to

     

       25
       25
       +
       > your account at any time, for any reason, or for no reason at all, at

     

       26
       26
       +
       > our sole discretion.** This includes, but is not limited to,

     

       27
       27
       +
       > termination for violation of these Terms, inappropriate conduct, spam,

     

       28
       28
       +
       > abuse, or any other behavior we deem harmful to the Service or other

     

       29
       29
       +
       > users.

     

       30
       30
       +
       >

     

       31
       31
       +
       > Account termination may result in the loss of access to your

     

       32
       32
       +
       > repositories, data, and other content associated with your account. We

     

       33
       33
       +
       > are not obligated to provide advance notice of termination, though we

     

       34
       34
       +
       > may do so in our discretion.

     

       35
       35
       +
       

     

       36
       36
       +
       ## 4. Acceptable Use

     

       37
       37
       +
       

     

       38
       38
       +
       You agree not to use the Service to:

     

       39
       39
       +
       

     

       40
       40
       +
       - Violate any applicable laws or regulations

     

       41
       41
       +
       - Infringe upon the rights of others

     

       42
       42
       +
       - Upload, store, or share content that is illegal, harmful, threatening,

     

       43
       43
       +
         abusive, harassing, defamatory, vulgar, obscene, or otherwise

     

       44
       44
       +
         objectionable

     

       45
       45
       +
       - Engage in spam, phishing, or other deceptive practices

     

       46
       46
       +
       - Attempt to gain unauthorized access to the Service or other users'

     

       47
       47
       +
         accounts

     

       48
       48
       +
       - Interfere with or disrupt the Service or servers connected to the

     

       49
       49
       +
         Service

     

       50
       50
       +
       

     

       51
       51
       +
       ## 5. Content and Intellectual Property

     

       52
       52
       +
       

     

       53
       53
       +
       You retain ownership of the content you upload to the Service. By

     

       54
       54
       +
       uploading content, you grant us a non-exclusive, worldwide, royalty-free

     

       55
       55
       +
       license to use, reproduce, modify, and distribute your content as

     

       56
       56
       +
       necessary to provide the Service.

     

       57
       57
       +
       

     

       58
       58
       +
       ## 6. Privacy

     

       59
       59
       +
       

     

       60
       60
       +
       Your privacy is important to us. Please review our [Privacy

     

       61
       61
       +
       Policy](/privacy), which also governs your use of the Service.

     

       62
       62
       +
       

     

       63
       63
       +
       ## 7. Disclaimers

     

       64
       64
       +
       

     

       65
       65
       +
       The Service is provided on an "AS IS" and "AS AVAILABLE" basis. We make

     

       66
       66
       +
       no warranties, expressed or implied, and hereby disclaim and negate all

     

       67
       67
       +
       other warranties including without limitation, implied warranties or

     

       68
       68
       +
       conditions of merchantability, fitness for a particular purpose, or

     

       69
       69
       +
       non-infringement of intellectual property or other violation of rights.

     

       70
       70
       +
       

     

       71
       71
       +
       ## 8. Limitation of Liability

     

       72
       72
       +
       

     

       73
       73
       +
       In no event shall Tangled, nor its directors, employees, partners,

     

       74
       74
       +
       agents, suppliers, or affiliates, be liable for any indirect,

     

       75
       75
       +
       incidental, special, consequential, or punitive damages, including

     

       76
       76
       +
       without limitation, loss of profits, data, use, goodwill, or other

     

       77
       77
       +
       intangible losses, resulting from your use of the Service.

     

       78
       78
       +
       

     

       79
       79
       +
       ## 9. Indemnification

     

       80
       80
       +
       

     

       81
       81
       +
       You agree to defend, indemnify, and hold harmless Tangled and its

     

       82
       82
       +
       affiliates, officers, directors, employees, and agents from and against

     

       83
       83
       +
       any and all claims, damages, obligations, losses, liabilities, costs,

     

       84
       84
       +
       or debt, and expenses (including attorney's fees).

     

       85
       85
       +
       

     

       86
       86
       +
       ## 10. Governing Law

     

       87
       87
       +
       

     

       88
       88
       +
       These Terms shall be interpreted and governed by the laws of Finland,

     

       89
       89
       +
       without regard to its conflict of law provisions.

     

       90
       90
       +
       

     

       91
       91
       +
       ## 11. Changes to Terms

     

       92
       92
       +
       

     

       93
       93
       +
       We reserve the right to modify or replace these Terms at any time. If a

     

       94
       94
       +
       revision is material, we will try to provide at least 30 days notice

     

       95
       95
       +
       prior to any new terms taking effect.

     

       96
       96
       +
       

     

       97
       97
       +
       ## 12. Contact Information

     

       98
       98
       +
       

     

       99
       99
       +
       If you have any questions about these Terms of Service, please contact

     

       100
       100
       +
       us through our platform or via email.

     

       101
       101
       +
       

     

       102
       102
       +
       ---

     

       103
       103
       +
       

     

       104
       104
       +
       These terms are effective as of the last updated date shown above and

     

       105
       105
       +
       will remain in effect except with respect to any changes in their

     

       106
       106
       +
       provisions in the future, which will be in effect immediately after

     

       107
       107
       +
       being posted on this page.

+15 -17

appview/pages/markup/format.go

···

       1
       1
        
       package markup

     

       2
       2
        
       

     

       3
       3
       -
       import "strings"

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"regexp"

     

       5
       5
       +
       )

     

       4
       6
        
       

     

       5
       7
        
       type Format string

     

       6
       8
        
       

     
···

       10
       12
        
       )

     

       11
       13
        
       

     

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

     

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

     

       15
       15
       +
       	FormatMarkdown: {".md", ".markdown", ".mdown", ".mkdn", ".mkd"},

     

       14
       16
        
       }

     

       15
       17
        
       

     

       16
       16
       -
       // ReadmeFilenames contains the list of common README filenames to search for,

     

       17
       17
       -
       // in order of preference. Only includes well-supported formats.

     

       18
       18
       -
       var ReadmeFilenames = []string{

     

       19
       19
       -
       	"README.md", "readme.md",

     

       20
       20
       -
       	"README",

     

       21
       21
       -
       	"readme",

     

       22
       22
       -
       	"README.markdown",

     

       23
       23
       -
       	"readme.markdown",

     

       24
       24
       -
       	"README.txt",

     

       25
       25
       -
       	"readme.txt",

     

       18
       18
       +
       var FileTypePatterns = map[Format]*regexp.Regexp{

     

       19
       19
       +
       	FormatMarkdown: regexp.MustCompile(`(?i)\.(md|markdown|mdown|mkdn|mkd)$`),

     

       20
       20
       +
       }

     

       21
       21
       +
       

     

       22
       22
       +
       var ReadmePattern = regexp.MustCompile(`(?i)^readme(\.(md|markdown|txt))?$`)

     

       23
       23
       +
       

     

       24
       24
       +
       func IsReadmeFile(filename string) bool {

     

       25
       25
       +
       	return ReadmePattern.MatchString(filename)

     

       26
       26
        
       }

     

       27
       27
        
       

     

       28
       28
        
       func GetFormat(filename string) Format {

     

       29
       29
       -
       	for format, extensions := range FileTypes {

     

       30
       30
       -
       		for _, extension := range extensions {

     

       31
       31
       -
       			if strings.HasSuffix(filename, extension) {

     

       32
       32
       -
       				return format

     

       33
       33
       -
       			}

     

       29
       29
       +
       	for format, pattern := range FileTypePatterns {

     

       30
       30
       +
       		if pattern.MatchString(filename) {

     

       31
       31
       +
       			return format

     

       34
       32
        
       		}

     

       35
       33
        
       	}

     

       36
       34
        
       	// default format

+48 -20

appview/pages/pages.go

···

       38
       38
        
       	"github.com/go-git/go-git/v5/plumbing/object"

     

       39
       39
        
       )

     

       40
       40
        
       

     

       41
       41
       -
       //go:embed templates/* static

     

       41
       41
       +
       //go:embed templates/* static legal

     

       42
       42
        
       var Files embed.FS

     

       43
       43
        
       

     

       44
       44
        
       type Pages struct {

     
···

       226
       226
        
       	return p.executePlain("user/login", w, params)

     

       227
       227
        
       }

     

       228
       228
        
       

     

       229
       229
       -
       func (p *Pages) Signup(w io.Writer) error {

     

       230
       230
       -
       	return p.executePlain("user/signup", w, nil)

     

       229
       229
       +
       type SignupParams struct {

     

       230
       230
       +
       	CloudflareSiteKey string

     

       231
       231
       +
       }

     

       232
       232
       +
       

     

       233
       233
       +
       func (p *Pages) Signup(w io.Writer, params SignupParams) error {

     

       234
       234
       +
       	return p.executePlain("user/signup", w, params)

     

       231
       235
        
       }

     

       232
       236
        
       

     

       233
       237
        
       func (p *Pages) CompleteSignup(w io.Writer) error {

     
···

       242
       246
        
       func (p *Pages) TermsOfService(w io.Writer, params TermsOfServiceParams) error {

     

       243
       247
        
       	filename := "terms.md"

     

       244
       248
        
       	filePath := filepath.Join("legal", filename)

     

       245
       245
       -
       	markdownBytes, err := os.ReadFile(filePath)

     

       249
       249
       +
       

     

       250
       250
       +
       	file, err := p.embedFS.Open(filePath)

     

       251
       251
       +
       	if err != nil {

     

       252
       252
       +
       		return fmt.Errorf("failed to read %s: %w", filename, err)

     

       253
       253
       +
       	}

     

       254
       254
       +
       	defer file.Close()

     

       255
       255
       +
       

     

       256
       256
       +
       	markdownBytes, err := io.ReadAll(file)

     

       246
       257
        
       	if err != nil {

     

       247
       258
        
       		return fmt.Errorf("failed to read %s: %w", filename, err)

     

       248
       259
        
       	}

     
···

       263
       274
        
       func (p *Pages) PrivacyPolicy(w io.Writer, params PrivacyPolicyParams) error {

     

       264
       275
        
       	filename := "privacy.md"

     

       265
       276
        
       	filePath := filepath.Join("legal", filename)

     

       266
       266
       -
       	markdownBytes, err := os.ReadFile(filePath)

     

       277
       277
       +
       

     

       278
       278
       +
       	file, err := p.embedFS.Open(filePath)

     

       279
       279
       +
       	if err != nil {

     

       280
       280
       +
       		return fmt.Errorf("failed to read %s: %w", filename, err)

     

       281
       281
       +
       	}

     

       282
       282
       +
       	defer file.Close()

     

       283
       283
       +
       

     

       284
       284
       +
       	markdownBytes, err := io.ReadAll(file)

     

       267
       285
        
       	if err != nil {

     

       268
       286
        
       		return fmt.Errorf("failed to read %s: %w", filename, err)

     

       269
       287
        
       	}

     
···

       276
       294
        
       	return p.execute("legal/privacy", w, params)

     

       277
       295
        
       }

     

       278
       296
        
       

     

       297
       297
       +
       type BrandParams struct {

     

       298
       298
       +
       	LoggedInUser *oauth.User

     

       299
       299
       +
       }

     

       300
       300
       +
       

     

       301
       301
       +
       func (p *Pages) Brand(w io.Writer, params BrandParams) error {

     

       302
       302
       +
       	return p.execute("brand/brand", w, params)

     

       303
       303
       +
       }

     

       304
       304
       +
       

     

       279
       305
        
       type TimelineParams struct {

     

       280
       306
        
       	LoggedInUser *oauth.User

     

       281
       307
        
       	Timeline     []models.TimelineEvent

     
···

       300
       326
        
       	LoggedInUser  *oauth.User

     

       301
       327
        
       	Notifications []*models.NotificationWithEntity

     

       302
       328
        
       	UnreadCount   int

     

       303
       303
       -
       	HasMore       bool

     

       304
       304
       -
       	NextOffset    int

     

       305
       305
       -
       	Limit         int

     

       329
       329
       +
       	Page          pagination.Page

     

       330
       330
       +
       	Total         int64

     

       306
       331
        
       }

     

       307
       332
        
       

     

       308
       333
        
       func (p *Pages) Notifications(w io.Writer, params NotificationsParams) error {

     
···

       318
       343
        
       }

     

       319
       344
        
       

     

       320
       345
        
       type NotificationCountParams struct {

     

       321
       321
       -
       	Count int

     

       346
       346
       +
       	Count int64

     

       322
       347
        
       }

     

       323
       348
        
       

     

       324
       349
        
       func (p *Pages) NotificationCount(w io.Writer, params NotificationCountParams) error {

     
···

       695
       720
        
       }

     

       696
       721
        
       

     

       697
       722
        
       type RepoTreeParams struct {

     

       698
       698
       -
       	LoggedInUser   *oauth.User

     

       699
       699
       -
       	RepoInfo       repoinfo.RepoInfo

     

       700
       700
       -
       	Active         string

     

       701
       701
       -
       	BreadCrumbs    [][]string

     

       702
       702
       -
       	TreePath       string

     

       703
       703
       -
       	Readme         string

     

       704
       704
       -
       	ReadmeFileName string

     

       705
       705
       -
       	HTMLReadme     template.HTML

     

       706
       706
       -
       	Raw            bool

     

       723
       723
       +
       	LoggedInUser *oauth.User

     

       724
       724
       +
       	RepoInfo     repoinfo.RepoInfo

     

       725
       725
       +
       	Active       string

     

       726
       726
       +
       	BreadCrumbs  [][]string

     

       727
       727
       +
       	TreePath     string

     

       728
       728
       +
       	Raw          bool

     

       729
       729
       +
       	HTMLReadme   template.HTML

     

       707
       730
        
       	types.RepoTreeResponse

     

       708
       731
        
       }

     

       709
       732
        
       

     
···

       731
       754
        
       func (p *Pages) RepoTree(w io.Writer, params RepoTreeParams) error {

     

       732
       755
        
       	params.Active = "overview"

     

       733
       756
        
       

     

       734
       734
       -
       	if params.ReadmeFileName != "" {

     

       735
       735
       -
       		params.ReadmeFileName = filepath.Base(params.ReadmeFileName)

     

       757
       757
       +
       	p.rctx.RepoInfo = params.RepoInfo

     

       758
       758
       +
       	p.rctx.RepoInfo.Ref = params.Ref

     

       759
       759
       +
       	p.rctx.RendererType = markup.RendererTypeRepoMarkdown

     

       736
       760
        
       

     

       761
       761
       +
       	if params.ReadmeFileName != "" {

     

       737
       762
        
       		ext := filepath.Ext(params.ReadmeFileName)

     

       738
       763
        
       		switch ext {

     

       739
       764
        
       		case ".md", ".markdown", ".mdown", ".mkdn", ".mkd":

     
···

       1061
       1086
        
       	FilteringBy  models.PullState

     

       1062
       1087
        
       	Stacks       map[string]models.Stack

     

       1063
       1088
        
       	Pipelines    map[string]models.Pipeline

     

       1089
       1089
       +
       	LabelDefs    map[string]*models.LabelDefinition

     

       1064
       1090
        
       }

     

       1065
       1091
        
       

     

       1066
       1092
        
       func (p *Pages) RepoPulls(w io.Writer, params RepoPullsParams) error {

     
···

       1100
       1126
        
       	OrderedReactionKinds []models.ReactionKind

     

       1101
       1127
        
       	Reactions            map[models.ReactionKind]int

     

       1102
       1128
        
       	UserReacted          map[models.ReactionKind]bool

     

       1129
       1129
       +
       

     

       1130
       1130
       +
       	LabelDefs map[string]*models.LabelDefinition

     

       1103
       1131
        
       }

     

       1104
       1132
        
       

     

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

+224

appview/pages/templates/brand/brand.html

···

       1
       1
       +
       {{ define "title" }}brand{{ end }}

     

       2
       2
       +
       

     

       3
       3
       +
       {{ define "content" }}

     

       4
       4
       +
       <div class="grid grid-cols-10">

     

       5
       5
       +
         <header class="col-span-full md:col-span-10 px-6 py-2 mb-4">

     

       6
       6
       +
           <h1 class="text-2xl font-bold dark:text-white mb-1">Brand</h1>

     

       7
       7
       +
           <p class="text-gray-600 dark:text-gray-400 mb-1">

     

       8
       8
       +
           Assets and guidelines for using Tangled's logo and brand elements.

     

       9
       9
       +
           </p>

     

       10
       10
       +
         </header>

     

       11
       11
       +
       

     

       12
       12
       +
         <main class="col-span-full md:col-span-10 bg-white dark:bg-gray-800 drop-shadow-sm rounded p-6 md:px-10">

     

       13
       13
       +
           <div class="space-y-16">

     

       14
       14
       +
       

     

       15
       15
       +
             <!-- Introduction Section -->

     

       16
       16
       +
             <section>

     

       17
       17
       +
               <p class="text-gray-600 dark:text-gray-400 mb-2">

     

       18
       18
       +
               Tangled's logo and mascot is <strong>Dolly</strong>, the first ever <em>cloned</em> mammal. Please

     

       19
       19
       +
               follow the below guidelines when using Dolly and the logotype.

     

       20
       20
       +
               </p>

     

       21
       21
       +
               <p class="text-gray-600 dark:text-gray-400 mb-2">

     

       22
       22
       +
               All assets are served as SVGs, and can be downloaded by right-clicking and clicking "Save image as".

     

       23
       23
       +
               </p>

     

       24
       24
       +
             </section>

     

       25
       25
       +
       

     

       26
       26
       +
             <!-- Black Logotype Section -->

     

       27
       27
       +
             <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center">

     

       28
       28
       +
               <div class="order-2 lg:order-1">

     

       29
       29
       +
                 <div class="border border-gray-200 dark:border-gray-700 p-8 sm:p-16 bg-gray-50 dark:bg-gray-100 rounded">

     

       30
       30
       +
                   <img src="https://assets.tangled.network/tangled_logotype_black_on_trans.svg"

     

       31
       31
       +
                        alt="Tangled logo - black version"

     

       32
       32
       +
                        class="w-full max-w-sm mx-auto" />

     

       33
       33
       +
                 </div>

     

       34
       34
       +
               </div>

     

       35
       35
       +
               <div class="order-1 lg:order-2">

     

       36
       36
       +
                 <h2 class="text-xl font-semibold dark:text-white mb-3">Black logotype</h2>

     

       37
       37
       +
                 <p class="text-gray-600 dark:text-gray-400 mb-4">For use on light-colored backgrounds.</p>

     

       38
       38
       +
                 <p class="text-gray-700 dark:text-gray-300">

     

       39
       39
       +
                 This is the preferred version of the logotype, featuring dark text and elements, ideal for light

     

       40
       40
       +
                 backgrounds and designs.

     

       41
       41
       +
                 </p>

     

       42
       42
       +
               </div>

     

       43
       43
       +
             </section>

     

       44
       44
       +
       

     

       45
       45
       +
             <!-- White Logotype Section -->

     

       46
       46
       +
             <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center">

     

       47
       47
       +
               <div class="order-2 lg:order-1">

     

       48
       48
       +
                 <div class="bg-black p-8 sm:p-16 rounded">

     

       49
       49
       +
                   <img src="https://assets.tangled.network/tangled_logotype_white_on_trans.svg"

     

       50
       50
       +
                        alt="Tangled logo - white version"

     

       51
       51
       +
                        class="w-full max-w-sm mx-auto" />

     

       52
       52
       +
                 </div>

     

       53
       53
       +
               </div>

     

       54
       54
       +
               <div class="order-1 lg:order-2">

     

       55
       55
       +
                 <h2 class="text-xl font-semibold dark:text-white mb-3">White logotype</h2>

     

       56
       56
       +
                 <p class="text-gray-600 dark:text-gray-400 mb-4">For use on dark-colored backgrounds.</p>

     

       57
       57
       +
                 <p class="text-gray-700 dark:text-gray-300">

     

       58
       58
       +
                   This version features white text and elements, ideal for dark backgrounds

     

       59
       59
       +
                   and inverted designs.

     

       60
       60
       +
                 </p>

     

       61
       61
       +
               </div>

     

       62
       62
       +
             </section>

     

       63
       63
       +
       

     

       64
       64
       +
             <!-- Mark Only Section -->

     

       65
       65
       +
             <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center">

     

       66
       66
       +
               <div class="order-2 lg:order-1">

     

       67
       67
       +
                 <div class="grid grid-cols-2 gap-2">

     

       68
       68
       +
                   <!-- Black mark on light background -->

     

       69
       69
       +
                   <div class="border border-gray-200 dark:border-gray-700 bg-gray-50 dark:bg-gray-100 p-8 sm:p-12 rounded">

     

       70
       70
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_black_on_trans.svg"

     

       71
       71
       +
                          alt="Dolly face - black version"

     

       72
       72
       +
                          class="w-full max-w-16 mx-auto" />

     

       73
       73
       +
                   </div>

     

       74
       74
       +
                   <!-- White mark on dark background -->

     

       75
       75
       +
                   <div class="bg-black p-8 sm:p-12 rounded">

     

       76
       76
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_white_on_trans.svg"

     

       77
       77
       +
                          alt="Dolly face - white version"

     

       78
       78
       +
                          class="w-full max-w-16 mx-auto" />

     

       79
       79
       +
                   </div>

     

       80
       80
       +
                 </div>

     

       81
       81
       +
               </div>

     

       82
       82
       +
               <div class="order-1 lg:order-2">

     

       83
       83
       +
                 <h2 class="text-xl font-semibold dark:text-white mb-3">Mark only</h2>

     

       84
       84
       +
                 <p class="text-gray-600 dark:text-gray-400 mb-4">

     

       85
       85
       +
                   When a smaller 1:1 logo or icon is needed, Dolly's face may be used on its own.

     

       86
       86
       +
                 </p>

     

       87
       87
       +
                 <p class="text-gray-700 dark:text-gray-300 mb-4">

     

       88
       88
       +
                   <strong class="font-semibold">Note</strong>: for situations where the background

     

       89
       89
       +
                   is unknown, use the black version for ideal contrast in most environments.

     

       90
       90
       +
                 </p>

     

       91
       91
       +
               </div>

     

       92
       92
       +
             </section>

     

       93
       93
       +
       

     

       94
       94
       +
             <!-- Colored Backgrounds Section -->

     

       95
       95
       +
             <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center">

     

       96
       96
       +
               <div class="order-2 lg:order-1">

     

       97
       97
       +
                 <div class="grid grid-cols-2 gap-2">

     

       98
       98
       +
                   <!-- Pastel Green background -->

     

       99
       99
       +
                   <div class="bg-green-500 p-8 sm:p-12 rounded">

     

       100
       100
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_white_on_trans.svg"

     

       101
       101
       +
                          alt="Tangled logo on pastel green background"

     

       102
       102
       +
                          class="w-full max-w-16 mx-auto" />

     

       103
       103
       +
                   </div>

     

       104
       104
       +
                   <!-- Pastel Blue background -->

     

       105
       105
       +
                   <div class="bg-blue-500 p-8 sm:p-12 rounded">

     

       106
       106
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_white_on_trans.svg"

     

       107
       107
       +
                          alt="Tangled logo on pastel blue background"

     

       108
       108
       +
                          class="w-full max-w-16 mx-auto" />

     

       109
       109
       +
                   </div>

     

       110
       110
       +
                   <!-- Pastel Yellow background -->

     

       111
       111
       +
                   <div class="bg-yellow-500 p-8 sm:p-12 rounded">

     

       112
       112
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_white_on_trans.svg"

     

       113
       113
       +
                          alt="Tangled logo on pastel yellow background"

     

       114
       114
       +
                          class="w-full max-w-16 mx-auto" />

     

       115
       115
       +
                   </div>

     

       116
       116
       +
                   <!-- Pastel Red background -->

     

       117
       117
       +
                   <div class="bg-red-500 p-8 sm:p-12 rounded">

     

       118
       118
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_white_on_trans.svg"

     

       119
       119
       +
                          alt="Tangled logo on pastel red background"

     

       120
       120
       +
                          class="w-full max-w-16 mx-auto" />

     

       121
       121
       +
                   </div>

     

       122
       122
       +
                 </div>

     

       123
       123
       +
               </div>

     

       124
       124
       +
               <div class="order-1 lg:order-2">

     

       125
       125
       +
                 <h2 class="text-xl font-semibold dark:text-white mb-3">Colored backgrounds</h2>

     

       126
       126
       +
                 <p class="text-gray-600 dark:text-gray-400 mb-4">

     

       127
       127
       +
                   White logo mark on colored backgrounds.

     

       128
       128
       +
                 </p>

     

       129
       129
       +
                 <p class="text-gray-700 dark:text-gray-300 mb-4">

     

       130
       130
       +
                   The white logo mark provides contrast on colored backgrounds.

     

       131
       131
       +
                   Perfect for more fun design contexts.

     

       132
       132
       +
                 </p>

     

       133
       133
       +
               </div>

     

       134
       134
       +
             </section>

     

       135
       135
       +
       

     

       136
       136
       +
             <!-- Black Logo on Pastel Backgrounds Section -->

     

       137
       137
       +
             <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center">

     

       138
       138
       +
               <div class="order-2 lg:order-1">

     

       139
       139
       +
                 <div class="grid grid-cols-2 gap-2">

     

       140
       140
       +
                   <!-- Pastel Green background -->

     

       141
       141
       +
                   <div class="bg-green-200 p-8 sm:p-12 rounded">

     

       142
       142
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_black_on_trans.svg"

     

       143
       143
       +
                          alt="Tangled logo on pastel green background"

     

       144
       144
       +
                          class="w-full max-w-16 mx-auto" />

     

       145
       145
       +
                   </div>

     

       146
       146
       +
                   <!-- Pastel Blue background -->

     

       147
       147
       +
                   <div class="bg-blue-200 p-8 sm:p-12 rounded">

     

       148
       148
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_black_on_trans.svg"

     

       149
       149
       +
                          alt="Tangled logo on pastel blue background"

     

       150
       150
       +
                          class="w-full max-w-16 mx-auto" />

     

       151
       151
       +
                   </div>

     

       152
       152
       +
                   <!-- Pastel Yellow background -->

     

       153
       153
       +
                   <div class="bg-yellow-200 p-8 sm:p-12 rounded">

     

       154
       154
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_black_on_trans.svg"

     

       155
       155
       +
                          alt="Tangled logo on pastel yellow background"

     

       156
       156
       +
                          class="w-full max-w-16 mx-auto" />

     

       157
       157
       +
                   </div>

     

       158
       158
       +
                   <!-- Pastel Pink background -->

     

       159
       159
       +
                   <div class="bg-pink-200 p-8 sm:p-12 rounded">

     

       160
       160
       +
                     <img src="https://assets.tangled.network/tangled_dolly_face_only_black_on_trans.svg"

     

       161
       161
       +
                          alt="Tangled logo on pastel pink background"

     

       162
       162
       +
                          class="w-full max-w-16 mx-auto" />

     

       163
       163
       +
                   </div>

     

       164
       164
       +
                 </div>

     

       165
       165
       +
               </div>

     

       166
       166
       +
               <div class="order-1 lg:order-2">

     

       167
       167
       +
                 <h2 class="text-xl font-semibold dark:text-white mb-3">Lighter backgrounds</h2>

     

       168
       168
       +
                 <p class="text-gray-600 dark:text-gray-400 mb-4">

     

       169
       169
       +
                   Dark logo mark on lighter, pastel backgrounds.

     

       170
       170
       +
                 </p>

     

       171
       171
       +
                 <p class="text-gray-700 dark:text-gray-300 mb-4">

     

       172
       172
       +
                   The dark logo mark works beautifully on pastel backgrounds,

     

       173
       173
       +
                   providing crisp contrast.

     

       174
       174
       +
                 </p>

     

       175
       175
       +
               </div>

     

       176
       176
       +
             </section>

     

       177
       177
       +
       

     

       178
       178
       +
             <!-- Recoloring Section -->

     

       179
       179
       +
             <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center">

     

       180
       180
       +
               <div class="order-2 lg:order-1">

     

       181
       181
       +
                 <div class="bg-yellow-100 border border-yellow-200 p-8 sm:p-16 rounded">

     

       182
       182
       +
                   <img src="https://assets.tangled.network/tangled_logotype_black_on_trans.svg"

     

       183
       183
       +
                        alt="Recolored Tangled logotype in gray/sand color"

     

       184
       184
       +
                        class="w-full max-w-sm mx-auto opacity-60 sepia contrast-75 saturate-50" />

     

       185
       185
       +
                 </div>

     

       186
       186
       +
               </div>

     

       187
       187
       +
               <div class="order-1 lg:order-2">

     

       188
       188
       +
                 <h2 class="text-xl font-semibold dark:text-white mb-3">Recoloring</h2>

     

       189
       189
       +
                 <p class="text-gray-600 dark:text-gray-400 mb-4">

     

       190
       190
       +
                   Custom coloring of the logotype is permitted.

     

       191
       191
       +
                 </p>

     

       192
       192
       +
                 <p class="text-gray-700 dark:text-gray-300 mb-4">

     

       193
       193
       +
                   Recoloring the logotype is allowed as long as readability is maintained.

     

       194
       194
       +
                 </p>

     

       195
       195
       +
                 <p class="text-gray-700 dark:text-gray-300 text-sm">

     

       196
       196
       +
                   <strong>Example:</strong> Gray/sand colored logotype on a light yellow/tan background.

     

       197
       197
       +
                 </p>

     

       198
       198
       +
               </div>

     

       199
       199
       +
             </section>

     

       200
       200
       +
       

     

       201
       201
       +
             <!-- Silhouette Section -->

     

       202
       202
       +
             <section class="grid grid-cols-1 lg:grid-cols-2 gap-8 items-center">

     

       203
       203
       +
               <div class="order-2 lg:order-1">

     

       204
       204
       +
                 <div class="border border-gray-200 dark:border-gray-700 p-8 sm:p-16 bg-gray-50 dark:bg-gray-100 rounded">

     

       205
       205
       +
                   <img src="https://assets.tangled.network/tangled_dolly_silhouette.svg"

     

       206
       206
       +
                        alt="Dolly silhouette"

     

       207
       207
       +
                        class="w-full max-w-32 mx-auto" />

     

       208
       208
       +
                 </div>

     

       209
       209
       +
               </div>

     

       210
       210
       +
               <div class="order-1 lg:order-2">

     

       211
       211
       +
                 <h2 class="text-xl font-semibold dark:text-white mb-3">Dolly silhouette</h2>

     

       212
       212
       +
                 <p class="text-gray-600 dark:text-gray-400 mb-4">A minimalist version of Dolly.</p>

     

       213
       213
       +
                 <p class="text-gray-700 dark:text-gray-300">

     

       214
       214
       +
                   The silhouette can be used where a subtle brand presence is needed,

     

       215
       215
       +
                   or as a background element. Works on any background color with proper contrast.

     

       216
       216
       +
                   For example, we use this as the site's favicon.

     

       217
       217
       +
                 </p>

     

       218
       218
       +
               </div>

     

       219
       219
       +
             </section>

     

       220
       220
       +
       

     

       221
       221
       +
           </div>

     

       222
       222
       +
         </main>

     

       223
       223
       +
       </div>

     

       224
       224
       +
       {{ end }}

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

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

···

       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/brand" class="{{ $linkStyle }}">{{ i "paintbrush" $iconStyle }} brand</a>

     

       26
       27
        
               </div>

     

       27
       28
        
       

     

       28
       29
        
               <div class="flex flex-col gap-1">

+13 -6

appview/pages/templates/legal/privacy.html

···

       1
       1
        
       {{ define "title" }}privacy policy{{ end }}

     

       2
       2
        
       

     

       3
       3
        
       {{ define "content" }}

     

       4
       4
       -
       <div class="max-w-4xl mx-auto px-4 py-8">

     

       5
       5
       -
           <div class="bg-white dark:bg-gray-800 rounded-lg shadow-sm p-8">

     

       6
       6
       -
               <div class="prose prose-gray dark:prose-invert max-w-none">

     

       7
       7
       -
                   {{ .Content }}

     

       8
       8
       -
               </div>

     

       4
       4
       +
       <div class="grid grid-cols-10">

     

       5
       5
       +
         <header class="col-span-full md:col-span-10 px-6 py-2 mb-4">

     

       6
       6
       +
           <h1 class="text-2xl font-bold dark:text-white mb-1">Privacy Policy</h1>

     

       7
       7
       +
           <p class="text-gray-600 dark:text-gray-400 mb-1">

     

       8
       8
       +
             Learn how we collect, use, and protect your personal information.

     

       9
       9
       +
           </p>

     

       10
       10
       +
         </header>

     

       11
       11
       +
       

     

       12
       12
       +
         <main class="col-span-full md:col-span-10 bg-white dark:bg-gray-800 drop-shadow-sm rounded p-6 md:px-10">

     

       13
       13
       +
           <div class="prose prose-gray dark:prose-invert max-w-none">

     

       14
       14
       +
             {{ .Content }}

     

       9
       15
        
           </div>

     

       16
       16
       +
         </main>

     

       10
       17
        
       </div>

     

       11
       11
       -
       {{ end }}
     

       18
       18
       +
       {{ end }}

+13 -6

appview/pages/templates/legal/terms.html

···

       1
       1
        
       {{ define "title" }}terms of service{{ end }}

     

       2
       2
        
       

     

       3
       3
        
       {{ define "content" }}

     

       4
       4
       -
       <div class="max-w-4xl mx-auto px-4 py-8">

     

       5
       5
       -
           <div class="bg-white dark:bg-gray-800 rounded-lg shadow-sm p-8">

     

       6
       6
       -
               <div class="prose prose-gray dark:prose-invert max-w-none">

     

       7
       7
       -
                   {{ .Content }}

     

       8
       8
       -
               </div>

     

       4
       4
       +
       <div class="grid grid-cols-10">

     

       5
       5
       +
         <header class="col-span-full md:col-span-10 px-6 py-2 mb-4">

     

       6
       6
       +
           <h1 class="text-2xl font-bold dark:text-white mb-1">Terms of Service</h1>

     

       7
       7
       +
           <p class="text-gray-600 dark:text-gray-400 mb-1">

     

       8
       8
       +
           A few things you should know.

     

       9
       9
       +
           </p>

     

       10
       10
       +
         </header>

     

       11
       11
       +
       

     

       12
       12
       +
         <main class="col-span-full md:col-span-10 bg-white dark:bg-gray-800 drop-shadow-sm rounded p-6 md:px-10">

     

       13
       13
       +
           <div class="prose prose-gray dark:prose-invert max-w-none">

     

       14
       14
       +
             {{ .Content }}

     

       9
       15
        
           </div>

     

       16
       16
       +
         </main>

     

       10
       17
        
       </div>

     

       11
       11
       -
       {{ end }}
     

       18
       18
       +
       {{ end }}

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

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-6 md:px-0">

     

       3
       3
        
           {{ template "basicLabels" . }}

     

       4
       4
        
           {{ template "kvLabels" . }}

     

       5
       5
        
         </div>

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

+2 -2

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

···

       1
       1
        
       {{ define "repo/fragments/readme" }}

     

       2
       2
        
       <div class="mt-4 rounded bg-white dark:bg-gray-800 drop-shadow-sm w-full mx-auto overflow-hidden">

     

       3
       3
        
           {{- if .ReadmeFileName -}}

     

       4
       4
       -
           <div class="px-4 py-2 bg-gray-50 dark:bg-gray-700 border-b border-gray-200 dark:border-gray-600 flex items-center gap-2">

     

       4
       4
       +
           <div class="px-4 py-2 border-b border-gray-200 dark:border-gray-600 flex items-center gap-2">

     

       5
       5
        
               {{ i "file-text" "w-4 h-4" "text-gray-600 dark:text-gray-400" }}

     

       6
       6
        
               <span class="font-mono text-sm text-gray-800 dark:text-gray-200">{{ .ReadmeFileName }}</span>

     

       7
       7
        
           </div>

     

       8
       8
        
           {{- end -}}

     

       9
       9
        
           <section

     

       10
       10
       -
               class="p-6 overflow-auto {{ if not .Raw }}

     

       10
       10
       +
               class="px-6 pb-6 overflow-auto {{ if not .Raw }}

     

       11
       11
        
               prose dark:prose-invert dark:[&_pre]:bg-gray-900

     

       12
       12
        
               dark:[&_code]:text-gray-300 dark:[&_pre_code]:bg-gray-900

     

       13
       13
        
               dark:[&_pre]:border dark:[&_pre]:border-gray-700

+1 -27

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

     
···

       122
       122
        
         </div>

     

       123
       123
        
       {{ end }}

     

       124
       124
        
       

     

       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
       125
        
       

     

       152
       126
        
       {{ define "repoAfter" }}

     

       153
       127
        
         <div class="flex flex-col gap-4 mt-4">

+156 -140

appview/pages/templates/repo/new.html

···

       1
       1
        
       {{ define "title" }}new repo{{ end }}

     

       2
       2
        
       

     

       3
       3
        
       {{ define "content" }}

     

       4
       4
       -
       <div class="px-6 py-2 mb-4">

     

       5
       5
       -
         <h1 class="text-xl font-bold dark:text-white mb-1">Create a new repository</h1>

     

       6
       6
       -
         <p class="text-gray-600 dark:text-gray-400 mb-1">

     

       7
       7
       -
           Repositories contain a project's files and version history.

     

       8
       8
       -
         </p>

     

       4
       4
       +
       <div class="grid grid-cols-12">

     

       5
       5
       +
         <div class="col-span-full md:col-start-3 md:col-span-8 px-6 py-2 mb-4">

     

       6
       6
       +
           <h1 class="text-xl font-bold dark:text-white mb-1">Create a new repository</h1>

     

       7
       7
       +
           <p class="text-gray-600 dark:text-gray-400 mb-1">

     

       8
       8
       +
           Repositories contain a project's files and version history. All

     

       9
       9
       +
           repositories are publicly accessible.

     

       10
       10
       +
           </p>

     

       11
       11
       +
         </div>

     

       12
       12
       +
         {{ template "newRepoPanel" . }}

     

       9
       13
        
       </div>

     

       14
       14
       +
       {{ end }}

     

       10
       15
        
       

     

       11
       11
       -
       <div class="bg-white dark:bg-gray-800 drop-shadow-sm rounded">

     

       16
       16
       +
       {{ define "newRepoPanel" }}

     

       17
       17
       +
         <div class="col-span-full md:col-start-3 md:col-span-8 bg-white dark:bg-gray-800 drop-shadow-sm rounded p-6 md:px-10">

     

       18
       18
       +
           {{ template "newRepoForm" . }}

     

       19
       19
       +
         </div>

     

       20
       20
       +
       {{ end }}

     

       21
       21
       +
       

     

       22
       22
       +
       {{ define "newRepoForm" }}

     

       12
       23
        
         <form hx-post="/repo/new" hx-swap="none" hx-indicator="#spinner">

     

       24
       24
       +
           {{ template "step-1" . }}

     

       25
       25
       +
           {{ template "step-2" . }}

     

       13
       26
        
       

     

       14
       14
       -
           <div class="p-6">

     

       15
       15
       -
             <!-- Step 1: General -->

     

       16
       16
       -
             <div class="flex gap-4">

     

       17
       17
       -
               <div class="flex flex-col items-center w-10 flex-shrink-0">

     

       18
       18
       -
                 <div class="w-6 h-6 bg-gray-900 dark:bg-gray-100 text-white dark:text-gray-900 rounded-full flex items-center justify-center text-sm font-medium mt-1">

     

       19
       19
       -
                   1

     

       20
       20
       -
                 </div>

     

       21
       21
       -
                 <div class="w-px bg-gray-300 dark:bg-gray-600 h-80 mt-1"></div>

     

       22
       22
       -
               </div>

     

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

     

       24
       24
       -
                 <div class="mb-6">

     

       25
       25
       -
                   <div class="text-lg font-semibold dark:text-white mb-1">General</div>

     

       26
       26
       -
                   <div class="text-sm text-gray-500 dark:text-gray-400">Basic repository information.</div>

     

       27
       27
       -
                 </div>

     

       27
       27
       +
           <div class="mt-8 flex justify-end">

     

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

     

       29
       29
       +
               {{ i "book-plus" "w-4 h-4" }}

     

       30
       30
       +
               create repo

     

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

     

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

     

       33
       33
       +
               </span>

     

       34
       34
       +
             </button>

     

       35
       35
       +
           </div>

     

       36
       36
       +
           <div id="repo" class="error mt-2"></div>

     

       28
       37
        
       

     

       29
       29
       -
                 <div class="space-y-2">

     

       30
       30
       -
                   <!-- Repository Name with Owner -->

     

       31
       31
       -
                   <div>

     

       32
       32
       -
                     <label class="block text-sm font-bold uppercase dark:text-white mb-1">

     

       33
       33
       -
                       Repository name

     

       34
       34
       -
                     </label>

     

       35
       35
       -
                     <div class="flex flex-col md:flex-row md:items-center gap-2 md:gap-0">

     

       36
       36
       -
                       {{ if .LoggedInUser.Handle }}

     

       37
       37
       -
                         <div class="flex items-center px-2 py-2 gap-1 text-sm text-gray-700 dark:text-gray-300 md:border md:border-r-0 md:border-gray-300 md:dark:border-gray-600 md:rounded-l md:bg-gray-50 md:dark:bg-gray-700">

     

       38
       38
       -
                           {{ template "user/fragments/picHandle" .LoggedInUser.Handle }}

     

       39
       39
       -
                           <span class="md:hidden pr-2 py-2 text-gray-500 dark:text-gray-400">/</span>

     

       40
       40
       -
                         </div>

     

       41
       41
       -
                         <span class="hidden md:inline pr-2 py-2 text-gray-500 dark:text-gray-400 border-t border-b border-gray-300 dark:border-gray-600 bg-gray-50 dark:bg-gray-700">/</span>

     

       42
       42
       -
                       {{ end }}

     

       43
       43
       -
                       <input

     

       44
       44
       -
                         type="text"

     

       45
       45
       -
                         id="name"

     

       46
       46
       -
                         name="name"

     

       47
       47
       -
                         required

     

       48
       48
       -
                         class="w-full max-w-md dark:bg-gray-700 dark:text-white dark:border-gray-600 border border-gray-300 rounded md:rounded-r md:rounded-l-none px-3 py-2"

     

       49
       49
       -
                         placeholder="repository-name"

     

       50
       50
       -
                       />

     

       51
       51
       -
                     </div>

     

       52
       52
       -
                     <p class="text-sm text-gray-500 dark:text-gray-400 mt-1">

     

       53
       53
       -
                       Choose a unique, descriptive name for your repository. Use letters, numbers, and hyphens.

     

       54
       54
       -
                     </p>

     

       55
       55
       -
                   </div>

     

       38
       38
       +
         </form>

     

       39
       39
       +
       {{ end }}

     

       40
       40
       +
       

     

       41
       41
       +
       {{ define "step-1" }}

     

       42
       42
       +
         <div class="flex gap-4 relative border-l border-gray-200 dark:border-gray-700 pl-6">

     

       43
       43
       +
           <div class="absolute -left-3 -top-0">

     

       44
       44
       +
             {{ template "numberCircle" 1 }}

     

       45
       45
       +
           </div>

     

       46
       46
       +
       

     

       47
       47
       +
           <!-- Content column -->

     

       48
       48
       +
           <div class="flex-1 pb-12">

     

       49
       49
       +
             <h2 class="text-lg font-semibold dark:text-white">General</h2>

     

       50
       50
       +
             <div class="text-sm text-gray-500 dark:text-gray-400 mb-4">Basic repository information.</div>

     

       56
       51
        
       

     

       57
       57
       -
                   <!-- Description -->

     

       58
       58
       -
                   <div>

     

       59
       59
       -
                     <label for="description" class="block text-sm font-bold uppercase dark:text-white mb-1">

     

       60
       60
       -
                       Description

     

       61
       61
       -
                     </label>

     

       62
       62
       -
                     <input

     

       63
       63
       -
                       type="text"

     

       64
       64
       -
                       id="description"

     

       65
       65
       -
                       name="description"

     

       66
       66
       -
                       class="w-full max-w-md dark:bg-gray-700 dark:text-white dark:border-gray-600 border border-gray-300 rounded px-3 py-2"

     

       67
       67
       -
                       placeholder="A brief description of your project..."

     

       68
       68
       -
                     />

     

       69
       69
       -
                     <p class="text-sm text-gray-500 dark:text-gray-400 mt-1">

     

       70
       70
       -
                       Optional. A short description to help others understand what your project does.

     

       71
       71
       -
                     </p>

     

       72
       72
       -
                   </div>

     

       73
       73
       -
                 </div>

     

       74
       74
       -
               </div>

     

       52
       52
       +
             <div class="space-y-2">

     

       53
       53
       +
               {{ template "name" . }}

     

       54
       54
       +
               {{ template "description" . }}

     

       75
       55
        
             </div>

     

       56
       56
       +
           </div>

     

       57
       57
       +
         </div>

     

       58
       58
       +
       {{ end }}

     

       76
       59
        
       

     

       77
       77
       -
             <!-- Step 2: Configuration -->

     

       78
       78
       -
             <div class="flex gap-4">

     

       79
       79
       -
               <div class="flex flex-col items-center w-10 flex-shrink-0">

     

       80
       80
       -
                 <div class="w-6 h-6 bg-gray-900 dark:bg-gray-100 text-white dark:text-gray-900 rounded-full flex items-center justify-center text-sm font-medium mt-1">

     

       81
       81
       -
                   2

     

       82
       82
       -
                 </div>

     

       83
       83
       -
               </div>

     

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

     

       85
       85
       -
                 <div class="mb-6">

     

       86
       86
       -
                   <div class="text-lg font-semibold dark:text-white mb-1">Configuration</div>

     

       87
       87
       -
                   <div class="text-sm text-gray-500 dark:text-gray-400">Repository settings and hosting.</div>

     

       88
       88
       -
                 </div>

     

       60
       60
       +
       {{ define "step-2" }}

     

       61
       61
       +
         <div class="flex gap-4 relative border-l border-gray-200 dark:border-gray-700 pl-6">

     

       62
       62
       +
           <div class="absolute -left-3 -top-0">

     

       63
       63
       +
             {{ template "numberCircle" 2 }}

     

       64
       64
       +
           </div>

     

       89
       65
        
       

     

       90
       90
       -
                 <div class="space-y-2">

     

       91
       91
       -
                   <!-- Default Branch -->

     

       92
       92
       -
                   <div>

     

       93
       93
       -
                     <label for="branch" class="block text-sm font-bold uppercase dark:text-white mb-1">

     

       94
       94
       -
                       Default branch

     

       95
       95
       -
                     </label>

     

       96
       96
       -
                     <input

     

       97
       97
       -
                       type="text"

     

       98
       98
       -
                       id="branch"

     

       99
       99
       -
                       name="branch"

     

       100
       100
       -
                       value="main"

     

       101
       101
       -
                       required

     

       102
       102
       -
                       class="w-full max-w-md dark:bg-gray-700 dark:text-white dark:border-gray-600 border border-gray-300 rounded px-3 py-2"

     

       103
       103
       -
                     />

     

       104
       104
       -
                     <p class="text-sm text-gray-500 dark:text-gray-400 mt-1">

     

       105
       105
       -
                       The primary branch where development happens. Common choices are "main" or "master".

     

       106
       106
       -
                     </p>

     

       107
       107
       -
                   </div>

     

       66
       66
       +
           <div class="flex-1">

     

       67
       67
       +
             <h2 class="text-lg font-semibold dark:text-white">Configuration</h2>

     

       68
       68
       +
             <div class="text-sm text-gray-500 dark:text-gray-400 mb-4">Repository settings and hosting.</div>

     

       108
       69
        
       

     

       109
       109
       -
                   <!-- Knot Selection -->

     

       110
       110
       -
                   <div>

     

       111
       111
       -
                     <label class="block text-sm font-bold uppercase dark:text-white mb-1">

     

       112
       112
       -
                       Select a knot

     

       113
       113
       -
                     </label>

     

       114
       114
       -
                     <div class="w-full max-w-md dark:bg-gray-700 dark:text-white dark:border-gray-600 border border-gray-300 rounded p-3 space-y-2">

     

       115
       115
       -
                       {{ range .Knots }}

     

       116
       116
       -
                         <div class="flex items-center">

     

       117
       117
       -
                           <input

     

       118
       118
       -
                             type="radio"

     

       119
       119
       -
                             name="domain"

     

       120
       120
       -
                             value="{{ . }}"

     

       121
       121
       -
                             class="mr-2"

     

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

     

       123
       123
       -
                             required

     

       124
       124
       -
                           />

     

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

     

       126
       126
       -
                         </div>

     

       127
       127
       -
                       {{ else }}

     

       128
       128
       -
                       <p class="dark:text-white">no knots available.</p>

     

       129
       129
       -
                       {{ end }}

     

       130
       130
       -
                     </div>

     

       131
       131
       -
                     <p class="text-sm text-gray-500 dark:text-gray-400 mt-1">

     

       132
       132
       -
                       A knot hosts repository data and handles Git operations.

     

       133
       133
       -
                       You can also <a href="/knots" class="underline">register your own knot</a>.

     

       134
       134
       -
                     </p>

     

       135
       135
       -
                   </div>

     

       136
       136
       -
                 </div>

     

       137
       137
       -
               </div>

     

       70
       70
       +
             <div class="space-y-2">

     

       71
       71
       +
               {{ template "defaultBranch" . }}

     

       72
       72
       +
               {{ template "knot" . }}

     

       138
       73
        
             </div>

     

       139
       74
        
           </div>

     

       75
       75
       +
         </div>

     

       76
       76
       +
       {{ end }}

     

       140
       77
        
       

     

       141
       141
       -
           <!-- Create Repository Button -->

     

       142
       142
       -
           <div class="p-6 border-t border-gray-200 dark:border-gray-700">

     

       143
       143
       -
             <div class="flex items-center justify-between">

     

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

     

       145
       145
       -
                   All repositories are publicly accessible.

     

       146
       146
       -
               </div>

     

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

     

       148
       148
       -
                 {{ i "book-plus" "w-4 h-4" }}

     

       149
       149
       -
                 create repo

     

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

     

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

     

       152
       152
       -
                 </span>

     

       153
       153
       -
               </button>

     

       78
       78
       +
       {{ define "name" }}

     

       79
       79
       +
         <!-- Repository Name with Owner -->

     

       80
       80
       +
         <div>

     

       81
       81
       +
           <label class="block text-sm font-bold uppercase dark:text-white mb-1">

     

       82
       82
       +
             Repository name

     

       83
       83
       +
           </label>

     

       84
       84
       +
           <div class="flex flex-col md:flex-row md:items-center gap-2 md:gap-0 w-full">

     

       85
       85
       +
             <div class="shrink-0 hidden md:flex items-center px-2 py-2 gap-1 text-sm text-gray-700 dark:text-gray-300 md:border md:border-r-0 md:border-gray-300 md:dark:border-gray-600 md:rounded-l md:bg-gray-50 md:dark:bg-gray-700">

     

       86
       86
       +
               {{ template "user/fragments/picHandle" .LoggedInUser.Did }}

     

       154
       87
        
             </div>

     

       155
       155
       -
             <div id="repo" class="error mt-2"></div>

     

       88
       88
       +
             <input

     

       89
       89
       +
               type="text"

     

       90
       90
       +
               id="name"

     

       91
       91
       +
               name="name"

     

       92
       92
       +
               required

     

       93
       93
       +
               class="flex-1 dark:bg-gray-700 dark:text-white dark:border-gray-600 border border-gray-300 rounded md:rounded-r md:rounded-l-none px-3 py-2"

     

       94
       94
       +
               placeholder="repository-name"

     

       95
       95
       +
             />

     

       156
       96
        
           </div>

     

       97
       97
       +
           <p class="text-sm text-gray-500 dark:text-gray-400 mt-1">

     

       98
       98
       +
             Choose a unique, descriptive name for your repository. Use letters, numbers, and hyphens.

     

       99
       99
       +
           </p>

     

       100
       100
       +
         </div>

     

       101
       101
       +
       {{ end }}

     

       157
       102
        
       

     

       158
       158
       -
         </form>

     

       159
       159
       -
       </div>

     

       103
       103
       +
       {{ define "description" }}

     

       104
       104
       +
         <!-- Description -->

     

       105
       105
       +
         <div>

     

       106
       106
       +
           <label for="description" class="block text-sm font-bold uppercase dark:text-white mb-1">

     

       107
       107
       +
             Description

     

       108
       108
       +
           </label>

     

       109
       109
       +
           <input

     

       110
       110
       +
             type="text"

     

       111
       111
       +
             id="description"

     

       112
       112
       +
             name="description"

     

       113
       113
       +
             class="w-full w-full dark:bg-gray-700 dark:text-white dark:border-gray-600 border border-gray-300 rounded px-3 py-2"

     

       114
       114
       +
             placeholder="A brief description of your project..."

     

       115
       115
       +
           />

     

       116
       116
       +
           <p class="text-sm text-gray-500 dark:text-gray-400 mt-1">

     

       117
       117
       +
             Optional. A short description to help others understand what your project does.

     

       118
       118
       +
           </p>

     

       119
       119
       +
         </div>

     

       120
       120
       +
       {{ end }}

     

       121
       121
       +
       

     

       122
       122
       +
       {{ define "defaultBranch" }}

     

       123
       123
       +
         <!-- Default Branch -->

     

       124
       124
       +
         <div>

     

       125
       125
       +
           <label for="branch" class="block text-sm font-bold uppercase dark:text-white mb-1">

     

       126
       126
       +
             Default branch

     

       127
       127
       +
           </label>

     

       128
       128
       +
           <input

     

       129
       129
       +
             type="text"

     

       130
       130
       +
             id="branch"

     

       131
       131
       +
             name="branch"

     

       132
       132
       +
             value="main"

     

       133
       133
       +
             required

     

       134
       134
       +
             class="w-full dark:bg-gray-700 dark:text-white dark:border-gray-600 border border-gray-300 rounded px-3 py-2"

     

       135
       135
       +
           />

     

       136
       136
       +
           <p class="text-sm text-gray-500 dark:text-gray-400 mt-1">

     

       137
       137
       +
             The primary branch where development happens. Common choices are "main" or "master".

     

       138
       138
       +
           </p>

     

       139
       139
       +
         </div>

     

       140
       140
       +
       {{ end }}

     

       141
       141
       +
       

     

       142
       142
       +
       {{ define "knot" }}

     

       143
       143
       +
         <!-- Knot Selection -->

     

       144
       144
       +
         <div>

     

       145
       145
       +
           <label class="block text-sm font-bold uppercase dark:text-white mb-1">

     

       146
       146
       +
             Select a knot

     

       147
       147
       +
           </label>

     

       148
       148
       +
           <div class="w-full dark:bg-gray-700 dark:text-white dark:border-gray-600 border border-gray-300 rounded p-3 space-y-2">

     

       149
       149
       +
             {{ range .Knots }}

     

       150
       150
       +
               <div class="flex items-center">

     

       151
       151
       +
                 <input

     

       152
       152
       +
                   type="radio"

     

       153
       153
       +
                   name="domain"

     

       154
       154
       +
                   value="{{ . }}"

     

       155
       155
       +
                   class="mr-2"

     

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

     

       157
       157
       +
                   required

     

       158
       158
       +
                 />

     

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

     

       160
       160
       +
               </div>

     

       161
       161
       +
             {{ else }}

     

       162
       162
       +
             <p class="dark:text-white">no knots available.</p>

     

       163
       163
       +
             {{ end }}

     

       164
       164
       +
           </div>

     

       165
       165
       +
           <p class="text-sm text-gray-500 dark:text-gray-400 mt-1">

     

       166
       166
       +
             A knot hosts repository data and handles Git operations.

     

       167
       167
       +
             You can also <a href="/knots" class="underline">register your own knot</a>.

     

       168
       168
       +
           </p>

     

       169
       169
       +
         </div>

     

       170
       170
       +
       {{ end }}

     

       171
       171
       +
       

     

       172
       172
       +
       {{ define "numberCircle" }}

     

       173
       173
       +
         <div class="w-6 h-6 bg-gray-200 dark:bg-gray-600 rounded-full flex items-center justify-center text-sm font-medium mt-1">

     

       174
       174
       +
           {{.}}

     

       175
       175
       +
         </div>

     

       160
       176
        
       {{ end }}

+30 -12

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>

     

       83
       83
       -
                   <span id="interdiff-error-{{.RoundNumber}}"></span>

     

       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>

     

       84
       101
        
                   {{ end }}

     

       102
       102
       +
                   <span id="interdiff-error-{{.RoundNumber}}"></span>

     

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

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

+1 -1

appview/pages/templates/repo/tree.html

···

       91
       91
        
       

     

       92
       92
        
       {{ define "repoAfter" }}

     

       93
       93
        
           {{- if or .HTMLReadme .Readme -}}

     

       94
       94
       -
               {{ template "repo/fragments/readme" . }}

     

       94
       94
       +
              {{ template "repo/fragments/readme" . }}

     

       95
       95
        
           {{- end -}}

     

       96
       96
        
       {{ end }}

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

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

···

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

     

       2
       2
        
       {{ $userIdent := resolve .UserDid }}

     

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

     

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

     

       4
       4
        
         <div class="py-4 px-6 drop-shadow-sm rounded bg-white dark:bg-gray-800 flex items-center gap-4">

     

       5
       5
        
           <div class="flex-shrink-0 max-h-full w-24 h-24">

     

       6
       6
        
             <img class="object-cover rounded-full p-2" src="{{ fullAvatar $userIdent }}" />

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

     
···

       36
       37
        
                                   placeholder="akshay.tngl.sh"

     

       37
       38
        
                               />

     

       38
       39
        
                               <span class="text-sm text-gray-500 mt-1">

     

       39
       39
       -
                                   Use your <a href="https://atproto.com">ATProto</a>

     

       40
       40
       +
                                   Use your <a href="https://atproto.com">AT Protocol</a>

     

       40
       41
        
                                   handle to log in. If you're unsure, this is likely

     

       41
       42
        
                                   your Tangled (<code>.tngl.sh</code>) or <a href="https://bsky.app">Bluesky</a> (<code>.bsky.social</code>) account.

     

       42
       43
        
                               </span>

+7 -1

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>

     

       14
       14
       +
       

     

       15
       15
       +
                   <script src="https://challenges.cloudflare.com/turnstile/v0/api.js" async defer></script>

     

       13
       16
        
               </head>

     

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

     

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

     
···

       39
       42
        
                           invite code, desired username, and password in the next

     

       40
       43
        
                           page to complete your registration.

     

       41
       44
        
                           </span>

     

       45
       45
       +
                           <div class="w-full mt-4 text-center">

     

       46
       46
       +
                             <div class="cf-turnstile" data-sitekey="{{ .CloudflareSiteKey }}"></div>

     

       47
       47
       +
                           </div>

     

       42
       48
        
                           <button class="btn text-base w-full my-2 mt-6" type="submit" id="signup-button" tabindex="7" >

     

       43
       49
        
                             <span>join now</span>

     

       44
       50
        
                           </button>

     

       45
       51
        
                       </form>

     

       46
       52
        
                       <p class="text-sm text-gray-500">

     

       47
       47
       -
                         Already have an ATProto account? <a href="/login" class="underline">Login to Tangled</a>.

     

       53
       53
       +
                         Already have an AT Protocol account? <a href="/login" class="underline">Login to Tangled</a>.

     

       48
       54
        
                       </p>

     

       49
       55
        
       

     

       50
       56
        
                       <p id="signup-msg" class="error w-full"></p>

+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

+35

appview/pulls/pulls.go

···

       200
       200
        
       		userReactions = db.GetReactionStatusMap(s.db, user.Did, pull.PullAt())

     

       201
       201
        
       	}

     

       202
       202
        
       

     

       203
       203
       +
       	labelDefs, err := db.GetLabelDefinitions(

     

       204
       204
       +
       		s.db,

     

       205
       205
       +
       		db.FilterIn("at_uri", f.Repo.Labels),

     

       206
       206
       +
       		db.FilterContains("scope", tangled.RepoPullNSID),

     

       207
       207
       +
       	)

     

       208
       208
       +
       	if err != nil {

     

       209
       209
       +
       		log.Println("failed to fetch labels", err)

     

       210
       210
       +
       		s.pages.Error503(w)

     

       211
       211
       +
       		return

     

       212
       212
       +
       	}

     

       213
       213
       +
       

     

       214
       214
       +
       	defs := make(map[string]*models.LabelDefinition)

     

       215
       215
       +
       	for _, l := range labelDefs {

     

       216
       216
       +
       		defs[l.AtUri().String()] = &l

     

       217
       217
       +
       	}

     

       218
       218
       +
       

     

       203
       219
        
       	s.pages.RepoSinglePull(w, pages.RepoSinglePullParams{

     

       204
       220
        
       		LoggedInUser:   user,

     

       205
       221
        
       		RepoInfo:       repoInfo,

     
···

       213
       229
        
       		OrderedReactionKinds: models.OrderedReactionKinds,

     

       214
       230
        
       		Reactions:            reactionCountMap,

     

       215
       231
        
       		UserReacted:          userReactions,

     

       232
       232
       +
       

     

       233
       233
       +
       		LabelDefs: defs,

     

       216
       234
        
       	})

     

       217
       235
        
       }

     

       218
       236
        
       

     
···

       557
       575
        
       		m[p.Sha] = p

     

       558
       576
        
       	}

     

       559
       577
        
       

     

       578
       578
       +
       	labelDefs, err := db.GetLabelDefinitions(

     

       579
       579
       +
       		s.db,

     

       580
       580
       +
       		db.FilterIn("at_uri", f.Repo.Labels),

     

       581
       581
       +
       		db.FilterContains("scope", tangled.RepoPullNSID),

     

       582
       582
       +
       	)

     

       583
       583
       +
       	if err != nil {

     

       584
       584
       +
       		log.Println("failed to fetch labels", err)

     

       585
       585
       +
       		s.pages.Error503(w)

     

       586
       586
       +
       		return

     

       587
       587
       +
       	}

     

       588
       588
       +
       

     

       589
       589
       +
       	defs := make(map[string]*models.LabelDefinition)

     

       590
       590
       +
       	for _, l := range labelDefs {

     

       591
       591
       +
       		defs[l.AtUri().String()] = &l

     

       592
       592
       +
       	}

     

       593
       593
       +
       

     

       560
       594
        
       	s.pages.RepoPulls(w, pages.RepoPullsParams{

     

       561
       595
        
       		LoggedInUser: s.oauth.GetUser(r),

     

       562
       596
        
       		RepoInfo:     f.RepoInfo(user),

     

       563
       597
        
       		Pulls:        pulls,

     

       598
       598
       +
       		LabelDefs:    defs,

     

       564
       599
        
       		FilteringBy:  state,

     

       565
       600
        
       		Stacks:       stacks,

     

       566
       601
        
       		Pipelines:    m,

+17 -22

appview/repo/index.go

···

       22
       22
        
       	"tangled.org/core/appview/db"

     

       23
       23
        
       	"tangled.org/core/appview/models"

     

       24
       24
        
       	"tangled.org/core/appview/pages"

     

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

     

       26
       25
        
       	"tangled.org/core/appview/reporesolver"

     

       27
       26
        
       	"tangled.org/core/appview/xrpcclient"

     

       28
       27
        
       	"tangled.org/core/types"

     
···

       201
       200
        
       			})

     

       202
       201
        
       		}

     

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

     

       204
       209
        
       		// update appview's cache

     

       205
       205
       -
       		err = db.InsertRepoLanguages(rp.db, langs)

     

       210
       210
       +
       		err = db.UpdateRepoLanguages(tx, f.RepoAt(), currentRef, langs)

     

       206
       211
        
       		if err != nil {

     

       207
       212
        
       			// non-fatal

     

       208
       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

     

       209
       219
        
       		}

     

       210
       220
        
       	}

     

       211
       221
        
       

     
···

       328
       338
        
       		}

     

       329
       339
        
       	}()

     

       330
       340
        
       

     

       331
       331
       -
       	// readme content

     

       332
       332
       -
       	wg.Add(1)

     

       333
       333
       -
       	go func() {

     

       334
       334
       -
       		defer wg.Done()

     

       335
       335
       -
       		for _, filename := range markup.ReadmeFilenames {

     

       336
       336
       -
       			blobResp, err := tangled.RepoBlob(ctx, xrpcc, filename, false, ref, repo)

     

       337
       337
       -
       			if err != nil {

     

       338
       338
       -
       				continue

     

       339
       339
       -
       			}

     

       340
       340
       -
       

     

       341
       341
       -
       			if blobResp == nil {

     

       342
       342
       -
       				continue

     

       343
       343
       -
       			}

     

       344
       344
       -
       

     

       345
       345
       -
       			readmeContent = blobResp.Content

     

       346
       346
       -
       			readmeFileName = filename

     

       347
       347
       -
       			break

     

       348
       348
       -
       		}

     

       349
       349
       -
       	}()

     

       350
       350
       -
       

     

       351
       341
        
       	wg.Wait()

     

       352
       342
        
       

     

       353
       343
        
       	if errs != nil {

     
···

       374
       364
        
       			}

     

       375
       365
        
       			files = append(files, niceFile)

     

       376
       366
        
       		}

     

       367
       367
       +
       	}

     

       368
       368
       +
       

     

       369
       369
       +
       	if treeResp != nil && treeResp.Readme != nil {

     

       370
       370
       +
       		readmeFileName = treeResp.Readme.Filename

     

       371
       371
       +
       		readmeContent = treeResp.Readme.Contents

     

       377
       372
        
       	}

     

       378
       373
        
       

     

       379
       374
        
       	result := &types.RepoIndexResponse{

+15 -31

appview/repo/repo.go

···

       449
       449
        
       		return

     

       450
       450
        
       	}

     

       451
       451
        
       

     

       452
       452
       -
       	// readme content

     

       453
       453
       -
       	var (

     

       454
       454
       -
       		readmeContent  string

     

       455
       455
       -
       		readmeFileName string

     

       456
       456
       -
       	)

     

       457
       457
       -
       

     

       458
       458
       -
       	for _, filename := range markup.ReadmeFilenames {

     

       459
       459
       -
       		path := fmt.Sprintf("%s/%s", treePath, filename)

     

       460
       460
       -
       		blobResp, err := tangled.RepoBlob(r.Context(), xrpcc, path, false, ref, repo)

     

       461
       461
       -
       		if err != nil {

     

       462
       462
       -
       			continue

     

       463
       463
       -
       		}

     

       464
       464
       -
       

     

       465
       465
       -
       		if blobResp == nil {

     

       466
       466
       -
       			continue

     

       467
       467
       -
       		}

     

       468
       468
       -
       

     

       469
       469
       -
       		readmeContent = blobResp.Content

     

       470
       470
       -
       		readmeFileName = path

     

       471
       471
       -
       		break

     

       472
       472
       -
       	}

     

       473
       473
       -
       

     

       474
       452
        
       	// Convert XRPC response to internal types.RepoTreeResponse

     

       475
       453
        
       	files := make([]types.NiceTree, len(xrpcResp.Files))

     

       476
       454
        
       	for i, xrpcFile := range xrpcResp.Files {

     
···

       506
       484
        
       	if xrpcResp.Dotdot != nil {

     

       507
       485
        
       		result.DotDot = *xrpcResp.Dotdot

     

       508
       486
        
       	}

     

       487
       487
       +
       	if xrpcResp.Readme != nil {

     

       488
       488
       +
       		result.ReadmeFileName = xrpcResp.Readme.Filename

     

       489
       489
       +
       		result.Readme = xrpcResp.Readme.Contents

     

       490
       490
       +
       	}

     

       509
       491
        
       

     

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

     

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

     
···

       532
       514
        
       		BreadCrumbs:      breadcrumbs,

     

       533
       515
        
       		TreePath:         treePath,

     

       534
       516
        
       		RepoInfo:         f.RepoInfo(user),

     

       535
       535
       -
       		Readme:           readmeContent,

     

       536
       536
       -
       		ReadmeFileName:   readmeFileName,

     

       537
       517
        
       		RepoTreeResponse: result,

     

       538
       518
        
       	})

     

       539
       519
        
       }

     
···

       2149
       2129
        
       		}

     

       2150
       2130
        
       

     

       2151
       2131
        
       		// choose a name for a fork

     

       2152
       2152
       -
       		forkName := f.Name

     

       2132
       2132
       +
       		forkName := r.FormValue("repo_name")

     

       2133
       2133
       +
       		if forkName == "" {

     

       2134
       2134
       +
       			rp.pages.Notice(w, "repo", "Repository name cannot be empty.")

     

       2135
       2135
       +
       			return

     

       2136
       2136
       +
       		}

     

       2137
       2137
       +
       

     

       2153
       2138
        
       		// this check is *only* to see if the forked repo name already exists

     

       2154
       2139
        
       		// in the user's account.

     

       2155
       2140
        
       		existingRepo, err := db.GetRepo(

     

       2156
       2141
        
       			rp.db,

     

       2157
       2142
        
       			db.FilterEq("did", user.Did),

     

       2158
       2158
       -
       			db.FilterEq("name", f.Name),

     

       2143
       2143
       +
       			db.FilterEq("name", forkName),

     

       2159
       2144
        
       		)

     

       2160
       2145
        
       		if err != nil {

     

       2161
       2161
       -
       			if errors.Is(err, sql.ErrNoRows) {

     

       2162
       2162
       -
       				// no existing repo with this name found, we can use the name as is

     

       2163
       2163
       -
       			} else {

     

       2146
       2146
       +
       			if !errors.Is(err, sql.ErrNoRows) {

     

       2164
       2147
        
       				log.Println("error fetching existing repo from db", "err", err)

     

       2165
       2148
        
       				rp.pages.Notice(w, "repo", "Failed to fork this repository. Try again later.")

     

       2166
       2149
        
       				return

     

       2167
       2150
        
       			}

     

       2168
       2151
        
       		} else if existingRepo != nil {

     

       2169
       2169
       -
       			// repo with this name already exists, append random string

     

       2170
       2170
       -
       			forkName = fmt.Sprintf("%s-%s", forkName, randomString(3))

     

       2152
       2152
       +
       			// repo with this name already exists

     

       2153
       2153
       +
       			rp.pages.Notice(w, "repo", "A repository with this name already exists.")

     

       2154
       2154
       +
       			return

     

       2171
       2155
        
       		}

     

       2172
       2156
        
       		l = l.With("forkName", forkName)

     

       2173
       2157

+65 -1

appview/signup/signup.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"bufio"

     

       5
       5
       +
       	"encoding/json"

     

       6
       6
       +
       	"errors"

     

       5
       7
        
       	"fmt"

     

       6
       8
        
       	"log/slog"

     

       7
       9
        
       	"net/http"

     

       10
       10
       +
       	"net/url"

     

       8
       11
        
       	"os"

     

       9
       12
        
       	"strings"

     

       10
       13
        
       

     
···

       116
       119
        
       func (s *Signup) signup(w http.ResponseWriter, r *http.Request) {

     

       117
       120
        
       	switch r.Method {

     

       118
       121
        
       	case http.MethodGet:

     

       119
       119
       -
       		s.pages.Signup(w)

     

       122
       122
       +
       		s.pages.Signup(w, pages.SignupParams{

     

       123
       123
       +
       			CloudflareSiteKey: s.config.Cloudflare.TurnstileSiteKey,

     

       124
       124
       +
       		})

     

       120
       125
        
       	case http.MethodPost:

     

       121
       126
        
       		if s.cf == nil {

     

       122
       127
        
       			http.Error(w, "signup is disabled", http.StatusFailedDependency)

     

       128
       128
       +
       			return

     

       123
       129
        
       		}

     

       124
       130
        
       		emailId := r.FormValue("email")

     

       131
       131
       +
       		cfToken := r.FormValue("cf-turnstile-response")

     

       125
       132
        
       

     

       126
       133
        
       		noticeId := "signup-msg"

     

       134
       134
       +
       

     

       135
       135
       +
       		if err := s.validateCaptcha(cfToken, r); err != nil {

     

       136
       136
       +
       			s.l.Warn("turnstile validation failed", "error", err, "email", emailId)

     

       137
       137
       +
       			s.pages.Notice(w, noticeId, "Captcha validation failed.")

     

       138
       138
       +
       			return

     

       139
       139
       +
       		}

     

       140
       140
       +
       

     

       127
       141
        
       		if !email.IsValidEmail(emailId) {

     

       128
       142
        
       			s.pages.Notice(w, noticeId, "Invalid email address.")

     

       129
       143
        
       			return

     
···

       255
       269
        
       		return

     

       256
       270
        
       	}

     

       257
       271
        
       }

     

       272
       272
       +
       

     

       273
       273
       +
       type turnstileResponse struct {

     

       274
       274
       +
       	Success     bool     `json:"success"`

     

       275
       275
       +
       	ErrorCodes  []string `json:"error-codes,omitempty"`

     

       276
       276
       +
       	ChallengeTs string   `json:"challenge_ts,omitempty"`

     

       277
       277
       +
       	Hostname    string   `json:"hostname,omitempty"`

     

       278
       278
       +
       }

     

       279
       279
       +
       

     

       280
       280
       +
       func (s *Signup) validateCaptcha(cfToken string, r *http.Request) error {

     

       281
       281
       +
       	if cfToken == "" {

     

       282
       282
       +
       		return errors.New("captcha token is empty")

     

       283
       283
       +
       	}

     

       284
       284
       +
       

     

       285
       285
       +
       	if s.config.Cloudflare.TurnstileSecretKey == "" {

     

       286
       286
       +
       		return errors.New("turnstile secret key not configured")

     

       287
       287
       +
       	}

     

       288
       288
       +
       

     

       289
       289
       +
       	data := url.Values{}

     

       290
       290
       +
       	data.Set("secret", s.config.Cloudflare.TurnstileSecretKey)

     

       291
       291
       +
       	data.Set("response", cfToken)

     

       292
       292
       +
       

     

       293
       293
       +
       	// include the client IP if we have it

     

       294
       294
       +
       	if remoteIP := r.Header.Get("CF-Connecting-IP"); remoteIP != "" {

     

       295
       295
       +
       		data.Set("remoteip", remoteIP)

     

       296
       296
       +
       	} else if remoteIP := r.Header.Get("X-Forwarded-For"); remoteIP != "" {

     

       297
       297
       +
       		if ips := strings.Split(remoteIP, ","); len(ips) > 0 {

     

       298
       298
       +
       			data.Set("remoteip", strings.TrimSpace(ips[0]))

     

       299
       299
       +
       		}

     

       300
       300
       +
       	} else {

     

       301
       301
       +
       		data.Set("remoteip", r.RemoteAddr)

     

       302
       302
       +
       	}

     

       303
       303
       +
       

     

       304
       304
       +
       	resp, err := http.PostForm("https://challenges.cloudflare.com/turnstile/v0/siteverify", data)

     

       305
       305
       +
       	if err != nil {

     

       306
       306
       +
       		return fmt.Errorf("failed to verify turnstile token: %w", err)

     

       307
       307
       +
       	}

     

       308
       308
       +
       	defer resp.Body.Close()

     

       309
       309
       +
       

     

       310
       310
       +
       	var turnstileResp turnstileResponse

     

       311
       311
       +
       	if err := json.NewDecoder(resp.Body).Decode(&turnstileResp); err != nil {

     

       312
       312
       +
       		return fmt.Errorf("failed to decode turnstile response: %w", err)

     

       313
       313
       +
       	}

     

       314
       314
       +
       

     

       315
       315
       +
       	if !turnstileResp.Success {

     

       316
       316
       +
       		s.l.Warn("turnstile validation failed", "error_codes", turnstileResp.ErrorCodes)

     

       317
       317
       +
       		return errors.New("turnstile validation failed")

     

       318
       318
       +
       	}

     

       319
       319
       +
       

     

       320
       320
       +
       	return nil

     

       321
       321
       +
       }

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

appview/state/router.go

···

       37
       37
        
       	router.Use(middleware.TryRefreshSession())

     

       38
       38
        
       	router.Get("/favicon.svg", s.Favicon)

     

       39
       39
        
       	router.Get("/favicon.ico", s.Favicon)

     

       40
       40
       +
       	router.Get("/pwa-manifest.json", s.PWAManifest)

     

       40
       41
        
       

     

       41
       42
        
       	userRouter := s.UserRouter(&middleware)

     

       42
       43
        
       	standardRouter := s.StandardRouter(&middleware)

     
···

       166
       167
        
       	r.Get("/keys/{user}", s.Keys)

     

       167
       168
        
       	r.Get("/terms", s.TermsOfService)

     

       168
       169
        
       	r.Get("/privacy", s.PrivacyPolicy)

     

       170
       170
       +
       	r.Get("/brand", s.Brand)

     

       169
       171
        
       

     

       170
       172
        
       	r.NotFound(func(w http.ResponseWriter, r *http.Request) {

     

       171
       173
        
       		s.pages.Error404(w)

+30

appview/state/state.go

···

       198
       198
        
       	s.pages.Favicon(w)

     

       199
       199
        
       }

     

       200
       200
        
       

     

       201
       201
       +
       // https://developer.mozilla.org/en-US/docs/Web/Progressive_web_apps/Manifest

     

       202
       202
       +
       const manifestJson = `{

     

       203
       203
       +
         "name": "tangled",

     

       204
       204
       +
         "description": "tightly-knit social coding.",

     

       205
       205
       +
         "icons": [

     

       206
       206
       +
           {

     

       207
       207
       +
             "src": "/favicon.svg",

     

       208
       208
       +
             "sizes": "144x144"

     

       209
       209
       +
           }

     

       210
       210
       +
         ],

     

       211
       211
       +
         "start_url": "/",

     

       212
       212
       +
         "id": "org.tangled",

     

       213
       213
       +
       

     

       214
       214
       +
         "display": "standalone",

     

       215
       215
       +
         "background_color": "#111827",

     

       216
       216
       +
         "theme_color": "#111827"

     

       217
       217
       +
       }`

     

       218
       218
       +
       

     

       219
       219
       +
       func (p *State) PWAManifest(w http.ResponseWriter, r *http.Request) {

     

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

     

       221
       221
       +
       	w.Write([]byte(manifestJson))

     

       222
       222
       +
       }

     

       223
       223
       +
       

     

       201
       224
        
       func (s *State) TermsOfService(w http.ResponseWriter, r *http.Request) {

     

       202
       225
        
       	user := s.oauth.GetUser(r)

     

       203
       226
        
       	s.pages.TermsOfService(w, pages.TermsOfServiceParams{

     
···

       208
       231
        
       func (s *State) PrivacyPolicy(w http.ResponseWriter, r *http.Request) {

     

       209
       232
        
       	user := s.oauth.GetUser(r)

     

       210
       233
        
       	s.pages.PrivacyPolicy(w, pages.PrivacyPolicyParams{

     

       234
       234
       +
       		LoggedInUser: user,

     

       235
       235
       +
       	})

     

       236
       236
       +
       }

     

       237
       237
       +
       

     

       238
       238
       +
       func (s *State) Brand(w http.ResponseWriter, r *http.Request) {

     

       239
       239
       +
       	user := s.oauth.GetUser(r)

     

       240
       240
       +
       	s.pages.Brand(w, pages.BrandParams{

     

       211
       241
        
       		LoggedInUser: user,

     

       212
       242
        
       	})

     

       213
       243
        
       }

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

+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) {

+1 -3

knotserver/git/tag.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"fmt"

     

       5
       5
       -
       	"slices"

     

       6
       5
        
       	"strconv"

     

       7
       6
        
       	"strings"

     

       8
       7
        
       	"time"

     
···

       35
       34
        
       	outFormat.WriteString("")

     

       36
       35
        
       	outFormat.WriteString(recordSeparator)

     

       37
       36
        
       

     

       38
       38
       -
       	output, err := g.forEachRef(outFormat.String(), "refs/tags")

     

       37
       37
       +
       	output, err := g.forEachRef(outFormat.String(), "--sort=-creatordate", "refs/tags")

     

       39
       38
        
       	if err != nil {

     

       40
       39
        
       		return nil, fmt.Errorf("failed to get tags: %w", err)

     

       41
       40
        
       	}

     
···

       94
       93
        
       		tags = append(tags, tag)

     

       95
       94
        
       	}

     

       96
       95
        
       

     

       97
       97
       -
       	slices.Reverse(tags)

     

       98
       96
        
       	return tags, nil

     

       99
       97
        
       }

+1 -1

knotserver/xrpc/repo_blob.go

···

       44
       44
        
       

     

       45
       45
        
       	contents, err := gr.RawContent(treePath)

     

       46
       46
        
       	if err != nil {

     

       47
       47
       -
       		x.Logger.Error("file content", "error", err.Error())

     

       47
       47
       +
       		x.Logger.Error("file content", "error", err.Error(), "treePath", treePath)

     

       48
       48
        
       		writeError(w, xrpcerr.NewXrpcError(

     

       49
       49
        
       			xrpcerr.WithTag("FileNotFound"),

     

       50
       50
        
       			xrpcerr.WithMessage("file not found at the specified path"),

+24

knotserver/xrpc/repo_tree.go

···

       4
       4
        
       	"net/http"

     

       5
       5
        
       	"path/filepath"

     

       6
       6
        
       	"time"

     

       7
       7
       +
       	"unicode/utf8"

     

       7
       8
        
       

     

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

     

       10
       10
       +
       	"tangled.org/core/appview/pages/markup"

     

       9
       11
        
       	"tangled.org/core/knotserver/git"

     

       10
       12
        
       	xrpcerr "tangled.org/core/xrpc/errors"

     

       11
       13
        
       )

     
···

       43
       45
        
       		return

     

       44
       46
        
       	}

     

       45
       47
        
       

     

       48
       48
       +
       	// if any of these files are a readme candidate, pass along its blob contents too

     

       49
       49
       +
       	var readmeFileName string

     

       50
       50
       +
       	var readmeContents string

     

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

     

       52
       52
       +
       		if markup.IsReadmeFile(file.Name) {

     

       53
       53
       +
       			contents, err := gr.RawContent(filepath.Join(path, file.Name))

     

       54
       54
       +
       			if err != nil {

     

       55
       55
       +
       				x.Logger.Error("failed to read contents of file", "path", path, "file", file.Name)

     

       56
       56
       +
       			}

     

       57
       57
       +
       

     

       58
       58
       +
       			if utf8.Valid(contents) {

     

       59
       59
       +
       				readmeFileName = file.Name

     

       60
       60
       +
       				readmeContents = string(contents)

     

       61
       61
       +
       				break

     

       62
       62
       +
       			}

     

       63
       63
       +
       		}

     

       64
       64
       +
       	}

     

       65
       65
       +
       

     

       46
       66
        
       	// convert NiceTree -> tangled.RepoTree_TreeEntry

     

       47
       67
        
       	treeEntries := make([]*tangled.RepoTree_TreeEntry, len(files))

     

       48
       68
        
       	for i, file := range files {

     
···

       83
       103
        
       		Parent: parentPtr,

     

       84
       104
        
       		Dotdot: dotdotPtr,

     

       85
       105
        
       		Files:  treeEntries,

     

       106
       106
       +
       		Readme: &tangled.RepoTree_Readme{

     

       107
       107
       +
       			Filename: readmeFileName,

     

       108
       108
       +
       			Contents: readmeContents,

     

       109
       109
       +
       		},

     

       86
       110
        
       	}

     

       87
       111
        
       

     

       88
       112
        
       	writeJson(w, response)

-158

legal/privacy.md

···

       1
       1
       -
       # Privacy Policy

     

       2
       2
       -
       

     

       3
       3
       -
       **Last updated:** January 15, 2025

     

       4
       4
       -
       

     

       5
       5
       -
       This Privacy Policy describes how Tangled ("we," "us," or "our")

     

       6
       6
       -
       collects, uses, and shares your personal information when you use our

     

       7
       7
       -
       platform and services (the "Service").

     

       8
       8
       -
       

     

       9
       9
       -
       ## 1. Information We Collect

     

       10
       10
       -
       

     

       11
       11
       -
       ### Account Information

     

       12
       12
       -
       

     

       13
       13
       -
       When you create an account, we collect:

     

       14
       14
       -
       

     

       15
       15
       -
       - Your chosen username

     

       16
       16
       -
       - Email address

     

       17
       17
       -
       - Profile information you choose to provide

     

       18
       18
       -
       - Authentication data

     

       19
       19
       -
       

     

       20
       20
       -
       ### Content and Activity

     

       21
       21
       -
       

     

       22
       22
       -
       We store:

     

       23
       23
       -
       

     

       24
       24
       -
       - Code repositories and associated metadata

     

       25
       25
       -
       - Issues, pull requests, and comments

     

       26
       26
       -
       - Activity logs and usage patterns

     

       27
       27
       -
       - Public keys for authentication

     

       28
       28
       -
       

     

       29
       29
       -
       ## 2. Data Location and Hosting

     

       30
       30
       -
       

     

       31
       31
       -
       ### EU Data Hosting

     

       32
       32
       -
       

     

       33
       33
       -
       **All Tangled service data is hosted within the European Union.**

     

       34
       34
       -
       Specifically:

     

       35
       35
       -
       

     

       36
       36
       -
       - **Personal Data Servers (PDS):** Accounts hosted on Tangled PDS

     

       37
       37
       -
         (*.tngl.sh) are located in Finland

     

       38
       38
       -
       - **Application Data:** All other service data is stored on EU-based

     

       39
       39
       -
         servers

     

       40
       40
       -
       - **Data Processing:** All data processing occurs within EU

     

       41
       41
       -
         jurisdiction

     

       42
       42
       -
       

     

       43
       43
       -
       ### External PDS Notice

     

       44
       44
       -
       

     

       45
       45
       -
       **Important:** If your account is hosted on Bluesky's PDS or other

     

       46
       46
       -
       self-hosted Personal Data Servers (not *.tngl.sh), we do not control

     

       47
       47
       -
       that data. The data protection, storage location, and privacy

     

       48
       48
       -
       practices for such accounts are governed by the respective PDS

     

       49
       49
       -
       provider's policies, not this Privacy Policy. We only control data

     

       50
       50
       -
       processing within our own services and infrastructure.

     

       51
       51
       -
       

     

       52
       52
       -
       ## 3. Third-Party Data Processors

     

       53
       53
       -
       

     

       54
       54
       -
       We only share your data with the following third-party processors:

     

       55
       55
       -
       

     

       56
       56
       -
       ### Resend (Email Services)

     

       57
       57
       -
       

     

       58
       58
       -
       - **Purpose:** Sending transactional emails (account verification,

     

       59
       59
       -
         notifications)

     

       60
       60
       -
       - **Data Shared:** Email address and necessary message content

     

       61
       61
       -
       

     

       62
       62
       -
       ### Cloudflare (Image Caching)

     

       63
       63
       -
       

     

       64
       64
       -
       - **Purpose:** Caching and optimizing image delivery

     

       65
       65
       -
       - **Data Shared:** Public images and associated metadata for caching

     

       66
       66
       -
         purposes

     

       67
       67
       -
       

     

       68
       68
       -
       ### Posthog (Usage Metrics Tracking)

     

       69
       69
       -
       

     

       70
       70
       -
       - **Purpose:** Tracking usage and platform metrics

     

       71
       71
       -
       - **Data Shared:** Anonymous usage data, IP addresses, DIDs, and browser

     

       72
       72
       -
         information

     

       73
       73
       -
       

     

       74
       74
       -
       ## 4. How We Use Your Information

     

       75
       75
       -
       

     

       76
       76
       -
       We use your information to:

     

       77
       77
       -
       

     

       78
       78
       -
       - Provide and maintain the Service

     

       79
       79
       -
       - Process your transactions and requests

     

       80
       80
       -
       - Send you technical notices and support messages

     

       81
       81
       -
       - Improve and develop new features

     

       82
       82
       -
       - Ensure security and prevent fraud

     

       83
       83
       -
       - Comply with legal obligations

     

       84
       84
       -
       

     

       85
       85
       -
       ## 5. Data Sharing and Disclosure

     

       86
       86
       -
       

     

       87
       87
       -
       We do not sell, trade, or rent your personal information. We may share

     

       88
       88
       -
       your information only in the following circumstances:

     

       89
       89
       -
       

     

       90
       90
       -
       - With the third-party processors listed above

     

       91
       91
       -
       - When required by law or legal process

     

       92
       92
       -
       - To protect our rights, property, or safety, or that of our users

     

       93
       93
       -
       - In connection with a merger, acquisition, or sale of assets (with

     

       94
       94
       -
         appropriate protections)

     

       95
       95
       -
       

     

       96
       96
       -
       ## 6. Data Security

     

       97
       97
       -
       

     

       98
       98
       -
       We implement appropriate technical and organizational measures to

     

       99
       99
       -
       protect your personal information against unauthorized access,

     

       100
       100
       -
       alteration, disclosure, or destruction. However, no method of

     

       101
       101
       -
       transmission over the Internet is 100% secure.

     

       102
       102
       -
       

     

       103
       103
       -
       ## 7. Data Retention

     

       104
       104
       -
       

     

       105
       105
       -
       We retain your personal information for as long as necessary to provide

     

       106
       106
       -
       the Service and fulfill the purposes outlined in this Privacy Policy,

     

       107
       107
       -
       unless a longer retention period is required by law.

     

       108
       108
       -
       

     

       109
       109
       -
       ## 8. Your Rights

     

       110
       110
       -
       

     

       111
       111
       -
       Under applicable data protection laws, you have the right to:

     

       112
       112
       -
       

     

       113
       113
       -
       - Access your personal information

     

       114
       114
       -
       - Correct inaccurate information

     

       115
       115
       -
       - Request deletion of your information

     

       116
       116
       -
       - Object to processing of your information

     

       117
       117
       -
       - Data portability

     

       118
       118
       -
       - Withdraw consent (where applicable)

     

       119
       119
       -
       

     

       120
       120
       -
       ## 9. Cookies and Tracking

     

       121
       121
       -
       

     

       122
       122
       -
       We use cookies and similar technologies to:

     

       123
       123
       -
       

     

       124
       124
       -
       - Maintain your login session

     

       125
       125
       -
       - Remember your preferences

     

       126
       126
       -
       - Analyze usage patterns to improve the Service

     

       127
       127
       -
       

     

       128
       128
       -
       You can control cookie settings through your browser preferences.

     

       129
       129
       -
       

     

       130
       130
       -
       ## 10. Children's Privacy

     

       131
       131
       -
       

     

       132
       132
       -
       The Service is not intended for children under 16 years of age. We do

     

       133
       133
       -
       not knowingly collect personal information from children under 16. If

     

       134
       134
       -
       we become aware that we have collected such information, we will take

     

       135
       135
       -
       steps to delete it.

     

       136
       136
       -
       

     

       137
       137
       -
       ## 11. International Data Transfers

     

       138
       138
       -
       

     

       139
       139
       -
       While all our primary data processing occurs within the EU, some of our

     

       140
       140
       -
       third-party processors may process data outside the EU. When this

     

       141
       141
       -
       occurs, we ensure appropriate safeguards are in place, such as Standard

     

       142
       142
       -
       Contractual Clauses or adequacy decisions.

     

       143
       143
       -
       

     

       144
       144
       -
       ## 12. Changes to This Privacy Policy

     

       145
       145
       -
       

     

       146
       146
       -
       We may update this Privacy Policy from time to time. We will notify you

     

       147
       147
       -
       of any changes by posting the new Privacy Policy on this page and

     

       148
       148
       -
       updating the "Last updated" date.

     

       149
       149
       -
       

     

       150
       150
       -
       ## 13. Contact Information

     

       151
       151
       -
       

     

       152
       152
       -
       If you have any questions about this Privacy Policy or wish to exercise

     

       153
       153
       -
       your rights, please contact us through our platform or via email.

     

       154
       154
       -
       

     

       155
       155
       -
       ---

     

       156
       156
       -
       

     

       157
       157
       -
       This Privacy Policy complies with the EU General Data Protection

     

       158
       158
       -
       Regulation (GDPR) and other applicable data protection laws.

-109

legal/terms.md

···

       1
       1
       -
       # Terms of Service

     

       2
       2
       -
       

     

       3
       3
       -
       **Last updated:** January 15, 2025

     

       4
       4
       -
       

     

       5
       5
       -
       Welcome to Tangled. These Terms of Service ("Terms") govern your access

     

       6
       6
       -
       to and use of the Tangled platform and services (the "Service")

     

       7
       7
       -
       operated by us ("Tangled," "we," "us," or "our").

     

       8
       8
       -
       

     

       9
       9
       -
       ## 1. Acceptance of Terms

     

       10
       10
       -
       

     

       11
       11
       -
       By accessing or using our Service, you agree to be bound by these Terms.

     

       12
       12
       -
       If you disagree with any part of these terms, then you may not access

     

       13
       13
       -
       the Service.

     

       14
       14
       -
       

     

       15
       15
       -
       ## 2. Account Registration

     

       16
       16
       -
       

     

       17
       17
       -
       To use certain features of the Service, you must register for an

     

       18
       18
       -
       account. You agree to provide accurate, current, and complete

     

       19
       19
       -
       information during the registration process and to update such

     

       20
       20
       -
       information to keep it accurate, current, and complete.

     

       21
       21
       -
       

     

       22
       22
       -
       ## 3. Account Termination

     

       23
       23
       -
       

     

       24
       24
       -
       > **Important Notice**

     

       25
       25
       -
       > 

     

       26
       26
       -
       > **We reserve the right to terminate, suspend, or restrict access to

     

       27
       27
       -
       > your account at any time, for any reason, or for no reason at all, at

     

       28
       28
       -
       > our sole discretion.** This includes, but is not limited to,

     

       29
       29
       -
       > termination for violation of these Terms, inappropriate conduct, spam,

     

       30
       30
       -
       > abuse, or any other behavior we deem harmful to the Service or other

     

       31
       31
       -
       > users.

     

       32
       32
       -
       > 

     

       33
       33
       -
       > Account termination may result in the loss of access to your

     

       34
       34
       -
       > repositories, data, and other content associated with your account. We

     

       35
       35
       -
       > are not obligated to provide advance notice of termination, though we

     

       36
       36
       -
       > may do so in our discretion.

     

       37
       37
       -
       

     

       38
       38
       -
       ## 4. Acceptable Use

     

       39
       39
       -
       

     

       40
       40
       -
       You agree not to use the Service to:

     

       41
       41
       -
       

     

       42
       42
       -
       - Violate any applicable laws or regulations

     

       43
       43
       -
       - Infringe upon the rights of others

     

       44
       44
       -
       - Upload, store, or share content that is illegal, harmful, threatening,

     

       45
       45
       -
         abusive, harassing, defamatory, vulgar, obscene, or otherwise

     

       46
       46
       -
         objectionable

     

       47
       47
       -
       - Engage in spam, phishing, or other deceptive practices

     

       48
       48
       -
       - Attempt to gain unauthorized access to the Service or other users'

     

       49
       49
       -
         accounts

     

       50
       50
       -
       - Interfere with or disrupt the Service or servers connected to the

     

       51
       51
       -
         Service

     

       52
       52
       -
       

     

       53
       53
       -
       ## 5. Content and Intellectual Property

     

       54
       54
       -
       

     

       55
       55
       -
       You retain ownership of the content you upload to the Service. By

     

       56
       56
       -
       uploading content, you grant us a non-exclusive, worldwide, royalty-free

     

       57
       57
       -
       license to use, reproduce, modify, and distribute your content as

     

       58
       58
       -
       necessary to provide the Service.

     

       59
       59
       -
       

     

       60
       60
       -
       ## 6. Privacy

     

       61
       61
       -
       

     

       62
       62
       -
       Your privacy is important to us. Please review our [Privacy

     

       63
       63
       -
       Policy](/privacy), which also governs your use of the Service.

     

       64
       64
       -
       

     

       65
       65
       -
       ## 7. Disclaimers

     

       66
       66
       -
       

     

       67
       67
       -
       The Service is provided on an "AS IS" and "AS AVAILABLE" basis. We make

     

       68
       68
       -
       no warranties, expressed or implied, and hereby disclaim and negate all

     

       69
       69
       -
       other warranties including without limitation, implied warranties or

     

       70
       70
       -
       conditions of merchantability, fitness for a particular purpose, or

     

       71
       71
       -
       non-infringement of intellectual property or other violation of rights.

     

       72
       72
       -
       

     

       73
       73
       -
       ## 8. Limitation of Liability

     

       74
       74
       -
       

     

       75
       75
       -
       In no event shall Tangled, nor its directors, employees, partners,

     

       76
       76
       -
       agents, suppliers, or affiliates, be liable for any indirect,

     

       77
       77
       -
       incidental, special, consequential, or punitive damages, including

     

       78
       78
       -
       without limitation, loss of profits, data, use, goodwill, or other

     

       79
       79
       -
       intangible losses, resulting from your use of the Service.

     

       80
       80
       -
       

     

       81
       81
       -
       ## 9. Indemnification

     

       82
       82
       -
       

     

       83
       83
       -
       You agree to defend, indemnify, and hold harmless Tangled and its

     

       84
       84
       -
       affiliates, officers, directors, employees, and agents from and against

     

       85
       85
       -
       any and all claims, damages, obligations, losses, liabilities, costs,

     

       86
       86
       -
       or debt, and expenses (including attorney's fees).

     

       87
       87
       -
       

     

       88
       88
       -
       ## 10. Governing Law

     

       89
       89
       -
       

     

       90
       90
       -
       These Terms shall be interpreted and governed by the laws of Finland,

     

       91
       91
       -
       without regard to its conflict of law provisions.

     

       92
       92
       -
       

     

       93
       93
       -
       ## 11. Changes to Terms

     

       94
       94
       -
       

     

       95
       95
       -
       We reserve the right to modify or replace these Terms at any time. If a

     

       96
       96
       -
       revision is material, we will try to provide at least 30 days notice

     

       97
       97
       -
       prior to any new terms taking effect.

     

       98
       98
       -
       

     

       99
       99
       -
       ## 12. Contact Information

     

       100
       100
       -
       

     

       101
       101
       -
       If you have any questions about these Terms of Service, please contact

     

       102
       102
       -
       us through our platform or via email.

     

       103
       103
       -
       

     

       104
       104
       -
       ---

     

       105
       105
       -
       

     

       106
       106
       -
       These terms are effective as of the last updated date shown above and

     

       107
       107
       -
       will remain in effect except with respect to any changes in their

     

       108
       108
       -
       provisions in the future, which will be in effect immediately after

     

       109
       109
       -
       being posted on this page.

+19

lexicons/repo/tree.json

···

       41
       41
        
                     "type": "string",

     

       42
       42
        
                     "description": "Parent directory path"

     

       43
       43
        
                   },

     

       44
       44
       +
                   "readme": {

     

       45
       45
       +
                     "type": "ref",

     

       46
       46
       +
                     "ref": "#readme",

     

       47
       47
       +
                     "description": "Readme for this file tree"

     

       48
       48
       +
                   },

     

       44
       49
        
                   "files": {

     

       45
       50
        
                     "type": "array",

     

       46
       51
        
                     "items": {

     
···

       69
       74
        
                 "description": "Invalid request parameters"

     

       70
       75
        
               }

     

       71
       76
        
             ]

     

       77
       77
       +
           },

     

       78
       78
       +
           "readme": {

     

       79
       79
       +
             "type": "object",

     

       80
       80
       +
             "required": ["filename", "contents"],

     

       81
       81
       +
             "properties": {

     

       82
       82
       +
               "filename": {

     

       83
       83
       +
                 "type": "string",

     

       84
       84
       +
                 "description": "Name of the readme file"

     

       85
       85
       +
               },

     

       86
       86
       +
               "contents": {

     

       87
       87
       +
                 "type": "string",

     

       88
       88
       +
                 "description": "Contents of the readme file"

     

       89
       89
       +
               }

     

       90
       90
       +
             }

     

       72
       91
        
           },

     

       73
       92
        
           "treeEntry": {

     

       74
       93
        
             "type": "object",

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

+7 -5

types/repo.go

···

       41
       41
        
       }

     

       42
       42
        
       

     

       43
       43
        
       type RepoTreeResponse struct {

     

       44
       44
       -
       	Ref         string     `json:"ref,omitempty"`

     

       45
       45
       -
       	Parent      string     `json:"parent,omitempty"`

     

       46
       46
       -
       	Description string     `json:"description,omitempty"`

     

       47
       47
       -
       	DotDot      string     `json:"dotdot,omitempty"`

     

       48
       48
       -
       	Files       []NiceTree `json:"files,omitempty"`

     

       44
       44
       +
       	Ref            string     `json:"ref,omitempty"`

     

       45
       45
       +
       	Parent         string     `json:"parent,omitempty"`

     

       46
       46
       +
       	Description    string     `json:"description,omitempty"`

     

       47
       47
       +
       	DotDot         string     `json:"dotdot,omitempty"`

     

       48
       48
       +
       	Files          []NiceTree `json:"files,omitempty"`

     

       49
       49
       +
       	ReadmeFileName string     `json:"readme_filename,omitempty"`

     

       50
       50
       +
       	Readme         string     `json:"readme_contents,omitempty"`

     

       49
       51
        
       }

     

       50
       52
        
       

     

       51
       53
        
       type TagReference struct {

Compare changes