comparing 218b13d4e7e7cb4e96a0e8f20f71bb0b93afabf4 and master on nel.pet/core

+1 -1

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

···

       23
       23
        
                 <a href="https://blog.tangled.org" class="{{ $linkStyle }}" target="_blank" rel="noopener noreferrer">{{ i "book-open" $iconStyle }} blog</a>

     

       24
       24
        
                 <a href="https://tangled.org/@tangled.org/core/tree/master/docs" class="{{ $linkStyle }}">{{ i "book" $iconStyle }} docs</a>

     

       25
       25
        
                 <a href="https://tangled.org/@tangled.org/core" class="{{ $linkStyle }}">{{ i "code" $iconStyle }} source</a>

     

       26
       26
       -
                 <a href="https://tangled.org/@tangled.org/core" class="{{ $linkStyle }}">{{ i "paintbrush" $iconStyle }} brand</a>

     

       26
       26
       +
                 <a href="https://tangled.org/brand" class="{{ $linkStyle }}">{{ i "paintbrush" $iconStyle }} brand</a>

     

       27
       27
        
               </div>

     

       28
       28
        
       

     

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

+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/signup/signup.go

···

       133
       133
        
       		noticeId := "signup-msg"

     

       134
       134
        
       

     

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

     

       136
       136
       -
       			s.l.Warn("turnstile validation failed", "error", err)

     

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

     

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

     

       138
       138
        
       			return

     

       139
       139
        
       		}

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

+3

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

+1

appview/pages/templates/user/completeSignup.html

···

       20
       20
        
                       content="complete your signup for tangled"

     

       21
       21
        
                   />

     

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

     

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

     

       23
       24
        
                   <link

     

       24
       25
        
                       rel="stylesheet"

     

       25
       26
        
                       href="/static/tw.css?{{ cssContentHash }}"

+1

appview/pages/templates/user/login.html

···

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

     

       9
       9
        
                   <meta property="og:description" content="login to for tangled" />

     

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

     

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

     

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

     

       12
       13
        
                   <title>login &middot; tangled</title>

     

       13
       14
        
               </head>

+1

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

+1

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

+12 -1

appview/repo/index.go

···

       200
       200
        
       			})

     

       201
       201
        
       		}

     

       202
       202
        
       

     

       203
       203
       +
       		tx, err := rp.db.Begin()

     

       204
       204
       +
       		if err != nil {

     

       205
       205
       +
       			return nil, err

     

       206
       206
       +
       		}

     

       207
       207
       +
       		defer tx.Rollback()

     

       208
       208
       +
       

     

       203
       209
        
       		// update appview's cache

     

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

     

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

     

       205
       211
        
       		if err != nil {

     

       206
       212
        
       			// non-fatal

     

       207
       213
        
       			log.Println("failed to cache lang results", err)

     

       208
       214
        
       		}

     

       215
       215
       +
       

     

       216
       216
       +
       		err = tx.Commit()

     

       217
       217
       +
       		if err != nil {

     

       218
       218
       +
       			return nil, err

     

       219
       219
       +
       		}

     

       209
       220
        
       	}

     

       210
       221
        
       

     

       211
       222
        
       	var total int64

+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