commit cb0e35b671261924d93f35793cb890c474492a87 · hailey.at/peruse

+16 -10

cmd/peruse/main.go

···

       69
       69
        
       				EnvVars:  []string{"PERUSE_CHRONO_FEED_RKEY"},

     

       70
       70
        
       				Required: true,

     

       71
       71
        
       			},

     

       72
       72
       +
       			&cli.StringFlag{

     

       73
       73
       +
       				Name:     "suggested-follows-rkey",

     

       74
       74
       +
       				EnvVars:  []string{"PERUSE_SUGGESTED_FOLLOWS_RKEY"},

     

       75
       75
       +
       				Required: true,

     

       76
       76
       +
       			},

     

       72
       77
        
       		},

     

       73
       78
        
       		Action: run,

     

       74
       79
        
       	}

     
···

       86
       91
        
       	}))

     

       87
       92
        
       

     

       88
       93
        
       	server, err := peruse.NewServer(peruse.ServerArgs{

     

       89
       89
       -
       		HttpAddr:           cmd.String("http-addr"),

     

       90
       90
       -
       		ClickhouseAddr:     cmd.String("clickhouse-addr"),

     

       91
       91
       -
       		ClickhouseDatabase: cmd.String("clickhouse-database"),

     

       92
       92
       -
       		ClickhouseUser:     cmd.String("clickhouse-user"),

     

       93
       93
       -
       		ClickhousePass:     cmd.String("clickhouse-pass"),

     

       94
       94
       -
       		Logger:             logger,

     

       95
       95
       -
       		FeedOwnerDid:       cmd.String("feed-owner-did"),

     

       96
       96
       -
       		ServiceDid:         cmd.String("service-did"),

     

       97
       97
       -
       		ServiceEndpoint:    cmd.String("service-endpoint"),

     

       98
       98
       -
       		ChronoFeedRkey:     cmd.String("chrono-feed-rkey"),

     

       94
       94
       +
       		HttpAddr:             cmd.String("http-addr"),

     

       95
       95
       +
       		ClickhouseAddr:       cmd.String("clickhouse-addr"),

     

       96
       96
       +
       		ClickhouseDatabase:   cmd.String("clickhouse-database"),

     

       97
       97
       +
       		ClickhouseUser:       cmd.String("clickhouse-user"),

     

       98
       98
       +
       		ClickhousePass:       cmd.String("clickhouse-pass"),

     

       99
       99
       +
       		Logger:               logger,

     

       100
       100
       +
       		FeedOwnerDid:         cmd.String("feed-owner-did"),

     

       101
       101
       +
       		ServiceDid:           cmd.String("service-did"),

     

       102
       102
       +
       		ServiceEndpoint:      cmd.String("service-endpoint"),

     

       103
       103
       +
       		ChronoFeedRkey:       cmd.String("chrono-feed-rkey"),

     

       104
       104
       +
       		SuggestedFollowsRkey: cmd.String("suggested-follows-rkey"),

     

       99
       105
        
       	})

     

       100
       106
        
       	if err != nil {

     

       101
       107
        
       		logger.Error("error creating server", "error", err)

+77

peruse/get_suggested_follows.go

···

       1
       1
       +
       package peruse

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       	"time"

     

       6
       6
       +
       )

     

       7
       7
       +
       

     

       8
       8
       +
       type SuggestedFollow struct {

     

       9
       9
       +
       	SuggestedDid    string `ch:"suggested_did"`

     

       10
       10
       +
       	BskyUrl         string `ch:"bsky_url"`

     

       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) {

     

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

     

       16
       16
       +
       		return u.suggestedFollows, nil

     

       17
       17
       +
       	}

     

       18
       18
       +
       

     

       19
       19
       +
       	u.mu.Lock()

     

       20
       20
       +
       	defer u.mu.Unlock()

     

       21
       21
       +
       

     

       22
       22
       +
       	if !time.Now().After(u.suggestedFollowsExpiresAt) {

     

       23
       23
       +
       		return u.suggestedFollows, nil

     

       24
       24
       +
       	}

     

       25
       25
       +
       

     

       26
       26
       +
       	var suggestedFollows []SuggestedFollow

     

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

     

       28
       28
       +
       		return nil, err

     

       29
       29
       +
       	}

     

       30
       30
       +
       

     

       31
       31
       +
       	u.suggestedFollowsExpiresAt = time.Now().Add(1 * time.Hour)

     

       32
       32
       +
       

     

       33
       33
       +
       	return suggestedFollows, nil

     

       34
       34
       +
       }

     

       35
       35
       +
       

     

       36
       36
       +
       const getSuggestedFollowsQuery = `

     

       37
       37
       +
       WITH ? as your_did,

     

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

     

       39
       39
       +
           40 as top_mutual_limit,

     

       40
       40
       +
           20 as second_level_limit

     

       41
       41
       +
       

     

       42
       42
       +
       SELECT

     

       43
       43
       +
           f.subject as suggested_did,

     

       44
       44
       +
           concat('https://bsky.app/profile/', f.subject) as bsky_url,

     

       45
       45
       +
           COUNT(*) as followed_by_count

     

       46
       46
       +
       FROM follow f

     

       47
       47
       +
       WHERE

     

       48
       48
       +
           f.subject != your_did

     

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

     

       50
       50
       +
           AND f.did IN (

     

       51
       51
       +
               SELECT i.subject_did

     

       52
       52
       +
               FROM interaction i

     

       53
       53
       +
               WHERE

     

       54
       54
       +
                   i.kind = 'like'

     

       55
       55
       +
                   AND i.created_at > timeframe

     

       56
       56
       +
                   AND i.did IN (

     

       57
       57
       +
                       SELECT i1.subject_did

     

       58
       58
       +
                       FROM interaction i1, interaction_reverse i2

     

       59
       59
       +
                       WHERE i1.subject_did = i2.did

     

       60
       60
       +
                       AND i2.subject_did = your_did

     

       61
       61
       +
                       AND i2.kind = 'like'

     

       62
       62
       +
                       AND i1.did = your_did

     

       63
       63
       +
                       AND i1.kind = 'like'

     

       64
       64
       +
                       AND i1.created_at > timeframe

     

       65
       65
       +
                       GROUP BY i1.subject_did

     

       66
       66
       +
                       ORDER BY COUNT(*) DESC

     

       67
       67
       +
                       LIMIT top_mutual_limit

     

       68
       68
       +
                   )

     

       69
       69
       +
               GROUP BY i.subject_did

     

       70
       70
       +
               ORDER BY COUNT(*) DESC

     

       71
       71
       +
               LIMIT second_level_limit

     

       72
       72
       +
           )

     

       73
       73
       +
       GROUP BY f.subject

     

       74
       74
       +
       HAVING COUNT(*) >= 2

     

       75
       75
       +
       ORDER BY followed_by_count DESC

     

       76
       76
       +
       LIMIT 100

     

       77
       77
       +
       	`

