comparing b2d8a54abc3db4261fa7ca5aecffcce8bbeb67cd and master on nel.pet/core

appview/models/repo.go

···

       10
       10
        
       )

     

       11
       11
        
       

     

       12
       12
        
       type Repo struct {

     

       13
       13
       +
       	Id          int64

     

       13
       14
        
       	Did         string

     

       14
       15
        
       	Name        string

     

       15
       16
        
       	Knot        string

+58 -3

appview/posthog/notifier.go appview/notify/posthog/notifier.go

···

       1
       1
       -
       package posthog_service

     

       1
       1
       +
       package posthog

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     
···

       98
       98
        
       	}

     

       99
       99
        
       }

     

       100
       100
        
       

     

       101
       101
       +
       func (n *posthogNotifier) NewPullClosed(ctx context.Context, pull *models.Pull) {

     

       102
       102
       +
       	err := n.client.Enqueue(posthog.Capture{

     

       103
       103
       +
       		DistinctId: pull.OwnerDid,

     

       104
       104
       +
       		Event:      "pull_closed",

     

       105
       105
       +
       		Properties: posthog.Properties{

     

       106
       106
       +
       			"repo_at": pull.RepoAt,

     

       107
       107
       +
       			"pull_id": pull.PullId,

     

       108
       108
       +
       		},

     

       109
       109
       +
       	})

     

       110
       110
       +
       	if err != nil {

     

       111
       111
       +
       		log.Println("failed to enqueue posthog event:", err)

     

       112
       112
       +
       	}

     

       113
       113
       +
       }

     

       114
       114
       +
       

     

       101
       115
        
       func (n *posthogNotifier) NewFollow(ctx context.Context, follow *models.Follow) {

     

       102
       116
        
       	err := n.client.Enqueue(posthog.Capture{

     

       103
       117
        
       		DistinctId: follow.UserDid,

     
···

       152
       166
        
       	}

     

       153
       167
        
       }

     

       154
       168
        
       

     

       155
       155
       -
       func (n *posthogNotifier) CreateString(ctx context.Context, string models.String) {

     

       169
       169
       +
       func (n *posthogNotifier) NewString(ctx context.Context, string *models.String) {

     

       156
       170
        
       	err := n.client.Enqueue(posthog.Capture{

     

       157
       171
        
       		DistinctId: string.Did.String(),

     

       158
       158
       -
       		Event:      "create_string",

     

       172
       172
       +
       		Event:      "new_string",

     

       159
       173
        
       		Properties: posthog.Properties{"rkey": string.Rkey},

     

       160
       174
        
       	})

     

       161
       175
        
       	if err != nil {

     

       162
       176
        
       		log.Println("failed to enqueue posthog event:", err)

     

       163
       177
        
       	}

     

       164
       178
        
       }

     

       179
       179
       +
       

     

       180
       180
       +
       func (n *posthogNotifier) NewIssueComment(ctx context.Context, comment *models.IssueComment) {

     

       181
       181
       +
       	err := n.client.Enqueue(posthog.Capture{

     

       182
       182
       +
       		DistinctId: comment.Did,

     

       183
       183
       +
       		Event:      "new_issue_comment",

     

       184
       184
       +
       		Properties: posthog.Properties{

     

       185
       185
       +
       			"issue_at": comment.IssueAt,

     

       186
       186
       +
       		},

     

       187
       187
       +
       	})

     

       188
       188
       +
       	if err != nil {

     

       189
       189
       +
       		log.Println("failed to enqueue posthog event:", err)

     

       190
       190
       +
       	}

     

       191
       191
       +
       }

     

       192
       192
       +
       

     

       193
       193
       +
       func (n *posthogNotifier) NewIssueClosed(ctx context.Context, issue *models.Issue) {

     

       194
       194
       +
       	err := n.client.Enqueue(posthog.Capture{

     

       195
       195
       +
       		DistinctId: issue.Did,

     

       196
       196
       +
       		Event:      "issue_closed",

     

       197
       197
       +
       		Properties: posthog.Properties{

     

       198
       198
       +
       			"repo_at":  issue.RepoAt.String(),

     

       199
       199
       +
       			"issue_id": issue.IssueId,

     

       200
       200
       +
       		},

     

       201
       201
       +
       	})

     

       202
       202
       +
       	if err != nil {

     

       203
       203
       +
       		log.Println("failed to enqueue posthog event:", err)

     

       204
       204
       +
       	}

     

       205
       205
       +
       }

     

       206
       206
       +
       

     

       207
       207
       +
       func (n *posthogNotifier) NewPullMerged(ctx context.Context, pull *models.Pull) {

     

       208
       208
       +
       	err := n.client.Enqueue(posthog.Capture{

     

       209
       209
       +
       		DistinctId: pull.OwnerDid,

     

       210
       210
       +
       		Event:      "pull_merged",

     

       211
       211
       +
       		Properties: posthog.Properties{

     

       212
       212
       +
       			"repo_at": pull.RepoAt,

     

       213
       213
       +
       			"pull_id": pull.PullId,

     

       214
       214
       +
       		},

     

       215
       215
       +
       	})

     

       216
       216
       +
       	if err != nil {

     

       217
       217
       +
       		log.Println("failed to enqueue posthog event:", err)

     

       218
       218
       +
       	}

     

       219
       219
       +
       }

+36 -6

appview/db/repos.go

···

       10
       10
        
       	"time"

     

       11
       11
        
       

     

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

     

       13
       13
       +
       	securejoin "github.com/cyphar/filepath-securejoin"

     

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

     

       13
       15
        
       	"tangled.org/core/appview/models"

     

       14
       16
        
       )

     

       15
       17
        
       

     

       18
       18
       +
       type Repo struct {

     

       19
       19
       +
       	Id          int64

     

       20
       20
       +
       	Did         string

     

       21
       21
       +
       	Name        string

     

       22
       22
       +
       	Knot        string

     

       23
       23
       +
       	Rkey        string

     

       24
       24
       +
       	Created     time.Time

     

       25
       25
       +
       	Description string

     

       26
       26
       +
       	Spindle     string

     

       27
       27
       +
       

     

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

     

       29
       29
       +
       	RepoStats *models.RepoStats

     

       30
       30
       +
       

     

       31
       31
       +
       	// optional

     

       32
       32
       +
       	Source string

     

       33
       33
       +
       }

     

       34
       34
       +
       

     

       35
       35
       +
       func (r Repo) RepoAt() syntax.ATURI {

     

       36
       36
       +
       	return syntax.ATURI(fmt.Sprintf("at://%s/%s/%s", r.Did, tangled.RepoNSID, r.Rkey))

     

       37
       37
       +
       }

     

       38
       38
       +
       

     

       39
       39
       +
       func (r Repo) DidSlashRepo() string {

     

       40
       40
       +
       	p, _ := securejoin.SecureJoin(r.Did, r.Name)

     

       41
       41
       +
       	return p

     

       42
       42
       +
       }

     

       43
       43
       +
       

     

       16
       44
        
       func GetRepos(e Execer, limit int, filters ...filter) ([]models.Repo, error) {

     

       17
       45
        
       	repoMap := make(map[syntax.ATURI]*models.Repo)

     

       18
       46
        
       

     
···

       35
       63
        
       

     

       36
       64
        
       	repoQuery := fmt.Sprintf(

     

       37
       65
        
       		`select

     

       66
       66
       +
       			id,

     

       38
       67
        
       			did,

     

       39
       68
        
       			name,

     

       40
       69
        
       			knot,

     
···

       63
       92
        
       		var description, source, spindle sql.NullString

     

       64
       93
        
       

     

       65
       94
        
       		err := rows.Scan(

     

       95
       95
       +
       			&repo.Id,

     

       66
       96
        
       			&repo.Did,

     

       67
       97
        
       			&repo.Name,

     

       68
       98
        
       			&repo.Knot,

     
···

       327
       357
        
       	var repo models.Repo

     

       328
       358
        
       	var nullableDescription sql.NullString

     

       329
       359
        
       

     

       330
       330
       -
       	row := e.QueryRow(`select did, name, knot, created, rkey, description from repos where at_uri = ?`, atUri)

     

       360
       360
       +
       	row := e.QueryRow(`select id, did, name, knot, created, rkey, description from repos where at_uri = ?`, atUri)

     

       331
       361
        
       

     

       332
       362
        
       	var createdAt string

     

       333
       333
       -
       	if err := row.Scan(&repo.Did, &repo.Name, &repo.Knot, &createdAt, &repo.Rkey, &nullableDescription); err != nil {

     

       363
       363
       +
       	if err := row.Scan(&repo.Id, &repo.Did, &repo.Name, &repo.Knot, &createdAt, &repo.Rkey, &nullableDescription); err != nil {

     

       334
       364
        
       		return nil, err

     

       335
       365
        
       	}

     

       336
       366
        
       	createdAtTime, _ := time.Parse(time.RFC3339, createdAt)

     
···

       386
       416
        
       	var repos []models.Repo

     

       387
       417
        
       

     

       388
       418
        
       	rows, err := e.Query(

     

       389
       389
       -
       		`select distinct r.did, r.name, r.knot, r.rkey, r.description, r.created, r.source

     

       419
       419
       +
       		`select distinct r.id, r.did, r.name, r.knot, r.rkey, r.description, r.created, r.source

     

       390
       420
        
       		from repos r

     

       391
       421
        
       		left join collaborators c on r.at_uri = c.repo_at

     

       392
       422
        
       		where (r.did = ? or c.subject_did = ?)

     
···

       406
       436
        
       		var nullableDescription sql.NullString

     

       407
       437
        
       		var nullableSource sql.NullString

     

       408
       438
        
       

     

       409
       409
       -
       		err := rows.Scan(&repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &nullableDescription, &createdAt, &nullableSource)

     

       439
       439
       +
       		err := rows.Scan(&repo.Id, &repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &nullableDescription, &createdAt, &nullableSource)

     

       410
       440
        
       		if err != nil {

     

       411
       441
        
       			return nil, err

     

       412
       442
        
       		}

     
···

       443
       473
        
       	var nullableSource sql.NullString

     

       444
       474
        
       

     

       445
       475
        
       	row := e.QueryRow(

     

       446
       446
       -
       		`select did, name, knot, rkey, description, created, source

     

       476
       476
       +
       		`select id, did, name, knot, rkey, description, created, source

     

       447
       477
        
       		from repos

     

       448
       478
        
       		where did = ? and name = ? and source is not null and source != ''`,

     

       449
       479
        
       		did, name,

     

       450
       480
        
       	)

     

       451
       481
        
       

     

       452
       452
       -
       	err := row.Scan(&repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &nullableDescription, &createdAt, &nullableSource)

     

       482
       482
       +
       	err := row.Scan(&repo.Id, &repo.Did, &repo.Name, &repo.Knot, &repo.Rkey, &nullableDescription, &createdAt, &nullableSource)

     

       453
       483
        
       	if err != nil {

     

       454
       484
        
       		return nil, err

     

       455
       485
        
       	}

+51

appview/settings/settings.go

···

       41
       41
        
       		{"Name": "profile", "Icon": "user"},

     

       42
       42
        
       		{"Name": "keys", "Icon": "key"},

     

       43
       43
        
       		{"Name": "emails", "Icon": "mail"},

     

       44
       44
       +
       		{"Name": "notifications", "Icon": "bell"},

     

       44
       45
        
       	}

     

       45
       46
        
       )

     

       46
       47
        
       

     
