comparing ccdc3b51b082b8064d5b9061d22b19b86281d4ce and master on edavis.dev/bsky-tools

-46

plc-activity.py

···

       1
       -
       #!/usr/bin/env python3

     

       2
       -
       

     

       3
       -
       from datetime import datetime, timezone

     

       4
       -
       import sys

     

       5
       -
       import json

     

       6
       -
       import redis

     

       7
       -
       import requests

     

       8
       -
       import time

     

       9
       -
       

     

       10
       -
       PLC_EXPORT_URL = 'https://plc.directory/export'

     

       11
       -
       

     

       12
       -
       cids = []

     

       13
       -
       redis_conn = redis.Redis()

     

       14
       -
       redis_pipe = redis_conn.pipeline()

     

       15
       -
       

     

       16
       -
       while True:

     

       17
       -
           plc_latest = redis_conn.get('dev.edavis.muninsky.plc_latest')

     

       18
       -
           assert plc_latest is not None, 'manually set the `plc_latest` redis key first'

     

       19
       -
           ts = datetime.fromisoformat(plc_latest.decode())

     

       20
       -
           ts = ts.isoformat('T', 'milliseconds').replace('+00:00', 'Z')

     

       21
       -
       

     

       22
       -
           qs = '?after={ts}'.format(ts=ts)

     

       23
       -
       

     

       24
       -
           print(f'Requesting {PLC_EXPORT_URL}{qs}', end=' ')

     

       25
       -
           resp = requests.get(PLC_EXPORT_URL + qs)

     

       26
       -
           resp.raise_for_status()

     

       27
       -
       

     

       28
       -
           ops = 0

     

       29
       -
           after = datetime.now(timezone.utc)

     

       30
       -
           for line in resp.iter_lines():

     

       31
       -
               doc = json.loads(line)

     

       32
       -
               after = datetime.strptime(doc['createdAt'], '%Y-%m-%dT%H:%M:%S.%fZ').replace(tzinfo=timezone.utc)

     

       33
       -
               if doc['cid'] in cids:

     

       34
       -
                   continue

     

       35
       -
               cids.insert(0, doc['cid'])

     

       36
       -
               redis_pipe.incr('dev.edavis.muninsky.plc_ops')

     

       37
       -
               ops += 1

     

       38
       -
       

     

       39
       -
           print(f'Fetched {ops} operations')

     

       40
       -
           sys.stdout.flush()

     

       41
       -
           cids = cids[:25]

     

       42
       -
       

     

       43
       -
           redis_pipe.set('dev.edavis.muninsky.plc_latest', after.isoformat())

     

       44
       -
           redis_pipe.execute()

     

       45
       -
       

     

       46
       -
           time.sleep(5)

+1 -1

autoposters/bskycharts.py

···

       12
        
       

     

       13
        
       

     

       14
        
       def main():

     

       15
       -
           client = atproto.Client()

     

       16
        
           client.login(BSKY_HANDLE, BSKY_APP_PASSWORD)

     

       17
        
       

     

       18
        
           resp = requests.get(BSKY_ACTIVITY_IMAGE_URL)

···

       12
        
       

     

       13
        
       

     

       14
        
       def main():

     

       15
       +
           client = atproto.Client('https://pds.merklehost.xyz')

     

       16
        
           client.login(BSKY_HANDLE, BSKY_APP_PASSWORD)

     

       17
        
       

     

       18
        
           resp = requests.get(BSKY_ACTIVITY_IMAGE_URL)

+1 -1

cmd/bsky-langs/main.go

···

       10
        
       	"github.com/gorilla/websocket"

     

       11
        
       )

     

       12
        
       

     

       13
       -
       const JetstreamUrl = `ws://localhost:6008/subscribe?wantedCollections=app.bsky.feed.post`

     

       14
        
       

     

       15
        
       func main() {

     

       16
        
       	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGINT, syscall.SIGTERM)

···

       10
        
       	"github.com/gorilla/websocket"

     

       11
        
       )

     

       12
        
       

     

       13
       +
       const JetstreamUrl = `wss://jetstream1.us-west.bsky.network/subscribe?wantedCollections=app.bsky.feed.post`

     

       14
        
       

     

       15
        
       func main() {

     

       16
        
       	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGINT, syscall.SIGTERM)

