interdiff of round #2 and #1 · pull #208 · tangled.org/core

ERROR

knotserver/routes.go

Failed to calculate interdiff for this file.

ERROR

types/repo.go

Failed to calculate interdiff for this file.

ERROR

appview/pages/templates/layouts/repobase.html

Failed to calculate interdiff for this file.

REVERTED

appview/pages/templates/settings.html

···

       140
       140
        
               <form

     

       141
       141
        
                 hx-delete="/settings/emails"

     

       142
       142
        
                 hx-confirm="Are you sure you wish to delete the email '{{ .Address }}'?"

     

       143
       143
       +
                 hx-indicator="#delete-email-{{ .Address }}-spinner"

     

       143
       143
       -
                 hx-indicator="#delete-email-{{ $index }}-spinner"

     

       144
       144
        
               >

     

       145
       145
        
                 <input type="hidden" name="email" value="{{ .Address }}">

     

       146
       146
        
                 <button

     
···

       150
       150
        
                 >

     

       151
       151
        
                   {{ i "trash-2" "w-5 h-5" }}

     

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

     

       153
       153
       +
                   <span id="delete-email-{{ .Address }}-spinner" class="group">

     

       153
       153
       -
                   <span id="delete-email-{{ $index }}-spinner" class="group">

     

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

     

       155
       155
        
                   </span>

     

       156
       156
        
                 </button>

REVERTED

appview/repo/repo_util.go