···

       68
       69
        
       		r.Post("/primary", s.emailsPrimary)

     

       69
       70
        
       	})

     

       70
       71
        
       

     

       72
       72
       +
       	r.Route("/notifications", func(r chi.Router) {

     

       73
       73
       +
       		r.Get("/", s.notificationsSettings)

     

       74
       74
       +
       		r.Put("/", s.updateNotificationPreferences)

     

       75
       75
       +
       	})

     

       76
       76
       +
       

     

       71
       77
        
       	return r

     

       72
       78
        
       }

     

       73
       79
        
       

     
···

       81
       87
        
       	})

     

       82
       88
        
       }

     

       83
       89
        
       

     

       90
       90
       +
       func (s *Settings) notificationsSettings(w http.ResponseWriter, r *http.Request) {

     

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

     

       92
       92
       +
       	did := s.OAuth.GetDid(r)

     

       93
       93
       +
       

     

       94
       94
       +
       	prefs, err := s.Db.GetNotificationPreferences(r.Context(), did)

     

       95
       95
       +
       	if err != nil {

     

       96
       96
       +
       		log.Printf("failed to get notification preferences: %s", err)

     

       97
       97
       +
       		s.Pages.Notice(w, "settings-notifications-error", "Unable to load notification preferences.")

     

       98
       98
       +
       		return

     

       99
       99
       +
       	}

     

       100
       100
       +
       

     

       101
       101
       +
       	s.Pages.UserNotificationSettings(w, pages.UserNotificationSettingsParams{

     

       102
       102
       +
       		LoggedInUser: user,

     

       103
       103
       +
       		Preferences:  prefs,

     

       104
       104
       +
       		Tabs:         settingsTabs,

     

       105
       105
       +
       		Tab:          "notifications",

     

       106
       106
       +
       	})

     

       107
       107
       +
       }

     

       108
       108
       +
       

     

       109
       109
       +
       func (s *Settings) updateNotificationPreferences(w http.ResponseWriter, r *http.Request) {

     

       110
       110
       +
       	did := s.OAuth.GetDid(r)

     

       111
       111
       +
       

     

       112
       112
       +
       	prefs := &models.NotificationPreferences{

     

       113
       113
       +
       		UserDid:            did,

     

       114
       114
       +
       		RepoStarred:        r.FormValue("repo_starred") == "on",

     

       115
       115
       +
       		IssueCreated:       r.FormValue("issue_created") == "on",

     

       116
       116
       +
       		IssueCommented:     r.FormValue("issue_commented") == "on",

     

       117
       117
       +
       		IssueClosed:        r.FormValue("issue_closed") == "on",

     

       118
       118
       +
       		PullCreated:        r.FormValue("pull_created") == "on",

     

       119
       119
       +
       		PullCommented:      r.FormValue("pull_commented") == "on",

     

       120
       120
       +
       		PullMerged:         r.FormValue("pull_merged") == "on",

     

       121
       121
       +
       		Followed:           r.FormValue("followed") == "on",

     

       122
       122
       +
       		EmailNotifications: r.FormValue("email_notifications") == "on",

     

       123
       123
       +
       	}

     

       124
       124
       +
       

     

       125
       125
       +
       	err := s.Db.UpdateNotificationPreferences(r.Context(), prefs)

     

       126
       126
       +
       	if err != nil {

     

       127
       127
       +
       		log.Printf("failed to update notification preferences: %s", err)

     

       128
       128
       +
       		s.Pages.Notice(w, "settings-notifications-error", "Unable to save notification preferences.")

     

       129
       129
       +
       		return

     

       130
       130
       +
       	}

     

       131
       131
       +
       

     

       132
       132
       +
       	s.Pages.Notice(w, "settings-notifications-success", "Notification preferences saved successfully.")

     

       133
       133
       +
       }

     

       134
       134
       +
       

     

       84
       135
        
       func (s *Settings) keysSettings(w http.ResponseWriter, r *http.Request) {

     

       85
       136
        
       	user := s.OAuth.GetUser(r)

     

       86
       137
        
       	pubKeys, err := db.GetPublicKeysForDid(s.Db, user.Did)

+4 -11

appview/pages/templates/errors/500.html

···

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

     

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

     

       7
       7
        
                   <div class="w-16 h-16 mx-auto mb-4 rounded-full bg-red-100 dark:bg-red-900/30 flex items-center justify-center">

     

       8
       8
       -
                       {{ i "alert-triangle" "w-8 h-8 text-red-500 dark:text-red-400" }}

     

       8
       8
       +
                       {{ i "triangle-alert" "w-8 h-8 text-red-500 dark:text-red-400" }}

     

       9
       9
        
                   </div>

     

       10
       10
        
               </div>

     

       11
       11
        
       

     
···

       14
       14
        
                       500 &mdash; internal server error

     

       15
       15
        
                   </h1>

     

       16
       16
        
                   <p class="text-gray-600 dark:text-gray-300">

     

       17
       17
       -
                       Something went wrong on our end. We've been notified and are working to fix the issue.

     

       18
       18
       -
                   </p>

     

       19
       19
       -
                   <div class="bg-yellow-50 dark:bg-yellow-900/20 border border-yellow-200 dark:border-yellow-800 rounded p-3 text-sm text-yellow-800 dark:text-yellow-200">

     

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

     

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

     

       22
       22
       -
                           <span class="font-medium">we're on it!</span>

     

       23
       23
       -
                       </div>

     

       24
       24
       -
                       <p class="mt-1">Our team has been automatically notified about this error.</p>

     

       25
       25
       -
                   </div>

     

       17
       17
       +
                       We encountered an error while processing your request. Please try again later.

     

       18
       18
       +
                    </p>

     

       26
       19
        
                   <div class="flex flex-col sm:flex-row gap-3 justify-center items-center mt-6">

     

       27
       20
        
                       <button onclick="location.reload()" class="btn-create gap-2">

     

       28
       21
        
                           {{ i "refresh-cw" "w-4 h-4" }}

     

       29
       22
        
                           try again

     

       30
       23
        
                       </button>

     

       31
       24
        
                       <a href="/" class="btn no-underline hover:no-underline gap-2">

     

       32
       32
       -
                           {{ i "home" "w-4 h-4" }}

     

       25
       25
       +
                           {{ i "arrow-left" "w-4 h-4" }}

     

       33
       26
        
                           back to home

     

       34
       27
        
                       </a>

     

       35
       28
        
                   </div>

+173

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

···

       1
       1
       +
       {{ define "title" }}{{ .Tab }} settings{{ end }}

     

       2
       2
       +
       

     

       3
       3
       +
       {{ define "content" }}

     

       4
       4
       +
         <div class="p-6">

     

       5
       5
       +
           <p class="text-xl font-bold dark:text-white">Settings</p>

     

       6
       6
       +
         </div>

     

       7
       7
       +
         <div class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white">

     

       8
       8
       +
           <section class="w-full grid grid-cols-1 md:grid-cols-4 gap-6">

     

       9
       9
       +
             <div class="col-span-1">

     

       10
       10
       +
               {{ template "user/settings/fragments/sidebar" . }}

     

       11
       11
       +
             </div>

     

       12
       12
       +
             <div class="col-span-1 md:col-span-3 flex flex-col gap-6">

     

       13
       13
       +
               {{ template "notificationSettings" . }}

     

       14
       14
       +
             </div>

     

       15
       15
       +
           </section>

     

       16
       16
       +
         </div>

     

       17
       17
       +
       {{ end }}

     

       18
       18
       +
       

     

       19
       19
       +
       {{ define "notificationSettings" }}

     

       20
       20
       +
         <div class="grid grid-cols-1 md:grid-cols-3 gap-4 items-center">

     

       21
       21
       +
           <div class="col-span-1 md:col-span-2">

     

       22
       22
       +
             <h2 class="text-sm pb-2 uppercase font-bold">Notification Preferences</h2>

     

       23
       23
       +
             <p class="text-gray-500 dark:text-gray-400">

     

       24
       24
       +
               Choose which notifications you want to receive when activity happens on your repositories and profile.

     

       25
       25
       +
             </p>

     

       26
       26
       +
           </div>

     

       27
       27
       +
         </div>

     

       28
       28
       +
       

     

       29
       29
       +
         <form hx-put="/settings/notifications" hx-swap="none" class="flex flex-col gap-6">

     

       30
       30
       +
       

     

       31
       31
       +
           <div class="flex flex-col rounded border border-gray-200 dark:border-gray-700 divide-y divide-gray-200 dark:divide-gray-700 w-full">

     

       32
       32
       +
             <div class="flex items-center justify-between p-2">

     

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

     

       34
       34
       +
                 <div class="flex flex-col gap-1">

     

       35
       35
       +
                   <span class="font-bold">Repository starred</span>

     

       36
       36
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       37
       37
       +
                     <span>When someone stars your repository.</span>

     

       38
       38
       +
                   </div>

     

       39
       39
       +
                 </div>

     

       40
       40
       +
               </div>

     

       41
       41
       +
               <label class="flex items-center gap-2">

     

       42
       42
       +
                 <input type="checkbox" name="repo_starred" {{if .Preferences.RepoStarred}}checked{{end}}>

     

       43
       43
       +
               </label>

     

       44
       44
       +
             </div>

     

       45
       45
       +
       

     

       46
       46
       +
             <div class="flex items-center justify-between p-2">

     

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

     

       48
       48
       +
                 <div class="flex flex-col gap-1">

     

       49
       49
       +
                   <span class="font-bold">New issues</span>

     

       50
       50
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       51
       51
       +
                     <span>When someone creates an issue on your repository.</span>

     

       52
       52
       +
                   </div>

     

       53
       53
       +
                 </div>

     

       54
       54
       +
               </div>

     

       55
       55
       +
               <label class="flex items-center gap-2">

     

       56
       56
       +
                 <input type="checkbox" name="issue_created" {{if .Preferences.IssueCreated}}checked{{end}}>

     

       57
       57
       +
               </label>

     

       58
       58
       +
             </div>

     

       59
       59
       +
       

     

       60
       60
       +
             <div class="flex items-center justify-between p-2">

     

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

     

       62
       62
       +
                 <div class="flex flex-col gap-1">

     

       63
       63
       +
                   <span class="font-bold">Issue comments</span>

     

       64
       64
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       65
       65
       +
                     <span>When someone comments on an issue you're involved with.</span>

     

       66
       66
       +
                   </div>

     

       67
       67
       +
                 </div>

     

       68
       68
       +
               </div>

     

       69
       69
       +
               <label class="flex items-center gap-2">

     

       70
       70
       +
                 <input type="checkbox" name="issue_commented" {{if .Preferences.IssueCommented}}checked{{end}}>

     

       71
       71
       +
               </label>

     

       72
       72
       +
             </div>

     

       73
       73
       +
       

     

       74
       74
       +
             <div class="flex items-center justify-between p-2">

     

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

     

       76
       76
       +
                 <div class="flex flex-col gap-1">

     

       77
       77
       +
                   <span class="font-bold">Issue closed</span>

     

       78
       78
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       79
       79
       +
                     <span>When an issue on your repository is closed.</span>

     

       80
       80
       +
                   </div>

     

       81
       81
       +
                 </div>

     

       82
       82
       +
               </div>

     

       83
       83
       +
               <label class="flex items-center gap-2">

     

       84
       84
       +
                 <input type="checkbox" name="issue_closed" {{if .Preferences.IssueClosed}}checked{{end}}>

     

       85
       85
       +
               </label>

     

       86
       86
       +
             </div>

     

       87
       87
       +
       

     

       88
       88
       +
             <div class="flex items-center justify-between p-2">

     

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

     

       90
       90
       +
                 <div class="flex flex-col gap-1">

     

       91
       91
       +
                   <span class="font-bold">New pull requests</span>

     

       92
       92
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       93
       93
       +
                     <span>When someone creates a pull request on your repository.</span>

     

       94
       94
       +
                   </div>

     

       95
       95
       +
                 </div>

     

       96
       96
       +
               </div>

     

       97
       97
       +
               <label class="flex items-center gap-2">

     

       98
       98
       +
                 <input type="checkbox" name="pull_created" {{if .Preferences.PullCreated}}checked{{end}}>

     

       99
       99
       +
               </label>

     

       100
       100
       +
             </div>

     

       101
       101
       +
       

     

       102
       102
       +
             <div class="flex items-center justify-between p-2">

     

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

     

       104
       104
       +
                 <div class="flex flex-col gap-1">

     

       105
       105
       +
                   <span class="font-bold">Pull request comments</span>

     

       106
       106
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       107
       107
       +
                     <span>When someone comments on a pull request you're involved with.</span>

     

       108
       108
       +
                   </div>

     

       109
       109
       +
                 </div>

     

       110
       110
       +
               </div>

     

       111
       111
       +
               <label class="flex items-center gap-2">

     

       112
       112
       +
                 <input type="checkbox" name="pull_commented" {{if .Preferences.PullCommented}}checked{{end}}>

     

       113
       113
       +
               </label>

     

       114
       114
       +
             </div>

     

       115
       115
       +
       

     

       116
       116
       +
             <div class="flex items-center justify-between p-2">

     

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

     

       118
       118
       +
                 <div class="flex flex-col gap-1">

     

       119
       119
       +
                   <span class="font-bold">Pull request merged</span>

     

       120
       120
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       121
       121
       +
                     <span>When your pull request is merged.</span>

     

       122
       122
       +
                   </div>

     

       123
       123
       +
                 </div>

     

       124
       124
       +
               </div>

     

       125
       125
       +
               <label class="flex items-center gap-2">

     

       126
       126
       +
                 <input type="checkbox" name="pull_merged" {{if .Preferences.PullMerged}}checked{{end}}>

     

       127
       127
       +
               </label>

     

       128
       128
       +
             </div>

     

       129
       129
       +
       

     

       130
       130
       +
             <div class="flex items-center justify-between p-2">

     

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

     

       132
       132
       +
                 <div class="flex flex-col gap-1">

     

       133
       133
       +
                   <span class="font-bold">New followers</span>

     

       134
       134
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       135
       135
       +
                     <span>When someone follows you.</span>

     

       136
       136
       +
                   </div>

     

       137
       137
       +
                 </div>

     

       138
       138
       +
               </div>

     

       139
       139
       +
               <label class="flex items-center gap-2">

     

       140
       140
       +
                 <input type="checkbox" name="followed" {{if .Preferences.Followed}}checked{{end}}>

     

       141
       141
       +
               </label>

     

       142
       142
       +
             </div>

     

       143
       143
       +
       

     

       144
       144
       +
             <div class="flex items-center justify-between p-2">

     

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

     

       146
       146
       +
                 <div class="flex flex-col gap-1">

     

       147
       147
       +
                   <span class="font-bold">Email notifications</span>

     

       148
       148
       +
                   <div class="flex text-sm items-center gap-1 text-gray-500 dark:text-gray-400">

     

       149
       149
       +
                     <span>Receive notifications via email in addition to in-app notifications.</span>

     

       150
       150
       +
                   </div>

     

       151
       151
       +
                 </div>

     

       152
       152
       +
               </div>

     

       153
       153
       +
               <label class="flex items-center gap-2">

     

       154
       154
       +
                 <input type="checkbox" name="email_notifications" {{if .Preferences.EmailNotifications}}checked{{end}}>

     

       155
       155
       +
               </label>

     

       156
       156
       +
             </div>

     

       157
       157
       +
           </div>

     

       158
       158
       +
       

     

       159
       159
       +
           <div class="flex justify-end pt-2">

     

       160
       160
       +
             <button

     

       161
       161
       +
               type="submit"

     

       162
       162
       +
               class="btn-create flex items-center gap-2 group"

     

       163
       163
       +
             >

     

       164
       164
       +
               {{ i "save" "w-4 h-4" }}

     

       165
       165
       +
               save

     

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

     

       167
       167
       +
             </button>

     

       168
       168
       +
           </div>

     

       169
       169
       +
           <div id="settings-notifications-success"></div>

     

       170
       170
       +
       

     

       171
       171
       +
           <div id="settings-notifications-error" class="error"></div>

     

       172
       172
       +
         </form>

     

       173
       173
       +
       {{ end }}

+13 -4

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

···

       2
       2
        
           <nav class="space-x-4 px-6 py-2 rounded-b bg-white dark:bg-gray-800 dark:text-white drop-shadow-sm">

     

       3
       3
        
               <div class="flex justify-between p-0 items-center">

     

       4
       4
        
                   <div id="left-items">

     

       5
       5
       -
                     <a href="/" hx-boost="true" class="text-2xl no-underline hover:no-underline">

     

       6
       6
       -
                       {{ template "fragments/logotypeSmall" }}

     

       5
       5
       +
                     <a href="/" hx-boost="true" class="text-2xl no-underline hover:no-underline flex items-center gap-2">

     

       6
       6
       +
                       {{ template "fragments/dolly/logo" "size-8 text-black dark:text-white" }}

     

       7
       7
       +
                       <span class="font-bold text-xl not-italic hidden md:inline">tangled</span>

     

       8
       8
       +
                       <span class="font-normal not-italic text-xs rounded bg-gray-100 dark:bg-gray-700 px-1 hidden md:inline">

     

       9
       9
       +
                         alpha

     

       10
       10
       +
                       </span>

     

       7
       11
        
                     </a>

     

       8
       12
        
                   </div>

     

       9
       13
        
       

     
···

       27
       31
        
       {{ define "newButton" }}

     

       28
       32
        
       <details class="relative inline-block text-left nav-dropdown">

     

       29
       33
        
           <summary class="btn-create py-0 cursor-pointer list-none flex items-center gap-2">

     

       30
       30
       -
             {{ i "plus" "w-4 h-4" }} new

     

       34
       34
       +
             {{ i "plus" "w-4 h-4" }} <span class="hidden md:inline">new</span>

     

       31
       35
        
           </summary>

     

       32
       36
        
           <div class="absolute flex flex-col right-0 mt-4 p-4 rounded w-48 bg-white dark:bg-gray-800 dark:text-white border border-gray-200 dark:border-gray-700">

     

       33
       37
        
               <a href="/repo/new" class="flex items-center gap-2">

     
···

       48
       52
        
               class="cursor-pointer list-none flex items-center gap-1"

     

       49
       53
        
           >

     

       50
       54
        
               {{ $user := didOrHandle .Did .Handle }}

     

       51
       51
       -
               {{ template "user/fragments/picHandle" $user }}

     

       55
       55
       +
               <img

     

       56
       56
       +
                   src="{{ tinyAvatar $user }}"

     

       57
       57
       +
                   alt=""

     

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

     

       59
       59
       +
               />

     

       60
       60
       +
               <span class="hidden md:inline">{{ $user | resolve | truncateAt30 }}</span>

     

       52
       61
        
           </summary>

     

       53
       62
        
           <div

     

       54
       63
        
               class="absolute flex flex-col right-0 mt-4 p-4 rounded w-48 bg-white dark:bg-gray-800 dark:text-white border border-gray-200 dark:border-gray-700"

+2 -2

appview/pages/templates/strings/put.html

···

       3
       3
        
       {{ define "content" }}

     

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

     

       5
       5
        
           {{ if eq .Action "new" }}

     

       6
       6
       -
             <p class="text-xl font-bold dark:text-white">Create a new string</p>

     

       7
       7
       -
             <p class="">Store and share code snippets with ease.</p>

     

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

     

       7
       7
       +
             <p class="text-gray-600 dark:text-gray-400 mb-1">Store and share code snippets with ease.</p>

     

       8
       8
        
           {{ else }}

     

       9
       9
        
             <p class="text-xl font-bold dark:text-white">Edit string</p>

     

       10
       10
        
           {{ end }}

-33

knotserver/git/git.go

···

       120
       120
        
       	return g.r.CommitObject(h)

     

       121
       121
        
       }

     

       122
       122
        
       

     

       123
       123
       -
       func (g *GitRepo) LastCommit() (*object.Commit, error) {

     

       124
       124
       -
       	c, err := g.r.CommitObject(g.h)

     

       125
       125
       -
       	if err != nil {

     

       126
       126
       -
       		return nil, fmt.Errorf("last commit: %w", err)

     

       127
       127
       -
       	}

     

       128
       128
       -
       	return c, nil

     

       129
       129
       -
       }

     

       130
       130
       -
       

     

       131
       123
        
       func (g *GitRepo) FileContentN(path string, cap int64) ([]byte, error) {

     

       132
       124
        
       	c, err := g.r.CommitObject(g.h)

     

       133
       125
        
       	if err != nil {

     
···

       162
       154
        
       	return buf.Bytes(), nil

     

       163
       155
        
       }

     

       164
       156
        
       

     

       165
       165
       -
       func (g *GitRepo) FileContent(path string) (string, error) {

     

       166
       166
       -
       	c, err := g.r.CommitObject(g.h)

     

       167
       167
       -
       	if err != nil {

     

       168
       168
       -
       		return "", fmt.Errorf("commit object: %w", err)

     

       169
       169
       -
       	}

     

       170
       170
       -
       

     

       171
       171
       -
       	tree, err := c.Tree()

     

       172
       172
       -
       	if err != nil {

     

       173
       173
       -
       		return "", fmt.Errorf("file tree: %w", err)

     

       174
       174
       -
       	}

     

       175
       175
       -
       

     

       176
       176
       -
       	file, err := tree.File(path)

     

       177
       177
       -
       	if err != nil {

     

       178
       178
       -
       		return "", err

     

       179
       179
       -
       	}

     

       180
       180
       -
       

     

       181
       181
       -
       	isbin, _ := file.IsBinary()

     

       182
       182
       -
       

     

       183
       183
       -
       	if !isbin {

     

       184
       184
       -
       		return file.Contents()

     

       185
       185
       -
       	} else {

     

       186
       186
       -
       		return "", ErrBinaryFile

     

       187
       187
       -
       	}

     

       188
       188
       -
       }

     

       189
       189
       -
       

     

       190
       157
        
       func (g *GitRepo) RawContent(path string) ([]byte, error) {

     

       191
       158
        
       	c, err := g.r.CommitObject(g.h)

     

       192
       159
        
       	if err != nil {

-4

knotserver/http_util.go

···

       16
       16
        
       	w.WriteHeader(status)

     

       17
       17
        
       	json.NewEncoder(w).Encode(map[string]string{"error": msg})

     

       18
       18
        
       }

     

       19
       19
       -
       

     

       20
       20
       -
       func notFound(w http.ResponseWriter) {

     

       21
       21
       -
       	writeError(w, "not found", http.StatusNotFound)

     

       22
       22
       -
       }

+1 -1

appview/ingester.go

···

       1008
       1008
        
       			if !ok {

     

       1009
       1009
        
       				return fmt.Errorf("failed to find label def for key: %s, expected: %q", o.OperandKey, slices.Collect(maps.Keys(actx.Defs)))

     

       1010
       1010
        
       			}

     

       1011
       1011
       -
       			if err := i.Validator.ValidateLabelOp(def, &o); err != nil {

     

       1011
       1011
       +
       			if err := i.Validator.ValidateLabelOp(def, repo, &o); err != nil {

     

       1012
       1012
        
       				return fmt.Errorf("failed to validate labelop: %w", err)

     

       1013
       1013
        
       			}

     

       1014
       1014
        
       		}

+15 -1

appview/validator/label.go

···

       95
       95
        
       	return nil

     

       96
       96
        
       }

     

       97
       97
        
       

     

       98
       98
       -
       func (v *Validator) ValidateLabelOp(labelDef *models.LabelDefinition, labelOp *models.LabelOp) error {

     

       98
       98
       +
       func (v *Validator) ValidateLabelOp(labelDef *models.LabelDefinition, repo *models.Repo, labelOp *models.LabelOp) error {

     

       99
       99
        
       	if labelDef == nil {

     

       100
       100
        
       		return fmt.Errorf("label definition is required")

     

       101
       101
        
       	}

     

       102
       102
       +
       	if repo == nil {

     

       103
       103
       +
       		return fmt.Errorf("repo is required")

     

       104
       104
       +
       	}

     

       102
       105
        
       	if labelOp == nil {

     

       103
       106
        
       		return fmt.Errorf("label operation is required")

     

       104
       107
        
       	}

     

       105
       108
        
       

     

       109
       109
       +
       	// validate permissions: only collaborators can apply labels currently

     

       110
       110
       +
       	//

     

       111
       111
       +
       	// TODO: introduce a repo:triage permission

     

       112
       112
       +
       	ok, err := v.enforcer.IsPushAllowed(labelOp.Did, repo.Knot, repo.DidSlashRepo())

     

       113
       113
       +
       	if err != nil {

     

       114
       114
       +
       		return fmt.Errorf("failed to enforce permissions: %w", err)

     

       115
       115
       +
       	}

     

       116
       116
       +
       	if !ok {

     

       117
       117
       +
       		return fmt.Errorf("unauhtorized label operation")

     

       118
       118
       +
       	}

     

       119
       119
       +
       

     

       106
       120
        
       	expectedKey := labelDef.AtUri().String()

     

       107
       121
        
       	if labelOp.OperandKey != expectedKey {

     

       108
       122
        
       		return fmt.Errorf("operand key %q does not match label definition URI %q", labelOp.OperandKey, expectedKey)

+4 -1

appview/validator/validator.go

···

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

     

       5
       5
        
       	"tangled.org/core/appview/pages/markup"

     

       6
       6
        
       	"tangled.org/core/idresolver"

     

       7
       7
       +
       	"tangled.org/core/rbac"

     

       7
       8
        
       )

     

       8
       9
        
       

     

       9
       10
        
       type Validator struct {

     

       10
       11
        
       	db        *db.DB

     

       11
       12
        
       	sanitizer markup.Sanitizer

     

       12
       13
        
       	resolver  *idresolver.Resolver

     

       14
       14
       +
       	enforcer  *rbac.Enforcer

     

       13
       15
        
       }

     

       14
       16
        
       

     

       15
       15
       -
       func New(db *db.DB, res *idresolver.Resolver) *Validator {

     

       17
       17
       +
       func New(db *db.DB, res *idresolver.Resolver, enforcer *rbac.Enforcer) *Validator {

     

       16
       18
        
       	return &Validator{

     

       17
       19
        
       		db:        db,

     

       18
       20
        
       		sanitizer: markup.NewSanitizer(),

     

       19
       21
        
       		resolver:  res,

     

       22
       22
       +
       		enforcer:  enforcer,

     

       20
       23
        
       	}

     

       21
       24
        
       }

+5 -4

appview/models/label.go

···

       232
       232
        
       	}

     

       233
       233
        
       

     

       234
       234
        
       	var ops []LabelOp

     

       235
       235
       -
       	for _, o := range record.Add {

     

       235
       235
       +
       	// deletes first, then additions

     

       236
       236
       +
       	for _, o := range record.Delete {

     

       236
       237
        
       		if o != nil {

     

       237
       238
        
       			op := mkOp(o)

     

       238
       238
       -
       			op.Operation = LabelOperationAdd

     

       239
       239
       +
       			op.Operation = LabelOperationDel

     

       239
       240
        
       			ops = append(ops, op)

     

       240
       241
        
       		}

     

       241
       242
        
       	}

     

       242
       242
       -
       	for _, o := range record.Delete {

     

       243
       243
       +
       	for _, o := range record.Add {

     

       243
       244
        
       		if o != nil {

     

       244
       245
        
       			op := mkOp(o)

     

       245
       245
       -
       			op.Operation = LabelOperationDel

     

       246
       246
       +
       			op.Operation = LabelOperationAdd

     

       246
       247
        
       			ops = append(ops, op)

     

       247
       248
        
       		}

     

       248
       249
        
       	}

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

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

     

       36
       38
        
       }

     

       37
       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"`

     

       46
       46
       +
       }

     

       47
       47
       +
       

     

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

     

       39
       49
        
       type RepoTree_TreeEntry struct {

     

       40
       50
        
       	// is_file: Whether this entry is a file

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

     

       16
       16
       +
       }

     

       17
       17
       +
       

     

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

     

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

     

       14
       20
        
       }

     

       15
       21
        
       

     

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

     

       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

+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

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

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

     
···

       70
       75
        
               }

     

       71
       76
        
             ]

     

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

     

       91
       91
       +
           },

     

       73
       92
        
           "treeEntry": {

     

       74
       93
        
             "type": "object",

     

       75
       94
        
             "required": ["name", "mode", "size", "is_file", "is_subtree"],

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

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

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

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

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

+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
        
       

     
···

       81
       81
        
       		verifiedFilter = 1

     

       82
       82
        
       	}

     

       83
       83
        
       

     

       84
       84
       +
       	assoc := make(map[string]string)

     

       85
       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 := `

     
···

       105
       111
        
       	}

     

       106
       112
        
       	defer rows.Close()

     

       107
       113
        
       

     

       108
       108
       -
       	assoc := make(map[string]string)

     

       109
       109
       -
       

     

       110
       114
        
       	for rows.Next() {

     

       111
       115
        
       		var email, did string

     

       112
       116
        
       		if err := rows.Scan(&email, &did); err != nil {

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

+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

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

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

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

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

+18 -13

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
       -
       func (d *DB) GetUnreadNotificationCount(ctx context.Context, userDID string) (int, error) {

     

       252
       252
       -
       	recipientFilter := FilterEq("recipient_did", userDID)

     

       253
       253
       -
       	readFilter := FilterEq("read", 0)

     

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

     

       254
       260
        
       

     

       255
       255
       -
       	query := fmt.Sprintf(`

     

       256
       256
       -
       		SELECT COUNT(*)

     

       257
       257
       -
       		FROM notifications

     

       258
       258
       -
       		WHERE %s AND %s

     

       259
       259
       -
       	`, recipientFilter.Condition(), readFilter.Condition())

     

       261
       261
       +
       	whereClause := ""

     

       262
       262
       +
       	if conditions != nil {

     

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

     

       264
       264
       +
       	}

     

       260
       265
        
       

     

       261
       261
       -
       	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)

     

       262
       269
        
       

     

       263
       263
       -
       	var count int

     

       264
       264
       -
       	err := d.DB.QueryRowContext(ctx, query, args...).Scan(&count)

     

       265
       265
       -
       	if err != nil {

     

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

     

       267
       272
        
       	}

     

       268
       273
        
       

     

       269
       274
        
       	return count, nil

+29 -36

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"

     
···

       32
       33
        
       

     

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

     

       34
       35
        
       

     

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

     

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

     

       36
       37
        
       

     

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

     

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

     
···

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

     

       46
       47
        
       	userDid := n.oauth.GetDid(r)

     

       47
       48
        
       

     

       48
       48
       -
       	limitStr := r.URL.Query().Get("limit")

     

       49
       49
       -
       	offsetStr := r.URL.Query().Get("offset")

     

       50
       50
       -
       

     

       51
       51
       -
       	limit := 20 // default

     

       52
       52
       -
       	if limitStr != "" {

     

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

     

       54
       54
       -
       			limit = l

     

       55
       55
       -
       		}

     

       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()

     

       56
       53
        
       	}

     

       57
       54
        
       

     

       58
       58
       -
       	offset := 0 // default

     

       59
       59
       -
       	if offsetStr != "" {

     

       60
       60
       -
       		if o, err := strconv.Atoi(offsetStr); err == nil && o >= 0 {

     

       61
       61
       -
       			offset = o

     

       62
       62
       -
       		}

     

       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

     

       63
       63
        
       	}

     

       64
       64
        
       

     

       65
       65
       -
       	page := pagination.Page{Limit: limit + 1, Offset: offset}

     

       66
       66
       -
       	notifications, err := db.GetNotificationsWithEntities(n.db, page, db.FilterEq("recipient_did", userDid))

     

       65
       65
       +
       	notifications, err := db.GetNotificationsWithEntities(

     

       66
       66
       +
       		n.db,

     

       67
       67
       +
       		page,

     

       68
       68
       +
       		db.FilterEq("recipient_did", userDid),

     

       69
       69
       +
       	)

     

       67
       70
        
       	if err != nil {

     

       68
       71
        
       		log.Println("failed to get notifications:", err)

     

       69
       72
        
       		n.pages.Error500(w)

     

       70
       73
        
       		return

     

       71
       74
        
       	}

     

       72
       75
        
       

     

       73
       73
       -
       	hasMore := len(notifications) > limit

     

       74
       74
       -
       	if hasMore {

     

       75
       75
       -
       		notifications = notifications[:limit]

     

       76
       76
       -
       	}

     

       77
       77
       -
       

     

       78
       76
        
       	err = n.db.MarkAllNotificationsRead(r.Context(), userDid)

     

       79
       77
        
       	if err != nil {

     

       80
       78
        
       		log.Println("failed to mark notifications as read:", err)

     
···

       88
       86
        
       		return

     

       89
       87
        
       	}

     

       90
       88
        
       

     

       91
       91
       -
       	params := pages.NotificationsParams{

     

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

     

       92
       90
        
       		LoggedInUser:  user,

     

       93
       91
        
       		Notifications: notifications,

     

       94
       92
        
       		UnreadCount:   unreadCount,

     

       95
       95
       -
       		HasMore:       hasMore,

     

       96
       96
       -
       		NextOffset:    offset + limit,

     

       97
       97
       -
       		Limit:         limit,

     

       98
       98
       -
       	}

     

       99
       99
       -
       

     

       100
       100
       -
       	err = n.pages.Notifications(w, params)

     

       101
       101
       -
       	if err != nil {

     

       102
       102
       -
       		log.Println("failed to load notifs:", err)

     

       103
       103
       -
       		n.pages.Error500(w)

     

       104
       104
       -
       		return

     

       105
       105
       -
       	}

     

       93
       93
       +
       		Page:          page,

     

       94
       94
       +
       		Total:         total,

     

       95
       95
       +
       	}))

     

       106
       96
        
       }

     

       107
       97
        
       

     

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

     

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

     

       110
       110
       -
       

     

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

     

       112
       105
        
       	if err != nil {

     

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

     

       114
       107
        
       		return

+48 -15

appview/pages/templates/notifications/list.html

···

       11
       11
        
           </div>

     

       12
       12
        
         </div>

     

       13
       13
        
       

     

       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>

     

       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>

     

       20
       20
        
       

     

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

     

       23
       23
       -
               <div class="text-center py-12">

     

       24
       24
       -
                 <div class="w-16 h-16 mx-auto mb-4 text-gray-300 dark:text-gray-600">

     

       25
       25
       -
                   {{ i "bell-off" "w-16 h-16" }}

     

       26
       26
       -
                 </div>

     

       27
       27
       -
                 <h3 class="text-lg font-medium text-gray-900 dark:text-white mb-2">No notifications</h3>

     

       28
       28
       -
                 <p class="text-gray-600 dark:text-gray-400">When you receive notifications, they'll appear here.</p>

     

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

     

       23
       23
       +
             <div class="text-center py-12">

     

       24
       24
       +
               <div class="w-16 h-16 mx-auto mb-4 text-gray-300 dark:text-gray-600">

     

       25
       25
       +
                 {{ i "bell-off" "w-16 h-16" }}

     

       29
       26
        
               </div>

     

       27
       27
       +
               <h3 class="text-lg font-medium text-gray-900 dark:text-white mb-2">No notifications</h3>

     

       28
       28
       +
               <p class="text-gray-600 dark:text-gray-400">When you receive notifications, they'll appear here.</p>

     

       30
       29
        
             </div>

     

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

     

       64
       64
       +
         </div>

     

       32
       65
        
       {{ end }}

+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

+27 -208

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

···

       1
       1
        
       {{define "notifications/fragments/item"}}

     

       2
       2
       -
         <div 

     

       3
       3
       -
           class="

     

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

     

       5
       5
       -
             {{if not .Read}}bg-blue-50 dark:bg-blue-900/20 border border-blue-500 dark:border-sky-800{{end}}

     

       6
       6
       -
             flex gap-2 items-center

     

       7
       7
       -
             "

     

       8
       8
       -
           >

     

       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>

     

       13
       13
       +
             </div>

     

       9
       14
        
       

     

       10
       10
       -
           {{ template "notificationIcon" . }}

     

       11
       11
       -
           <div class="flex-1 w-full flex flex-col gap-1">

     

       12
       12
       -
             <span>{{ template "notificationHeader" . }}</span>

     

       13
       13
       -
             <span class="text-sm text-gray-500 dark:text-gray-400">{{ template "notificationSummary" . }}</span>

     

       14
       15
        
           </div>

     

       15
       15
       -
       

     

       16
       16
       -
         </div>

     

       16
       16
       +
         </a>

     

       17
       17
        
       {{end}}

     

       18
       18
        
       

     

       19
       19
        
       {{ define "notificationIcon" }}

     
···

       64
       64
        
         {{ end }}

     

       65
       65
        
       {{ end }}

     

       66
       66
        
       

     

       67
       67
       -
       {{define "issueNotification"}}

     

       68
       68
       -
       {{$url := printf "/%s/%s/issues/%d" (resolve .Repo.Did) .Repo.Name .Issue.IssueId}}

     

       69
       69
       -
       <a

     

       70
       70
       -
         href="{{$url}}"

     

       71
       71
       -
         class="block no-underline hover:no-underline text-inherit -m-3 p-3"

     

       72
       72
       -
       >

     

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

     

       74
       74
       -
           <div class="min-w-0 flex-1">

     

       75
       75
       -
             <!-- First line: icon + actor action -->

     

       76
       76
       -
             <div class="flex items-center gap-2 text-gray-900 dark:text-white">

     

       77
       77
       -
               {{if eq .Type "issue_created"}}

     

       78
       78
       -
                 <span class="text-green-600 dark:text-green-500">

     

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

     

       80
       80
       -
                 </span>

     

       81
       81
       -
               {{else if eq .Type "issue_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 "issue_closed"}}

     

       86
       86
       -
                 <span class="text-gray-500 dark:text-gray-400">

     

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

     

       88
       88
       -
                 </span>

     

       89
       89
       -
               {{end}}

     

       90
       90
       -
               {{template "user/fragments/picHandle" .ActorDid}}

     

       91
       91
       -
               {{if eq .Type "issue_created"}}

     

       92
       92
       -
                 <span class="text-gray-500 dark:text-gray-400">opened issue</span>

     

       93
       93
       -
               {{else if eq .Type "issue_commented"}}

     

       94
       94
       -
                 <span class="text-gray-500 dark:text-gray-400">commented on issue</span>

     

       95
       95
       -
               {{else if eq .Type "issue_closed"}}

     

       96
       96
       -
                 <span class="text-gray-500 dark:text-gray-400">closed issue</span>

     

       97
       97
       -
               {{end}}

     

       98
       98
       -
               {{if not .Read}}

     

       99
       99
       -
                 <div class="w-2 h-2 bg-blue-500 rounded-full flex-shrink-0 ml-1"></div>

     

       100
       100
       -
               {{end}}

     

       101
       101
       -
             </div>

     

       102
       102
       -
       

     

       103
       103
       -
             <div class="text-sm text-gray-600 dark:text-gray-400 mt-0.5 ml-6 flex items-center gap-1">

     

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

     

       105
       105
       -
               <span class="text-gray-900 dark:text-white truncate">{{.Issue.Title}}</span>

     

       106
       106
       -
               <span>on</span>

     

       107
       107
       -
               <span class="font-medium text-gray-900 dark:text-white">{{resolve .Repo.Did}}/{{.Repo.Name}}</span>

     

       108
       108
       -
             </div>

     

       109
       109
       -
           </div>

     

       110
       110
       -
       

     

       111
       111
       -
           <div class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0 ml-2">

     

       112
       112
       -
             {{ template "repo/fragments/time" .Created }}

     

       113
       113
       -
           </div>

     

       114
       114
       -
         </div>

     

       115
       115
       -
       </a>

     

       116
       116
       -
       {{end}}

     

       117
       117
       -
       

     

       118
       118
       -
       {{define "pullNotification"}}

     

       119
       119
       -
       {{$url := printf "/%s/%s/pulls/%d" (resolve .Repo.Did) .Repo.Name .Pull.PullId}}

     

       120
       120
       -
       <a

     

       121
       121
       -
         href="{{$url}}"

     

       122
       122
       -
         class="block no-underline hover:no-underline text-inherit -m-3 p-3"

     

       123
       123
       -
       >

     

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

     

       125
       125
       -
           <div class="min-w-0 flex-1">

     

       126
       126
       -
             <div class="flex items-center gap-2 text-gray-900 dark:text-white">

     

       127
       127
       -
               {{if eq .Type "pull_created"}}

     

       128
       128
       -
                 <span class="text-green-600 dark:text-green-500">

     

       129
       129
       -
                   {{ i "git-pull-request-create" "w-4 h-4" }}

     

       130
       130
       -
                 </span>

     

       131
       131
       -
               {{else if eq .Type "pull_commented"}}

     

       132
       132
       -
                 <span class="text-gray-500 dark:text-gray-400">

     

       133
       133
       -
                   {{ i "message-circle" "w-4 h-4" }}

     

       134
       134
       -
                 </span>

     

       135
       135
       -
               {{else if eq .Type "pull_merged"}}

     

       136
       136
       -
                 <span class="text-purple-600 dark:text-purple-500">

     

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

     

       138
       138
       -
                 </span>

     

       139
       139
       -
               {{else if eq .Type "pull_closed"}}

     

       140
       140
       -
                 <span class="text-red-600 dark:text-red-500">

     

       141
       141
       -
                   {{ i "git-pull-request-closed" "w-4 h-4" }}

     

       142
       142
       -
                 </span>

     

       143
       143
       -
               {{end}}

     

       144
       144
       -
               {{template "user/fragments/picHandle" (resolve .ActorDid)}}

     

       145
       145
       -
               {{if eq .Type "pull_created"}}

     

       146
       146
       -
                 <span class="text-gray-500 dark:text-gray-400">opened pull request</span>

     

       147
       147
       -
               {{else if eq .Type "pull_commented"}}

     

       148
       148
       -
                 <span class="text-gray-500 dark:text-gray-400">commented on pull request</span>

     

       149
       149
       -
               {{else if eq .Type "pull_merged"}}

     

       150
       150
       -
                 <span class="text-gray-500 dark:text-gray-400">merged pull request</span>

     

       151
       151
       -
               {{else if eq .Type "pull_closed"}}

     

       152
       152
       -
                 <span class="text-gray-500 dark:text-gray-400">closed pull request</span>

     

       153
       153
       -
               {{end}}

     

       154
       154
       -
               {{if not .Read}}

     

       155
       155
       -
                 <div class="w-2 h-2 bg-blue-500 rounded-full flex-shrink-0 ml-1"></div>

     

       156
       156
       -
               {{end}}

     

       157
       157
       -
             </div>

     

       158
       158
       -
       

     

       159
       159
       -
             <div class="text-sm text-gray-600 dark:text-gray-400 mt-0.5 ml-6 flex items-center gap-1">

     

       160
       160
       -
               <span class="text-gray-500 dark:text-gray-400">#{{.Pull.PullId}}</span>

     

       161
       161
       -
               <span class="text-gray-900 dark:text-white truncate">{{.Pull.Title}}</span>

     

       162
       162
       -
               <span>on</span>

     

       163
       163
       -
               <span class="font-medium text-gray-900 dark:text-white">{{resolve .Repo.Did}}/{{.Repo.Name}}</span>

     

       164
       164
       -
             </div>

     

       165
       165
       -
           </div>

     

       166
       166
       -
       

     

       167
       167
       -
           <div class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0 ml-2">

     

       168
       168
       -
             {{ template "repo/fragments/time" .Created }}

     

       169
       169
       -
           </div>

     

       170
       170
       -
         </div>

     

       171
       171
       -
       </a>

     

       172
       172
       -
       {{end}}

     

       173
       173
       -
       

     

       174
       174
       -
       {{define "repoNotification"}}

     

       175
       175
       -
       {{$url := printf "/%s/%s" (resolve .Repo.Did) .Repo.Name}}

     

       176
       176
       -
       <a

     

       177
       177
       -
         href="{{$url}}"

     

       178
       178
       -
         class="block no-underline hover:no-underline text-inherit -m-3 p-3"

     

       179
       179
       -
       >

     

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

     

       181
       181
       -
           <div class="flex items-center gap-2 min-w-0 flex-1">

     

       182
       182
       -
             <span class="text-yellow-500 dark:text-yellow-400">

     

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

     

       184
       184
       -
             </span>

     

       185
       185
       -
       

     

       186
       186
       -
             <div class="min-w-0 flex-1">

     

       187
       187
       -
               <!-- Single line for stars: actor action subject -->

     

       188
       188
       -
               <div class="flex items-center gap-1 text-gray-900 dark:text-white">

     

       189
       189
       -
                 {{template "user/fragments/picHandle" (resolve .ActorDid)}}

     

       190
       190
       -
                 <span class="text-gray-500 dark:text-gray-400">starred</span>

     

       191
       191
       -
                 <span class="font-medium">{{resolve .Repo.Did}}/{{.Repo.Name}}</span>

     

       192
       192
       -
                 {{if not .Read}}

     

       193
       193
       -
                   <div class="w-2 h-2 bg-blue-500 rounded-full flex-shrink-0 ml-1"></div>

     

       194
       194
       -
                 {{end}}

     

       195
       195
       -
               </div>

     

       196
       196
       -
             </div>

     

       197
       197
       -
           </div>

     

       198
       198
       -
       

     

       199
       199
       -
           <div class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0 ml-2">

     

       200
       200
       -
             {{ template "repo/fragments/time" .Created }}

     

       201
       201
       -
           </div>

     

       202
       202
       -
         </div>

     

       203
       203
       -
       </a>

     

       204
       204
       -
       {{end}}

     

       205
       205
       -
       

     

       206
       206
       -
       {{define "followNotification"}}

     

       207
       207
       -
       {{$url := printf "/%s" (resolve .ActorDid)}}

     

       208
       208
       -
       <a

     

       209
       209
       -
         href="{{$url}}"

     

       210
       210
       -
         class="block no-underline hover:no-underline text-inherit -m-3 p-3"

     

       211
       211
       -
       >

     

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

     

       213
       213
       -
           <div class="flex items-center gap-2 min-w-0 flex-1">

     

       214
       214
       -
             <span class="text-blue-600 dark:text-blue-400">

     

       215
       215
       -
               {{ i "user-plus" "w-4 h-4" }}

     

       216
       216
       -
             </span>

     

       217
       217
       -
       

     

       218
       218
       -
             <div class="min-w-0 flex-1">

     

       219
       219
       -
               <div class="flex items-center gap-1 text-gray-900 dark:text-white">

     

       220
       220
       -
                 {{template "user/fragments/picHandle" (resolve .ActorDid)}}

     

       221
       221
       -
                 <span class="text-gray-500 dark:text-gray-400">followed you</span>

     

       222
       222
       -
                 {{if not .Read}}

     

       223
       223
       -
                   <div class="w-2 h-2 bg-blue-500 rounded-full flex-shrink-0 ml-1"></div>

     

       224
       224
       -
                 {{end}}

     

       225
       225
       -
               </div>

     

       226
       226
       -
             </div>

     

       227
       227
       -
           </div>

     

       228
       228
       -
       

     

       229
       229
       -
           <div class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0 ml-2">

     

       230
       230
       -
             {{ template "repo/fragments/time" .Created }}

     

       231
       231
       -
           </div>

     

       232
       232
       -
         </div>

     

       233
       233
       -
       </a>

     

       234
       234
       -
       {{end}}

     

       235
       235
       -
       

     

       236
       236
       -
       {{define "genericNotification"}}

     

       237
       237
       -
       <a

     

       238
       238
       -
         href="#"

     

       239
       239
       -
         class="block no-underline hover:no-underline text-inherit -m-3 p-3"

     

       240
       240
       -
       >

     

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

     

       242
       242
       -
           <div class="flex items-center gap-2 min-w-0 flex-1">

     

       243
       243
       -
             <span class="{{if not .Read}}text-blue-600 dark:text-blue-400{{else}}text-gray-500 dark:text-gray-400{{end}}">

     

       244
       244
       -
               {{ i "bell" "w-4 h-4" }}

     

       245
       245
       -
             </span>

     

       246
       246
       -
       

     

       247
       247
       -
             <div class="min-w-0 flex-1">

     

       248
       248
       -
               <div class="flex items-center gap-1 text-gray-900 dark:text-white">

     

       249
       249
       -
                 <span>New notification</span>

     

       250
       250
       -
                 {{if not .Read}}

     

       251
       251
       -
                   <div class="w-2 h-2 bg-blue-500 rounded-full flex-shrink-0 ml-1"></div>

     

       252
       252
       -
                 {{end}}

     

       253
       253
       -
               </div>

     

       254
       254
       -
             </div>

     

       255
       255
       -
           </div>

     

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

     

       256
       79
        
       

     

       257
       257
       -
           <div class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0 ml-2">

     

       258
       258
       -
             {{ template "repo/fragments/time" .Created }}

     

       259
       259
       -
           </div>

     

       260
       260
       -
         </div>

     

       261
       261
       -
       </a>

     

       262
       262
       -
       {{end}}

     

       80
       80
       +
         {{ $url }}

     

       81
       81
       +
       {{ end }}

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

+2 -2

appview/db/pulls.go

···

       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.RepoAt != nil {

     

       249
       249
       +
       		if p.PullSource != nil && p.PullSource.RepoAt != nil {

     

       250
       250
        
       			sourceAts = append(sourceAts, *p.PullSource.RepoAt)

     

       251
       251
        
       		}

     

       252
       252
        
       	}

     
···

       259
       259
        
       		sourceRepoMap[r.RepoAt()] = &r

     

       260
       260
        
       	}

     

       261
       261
        
       	for _, p := range pulls {

     

       262
       262
       -
       		if p.PullSource.RepoAt != nil {

     

       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
        
       			}

+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

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

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

appview/pages/templates/user/signup.html

···

       8
       8
        
                   <meta property="og:url" content="https://tangled.org/signup" />

     

       9
       9
        
                   <meta property="og:description" content="sign up for tangled" />

     

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

     

       11
       11
       +
                   <link rel="manifest" href="/pwa-manifest.json" />

     

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

     

       12
       13
        
                   <title>sign up &middot; tangled</title>

     

       13
       14

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)

+23

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{

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

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

Compare changes