-4

cmd/bsky-users/main.go

···

       215
        
       				stop()

     

       216
        
       				break

     

       217
        
       			}

     

       218
       -
       

     

       219
        
       			queue.Enqueue(event)

     

       220
       -
       			if queue.Size() < 50 {

     

       221
       -
       				log.Printf("[startup] added event")

     

       222
       -
       			}

     

       223
        
       		}

     

       224
        
       	}()

     

       225

···

       215
        
       				stop()

     

       216
        
       				break

     

       217
        
       			}

     

       0
        
       
     

       218
        
       			queue.Enqueue(event)

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       219
        
       		}

     

       220
        
       	}()

     

       221

+3 -3

service/bsky-users.service

···

       4
        
       

     

       5
        
       [Service]

     

       6
        
       Type=simple

     

       7
       -
       User=eric

     

       8
       -
       WorkingDirectory=/home/eric/bsky-tools

     

       9
       -
       ExecStart=/home/eric/bsky-tools/bin/bsky-users

     

       10
        
       TimeoutSec=10

     

       11
        
       Restart=always

     

       12
        
       RestartSec=5

···

       4
        
       

     

       5
        
       [Service]

     

       6
        
       Type=simple

     

       7
       +
       User=ubuntu

     

       8
       +
       WorkingDirectory=/home/ubuntu/bsky-tools

     

       9
       +
       ExecStart=/home/ubuntu/bsky-tools/bin/bsky-users

     

       10
        
       TimeoutSec=10

     

       11
        
       Restart=always

     

       12
        
       RestartSec=5

+3 -3

service/bsky-langs.service

···

       4
        
       

     

       5
        
       [Service]

     

       6
        
       Type=simple

     

       7
       -
       User=eric

     

       8
       -
       WorkingDirectory=/home/eric/bsky-tools

     

       9
       -
       ExecStart=/home/eric/bsky-tools/bin/bsky-langs

     

       10
        
       TimeoutSec=15

     

       11
        
       Restart=always

     

       12
        
       RestartSec=30

···

       4
        
       

     

       5
        
       [Service]

     

       6
        
       Type=simple

     

       7
       +
       User=ubuntu

     

       8
       +
       WorkingDirectory=/home/ubuntu/bsky-tools

     

       9
       +
       ExecStart=/home/ubuntu/bsky-tools/bin/bsky-langs

     

       10
        
       TimeoutSec=15

     

       11
        
       Restart=always

     

       12
        
       RestartSec=30

+6 -6

service/bsky-activity.service

···

       1
        
       [Unit]

     

       2
       -
       Description=Bsky Activity

     

       3
        
       After=network.target syslog.target

     

       4
        
       

     

       5
        
       [Service]

     

       6
        
       Type=simple

     

       7
       -
       User=eric

     

       8
       -
       WorkingDirectory=/home/eric/bsky-tools

     

       9
       -
       ExecStart=/home/eric/.local/bin/pipenv run ./bsky-activity.py

     

       10
        
       TimeoutSec=15

     

       11
       -
       Restart=on-failure

     

       12
       -
       RestartSec=1

     

       13
        
       StandardOutput=journal

     

       14
        
       

     

       15
        
       [Install]

···

       1
        
       [Unit]

     

       2
       +
       Description=bsky activity

     

       3
        
       After=network.target syslog.target

     

       4
        
       

     

       5
        
       [Service]

     

       6
        
       Type=simple

     

       7
       +
       User=ubuntu

     

       8
       +
       WorkingDirectory=/home/ubuntu/bsky-tools

     

       9
       +
       ExecStart=/home/ubuntu/bsky-tools/bin/bsky-activity

     

       10
        
       TimeoutSec=15

     

       11
       +
       Restart=always

     

       12
       +
       RestartSec=30

     

       13
        
       StandardOutput=journal

     

       14
        
       

     

       15
        
       [Install]

+55 -8

cmd/bsky-activity/main.go

