comparing a53d124ea4746109c1933f7adc72f0bde1309890 and master on julien.rbrt.fr/tangled-core

+67 -57

appview/notify/db/db.go

···

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     

       5
       5
        
       	"log"

     

       6
       6
       -
       	"maps"

     

       7
       6
        
       	"slices"

     

       8
       7
        
       

     

       9
       8
        
       	"github.com/bluesky-social/indigo/atproto/syntax"

     
···

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

     

       14
       13
        
       	"tangled.org/core/idresolver"

     

       15
       14
        
       	"tangled.org/core/orm"

     

       15
       15
       +
       	"tangled.org/core/sets"

     

       16
       16
        
       )

     

       17
       17
        
       

     

       18
       18
        
       const (

     

       19
       19
       -
       	maxMentions = 5

     

       19
       19
       +
       	maxMentions = 8

     

       20
       20
        
       )

     

       21
       21
        
       

     

       22
       22
        
       type databaseNotifier struct {

     
···

       50
       50
        
       	}

     

       51
       51
        
       

     

       52
       52
        
       	actorDid := syntax.DID(star.Did)

     

       53
       53
       -
       	recipients := []syntax.DID{syntax.DID(repo.Did)}

     

       53
       53
       +
       	recipients := sets.Singleton(syntax.DID(repo.Did))

     

       54
       54
        
       	eventType := models.NotificationTypeRepoStarred

     

       55
       55
        
       	entityType := "repo"

     

       56
       56
        
       	entityId := star.RepoAt.String()

     
···

       75
       75
        
       }

     

       76
       76
        
       

     

       77
       77
        
       func (n *databaseNotifier) NewIssue(ctx context.Context, issue *models.Issue, mentions []syntax.DID) {

     

       78
       78
       -
       

     

       79
       79
       -
       	// build the recipients list

     

       80
       80
       -
       	// - owner of the repo

     

       81
       81
       -
       	// - collaborators in the repo

     

       82
       82
       -
       	var recipients []syntax.DID

     

       83
       83
       -
       	recipients = append(recipients, syntax.DID(issue.Repo.Did))

     

       84
       78
        
       	collaborators, err := db.GetCollaborators(n.db, orm.FilterEq("repo_at", issue.Repo.RepoAt()))

     

       85
       79
        
       	if err != nil {

     

       86
       80
        
       		log.Printf("failed to fetch collaborators: %v", err)

     

       87
       81
        
       		return

     

       88
       82
        
       	}

     

       83
       83
       +
       

     

       84
       84
       +
       	// build the recipients list

     

       85
       85
       +
       	// - owner of the repo

     

       86
       86
       +
       	// - collaborators in the repo

     

       87
       87
       +
       	// - remove users already mentioned

     

       88
       88
       +
       	recipients := sets.Singleton(syntax.DID(issue.Repo.Did))

     

       89
       89
        
       	for _, c := range collaborators {

     

       90
       90
       -
       		recipients = append(recipients, c.SubjectDid)

     

       90
       90
       +
       		recipients.Insert(c.SubjectDid)

     

       91
       91
       +
       	}

     

       92
       92
       +
       	for _, m := range mentions {

     

       93
       93
       +
       		recipients.Remove(m)

     

       91
       94
        
       	}

     

       92
       95
        
       

     

       93
       96
        
       	actorDid := syntax.DID(issue.Did)

     
···

       109
       112
        
       	)

     

       110
       113
        
       	n.notifyEvent(

     

       111
       114
        
       		actorDid,

     

       112
       112
       -
       		mentions,

     

       115
       115
       +
       		sets.Collect(slices.Values(mentions)),

     

       113
       116
        
       		models.NotificationTypeUserMentioned,

     

       114
       117
        
       		entityType,

     

       115
       118
        
       		entityId,

     
···

       131
       134
        
       	}

     

       132
       135
        
       	issue := issues[0]

     

       133
       136
        
       

     

       134
       134
       -
       	var recipients []syntax.DID

     

       135
       135
       -
       	recipients = append(recipients, syntax.DID(issue.Repo.Did))

     

       137
       137
       +
       	// built the recipients list:

     

       138
       138
       +
       	// - the owner of the repo

     

       139
       139
       +
       	// - | if the comment is a reply -> everybody on that thread

     

       140
       140
       +
       	//   | if the comment is a top level -> just the issue owner

     

       141
       141
       +
       	// - remove mentioned users from the recipients list

     

       142
       142
       +
       	recipients := sets.Singleton(syntax.DID(issue.Repo.Did))

     

       136
       143
        
       

     

       137
       144
        
       	if comment.IsReply() {

     

       138
       145
        
       		// if this comment is a reply, then notify everybody in that thread

     

       139
       146
        
       		parentAtUri := *comment.ReplyTo

     

       140
       140
       -
       		allThreads := issue.CommentList()

     

       141
       147
        
       

     

       142
       148
        
       		// find the parent thread, and add all DIDs from here to the recipient list

     

       143
       143
       -
       		for _, t := range allThreads {

     

       149
       149
       +
       		for _, t := range issue.CommentList() {

     

       144
       150
        
       			if t.Self.AtUri().String() == parentAtUri {

     

       145
       145
       -
       				recipients = append(recipients, t.Participants()...)

     

       151
       151
       +
       				for _, p := range t.Participants() {

     

       152
       152
       +
       					recipients.Insert(p)

     

       153
       153
       +
       				}

     

       146
       154
        
       			}

     

       147
       155
        
       		}

     

       148
       156
        
       	} else {

     

       149
       157
        
       		// not a reply, notify just the issue author

     

       150
       150
       -
       		recipients = append(recipients, syntax.DID(issue.Did))

     

       158
       158
       +
       		recipients.Insert(syntax.DID(issue.Did))

     

       159
       159
       +
       	}

     

       160
       160
       +
       

     

       161
       161
       +
       	for _, m := range mentions {

     

       162
       162
       +
       		recipients.Remove(m)

     

       151
       163
        
       	}

     

       152
       164
        
       

     

       153
       165
        
       	actorDid := syntax.DID(comment.Did)

     
···

       169
       181
        
       	)

     

       170
       182
        
       	n.notifyEvent(

     

       171
       183
        
       		actorDid,

     

       172
       172
       -
       		mentions,

     

       184
       184
       +
       		sets.Collect(slices.Values(mentions)),

     

       173
       185
        
       		models.NotificationTypeUserMentioned,

     

       174
       186
        
       		entityType,

     

       175
       187
        
       		entityId,

     
···

       185
       197
        
       

     

       186
       198
        
       func (n *databaseNotifier) NewFollow(ctx context.Context, follow *models.Follow) {

     

       187
       199
        
       	actorDid := syntax.DID(follow.UserDid)

     

       188
       188
       -
       	recipients := []syntax.DID{syntax.DID(follow.SubjectDid)}

     

       200
       200
       +
       	recipients := sets.Singleton(syntax.DID(follow.SubjectDid))

     

       189
       201
        
       	eventType := models.NotificationTypeFollowed

     

       190
       202
        
       	entityType := "follow"

     

       191
       203
        
       	entityId := follow.UserDid

     
···

       213
       225
        
       		log.Printf("NewPull: failed to get repos: %v", err)

     

       214
       226
        
       		return

     

       215
       227
        
       	}

     

       216
       216
       -
       

     

       217
       217
       -
       	// build the recipients list

     

       218
       218
       -
       	// - owner of the repo

     

       219
       219
       -
       	// - collaborators in the repo

     

       220
       220
       -
       	var recipients []syntax.DID

     

       221
       221
       -
       	recipients = append(recipients, syntax.DID(repo.Did))

     

       222
       228
        
       	collaborators, err := db.GetCollaborators(n.db, orm.FilterEq("repo_at", repo.RepoAt()))

     

       223
       229
        
       	if err != nil {

     

       224
       230
        
       		log.Printf("failed to fetch collaborators: %v", err)

     

       225
       231
        
       		return

     

       226
       232
        
       	}

     

       233
       233
       +
       

     

       234
       234
       +
       	// build the recipients list

     

       235
       235
       +
       	// - owner of the repo

     

       236
       236
       +
       	// - collaborators in the repo

     

       237
       237
       +
       	recipients := sets.Singleton(syntax.DID(repo.Did))

     

       227
       238
        
       	for _, c := range collaborators {

     

       228
       228
       -
       		recipients = append(recipients, c.SubjectDid)

     

       239
       239
       +
       		recipients.Insert(c.SubjectDid)

     

       229
       240
        
       	}

     

       230
       241
        
       

     

       231
       242
        
       	actorDid := syntax.DID(pull.OwnerDid)

     
···

       268
       279
        
       	// build up the recipients list:

     

       269
       280
        
       	// - repo owner

     

       270
       281
        
       	// - all pull participants

     

       271
       271
       -
       	var recipients []syntax.DID

     

       272
       272
       -
       	recipients = append(recipients, syntax.DID(repo.Did))

     

       282
       282
       +
       	// - remove those already mentioned

     

       283
       283
       +
       	recipients := sets.Singleton(syntax.DID(repo.Did))

     

       273
       284
        
       	for _, p := range pull.Participants() {

     

       274
       274
       -
       		recipients = append(recipients, syntax.DID(p))

     

       285
       285
       +
       		recipients.Insert(syntax.DID(p))

     

       286
       286
       +
       	}

     

       287
       287
       +
       	for _, m := range mentions {

     

       288
       288
       +
       		recipients.Remove(m)

     

       275
       289
        
       	}

     

       276
       290
        
       

     

       277
       291
        
       	actorDid := syntax.DID(comment.OwnerDid)

     
···

       295
       309
        
       	)

     

       296
       310
        
       	n.notifyEvent(

     

       297
       311
        
       		actorDid,

     

       298
       298
       -
       		mentions,

     

       312
       312
       +
       		sets.Collect(slices.Values(mentions)),

     

       299
       313
        
       		models.NotificationTypeUserMentioned,

     

       300
       314
        
       		entityType,

     

       301
       315
        
       		entityId,

     
···

       322
       336
        
       }

     

       323
       337
        
       

     

       324
       338
        
       func (n *databaseNotifier) NewIssueState(ctx context.Context, actor syntax.DID, issue *models.Issue) {

     

       325
       325
       -
       	// build up the recipients list:

     

       326
       326
       -
       	// - repo owner

     

       327
       327
       -
       	// - repo collaborators

     

       328
       328
       -
       	// - all issue participants

     

       329
       329
       -
       	var recipients []syntax.DID

     

       330
       330
       -
       	recipients = append(recipients, syntax.DID(issue.Repo.Did))

     

       331
       339
        
       	collaborators, err := db.GetCollaborators(n.db, orm.FilterEq("repo_at", issue.Repo.RepoAt()))

     

       332
       340
        
       	if err != nil {

     

       333
       341
        
       		log.Printf("failed to fetch collaborators: %v", err)

     

       334
       342
        
       		return

     

       335
       343
        
       	}

     

       344
       344
       +
       

     

       345
       345
       +
       	// build up the recipients list:

     

       346
       346
       +
       	// - repo owner

     

       347
       347
       +
       	// - repo collaborators

     

       348
       348
       +
       	// - all issue participants

     

       349
       349
       +
       	recipients := sets.Singleton(syntax.DID(issue.Repo.Did))

     

       336
       350
        
       	for _, c := range collaborators {

     

       337
       337
       -
       		recipients = append(recipients, c.SubjectDid)

     

       351
       351
       +
       		recipients.Insert(c.SubjectDid)

     

       338
       352
        
       	}

     

       339
       353
        
       	for _, p := range issue.Participants() {

     

       340
       340
       -
       		recipients = append(recipients, syntax.DID(p))

     

       354
       354
       +
       		recipients.Insert(syntax.DID(p))

     

       341
       355
        
       	}

     

       342
       356
        
       

     

       343
       357
        
       	entityType := "pull"

     
···

       373
       387
        
       		return

     

       374
       388
        
       	}

     

       375
       389
        
       

     

       376
       376
       -
       	// build up the recipients list:

     

       377
       377
       -
       	// - repo owner

     

       378
       378
       -
       	// - all pull participants

     

       379
       379
       -
       	var recipients []syntax.DID

     

       380
       380
       -
       	recipients = append(recipients, syntax.DID(repo.Did))

     

       381
       390
        
       	collaborators, err := db.GetCollaborators(n.db, orm.FilterEq("repo_at", repo.RepoAt()))

     

       382
       391
        
       	if err != nil {

     

       383
       392
        
       		log.Printf("failed to fetch collaborators: %v", err)

     

       384
       393
        
       		return

     

       385
       394
        
       	}

     

       395
       395
       +
       

     

       396
       396
       +
       	// build up the recipients list:

     

       397
       397
       +
       	// - repo owner

     

       398
       398
       +
       	// - all pull participants

     

       399
       399
       +
       	recipients := sets.Singleton(syntax.DID(repo.Did))

     

       386
       400
        
       	for _, c := range collaborators {

     

       387
       387
       -
       		recipients = append(recipients, c.SubjectDid)

     

       401
       401
       +
       		recipients.Insert(c.SubjectDid)

     

       388
       402
        
       	}

     

       389
       403
        
       	for _, p := range pull.Participants() {

     

       390
       390
       -
       		recipients = append(recipients, syntax.DID(p))

     

       404
       404
       +
       		recipients.Insert(syntax.DID(p))

     

       391
       405
        
       	}

     

       392
       406
        
       

     

       393
       407
        
       	entityType := "pull"

     
