this repo has no description
rip out notifs code
+9
-62
+1
-4
cmd/bigsky/main.go
+1
-4
cmd/bigsky/main.go
···
20
20
"github.com/bluesky-social/indigo/did"
21
21
"github.com/bluesky-social/indigo/events"
22
22
"github.com/bluesky-social/indigo/indexer"
23
-
"github.com/bluesky-social/indigo/notifs"
24
23
"github.com/bluesky-social/indigo/plc"
25
24
"github.com/bluesky-social/indigo/repomgr"
26
25
"github.com/bluesky-social/indigo/util"
···
449
448
450
449
evtman := events.NewEventManager(persister)
451
450
452
-
notifman := ¬ifs.NullNotifs{}
453
-
454
451
rf := indexer.NewRepoFetcher(db, repoman, cctx.Int("max-fetch-concurrency"))
455
452
456
-
ix, err := indexer.NewIndexer(db, notifman, evtman, cachedidr, rf, true, false, cctx.Bool("spidering"))
453
+
ix, err := indexer.NewIndexer(db, evtman, cachedidr, rf, true, false, cctx.Bool("spidering"))
457
454
if err != nil {
458
455
return err
459
456
}
+5
-34
indexer/indexer.go
+5
-34
indexer/indexer.go
···
14
14
"github.com/bluesky-social/indigo/events"
15
15
lexutil "github.com/bluesky-social/indigo/lex/util"
16
16
"github.com/bluesky-social/indigo/models"
17
-
"github.com/bluesky-social/indigo/notifs"
18
17
"github.com/bluesky-social/indigo/repomgr"
19
18
"github.com/bluesky-social/indigo/util"
20
19
"github.com/bluesky-social/indigo/xrpc"
···
31
30
type Indexer struct {
32
31
db *gorm.DB
33
32
34
-
notifman notifs.NotificationManager
35
-
events *events.EventManager
36
-
didr did.Resolver
33
+
events *events.EventManager
34
+
didr did.Resolver
37
35
38
36
Crawler *CrawlDispatcher
39
37
···
47
45
log *slog.Logger
48
46
}
49
47
50
-
func NewIndexer(db *gorm.DB, notifman notifs.NotificationManager, evtman *events.EventManager, didr did.Resolver, fetcher *RepoFetcher, crawl, aggregate, spider bool) (*Indexer, error) {
48
+
func NewIndexer(db *gorm.DB, evtman *events.EventManager, didr did.Resolver, fetcher *RepoFetcher, crawl, aggregate, spider bool) (*Indexer, error) {
51
49
db.AutoMigrate(&models.FeedPost{})
52
50
db.AutoMigrate(&models.ActorInfo{})
53
51
db.AutoMigrate(&models.FollowRecord{})
···
56
54
57
55
ix := &Indexer{
58
56
db: db,
59
-
notifman: notifman,
60
57
events: evtman,
61
58
didr: didr,
62
59
doAggregations: aggregate,
···
424
421
if err := ix.db.Where("reposter = ? AND rkey = ?", evt.User, op.Rkey).Delete(&models.RepostRecord{}).Error; err != nil {
425
422
return err
426
423
}
427
-
428
-
ix.log.Warn("TODO: remove notifications on delete")
429
-
/*
430
-
if err := ix.notifman.RemoveRepost(ctx, fp.Author, rr.ID, evt.User); err != nil {
431
-
return nil, err
432
-
}
433
-
*/
434
-
435
424
case "app.bsky.feed.vote":
436
425
return ix.handleRecordDeleteFeedLike(ctx, evt, op)
437
426
case "app.bsky.graph.follow":
···
518
507
return nil, err
519
508
}
520
509
521
-
if err := ix.notifman.AddRepost(ctx, fp.Author, rr.ID, evt.User); err != nil {
522
-
return nil, err
523
-
}
524
-
525
510
case *bsky.FeedLike:
526
511
return nil, ix.handleRecordCreateFeedLike(ctx, rec, evt, op)
527
512
case *bsky.GraphFollow:
···
599
584
Cid: op.RecCid.String(),
600
585
}
601
586
if err := ix.db.Create(&fr).Error; err != nil {
602
-
return err
603
-
}
604
-
605
-
if err := ix.notifman.AddFollow(ctx, fr.Follower, fr.Target, fr.ID); err != nil {
606
587
return err
607
588
}
608
589
···
812
793
813
794
func (ix *Indexer) addNewPostNotification(ctx context.Context, post *bsky.FeedPost, fp *models.FeedPost, mentions []*models.ActorInfo) error {
814
795
if post.Reply != nil {
815
-
replyto, err := ix.GetPost(ctx, post.Reply.Parent.Uri)
796
+
_, err := ix.GetPost(ctx, post.Reply.Parent.Uri)
816
797
if err != nil {
817
798
ix.log.Error("probably shouldn't error when processing a reply to a not-found post")
818
799
return err
819
800
}
820
-
821
-
if err := ix.notifman.AddReplyTo(ctx, fp.Author, fp.ID, replyto); err != nil {
822
-
return err
823
-
}
824
-
}
825
-
826
-
for _, mentioned := range mentions {
827
-
if err := ix.notifman.AddMention(ctx, fp.Author, fp.ID, mentioned.Uid); err != nil {
828
-
return err
829
-
}
830
801
}
831
802
832
803
return nil
833
804
}
834
805
835
806
func (ix *Indexer) addNewVoteNotification(ctx context.Context, postauthor models.Uid, vr *models.VoteRecord) error {
836
-
return ix.notifman.AddUpVote(ctx, vr.Voter, vr.Post, vr.ID, postauthor)
807
+
return nil
837
808
}
+1
-3
indexer/posts_test.go
+1
-3
indexer/posts_test.go
···
10
10
bsky "github.com/bluesky-social/indigo/api/bsky"
11
11
"github.com/bluesky-social/indigo/carstore"
12
12
"github.com/bluesky-social/indigo/events"
13
-
"github.com/bluesky-social/indigo/notifs"
14
13
"github.com/bluesky-social/indigo/plc"
15
14
"github.com/bluesky-social/indigo/repomgr"
16
15
"github.com/bluesky-social/indigo/util"
···
56
55
}
57
56
58
57
repoman := repomgr.NewRepoManager(cs, &util.FakeKeyManager{})
59
-
notifman := notifs.NewNotificationManager(maindb, repoman.GetRecord)
60
58
evtman := events.NewEventManager(events.NewMemPersister())
61
59
62
60
didr := testPLC(t)
63
61
64
62
rf := NewRepoFetcher(maindb, repoman, 10)
65
63
66
-
ix, err := NewIndexer(maindb, notifman, evtman, didr, rf, false, true, true)
64
+
ix, err := NewIndexer(maindb, evtman, didr, rf, false, true, true)
67
65
if err != nil {
68
66
t.Fatal(err)
69
67
}
+1
-5
pds/server.go
+1
-5
pds/server.go
···
20
20
"github.com/bluesky-social/indigo/indexer"
21
21
lexutil "github.com/bluesky-social/indigo/lex/util"
22
22
"github.com/bluesky-social/indigo/models"
23
-
"github.com/bluesky-social/indigo/notifs"
24
23
pdsdata "github.com/bluesky-social/indigo/pds/data"
25
24
"github.com/bluesky-social/indigo/plc"
26
25
"github.com/bluesky-social/indigo/repomgr"
···
42
41
cs carstore.CarStore
43
42
repoman *repomgr.RepoManager
44
43
feedgen *FeedGenerator
45
-
notifman notifs.NotificationManager
46
44
indexer *indexer.Indexer
47
45
events *events.EventManager
48
46
signingKey *did.PrivKey
···
74
72
kmgr := indexer.NewKeyManager(didr, serkey)
75
73
76
74
repoman := repomgr.NewRepoManager(cs, kmgr)
77
-
notifman := notifs.NewNotificationManager(db, repoman.GetRecord)
78
75
79
76
rf := indexer.NewRepoFetcher(db, repoman, 10)
80
77
81
-
ix, err := indexer.NewIndexer(db, notifman, evtman, didr, rf, false, true, true)
78
+
ix, err := indexer.NewIndexer(db, evtman, didr, rf, false, true, true)
82
79
if err != nil {
83
80
return nil, err
84
81
}
···
87
84
signingKey: serkey,
88
85
db: db,
89
86
cs: cs,
90
-
notifman: notifman,
91
87
indexer: ix,
92
88
plc: didr,
93
89
events: evtman,
+1
-16
testing/utils.go
+1
-16
testing/utils.go
···
29
29
"github.com/bluesky-social/indigo/indexer"
30
30
lexutil "github.com/bluesky-social/indigo/lex/util"
31
31
"github.com/bluesky-social/indigo/models"
32
-
"github.com/bluesky-social/indigo/notifs"
33
32
"github.com/bluesky-social/indigo/pds"
34
33
"github.com/bluesky-social/indigo/plc"
35
34
"github.com/bluesky-social/indigo/repo"
···
469
468
return resp.Feed
470
469
}
471
470
472
-
func (u *TestUser) GetNotifs(t *testing.T) []*bsky.NotificationListNotifications_Notification {
473
-
t.Helper()
474
-
475
-
ctx := context.TODO()
476
-
resp, err := bsky.NotificationListNotifications(ctx, u.client, "", 100, false, nil, "")
477
-
if err != nil {
478
-
t.Fatal(err)
479
-
}
480
-
481
-
return resp.Notifications
482
-
}
483
-
484
471
func (u *TestUser) ChangeHandle(t *testing.T, nhandle string) {
485
472
t.Helper()
486
473
···
572
559
573
560
repoman := repomgr.NewRepoManager(cs, kmgr)
574
561
575
-
notifman := notifs.NewNotificationManager(maindb, repoman.GetRecord)
576
-
577
562
opts := events.DefaultDiskPersistOptions()
578
563
opts.EventsPerFile = 10
579
564
diskpersist, err := events.NewDiskPersistence(filepath.Join(dir, "dp-primary"), filepath.Join(dir, "dp-archive"), maindb, opts)
···
581
566
evtman := events.NewEventManager(diskpersist)
582
567
rf := indexer.NewRepoFetcher(maindb, repoman, 10)
583
568
584
-
ix, err := indexer.NewIndexer(maindb, notifman, evtman, didr, rf, true, true, true)
569
+
ix, err := indexer.NewIndexer(maindb, evtman, didr, rf, true, true, true)
585
570
if err != nil {
586
571
return nil, err
587
572
}