···

       7
        
       	"os"

     

       8
        
       	"os/signal"

     

       9
        
       	"strings"

     

       0
        
       
     

       10
        
       	"syscall"

     

       0
        
       
     

       11
        
       

     

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

     

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

     
···

       15
        
       	"github.com/redis/go-redis/v9"

     

       16
        
       )

     

       17
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       18
        
       const JetstreamUrl = `wss://jetstream1.us-west.bsky.network/subscribe`

     

       19
        
       

     

       20
        
       var AppBskyAllowlist = map[string]bool{

     
···

       59
        
       	return false

     

       60
        
       }

     

       61
        
       

     

       62
       -
       func handler(ctx context.Context, events <-chan jetstream.Event) {

     

       63
        
       	rdb := redis.NewClient(&redis.Options{

     

       64
        
       		Addr:     "localhost:6379",

     

       65
        
       		Password: "",

     
···

       69
        
       	var eventCount int

     

       70
        
       

     

       71
        
       eventLoop:

     

       72
       -
       	for event := range events {

     

       73
        
       		select {

     

       74
        
       		case <-ctx.Done():

     

       75
        
       			break eventLoop

     

       76
        
       		default:

     

       77
        
       		}

     

       78
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       79
        
       		if event.Kind != jetstream.EventKindCommit {

     

       80
        
       			continue

     

       81
        
       		}

     
···

       145
        
       			if _, err := pipe.Exec(ctx); err != nil {

     

       146
        
       				log.Printf("failed to exec pipe\n")

     

       147
        
       			}

     

       0
        
       
     

       148
        
       		}

     

       149
        
       	}

     

       150
        
       }

     
···

       164
        
       		log.Printf("websocket closed\n")

     

       165
        
       	}()

     

       166
        
       

     

       167
       -
       	jetstreamEvents := make(chan jetstream.Event)

     

       168
       -
       	go handler(ctx, jetstreamEvents)

     

       169
        
       

     

       170
        
       	log.Printf("starting up\n")

     

       171
       -
       	var event jetstream.Event

     

       172
        
       	go func() {

     

       173
        
       		for {

     

       174
       -
       			event = jetstream.Event{}

     

       175
        
       			err := conn.ReadJSON(&event)

     

       176
        
       			if err != nil {

     

       177
        
       				log.Printf("ReadJSON error: %v\n", err)

     

       178
        
       				stop()

     

       179
        
       				break

     

       180
       -
       			} else {

     

       181
       -
       				jetstreamEvents <- event

     

       182
        
       			}

     

       0
        
       
     

       183
        
       		}

     

       184
        
       	}()

     

       185

