@@ -14,7 +14,6 @@ import (
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,9 +30,8 @@ const MaxOpsSliceLength = 200
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,7 +45,7 @@ type Indexer struct {
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,7 +54,6 @@ func NewIndexer(db *gorm.DB, notifman notifs.NotificationManager, evtman *events
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,14 +421,6 @@ func (ix *Indexer) handleRecordDelete(ctx context.Context, evt *repomgr.RepoEven
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,10 +507,6 @@ func (ix *Indexer) handleRecordCreate(ctx context.Context, evt *repomgr.RepoEven
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 :
@@ -602,10 +587,6 @@ func (ix *Indexer) handleRecordCreateGraphFollow(ctx context.Context, rec *bsky.
602
587
return err
603
588
}
604
589
605
- if err := ix .notifman .AddFollow (ctx , fr .Follower , fr .Target , fr .ID ); err != nil {
606
- return err
607
- }
608
-
609
590
return nil
610
591
}
611
592
@@ -812,26 +793,16 @@ func (ix *Indexer) createMissingPostRecord(ctx context.Context, puri *util.Parse
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
}
0 commit comments