commit 33f520aafc953029703bcb3342c4fa6e944364ed · hailey.at/peruse

+57 -2

peruse/get_suggested_follows.go

···

       11
       11
        
       	FollowedByCount uint64 `ch:"followed_by_count"`

     

       12
       12
        
       }

     

       13
       13
        
       

     

       14
       14
       -
       func (u *User) getSuggestedFollows(ctx context.Context, s *Server) ([]SuggestedFollow, error) {

     

       14
       14
       +
       func (u *User) getSuggestedFollows(ctx context.Context, s *Server, showHandles bool) ([]SuggestedFollow, error) {

     

       15
       15
        
       	if !time.Now().After(u.suggestedFollowsExpiresAt) {

     

       16
       16
        
       		return u.suggestedFollows, nil

     

       17
       17
        
       	}

     
···

       24
       24
        
       	}

     

       25
       25
        
       

     

       26
       26
        
       	var suggestedFollows []SuggestedFollow

     

       27
       27
       -
       	if err := s.conn.Select(ctx, &suggestedFollows, getSuggestedFollowsQuery, u.did); err != nil {

     

       27
       27
       +
       	query := getSuggestedFollowsQuery

     

       28
       28
       +
       	if showHandles {

     

       29
       29
       +
       		query = getSuggestedFollowsQueryWithHandle

     

       30
       30
       +
       	}

     

       31
       31
       +
       	if err := s.conn.Select(ctx, &suggestedFollows, query, u.did); err != nil {

     

       28
       32
        
       		return nil, err

     

       29
       33
        
       	}

     

       30
       34
        
       

     
···

       75
       79
        
       ORDER BY followed_by_count DESC

     

       76
       80
        
       LIMIT 100

     

       77
       81
        
       	`

     

       82
       82
       +
       

     

       83
       83
       +
       const getSuggestedFollowsQueryWithHandle = `

     

       84
       84
       +
       WITH ? as your_did,

     

       85
       85
       +
           now() - interval 60 day AS timeframe,

     

       86
       86
       +
           40 as top_mutual_limit,

     

       87
       87
       +
           20 as second_level_limit

     

       88
       88
       +
       

     

       89
       89
       +
       SELECT

     

       90
       90
       +
           COALESCE(substring(any(p.latest_handle), 6), f.subject) as suggested_did,

     

       91
       91
       +
           concat('https://bsky.app/profile/', COALESCE(substring(any(p.latest_handle), 6), f.subject)) as bsky_url,

     

       92
       92
       +
           COUNT(*) as followed_by_count

     

       93
       93
       +
       FROM follow f

     

       94
       94
       +
       LEFT JOIN (

     

       95
       95
       +
           SELECT 

     

       96
       96
       +
               did,

     

       97
       97
       +
               argMax(plc_op_also_known_as[1], created_at) as latest_handle

     

       98
       98
       +
           FROM plc 

     

       99
       99
       +
           WHERE length(plc_op_also_known_as) > 0

     

       100
       100
       +
           GROUP BY did

     

       101
       101
       +
       ) p ON p.did = f.subject

     

       102
       102
       +
       WHERE

     

       103
       103
       +
           f.subject != your_did

     

       104
       104
       +
           AND f.subject NOT IN (SELECT subject FROM follow WHERE did = your_did)

     

       105
       105
       +
           AND f.did IN (

     

       106
       106
       +
               SELECT i.subject_did

     

       107
       107
       +
               FROM interaction i

     

       108
       108
       +
               WHERE

     

       109
       109
       +
                   i.kind = 'like'

     

       110
       110
       +
                   AND i.created_at > timeframe

     

       111
       111
       +
                   AND i.did IN (

     

       112
       112
       +
                       SELECT i1.subject_did

     

       113
       113
       +
                       FROM interaction i1, interaction_reverse i2

     

       114
       114
       +
                       WHERE i1.subject_did = i2.did

     

       115
       115
       +
                       AND i2.subject_did = your_did

     

       116
       116
       +
                       AND i2.kind = 'like'

     

       117
       117
       +
                       AND i1.did = your_did

     

       118
       118
       +
                       AND i1.kind = 'like'

     

       119
       119
       +
                       AND i1.created_at > timeframe

     

       120
       120
       +
                       GROUP BY i1.subject_did

     

       121
       121
       +
                       ORDER BY COUNT(*) DESC

     

       122
       122
       +
                       LIMIT top_mutual_limit

     

       123
       123
       +
                   )

     

       124
       124
       +
               GROUP BY i.subject_did

     

       125
       125
       +
               ORDER BY COUNT(*) DESC

     

       126
       126
       +
               LIMIT second_level_limit

     

       127
       127
       +
           )

     

       128
       128
       +
       GROUP BY f.subject

     

       129
       129
       +
       HAVING COUNT(*) >= 2

     

       130
       130
       +
       ORDER BY followed_by_count DESC

     

       131
       131
       +
       LIMIT 100

     

       132
       132
       +
       	`

+1 -1

peruse/handle_get_suggested_follows.go

···

       35
       35
        
       	}

     

       36
       36
        
       

     

       37
       37
        
       	u := NewUser(req.Handle)

     

       38
       38
       -
       	suggs, err := u.getSuggestedFollows(ctx, s)

     

       38
       38
       +
       	suggs, err := u.getSuggestedFollows(ctx, s, req.ShowHandles)

     

       39
       39
        
       	if err != nil {

     

       40
       40
        
       		return e.String(400, fmt.Sprintf("error getting suggested follows: %v"))

     

       41
       41
        
       	}

+1 -1

peruse/handle_suggested_follows_feed.go

···

       9
       9
        
       	ctx := e.Request().Context()

     

       10
       10
        
       	u := e.Get("user").(*User)

     

       11
       11
        
       

     

       12
       12
       -
       	suggFollows, err := u.getSuggestedFollows(ctx, s)

     

       12
       12
       +
       	suggFollows, err := u.getSuggestedFollows(ctx, s, false)

     

       13
       13
        
       	if err != nil {

     

       14
       14
        
       		s.logger.Error("error getting suggested follows for user", "user", u.did, "error", err)

     

       15
       15
        
       		return helpers.ServerError(e, "FeedError", "")