···

       7
        
       	"os"

     

       8
        
       	"os/signal"

     

       9
        
       	"strings"

     

       10
       +
       	"sync"

     

       11
        
       	"syscall"

     

       12
       +
       	"time"

     

       13
        
       

     

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

     

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

     
···

       17
        
       	"github.com/redis/go-redis/v9"

     

       18
        
       )

     

       19
        
       

     

       20
       +
       type Queue struct {

     

       21
       +
       	lk     sync.Mutex

     

       22
       +
       	events []jetstream.Event

     

       23
       +
       }

     

       24
       +
       

     

       25
       +
       func NewQueue(capacity int) *Queue {

     

       26
       +
       	return &Queue{

     

       27
       +
       		events: make([]jetstream.Event, 0, capacity),

     

       28
       +
       	}

     

       29
       +
       }

     

       30
       +
       

     

       31
       +
       func (q *Queue) Enqueue(event jetstream.Event) {

     

       32
       +
       	q.lk.Lock()

     

       33
       +
       	defer q.lk.Unlock()

     

       34
       +
       

     

       35
       +
       	q.events = append(q.events, event)

     

       36
       +
       }

     

       37
       +
       

     

       38
       +
       func (q *Queue) Dequeue() (jetstream.Event, bool) {

     

       39
       +
       	q.lk.Lock()

     

       40
       +
       	defer q.lk.Unlock()

     

       41
       +
       

     

       42
       +
       	var event jetstream.Event

     

       43
       +
       

     

       44
       +
       	if len(q.events) == 0 {

     

       45
       +
       		return event, false

     

       46
       +
       	}

     

       47
       +
       

     

       48
       +
       	event = q.events[0]

     

       49
       +
       	q.events = q.events[1:]

     

       50
       +
       	return event, true

     

       51
       +
       }

     

       52
       +
       

     

       53
       +
       func (q *Queue) Size() int {

     

       54
       +
       	q.lk.Lock()

     

       55
       +
       	defer q.lk.Unlock()

     

       56
       +
       

     

       57
       +
       	return len(q.events)

     

       58
       +
       }

     

       59
       +
       

     

       60
        
       const JetstreamUrl = `wss://jetstream1.us-west.bsky.network/subscribe`

     

       61
        
       

     

       62
        
       var AppBskyAllowlist = map[string]bool{

     
···

       101
        
       	return false

     

       102
        
       }

     

       103
        
       

     

       104
       +
       func handler(ctx context.Context, queue *Queue) {

     

       105
        
       	rdb := redis.NewClient(&redis.Options{

     

       106
        
       		Addr:     "localhost:6379",

     

       107
        
       		Password: "",

     
···

       111
        
       	var eventCount int

     

       112
        
       

     

       113
        
       eventLoop:

     

       114
       +
       	for {

     

       115
        
       		select {

     

       116
        
       		case <-ctx.Done():

     

       117
        
       			break eventLoop

     

       118
        
       		default:

     

       119
        
       		}

     

       120
        
       

     

       121
       +
       		event, ok := queue.Dequeue()

     

       122
       +
       		if !ok {

     

       123
       +
       			time.Sleep(100 * time.Millisecond)

     

       124
       +
       			continue

     

       125
       +
       		}

     

       126
       +
       

     

       127
        
       		if event.Kind != jetstream.EventKindCommit {

     

       128
        
       			continue

     

       129
        
       		}

     
···

       193
        
       			if _, err := pipe.Exec(ctx); err != nil {

     

       194
        
       				log.Printf("failed to exec pipe\n")

     

       195
        
       			}

     

       196
       +
       			log.Printf("queue size: %d\n", queue.Size())

     

       197
        
       		}

     

       198
        
       	}

     

       199
        
       }

     
···

       213
        
       		log.Printf("websocket closed\n")

     

       214
        
       	}()

     

       215
        
       

     

       216
       +
       	queue := NewQueue(100_000)

     

       217
       +
       	go handler(ctx, queue)

     

       218
        
       

     

       219
        
       	log.Printf("starting up\n")

     

       0
        
       
     

       220
        
       	go func() {

     

       221
        
       		for {

     

       222
       +
       			var event jetstream.Event

     

       223
        
       			err := conn.ReadJSON(&event)

     

       224
        
       			if err != nil {

     

       225
        
       				log.Printf("ReadJSON error: %v\n", err)

     

       226
        
       				stop()

     

       227
        
       				break

     

       0
        
       
     

       0
        
       
     

       228
        
       			}

     

       229
       +
       			queue.Enqueue(event)

     

       230
        
       		}

     

       231
        
       	}()

     

       232

+11 -3

go.mod