+8 -27

peruse/handle_chrono_feed.go

···

       1
       1
        
       package peruse

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"fmt"

     

       5
       5
       -
       	"strings"

     

       6
       6
       -
       

     

       7
       4
        
       	"github.com/haileyok/peruse/internal/helpers"

     

       8
       8
       -
       	"github.com/haileyok/photocopy/models"

     

       9
       5
        
       	"github.com/labstack/echo/v4"

     

       6
       6
       +
       )

     

       7
       7
       +
       

     

       8
       8
       +
       const (

     

       9
       9
       +
       	DefaultCursor = "9999999999999"

     

       10
       10
        
       )

     

       11
       11
        
       

     

       12
       12
        
       func (s *Server) handleChronoFeed(e echo.Context, req FeedSkeletonRequest) error {

     
···

       26
       26
        
       	cbdids = cbdids[1:] // remove self

     

       27
       27
        
       

     

       28
       28
        
       	if req.Cursor == "" {

     

       29
       29
       -
       		req.Cursor = "9999999999999" // hack for simplicity...

     

       29
       29
       +
       		req.Cursor = DefaultCursor // hack for simplicity...

     

       30
       30
        
       	}

     

       31
       31
        
       

     

       32
       32
       -
       	var posts []models.Post

     

       33
       33
       -
       	if err := s.conn.Select(ctx, &posts, fmt.Sprintf(`

     

       34
       34
       -
       		SELECT uri

     

       35
       35
       -
       		FROM default.post

     

       36
       36
       -
       		WHERE rkey < ?

     

       37
       37
       -
       		AND did IN (?)

     

       38
       38
       -
       		AND parent_uri = ''

     

       39
       39
       -
       		ORDER BY created_at DESC

     

       40
       40
       -
       		LIMIT 50

     

       41
       41
       -
       		`), req.Cursor, cbdids); err != nil {

     

       32
       32
       +
       	posts, err := s.getPostsForDidsChronological(ctx, cbdids, req.Cursor)

     

       33
       33
       +
       	if err != nil {

     

       42
       34
        
       		s.logger.Error("error getting close by chrono posts", "error", err)

     

       43
       35
        
       		return helpers.ServerError(e, "FeedError", "")

     

       44
       36
        
       	}

     
···

       47
       39
        
       		return helpers.ServerError(e, "FeedError", "Not enough posts")

     

       48
       40
        
       	}

     

       49
       41
        
       

     

       50
       50
       -
       	var fpis []FeedPostItem

     

       51
       51
       -
       	var cursor string

     

       52
       52
       -
       

     

       53
       53
       -
       	for i, p := range posts {

     

       54
       54
       -
       		fpis = append(fpis, FeedPostItem{

     

       55
       55
       -
       			Post: p.Uri,

     

       56
       56
       -
       		})

     

       57
       57
       -
       		if i == len(posts)-1 {

     

       58
       58
       -
       			pts := strings.Split(p.Uri, "/")

     

       59
       59
       -
       			cursor = pts[len(pts)-1]

     

       60
       60
       -
       		}

     

       61
       61
       -
       	}

     

       42
       42
       +
       	fpis, cursor := modelPostsToFeedItems(posts)

     

       62
       43
        
       

     

       63
       44
        
       	return e.JSON(200, FeedSkeletonResponse{

     

       64
       45
        
       		Cursor: &cursor,

peruse/handle_feed_skeleton.go

···

       36
       36
        
       	switch aturi.RecordKey().String() {

     

       37
       37
        
       	case s.args.ChronoFeedRkey:

     

       38
       38
        
       		return s.handleChronoFeed(e, req)

     

       39
       39
       +
       	case s.args.SuggestedFollowsRkey:

     

       40
       40
       +
       		return s.handleSuggestedFollowsFeed(e, req)

     

       39
       41
        
       	default:

     

       40
       42
        
       		s.logger.Warn("invalid feed requested", "requested-feed", req.Feed)

     

       41
       43
        
       		return helpers.InputError(e, "FeedNotFound", "")

+43

peruse/handle_suggested_follows_feed.go

···

       1
       1
       +
       package peruse

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"github.com/haileyok/peruse/internal/helpers"

     

       5
       5
       +
       	"github.com/labstack/echo/v4"

     

       6
       6
       +
       )

     

       7
       7
       +
       

     

       8
       8
       +
       func (s *Server) handleSuggestedFollowsFeed(e echo.Context, req FeedSkeletonRequest) error {

     

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

     

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

     

       11
       11
       +
       

     

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

     

       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", "")

     

       16
       16
       +
       	}

     

       17
       17
       +
       

     

       18
       18
       +
       	suggDids := []string{}

     

       19
       19
       +
       	for _, sugg := range suggFollows {

     

       20
       20
       +
       		suggDids = append(suggDids, sugg.SuggestedDid)

     

       21
       21
       +
       	}

     

       22
       22
       +
       

     

       23
       23
       +
       	if req.Cursor == "" {

     

       24
       24
       +
       		req.Cursor = DefaultCursor

     

       25
       25
       +
       	}

     

       26
       26
       +
       

     

       27
       27
       +
       	posts, err := s.getPostsForDidsChronological(ctx, suggDids, req.Cursor)

     

       28
       28
       +
       	if err != nil {

     

       29
       29
       +
       		s.logger.Error("error getting suggested follows chrono posts", "error", err)

     

       30
       30
       +
       		return helpers.ServerError(e, "FeedError", "")

     

       31
       31
       +
       	}

     

       32
       32
       +
       

     

       33
       33
       +
       	if len(posts) == 0 {

     

       34
       34
       +
       		return helpers.ServerError(e, "FeedError", "Not enough posts")

     

       35
       35
       +
       	}

     

       36
       36
       +
       

     

       37
       37
       +
       	fpis, cursor := modelPostsToFeedItems(posts)

     

       38
       38
       +
       

     

       39
       39
       +
       	return e.JSON(200, FeedSkeletonResponse{

     

       40
       40
       +
       		Cursor: &cursor,

     

       41
       41
       +
       		Feed:   fpis,

     

       42
       42
       +
       	})

     

       43
       43
       +
       }

+11 -10

peruse/peruse.go

···

       32
       32
        
       }

     

       33
       33
        
       

     

       34
       34
        
       type ServerArgs struct {

     

       35
       35
       -
       	Logger             *slog.Logger

     

       36
       36
       -
       	HttpAddr           string

     

       37
       37
       -
       	ClickhouseAddr     string

     

       38
       38
       -
       	ClickhouseDatabase string

     

       39
       39
       -
       	ClickhouseUser     string

     

       40
       40
       -
       	ClickhousePass     string

     

       41
       41
       -
       	FeedOwnerDid       string

     

       42
       42
       -
       	ServiceDid         string

     

       43
       43
       -
       	ServiceEndpoint    string

     

       44
       44
       -
       	ChronoFeedRkey     string

     

       35
       35
       +
       	Logger               *slog.Logger

     

       36
       36
       +
       	HttpAddr             string

     

       37
       37
       +
       	ClickhouseAddr       string

     

       38
       38
       +
       	ClickhouseDatabase   string

     

       39
       39
       +
       	ClickhouseUser       string

     

       40
       40
       +
       	ClickhousePass       string

     

       41
       41
       +
       	FeedOwnerDid         string

     

       42
       42
       +
       	ServiceDid           string

     

       43
       43
       +
       	ServiceEndpoint      string

     

       44
       44
       +
       	ChronoFeedRkey       string

     

       45
       45
       +
       	SuggestedFollowsRkey string

     

       45
       46
        
       }

     

       46
       47
        
       

     

       47
       48
        
       func NewServer(args ServerArgs) (*Server, error) {

+39

peruse/post.go

···

       1
       1
       +
       package peruse

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       	"strings"

     

       6
       6
       +
       

     

       7
       7
       +
       	"github.com/haileyok/photocopy/models"

     

       8
       8
       +
       )

     

       9
       9
       +
       

     

       10
       10
       +
       func (s *Server) getPostsForDidsChronological(ctx context.Context, dids []string, cursor string) ([]models.Post, error) {

     

       11
       11
       +
       	var posts []models.Post

     

       12
       12
       +
       	if err := s.conn.Select(ctx, &posts, `

     

       13
       13
       +
       		SELECT uri

     

       14
       14
       +
       		FROM default.post

     

       15
       15
       +
       		WHERE rkey < ?

     

       16
       16
       +
       		AND did IN (?)

     

       17
       17
       +
       		AND parent_uri = ''

     

       18
       18
       +
       		ORDER BY created_at DESC

     

       19
       19
       +
       		LIMIT 50

     

       20
       20
       +
       		`, cursor, dids); err != nil {

     

       21
       21
       +
       		return nil, err

     

       22
       22
       +
       	}

     

       23
       23
       +
       	return posts, nil

     

       24
       24
       +
       }

     

       25
       25
       +
       

     

       26
       26
       +
       func modelPostsToFeedItems(posts []models.Post) ([]FeedPostItem, string) {

     

       27
       27
       +
       	var fpis []FeedPostItem

     

       28
       28
       +
       	var cursor string

     

       29
       29
       +
       	for i, p := range posts {

     

       30
       30
       +
       		fpis = append(fpis, FeedPostItem{

     

       31
       31
       +
       			Post: p.Uri,

     

       32
       32
       +
       		})

     

       33
       33
       +
       		if i == len(posts)-1 {

     

       34
       34
       +
       			pts := strings.Split(p.Uri, "/")

     

       35
       35
       +
       			cursor = pts[len(pts)-1]

     

       36
       36
       +
       		}

     

       37
       37
       +
       	}

     

       38
       38
       +
       	return fpis, cursor

     

       39
       39
       +
       }

peruse/user.go

···

       50
       50
        
       

     

       51
       51
        
       	closeBy          []CloseBy

     

       52
       52
        
       	closeByExpiresAt time.Time

     

       53
       53
       +
       

     

       54
       54
       +
       	suggestedFollows          []SuggestedFollow

     

       55
       55
       +
       	suggestedFollowsExpiresAt time.Time

     

       53
       56
        
       }

     

       54
       57
        
       

     

       55
       58
        
       func NewUser(did string) *User {