···

       4
       4
        
       	"context"

     

       5
       5
        
       	"crypto/rand"

     

       6
       6
        
       	"fmt"

     

       7
       7
       +
       	"log"

     

       7
       8
        
       	"math/big"

     

       8
       9
        
       

     

       9
       10
        
       	"github.com/go-git/go-git/v5/plumbing/object"

     

       11
       11
       +
       	"tangled.sh/tangled.sh/core/appview/db"

     

       12
       12
       +
       	"tangled.sh/tangled.sh/core/crypto"

     

       13
       13
       +
       	"tangled.sh/tangled.sh/core/types"

     

       10
       14
        
       )

     

       11
       15
        
       

     

       12
       16
        
       func uniqueEmails(commits []*object.Commit) []string {

     
···

       87
       91
        
       	return emailToDidOrHandle

     

       88
       92
        
       }

     

       89
       93
        
       

     

       94
       94
       +
       func verifiedObjectCommits(r *Repo, emailToDid map[string]string, commits []*object.Commit) (map[string]bool, error) {

     

       95
       95
       +
       	ndCommits := []types.NiceDiff{}

     

       96
       96
       +
       	for _, commit := range commits {

     

       97
       97
       +
       		ndCommits = append(ndCommits, types.ObjectCommitToNiceDiff(commit))

     

       98
       98
       +
       	}

     

       99
       99
       +
       	return verifiedCommits(r, emailToDid, ndCommits)

     

       100
       100
       +
       }

     

       101
       101
       +
       

     

       102
       102
       +
       func verifiedCommits(r *Repo, emailToDid map[string]string, ndCommits []types.NiceDiff) (map[string]bool, error) {

     

       103
       103
       +
       	hashToVerified := make(map[string]bool)

     

       104
       104
       +
       

     

       105
       105
       +
       	didPubkeyCache := make(map[string][]db.PublicKey)

     

       106
       106
       +
       

     

       107
       107
       +
       	for _, commit := range ndCommits {

     

       108
       108
       +
       		c := commit.Commit

     

       109
       109
       +
       

     

       110
       110
       +
       		committerEmail := c.Committer.Email

     

       111
       111
       +
       		if did, exists := emailToDid[committerEmail]; exists {

     

       112
       112
       +
       			// check if we've already fetched public keys for this did

     

       113
       113
       +
       			pubKeys, ok := didPubkeyCache[did]

     

       114
       114
       +
       			if !ok {

     

       115
       115
       +
       				// fetch and cache public keys

     

       116
       116
       +
       				keys, err := db.GetPublicKeysForDid(r.db, did)

     

       117
       117
       +
       				if err != nil {

     

       118
       118
       +
       					log.Printf("failed to fetch pubkey for %s: %v", committerEmail, err)

     

       119
       119
       +
       					continue

     

       120
       120
       +
       				}

     

       121
       121
       +
       				pubKeys = keys

     

       122
       122
       +
       				didPubkeyCache[did] = pubKeys

     

       123
       123
       +
       			}

     

       124
       124
       +
       

     

       125
       125
       +
       			verified := false

     

       126
       126
       +
       

     

       127
       127
       +
       			// try to verify with any associated pubkeys

     

       128
       128
       +
       			for _, pk := range pubKeys {

     

       129
       129
       +
       				if _, ok := crypto.VerifyCommitSignature(pk.Key, commit); ok {

     

       130
       130
       +
       					verified = true

     

       131
       131
       +
       					break

     

       132
       132
       +
       				}

     

       133
       133
       +
       			}

     

       134
       134
       +
       

     

       135
       135
       +
       			hashToVerified[c.This] = verified

     

       136
       136
       +
       		}

     

       137
       137
       +
       	}

     

       138
       138
       +
       

     

       139
       139
       +
       	return hashToVerified, nil

     

       140
       140
       +
       }

     

       141
       141
       +
       

     

       90
       142
        
       func randomString(n int) string {

     

       91
       143
        
       	const letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"

     

       92
       144
        
       	result := make([]byte, n)

REVERTED

types/diff.go

···

       77
       77
        
       

     

       78
       78
        
       	return files

     

       79
       79
        
       }

     

       80
       80
       +
       

     

       81
       81
       +
       // ObjectCommitToNiceDiff is a compatibility function to convert a

     

       82
       82
       +
       // commit object into a NiceDiff structure.

     

       83
       83
       +
       func ObjectCommitToNiceDiff(c *object.Commit) NiceDiff {

     

       84
       84
       +
       	var niceDiff NiceDiff

     

       85
       85
       +
       

     

       86
       86
       +
       	// set commit information

     

       87
       87
       +
       	niceDiff.Commit.Message = c.Message

     

       88
       88
       +
       	niceDiff.Commit.Author = c.Author

     

       89
       89
       +
       	niceDiff.Commit.This = c.Hash.String()

     

       90
       90
       +
       	niceDiff.Commit.Committer = c.Committer

     

       91
       91
       +
       	niceDiff.Commit.Tree = c.TreeHash.String()

     

       92
       92
       +
       	niceDiff.Commit.PGPSignature = c.PGPSignature

     

       93
       93
       +
       

     

       94
       94
       +
       	changeId, ok := c.ExtraHeaders["change-id"]

     

       95
       95
       +
       	if ok {

     

       96
       96
       +
       		niceDiff.Commit.ChangedId = string(changeId)

     

       97
       97
       +
       	}

     

       98
       98
       +
       

     

       99
       99
       +
       	// set parent hash if available

     

       100
       100
       +
       	if len(c.ParentHashes) > 0 {

     

       101
       101
       +
       		niceDiff.Commit.Parent = c.ParentHashes[0].String()

     

       102
       102
       +
       	}

     

       103
       103
       +
       

     

       104
       104
       +
       	// XXX: Stats and Diff fields are typically populated

     

       105
       105
       +
       	// after fetching the actual diff information, which isn't

     

       106
       106
       +
       	// directly available in the commit object itself.

     

       107
       107
       +
       

     

       108
       108
       +
       	return niceDiff

     

       109
       109
       +
       }

REVERTED

appview/pages/templates/repo/log.html

···

       3
       3
        
       {{ define "extrameta" }}

     

       4
       4
        
           {{ $title := printf "commits &middot; %s" .RepoInfo.FullName }}

     

       5
       5
        
           {{ $url := printf "https://tangled.sh/%s/commits" .RepoInfo.FullName }}

     

       6
       6
       +
           

     

       6
       6
       -
       

     

       7
       7
        
           {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo "Title" $title "Url" $url) }}

     

       8
       8
        
       {{ end }}

     

       9
       9
        
       

     

       10
       10
        
       {{ define "repoContent" }}

     

       11
       11
        
       <section id="commit-table" class="overflow-x-auto">

     

       12
       12
        
           <h2 class="font-bold text-sm mb-4 uppercase dark:text-white">

     

       13
       13
       +
              commits 

     

       13
       13
       -
              commits

     

       14
       14
        
           </h2>

     

       15
       15
        
       

     

       16
       16
        
           <!-- desktop view (hidden on small screens) -->

     
