commit bf26b0a1e06c65de468cbdddef41752e0d8c8fdd · hailey.at/peruse

+20 -12

peruse/handle_baseball_feed.go

···

       16
       16
        
       type BaseballFeed struct {

     

       17
       17
        
       	conn           driver.Conn

     

       18
       18
        
       	logger         *slog.Logger

     

       19
       19
       -
       	cached         []BaseballPost

     

       19
       19
       +
       	cached         []RankedFeedPost

     

       20
       20
        
       	cacheExpiresAt time.Time

     

       21
       21
        
       	mu             sync.RWMutex

     

       22
       22
        
       }

     

       23
       23
        
       

     

       24
       24
       -
       type BaseballPost struct {

     

       24
       24
       +
       type RankedFeedPost struct {

     

       25
       25
        
       	LikeCt     uint64    `ch:"like_ct"`

     

       26
       26
        
       	Uri        string    `ch:"uri"`

     

       27
       27
        
       	CreatedAt  time.Time `ch:"created_at"`

     
···

       45
       45
        
       func (f *BaseballFeed) HandleGetFeedSkeleton(e echo.Context, req FeedSkeletonRequest) error {

     

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

     

       47
       47
        
       

     

       48
       48
       -
       	cursor := time.Now()

     

       49
       49
       -
       	if req.Cursor != "" {

     

       50
       50
       -
       		maybeCursor, err := msToTime(req.Cursor)

     

       51
       51
       -
       		if err != nil {

     

       52
       52
       -
       			f.logger.Error("error getting time from cursor", "error", err)

     

       53
       53
       -
       			return helpers.InputError(e, "InputError", "Invalid cursor for feed")

     

       54
       54
       -
       		}

     

       55
       55
       -
       		cursor = maybeCursor

     

       48
       48
       +
       	cursor, err := getTimeBasedCursor(req)

     

       49
       49
       +
       	if err != nil {

     

       50
       50
       +
       		f.logger.Error("error getting cursor", "error", err)

     

       51
       51
       +
       		return helpers.InputError(e, "FeedError", "Invalid cursor for feed")

     

       56
       52
        
       	}

     

       57
       53
        
       

     

       58
       54
        
       	posts, err := f.getPosts(ctx)

     
···

       89
       85
        
       	})

     

       90
       86
        
       }

     

       91
       87
        
       

     

       92
       92
       -
       func (f *BaseballFeed) getPosts(ctx context.Context) ([]BaseballPost, error) {

     

       88
       88
       +
       func (f *BaseballFeed) getPosts(ctx context.Context) ([]RankedFeedPost, error) {

     

       93
       89
        
       	f.mu.RLock()

     

       94
       90
        
       	f.mu.RUnlock()

     

       95
       91
        
       	if f.cached != nil && time.Now().Before(f.cacheExpiresAt) {

     
···

       103
       99
        
       		return f.cached, nil

     

       104
       100
        
       	}

     

       105
       101
        
       

     

       106
       106
       -
       	var posts []BaseballPost

     

       102
       102
       +
       	var posts []RankedFeedPost

     

       107
       103
        
       	if err := f.conn.Select(ctx, &posts, baseballQuery); err != nil {

     

       108
       104
        
       		return nil, err

     

       109
       105
        
       	}

     
···

       134
       130
        
       ORDER BY decay_score DESC

     

       135
       131
        
       LIMIT 5000

     

       136
       132
        
       `

     

       133
       133
       +
       

     

       134
       134
       +
       func getTimeBasedCursor(req FeedSkeletonRequest) (time.Time, error) {

     

       135
       135
       +
       	cursor := time.Now()

     

       136
       136
       +
       	if req.Cursor != "" {

     

       137
       137
       +
       		maybeCursor, err := msToTime(req.Cursor)

     

       138
       138
       +
       		if err != nil {

     

       139
       139
       +
       			return time.Time{}, fmt.Errorf("error getting time from cursor: %w", err)

     

       140
       140
       +
       		}

     

       141
       141
       +
       		cursor = maybeCursor

     

       142
       142
       +
       	}

     

       143
       143
       +
       	return cursor, nil

     

       144
       144
       +
       }

+115

peruse/handle_seattle_feed.go

···

       1
       1
       +
       package peruse

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       	"fmt"

     

       6
       6
       +
       	"log/slog"

     

       7
       7
       +
       	"sync"

     

       8
       8
       +
       	"time"

     

       9
       9
       +
       

     

       10
       10
       +
       	"github.com/ClickHouse/clickhouse-go/v2/lib/driver"

     

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

     

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

     

       13
       13
       +
       )

     

       14
       14
       +
       

     

       15
       15
       +
       type SeattleFeed struct {

     

       16
       16
       +
       	conn           driver.Conn

     

       17
       17
       +
       	logger         *slog.Logger

     

       18
       18
       +
       	cached         []RankedFeedPost

     

       19
       19
       +
       	cacheExpiresAt time.Time

     

       20
       20
       +
       	mu             sync.RWMutex

     

       21
       21
       +
       }

     

       22
       22
       +
       

     

       23
       23
       +
       func NewSeattleFeed(s *Server) *SeattleFeed {

     

       24
       24
       +
       	logger := s.logger.With("feed", "seattle-feed")

     

       25
       25
       +
       	return &SeattleFeed{

     

       26
       26
       +
       		conn:   s.conn,

     

       27
       27
       +
       		logger: logger,

     

       28
       28
       +
       	}

     

       29
       29
       +
       }

     

       30
       30
       +
       

     

       31
       31
       +
       func (f *SeattleFeed) Name() string {

     

       32
       32
       +
       	return "seattle"

     

       33
       33
       +
       }

     

       34
       34
       +
       

     

       35
       35
       +
       func (f *SeattleFeed) HandleGetFeedSkeleton(e echo.Context, req FeedSkeletonRequest) error {

     

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

     

       37
       37
       +
       

     

       38
       38
       +
       	cursor, err := getTimeBasedCursor(req)

     

       39
       39
       +
       	if err != nil {

     

       40
       40
       +
       		f.logger.Error("error getting cursor", "error", err)

     

       41
       41
       +
       		return helpers.InputError(e, "FeedError", "Invalid cursor for feed")

     

       42
       42
       +
       	}

     

       43
       43
       +
       

     

       44
       44
       +
       	posts, err := f.getPosts(ctx)

     

       45
       45
       +
       	if err != nil {

     

       46
       46
       +
       		f.logger.Error("error getting posts", "error", err)

     

       47
       47
       +
       		return helpers.ServerError(e, "FeedError", "Unable to get posts for feed")

     

       48
       48
       +
       	}

     

       49
       49
       +
       

     

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

     

       51
       51
       +
       		if p.CreatedAt.Before(cursor) {

     

       52
       52
       +
       			posts = posts[i:]

     

       53
       53
       +
       			break

     

       54
       54
       +
       		}

     

       55
       55
       +
       	}

     

       56
       56
       +
       

     

       57
       57
       +
       	if len(posts) > 30 {

     

       58
       58
       +
       		posts = posts[:30]

     

       59
       59
       +
       	}

     

       60
       60
       +
       

     

       61
       61
       +
       	var items []FeedPostItem

     

       62
       62
       +
       	for _, p := range posts {

     

       63
       63
       +
       		items = append(items, FeedPostItem{

     

       64
       64
       +
       			Post: p.Uri,

     

       65
       65
       +
       		})

     

       66
       66
       +
       	}

     

       67
       67
       +
       

     

       68
       68
       +
       	newCursor := fmt.Sprintf("%d", posts[len(posts)-1].CreatedAt.UnixMilli())

     

       69
       69
       +
       

     

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

     

       71
       71
       +
       		Feed:   items,

     

       72
       72
       +
       		Cursor: &newCursor,

     

       73
       73
       +
       	})

     

       74
       74
       +
       }

     

       75
       75
       +
       

     

       76
       76
       +
       func (f *SeattleFeed) getPosts(ctx context.Context) ([]RankedFeedPost, error) {

     

       77
       77
       +
       	now := time.Now()

     

       78
       78
       +
       	f.mu.RLock()

     

       79
       79
       +
       	expiresAt := f.cacheExpiresAt

     

       80
       80
       +
       	posts := f.cached

     

       81
       81
       +
       	f.mu.RUnlock()

     

       82
       82
       +
       	if posts != nil && now.Before(expiresAt) {

     

       83
       83
       +
       		return posts, nil

     

       84
       84
       +
       	}

     

       85
       85
       +
       

     

       86
       86
       +
       	f.mu.Lock()

     

       87
       87
       +
       	defer f.mu.Unlock()

     

       88
       88
       +
       

     

       89
       89
       +
       	if f.cached != nil && now.Before(expiresAt) {

     

       90
       90
       +
       		return f.cached, nil

     

       91
       91
       +
       	}

     

       92
       92
       +
       

     

       93
       93
       +
       	if err := f.conn.Select(ctx, &posts, seattleQuery); err != nil {

     

       94
       94
       +
       		return nil, err

     

       95
       95
       +
       	}

     

       96
       96
       +
       	f.cached = posts

     

       97
       97
       +
       	f.cacheExpiresAt = now

     

       98
       98
       +
       

     

       99
       99
       +
       	return posts, nil

     

       100
       100
       +
       }

     

       101
       101
       +
       

     

       102
       102
       +
       var seattleQuery = `

     

       103
       103
       +
       SELECT 

     

       104
       104
       +
           count(*) as like_ct,

     

       105
       105
       +
           sp.uri,

     

       106
       106
       +
           sp.created_at,

     

       107
       107
       +
           dateDiff('hour', sp.created_at, now()) as hours_old,

     

       108
       108
       +
           count(*) * exp(-0.1 * dateDiff('hour', sp.created_at, now())) as decay_score

     

       109
       109
       +
       FROM seattle_post sp 

     

       110
       110
       +
       LEFT JOIN default.like_by_subject i ON sp.uri = i.subject_uri 

     

       111
       111
       +
       WHERE sp.created_at > now() - INTERVAL 1 DAY 

     

       112
       112
       +
       GROUP BY sp.uri, sp.created_at 

     

       113
       113
       +
       ORDER BY decay_score DESC

     

       114
       114
       +
       LIMIT 5000

     

       115
       115
       +
       	`

peruse/peruse.go

···

       118
       118
        
       	defer cancel()

     

       119
       119
        
       

     

       120
       120
        
       	s.addFeed(NewBaseballFeed(s))

     

       121
       121
       +
       	s.addFeed(NewSeattleFeed(s))

     

       121
       122
        
       

     

       122
       123
        
       	s.addRoutes()

     

       123
       124