···

       423
       437
        
       

     

       424
       438
        
       func (n *databaseNotifier) notifyEvent(

     

       425
       439
        
       	actorDid syntax.DID,

     

       426
       426
       -
       	recipients []syntax.DID,

     

       440
       440
       +
       	recipients sets.Set[syntax.DID],

     

       427
       441
        
       	eventType models.NotificationType,

     

       428
       442
        
       	entityType string,

     

       429
       443
        
       	entityId string,

     
···

       431
       445
        
       	issueId *int64,

     

       432
       446
        
       	pullId *int64,

     

       433
       447
        
       ) {

     

       434
       434
       -
       	if eventType == models.NotificationTypeUserMentioned && len(recipients) > maxMentions {

     

       435
       435
       -
       		recipients = recipients[:maxMentions]

     

       448
       448
       +
       	// if the user is attempting to mention >maxMentions users, this is probably spam, do not mention anybody

     

       449
       449
       +
       	if eventType == models.NotificationTypeUserMentioned && recipients.Len() > maxMentions {

     

       450
       450
       +
       		return

     

       436
       451
        
       	}

     

       437
       437
       -
       	recipientSet := make(map[syntax.DID]struct{})

     

       438
       438
       -
       	for _, did := range recipients {

     

       439
       439
       -
       		// everybody except actor themselves

     

       440
       440
       -
       		if did != actorDid {

     

       441
       441
       -
       			recipientSet[did] = struct{}{}

     

       442
       442
       -
       		}

     

       443
       443
       -
       	}

     

       452
       452
       +
       

     

       453
       453
       +
       	recipients.Remove(actorDid)

     

       444
       454
        
       

     

       445
       455
        
       	prefMap, err := db.GetNotificationPreferences(

     

       446
       456
        
       		n.db,

     

       447
       447
       -
       		orm.FilterIn("user_did", slices.Collect(maps.Keys(recipientSet))),

     

       457
       457
       +
       		orm.FilterIn("user_did", slices.Collect(recipients.All())),

     

       448
       458
        
       	)

     

       449
       459
        
       	if err != nil {

     

       450
       460
        
       		// failed to get prefs for users

     
···

       460
       470
        
       	defer tx.Rollback()

     

       461
       471
        
       

     

       462
       472
        
       	// filter based on preferences

     

       463
       463
       -
       	for recipientDid := range recipientSet {

     

       473
       473
       +
       	for recipientDid := range recipients.All() {

     

       464
       474
        
       		prefs, ok := prefMap[recipientDid]

     

       465
       475
        
       		if !ok {

     

       466
       476
        
       			prefs = models.DefaultNotificationPreferences(recipientDid)

+9 -6

appview/pages/templates/user/signup.html

···

       43
       43
        
                           page to complete your registration.

     

       44
       44
        
                           </span>

     

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

     

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

     

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

     

       47
       47
        
                           </div>

     

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

     

       49
       49
        
                             <span>join now</span>

     

       50
       50
        
                           </button>

     

       51
       51
       +
                           <p class="text-sm text-gray-500">

     

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

     

       53
       53
       +
                           </p>

     

       54
       54
       +
       

     

       55
       55
       +
                           <p id="signup-msg" class="error w-full"></p>

     

       56
       56
       +
                           <p class="text-sm text-gray-500 pt-4">

     

       57
       57
       +
                             By signing up, you agree to our <a href="/terms" class="underline">Terms of Service</a> and <a href="/privacy" class="underline">Privacy Policy</a>.

     

       58
       58
       +
                           </p>

     

       51
       59
        
                       </form>

     

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

     

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

     

       54
       54
       -
                       </p>

     

       55
       55
       -
       

     

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

     

       57
       60
        
                   </main>

     

       58
       61
        
               </body>

     

       59
       62
        
           </html>

+3 -3

flake.lock

···

       150
       150
        
           },

     

       151
       151
        
           "nixpkgs": {

     

       152
       152
        
             "locked": {

     

       153
       153
       -
               "lastModified": 1751984180,

     

       154
       154
       -
               "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",

     

       153
       153
       +
               "lastModified": 1765186076,

     

       154
       154
       +
               "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=",

     

       155
       155
        
               "owner": "nixos",

     

       156
       156
        
               "repo": "nixpkgs",

     

       157
       157
       -
               "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",

     

       157
       157
       +
               "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8",

     

       158
       158
        
               "type": "github"

     

       159
       159
        
             },

     

       160
       160
        
             "original": {

-2

flake.nix

···

       80
       80
        
                 }).buildGoApplication;

     

       81
       81
        
               modules = ./nix/gomod2nix.toml;

     

       82
       82
        
               sqlite-lib = self.callPackage ./nix/pkgs/sqlite-lib.nix {

     

       83
       83
       -
                 inherit (pkgs) gcc;

     

       84
       83
        
                 inherit sqlite-lib-src;

     

       85
       84
        
               };

     

       86
       85
        
               lexgen = self.callPackage ./nix/pkgs/lexgen.nix {inherit indigo;};

     
···

       156
       155
        
               nativeBuildInputs = [

     

       157
       156
        
                 pkgs.go

     

       158
       157
        
                 pkgs.air

     

       159
       159
       -
                 pkgs.tilt

     

       160
       158
        
                 pkgs.gopls

     

       161
       159
        
                 pkgs.httpie

     

       162
       160
        
                 pkgs.litecli

+1 -1

go.mod

···

       1
       1
        
       module tangled.org/core

     

       2
       2
        
       

     

       3
       3
       -
       go 1.24.4

     

       3
       3
       +
       go 1.25.0

     

       4
       4
        
       

     

       5
       5
        
       require (

     

       6
       6
        
       	github.com/Blank-Xu/sql-adapter v1.1.1

+81

knotserver/db/db.go

···

       1
       1
       +
       package db

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       	"database/sql"

     

       6
       6
       +
       	"log/slog"

     

       7
       7
       +
       	"strings"

     

       8
       8
       +
       

     

       9
       9
       +
       	_ "github.com/mattn/go-sqlite3"

     

       10
       10
       +
       	"tangled.org/core/log"

     

       11
       11
       +
       )

     

       12
       12
       +
       

     

       13
       13
       +
       type DB struct {

     

       14
       14
       +
       	db     *sql.DB

     

       15
       15
       +
       	logger *slog.Logger

     

       16
       16
       +
       }

     

       17
       17
       +
       

     

       18
       18
       +
       func Setup(ctx context.Context, dbPath string) (*DB, error) {

     

       19
       19
       +
       	// https://github.com/mattn/go-sqlite3#connection-string

     

       20
       20
       +
       	opts := []string{

     

       21
       21
       +
       		"_foreign_keys=1",

     

       22
       22
       +
       		"_journal_mode=WAL",

     

       23
       23
       +
       		"_synchronous=NORMAL",

     

       24
       24
       +
       		"_auto_vacuum=incremental",

     

       25
       25
       +
       	}

     

       26
       26
       +
       

     

       27
       27
       +
       	logger := log.FromContext(ctx)

     

       28
       28
       +
       	logger = log.SubLogger(logger, "db")

     

       29
       29
       +
       

     

       30
       30
       +
       	db, err := sql.Open("sqlite3", dbPath+"?"+strings.Join(opts, "&"))

     

       31
       31
       +
       	if err != nil {

     

       32
       32
       +
       		return nil, err

     

       33
       33
       +
       	}

     

       34
       34
       +
       

     

       35
       35
       +
       	conn, err := db.Conn(ctx)

     

       36
       36
       +
       	if err != nil {

     

       37
       37
       +
       		return nil, err

     

       38
       38
       +
       	}

     

       39
       39
       +
       	defer conn.Close()

     

       40
       40
       +
       

     

       41
       41
       +
       	_, err = conn.ExecContext(ctx, `

     

       42
       42
       +
       		create table if not exists known_dids (

     

       43
       43
       +
       			did text primary key

     

       44
       44
       +
       		);

     

       45
       45
       +
       

     

       46
       46
       +
       		create table if not exists public_keys (

     

       47
       47
       +
       			id integer primary key autoincrement,

     

       48
       48
       +
       			did text not null,

     

       49
       49
       +
       			key text not null,

     

       50
       50
       +
       			created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),

     

       51
       51
       +
       			unique(did, key),

     

       52
       52
       +
       			foreign key (did) references known_dids(did) on delete cascade

     

       53
       53
       +
       		);

     

       54
       54
       +
       

     

       55
       55
       +
       		create table if not exists _jetstream (

     

       56
       56
       +
       			id integer primary key autoincrement,

     

       57
       57
       +
       			last_time_us integer not null

     

       58
       58
       +
       		);

     

       59
       59
       +
       

     

       60
       60
       +
       		create table if not exists events (

     

       61
       61
       +
       			rkey text not null,

     

       62
       62
       +
       			nsid text not null,

     

       63
       63
       +
       			event text not null, -- json

     

       64
       64
       +
       			created integer not null default (strftime('%s', 'now')),

     

       65
       65
       +
       			primary key (rkey, nsid)

     

       66
       66
       +
       		);

     

       67
       67
       +
       

     

       68
       68
       +
       		create table if not exists migrations (

     

       69
       69
       +
       			id integer primary key autoincrement,

     

       70
       70
       +
       			name text unique

     

       71
       71
       +
       		);

     

       72
       72
       +
       	`)

     

       73
       73
       +
       	if err != nil {

     

       74
       74
       +
       		return nil, err

     

       75
       75
       +
       	}

     

       76
       76
       +
       

     

       77
       77
       +
       	return &DB{

     

       78
       78
       +
       		db:     db,

     

       79
       79
       +
       		logger: logger,

     

       80
       80
       +
       	}, nil

     

       81
       81
       +
       }

-64

knotserver/db/init.go

···

       1
       1
       -
       package db

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"database/sql"

     

       5
       5
       -
       	"strings"

     

       6
       6
       -
       

     

       7
       7
       -
       	_ "github.com/mattn/go-sqlite3"

     

       8
       8
       -
       )

     

       9
       9
       -
       

     

       10
       10
       -
       type DB struct {

     

       11
       11
       -
       	db *sql.DB

     

       12
       12
       -
       }

     

       13
       13
       -
       

     

       14
       14
       -
       func Setup(dbPath string) (*DB, error) {

     

       15
       15
       -
       	// https://github.com/mattn/go-sqlite3#connection-string

     

       16
       16
       -
       	opts := []string{

     

       17
       17
       -
       		"_foreign_keys=1",

     

       18
       18
       -
       		"_journal_mode=WAL",

     

       19
       19
       -
       		"_synchronous=NORMAL",

     

       20
       20
       -
       		"_auto_vacuum=incremental",

     

       21
       21
       -
       	}

     

       22
       22
       -
       

     

       23
       23
       -
       	db, err := sql.Open("sqlite3", dbPath+"?"+strings.Join(opts, "&"))

     

       24
       24
       -
       	if err != nil {

     

       25
       25
       -
       		return nil, err

     

       26
       26
       -
       	}

     

       27
       27
       -
       

     

       28
       28
       -
       	// NOTE: If any other migration is added here, you MUST

     

       29
       29
       -
       	// copy the pattern in appview: use a single sql.Conn

     

       30
       30
       -
       	// for every migration.

     

       31
       31
       -
       

     

       32
       32
       -
       	_, err = db.Exec(`

     

       33
       33
       -
       		create table if not exists known_dids (

     

       34
       34
       -
       			did text primary key

     

       35
       35
       -
       		);

     

       36
       36
       -
       

     

       37
       37
       -
       		create table if not exists public_keys (

     

       38
       38
       -
       			id integer primary key autoincrement,

     

       39
       39
       -
       			did text not null,

     

       40
       40
       -
       			key text not null,

     

       41
       41
       -
       			created text not null default (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),

     

       42
       42
       -
       			unique(did, key),

     

       43
       43
       -
       			foreign key (did) references known_dids(did) on delete cascade

     

       44
       44
       -
       		);

     

       45
       45
       -
       

     

       46
       46
       -
       		create table if not exists _jetstream (

     

       47
       47
       -
       			id integer primary key autoincrement,

     

       48
       48
       -
       			last_time_us integer not null

     

       49
       49
       -
       		);

     

       50
       50
       -
       

     

       51
       51
       -
       		create table if not exists events (

     

       52
       52
       -
       			rkey text not null,

     

       53
       53
       -
       			nsid text not null,

     

       54
       54
       -
       			event text not null, -- json

     

       55
       55
       -
       			created integer not null default (strftime('%s', 'now')),

     

       56
       56
       -
       			primary key (rkey, nsid)

     

       57
       57
       -
       		);

     

       58
       58
       -
       	`)

     

       59
       59
       -
       	if err != nil {

     

       60
       60
       -
       		return nil, err

     

       61
       61
       -
       	}

     

       62
       62
       -
       

     

       63
       63
       -
       	return &DB{db: db}, nil

     

       64
       64
       -
       }

+1 -1

knotserver/server.go

···

       64
       64
        
       		logger.Info("running in dev mode, signature verification is disabled")

     

       65
       65
        
       	}

     

       66
       66
        
       

     

       67
       67
       -
       	db, err := db.Setup(c.Server.DBPath)

     

       67
       67
       +
       	db, err := db.Setup(ctx, c.Server.DBPath)

     

       68
       68
        
       	if err != nil {

     

       69
       69
        
       		return fmt.Errorf("failed to load db: %w", err)

     

       70
       70
        
       	}

+7 -5

nix/pkgs/sqlite-lib.nix

···

       1
       1
        
       {

     

       2
       2
       -
         gcc,

     

       3
       2
        
         stdenv,

     

       4
       3
        
         sqlite-lib-src,

     

       5
       4
        
       }:

     

       6
       5
        
       stdenv.mkDerivation {

     

       7
       6
        
         name = "sqlite-lib";

     

       8
       7
        
         src = sqlite-lib-src;

     

       9
       9
       -
         nativeBuildInputs = [gcc];

     

       8
       8
       +
       

     

       10
       9
        
         buildPhase = ''

     

       11
       11
       -
           gcc -c sqlite3.c

     

       12
       12
       -
           ar rcs libsqlite3.a sqlite3.o

     

       13
       13
       -
           ranlib libsqlite3.a

     

       10
       10
       +
           $CC -c sqlite3.c

     

       11
       11
       +
           $AR rcs libsqlite3.a sqlite3.o

     

       12
       12
       +
           $RANLIB libsqlite3.a

     

       13
       13
       +
         '';

     

       14
       14
       +
       

     

       15
       15
       +
         installPhase = ''

     

       14
       16
        
           mkdir -p $out/include $out/lib

     

       15
       17
        
           cp *.h $out/include

     

       16
       18
        
           cp libsqlite3.a $out/lib

+31

sets/gen.go

···

       1
       1
       +
       package sets

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"math/rand"

     

       5
       5
       +
       	"reflect"

     

       6
       6
       +
       	"testing/quick"

     

       7
       7
       +
       )

     

       8
       8
       +
       

     

       9
       9
       +
       func (_ Set[T]) Generate(rand *rand.Rand, size int) reflect.Value {

     

       10
       10
       +
       	s := New[T]()

     

       11
       11
       +
       

     

       12
       12
       +
       	var zero T

     

       13
       13
       +
       	itemType := reflect.TypeOf(zero)

     

       14
       14
       +
       

     

       15
       15
       +
       	for {

     

       16
       16
       +
       		if s.Len() >= size {

     

       17
       17
       +
       			break

     

       18
       18
       +
       		}

     

       19
       19
       +
       

     

       20
       20
       +
       		item, ok := quick.Value(itemType, rand)

     

       21
       21
       +
       		if !ok {

     

       22
       22
       +
       			continue

     

       23
       23
       +
       		}

     

       24
       24
       +
       

     

       25
       25
       +
       		if val, ok := item.Interface().(T); ok {

     

       26
       26
       +
       			s.Insert(val)

     

       27
       27
       +
       		}

     

       28
       28
       +
       	}

     

       29
       29
       +
       

     

       30
       30
       +
       	return reflect.ValueOf(s)

     

       31
       31
       +
       }

+35

sets/readme.txt

···

       1
       1
       +
       sets

     

       2
       2
       +
       ----

     

       3
       3
       +
       set datastructure for go with generics and iterators. the

     

       4
       4
       +
       api is supposed to mimic rust's std::collections::HashSet api.

     

       5
       5
       +
       

     

       6
       6
       +
           s1 := sets.Collect(slices.Values([]int{1, 2, 3, 4}))

     

       7
       7
       +
           s2 := sets.Collect(slices.Values([]int{1, 2, 3, 4, 5, 6}))

     

       8
       8
       +
       

     

       9
       9
       +
           union     := sets.Collect(s1.Union(s2))

     

       10
       10
       +
           intersect := sets.Collect(s1.Intersection(s2))

     

       11
       11
       +
           diff      := sets.Collect(s1.Difference(s2))

     

       12
       12
       +
           symdiff   := sets.Collect(s1.SymmetricDifference(s2))

     

       13
       13
       +
       

     

       14
       14
       +
           s1.Len()          // 4

     

       15
       15
       +
           s1.Contains(1)    // true

     

       16
       16
       +
           s1.IsEmpty()      // false

     

       17
       17
       +
           s1.IsSubset(s2)   // true

     

       18
       18
       +
           s1.IsSuperset(s2) // false

     

       19
       19
       +
           s1.IsDisjoint(s2) // false

     

       20
       20
       +
       

     

       21
       21
       +
           if exists := s1.Insert(1); exists {

     

       22
       22
       +
               // already existed in set

     

       23
       23
       +
           }

     

       24
       24
       +
       

     

       25
       25
       +
           if existed := s1.Remove(1); existed {

     

       26
       26
       +
               // existed in set, now removed

     

       27
       27
       +
           }

     

       28
       28
       +
       

     

       29
       29
       +
       

     

       30
       30
       +
       testing

     

       31
       31
       +
       -------

     

       32
       32
       +
       includes property-based tests using the wonderful

     

       33
       33
       +
       testing/quick module!

     

       34
       34
       +
       

     

       35
       35
       +
           go test -v

+174

sets/set.go

···

       1
       1
       +
       package sets

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"iter"

     

       5
       5
       +
       	"maps"

     

       6
       6
       +
       )

     

       7
       7
       +
       

     

       8
       8
       +
       type Set[T comparable] struct {

     

       9
       9
       +
       	data map[T]struct{}

     

       10
       10
       +
       }

     

       11
       11
       +
       

     

       12
       12
       +
       func New[T comparable]() Set[T] {

     

       13
       13
       +
       	return Set[T]{

     

       14
       14
       +
       		data: make(map[T]struct{}),

     

       15
       15
       +
       	}

     

       16
       16
       +
       }

     

       17
       17
       +
       

     

       18
       18
       +
       func (s *Set[T]) Insert(item T) bool {

     

       19
       19
       +
       	_, exists := s.data[item]

     

       20
       20
       +
       	s.data[item] = struct{}{}

     

       21
       21
       +
       	return !exists

     

       22
       22
       +
       }

     

       23
       23
       +
       

     

       24
       24
       +
       func Singleton[T comparable](item T) Set[T] {

     

       25
       25
       +
       	n := New[T]()

     

       26
       26
       +
       	_ = n.Insert(item)

     

       27
       27
       +
       	return n

     

       28
       28
       +
       }

     

       29
       29
       +
       

     

       30
       30
       +
       func (s *Set[T]) Remove(item T) bool {

     

       31
       31
       +
       	_, exists := s.data[item]

     

       32
       32
       +
       	if exists {

     

       33
       33
       +
       		delete(s.data, item)

     

       34
       34
       +
       	}

     

       35
       35
       +
       	return exists

     

       36
       36
       +
       }

     

       37
       37
       +
       

     

       38
       38
       +
       func (s Set[T]) Contains(item T) bool {

     

       39
       39
       +
       	_, exists := s.data[item]

     

       40
       40
       +
       	return exists

     

       41
       41
       +
       }

     

       42
       42
       +
       

     

       43
       43
       +
       func (s Set[T]) Len() int {

     

       44
       44
       +
       	return len(s.data)

     

       45
       45
       +
       }

     

       46
       46
       +
       

     

       47
       47
       +
       func (s Set[T]) IsEmpty() bool {

     

       48
       48
       +
       	return len(s.data) == 0

     

       49
       49
       +
       }

     

       50
       50
       +
       

     

       51
       51
       +
       func (s *Set[T]) Clear() {

     

       52
       52
       +
       	s.data = make(map[T]struct{})

     

       53
       53
       +
       }

     

       54
       54
       +
       

     

       55
       55
       +
       func (s Set[T]) All() iter.Seq[T] {

     

       56
       56
       +
       	return func(yield func(T) bool) {

     

       57
       57
       +
       		for item := range s.data {

     

       58
       58
       +
       			if !yield(item) {

     

       59
       59
       +
       				return

     

       60
       60
       +
       			}

     

       61
       61
       +
       		}

     

       62
       62
       +
       	}

     

       63
       63
       +
       }

     

       64
       64
       +
       

     

       65
       65
       +
       func (s Set[T]) Clone() Set[T] {

     

       66
       66
       +
       	return Set[T]{

     

       67
       67
       +
       		data: maps.Clone(s.data),

     

       68
       68
       +
       	}

     

       69
       69
       +
       }

     

       70
       70
       +
       

     

       71
       71
       +
       func (s Set[T]) Union(other Set[T]) iter.Seq[T] {

     

       72
       72
       +
       	if s.Len() >= other.Len() {

     

       73
       73
       +
       		return chain(s.All(), other.Difference(s))

     

       74
       74
       +
       	} else {

     

       75
       75
       +
       		return chain(other.All(), s.Difference(other))

     

       76
       76
       +
       	}

     

       77
       77
       +
       }

     

       78
       78
       +
       

     

       79
       79
       +
       func chain[T any](seqs ...iter.Seq[T]) iter.Seq[T] {

     

       80
       80
       +
       	return func(yield func(T) bool) {

     

       81
       81
       +
       		for _, seq := range seqs {

     

       82
       82
       +
       			for item := range seq {

     

       83
       83
       +
       				if !yield(item) {

     

       84
       84
       +
       					return

     

       85
       85
       +
       				}

     

       86
       86
       +
       			}

     

       87
       87
       +
       		}

     

       88
       88
       +
       	}

     

       89
       89
       +
       }

     

       90
       90
       +
       

     

       91
       91
       +
       func (s Set[T]) Intersection(other Set[T]) iter.Seq[T] {

     

       92
       92
       +
       	return func(yield func(T) bool) {

     

       93
       93
       +
       		for item := range s.data {

     

       94
       94
       +
       			if other.Contains(item) {

     

       95
       95
       +
       				if !yield(item) {

     

       96
       96
       +
       					return

     

       97
       97
       +
       				}

     

       98
       98
       +
       			}

     

       99
       99
       +
       		}

     

       100
       100
       +
       	}

     

       101
       101
       +
       }

     

       102
       102
       +
       

     

       103
       103
       +
       func (s Set[T]) Difference(other Set[T]) iter.Seq[T] {

     

       104
       104
       +
       	return func(yield func(T) bool) {

     

       105
       105
       +
       		for item := range s.data {

     

       106
       106
       +
       			if !other.Contains(item) {

     

       107
       107
       +
       				if !yield(item) {

     

       108
       108
       +
       					return

     

       109
       109
       +
       				}

     

       110
       110
       +
       			}

     

       111
       111
       +
       		}

     

       112
       112
       +
       	}

     

       113
       113
       +
       }

     

       114
       114
       +
       

     

       115
       115
       +
       func (s Set[T]) SymmetricDifference(other Set[T]) iter.Seq[T] {

     

       116
       116
       +
       	return func(yield func(T) bool) {

     

       117
       117
       +
       		for item := range s.data {

     

       118
       118
       +
       			if !other.Contains(item) {

     

       119
       119
       +
       				if !yield(item) {

     

       120
       120
       +
       					return

     

       121
       121
       +
       				}

     

       122
       122
       +
       			}

     

       123
       123
       +
       		}

     

       124
       124
       +
       		for item := range other.data {

     

       125
       125
       +
       			if !s.Contains(item) {

     

       126
       126
       +
       				if !yield(item) {

     

       127
       127
       +
       					return

     

       128
       128
       +
       				}

     

       129
       129
       +
       			}

     

       130
       130
       +
       		}

     

       131
       131
       +
       	}

     

       132
       132
       +
       }

     

       133
       133
       +
       

     

       134
       134
       +
       func (s Set[T]) IsSubset(other Set[T]) bool {

     

       135
       135
       +
       	for item := range s.data {

     

       136
       136
       +
       		if !other.Contains(item) {

     

       137
       137
       +
       			return false

     

       138
       138
       +
       		}

     

       139
       139
       +
       	}

     

       140
       140
       +
       	return true

     

       141
       141
       +
       }

     

       142
       142
       +
       

     

       143
       143
       +
       func (s Set[T]) IsSuperset(other Set[T]) bool {

     

       144
       144
       +
       	return other.IsSubset(s)

     

       145
       145
       +
       }

     

       146
       146
       +
       

     

       147
       147
       +
       func (s Set[T]) IsDisjoint(other Set[T]) bool {

     

       148
       148
       +
       	for item := range s.data {

     

       149
       149
       +
       		if other.Contains(item) {

     

       150
       150
       +
       			return false

     

       151
       151
       +
       		}

     

       152
       152
       +
       	}

     

       153
       153
       +
       	return true

     

       154
       154
       +
       }

     

       155
       155
       +
       

     

       156
       156
       +
       func (s Set[T]) Equal(other Set[T]) bool {

     

       157
       157
       +
       	if s.Len() != other.Len() {

     

       158
       158
       +
       		return false

     

       159
       159
       +
       	}

     

       160
       160
       +
       	for item := range s.data {

     

       161
       161
       +
       		if !other.Contains(item) {

     

       162
       162
       +
       			return false

     

       163
       163
       +
       		}

     

       164
       164
       +
       	}

     

       165
       165
       +
       	return true

     

       166
       166
       +
       }

     

       167
       167
       +
       

     

       168
       168
       +
       func Collect[T comparable](seq iter.Seq[T]) Set[T] {

     

       169
       169
       +
       	result := New[T]()

     

       170
       170
       +
       	for item := range seq {

     

       171
       171
       +
       		result.Insert(item)

     

       172
       172
       +
       	}

     

       173
       173
       +
       	return result

     

       174
       174
       +
       }

+411

sets/set_test.go

···

       1
       1
       +
       package sets

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"slices"

     

       5
       5
       +
       	"testing"

     

       6
       6
       +
       	"testing/quick"

     

       7
       7
       +
       )

     

       8
       8
       +
       

     

       9
       9
       +
       func TestNew(t *testing.T) {

     

       10
       10
       +
       	s := New[int]()

     

       11
       11
       +
       	if s.Len() != 0 {

     

       12
       12
       +
       		t.Errorf("New set should be empty, got length %d", s.Len())

     

       13
       13
       +
       	}

     

       14
       14
       +
       	if !s.IsEmpty() {

     

       15
       15
       +
       		t.Error("New set should be empty")

     

       16
       16
       +
       	}

     

       17
       17
       +
       }

     

       18
       18
       +
       

     

       19
       19
       +
       func TestFromSlice(t *testing.T) {

     

       20
       20
       +
       	s := Collect(slices.Values([]int{1, 2, 3, 2, 1}))

     

       21
       21
       +
       	if s.Len() != 3 {

     

       22
       22
       +
       		t.Errorf("Expected length 3, got %d", s.Len())

     

       23
       23
       +
       	}

     

       24
       24
       +
       	if !s.Contains(1) || !s.Contains(2) || !s.Contains(3) {

     

       25
       25
       +
       		t.Error("Set should contain all unique elements from slice")

     

       26
       26
       +
       	}

     

       27
       27
       +
       }

     

       28
       28
       +
       

     

       29
       29
       +
       func TestInsert(t *testing.T) {

     

       30
       30
       +
       	s := New[string]()

     

       31
       31
       +
       

     

       32
       32
       +
       	if !s.Insert("hello") {

     

       33
       33
       +
       		t.Error("First insert should return true")

     

       34
       34
       +
       	}

     

       35
       35
       +
       	if s.Insert("hello") {

     

       36
       36
       +
       		t.Error("Duplicate insert should return false")

     

       37
       37
       +
       	}

     

       38
       38
       +
       	if s.Len() != 1 {

     

       39
       39
       +
       		t.Errorf("Expected length 1, got %d", s.Len())

     

       40
       40
       +
       	}

     

       41
       41
       +
       }

     

       42
       42
       +
       

     

       43
       43
       +
       func TestRemove(t *testing.T) {

     

       44
       44
       +
       	s := Collect(slices.Values([]int{1, 2, 3}))

     

       45
       45
       +
       

     

       46
       46
       +
       	if !s.Remove(2) {

     

       47
       47
       +
       		t.Error("Remove existing element should return true")

     

       48
       48
       +
       	}

     

       49
       49
       +
       	if s.Remove(2) {

     

       50
       50
       +
       		t.Error("Remove non-existing element should return false")

     

       51
       51
       +
       	}

     

       52
       52
       +
       	if s.Contains(2) {

     

       53
       53
       +
       		t.Error("Element should be removed")

     

       54
       54
       +
       	}

     

       55
       55
       +
       	if s.Len() != 2 {

     

       56
       56
       +
       		t.Errorf("Expected length 2, got %d", s.Len())

     

       57
       57
       +
       	}

     

       58
       58
       +
       }

     

       59
       59
       +
       

     

       60
       60
       +
       func TestContains(t *testing.T) {

     

       61
       61
       +
       	s := Collect(slices.Values([]int{1, 2, 3}))

     

       62
       62
       +
       

     

       63
       63
       +
       	if !s.Contains(1) {

     

       64
       64
       +
       		t.Error("Should contain 1")

     

       65
       65
       +
       	}

     

       66
       66
       +
       	if s.Contains(4) {

     

       67
       67
       +
       		t.Error("Should not contain 4")

     

       68
       68
       +
       	}

     

       69
       69
       +
       }

     

       70
       70
       +
       

     

       71
       71
       +
       func TestClear(t *testing.T) {

     

       72
       72
       +
       	s := Collect(slices.Values([]int{1, 2, 3}))

     

       73
       73
       +
       	s.Clear()

     

       74
       74
       +
       

     

       75
       75
       +
       	if !s.IsEmpty() {

     

       76
       76
       +
       		t.Error("Set should be empty after clear")

     

       77
       77
       +
       	}

     

       78
       78
       +
       	if s.Len() != 0 {

     

       79
       79
       +
       		t.Errorf("Expected length 0, got %d", s.Len())

     

       80
       80
       +
       	}

     

       81
       81
       +
       }

     

       82
       82
       +
       

     

       83
       83
       +
       func TestIterator(t *testing.T) {

     

       84
       84
       +
       	s := Collect(slices.Values([]int{1, 2, 3}))

     

       85
       85
       +
       	var items []int

     

       86
       86
       +
       

     

       87
       87
       +
       	for item := range s.All() {

     

       88
       88
       +
       		items = append(items, item)

     

       89
       89
       +
       	}

     

       90
       90
       +
       

     

       91
       91
       +
       	slices.Sort(items)

     

       92
       92
       +
       	expected := []int{1, 2, 3}

     

       93
       93
       +
       	if !slices.Equal(items, expected) {

     

       94
       94
       +
       		t.Errorf("Expected %v, got %v", expected, items)

     

       95
       95
       +
       	}

     

       96
       96
       +
       }

     

       97
       97
       +
       

     

       98
       98
       +
       func TestClone(t *testing.T) {

     

       99
       99
       +
       	s1 := Collect(slices.Values([]int{1, 2, 3}))

     

       100
       100
       +
       	s2 := s1.Clone()

     

       101
       101
       +
       

     

       102
       102
       +
       	if !s1.Equal(s2) {

     

       103
       103
       +
       		t.Error("Cloned set should be equal to original")

     

       104
       104
       +
       	}

     

       105
       105
       +
       

     

       106
       106
       +
       	s2.Insert(4)

     

       107
       107
       +
       	if s1.Contains(4) {

     

       108
       108
       +
       		t.Error("Modifying clone should not affect original")

     

       109
       109
       +
       	}

     

       110
       110
       +
       }

     

       111
       111
       +
       

     

       112
       112
       +
       func TestUnion(t *testing.T) {

     

       113
       113
       +
       	s1 := Collect(slices.Values([]int{1, 2}))

     

       114
       114
       +
       	s2 := Collect(slices.Values([]int{2, 3}))

     

       115
       115
       +
       

     

       116
       116
       +
       	result := Collect(s1.Union(s2))

     

       117
       117
       +
       	expected := Collect(slices.Values([]int{1, 2, 3}))

     

       118
       118
       +
       

     

       119
       119
       +
       	if !result.Equal(expected) {

     

       120
       120
       +
       		t.Errorf("Expected %v, got %v", expected, result)

     

       121
       121
       +
       	}

     

       122
       122
       +
       }

     

       123
       123
       +
       

     

       124
       124
       +
       func TestIntersection(t *testing.T) {

     

       125
       125
       +
       	s1 := Collect(slices.Values([]int{1, 2, 3}))

     

       126
       126
       +
       	s2 := Collect(slices.Values([]int{2, 3, 4}))

     

       127
       127
       +
       

     

       128
       128
       +
       	expected := Collect(slices.Values([]int{2, 3}))

     

       129
       129
       +
       	result := Collect(s1.Intersection(s2))

     

       130
       130
       +
       

     

       131
       131
       +
       	if !result.Equal(expected) {

     

       132
       132
       +
       		t.Errorf("Expected %v, got %v", expected, result)

     

       133
       133
       +
       	}

     

       134
       134
       +
       }

     

       135
       135
       +
       

     

       136
       136
       +
       func TestDifference(t *testing.T) {

     

       137
       137
       +
       	s1 := Collect(slices.Values([]int{1, 2, 3}))

     

       138
       138
       +
       	s2 := Collect(slices.Values([]int{2, 3, 4}))

     

       139
       139
       +
       

     

       140
       140
       +
       	expected := Collect(slices.Values([]int{1}))

     

       141
       141
       +
       	result := Collect(s1.Difference(s2))

     

       142
       142
       +
       

     

       143
       143
       +
       	if !result.Equal(expected) {

     

       144
       144
       +
       		t.Errorf("Expected %v, got %v", expected, result)

     

       145
       145
       +
       	}

     

       146
       146
       +
       }

     

       147
       147
       +
       

     

       148
       148
       +
       func TestSymmetricDifference(t *testing.T) {

     

       149
       149
       +
       	s1 := Collect(slices.Values([]int{1, 2, 3}))

     

       150
       150
       +
       	s2 := Collect(slices.Values([]int{2, 3, 4}))

     

       151
       151
       +
       

     

       152
       152
       +
       	expected := Collect(slices.Values([]int{1, 4}))

     

       153
       153
       +
       	result := Collect(s1.SymmetricDifference(s2))

     

       154
       154
       +
       

     

       155
       155
       +
       	if !result.Equal(expected) {

     

       156
       156
       +
       		t.Errorf("Expected %v, got %v", expected, result)

     

       157
       157
       +
       	}

     

       158
       158
       +
       }

     

       159
       159
       +
       

     

       160
       160
       +
       func TestSymmetricDifferenceCommutativeProperty(t *testing.T) {

     

       161
       161
       +
       	s1 := Collect(slices.Values([]int{1, 2, 3}))

     

       162
       162
       +
       	s2 := Collect(slices.Values([]int{2, 3, 4}))

     

       163
       163
       +
       

     

       164
       164
       +
       	result1 := Collect(s1.SymmetricDifference(s2))

     

       165
       165
       +
       	result2 := Collect(s2.SymmetricDifference(s1))

     

       166
       166
       +
       

     

       167
       167
       +
       	if !result1.Equal(result2) {

     

       168
       168
       +
       		t.Errorf("Expected %v, got %v", result1, result2)

     

       169
       169
       +
       	}

     

       170
       170
       +
       }

     

       171
       171
       +
       

     

       172
       172
       +
       func TestIsSubset(t *testing.T) {

     

       173
       173
       +
       	s1 := Collect(slices.Values([]int{1, 2}))

     

       174
       174
       +
       	s2 := Collect(slices.Values([]int{1, 2, 3}))

     

       175
       175
       +
       

     

       176
       176
       +
       	if !s1.IsSubset(s2) {

     

       177
       177
       +
       		t.Error("s1 should be subset of s2")

     

       178
       178
       +
       	}

     

       179
       179
       +
       	if s2.IsSubset(s1) {

     

       180
       180
       +
       		t.Error("s2 should not be subset of s1")

     

       181
       181
       +
       	}

     

       182
       182
       +
       }

     

       183
       183
       +
       

     

       184
       184
       +
       func TestIsSuperset(t *testing.T) {

     

       185
       185
       +
       	s1 := Collect(slices.Values([]int{1, 2, 3}))

     

       186
       186
       +
       	s2 := Collect(slices.Values([]int{1, 2}))

     

       187
       187
       +
       

     

       188
       188
       +
       	if !s1.IsSuperset(s2) {

     

       189
       189
       +
       		t.Error("s1 should be superset of s2")

     

       190
       190
       +
       	}

     

       191
       191
       +
       	if s2.IsSuperset(s1) {

     

       192
       192
       +
       		t.Error("s2 should not be superset of s1")

     

       193
       193
       +
       	}

     

       194
       194
       +
       }

     

       195
       195
       +
       

     

       196
       196
       +
       func TestIsDisjoint(t *testing.T) {

     

       197
       197
       +
       	s1 := Collect(slices.Values([]int{1, 2}))

     

       198
       198
       +
       	s2 := Collect(slices.Values([]int{3, 4}))

     

       199
       199
       +
       	s3 := Collect(slices.Values([]int{2, 3}))

     

       200
       200
       +
       

     

       201
       201
       +
       	if !s1.IsDisjoint(s2) {

     

       202
       202
       +
       		t.Error("s1 and s2 should be disjoint")

     

       203
       203
       +
       	}

     

       204
       204
       +
       	if s1.IsDisjoint(s3) {

     

       205
       205
       +
       		t.Error("s1 and s3 should not be disjoint")

     

       206
       206
       +
       	}

     

       207
       207
       +
       }

     

       208
       208
       +
       

     

       209
       209
       +
       func TestEqual(t *testing.T) {

     

       210
       210
       +
       	s1 := Collect(slices.Values([]int{1, 2, 3}))

     

       211
       211
       +
       	s2 := Collect(slices.Values([]int{3, 2, 1}))

     

       212
       212
       +
       	s3 := Collect(slices.Values([]int{1, 2}))

     

       213
       213
       +
       

     

       214
       214
       +
       	if !s1.Equal(s2) {

     

       215
       215
       +
       		t.Error("s1 and s2 should be equal")

     

       216
       216
       +
       	}

     

       217
       217
       +
       	if s1.Equal(s3) {

     

       218
       218
       +
       		t.Error("s1 and s3 should not be equal")

     

       219
       219
       +
       	}

     

       220
       220
       +
       }

     

       221
       221
       +
       

     

       222
       222
       +
       func TestCollect(t *testing.T) {

     

       223
       223
       +
       	s1 := Collect(slices.Values([]int{1, 2}))

     

       224
       224
       +
       	s2 := Collect(slices.Values([]int{2, 3}))

     

       225
       225
       +
       

     

       226
       226
       +
       	unionSet := Collect(s1.Union(s2))

     

       227
       227
       +
       	if unionSet.Len() != 3 {

     

       228
       228
       +
       		t.Errorf("Expected union set length 3, got %d", unionSet.Len())

     

       229
       229
       +
       	}

     

       230
       230
       +
       	if !unionSet.Contains(1) || !unionSet.Contains(2) || !unionSet.Contains(3) {

     

       231
       231
       +
       		t.Error("Union set should contain 1, 2, and 3")

     

       232
       232
       +
       	}

     

       233
       233
       +
       

     

       234
       234
       +
       	diffSet := Collect(s1.Difference(s2))

     

       235
       235
       +
       	if diffSet.Len() != 1 {

     

       236
       236
       +
       		t.Errorf("Expected difference set length 1, got %d", diffSet.Len())

     

       237
       237
       +
       	}

     

       238
       238
       +
       	if !diffSet.Contains(1) {

     

       239
       239
       +
       		t.Error("Difference set should contain 1")

     

       240
       240
       +
       	}

     

       241
       241
       +
       }

     

       242
       242
       +
       

     

       243
       243
       +
       func TestPropertySingleonLen(t *testing.T) {

     

       244
       244
       +
       	f := func(item int) bool {

     

       245
       245
       +
       		single := Singleton(item)

     

       246
       246
       +
       		return single.Len() == 1

     

       247
       247
       +
       	}

     

       248
       248
       +
       

     

       249
       249
       +
       	if err := quick.Check(f, nil); err != nil {

     

       250
       250
       +
       		t.Error(err)

     

       251
       251
       +
       	}

     

       252
       252
       +
       }

     

       253
       253
       +
       

     

       254
       254
       +
       func TestPropertyInsertIdempotent(t *testing.T) {

     

       255
       255
       +
       	f := func(s Set[int], item int) bool {

     

       256
       256
       +
       		clone := s.Clone()

     

       257
       257
       +
       

     

       258
       258
       +
       		clone.Insert(item)

     

       259
       259
       +
       		firstLen := clone.Len()

     

       260
       260
       +
       

     

       261
       261
       +
       		clone.Insert(item)

     

       262
       262
       +
       		secondLen := clone.Len()

     

       263
       263
       +
       

     

       264
       264
       +
       		return firstLen == secondLen

     

       265
       265
       +
       	}

     

       266
       266
       +
       

     

       267
       267
       +
       	if err := quick.Check(f, nil); err != nil {

     

       268
       268
       +
       		t.Error(err)

     

       269
       269
       +
       	}

     

       270
       270
       +
       }

     

       271
       271
       +
       

     

       272
       272
       +
       func TestPropertyUnionCommutative(t *testing.T) {

     

       273
       273
       +
       	f := func(s1 Set[int], s2 Set[int]) bool {

     

       274
       274
       +
       		union1 := Collect(s1.Union(s2))

     

       275
       275
       +
       		union2 := Collect(s2.Union(s1))

     

       276
       276
       +
       		return union1.Equal(union2)

     

       277
       277
       +
       	}

     

       278
       278
       +
       

     

       279
       279
       +
       	if err := quick.Check(f, nil); err != nil {

     

       280
       280
       +
       		t.Error(err)

     

       281
       281
       +
       	}

     

       282
       282
       +
       }

     

       283
       283
       +
       

     

       284
       284
       +
       func TestPropertyIntersectionCommutative(t *testing.T) {

     

       285
       285
       +
       	f := func(s1 Set[int], s2 Set[int]) bool {

     

       286
       286
       +
       		inter1 := Collect(s1.Intersection(s2))

     

       287
       287
       +
       		inter2 := Collect(s2.Intersection(s1))

     

       288
       288
       +
       		return inter1.Equal(inter2)

     

       289
       289
       +
       	}

     

       290
       290
       +
       

     

       291
       291
       +
       	if err := quick.Check(f, nil); err != nil {

     

       292
       292
       +
       		t.Error(err)

     

       293
       293
       +
       	}

     

       294
       294
       +
       }

     

       295
       295
       +
       

     

       296
       296
       +
       func TestPropertyCloneEquals(t *testing.T) {

     

       297
       297
       +
       	f := func(s Set[int]) bool {

     

       298
       298
       +
       		clone := s.Clone()

     

       299
       299
       +
       		return s.Equal(clone)

     

       300
       300
       +
       	}

     

       301
       301
       +
       

     

       302
       302
       +
       	if err := quick.Check(f, nil); err != nil {

     

       303
       303
       +
       		t.Error(err)

     

       304
       304
       +
       	}

     

       305
       305
       +
       }

     

       306
       306
       +
       

     

       307
       307
       +
       func TestPropertyIntersectionIsSubset(t *testing.T) {

     

       308
       308
       +
       	f := func(s1 Set[int], s2 Set[int]) bool {

     

       309
       309
       +
       		inter := Collect(s1.Intersection(s2))

     

       310
       310
       +
       		return inter.IsSubset(s1) && inter.IsSubset(s2)

     

       311
       311
       +
       	}

     

       312
       312
       +
       

     

       313
       313
       +
       	if err := quick.Check(f, nil); err != nil {

     

       314
       314
       +
       		t.Error(err)

     

       315
       315
       +
       	}

     

       316
       316
       +
       }

     

       317
       317
       +
       

     

       318
       318
       +
       func TestPropertyUnionIsSuperset(t *testing.T) {

     

       319
       319
       +
       	f := func(s1 Set[int], s2 Set[int]) bool {

     

       320
       320
       +
       		union := Collect(s1.Union(s2))

     

       321
       321
       +
       		return union.IsSuperset(s1) && union.IsSuperset(s2)

     

       322
       322
       +
       	}

     

       323
       323
       +
       

     

       324
       324
       +
       	if err := quick.Check(f, nil); err != nil {

     

       325
       325
       +
       		t.Error(err)

     

       326
       326
       +
       	}

     

       327
       327
       +
       }

     

       328
       328
       +
       

     

       329
       329
       +
       func TestPropertyDifferenceDisjoint(t *testing.T) {

     

       330
       330
       +
       	f := func(s1 Set[int], s2 Set[int]) bool {

     

       331
       331
       +
       		diff := Collect(s1.Difference(s2))

     

       332
       332
       +
       		return diff.IsDisjoint(s2)

     

       333
       333
       +
       	}

     

       334
       334
       +
       

     

       335
       335
       +
       	if err := quick.Check(f, nil); err != nil {

     

       336
       336
       +
       		t.Error(err)

     

       337
       337
       +
       	}

     

       338
       338
       +
       }

     

       339
       339
       +
       

     

       340
       340
       +
       func TestPropertySymmetricDifferenceCommutative(t *testing.T) {

     

       341
       341
       +
       	f := func(s1 Set[int], s2 Set[int]) bool {

     

       342
       342
       +
       		symDiff1 := Collect(s1.SymmetricDifference(s2))

     

       343
       343
       +
       		symDiff2 := Collect(s2.SymmetricDifference(s1))

     

       344
       344
       +
       		return symDiff1.Equal(symDiff2)

     

       345
       345
       +
       	}

     

       346
       346
       +
       

     

       347
       347
       +
       	if err := quick.Check(f, nil); err != nil {

     

       348
       348
       +
       		t.Error(err)

     

       349
       349
       +
       	}

     

       350
       350
       +
       }

     

       351
       351
       +
       

     

       352
       352
       +
       func TestPropertyRemoveWorks(t *testing.T) {

     

       353
       353
       +
       	f := func(s Set[int], item int) bool {

     

       354
       354
       +
       		clone := s.Clone()

     

       355
       355
       +
       		clone.Insert(item)

     

       356
       356
       +
       		clone.Remove(item)

     

       357
       357
       +
       		return !clone.Contains(item)

     

       358
       358
       +
       	}

     

       359
       359
       +
       

     

       360
       360
       +
       	if err := quick.Check(f, nil); err != nil {

     

       361
       361
       +
       		t.Error(err)

     

       362
       362
       +
       	}

     

       363
       363
       +
       }

     

       364
       364
       +
       

     

       365
       365
       +
       func TestPropertyClearEmpty(t *testing.T) {

     

       366
       366
       +
       	f := func(s Set[int]) bool {

     

       367
       367
       +
       		s.Clear()

     

       368
       368
       +
       		return s.IsEmpty() && s.Len() == 0

     

       369
       369
       +
       	}

     

       370
       370
       +
       

     

       371
       371
       +
       	if err := quick.Check(f, nil); err != nil {

     

       372
       372
       +
       		t.Error(err)

     

       373
       373
       +
       	}

     

       374
       374
       +
       }

     

       375
       375
       +
       

     

       376
       376
       +
       func TestPropertyIsSubsetReflexive(t *testing.T) {

     

       377
       377
       +
       	f := func(s Set[int]) bool {

     

       378
       378
       +
       		return s.IsSubset(s)

     

       379
       379
       +
       	}

     

       380
       380
       +
       

     

       381
       381
       +
       	if err := quick.Check(f, nil); err != nil {

     

       382
       382
       +
       		t.Error(err)

     

       383
       383
       +
       	}

     

       384
       384
       +
       }

     

       385
       385
       +
       

     

       386
       386
       +
       func TestPropertyDeMorganUnion(t *testing.T) {

     

       387
       387
       +
       	f := func(s1 Set[int], s2 Set[int], universe Set[int]) bool {

     

       388
       388
       +
       		// create a universe that contains both sets

     

       389
       389
       +
       		u := universe.Clone()

     

       390
       390
       +
       		for item := range s1.All() {

     

       391
       391
       +
       			u.Insert(item)

     

       392
       392
       +
       		}

     

       393
       393
       +
       		for item := range s2.All() {

     

       394
       394
       +
       			u.Insert(item)

     

       395
       395
       +
       		}

     

       396
       396
       +
       

     

       397
       397
       +
       		// (A u B)' = A' n B'

     

       398
       398
       +
       		union := Collect(s1.Union(s2))

     

       399
       399
       +
       		complementUnion := Collect(u.Difference(union))

     

       400
       400
       +
       

     

       401
       401
       +
       		complementS1 := Collect(u.Difference(s1))

     

       402
       402
       +
       		complementS2 := Collect(u.Difference(s2))

     

       403
       403
       +
       		intersectionComplements := Collect(complementS1.Intersection(complementS2))

     

       404
       404
       +
       

     

       405
       405
       +
       		return complementUnion.Equal(intersectionComplements)

     

       406
       406
       +
       	}

     

       407
       407
       +
       

     

       408
       408
       +
       	if err := quick.Check(f, nil); err != nil {

     

       409
       409
       +
       		t.Error(err)

     

       410
       410
       +
       	}

     

       411
       411
       +
       }

+5 -3

spindle/engines/nixery/engine.go

···

       294
       294
        
       		workflowEnvs.AddEnv(s.Key, s.Value)

     

       295
       295
        
       	}

     

       296
       296
        
       

     

       297
       297
       -
       	step := w.Steps[idx].(Step)

     

       297
       297
       +
       	step := w.Steps[idx]

     

       298
       298
        
       

     

       299
       299
        
       	select {

     

       300
       300
        
       	case <-ctx.Done():

     
···

       303
       303
        
       	}

     

       304
       304
        
       

     

       305
       305
        
       	envs := append(EnvVars(nil), workflowEnvs...)

     

       306
       306
       -
       	for k, v := range step.environment {

     

       307
       307
       -
       		envs.AddEnv(k, v)

     

       306
       306
       +
       	if nixStep, ok := step.(Step); ok {

     

       307
       307
       +
       		for k, v := range nixStep.environment {

     

       308
       308
       +
       			envs.AddEnv(k, v)

     

       309
       309
       +
       		}

     

       308
       310
        
       	}

     

       309
       311
        
       	envs.AddEnv("HOME", homeDir)

     

       310
       312

+6 -1

types/commit.go

···

       174
       174
        
       

     

       175
       175
        
       func (commit Commit) CoAuthors() []object.Signature {

     

       176
       176
        
       	var coAuthors []object.Signature

     

       177
       177
       -
       

     

       177
       177
       +
       	seen := make(map[string]bool)

     

       178
       178
        
       	matches := coAuthorRegex.FindAllStringSubmatch(commit.Message, -1)

     

       179
       179
        
       

     

       180
       180
        
       	for _, match := range matches {

     

       181
       181
        
       		if len(match) >= 3 {

     

       182
       182
        
       			name := strings.TrimSpace(match[1])

     

       183
       183
        
       			email := strings.TrimSpace(match[2])

     

       184
       184
       +
       

     

       185
       185
       +
       			if seen[email] {

     

       186
       186
       +
       				continue

     

       187
       187
       +
       			}

     

       188
       188
       +
       			seen[email] = true

     

       184
       189
        
       

     

       185
       190
        
       			coAuthors = append(coAuthors, object.Signature{

     

       186
       191
        
       				Name:  name,

Compare changes