···

       36
       36
        
                               {{ end }}

     

       37
       37
        
                           </td>

     

       38
       38
        
                           <td class="py-3 align-top font-mono flex items-center">

     

       39
       39
       +
                               {{ $verified := false }}

     

       40
       40
       +
                               {{ $verified = index $.VerifiedCommits $commit.Hash.String }}

     

       39
       39
       -
                               {{ $verified := $.VerifiedCommits.IsVerified $commit.Hash.String }}

     

       40
       41
        
                               {{ $hashStyle := "text-gray-700 dark:text-gray-300 bg-gray-100 dark:bg-gray-900" }}

     

       41
       42
        
                               {{ if $verified }}

     

       42
       43
        
                                   {{ $hashStyle = "bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200 px-2 rounded" }}

     
···

       48
       49
        
                                   {{ end }}

     

       49
       50
        
                               </a>

     

       50
       51
        
                               <div class="{{ if not $verified }} ml-6 {{ end }}inline-flex">

     

       52
       52
       +
                                   <button class="p-1 mx-1 hover:bg-gray-100 dark:hover:bg-gray-700 rounded" 

     

       51
       51
       -
                                   <button class="p-1 mx-1 hover:bg-gray-100 dark:hover:bg-gray-700 rounded"

     

       52
       53
        
                                       title="Copy SHA"

     

       53
       54
        
                                       onclick="navigator.clipboard.writeText('{{ $commit.Hash.String }}'); this.innerHTML=`{{ i "copy-check" "w-4 h-4" }}`; setTimeout(() => this.innerHTML=`{{ i "copy" "w-4 h-4" }}`, 1500)">

     

       54
       55
        
                                           {{ i "copy" "w-4 h-4" }}

     
···

       62
       63
        
                             <div>

     

       63
       64
        
                                 <div class="flex items-center justify-start">

     

       64
       65
        
                                     <a href="/{{ $.RepoInfo.FullName }}/commit/{{ $commit.Hash.String }}" class="dark:text-white no-underline hover:underline">{{ index $messageParts 0 }}</a>

     

       66
       66
       +
                                     {{ if gt (len $messageParts) 1 }} 

     

       65
       65
       -
                                     {{ if gt (len $messageParts) 1 }}

     

       66
       67
        
                                     <button class="ml-2 py-1/2 px-1 bg-gray-200 hover:bg-gray-400 dark:bg-gray-700 dark:hover:bg-gray-600 rounded" hx-on:click="this.parentElement.nextElementSibling.classList.toggle('hidden')">{{ i "ellipsis" "w-3 h-3" }}</button>

     

       67
       68
        
                                     {{ end }}

     

       68
       69
        
       

     

       70
       70
       +
                                     

     

       69
       69
       -
       

     

       70
       71
        
                                     {{ if index $.TagMap $commit.Hash.String }}

     

       71
       72
        
                                       {{ range $tag := index $.TagMap $commit.Hash.String }}

     

       72
       73
        
                                         <span class="ml-2 text-xs rounded bg-gray-100 dark:bg-gray-700 text-black dark:text-white font-mono px-2 inline-flex items-center">

     
···

       74
       75
        
                                         </span>

     

       75
       76
        
                                       {{ end }}

     

       76
       77
        
                                     {{ end }}

     

       78
       78
       +
                         

     

       77
       77
       -
       

     

       78
       79
        
                                 </div>

     

       80
       80
       +
                                 

     

       79
       79
       -
       

     

       80
       81
        
                                 {{ if gt (len $messageParts) 1 }}

     

       81
       82
        
                                 <p class="hidden mt-1 text-sm text-gray-600 dark:text-gray-400">{{ nl2br (index $messageParts 1) }}</p>

     

       82
       83
        
                                 {{ end }}

     
