Skip to content

Commit 85d4bb6

Browse files
authored
remove notifs package (#970)
This is part of indexer stuff which isn't actually used anywhere.
2 parents 7a010d0 + 25aba9f commit 85d4bb6

File tree

7 files changed

+9
-480
lines changed

7 files changed

+9
-480
lines changed

cmd/bigsky/main.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"github.com/bluesky-social/indigo/did"
2121
"github.com/bluesky-social/indigo/events"
2222
"github.com/bluesky-social/indigo/indexer"
23-
"github.com/bluesky-social/indigo/notifs"
2423
"github.com/bluesky-social/indigo/plc"
2524
"github.com/bluesky-social/indigo/repomgr"
2625
"github.com/bluesky-social/indigo/util"
@@ -449,11 +448,9 @@ func runBigsky(cctx *cli.Context) error {
449448

450449
evtman := events.NewEventManager(persister)
451450

452-
notifman := &notifs.NullNotifs{}
453-
454451
rf := indexer.NewRepoFetcher(db, repoman, cctx.Int("max-fetch-concurrency"))
455452

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"))
457454
if err != nil {
458455
return err
459456
}

indexer/indexer.go

+5-34
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
"github.com/bluesky-social/indigo/events"
1515
lexutil "github.com/bluesky-social/indigo/lex/util"
1616
"github.com/bluesky-social/indigo/models"
17-
"github.com/bluesky-social/indigo/notifs"
1817
"github.com/bluesky-social/indigo/repomgr"
1918
"github.com/bluesky-social/indigo/util"
2019
"github.com/bluesky-social/indigo/xrpc"
@@ -31,9 +30,8 @@ const MaxOpsSliceLength = 200
3130
type Indexer struct {
3231
db *gorm.DB
3332

34-
notifman notifs.NotificationManager
35-
events *events.EventManager
36-
didr did.Resolver
33+
events *events.EventManager
34+
didr did.Resolver
3735

3836
Crawler *CrawlDispatcher
3937

@@ -47,7 +45,7 @@ type Indexer struct {
4745
log *slog.Logger
4846
}
4947

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) {
5149
db.AutoMigrate(&models.FeedPost{})
5250
db.AutoMigrate(&models.ActorInfo{})
5351
db.AutoMigrate(&models.FollowRecord{})
@@ -56,7 +54,6 @@ func NewIndexer(db *gorm.DB, notifman notifs.NotificationManager, evtman *events
5654

5755
ix := &Indexer{
5856
db: db,
59-
notifman: notifman,
6057
events: evtman,
6158
didr: didr,
6259
doAggregations: aggregate,
@@ -424,14 +421,6 @@ func (ix *Indexer) handleRecordDelete(ctx context.Context, evt *repomgr.RepoEven
424421
if err := ix.db.Where("reposter = ? AND rkey = ?", evt.User, op.Rkey).Delete(&models.RepostRecord{}).Error; err != nil {
425422
return err
426423
}
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-
435424
case "app.bsky.feed.vote":
436425
return ix.handleRecordDeleteFeedLike(ctx, evt, op)
437426
case "app.bsky.graph.follow":
@@ -518,10 +507,6 @@ func (ix *Indexer) handleRecordCreate(ctx context.Context, evt *repomgr.RepoEven
518507
return nil, err
519508
}
520509

521-
if err := ix.notifman.AddRepost(ctx, fp.Author, rr.ID, evt.User); err != nil {
522-
return nil, err
523-
}
524-
525510
case *bsky.FeedLike:
526511
return nil, ix.handleRecordCreateFeedLike(ctx, rec, evt, op)
527512
case *bsky.GraphFollow:
@@ -602,10 +587,6 @@ func (ix *Indexer) handleRecordCreateGraphFollow(ctx context.Context, rec *bsky.
602587
return err
603588
}
604589

605-
if err := ix.notifman.AddFollow(ctx, fr.Follower, fr.Target, fr.ID); err != nil {
606-
return err
607-
}
608-
609590
return nil
610591
}
611592

@@ -812,26 +793,16 @@ func (ix *Indexer) createMissingPostRecord(ctx context.Context, puri *util.Parse
812793

813794
func (ix *Indexer) addNewPostNotification(ctx context.Context, post *bsky.FeedPost, fp *models.FeedPost, mentions []*models.ActorInfo) error {
814795
if post.Reply != nil {
815-
replyto, err := ix.GetPost(ctx, post.Reply.Parent.Uri)
796+
_, err := ix.GetPost(ctx, post.Reply.Parent.Uri)
816797
if err != nil {
817798
ix.log.Error("probably shouldn't error when processing a reply to a not-found post")
818799
return err
819800
}
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-
}
830801
}
831802

832803
return nil
833804
}
834805

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

indexer/posts_test.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
bsky "github.com/bluesky-social/indigo/api/bsky"
1111
"github.com/bluesky-social/indigo/carstore"
1212
"github.com/bluesky-social/indigo/events"
13-
"github.com/bluesky-social/indigo/notifs"
1413
"github.com/bluesky-social/indigo/plc"
1514
"github.com/bluesky-social/indigo/repomgr"
1615
"github.com/bluesky-social/indigo/util"
@@ -56,14 +55,13 @@ func testIndexer(t *testing.T) *testIx {
5655
}
5756

5857
repoman := repomgr.NewRepoManager(cs, &util.FakeKeyManager{})
59-
notifman := notifs.NewNotificationManager(maindb, repoman.GetRecord)
6058
evtman := events.NewEventManager(events.NewMemPersister())
6159

6260
didr := testPLC(t)
6361

6462
rf := NewRepoFetcher(maindb, repoman, 10)
6563

66-
ix, err := NewIndexer(maindb, notifman, evtman, didr, rf, false, true, true)
64+
ix, err := NewIndexer(maindb, evtman, didr, rf, false, true, true)
6765
if err != nil {
6866
t.Fatal(err)
6967
}

0 commit comments

Comments
 (0)