commit 2bb7805ba838dfb5cb2705970cad61ec2889c591 · edavis.dev/bsky-feeds

-1

.gitignore

+6 -2

Makefile

···

       1
       1
        
       all: bin/mostliked bin/feedweb

     

       2
       2
        
       

     

       3
       3
       -
       bin/mostliked: cmd/mostliked/*.go pkg/mostliked/*.go

     

       3
       3
       +
       bin/mostliked: cmd/mostliked/*.go pkg/mostliked/*.go db/mostliked/*.go

     

       4
       4
        
       	go build -o $@ ./cmd/mostliked

     

       5
       5
        
       

     

       6
       6
       -
       bin/feedweb: cmd/feedweb/*.go pkg/*/*.go mostliked/*.go

     

       6
       6
       +
       bin/feedweb: cmd/feedweb/*.go pkg/*/*.go db/*/*.go

     

       7
       7
        
       	go build -o $@ ./cmd/feedweb

     

       8
       8
       +
       

     

       9
       9
       +
       .PHONY: clean

     

       10
       10
       +
       clean:

     

       11
       11
       +
       	rm bin/*

+1 -1

cmd/feedweb/feedweb.go cmd/feedweb/main.go

···

       3
       3
        
       import (

     

       4
       4
        
       	"net/http"

     

       5
       5
        
       

     

       6
       6
       -
       	"github.com/edavis/bsky-feeds/mostliked"

     

       6
       6
       +
       	"github.com/edavis/bsky-feeds/pkg/mostliked"

     

       7
       7
        
       	"github.com/labstack/echo/v4"

     

       8
       8
        
       	"github.com/labstack/echo/v4/middleware"

     

       9
       9
        
       )

+30

cmd/mostliked/main.go

···

       1
       1
       +
       package main

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"log"

     

       5
       5
       +
       

     

       6
       6
       +
       	"github.com/gorilla/websocket"

     

       7
       7
       +
       

     

       8
       8
       +
       	"github.com/edavis/bsky-feeds/pkg/mostliked"

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       func main() {

     

       12
       12
       +
       	conn, _, err := websocket.DefaultDialer.Dial("ws://localhost:6008/subscribe?wantedCollections=app.bsky.feed.post&wantedCollections=app.bsky.feed.like", nil)

     

       13
       13
       +
       	if err != nil {

     

       14
       14
       +
       		log.Fatal("websocket connection error:", err)

     

       15
       15
       +
       	}

     

       16
       16
       +
       	defer conn.Close()

     

       17
       17
       +
       

     

       18
       18
       +
       	jetstreamEvents := make(chan []byte)

     

       19
       19
       +
       	go mostliked.Handler(jetstreamEvents)

     

       20
       20
       +
       

     

       21
       21
       +
       	log.Println("starting up")

     

       22
       22
       +
       	for {

     

       23
       23
       +
       		_, message, err := conn.ReadMessage()

     

       24
       24
       +
       		if err != nil {

     

       25
       25
       +
       			log.Println("error reading from websocket:", err)

     

       26
       26
       +
       			break

     

       27
       27
       +
       		}

     

       28
       28
       +
       		jetstreamEvents <- message

     

       29
       29
       +
       	}

     

       30
       30
       +
       }

+4 -26

cmd/mostliked/mostliked.go pkg/mostliked/handler.go

···

       1
       1
       -
       package main

     

       1
       1
       +
       package mostliked

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"context"

     
···

       12
       12
        
       

     

       13
       13
        
       	appbsky "github.com/bluesky-social/indigo/api/bsky"

     

       14
       14
        
       	jetstream "github.com/bluesky-social/jetstream/pkg/models"

     

       15
       15
       -
       	db "github.com/edavis/bsky-feeds/pkg/mostliked"

     

       16
       16
       -
       	"github.com/gorilla/websocket"

     

       15
       15
       +
       	db "github.com/edavis/bsky-feeds/db/mostliked"

     

       17
       16
        
       	"github.com/karlseguin/ccache/v3"

     

       18
       17
        
       	_ "github.com/mattn/go-sqlite3"

     

       19
       18
        
       	"github.com/pemistahl/lingua-go"

     
···

       91
       90
        
       	return ""

     

       92
       91
        
       }

     

       93
       92
        
       

     

       94
       94
       -
       func processEvents(events <-chan []byte) {

     

       93
       93
       +
       func Handler(events <-chan []byte) {

     

       95
       94
        
       	ctx := context.Background()

     

       96
       95
        
       

     

       97
       97
       -
       	dbCnx, err := sql.Open("sqlite3", "db/mostliked.db?_journal=WAL&_fk=on")

     

       96
       96
       +
       	dbCnx, err := sql.Open("sqlite3", "data/mostliked.db?_journal=WAL&_fk=on")

     

       98
       97
        
       	if err != nil {

     

       99
       98
        
       		log.Fatal("error opening db")

     

       100
       99
        
       	}

     
···

       197
       196
        
       		}

     

       198
       197
        
       	}

     

       199
       198
        
       }

     

       200
       200
       -
       

     

       201
       201
       -
       func main() {

     

       202
       202
       -
       	conn, _, err := websocket.DefaultDialer.Dial("ws://localhost:6008/subscribe?wantedCollections=app.bsky.feed.post&wantedCollections=app.bsky.feed.like", nil)

     

       203
       203
       -
       	if err != nil {

     

       204
       204
       -
       		log.Fatal("websocket connection error:", err)

     

       205
       205
       -
       	}

     

       206
       206
       -
       	defer conn.Close()

     

       207
       207
       -
       

     

       208
       208
       -
       	jetstreamEvents := make(chan []byte)

     

       209
       209
       -
       	go processEvents(jetstreamEvents)

     

       210
       210
       -
       

     

       211
       211
       -
       	log.Println("starting up")

     

       212
       212
       -
       	for {

     

       213
       213
       -
       		_, message, err := conn.ReadMessage()

     

       214
       214
       -
       		if err != nil {

     

       215
       215
       -
       			log.Println("error reading from websocket:", err)

     

       216
       216
       -
       			break

     

       217
       217
       -
       		}

     

       218
       218
       -
       		jetstreamEvents <- message

     

       219
       219
       -
       	}

     

       220
       220
       -
       }

cmd/mostliked/query.sql pkg/mostliked/query.sql

cmd/mostliked/schema.sql pkg/mostliked/schema.sql

+2 -2

mostliked/feed.go pkg/mostliked/view.go

···

       6
       6
        
       	"log"

     

       7
       7
        
       	"strconv"

     

       8
       8
        
       

     

       9
       9
       -
       	db "github.com/edavis/bsky-feeds/pkg/mostliked"

     

       9
       9
       +
       	db "github.com/edavis/bsky-feeds/db/mostliked"

     

       10
       10
        
       	_ "github.com/mattn/go-sqlite3"

     

       11
       11
        
       )

     

       12
       12
        
       

     
···

       18
       18
        
       

     

       19
       19
        
       func Feed(args FeedViewParams) []string {

     

       20
       20
        
       	ctx := context.Background()

     

       21
       21
       -
       	dbCnx, err := sql.Open("sqlite3", "db/mostliked.db?_journal=WAL&_fk=on")

     

       21
       21
       +
       	dbCnx, err := sql.Open("sqlite3", "data/mostliked.db?_journal=WAL&_fk=on")

     

       22
       22
        
       	if err != nil {

     

       23
       23
        
       		log.Fatal("error opening db")

     

       24
       24
        
       	}

pkg/mostliked/db.go db/mostliked/db.go

pkg/mostliked/models.go db/mostliked/models.go

pkg/mostliked/query.sql.go db/mostliked/query.sql.go

+3 -3

sqlc.yaml

···

       1
       1
        
       version: "2"

     

       2
       2
        
       sql:

     

       3
       3
        
         - engine: "sqlite"

     

       4
       4
       -
           queries: "cmd/mostliked/query.sql"

     

       5
       5
       -
           schema: "cmd/mostliked/schema.sql"

     

       4
       4
       +
           queries: "pkg/mostliked/query.sql"

     

       5
       5
       +
           schema: "pkg/mostliked/schema.sql"

     

       6
       6
        
           gen:

     

       7
       7
        
             go:

     

       8
       8
        
               package: "mostliked"

     

       9
       9
       -
               out: "pkg/mostliked"

     

       9
       9
       +
               out: "db/mostliked"