···

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

     

       99
       100
        
                                       <div class="flex-1">

     

       100
       101
        
                                           <div class="inline">

     

       102
       102
       +
                                               <a href="/{{ $.RepoInfo.FullName }}/commit/{{ $commit.Hash.String }}" 

     

       101
       101
       -
                                               <a href="/{{ $.RepoInfo.FullName }}/commit/{{ $commit.Hash.String }}"

     

       102
       103
        
                                                  class="inline no-underline hover:underline dark:text-white">

     

       103
       104
        
                                                  {{ index $messageParts 0 }}

     

       104
       105
        
                                               </a>

     

       105
       106
        
                                               {{ if gt (len $messageParts) 1 }}

     

       107
       107
       +
                                                   <button 

     

       106
       106
       -
                                                   <button

     

       107
       108
        
                                                       class="py-1/2 px-1 bg-gray-200 hover:bg-gray-400 rounded dark:bg-gray-700 dark:hover:bg-gray-600 ml-2"

     

       108
       109
        
                                                       hx-on:click="this.parentElement.nextElementSibling.classList.toggle('hidden')">

     

       109
       110
        
                                                       {{ i "ellipsis" "w-3 h-3" }}

     
···

       125
       126
        
                                               </p>

     

       126
       127
        
                                           {{ end }}

     

       127
       128
        
                                       </div>

     

       129
       129
       +
                                       <a href="/{{ $.RepoInfo.FullName }}/tree/{{ $commit.Hash.String }}" 

     

       130
       130
       +
                                          class="p-1 mr-1 hover:bg-gray-100 dark:hover:bg-gray-700 rounded" 

     

       128
       128
       -
                                       <a href="/{{ $.RepoInfo.FullName }}/tree/{{ $commit.Hash.String }}"

     

       129
       129
       -
                                          class="p-1 mr-1 hover:bg-gray-100 dark:hover:bg-gray-700 rounded"

     

       130
       131
        
                                          title="Browse repository at this commit">

     

       131
       132
        
                                           {{ i "folder-code" "w-4 h-4" }}

     

       132
       133
        
                                       </a>

     
···

       136
       137
        
                       </div>

     

       137
       138
        
       

     

       138
       139
        
                       <div class="text-xs mt-2 text-gray-500 dark:text-gray-400 flex items-center">

     

       140
       140
       +
                           {{ $verified := false }}

     

       141
       141
       +
                           {{ $verified = index $.VerifiedCommits $commit.Hash.String }}

     

       139
       139
       -
                           {{ $verified := $.VerifiedCommits.IsVerified $commit.Hash.String }}

     

       140
       142
        
                           {{ $hashStyle := "text-gray-700 dark:text-gray-300 bg-gray-100 dark:bg-gray-900" }}

     

       141
       143
        
                           {{ if $verified }}

     

       142
       144
        
                               {{ $hashStyle = "bg-green-100 text-green-800 dark:bg-green-900 dark:text-green-200 px-2 rounded" }}

REVERTED

appview/config/config.go