···

       1
        
       module github.com/edavis/bsky-tools

     

       2
        
       

     

       3
       -
       go 1.23.0

     

       0
        
       
     

       0
        
       
     

       4
        
       

     

       5
        
       require (

     

       6
       -
       	github.com/bluesky-social/indigo v0.0.0-20240905024844-a4f38639767f

     

       7
        
       	github.com/bluesky-social/jetstream v0.0.0-20241020000921-dcd43344c716

     

       0
        
       
     

       8
        
       	github.com/gorilla/websocket v1.5.1

     

       9
        
       	github.com/mattn/go-sqlite3 v1.14.22

     

       10
        
       	github.com/pemistahl/lingua-go v1.4.0

     

       11
        
       	github.com/redis/go-redis/v9 v9.3.0

     

       0
        
       
     

       12
        
       )

     

       13
        
       

     

       14
        
       require (

     

       15
        
       	github.com/carlmjohnson/versioninfo v0.22.5 // indirect

     

       16
        
       	github.com/cespare/xxhash/v2 v2.3.0 // indirect

     

       0
        
       
     

       17
        
       	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect

     

       18
        
       	github.com/felixge/httpsnoop v1.0.4 // indirect

     

       19
        
       	github.com/go-logr/logr v1.4.1 // indirect

     
···

       48
        
       	github.com/multiformats/go-varint v0.0.7 // indirect

     

       49
        
       	github.com/opentracing/opentracing-go v1.2.0 // indirect

     

       50
        
       	github.com/polydawn/refmt v0.89.1-0.20221221234430-40501e09de1f // indirect

     

       0
        
       
     

       51
        
       	github.com/shopspring/decimal v1.3.1 // indirect

     

       52
        
       	github.com/spaolacci/murmur3 v1.1.0 // indirect

     

       53
       -
       	github.com/whyrusleeping/cbor-gen v0.1.3-0.20240904181319-8dc02b38228c // indirect

     

       0
        
       
     

       0
        
       
     

       54
        
       	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect

     

       55
        
       	go.opentelemetry.io/otel v1.21.0 // indirect

     

       56
        
       	go.opentelemetry.io/otel/metric v1.21.0 // indirect

···

       1
        
       module github.com/edavis/bsky-tools

     

       2
        
       

     

       3
       +
       go 1.24

     

       4
       +
       

     

       5
       +
       toolchain go1.24.7

     

       6
        
       

     

       7
        
       require (

     

       8
       +
       	github.com/bluesky-social/indigo v0.0.0-20250909204019-c5eaa30f683f

     

       9
        
       	github.com/bluesky-social/jetstream v0.0.0-20241020000921-dcd43344c716

     

       10
       +
       	github.com/fxamacker/cbor/v2 v2.9.0

     

       11
        
       	github.com/gorilla/websocket v1.5.1

     

       12
        
       	github.com/mattn/go-sqlite3 v1.14.22

     

       13
        
       	github.com/pemistahl/lingua-go v1.4.0

     

       14
        
       	github.com/redis/go-redis/v9 v9.3.0

     

       15
       +
       	github.com/urfave/cli/v2 v2.26.0

     

       16
        
       )

     

       17
        
       

     

       18
        
       require (

     

       19
        
       	github.com/carlmjohnson/versioninfo v0.22.5 // indirect

     

       20
        
       	github.com/cespare/xxhash/v2 v2.3.0 // indirect

     

       21
       +
       	github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect

     

       22
        
       	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect

     

       23
        
       	github.com/felixge/httpsnoop v1.0.4 // indirect

     

       24
        
       	github.com/go-logr/logr v1.4.1 // indirect

     
···

       53
        
       	github.com/multiformats/go-varint v0.0.7 // indirect

     

       54
        
       	github.com/opentracing/opentracing-go v1.2.0 // indirect

     

       55
        
       	github.com/polydawn/refmt v0.89.1-0.20221221234430-40501e09de1f // indirect

     

       56
       +
       	github.com/russross/blackfriday/v2 v2.1.0 // indirect

     

       57
        
       	github.com/shopspring/decimal v1.3.1 // indirect

     

       58
        
       	github.com/spaolacci/murmur3 v1.1.0 // indirect

     

       59
       +
       	github.com/whyrusleeping/cbor-gen v0.2.1-0.20241030202151-b7a6831be65e // indirect

     

       60
       +
       	github.com/x448/float16 v0.8.4 // indirect

     

       61
       +
       	github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e // indirect

     

       62
        
       	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect

     

       63
        
       	go.opentelemetry.io/otel v1.21.0 // indirect

     

       64
        
       	go.opentelemetry.io/otel/metric v1.21.0 // indirect

+16 -4

go.sum

···

       1
        
       github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=

     

       2
        
       github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=

     

       3
       -
       github.com/bluesky-social/indigo v0.0.0-20240905024844-a4f38639767f h1:Q9cfCAlYWIWPsSDhg5w6qcutQ7YaJtfTjiRLP/mw+pc=

     

       4
       -
       github.com/bluesky-social/indigo v0.0.0-20240905024844-a4f38639767f/go.mod h1:Zx9nSWgd/FxMenkJW07VKnzspxpHBdPrPmS+Fspl2I0=

     

       5
        
       github.com/bluesky-social/jetstream v0.0.0-20241020000921-dcd43344c716 h1:I8+VaZKaNIGCPGXE2/VXzJGlPFEZgiFLjnge+OWFl5w=

     

       6
        
       github.com/bluesky-social/jetstream v0.0.0-20241020000921-dcd43344c716/go.mod h1:/dE2dmFell/m4zxgIbH3fkiqZ1obzr/ETj4RpgomgMs=

     

       7
        
       github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=

     
···

       13
        
       github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=

     

       14
        
       github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=

     

       15
        
       github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=

     

       0
        
       
     

       0
        
       
     

       16
        
       github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

     

       17
        
       github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

     

       18
        
       github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

     
···

       20
        
       github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=

     

       21
        
       github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=

     

       22
        
       github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=

     

       0
        
       
     

       0
        
       
     

       23
        
       github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=

     

       24
        
       github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=

     

       25
        
       github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=

     
···

       124
        
       github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=

     

       125
        
       github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=

     

       126
        
       github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=

     

       0
        
       
     

       0
        
       
     

       127
        
       github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=

     

       128
        
       github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=

     

       129
        
       github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=

     
···

       141
        
       github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=

     

       142
        
       github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=

     

       143
        
       github.com/urfave/cli v1.22.10/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=

     

       0
        
       
     

       0
        
       
     

       144
        
       github.com/warpfork/go-wish v0.0.0-20220906213052-39a1cc7a02d0 h1:GDDkbFiaK8jsSDJfjId/PEGEShv6ugrt4kYsC5UIDaQ=

     

       145
        
       github.com/warpfork/go-wish v0.0.0-20220906213052-39a1cc7a02d0/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw=

     

       146
       -
       github.com/whyrusleeping/cbor-gen v0.1.3-0.20240904181319-8dc02b38228c h1:UsxJNcLPfyLyVaA4iusIrsLAqJn/xh36Qgb8emqtXzk=

     

       147
       -
       github.com/whyrusleeping/cbor-gen v0.1.3-0.20240904181319-8dc02b38228c/go.mod h1:pM99HXyEbSQHcosHc0iW7YFmwnscr+t9Te4ibko05so=

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       148
        
       github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

     

       149
        
       github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

     

       150
        
       github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=

···

       1
        
       github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=

     

       2
        
       github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=

     

       3
       +
       github.com/bluesky-social/indigo v0.0.0-20250909204019-c5eaa30f683f h1:FugOoTzh0nCMTWGqNGsjttFWVPcwxaaGD3p/nE9V8qY=

     

       4
       +
       github.com/bluesky-social/indigo v0.0.0-20250909204019-c5eaa30f683f/go.mod h1:n6QE1NDPFoi7PRbMUZmc2y7FibCqiVU4ePpsvhHUBR8=

     

       5
        
       github.com/bluesky-social/jetstream v0.0.0-20241020000921-dcd43344c716 h1:I8+VaZKaNIGCPGXE2/VXzJGlPFEZgiFLjnge+OWFl5w=

     

       6
        
       github.com/bluesky-social/jetstream v0.0.0-20241020000921-dcd43344c716/go.mod h1:/dE2dmFell/m4zxgIbH3fkiqZ1obzr/ETj4RpgomgMs=

     

       7
        
       github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=

     
···

       13
        
       github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=

     

       14
        
       github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=

     

       15
        
       github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=

     

       16
       +
       github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM=

     

       17
       +
       github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=

     

       18
        
       github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

     

       19
        
       github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=

     

       20
        
       github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

     
···

       22
        
       github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=

     

       23
        
       github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=

     

       24
        
       github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=

     

       25
       +
       github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=

     

       26
       +
       github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=

     

       27
        
       github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=

     

       28
        
       github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=

     

       29
        
       github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=

     
···

       128
        
       github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=

     

       129
        
       github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=

     

       130
        
       github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=

     

       131
       +
       github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=

     

       132
       +
       github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=

     

       133
        
       github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=

     

       134
        
       github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=

     

       135
        
       github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=

     
···

       147
        
       github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=

     

       148
        
       github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=

     

       149
        
       github.com/urfave/cli v1.22.10/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=

     

       150
       +
       github.com/urfave/cli/v2 v2.26.0 h1:3f3AMg3HpThFNT4I++TKOejZO8yU55t3JnnSr4S4QEI=

     

       151
       +
       github.com/urfave/cli/v2 v2.26.0/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=

     

       152
        
       github.com/warpfork/go-wish v0.0.0-20220906213052-39a1cc7a02d0 h1:GDDkbFiaK8jsSDJfjId/PEGEShv6ugrt4kYsC5UIDaQ=

     

       153
        
       github.com/warpfork/go-wish v0.0.0-20220906213052-39a1cc7a02d0/go.mod h1:x6AKhvSSexNrVSrViXSHUEbICjmGXhtgABaHIySUSGw=

     

       154
       +
       github.com/whyrusleeping/cbor-gen v0.2.1-0.20241030202151-b7a6831be65e h1:28X54ciEwwUxyHn9yrZfl5ojgF4CBNLWX7LR0rvBkf4=

     

       155
       +
       github.com/whyrusleeping/cbor-gen v0.2.1-0.20241030202151-b7a6831be65e/go.mod h1:pM99HXyEbSQHcosHc0iW7YFmwnscr+t9Te4ibko05so=

     

       156
       +
       github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=

     

       157
       +
       github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=

     

       158
       +
       github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e h1:+SOyEddqYF09QP7vr7CgJ1eti3pY9Fn3LHO1M1r/0sI=

     

       159
       +
       github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=

     

       160
        
       github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

     

       161
        
       github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

     

       162
        
       github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=

+24

cmd/bsky-modactions/main.go

···

       8
        
       	"net/http"

     

       9
        
       	"os"

     

       10
        
       	"os/signal"

     

       0
        
       
     

       11
        
       

     

       12
        
       	comatproto "github.com/bluesky-social/indigo/api/atproto"

     

       13
        
       	"github.com/fxamacker/cbor/v2"

     
···

       102
        
       			}

     

       103
        
       		}()

     

       104
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       105
        
       		<-ctx.Done()

     

       106
        
       		stop()

     

       107
        
       		slog.Info("shutting down")

     

       108
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       109
        
       		return nil

     

       110
        
       	}

     

       111