···

       25
       25
        
       }

     

       26
       26
        
       

     

       27
       27
        
       type ResendConfig struct {

     

       28
       28
       +
       	ApiKey string `env:"API_KEY"`

     

       28
       28
       -
       	ApiKey   string `env:"API_KEY"`

     

       29
       29
       -
       	SentFrom string `env:"SENT_FROM, default=noreply@notifs.tangled.sh"`

     

       30
       29
        
       }

     

       31
       30
        
       

     

       32
       31
        
       type CamoConfig struct {

REVERTED

appview/settings/settings.go

···

       81
       81
        
       

     

       82
       82
        
       	return email.Email{

     

       83
       83
        
       		APIKey:  s.Config.Resend.ApiKey,

     

       84
       84
       +
       		From:    "noreply@notifs.tangled.sh",

     

       84
       84
       -
       		From:    s.Config.Resend.SentFrom,

     

       85
       85
        
       		To:      emailAddr,

     

       86
       86
        
       		Subject: "Verify your Tangled email",

     

       87
       87
        
       		Text: `Click the link below (or copy and paste it into your browser) to verify your email address.

ERROR

appview/repo/repo.go

Failed to calculate interdiff for this file.

REVERTED

go.mod

···

       21
       21
        
       	github.com/go-git/go-git/v5 v5.14.0

     

       22
       22
        
       	github.com/google/uuid v1.6.0

     

       23
       23
        
       	github.com/gorilla/sessions v1.4.0

     

       24
       24
       -
       	github.com/gorilla/websocket v1.5.3

     

       25
       24
        
       	github.com/hiddeco/sshsig v0.2.0

     

       26
       25
        
       	github.com/ipfs/go-cid v0.5.0

     

       27
       26
        
       	github.com/lestrrat-go/jwx/v2 v2.1.6

     
···

       67
       66
        
       	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect

     

       68
       67
        
       	github.com/gorilla/css v1.0.1 // indirect

     

       69
       68
        
       	github.com/gorilla/securecookie v1.1.2 // indirect

     

       69
       69
       +
       	github.com/gorilla/websocket v1.5.3 // indirect

     

       70
       70
        
       	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect

     

       71
       71
        
       	github.com/hashicorp/go-retryablehttp v0.7.7 // indirect

     

       72
       72
        
       	github.com/hashicorp/golang-lru v1.0.2 // indirect

     
···

       139
       139
        
       

     

       140
       140
        
       replace github.com/bluekeyes/go-gitdiff => tangled.sh/oppi.li/go-gitdiff v0.8.2

     

       141
       141
        
       

     

       142
       142
       +
       replace github.com/alecthomas/chroma/v2 => github.com/oppiliappan/chroma/v2 v2.17.0

     

       142
       142
       -
       replace github.com/alecthomas/chroma/v2 => github.com/oppiliappan/chroma/v2 v2.19.0

     

       143
       143
        
       

     

       144
       144
        
       // from bluesky-social/indigo

     

       145
       145
        
       replace github.com/gocql/gocql => github.com/scylladb/gocql v1.14.4

REVERTED

go.sum

···

       289
       289
        
       github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=

     

       290
       290
        
       github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=

     

       291
       291
        
       github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=

     

       292
       292
       +
       github.com/oppiliappan/chroma/v2 v2.17.0 h1:Qi8qnCvhCn8VxwD+BGpt7n5BdLX32/2kRBlT7hAR5Ko=

     

       293
       293
       +
       github.com/oppiliappan/chroma/v2 v2.17.0/go.mod h1:RVX6AvYm4VfYe/zsk7mjHueLDZor3aWCNE14TFlepBk=

     

       292
       292
       -
       github.com/oppiliappan/chroma/v2 v2.19.0 h1:PN7/pb+6JRKCva30NPTtRJMlrOyzgpPpIroNzy4ekHU=

     

       293
       293
       -
       github.com/oppiliappan/chroma/v2 v2.19.0/go.mod h1:RVX6AvYm4VfYe/zsk7mjHueLDZor3aWCNE14TFlepBk=

     

       294
       294
        
       github.com/oppiliappan/go-git/v5 v5.17.0 h1:CuJnpcIDxr0oiNaSHMconovSWnowHznVDG+AhjGuSEo=

     

       295
       295
        
       github.com/oppiliappan/go-git/v5 v5.17.0/go.mod h1:q/FE8C3SPMoRN7LoH9vRFiBzidAOBWJPS1CqVS8DN+w=

     

       296
       296
        
       github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4=

NEW

appview/pages/pages.go

···

       416
       416
        
       	Raw                bool

     

       417
       417
        
       	EmailToDidOrHandle map[string]string

     

       418
       418
        
       	VerifiedCommits    commitverify.VerifiedCommits

     

       419
       419
       -
       	Languages          *types.RepoLanguageResponse

     

       419
       419
       +
       	Languages          []types.RepoLanguageDetails

     

       420
       420
        
       	types.RepoIndexResponse

     

       421
       421
        
       }

     

       422
       422

NEW

appview/pages/templates/repo/index.html

···

       7
       7
        
           {{ template "repo/fragments/og" (dict "RepoInfo" .RepoInfo) }}

     

       8
       8
        
       {{ end }}

     

       9
       9
        
       

     

       10
       10
       +
       {{ define "repoLanguages" }}

     

       11
       11
       +
           <div class="flex gap-[3px]">

     

       12
       12
       +
               {{ range $value := .Languages }}

     

       13
       13
       +
                   <div

     

       14
       14
       +
                       title="{{ $value.Name }} {{ printf "%.1f" $value.Percentage }}%"

     

       15
       15
       +
                       class="h-2"

     

       16
       16
       +
                       style="background-color: {{ $value.Color }}; width: {{ $value.Percentage }}%"

     

       17
       17
       +
                   ></div>

     

       18
       18
       +
               {{ end }}

     

       19
       19
       +
           </div>

     

       20
       20
       +
       {{ end }}

     

       10
       21
        
       

     

       11
       22
        
       {{ define "repoContent" }}

     

       12
       23
        
           <main>