···

       8
        
       	"net/http"

     

       9
        
       	"os"

     

       10
        
       	"os/signal"

     

       11
       +
       	"time"

     

       12
        
       

     

       13
        
       	comatproto "github.com/bluesky-social/indigo/api/atproto"

     

       14
        
       	"github.com/fxamacker/cbor/v2"

     
···

       103
        
       			}

     

       104
        
       		}()

     

       105
        
       

     

       106
       +
       		mux := http.NewServeMux()

     

       107
       +
       		mux.HandleFunc("/config", configHandler)

     

       108
       +
       		mux.HandleFunc("/", valueHandler)

     

       109
       +
       

     

       110
       +
       		srv := &http.Server{

     

       111
       +
       			Addr:    "127.0.0.1:4456",

     

       112
       +
       			Handler: mux,

     

       113
       +
       		}

     

       114
       +
       

     

       115
       +
       		go func() {

     

       116
       +
       			if err := srv.ListenAndServe(); err != nil {

     

       117
       +
       				slog.Error("error starting HTTP server", "err", err)

     

       118
       +
       				return

     

       119
       +
       			}

     

       120
       +
       		}()

     

       121
       +
       

     

       122
        
       		<-ctx.Done()

     

       123
        
       		stop()

     

       124
        
       		slog.Info("shutting down")

     

       125
        
       

     

       126
       +
       		endctx, cancel := context.WithTimeout(context.TODO(), time.Minute)

     

       127
       +
       		defer cancel()

     

       128
       +
       

     

       129
       +
       		if err := srv.Shutdown(endctx); err != nil {

     

       130
       +
       			slog.Error("error shutting down server", "err", err)

     

       131
       +
       		}

     

       132
       +
       

     

       133
        
       		return nil

     

       134
        
       	}

     

       135

Compare changes