+8 -4

.env.example

reviewed

··· 1 1 - # Margin Server Configuration 1 1 + # Margin Configuration 2 2 3 3 # Server 4 4 PORT=8080 5 5 BASE_URL=https://example.com 6 6 7 7 - # Database (SQLite file path or PostgreSQL connection string) 8 8 - DATABASE_URL=margin.db 7 7 + # Database (PostgreSQL connection string) 8 8 + DATABASE_URL=postgres://user:pass@localhost:5432/margin 9 9 10 10 # Static Files (path to built frontend) 11 11 STATIC_DIR=../web/dist ··· 13 13 # OAuth private key for signing requests (auto-generated if missing) 14 14 OAUTH_KEY_PATH=/data/oauth_private_key.pem 15 15 16 16 - 17 16 # Optional: Override default ATProto network URLs (you probably don't need these) 18 17 # BSKY_PUBLIC_API=https://public.api.bsky.app 19 18 # PLC_DIRECTORY_URL=https://plc.directory 20 19 # BLOCK_RELAY_URL=wss://jetstream2.us-east.bsky.network/subscribe 20 20 + 21 21 + # Analytics (PostHog) — leave blank to disable 22 22 + # POSTHOG_PROJECT_TOKEN=phc_ 23 23 + # POSTHOG_HOST= 24 24 + # POSTHOG_UI_HOST=https://us.posthog.com

+1 -1

Dockerfile

reviewed

··· 6 6 COPY web/ ./ 7 7 RUN bun run build 8 8 9 9 - FROM golang:1.24-alpine AS backend-builder 9 9 + FROM golang:1.25-alpine AS backend-builder 10 10 11 11 RUN apk add --no-cache gcc musl-dev 12 12

+9 -7

backend/cmd/server/main.go

reviewed

··· 14 14 "github.com/go-chi/cors" 15 15 "github.com/joho/godotenv" 16 16 17 17 + "margin.at/internal/analytics" 17 18 "margin.at/internal/api" 18 19 "margin.at/internal/db" 19 20 "margin.at/internal/embeddings" ··· 41 42 if err := database.Migrate(); err != nil { 42 43 logger.Fatal("Failed to run migrations: %v", err) 43 44 } 45 45 + database.MigrateUnifiedNotes() 44 46 45 47 go func() { 46 48 ticker := time.NewTicker(1 * time.Hour) ··· 58 60 }() 59 61 60 62 embeddingClient := embeddings.NewClient() 61 61 - if err := database.MigrateRecommendations(); err != nil { 62 62 - logger.Fatal("Failed to run recommendation migrations: %v", err) 63 63 - } 64 63 recService := recommendations.NewService(database, embeddingClient) 65 64 logger.Info("Recommendation engine initialized (embeddings enabled: %v)", embeddingClient.IsEnabled()) 66 65 67 66 syncSvc := sync.NewService(database) 68 67 69 69 - oauthHandler, err := oauth.NewHandler(database, syncSvc) 68 68 + analyticsCl := analytics.New() 69 69 + defer analyticsCl.Close() 70 70 + 71 71 + oauthHandler, err := oauth.NewHandler(database, syncSvc, analyticsCl) 70 72 if err != nil { 71 73 logger.Fatal("Failed to initialize OAuth: %v", err) 72 74 } ··· 157 159 })) 158 160 159 161 tokenRefresher := api.NewTokenRefresher(database, oauthHandler.GetPrivateKey()) 160 160 - annotationSvc := api.NewAnnotationService(database, tokenRefresher) 162 162 + noteWriteSvc := api.NewNoteWriteService(database, tokenRefresher) 161 163 162 162 - handler := api.NewHandler(database, annotationSvc, tokenRefresher, syncSvc, recService) 164 164 + handler := api.NewHandler(database, noteWriteSvc, tokenRefresher, syncSvc, recService, analyticsCl) 163 165 handler.RegisterRoutes(r) 164 166 165 167 r.Route("/auth", func(r chi.Router) { ··· 171 173 r.Post("/logout", oauthHandler.HandleLogout) 172 174 r.Get("/session", oauthHandler.HandleSession) 173 175 }) 174 174 - r.Get("/client-metadata.json", oauthHandler.HandleClientMetadata) 176 176 + r.Get("/oauth-client-metadata.json", oauthHandler.HandleClientMetadata) 175 177 r.Get("/jwks.json", oauthHandler.HandleJWKS) 176 178 177 179 port := getEnv("PORT", "8081")

+12 -4

backend/go.mod

reviewed

··· 1 1 module margin.at 2 2 3 3 - go 1.24.0 3 3 + go 1.25.0 4 4 5 5 require ( 6 6 github.com/fxamacker/cbor/v2 v2.9.0 ··· 12 12 github.com/joho/godotenv v1.5.1 13 13 github.com/lib/pq v1.10.9 14 14 github.com/multiformats/go-multihash v0.2.3 15 15 + github.com/posthog/posthog-go v1.11.2 16 16 + github.com/pressly/goose/v3 v3.27.0 15 17 ) 16 18 17 19 require ( 18 20 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect 21 21 + github.com/goccy/go-json v0.10.5 // indirect 22 22 + github.com/google/uuid v1.6.0 // indirect 23 23 + github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect 19 24 github.com/klauspost/cpuid/v2 v2.0.9 // indirect 25 25 + github.com/mfridman/interpolate v0.0.2 // indirect 20 26 github.com/minio/sha256-simd v1.0.0 // indirect 21 27 github.com/mr-tron/base58 v1.2.0 // indirect 22 28 github.com/multiformats/go-base32 v0.0.3 // indirect ··· 24 30 github.com/multiformats/go-multibase v0.2.0 // indirect 25 31 github.com/multiformats/go-varint v0.1.0 // indirect 26 32 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect 33 33 + github.com/sethvargo/go-retry v0.3.0 // indirect 27 34 github.com/spaolacci/murmur3 v1.1.0 // indirect 28 28 - github.com/stretchr/testify v1.10.0 // indirect 29 35 github.com/x448/float16 v0.8.4 // indirect 30 30 - golang.org/x/crypto v0.35.0 // indirect 31 31 - golang.org/x/sys v0.30.0 // indirect 36 36 + go.uber.org/multierr v1.11.0 // indirect 37 37 + golang.org/x/crypto v0.48.0 // indirect 38 38 + golang.org/x/sync v0.19.0 // indirect 39 39 + golang.org/x/sys v0.41.0 // indirect 32 40 lukechampine.com/blake3 v1.1.6 // indirect 33 41 )

+44 -8

backend/go.sum

reviewed

··· 1 1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= 2 2 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= 3 3 + github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= 4 4 + github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= 3 5 github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM= 4 6 github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ= 5 7 github.com/go-chi/chi/v5 v5.1.0 h1:acVI1TYaD+hhedDJ3r54HyA6sExp3HfXq7QWEEY/xMw= ··· 8 10 github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58= 9 11 github.com/go-jose/go-jose/v4 v4.0.4 h1:VsjPI33J0SB9vQM6PLmNjoHqMQNGPiZ0rHL7Ni7Q6/E= 10 12 github.com/go-jose/go-jose/v4 v4.0.4/go.mod h1:NKb5HO1EZccyMpiZNbdUw/14tiXNyUJh188dfnMCAfc= 11 11 - github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= 12 12 - github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= 13 13 + github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4= 14 14 + github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= 15 15 + github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= 16 16 + github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= 17 17 + github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= 18 18 + github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= 13 19 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= 14 20 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= 21 21 + github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k= 22 22 + github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM= 15 23 github.com/ipfs/go-cid v0.6.0 h1:DlOReBV1xhHBhhfy/gBNNTSyfOM6rLiIx9J7A4DGf30= 16 24 github.com/ipfs/go-cid v0.6.0/go.mod h1:NC4kS1LZjzfhK40UGmpXv5/qD2kcMzACYJNntCUiDhQ= 17 25 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= ··· 21 29 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= 22 30 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= 23 31 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= 32 32 + github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= 33 33 + github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= 34 34 + github.com/mfridman/interpolate v0.0.2 h1:pnuTK7MQIxxFz1Gr+rjSIx9u7qVjf5VOoM/u6BbAxPY= 35 35 + github.com/mfridman/interpolate v0.0.2/go.mod h1:p+7uk6oE07mpE/Ik1b8EckO0O4ZXiGAfshKBWLUM9Xg= 24 36 github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g= 25 37 github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM= 26 38 github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= ··· 35 47 github.com/multiformats/go-multihash v0.2.3/go.mod h1:dXgKXCXjBzdscBLk9JkjINiEsCKRVch90MdaGiKsvSM= 36 48 github.com/multiformats/go-varint v0.1.0 h1:i2wqFp4sdl3IcIxfAonHQV9qU5OsZ4Ts9IOoETFs5dI= 37 49 github.com/multiformats/go-varint v0.1.0/go.mod h1:5KVAVXegtfmNQQm/lCY+ATvDzvJJhSkUlGQV9wgObdI= 50 50 + github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w= 51 51 + github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls= 38 52 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= 39 53 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= 54 54 + github.com/posthog/posthog-go v1.11.2 h1:ApKTtOhIeWhUBc4ByO+mlbg2o0iZaEGJnJHX2QDnn5Q= 55 55 + github.com/posthog/posthog-go v1.11.2/go.mod h1:xsVOW9YImilUcazwPNEq4PJDqEZf2KeCS758zXjwkPg= 56 56 + github.com/pressly/goose/v3 v3.27.0 h1:/D30gVTuQhu0WsNZYbJi4DMOsx1lNq+6SkLe+Wp59BM= 57 57 + github.com/pressly/goose/v3 v3.27.0/go.mod h1:3ZBeCXqzkgIRvrEMDkYh1guvtoJTU5oMMuDdkutoM78= 58 58 + github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= 59 59 + github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= 60 60 + github.com/sethvargo/go-retry v0.3.0 h1:EEt31A35QhrcRZtrYFDTBg91cqZVnFL2navjDrah2SE= 61 61 + github.com/sethvargo/go-retry v0.3.0/go.mod h1:mNX17F0C/HguQMyMyJxcnU471gOZGxCLyYaFyAZraas= 40 62 github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= 41 63 github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= 42 42 - github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= 43 43 - github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= 64 64 + github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= 65 65 + github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= 44 66 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= 45 67 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= 46 46 - golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs= 47 47 - golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ= 48 48 - golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= 49 49 - golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= 68 68 + go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= 69 69 + go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= 70 70 + golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts= 71 71 + golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos= 72 72 + golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa h1:Zt3DZoOFFYkKhDT3v7Lm9FDMEV06GpzjG2jrqW+QTE0= 73 73 + golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa/go.mod h1:K79w1Vqn7PoiZn+TkNpx3BUWUQksGO3JcVX6qIjytmA= 74 74 + golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= 75 75 + golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= 76 76 + golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k= 77 77 + golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= 50 78 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= 51 79 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= 52 80 lukechampine.com/blake3 v1.1.6 h1:H3cROdztr7RCfoaTpGZFQsrqvweFLrqS73j7L7cmR5c= 53 81 lukechampine.com/blake3 v1.1.6/go.mod h1:tkKEOtDkNtklkXtLNEOGNq5tcV90tJiA1vAA12R78LA= 82 82 + modernc.org/libc v1.68.0 h1:PJ5ikFOV5pwpW+VqCK1hKJuEWsonkIJhhIXyuF/91pQ= 83 83 + modernc.org/libc v1.68.0/go.mod h1:NnKCYeoYgsEqnY3PgvNgAeaJnso968ygU8Z0DxjoEc0= 84 84 + modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU= 85 85 + modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg= 86 86 + modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI= 87 87 + modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw= 88 88 + modernc.org/sqlite v1.46.1 h1:eFJ2ShBLIEnUWlLy12raN0Z1plqmFX9Qe3rjQTKt6sU= 89 89 + modernc.org/sqlite v1.46.1/go.mod h1:CzbrU2lSB1DKUusvwGz7rqEKIq+NUd8GWuBBZDs9/nA=

+73

backend/internal/analytics/posthog.go

reviewed

··· 1 1 + package analytics 2 2 + 3 3 + import ( 4 4 + "os" 5 5 + 6 6 + "github.com/posthog/posthog-go" 7 7 + "margin.at/internal/logger" 8 8 + ) 9 9 + 10 10 + type Client struct { 11 11 + ph posthog.Client 12 12 + enabled bool 13 13 + } 14 14 + 15 15 + func New() *Client { 16 16 + token := os.Getenv("POSTHOG_PROJECT_TOKEN") 17 17 + if token == "" { 18 18 + logger.Info("PostHog analytics disabled (POSTHOG_PROJECT_TOKEN not set)") 19 19 + return &Client{} 20 20 + } 21 21 + 22 22 + host := os.Getenv("POSTHOG_HOST") 23 23 + if host == "" { 24 24 + host = "https://us.i.posthog.com" 25 25 + } 26 26 + 27 27 + ph, err := posthog.NewWithConfig(token, posthog.Config{ 28 28 + Endpoint: host, 29 29 + }) 30 30 + if err != nil { 31 31 + logger.Error("Failed to initialise PostHog client: %v", err) 32 32 + return &Client{} 33 33 + } 34 34 + 35 35 + logger.Info("PostHog analytics enabled (host: %s)", host) 36 36 + return &Client{ph: ph, enabled: true} 37 37 + } 38 38 + 39 39 + func (c *Client) Capture(distinctID, event string, properties map[string]interface{}) { 40 40 + if !c.enabled || c.ph == nil { 41 41 + return 42 42 + } 43 43 + props := posthog.NewProperties() 44 44 + for k, v := range properties { 45 45 + props.Set(k, v) 46 46 + } 47 47 + 48 48 + _ = c.ph.Enqueue(posthog.Capture{ 49 49 + DistinctId: distinctID, 50 50 + Event: event, 51 51 + Properties: props, 52 52 + }) 53 53 + } 54 54 + 55 55 + func (c *Client) Identify(distinctID string, properties map[string]interface{}) { 56 56 + if !c.enabled || c.ph == nil { 57 57 + return 58 58 + } 59 59 + traits := posthog.NewProperties() 60 60 + for k, v := range properties { 61 61 + traits.Set(k, v) 62 62 + } 63 63 + _ = c.ph.Enqueue(posthog.Identify{ 64 64 + DistinctId: distinctID, 65 65 + Properties: traits, 66 66 + }) 67 67 + } 68 68 + 69 69 + func (c *Client) Close() { 70 70 + if c.enabled && c.ph != nil { 71 71 + c.ph.Close() 72 72 + } 73 73 + }

-1147

backend/internal/api/annotations.go

reviewed

··· 1 1 - package api 2 2 - 3 3 - import ( 4 4 - "encoding/json" 5 5 - "fmt" 6 6 - "net/http" 7 7 - "regexp" 8 8 - "strings" 9 9 - "time" 10 10 - 11 11 - "margin.at/internal/db" 12 12 - "margin.at/internal/logger" 13 13 - "margin.at/internal/xrpc" 14 14 - ) 15 15 - 16 16 - type AnnotationService struct { 17 17 - db *db.DB 18 18 - refresher *TokenRefresher 19 19 - } 20 20 - 21 21 - func NewAnnotationService(database *db.DB, refresher *TokenRefresher) *AnnotationService { 22 22 - return &AnnotationService{db: database, refresher: refresher} 23 23 - } 24 24 - 25 25 - type CreateAnnotationRequest struct { 26 26 - URL string `json:"url"` 27 27 - Text string `json:"text"` 28 28 - Selector json.RawMessage `json:"selector,omitempty"` 29 29 - Title string `json:"title,omitempty"` 30 30 - Tags []string `json:"tags,omitempty"` 31 31 - Labels []string `json:"labels,omitempty"` 32 32 - } 33 33 - 34 34 - type CreateAnnotationResponse struct { 35 35 - URI string `json:"uri"` 36 36 - CID string `json:"cid"` 37 37 - } 38 38 - 39 39 - func (s *AnnotationService) CreateAnnotation(w http.ResponseWriter, r *http.Request) { 40 40 - session, err := s.refresher.GetSessionWithAutoRefresh(r) 41 41 - if err != nil { 42 42 - WriteUnauthorized(w, err.Error()) 43 43 - return 44 44 - } 45 45 - 46 46 - var req CreateAnnotationRequest 47 47 - if err := json.NewDecoder(r.Body).Decode(&req); err != nil { 48 48 - WriteBadRequest(w, "Invalid request body") 49 49 - return 50 50 - } 51 51 - 52 52 - if req.URL == "" { 53 53 - WriteBadRequest(w, "URL is required") 54 54 - return 55 55 - } 56 56 - 57 57 - if req.Text == "" && req.Selector == nil && len(req.Tags) == 0 { 58 58 - WriteBadRequest(w, "Must provide text, selector, or tags") 59 59 - return 60 60 - } 61 61 - 62 62 - if len(req.Text) > 3000 { 63 63 - WriteBadRequest(w, "Text too long (max 3000 chars)") 64 64 - return 65 65 - } 66 66 - 67 67 - for i, t := range req.Tags { 68 68 - req.Tags[i] = strings.ToLower(t) 69 69 - } 70 70 - 71 71 - urlHash := db.HashURL(req.URL) 72 72 - 73 73 - motivation := "commenting" 74 74 - if req.Selector != nil && req.Text == "" { 75 75 - motivation = "highlighting" 76 76 - } else if len(req.Tags) > 0 { 77 77 - motivation = "tagging" 78 78 - } 79 79 - 80 80 - var facets []xrpc.Facet 81 81 - var mentionedDIDs []string 82 82 - 83 83 - mentionRegex := regexp.MustCompile(`(^|\s|@)@([a-zA-Z0-9.-]+)(\b)`) 84 84 - matches := mentionRegex.FindAllStringSubmatchIndex(req.Text, -1) 85 85 - 86 86 - for _, m := range matches { 87 87 - handle := req.Text[m[4]:m[5]] 88 88 - 89 89 - if !strings.Contains(handle, ".") { 90 90 - continue 91 91 - } 92 92 - 93 93 - var did string 94 94 - err := s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, _ string) error { 95 95 - var resolveErr error 96 96 - did, resolveErr = client.ResolveHandle(r.Context(), handle) 97 97 - return resolveErr 98 98 - }) 99 99 - 100 100 - if err == nil && did != "" { 101 101 - start := m[2] 102 102 - end := m[5] 103 103 - 104 104 - facets = append(facets, xrpc.Facet{ 105 105 - Index: xrpc.FacetIndex{ 106 106 - ByteStart: start, 107 107 - ByteEnd: end, 108 108 - }, 109 109 - Features: []xrpc.FacetFeature{ 110 110 - { 111 111 - Type: "app.bsky.richtext.facet#mention", 112 112 - Did: did, 113 113 - }, 114 114 - }, 115 115 - }) 116 116 - mentionedDIDs = append(mentionedDIDs, did) 117 117 - } 118 118 - } 119 119 - 120 120 - urlRegex := regexp.MustCompile(`(https?://[^\s]+)`) 121 121 - urlMatches := urlRegex.FindAllStringIndex(req.Text, -1) 122 122 - 123 123 - for _, m := range urlMatches { 124 124 - facets = append(facets, xrpc.Facet{ 125 125 - Index: xrpc.FacetIndex{ 126 126 - ByteStart: m[0], 127 127 - ByteEnd: m[1], 128 128 - }, 129 129 - Features: []xrpc.FacetFeature{ 130 130 - { 131 131 - Type: "app.bsky.richtext.facet#link", 132 132 - Uri: req.Text[m[0]:m[1]], 133 133 - }, 134 134 - }, 135 135 - }) 136 136 - } 137 137 - 138 138 - record := xrpc.NewAnnotationRecordWithMotivation(req.URL, urlHash, req.Text, req.Selector, req.Title, motivation) 139 139 - if len(req.Tags) > 0 { 140 140 - record.Tags = req.Tags 141 141 - } 142 142 - if len(facets) > 0 { 143 143 - record.Facets = facets 144 144 - } 145 145 - 146 146 - validSelfLabels := map[string]bool{"sexual": true, "nudity": true, "violence": true, "gore": true, "spam": true, "misleading": true} 147 147 - var validLabels []string 148 148 - for _, l := range req.Labels { 149 149 - if validSelfLabels[l] { 150 150 - validLabels = append(validLabels, l) 151 151 - } 152 152 - } 153 153 - record.Labels = xrpc.NewSelfLabels(validLabels) 154 154 - 155 155 - var result *xrpc.CreateRecordOutput 156 156 - 157 157 - if existing, err := s.checkDuplicateAnnotation(session.DID, req.URL, req.Text); err == nil && existing != nil { 158 158 - w.Header().Set("Content-Type", "application/json") 159 159 - json.NewEncoder(w).Encode(CreateAnnotationResponse{ 160 160 - URI: existing.URI, 161 161 - CID: *existing.CID, 162 162 - }) 163 163 - return 164 164 - } 165 165 - 166 166 - err = s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 167 167 - var createErr error 168 168 - result, createErr = client.CreateRecord(r.Context(), did, xrpc.CollectionAnnotation, record) 169 169 - return createErr 170 170 - }) 171 171 - if err != nil { 172 172 - HandleAPIError(w, r, err, "Failed to create annotation: ", http.StatusInternalServerError) 173 173 - return 174 174 - } 175 175 - 176 176 - for _, mentionedDID := range mentionedDIDs { 177 177 - if mentionedDID != session.DID { 178 178 - s.db.CreateNotification(&db.Notification{ 179 179 - RecipientDID: mentionedDID, 180 180 - ActorDID: session.DID, 181 181 - Type: "mention", 182 182 - SubjectURI: result.URI, 183 183 - CreatedAt: time.Now(), 184 184 - }) 185 185 - } 186 186 - } 187 187 - 188 188 - bodyValue := req.Text 189 189 - var bodyValuePtr, targetTitlePtr, selectorJSONPtr *string 190 190 - if bodyValue != "" { 191 191 - bodyValuePtr = &bodyValue 192 192 - } 193 193 - if req.Title != "" { 194 194 - targetTitlePtr = &req.Title 195 195 - } 196 196 - if req.Selector != nil { 197 197 - selectorBytes, _ := json.Marshal(req.Selector) 198 198 - selectorStr := string(selectorBytes) 199 199 - selectorJSONPtr = &selectorStr 200 200 - } 201 201 - 202 202 - var tagsJSONPtr *string 203 203 - if len(req.Tags) > 0 { 204 204 - tagsBytes, _ := json.Marshal(req.Tags) 205 205 - tagsStr := string(tagsBytes) 206 206 - tagsJSONPtr = &tagsStr 207 207 - } 208 208 - 209 209 - cid := result.CID 210 210 - did := session.DID 211 211 - annotation := &db.Annotation{ 212 212 - URI: result.URI, 213 213 - CID: &cid, 214 214 - AuthorDID: did, 215 215 - Motivation: motivation, 216 216 - BodyValue: bodyValuePtr, 217 217 - TargetSource: req.URL, 218 218 - TargetHash: urlHash, 219 219 - TargetTitle: targetTitlePtr, 220 220 - SelectorJSON: selectorJSONPtr, 221 221 - TagsJSON: tagsJSONPtr, 222 222 - CreatedAt: time.Now(), 223 223 - IndexedAt: time.Now(), 224 224 - } 225 225 - 226 226 - if err := s.db.CreateAnnotation(annotation); err != nil { 227 227 - logger.Error("Warning: failed to index annotation in local DB: %v", err) 228 228 - } 229 229 - 230 230 - for _, label := range validLabels { 231 231 - if err := s.db.CreateContentLabel(session.DID, result.URI, label, session.DID); err != nil { 232 232 - logger.Error("Warning: failed to create self-label %s: %v", label, err) 233 233 - } 234 234 - } 235 235 - 236 236 - WriteSuccess(w, CreateAnnotationResponse{ 237 237 - URI: result.URI, 238 238 - CID: result.CID, 239 239 - }) 240 240 - } 241 241 - 242 242 - func (s *AnnotationService) DeleteAnnotation(w http.ResponseWriter, r *http.Request) { 243 243 - session, err := s.refresher.GetSessionWithAutoRefresh(r) 244 244 - if err != nil { 245 245 - WriteUnauthorized(w, err.Error()) 246 246 - return 247 247 - } 248 248 - 249 249 - rkey := r.URL.Query().Get("rkey") 250 250 - collectionType := r.URL.Query().Get("type") 251 251 - 252 252 - if rkey == "" { 253 253 - WriteBadRequest(w, "rkey required") 254 254 - return 255 255 - } 256 256 - 257 257 - did := session.DID 258 258 - 259 259 - collection := xrpc.CollectionAnnotation 260 260 - if collectionType == "reply" { 261 261 - collection = xrpc.CollectionReply 262 262 - } else { 263 263 - candidateCollections := []string{xrpc.CollectionAnnotation, "network.cosmik.card"} 264 264 - for _, col := range candidateCollections { 265 265 - uri := "at://" + did + "/" + col + "/" + rkey 266 266 - if _, dbErr := s.db.GetAnnotationByURI(uri); dbErr == nil { 267 267 - collection = col 268 268 - break 269 269 - } 270 270 - } 271 271 - } 272 272 - 273 273 - pdsErr := s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 274 274 - return client.DeleteRecord(r.Context(), did, collection, rkey) 275 275 - }) 276 276 - if pdsErr != nil { 277 277 - logger.Error("PDS delete failed (will still clean local DB): %v", pdsErr) 278 278 - } 279 279 - 280 280 - // Always clean up local DB regardless of PDS result 281 281 - if collectionType == "reply" { 282 282 - uri := "at://" + did + "/" + xrpc.CollectionReply + "/" + rkey 283 283 - s.db.DeleteReply(uri) 284 284 - } else { 285 285 - uri := "at://" + did + "/" + collection + "/" + rkey 286 286 - s.db.DeleteAnnotation(uri) 287 287 - } 288 288 - 289 289 - WriteSuccess(w, map[string]bool{"success": true}) 290 290 - } 291 291 - 292 292 - type UpdateAnnotationRequest struct { 293 293 - Text string `json:"text"` 294 294 - Tags []string `json:"tags"` 295 295 - Labels []string `json:"labels,omitempty"` 296 296 - } 297 297 - 298 298 - func (s *AnnotationService) UpdateAnnotation(w http.ResponseWriter, r *http.Request) { 299 299 - uri := r.URL.Query().Get("uri") 300 300 - if uri == "" { 301 301 - WriteBadRequest(w, "uri query parameter required") 302 302 - return 303 303 - } 304 304 - 305 305 - session, err := s.refresher.GetSessionWithAutoRefresh(r) 306 306 - if err != nil { 307 307 - WriteUnauthorized(w, err.Error()) 308 308 - return 309 309 - } 310 310 - 311 311 - annotation, err := s.db.GetAnnotationByURI(uri) 312 312 - if err != nil || annotation == nil { 313 313 - WriteNotFound(w, "Annotation not found") 314 314 - return 315 315 - } 316 316 - 317 317 - if annotation.AuthorDID != session.DID { 318 318 - WriteForbidden(w, "Not authorized to edit this annotation") 319 319 - return 320 320 - } 321 321 - 322 322 - var req UpdateAnnotationRequest 323 323 - if err := json.NewDecoder(r.Body).Decode(&req); err != nil { 324 324 - WriteBadRequest(w, "Invalid request body") 325 325 - return 326 326 - } 327 327 - 328 328 - parts := parseATURI(uri) 329 329 - if len(parts) < 3 { 330 330 - WriteBadRequest(w, "Invalid URI format") 331 331 - return 332 332 - } 333 333 - rkey := parts[2] 334 334 - 335 335 - for i, t := range req.Tags { 336 336 - req.Tags[i] = strings.ToLower(t) 337 337 - } 338 338 - 339 339 - tagsJSON := "" 340 340 - if len(req.Tags) > 0 { 341 341 - tagsBytes, _ := json.Marshal(req.Tags) 342 342 - tagsJSON = string(tagsBytes) 343 343 - } 344 344 - 345 345 - if annotation.BodyValue != nil { 346 346 - previousContent := *annotation.BodyValue 347 347 - logger.Info("[DEBUG] Saving edit history for %s. Previous content: %s", uri, previousContent) 348 348 - if err := s.db.SaveEditHistory(uri, "annotation", previousContent, annotation.CID); err != nil { 349 349 - logger.Error("Failed to save edit history for %s: %v", uri, err) 350 350 - } else { 351 351 - logger.Info("[DEBUG] Successfully saved edit history for %s", uri) 352 352 - } 353 353 - } else { 354 354 - logger.Info("[DEBUG] Annotation BodyValue is nil for %s", uri) 355 355 - } 356 356 - 357 357 - var result *xrpc.PutRecordOutput 358 358 - err = s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 359 359 - existing, getErr := client.GetRecord(r.Context(), did, xrpc.CollectionAnnotation, rkey) 360 360 - if getErr != nil { 361 361 - return fmt.Errorf("failed to fetch existing record: %w", getErr) 362 362 - } 363 363 - 364 364 - var record xrpc.AnnotationRecord 365 365 - if err := json.Unmarshal(existing.Value, &record); err != nil { 366 366 - return fmt.Errorf("failed to parse existing record: %w", err) 367 367 - } 368 368 - 369 369 - record.Body = &xrpc.AnnotationBody{ 370 370 - Value: req.Text, 371 371 - Format: "text/plain", 372 372 - } 373 373 - if len(req.Tags) > 0 { 374 374 - record.Tags = req.Tags 375 375 - } else { 376 376 - record.Tags = nil 377 377 - } 378 378 - 379 379 - updateValidLabels := map[string]bool{"sexual": true, "nudity": true, "violence": true, "gore": true, "spam": true, "misleading": true} 380 380 - var updateLabels []string 381 381 - for _, l := range req.Labels { 382 382 - if updateValidLabels[l] { 383 383 - updateLabels = append(updateLabels, l) 384 384 - } 385 385 - } 386 386 - record.Labels = xrpc.NewSelfLabels(updateLabels) 387 387 - 388 388 - if err := record.Validate(); err != nil { 389 389 - return fmt.Errorf("validation failed: %w", err) 390 390 - } 391 391 - 392 392 - var updateErr error 393 393 - result, updateErr = client.PutRecord(r.Context(), did, xrpc.CollectionAnnotation, rkey, record) 394 394 - if updateErr != nil { 395 395 - logger.Error("UpdateAnnotation failed: %v. Retrying with delete-then-create workaround.", updateErr) 396 396 - _ = client.DeleteRecord(r.Context(), did, xrpc.CollectionAnnotation, rkey) 397 397 - result, updateErr = client.PutRecord(r.Context(), did, xrpc.CollectionAnnotation, rkey, record) 398 398 - } 399 399 - return updateErr 400 400 - }) 401 401 - 402 402 - if err != nil { 403 403 - logger.Error("[UpdateAnnotation] Failed: %v", err) 404 404 - HandleAPIError(w, r, err, "Failed to update record: ", http.StatusInternalServerError) 405 405 - return 406 406 - } 407 407 - 408 408 - s.db.UpdateAnnotation(uri, req.Text, tagsJSON, result.CID) 409 409 - 410 410 - validSelfLabels := map[string]bool{"sexual": true, "nudity": true, "violence": true, "gore": true, "spam": true, "misleading": true} 411 411 - var validLabels []string 412 412 - for _, l := range req.Labels { 413 413 - if validSelfLabels[l] { 414 414 - validLabels = append(validLabels, l) 415 415 - } 416 416 - } 417 417 - if err := s.db.SyncSelfLabels(session.DID, uri, validLabels); err != nil { 418 418 - logger.Error("Warning: failed to sync self-labels: %v", err) 419 419 - } 420 420 - 421 421 - WriteSuccess(w, map[string]interface{}{ 422 422 - "success": true, 423 423 - "uri": result.URI, 424 424 - "cid": result.CID, 425 425 - }) 426 426 - } 427 427 - 428 428 - func parseATURI(uri string) []string { 429 429 - 430 430 - if len(uri) < 5 || uri[:5] != "at://" { 431 431 - return nil 432 432 - } 433 433 - return strings.Split(uri[5:], "/") 434 434 - } 435 435 - 436 436 - type CreateLikeRequest struct { 437 437 - SubjectURI string `json:"subjectUri"` 438 438 - SubjectCID string `json:"subjectCid"` 439 439 - } 440 440 - 441 441 - func (s *AnnotationService) LikeAnnotation(w http.ResponseWriter, r *http.Request) { 442 442 - session, err := s.refresher.GetSessionWithAutoRefresh(r) 443 443 - if err != nil { 444 444 - WriteUnauthorized(w, err.Error()) 445 445 - return 446 446 - } 447 447 - 448 448 - var req CreateLikeRequest 449 449 - if err := json.NewDecoder(r.Body).Decode(&req); err != nil { 450 450 - WriteBadRequest(w, "Invalid request body") 451 451 - return 452 452 - } 453 453 - 454 454 - if req.SubjectURI == "" || req.SubjectCID == "" { 455 455 - WriteBadRequest(w, "subjectUri and subjectCid are required") 456 456 - return 457 457 - } 458 458 - 459 459 - existingLike, _ := s.db.GetLikeByUserAndSubject(session.DID, req.SubjectURI) 460 460 - if existingLike != nil { 461 461 - w.Header().Set("Content-Type", "application/json") 462 462 - json.NewEncoder(w).Encode(map[string]string{"uri": existingLike.URI, "existing": "true"}) 463 463 - return 464 464 - } 465 465 - 466 466 - record := xrpc.NewLikeRecord(req.SubjectURI, req.SubjectCID) 467 467 - 468 468 - if err := record.Validate(); err != nil { 469 469 - WriteBadRequest(w, "Validation error: "+err.Error()) 470 470 - return 471 471 - } 472 472 - 473 473 - var result *xrpc.CreateRecordOutput 474 474 - err = s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 475 475 - var createErr error 476 476 - result, createErr = client.CreateRecord(r.Context(), did, xrpc.CollectionLike, record) 477 477 - return createErr 478 478 - }) 479 479 - if err != nil { 480 480 - HandleAPIError(w, r, err, "Failed to create like: ", http.StatusInternalServerError) 481 481 - return 482 482 - } 483 483 - 484 484 - did := session.DID 485 485 - like := &db.Like{ 486 486 - URI: result.URI, 487 487 - AuthorDID: did, 488 488 - SubjectURI: req.SubjectURI, 489 489 - CreatedAt: time.Now(), 490 490 - IndexedAt: time.Now(), 491 491 - } 492 492 - s.db.CreateLike(like) 493 493 - 494 494 - if authorDID, err := s.db.GetAuthorByURI(req.SubjectURI); err == nil && authorDID != did { 495 495 - s.db.CreateNotification(&db.Notification{ 496 496 - RecipientDID: authorDID, 497 497 - ActorDID: did, 498 498 - Type: "like", 499 499 - SubjectURI: req.SubjectURI, 500 500 - CreatedAt: time.Now(), 501 501 - }) 502 502 - } 503 503 - 504 504 - WriteSuccess(w, map[string]string{"uri": result.URI}) 505 505 - } 506 506 - 507 507 - func (s *AnnotationService) UnlikeAnnotation(w http.ResponseWriter, r *http.Request) { 508 508 - session, err := s.refresher.GetSessionWithAutoRefresh(r) 509 509 - if err != nil { 510 510 - WriteUnauthorized(w, err.Error()) 511 511 - return 512 512 - } 513 513 - 514 514 - subjectURI := r.URL.Query().Get("uri") 515 515 - if subjectURI == "" { 516 516 - WriteBadRequest(w, "uri query parameter required") 517 517 - return 518 518 - } 519 519 - 520 520 - userLike, err := s.db.GetLikeByUserAndSubject(session.DID, subjectURI) 521 521 - if err != nil { 522 522 - WriteNotFound(w, "Like not found") 523 523 - return 524 524 - } 525 525 - 526 526 - parts := strings.Split(userLike.URI, "/") 527 527 - rkey := parts[len(parts)-1] 528 528 - 529 529 - err = s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 530 530 - return client.DeleteRecord(r.Context(), did, xrpc.CollectionLike, rkey) 531 531 - }) 532 532 - if err != nil { 533 533 - HandleAPIError(w, r, err, "Failed to delete like: ", http.StatusInternalServerError) 534 534 - return 535 535 - } 536 536 - 537 537 - s.db.DeleteLike(userLike.URI) 538 538 - 539 539 - WriteSuccess(w, map[string]bool{"success": true}) 540 540 - } 541 541 - 542 542 - type CreateReplyRequest struct { 543 543 - ParentURI string `json:"parentUri"` 544 544 - ParentCID string `json:"parentCid"` 545 545 - RootURI string `json:"rootUri"` 546 546 - RootCID string `json:"rootCid"` 547 547 - Text string `json:"text"` 548 548 - } 549 549 - 550 550 - func (s *AnnotationService) CreateReply(w http.ResponseWriter, r *http.Request) { 551 551 - session, err := s.refresher.GetSessionWithAutoRefresh(r) 552 552 - if err != nil { 553 553 - WriteUnauthorized(w, err.Error()) 554 554 - return 555 555 - } 556 556 - 557 557 - var req CreateReplyRequest 558 558 - if err := json.NewDecoder(r.Body).Decode(&req); err != nil { 559 559 - WriteBadRequest(w, "Invalid request body") 560 560 - return 561 561 - } 562 562 - 563 563 - if req.ParentURI == "" || req.ParentCID == "" { 564 564 - WriteBadRequest(w, "parentUri and parentCid are required") 565 565 - return 566 566 - } 567 567 - if req.RootURI == "" || req.RootCID == "" { 568 568 - WriteBadRequest(w, "rootUri and rootCid are required") 569 569 - return 570 570 - } 571 571 - if req.Text == "" { 572 572 - WriteBadRequest(w, "text is required") 573 573 - return 574 574 - } 575 575 - 576 576 - record := xrpc.NewReplyRecord(req.ParentURI, req.ParentCID, req.RootURI, req.RootCID, req.Text) 577 577 - 578 578 - if err := record.Validate(); err != nil { 579 579 - WriteBadRequest(w, "Validation error: "+err.Error()) 580 580 - return 581 581 - } 582 582 - 583 583 - var result *xrpc.CreateRecordOutput 584 584 - err = s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 585 585 - var createErr error 586 586 - result, createErr = client.CreateRecord(r.Context(), did, xrpc.CollectionReply, record) 587 587 - return createErr 588 588 - }) 589 589 - if err != nil { 590 590 - HandleAPIError(w, r, err, "Failed to create reply: ", http.StatusInternalServerError) 591 591 - return 592 592 - } 593 593 - 594 594 - reply := &db.Reply{ 595 595 - URI: result.URI, 596 596 - AuthorDID: session.DID, 597 597 - ParentURI: req.ParentURI, 598 598 - RootURI: req.RootURI, 599 599 - Text: req.Text, 600 600 - CreatedAt: time.Now(), 601 601 - IndexedAt: time.Now(), 602 602 - CID: &result.CID, 603 603 - } 604 604 - s.db.CreateReply(reply) 605 605 - 606 606 - if authorDID, err := s.db.GetAuthorByURI(req.ParentURI); err == nil && authorDID != session.DID { 607 607 - s.db.CreateNotification(&db.Notification{ 608 608 - RecipientDID: authorDID, 609 609 - ActorDID: session.DID, 610 610 - Type: "reply", 611 611 - SubjectURI: result.URI, 612 612 - CreatedAt: time.Now(), 613 613 - }) 614 614 - } 615 615 - 616 616 - if req.RootURI != req.ParentURI { 617 617 - if rootAuthorDID, err := s.db.GetAuthorByURI(req.RootURI); err == nil && rootAuthorDID != session.DID { 618 618 - parentAuthorDID, _ := s.db.GetAuthorByURI(req.ParentURI) 619 619 - if rootAuthorDID != parentAuthorDID { 620 620 - s.db.CreateNotification(&db.Notification{ 621 621 - RecipientDID: rootAuthorDID, 622 622 - ActorDID: session.DID, 623 623 - Type: "reply", 624 624 - SubjectURI: result.URI, 625 625 - CreatedAt: time.Now(), 626 626 - }) 627 627 - } 628 628 - } 629 629 - } 630 630 - 631 631 - WriteSuccess(w, map[string]string{"uri": result.URI}) 632 632 - } 633 633 - 634 634 - func (s *AnnotationService) DeleteReply(w http.ResponseWriter, r *http.Request) { 635 635 - uri := r.URL.Query().Get("uri") 636 636 - if uri == "" { 637 637 - WriteBadRequest(w, "uri query parameter required") 638 638 - return 639 639 - } 640 640 - 641 641 - session, err := s.refresher.GetSessionWithAutoRefresh(r) 642 642 - if err != nil { 643 643 - WriteUnauthorized(w, err.Error()) 644 644 - return 645 645 - } 646 646 - 647 647 - reply, err := s.db.GetReplyByURI(uri) 648 648 - if err != nil || reply == nil { 649 649 - WriteNotFound(w, "reply not found") 650 650 - return 651 651 - } 652 652 - 653 653 - if reply.AuthorDID != session.DID { 654 654 - WriteForbidden(w, "not authorized to delete this reply") 655 655 - return 656 656 - } 657 657 - 658 658 - parts := strings.Split(uri, "/") 659 659 - if len(parts) >= 2 { 660 660 - rkey := parts[len(parts)-1] 661 661 - _ = s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 662 662 - return client.DeleteRecord(r.Context(), did, "at.margin.reply", rkey) 663 663 - }) 664 664 - } 665 665 - 666 666 - s.db.DeleteReply(uri) 667 667 - 668 668 - WriteSuccess(w, map[string]bool{"success": true}) 669 669 - } 670 670 - 671 671 - type CreateHighlightRequest struct { 672 672 - URL string `json:"url"` 673 673 - Title string `json:"title,omitempty"` 674 674 - Selector json.RawMessage `json:"selector"` 675 675 - Color string `json:"color,omitempty"` 676 676 - Tags []string `json:"tags,omitempty"` 677 677 - Labels []string `json:"labels,omitempty"` 678 678 - } 679 679 - 680 680 - func (s *AnnotationService) CreateHighlight(w http.ResponseWriter, r *http.Request) { 681 681 - session, err := s.refresher.GetSessionWithAutoRefresh(r) 682 682 - if err != nil { 683 683 - WriteUnauthorized(w, err.Error()) 684 684 - return 685 685 - } 686 686 - 687 687 - var req CreateHighlightRequest 688 688 - if err := json.NewDecoder(r.Body).Decode(&req); err != nil { 689 689 - WriteBadRequest(w, "Invalid request body") 690 690 - return 691 691 - } 692 692 - 693 693 - if req.URL == "" || req.Selector == nil { 694 694 - WriteBadRequest(w, "URL and selector are required") 695 695 - return 696 696 - } 697 697 - 698 698 - for i, t := range req.Tags { 699 699 - req.Tags[i] = strings.ToLower(t) 700 700 - } 701 701 - 702 702 - urlHash := db.HashURL(req.URL) 703 703 - record := xrpc.NewHighlightRecord(req.URL, urlHash, req.Selector, req.Color, req.Tags) 704 704 - 705 705 - validSelfLabels := map[string]bool{"sexual": true, "nudity": true, "violence": true, "gore": true, "spam": true, "misleading": true} 706 706 - var validLabels []string 707 707 - for _, l := range req.Labels { 708 708 - if validSelfLabels[l] { 709 709 - validLabels = append(validLabels, l) 710 710 - } 711 711 - } 712 712 - record.Labels = xrpc.NewSelfLabels(validLabels) 713 713 - 714 714 - if err := record.Validate(); err != nil { 715 715 - WriteBadRequest(w, "Validation error: "+err.Error()) 716 716 - return 717 717 - } 718 718 - 719 719 - var result *xrpc.CreateRecordOutput 720 720 - 721 721 - if existing, err := s.checkDuplicateHighlight(session.DID, req.URL, req.Selector); err == nil && existing != nil { 722 722 - w.Header().Set("Content-Type", "application/json") 723 723 - json.NewEncoder(w).Encode(map[string]string{"uri": existing.URI, "cid": *existing.CID}) 724 724 - return 725 725 - } 726 726 - 727 727 - err = s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 728 728 - var createErr error 729 729 - result, createErr = client.CreateRecord(r.Context(), did, xrpc.CollectionHighlight, record) 730 730 - return createErr 731 731 - }) 732 732 - if err != nil { 733 733 - HandleAPIError(w, r, err, "Failed to create highlight: ", http.StatusInternalServerError) 734 734 - return 735 735 - } 736 736 - 737 737 - var selectorJSONPtr *string 738 738 - if len(record.Target.Selector) > 0 { 739 739 - selectorStr := string(record.Target.Selector) 740 740 - selectorJSONPtr = &selectorStr 741 741 - } 742 742 - 743 743 - var titlePtr *string 744 744 - if req.Title != "" { 745 745 - titlePtr = &req.Title 746 746 - } 747 747 - 748 748 - var colorPtr *string 749 749 - if req.Color != "" { 750 750 - colorPtr = &req.Color 751 751 - } 752 752 - 753 753 - var tagsJSONPtr *string 754 754 - if len(req.Tags) > 0 { 755 755 - tagsBytes, _ := json.Marshal(req.Tags) 756 756 - tagsStr := string(tagsBytes) 757 757 - tagsJSONPtr = &tagsStr 758 758 - } 759 759 - 760 760 - cid := result.CID 761 761 - highlight := &db.Highlight{ 762 762 - URI: result.URI, 763 763 - AuthorDID: session.DID, 764 764 - TargetSource: req.URL, 765 765 - TargetHash: urlHash, 766 766 - TargetTitle: titlePtr, 767 767 - SelectorJSON: selectorJSONPtr, 768 768 - Color: colorPtr, 769 769 - TagsJSON: tagsJSONPtr, 770 770 - CreatedAt: time.Now(), 771 771 - IndexedAt: time.Now(), 772 772 - CID: &cid, 773 773 - } 774 774 - if err := s.db.CreateHighlight(highlight); err != nil { 775 775 - WriteInternalError(w, "Failed to index highlight") 776 776 - return 777 777 - } 778 778 - 779 779 - for _, label := range validLabels { 780 780 - if err := s.db.CreateContentLabel(session.DID, result.URI, label, session.DID); err != nil { 781 781 - logger.Error("Warning: failed to create self-label %s: %v", label, err) 782 782 - } 783 783 - } 784 784 - 785 785 - WriteSuccess(w, map[string]string{"uri": result.URI, "cid": result.CID}) 786 786 - } 787 787 - 788 788 - type CreateBookmarkRequest struct { 789 789 - URL string `json:"url"` 790 790 - Title string `json:"title,omitempty"` 791 791 - Description string `json:"description,omitempty"` 792 792 - Tags []string `json:"tags,omitempty"` 793 793 - } 794 794 - 795 795 - func (s *AnnotationService) CreateBookmark(w http.ResponseWriter, r *http.Request) { 796 796 - session, err := s.refresher.GetSessionWithAutoRefresh(r) 797 797 - if err != nil { 798 798 - WriteUnauthorized(w, err.Error()) 799 799 - return 800 800 - } 801 801 - 802 802 - var req CreateBookmarkRequest 803 803 - if err := json.NewDecoder(r.Body).Decode(&req); err != nil { 804 804 - WriteBadRequest(w, "Invalid request body") 805 805 - return 806 806 - } 807 807 - 808 808 - if req.URL == "" { 809 809 - WriteBadRequest(w, "URL is required") 810 810 - return 811 811 - } 812 812 - 813 813 - for i, t := range req.Tags { 814 814 - req.Tags[i] = strings.ToLower(t) 815 815 - } 816 816 - 817 817 - urlHash := db.HashURL(req.URL) 818 818 - record := xrpc.NewBookmarkRecord(req.URL, urlHash, req.Title, req.Description) 819 819 - if len(req.Tags) > 0 { 820 820 - record.Tags = req.Tags 821 821 - } 822 822 - 823 823 - if err := record.Validate(); err != nil { 824 824 - WriteBadRequest(w, "Validation error: "+err.Error()) 825 825 - return 826 826 - } 827 827 - 828 828 - var result *xrpc.CreateRecordOutput 829 829 - 830 830 - if existing, err := s.checkDuplicateBookmark(session.DID, req.URL); err == nil && existing != nil { 831 831 - WriteConflict(w, "Bookmark already exists") 832 832 - return 833 833 - } 834 834 - 835 835 - err = s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 836 836 - var createErr error 837 837 - result, createErr = client.CreateRecord(r.Context(), did, xrpc.CollectionBookmark, record) 838 838 - return createErr 839 839 - }) 840 840 - if err != nil { 841 841 - HandleAPIError(w, r, err, "Failed to create bookmark: ", http.StatusInternalServerError) 842 842 - return 843 843 - } 844 844 - 845 845 - var titlePtr *string 846 846 - if req.Title != "" { 847 847 - titlePtr = &req.Title 848 848 - } 849 849 - var descPtr *string 850 850 - if req.Description != "" { 851 851 - descPtr = &req.Description 852 852 - } 853 853 - 854 854 - var tagsJSONPtr *string 855 855 - if len(req.Tags) > 0 { 856 856 - tagsBytes, _ := json.Marshal(req.Tags) 857 857 - tagsStr := string(tagsBytes) 858 858 - tagsJSONPtr = &tagsStr 859 859 - } 860 860 - 861 861 - cid := result.CID 862 862 - bookmark := &db.Bookmark{ 863 863 - URI: result.URI, 864 864 - AuthorDID: session.DID, 865 865 - Source: req.URL, 866 866 - SourceHash: urlHash, 867 867 - Title: titlePtr, 868 868 - Description: descPtr, 869 869 - TagsJSON: tagsJSONPtr, 870 870 - CreatedAt: time.Now(), 871 871 - IndexedAt: time.Now(), 872 872 - CID: &cid, 873 873 - } 874 874 - s.db.CreateBookmark(bookmark) 875 875 - 876 876 - WriteSuccess(w, map[string]string{"uri": result.URI, "cid": result.CID}) 877 877 - } 878 878 - 879 879 - func (s *AnnotationService) DeleteHighlight(w http.ResponseWriter, r *http.Request) { 880 880 - session, err := s.refresher.GetSessionWithAutoRefresh(r) 881 881 - if err != nil { 882 882 - WriteUnauthorized(w, err.Error()) 883 883 - return 884 884 - } 885 885 - 886 886 - rkey := r.URL.Query().Get("rkey") 887 887 - if rkey == "" { 888 888 - WriteBadRequest(w, "rkey required") 889 889 - return 890 890 - } 891 891 - 892 892 - pdsErr := s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 893 893 - return client.DeleteRecord(r.Context(), did, xrpc.CollectionHighlight, rkey) 894 894 - }) 895 895 - if pdsErr != nil { 896 896 - logger.Error("PDS delete highlight failed (will still clean local DB): %v", pdsErr) 897 897 - } 898 898 - 899 899 - uri := "at://" + session.DID + "/" + xrpc.CollectionHighlight + "/" + rkey 900 900 - s.db.DeleteHighlight(uri) 901 901 - 902 902 - WriteSuccess(w, map[string]bool{"success": true}) 903 903 - } 904 904 - 905 905 - func (s *AnnotationService) DeleteBookmark(w http.ResponseWriter, r *http.Request) { 906 906 - session, err := s.refresher.GetSessionWithAutoRefresh(r) 907 907 - if err != nil { 908 908 - WriteUnauthorized(w, err.Error()) 909 909 - return 910 910 - } 911 911 - 912 912 - rkey := r.URL.Query().Get("rkey") 913 913 - if rkey == "" { 914 914 - WriteBadRequest(w, "rkey required") 915 915 - return 916 916 - } 917 917 - 918 918 - pdsErr := s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 919 919 - return client.DeleteRecord(r.Context(), did, xrpc.CollectionBookmark, rkey) 920 920 - }) 921 921 - if pdsErr != nil { 922 922 - logger.Error("PDS delete bookmark failed (will still clean local DB): %v", pdsErr) 923 923 - } 924 924 - 925 925 - uri := "at://" + session.DID + "/" + xrpc.CollectionBookmark + "/" + rkey 926 926 - s.db.DeleteBookmark(uri) 927 927 - 928 928 - WriteSuccess(w, map[string]bool{"success": true}) 929 929 - } 930 930 - 931 931 - type UpdateHighlightRequest struct { 932 932 - Color string `json:"color"` 933 933 - Tags []string `json:"tags,omitempty"` 934 934 - Labels []string `json:"labels,omitempty"` 935 935 - } 936 936 - 937 937 - func (s *AnnotationService) UpdateHighlight(w http.ResponseWriter, r *http.Request) { 938 938 - uri := r.URL.Query().Get("uri") 939 939 - if uri == "" { 940 940 - WriteBadRequest(w, "uri query parameter required") 941 941 - return 942 942 - } 943 943 - 944 944 - session, err := s.refresher.GetSessionWithAutoRefresh(r) 945 945 - if err != nil { 946 946 - WriteUnauthorized(w, err.Error()) 947 947 - return 948 948 - } 949 949 - 950 950 - if len(uri) < 5 || !strings.HasPrefix(uri[5:], session.DID) { 951 951 - WriteForbidden(w, "Not authorized") 952 952 - return 953 953 - } 954 954 - 955 955 - var req UpdateHighlightRequest 956 956 - if err := json.NewDecoder(r.Body).Decode(&req); err != nil { 957 957 - WriteBadRequest(w, "Invalid request body") 958 958 - return 959 959 - } 960 960 - 961 961 - parts := parseATURI(uri) 962 962 - if len(parts) < 3 { 963 963 - WriteBadRequest(w, "Invalid URI") 964 964 - return 965 965 - } 966 966 - rkey := parts[2] 967 967 - 968 968 - for i, t := range req.Tags { 969 969 - req.Tags[i] = strings.ToLower(t) 970 970 - } 971 971 - 972 972 - var result *xrpc.PutRecordOutput 973 973 - err = s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 974 974 - existing, getErr := client.GetRecord(r.Context(), did, xrpc.CollectionHighlight, rkey) 975 975 - if getErr != nil { 976 976 - return fmt.Errorf("failed to fetch record: %w", getErr) 977 977 - } 978 978 - 979 979 - var record xrpc.HighlightRecord 980 980 - json.Unmarshal(existing.Value, &record) 981 981 - 982 982 - if req.Color != "" { 983 983 - record.Color = req.Color 984 984 - } 985 985 - if req.Tags != nil { 986 986 - record.Tags = req.Tags 987 987 - } 988 988 - 989 989 - updateValidLabels := map[string]bool{"sexual": true, "nudity": true, "violence": true, "gore": true, "spam": true, "misleading": true} 990 990 - var updateLabels []string 991 991 - for _, l := range req.Labels { 992 992 - if updateValidLabels[l] { 993 993 - updateLabels = append(updateLabels, l) 994 994 - } 995 995 - } 996 996 - record.Labels = xrpc.NewSelfLabels(updateLabels) 997 997 - 998 998 - if err := record.Validate(); err != nil { 999 999 - return fmt.Errorf("validation failed: %w", err) 1000 1000 - } 1001 1001 - 1002 1002 - var updateErr error 1003 1003 - result, updateErr = client.PutRecord(r.Context(), did, xrpc.CollectionHighlight, rkey, record) 1004 1004 - if updateErr != nil { 1005 1005 - logger.Error("UpdateHighlight failed: %v. Retrying with delete-then-create workaround.", updateErr) 1006 1006 - _ = client.DeleteRecord(r.Context(), did, xrpc.CollectionHighlight, rkey) 1007 1007 - result, updateErr = client.PutRecord(r.Context(), did, xrpc.CollectionHighlight, rkey, record) 1008 1008 - } 1009 1009 - return updateErr 1010 1010 - }) 1011 1011 - 1012 1012 - if err != nil { 1013 1013 - HandleAPIError(w, r, err, "Failed to update: ", http.StatusInternalServerError) 1014 1014 - return 1015 1015 - } 1016 1016 - 1017 1017 - tagsJSON := "" 1018 1018 - if req.Tags != nil { 1019 1019 - b, _ := json.Marshal(req.Tags) 1020 1020 - tagsJSON = string(b) 1021 1021 - } 1022 1022 - s.db.UpdateHighlight(uri, req.Color, tagsJSON, result.CID) 1023 1023 - 1024 1024 - validSelfLabels := map[string]bool{"sexual": true, "nudity": true, "violence": true, "gore": true, "spam": true, "misleading": true} 1025 1025 - var validLabels []string 1026 1026 - for _, l := range req.Labels { 1027 1027 - if validSelfLabels[l] { 1028 1028 - validLabels = append(validLabels, l) 1029 1029 - } 1030 1030 - } 1031 1031 - if err := s.db.SyncSelfLabels(session.DID, uri, validLabels); err != nil { 1032 1032 - logger.Error("Warning: failed to sync self-labels: %v", err) 1033 1033 - } 1034 1034 - 1035 1035 - WriteSuccess(w, map[string]interface{}{"success": true, "uri": result.URI, "cid": result.CID}) 1036 1036 - } 1037 1037 - 1038 1038 - type UpdateBookmarkRequest struct { 1039 1039 - Title string `json:"title"` 1040 1040 - Description string `json:"description"` 1041 1041 - Tags []string `json:"tags,omitempty"` 1042 1042 - Labels []string `json:"labels,omitempty"` 1043 1043 - } 1044 1044 - 1045 1045 - func (s *AnnotationService) UpdateBookmark(w http.ResponseWriter, r *http.Request) { 1046 1046 - uri := r.URL.Query().Get("uri") 1047 1047 - if uri == "" { 1048 1048 - WriteBadRequest(w, "uri query parameter required") 1049 1049 - return 1050 1050 - } 1051 1051 - 1052 1052 - session, err := s.refresher.GetSessionWithAutoRefresh(r) 1053 1053 - if err != nil { 1054 1054 - WriteUnauthorized(w, err.Error()) 1055 1055 - return 1056 1056 - } 1057 1057 - 1058 1058 - if len(uri) < 5 || !strings.HasPrefix(uri[5:], session.DID) { 1059 1059 - WriteForbidden(w, "Not authorized") 1060 1060 - return 1061 1061 - } 1062 1062 - 1063 1063 - var req UpdateBookmarkRequest 1064 1064 - if err := json.NewDecoder(r.Body).Decode(&req); err != nil { 1065 1065 - WriteBadRequest(w, "Invalid request body") 1066 1066 - return 1067 1067 - } 1068 1068 - 1069 1069 - parts := parseATURI(uri) 1070 1070 - if len(parts) < 3 { 1071 1071 - WriteBadRequest(w, "Invalid URI") 1072 1072 - return 1073 1073 - } 1074 1074 - rkey := parts[2] 1075 1075 - 1076 1076 - var result *xrpc.PutRecordOutput 1077 1077 - for i, t := range req.Tags { 1078 1078 - req.Tags[i] = strings.ToLower(t) 1079 1079 - } 1080 1080 - 1081 1081 - err = s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 1082 1082 - existing, getErr := client.GetRecord(r.Context(), did, xrpc.CollectionBookmark, rkey) 1083 1083 - if getErr != nil { 1084 1084 - return fmt.Errorf("failed to fetch record: %w", getErr) 1085 1085 - } 1086 1086 - 1087 1087 - var record xrpc.BookmarkRecord 1088 1088 - json.Unmarshal(existing.Value, &record) 1089 1089 - 1090 1090 - if req.Title != "" { 1091 1091 - record.Title = req.Title 1092 1092 - } 1093 1093 - if req.Description != "" { 1094 1094 - record.Description = req.Description 1095 1095 - } 1096 1096 - if req.Tags != nil { 1097 1097 - record.Tags = req.Tags 1098 1098 - } 1099 1099 - 1100 1100 - updateValidLabels := map[string]bool{"sexual": true, "nudity": true, "violence": true, "gore": true, "spam": true, "misleading": true} 1101 1101 - var updateLabels []string 1102 1102 - for _, l := range req.Labels { 1103 1103 - if updateValidLabels[l] { 1104 1104 - updateLabels = append(updateLabels, l) 1105 1105 - } 1106 1106 - } 1107 1107 - record.Labels = xrpc.NewSelfLabels(updateLabels) 1108 1108 - 1109 1109 - if err := record.Validate(); err != nil { 1110 1110 - return fmt.Errorf("validation failed: %w", err) 1111 1111 - } 1112 1112 - 1113 1113 - var updateErr error 1114 1114 - result, updateErr = client.PutRecord(r.Context(), did, xrpc.CollectionBookmark, rkey, record) 1115 1115 - if updateErr != nil { 1116 1116 - logger.Error("UpdateBookmark failed: %v. Retrying with delete-then-create workaround.", updateErr) 1117 1117 - _ = client.DeleteRecord(r.Context(), did, xrpc.CollectionBookmark, rkey) 1118 1118 - result, updateErr = client.PutRecord(r.Context(), did, xrpc.CollectionBookmark, rkey, record) 1119 1119 - } 1120 1120 - return updateErr 1121 1121 - }) 1122 1122 - 1123 1123 - if err != nil { 1124 1124 - HandleAPIError(w, r, err, "Failed to update: ", http.StatusInternalServerError) 1125 1125 - return 1126 1126 - } 1127 1127 - 1128 1128 - tagsJSON := "" 1129 1129 - if req.Tags != nil { 1130 1130 - b, _ := json.Marshal(req.Tags) 1131 1131 - tagsJSON = string(b) 1132 1132 - } 1133 1133 - s.db.UpdateBookmark(uri, req.Title, req.Description, tagsJSON, result.CID) 1134 1134 - 1135 1135 - validSelfLabels := map[string]bool{"sexual": true, "nudity": true, "violence": true, "gore": true, "spam": true, "misleading": true} 1136 1136 - var validLabels []string 1137 1137 - for _, l := range req.Labels { 1138 1138 - if validSelfLabels[l] { 1139 1139 - validLabels = append(validLabels, l) 1140 1140 - } 1141 1141 - } 1142 1142 - if err := s.db.SyncSelfLabels(session.DID, uri, validLabels); err != nil { 1143 1143 - logger.Error("Warning: failed to sync self-labels: %v", err) 1144 1144 - } 1145 1145 - 1146 1146 - WriteSuccess(w, map[string]interface{}{"success": true, "uri": result.URI, "cid": result.CID}) 1147 1147 - }

-60

backend/internal/api/annotations_helpers.go

reviewed

··· 1 1 - package api 2 2 - 3 3 - import ( 4 4 - "encoding/json" 5 5 - "time" 6 6 - 7 7 - "margin.at/internal/db" 8 8 - ) 9 9 - 10 10 - func (s *AnnotationService) checkDuplicateAnnotation(did, url, text string) (*db.Annotation, error) { 11 11 - recentAnnos, err := s.db.GetAnnotationsByAuthor(did, 5, 0) 12 12 - if err != nil { 13 13 - return nil, err 14 14 - } 15 15 - for _, a := range recentAnnos { 16 16 - if a.TargetSource == url && 17 17 - ((a.BodyValue == nil && text == "") || (a.BodyValue != nil && *a.BodyValue == text)) && 18 18 - time.Since(a.CreatedAt) < 10*time.Second { 19 19 - return &a, nil 20 20 - } 21 21 - } 22 22 - return nil, nil 23 23 - } 24 24 - 25 25 - func (s *AnnotationService) checkDuplicateHighlight(did, url string, selector json.RawMessage) (*db.Highlight, error) { 26 26 - recentHighs, err := s.db.GetHighlightsByAuthor(did, 5, 0) 27 27 - if err != nil { 28 28 - return nil, err 29 29 - } 30 30 - for _, h := range recentHighs { 31 31 - matchSelector := false 32 32 - if h.SelectorJSON == nil && selector == nil { 33 33 - matchSelector = true 34 34 - } else if h.SelectorJSON != nil && selector != nil { 35 35 - selectorBytes, _ := json.Marshal(selector) 36 36 - if *h.SelectorJSON == string(selectorBytes) { 37 37 - matchSelector = true 38 38 - } 39 39 - } 40 40 - 41 41 - if h.TargetSource == url && matchSelector && time.Since(h.CreatedAt) < 10*time.Second { 42 42 - return &h, nil 43 43 - } 44 44 - } 45 45 - return nil, nil 46 46 - } 47 47 - 48 48 - func (s *AnnotationService) checkDuplicateBookmark(did, url string) (*db.Bookmark, error) { 49 49 - urlHash := db.HashURL(url) 50 50 - bookmarks, err := s.db.GetBookmarksByTargetHash(urlHash, 50, 0) 51 51 - if err != nil { 52 52 - return nil, err 53 53 - } 54 54 - for _, b := range bookmarks { 55 55 - if b.AuthorDID == did && b.Source == url { 56 56 - return &b, nil 57 57 - } 58 58 - } 59 59 - return nil, nil 60 60 - }

+168 -36

backend/internal/api/apikey.go

reviewed

··· 1 1 package api 2 2 3 3 import ( 4 4 + "context" 4 5 "crypto/rand" 5 6 "crypto/sha256" 6 7 "crypto/x509" ··· 154 155 } 155 156 156 157 type QuickBookmarkRequest struct { 157 157 - URL string `json:"url"` 158 158 - Title string `json:"title,omitempty"` 159 159 - Description string `json:"description,omitempty"` 158 158 + URL string `json:"url"` 159 159 + Title string `json:"title,omitempty"` 160 160 + Description string `json:"description,omitempty"` 161 161 + Tags []string `json:"tags,omitempty"` 160 162 } 161 163 162 164 func (h *APIKeyHandler) QuickBookmark(w http.ResponseWriter, r *http.Request) { ··· 179 181 180 182 session, err := h.getSessionByDID(apiKey.OwnerDID) 181 183 if err != nil { 184 184 + logger.Error("[QuickBookmark] session lookup failed for DID %s: %v", apiKey.OwnerDID, err) 182 185 WriteUnauthorized(w, "User session not found. Please log in to margin.at first.") 183 186 return 184 187 } 185 188 189 189 + for i, t := range req.Tags { 190 190 + req.Tags[i] = strings.ToLower(t) 191 191 + } 192 192 + 186 193 urlHash := db.HashURL(req.URL) 187 187 - record := xrpc.NewBookmarkRecord(req.URL, urlHash, req.Title, req.Description) 194 194 + record := xrpc.NewNoteRecord(req.URL, urlHash, "", nil, req.Title, "", req.Description, "bookmarking") 195 195 + if len(req.Tags) > 0 { 196 196 + record.Tags = req.Tags 197 197 + } 188 198 189 199 if err := record.Validate(); err != nil { 200 200 + logger.Error("[QuickBookmark] record validation failed for DID %s url=%s: %v", apiKey.OwnerDID, req.URL, err) 190 201 WriteBadRequest(w, "Validation error: "+err.Error()) 191 202 return 192 203 } 193 204 205 205 + logger.Info("[QuickBookmark] creating record for DID %s url=%s", apiKey.OwnerDID, req.URL) 206 206 + 194 207 var result *xrpc.CreateRecordOutput 195 208 err = h.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 196 209 var createErr error 197 197 - result, createErr = client.CreateRecord(r.Context(), did, xrpc.CollectionBookmark, record) 210 210 + result, createErr = client.CreateRecord(r.Context(), did, xrpc.CollectionNote, record) 198 211 return createErr 199 212 }) 200 213 if err != nil { 214 214 + logger.Error("[QuickBookmark] PDS CreateRecord failed for DID %s url=%s: %v", apiKey.OwnerDID, req.URL, err) 201 215 WriteInternalError(w, "Failed to create bookmark") 202 216 return 203 217 } 218 218 + 219 219 + logger.Info("[QuickBookmark] created record URI=%s for DID %s", result.URI, apiKey.OwnerDID) 204 220 205 221 h.db.UpdateAPIKeyLastUsed(apiKey.ID) 206 222 207 207 - var titlePtr, descPtr *string 223 223 + capturedTags := append([]string(nil), req.Tags...) 224 224 + go func(did, url string) { 225 225 + prefs, dbErr := h.db.GetPreferences(did) 226 226 + communityEnabled := dbErr == nil && prefs != nil && (prefs.EnableCommunityBookmarks == nil || *prefs.EnableCommunityBookmarks) 227 227 + if !communityEnabled { 228 228 + return 229 229 + } 230 230 + sess, err := h.getSessionByDID(did) 231 231 + if err != nil { 232 232 + return 233 233 + } 234 234 + client := h.refresher.CreateClientFromSession(sess) 235 235 + communityRecord := map[string]interface{}{ 236 236 + "$type": xrpc.CollectionCommunityBookmark, 237 237 + "subject": url, 238 238 + "createdAt": time.Now().UTC().Format(time.RFC3339), 239 239 + } 240 240 + if len(capturedTags) > 0 { 241 241 + communityRecord["tags"] = capturedTags 242 242 + } 243 243 + ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) 244 244 + defer cancel() 245 245 + _, _ = client.CreateRecord(ctx, did, xrpc.CollectionCommunityBookmark, communityRecord) 246 246 + }(apiKey.OwnerDID, req.URL) 247 247 + 248 248 + var titlePtr, bodyValuePtr, tagsJSONPtr *string 208 249 if req.Title != "" { 209 250 titlePtr = &req.Title 210 251 } 211 252 if req.Description != "" { 212 212 - descPtr = &req.Description 253 253 + bodyValuePtr = &req.Description 254 254 + } 255 255 + if len(req.Tags) > 0 { 256 256 + b, _ := json.Marshal(req.Tags) 257 257 + s := string(b) 258 258 + tagsJSONPtr = &s 213 259 } 214 260 215 261 cid := result.CID 216 216 - bookmark := &db.Bookmark{ 217 217 - URI: result.URI, 218 218 - AuthorDID: apiKey.OwnerDID, 219 219 - Source: req.URL, 220 220 - SourceHash: urlHash, 221 221 - Title: titlePtr, 222 222 - Description: descPtr, 223 223 - CreatedAt: time.Now(), 224 224 - IndexedAt: time.Now(), 225 225 - CID: &cid, 262 262 + note := &db.Note{ 263 263 + URI: result.URI, 264 264 + AuthorDID: apiKey.OwnerDID, 265 265 + Motivation: "bookmarking", 266 266 + TargetSource: req.URL, 267 267 + TargetHash: urlHash, 268 268 + TargetTitle: titlePtr, 269 269 + BodyValue: bodyValuePtr, 270 270 + TagsJSON: tagsJSONPtr, 271 271 + CreatedAt: time.Now(), 272 272 + IndexedAt: time.Now(), 273 273 + CID: &cid, 226 274 } 227 227 - h.db.CreateBookmark(bookmark) 275 275 + h.db.CreateNote(note) 228 276 229 277 WriteSuccess(w, map[string]string{ 230 278 "uri": result.URI, ··· 236 284 type QuickSaveRequest struct { 237 285 URL string `json:"url"` 238 286 Text string `json:"text,omitempty"` 287 287 + Title string `json:"title,omitempty"` 239 288 Selector json.RawMessage `json:"selector,omitempty"` 240 289 Color string `json:"color,omitempty"` 290 290 + Tags []string `json:"tags,omitempty"` 241 291 } 242 292 243 293 func (h *APIKeyHandler) QuickSave(w http.ResponseWriter, r *http.Request) { ··· 274 324 var result *xrpc.CreateRecordOutput 275 325 var createErr error 276 326 327 327 + for i, t := range req.Tags { 328 328 + req.Tags[i] = strings.ToLower(t) 329 329 + } 330 330 + 331 331 + var tagsJSONPtr *string 332 332 + if len(req.Tags) > 0 { 333 333 + b, _ := json.Marshal(req.Tags) 334 334 + s := string(b) 335 335 + tagsJSONPtr = &s 336 336 + } 337 337 + 277 338 if isHighlight { 278 339 color := req.Color 279 340 if color == "" { 280 341 color = "yellow" 281 342 } 282 282 - record := xrpc.NewHighlightRecord(req.URL, urlHash, req.Selector, color, nil) 343 343 + record := xrpc.NewNoteRecord(req.URL, urlHash, "", req.Selector, req.Title, color, "", "highlighting") 344 344 + if len(req.Tags) > 0 { 345 345 + record.Tags = req.Tags 346 346 + } 283 347 284 348 if err := record.Validate(); err != nil { 285 349 WriteBadRequest(w, "Validation error: "+err.Error()) ··· 287 351 } 288 352 289 353 err = h.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 290 290 - result, createErr = client.CreateRecord(r.Context(), did, xrpc.CollectionHighlight, record) 354 354 + result, createErr = client.CreateRecord(r.Context(), did, xrpc.CollectionNote, record) 291 355 return createErr 292 356 }) 293 357 if err == nil { ··· 296 360 selectorStr := string(selectorJSON) 297 361 colorPtr := &color 298 362 299 299 - highlight := &db.Highlight{ 363 363 + var titlePtr *string 364 364 + if req.Title != "" { 365 365 + titlePtr = &req.Title 366 366 + } 367 367 + 368 368 + note := &db.Note{ 300 369 URI: result.URI, 301 370 AuthorDID: apiKey.OwnerDID, 371 371 + Motivation: "highlighting", 302 372 TargetSource: req.URL, 303 373 TargetHash: urlHash, 374 374 + TargetTitle: titlePtr, 304 375 SelectorJSON: &selectorStr, 305 376 Color: colorPtr, 377 377 + TagsJSON: tagsJSONPtr, 306 378 CreatedAt: time.Now(), 307 379 IndexedAt: time.Now(), 308 380 CID: &result.CID, 309 381 } 310 382 go func() { 311 311 - if err := h.db.CreateHighlight(highlight); err != nil { 312 312 - fmt.Printf("Warning: failed to index highlight in local DB: %v\n", err) 383 383 + if err := h.db.CreateNote(note); err != nil { 384 384 + logger.Error("Warning: failed to index highlight note in local DB: %v", err) 313 385 } 314 386 }() 315 387 } 316 388 317 389 } else { 318 318 - record := xrpc.NewAnnotationRecord(req.URL, urlHash, req.Text, req.Selector, "") 390 390 + record := xrpc.NewNoteRecord(req.URL, urlHash, req.Text, req.Selector, req.Title, "", "", "commenting") 391 391 + if len(req.Tags) > 0 { 392 392 + record.Tags = req.Tags 393 393 + } 319 394 320 395 if err := record.Validate(); err != nil { 321 396 WriteBadRequest(w, "Validation error: "+err.Error()) ··· 323 398 } 324 399 325 400 err = h.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 326 326 - result, createErr = client.CreateRecord(r.Context(), did, xrpc.CollectionAnnotation, record) 401 401 + result, createErr = client.CreateRecord(r.Context(), did, xrpc.CollectionNote, record) 327 402 return createErr 328 403 }) 329 404 if err == nil { ··· 336 411 selectorStrPtr = &s 337 412 } 338 413 339 339 - bodyValue := req.Text 340 340 - var bodyValuePtr *string 341 341 - if bodyValue != "" { 342 342 - bodyValuePtr = &bodyValue 414 414 + var bodyValuePtr, titlePtr *string 415 415 + if req.Text != "" { 416 416 + bodyValuePtr = &req.Text 417 417 + } 418 418 + if req.Title != "" { 419 419 + titlePtr = &req.Title 343 420 } 344 421 345 345 - annotation := &db.Annotation{ 422 422 + note := &db.Note{ 346 423 URI: result.URI, 347 424 AuthorDID: apiKey.OwnerDID, 348 425 Motivation: "commenting", 349 426 BodyValue: bodyValuePtr, 350 427 TargetSource: req.URL, 351 428 TargetHash: urlHash, 429 429 + TargetTitle: titlePtr, 352 430 SelectorJSON: selectorStrPtr, 431 431 + TagsJSON: tagsJSONPtr, 353 432 CreatedAt: time.Now(), 354 433 IndexedAt: time.Now(), 355 434 CID: &result.CID, 356 435 } 357 436 go func() { 358 358 - h.db.CreateAnnotation(annotation) 437 437 + h.db.CreateNote(note) 359 438 }() 360 439 } 361 440 } ··· 374 453 375 454 type QuickHighlightRequest struct { 376 455 URL string `json:"url"` 456 456 + Title string `json:"title,omitempty"` 377 457 Selector interface{} `json:"selector"` 378 458 Color string `json:"color,omitempty"` 459 459 + Tags []string `json:"tags,omitempty"` 379 460 } 380 461 381 462 func (h *APIKeyHandler) QuickHighlight(w http.ResponseWriter, r *http.Request) { ··· 400 481 if err != nil { 401 482 WriteUnauthorized(w, "User session not found. Please log in to margin.at first.") 402 483 return 484 484 + } 485 485 + 486 486 + for i, t := range req.Tags { 487 487 + req.Tags[i] = strings.ToLower(t) 403 488 } 404 489 405 490 urlHash := db.HashURL(req.URL) ··· 408 493 color = "yellow" 409 494 } 410 495 411 411 - record := xrpc.NewHighlightRecord(req.URL, urlHash, req.Selector, color, nil) 496 496 + record := xrpc.NewNoteRecord(req.URL, urlHash, "", req.Selector, req.Title, color, "", "highlighting") 497 497 + if len(req.Tags) > 0 { 498 498 + record.Tags = req.Tags 499 499 + } 412 500 413 501 if err := record.Validate(); err != nil { 414 502 WriteBadRequest(w, "Validation error: "+err.Error()) ··· 418 506 var result *xrpc.CreateRecordOutput 419 507 err = h.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 420 508 var createErr error 421 421 - result, createErr = client.CreateRecord(r.Context(), did, xrpc.CollectionHighlight, record) 509 509 + result, createErr = client.CreateRecord(r.Context(), did, xrpc.CollectionNote, record) 422 510 return createErr 423 511 }) 424 512 if err != nil { ··· 432 520 selectorStr := string(selectorJSON) 433 521 colorPtr := &color 434 522 435 435 - highlight := &db.Highlight{ 523 523 + var titlePtr, tagsJSONPtr *string 524 524 + if req.Title != "" { 525 525 + titlePtr = &req.Title 526 526 + } 527 527 + if len(req.Tags) > 0 { 528 528 + b, _ := json.Marshal(req.Tags) 529 529 + s := string(b) 530 530 + tagsJSONPtr = &s 531 531 + } 532 532 + 533 533 + note := &db.Note{ 436 534 URI: result.URI, 437 535 AuthorDID: apiKey.OwnerDID, 536 536 + Motivation: "highlighting", 438 537 TargetSource: req.URL, 439 538 TargetHash: urlHash, 539 539 + TargetTitle: titlePtr, 440 540 SelectorJSON: &selectorStr, 441 541 Color: colorPtr, 542 542 + TagsJSON: tagsJSONPtr, 442 543 CreatedAt: time.Now(), 443 544 IndexedAt: time.Now(), 444 545 CID: &result.CID, 445 546 } 446 446 - if err := h.db.CreateHighlight(highlight); err != nil { 447 447 - fmt.Printf("Warning: failed to index highlight in local DB: %v\n", err) 547 547 + if err := h.db.CreateNote(note); err != nil { 548 548 + logger.Error("Warning: failed to index highlight note in local DB: %v", err) 448 549 } 449 550 450 551 WriteSuccess(w, map[string]string{ 451 552 "uri": result.URI, 452 553 "cid": result.CID, 453 554 "message": "Highlight created successfully", 555 555 + }) 556 556 + } 557 557 + 558 558 + func (h *APIKeyHandler) GetMe(w http.ResponseWriter, r *http.Request) { 559 559 + apiKey, err := h.authenticateAPIKey(r) 560 560 + if err == nil { 561 561 + session, err := h.getSessionByDID(apiKey.OwnerDID) 562 562 + if err != nil { 563 563 + WriteUnauthorized(w, "User session not found. Please log in to margin.at first.") 564 564 + return 565 565 + } 566 566 + WriteSuccess(w, map[string]string{ 567 567 + "did": session.DID, 568 568 + "handle": session.Handle, 569 569 + }) 570 570 + return 571 571 + } 572 572 + 573 573 + token := r.Header.Get("X-Session-Token") 574 574 + if token == "" { 575 575 + WriteUnauthorized(w, "Unauthorized") 576 576 + return 577 577 + } 578 578 + did, handle, _, _, _, err := h.db.GetSession(token) 579 579 + if err != nil { 580 580 + WriteUnauthorized(w, "Invalid session") 581 581 + return 582 582 + } 583 583 + WriteSuccess(w, map[string]string{ 584 584 + "did": did, 585 585 + "handle": handle, 454 586 }) 455 587 } 456 588

+376 -781

backend/internal/api/handler.go

reviewed

··· 7 7 "io" 8 8 "net/http" 9 9 "net/url" 10 10 - "sort" 11 10 "strconv" 12 11 "strings" 13 12 "sync" ··· 15 14 16 15 "github.com/go-chi/chi/v5" 17 16 17 17 + "margin.at/internal/analytics" 18 18 "margin.at/internal/config" 19 19 "margin.at/internal/db" 20 20 + "margin.at/internal/domain" 20 21 "margin.at/internal/logger" 21 22 "margin.at/internal/recommendations" 23 23 + "margin.at/internal/repository/postgres" 24 24 + "margin.at/internal/service" 22 25 internal_sync "margin.at/internal/sync" 23 26 "margin.at/internal/xrpc" 24 27 ) ··· 77 80 } 78 81 79 82 type Handler struct { 80 80 - db *db.DB 81 81 - annotationService *AnnotationService 82 82 - refresher *TokenRefresher 83 83 - apiKeys *APIKeyHandler 84 84 - syncService *internal_sync.Service 85 85 - moderation *ModerationHandler 86 86 - recommendations *recommendations.Service 87 87 - metaCache *urlMetaCache 88 88 - metaSem chan struct{} 83 83 + db *db.DB 84 84 + noteRepo domain.NoteRepository 85 85 + engagementRepo domain.EngagementRepository 86 86 + notificationRepo domain.NotificationRepository 87 87 + sessionRepo domain.SessionRepository 88 88 + noteWriter *NoteWriteService 89 89 + refresher *TokenRefresher 90 90 + apiKeys *APIKeyHandler 91 91 + syncService *internal_sync.Service 92 92 + moderation *ModerationHandler 93 93 + recommendations *recommendations.Service 94 94 + feedSvc *service.FeedService 95 95 + hydration *service.HydrationService 96 96 + metaCache *urlMetaCache 97 97 + metaSem chan struct{} 98 98 + analytics *analytics.Client 89 99 } 90 100 91 91 - func NewHandler(database *db.DB, annotationService *AnnotationService, refresher *TokenRefresher, syncService *internal_sync.Service, recService *recommendations.Service) *Handler { 101 101 + func NewHandler(database *db.DB, noteWriter *NoteWriteService, refresher *TokenRefresher, syncService *internal_sync.Service, recService *recommendations.Service, ac *analytics.Client) *Handler { 102 102 + noteRepo := postgres.NewNoteRepository(database.DB) 103 103 + engagementRepo := postgres.NewEngagementRepository(database.DB) 104 104 + notificationRepo := postgres.NewNotificationRepository(database.DB) 105 105 + sessionRepo := postgres.NewSessionRepository(database.DB) 106 106 + profileRepo := &fullProfileRepository{db: database} // rich resolution: cache → DB → bsky.social 107 107 + profileSvc := service.NewProfileService(profileRepo) // service-lifetime TTL cache on top 108 108 + hydration := service.NewHydrationService(engagementRepo, profileSvc) 109 109 + feedSvc := service.NewFeedService(noteRepo, hydration, database) 110 110 + 92 111 return &Handler{ 93 93 - db: database, 94 94 - annotationService: annotationService, 95 95 - refresher: refresher, 96 96 - apiKeys: NewAPIKeyHandler(database, refresher), 97 97 - syncService: syncService, 98 98 - moderation: NewModerationHandler(database, refresher), 99 99 - recommendations: recService, 100 100 - metaCache: newURLMetaCache(), 101 101 - metaSem: make(chan struct{}, 5), 112 112 + db: database, 113 113 + noteRepo: noteRepo, 114 114 + engagementRepo: engagementRepo, 115 115 + notificationRepo: notificationRepo, 116 116 + sessionRepo: sessionRepo, 117 117 + noteWriter: noteWriter, 118 118 + refresher: refresher, 119 119 + apiKeys: NewAPIKeyHandler(database, refresher), 120 120 + syncService: syncService, 121 121 + moderation: NewModerationHandler(database, refresher), 122 122 + recommendations: recService, 123 123 + feedSvc: feedSvc, 124 124 + hydration: hydration, 125 125 + metaCache: newURLMetaCache(), 126 126 + metaSem: make(chan struct{}, 5), 127 127 + analytics: ac, 102 128 } 103 129 } 104 130 ··· 113 139 r.Get("/annotations/feed", h.GetFeed) 114 140 r.Get("/annotation", h.GetAnnotation) 115 141 r.Get("/annotations/history", h.GetEditHistory) 116 116 - r.Post("/annotations", h.annotationService.CreateAnnotation) 117 117 - r.Put("/annotations", h.annotationService.UpdateAnnotation) 118 118 - r.Delete("/annotations", h.annotationService.DeleteAnnotation) 119 119 - r.Post("/annotations/like", h.annotationService.LikeAnnotation) 120 120 - r.Delete("/annotations/like", h.annotationService.UnlikeAnnotation) 121 121 - r.Post("/annotations/reply", h.annotationService.CreateReply) 122 122 - r.Delete("/annotations/reply", h.annotationService.DeleteReply) 142 142 + r.Post("/annotations", h.noteWriter.CreateAnnotation) 143 143 + r.Put("/annotations", h.noteWriter.UpdateAnnotation) 144 144 + r.Delete("/annotations", h.noteWriter.DeleteAnnotation) 145 145 + r.Post("/annotations/like", h.noteWriter.LikeAnnotation) 146 146 + r.Delete("/annotations/like", h.noteWriter.UnlikeAnnotation) 147 147 + r.Post("/annotations/reply", h.noteWriter.CreateReply) 148 148 + r.Delete("/annotations/reply", h.noteWriter.DeleteReply) 123 149 r.Get("/replies", h.GetReplies) 124 150 r.Get("/likes", h.GetLikeCount) 125 151 126 152 // Highlights 127 153 r.Get("/highlights", h.GetHighlights) 128 128 - r.Post("/highlights", h.annotationService.CreateHighlight) 129 129 - r.Put("/highlights", h.annotationService.UpdateHighlight) 130 130 - r.Delete("/highlights", h.annotationService.DeleteHighlight) 154 154 + r.Post("/highlights", h.noteWriter.CreateHighlight) 155 155 + r.Put("/highlights", h.noteWriter.UpdateHighlight) 156 156 + r.Delete("/highlights", h.noteWriter.DeleteAnnotation) 131 157 132 158 // Bookmarks 133 159 r.Get("/bookmarks", h.GetBookmarks) 134 134 - r.Post("/bookmarks", h.annotationService.CreateBookmark) 135 135 - r.Put("/bookmarks", h.annotationService.UpdateBookmark) 136 136 - r.Delete("/bookmarks", h.annotationService.DeleteBookmark) 160 160 + r.Post("/bookmarks", h.noteWriter.CreateBookmark) 161 161 + r.Put("/bookmarks", h.noteWriter.UpdateBookmark) 162 162 + r.Delete("/bookmarks", h.noteWriter.DeleteAnnotation) 137 163 138 164 // Collections 139 165 r.Post("/collections", collectionService.CreateCollection) ··· 148 174 149 175 // Targets & discovery 150 176 r.Get("/targets", h.GetByTarget) 177 177 + r.Get("/targets/hash", h.GetByTargetHash) 151 178 r.Get("/discover", h.DiscoverForURL) 152 179 r.Get("/url-metadata", h.GetURLMetadata) 153 180 ··· 182 209 r.Post("/sync", h.SyncAll) 183 210 184 211 // API keys 212 212 + r.Get("/me", h.apiKeys.GetMe) 185 213 r.Post("/keys", h.apiKeys.CreateKey) 186 214 r.Get("/keys", h.apiKeys.ListKeys) 187 215 r.Delete("/keys/{id}", h.apiKeys.DeleteKey) 188 216 r.Post("/quick/bookmark", h.apiKeys.QuickBookmark) 189 217 r.Post("/quick/save", h.apiKeys.QuickSave) 218 218 + r.Post("/quick/highlight", h.apiKeys.QuickHighlight) 190 219 191 220 // Moderation 192 221 r.Post("/moderation/block", h.moderation.BlockUser) ··· 208 237 209 238 // Admin 210 239 r.Post("/admin/backfill", h.AdminBackfill) 240 240 + 241 241 + // Analytics proxy 242 242 + r.Post("/analytics/capture", h.CaptureEvent) 211 243 }) 212 244 } 213 245 ··· 216 248 WriteSuccess(w, map[string]string{"status": "ok", "version": "1.0"}) 217 249 } 218 250 251 251 + func (h *Handler) CaptureEvent(w http.ResponseWriter, r *http.Request) { 252 252 + var body struct { 253 253 + Event string `json:"event"` 254 254 + DistinctID string `json:"distinct_id"` 255 255 + Properties map[string]interface{} `json:"properties"` 256 256 + } 257 257 + if err := json.NewDecoder(io.LimitReader(r.Body, 4096)).Decode(&body); err != nil { 258 258 + http.Error(w, "invalid body", http.StatusBadRequest) 259 259 + return 260 260 + } 261 261 + if body.Event == "" { 262 262 + http.Error(w, "event is required", http.StatusBadRequest) 263 263 + return 264 264 + } 265 265 + if body.DistinctID == "" { 266 266 + body.DistinctID = "anonymous_extension" 267 267 + } 268 268 + if h.analytics != nil { 269 269 + if body.Properties == nil { 270 270 + body.Properties = map[string]interface{}{} 271 271 + } 272 272 + body.Properties["$lib"] = "margin-extension" 273 273 + h.analytics.Capture(body.DistinctID, body.Event, body.Properties) 274 274 + } 275 275 + w.WriteHeader(http.StatusNoContent) 276 276 + } 277 277 + 219 278 func (h *Handler) GetAnnotations(w http.ResponseWriter, r *http.Request) { 220 279 source := r.URL.Query().Get("source") 221 280 if source == "" { 222 281 source = r.URL.Query().Get("url") 223 282 } 224 224 - 225 283 limit := parseIntParam(r, "limit", 50) 226 284 offset := parseIntParam(r, "offset", 0) 227 285 motivation := r.URL.Query().Get("motivation") 228 286 tag := r.URL.Query().Get("tag") 229 287 230 230 - var annotations []db.Annotation 231 231 - var err error 232 232 - 288 288 + filter := db.NoteFilter{Limit: limit, Offset: offset} 233 289 if source != "" { 234 234 - urlHash := db.HashURL(source) 235 235 - annotations, err = h.db.GetAnnotationsByTargetHash(urlHash, limit, offset) 236 236 - } else if motivation != "" { 237 237 - annotations, err = h.db.GetAnnotationsByMotivation(motivation, limit, offset) 238 238 - } else if tag != "" { 239 239 - annotations, err = h.db.GetAnnotationsByTag(tag, limit, offset) 240 240 - } else { 241 241 - annotations, err = h.db.GetRecentAnnotations(limit, offset) 290 290 + filter.TargetHash = db.HashURL(source) 291 291 + } 292 292 + if motivation != "" { 293 293 + filter.Motivations = []string{motivation} 294 294 + } 295 295 + if tag != "" { 296 296 + filter.Tag = tag 242 297 } 243 298 299 299 + notes, err := h.noteRepo.List(r.Context(), filter) 244 300 if err != nil { 245 301 WriteInternalError(w, "Internal server error") 246 302 return 247 303 } 248 304 249 249 - enriched, _ := hydrateAnnotations(h.db, annotations, h.getViewerDID(r)) 305 305 + lc, _ := h.hydration.Load(r.Context(), notes, h.getViewerDID(r)) 306 306 + items := make([]service.APINote, len(notes)) 307 307 + for i, n := range notes { 308 308 + items[i] = h.hydration.ToAPINote(n, lc) 309 309 + } 250 310 251 311 WriteSuccess(w, map[string]interface{}{ 252 312 "@context": "http://www.w3.org/ns/anno.jsonld", 253 313 "type": "AnnotationCollection", 254 254 - "items": enriched, 255 255 - "totalItems": len(enriched), 314 314 + "items": items, 315 315 + "totalItems": len(items), 256 316 }) 257 317 } 258 318 259 259 - func (h *Handler) GetFeed(w http.ResponseWriter, r *http.Request) { 260 260 - limit := parseIntParam(r, "limit", 50) 261 261 - offset := parseIntParam(r, "offset", 0) 262 262 - tag := strings.ToLower(r.URL.Query().Get("tag")) 263 263 - creator := r.URL.Query().Get("creator") 264 264 - feedType := r.URL.Query().Get("type") 265 265 - 266 266 - viewerDID := h.getViewerDID(r) 267 267 - 268 268 - var annotations []db.Annotation 269 269 - var highlights []db.Highlight 270 270 - var bookmarks []db.Bookmark 271 271 - var collectionItems []db.CollectionItem 272 272 - var err error 273 273 - 274 274 - motivation := r.URL.Query().Get("motivation") 275 275 - 276 276 - fetchLimit := limit + offset 277 277 - 278 278 - perTypeFetchLimit := fetchLimit 279 279 - if motivation == "" { 280 280 - perTypeFetchLimit = fetchLimit/2 + 10 319 319 + func parseFeedType(s string) db.FeedType { 320 320 + switch s { 321 321 + case "popular": 322 322 + return db.FeedTypePopular 323 323 + case "shelved": 324 324 + return db.FeedTypeShelved 325 325 + case "margin": 326 326 + return db.FeedTypeMargin 327 327 + case "semble": 328 328 + return db.FeedTypeSemble 329 329 + default: 330 330 + return db.FeedTypeRecent 281 331 } 332 332 + } 282 333 283 283 - if tag != "" { 284 284 - if creator != "" { 285 285 - if motivation == "" || motivation == "commenting" { 286 286 - switch feedType { 287 287 - case "margin": 288 288 - annotations, _ = h.db.GetMarginAnnotationsByTagAndAuthor(tag, creator, fetchLimit, 0) 289 289 - case "semble": 290 290 - annotations, _ = h.db.GetSembleAnnotationsByTagAndAuthor(tag, creator, fetchLimit, 0) 291 291 - default: 292 292 - annotations, _ = h.db.GetAnnotationsByTagAndAuthor(tag, creator, fetchLimit, 0) 293 293 - } 294 294 - } 295 295 - if motivation == "" || motivation == "highlighting" { 296 296 - switch feedType { 297 297 - case "margin": 298 298 - highlights, _ = h.db.GetMarginHighlightsByTagAndAuthor(tag, creator, fetchLimit, 0) 299 299 - case "semble": 300 300 - highlights, _ = h.db.GetSembleHighlightsByTagAndAuthor(tag, creator, fetchLimit, 0) 301 301 - default: 302 302 - highlights, _ = h.db.GetHighlightsByTagAndAuthor(tag, creator, fetchLimit, 0) 303 303 - } 304 304 - } 305 305 - if motivation == "" || motivation == "bookmarking" { 306 306 - switch feedType { 307 307 - case "margin": 308 308 - bookmarks, _ = h.db.GetMarginBookmarksByTagAndAuthor(tag, creator, fetchLimit, 0) 309 309 - case "semble": 310 310 - bookmarks, _ = h.db.GetSembleBookmarksByTagAndAuthor(tag, creator, fetchLimit, 0) 311 311 - default: 312 312 - bookmarks, _ = h.db.GetBookmarksByTagAndAuthor(tag, creator, fetchLimit, 0) 313 313 - } 314 314 - } 315 315 - collectionItems = []db.CollectionItem{} 316 316 - } else { 317 317 - if motivation == "" || motivation == "commenting" { 318 318 - switch feedType { 319 319 - case "margin": 320 320 - annotations, _ = h.db.GetMarginAnnotationsByTag(tag, fetchLimit, 0) 321 321 - case "semble": 322 322 - annotations, _ = h.db.GetSembleAnnotationsByTag(tag, fetchLimit, 0) 323 323 - default: 324 324 - annotations, _ = h.db.GetAnnotationsByTag(tag, fetchLimit, 0) 325 325 - } 326 326 - } 327 327 - if motivation == "" || motivation == "highlighting" { 328 328 - switch feedType { 329 329 - case "margin": 330 330 - highlights, _ = h.db.GetMarginHighlightsByTag(tag, fetchLimit, 0) 331 331 - case "semble": 332 332 - highlights, _ = h.db.GetSembleHighlightsByTag(tag, fetchLimit, 0) 333 333 - default: 334 334 - highlights, _ = h.db.GetHighlightsByTag(tag, fetchLimit, 0) 335 335 - } 336 336 - } 337 337 - if motivation == "" || motivation == "bookmarking" { 338 338 - switch feedType { 339 339 - case "margin": 340 340 - bookmarks, _ = h.db.GetMarginBookmarksByTag(tag, fetchLimit, 0) 341 341 - case "semble": 342 342 - bookmarks, _ = h.db.GetSembleBookmarksByTag(tag, fetchLimit, 0) 343 343 - default: 344 344 - bookmarks, _ = h.db.GetBookmarksByTag(tag, fetchLimit, 0) 345 345 - } 346 346 - } 347 347 - collectionItems = []db.CollectionItem{} 348 348 - } 349 349 - } else if creator != "" { 350 350 - if motivation == "" || motivation == "commenting" { 351 351 - switch feedType { 352 352 - case "margin": 353 353 - annotations, _ = h.db.GetMarginAnnotationsByAuthor(creator, fetchLimit, 0) 354 354 - case "semble": 355 355 - annotations, _ = h.db.GetSembleAnnotationsByAuthor(creator, fetchLimit, 0) 356 356 - default: 357 357 - annotations, _ = h.db.GetAnnotationsByAuthor(creator, fetchLimit, 0) 358 358 - } 359 359 - } 360 360 - if motivation == "" || motivation == "highlighting" { 361 361 - switch feedType { 362 362 - case "margin": 363 363 - highlights, _ = h.db.GetMarginHighlightsByAuthor(creator, fetchLimit, 0) 364 364 - case "semble": 365 365 - highlights, _ = h.db.GetSembleHighlightsByAuthor(creator, fetchLimit, 0) 366 366 - default: 367 367 - highlights, _ = h.db.GetHighlightsByAuthor(creator, fetchLimit, 0) 368 368 - } 369 369 - } 370 370 - if motivation == "" || motivation == "bookmarking" { 371 371 - switch feedType { 372 372 - case "margin": 373 373 - bookmarks, _ = h.db.GetMarginBookmarksByAuthor(creator, fetchLimit, 0) 374 374 - case "semble": 375 375 - bookmarks, _ = h.db.GetSembleBookmarksByAuthor(creator, fetchLimit, 0) 376 376 - default: 377 377 - bookmarks, _ = h.db.GetBookmarksByAuthor(creator, fetchLimit, 0) 378 378 - } 379 379 - } 380 380 - collectionItems = []db.CollectionItem{} 381 381 - } else { 382 382 - typeLim := fetchLimit 383 383 - if motivation == "" { 384 384 - typeLim = perTypeFetchLimit 385 385 - } 386 386 - if motivation == "" || motivation == "commenting" { 387 387 - switch feedType { 388 388 - case "margin": 389 389 - annotations, _ = h.db.GetMarginAnnotations(typeLim, 0) 390 390 - case "semble": 391 391 - annotations, _ = h.db.GetSembleAnnotations(typeLim, 0) 392 392 - case "popular": 393 393 - annotations, _ = h.db.GetPopularAnnotations(typeLim, 0) 394 394 - case "shelved": 395 395 - annotations, _ = h.db.GetShelvedAnnotations(typeLim, 0) 396 396 - default: 397 397 - annotations, _ = h.db.GetRecentAnnotations(typeLim, 0) 398 398 - } 399 399 - } 400 400 - if motivation == "" || motivation == "highlighting" { 401 401 - switch feedType { 402 402 - case "margin": 403 403 - highlights, _ = h.db.GetMarginHighlights(typeLim, 0) 404 404 - case "semble": 405 405 - highlights, _ = h.db.GetSembleHighlights(typeLim, 0) 406 406 - case "popular": 407 407 - highlights, _ = h.db.GetPopularHighlights(typeLim, 0) 408 408 - case "shelved": 409 409 - highlights, _ = h.db.GetShelvedHighlights(typeLim, 0) 410 410 - default: 411 411 - highlights, _ = h.db.GetRecentHighlights(typeLim, 0) 412 412 - } 413 413 - } 414 414 - if motivation == "" || motivation == "bookmarking" { 415 415 - switch feedType { 416 416 - case "margin": 417 417 - bookmarks, _ = h.db.GetMarginBookmarks(typeLim, 0) 418 418 - case "semble": 419 419 - bookmarks, _ = h.db.GetSembleBookmarks(typeLim, 0) 420 420 - case "popular": 421 421 - bookmarks, _ = h.db.GetPopularBookmarks(typeLim, 0) 422 422 - case "shelved": 423 423 - bookmarks, _ = h.db.GetShelvedBookmarks(typeLim, 0) 424 424 - default: 425 425 - bookmarks, _ = h.db.GetRecentBookmarks(typeLim, 0) 426 426 - } 427 427 - } 428 428 - if motivation == "" { 429 429 - switch feedType { 430 430 - case "popular": 431 431 - collectionItems, err = h.db.GetPopularCollectionItems(typeLim, 0) 432 432 - case "shelved": 433 433 - collectionItems, err = h.db.GetShelvedCollectionItems(typeLim, 0) 434 434 - default: 435 435 - collectionItems, err = h.db.GetRecentCollectionItems(typeLim, 0) 436 436 - } 437 437 - if err != nil { 438 438 - logger.Error("Error fetching collection items: %v", err) 439 439 - } 334 334 + func notesByMotivation(notes []service.APINote) (annotations, highlights, bookmarks []service.APINote) { 335 335 + annotations = []service.APINote{} 336 336 + highlights = []service.APINote{} 337 337 + bookmarks = []service.APINote{} 338 338 + for _, n := range notes { 339 339 + switch n.Motivation { 340 340 + case "highlighting": 341 341 + highlights = append(highlights, n) 342 342 + case "bookmarking": 343 343 + bookmarks = append(bookmarks, n) 344 344 + default: 345 345 + annotations = append(annotations, n) 440 346 } 441 347 } 348 348 + return 349 349 + } 442 350 443 443 - allDIDs := make(map[string]bool) 444 444 - for _, a := range annotations { 445 445 - allDIDs[a.AuthorDID] = true 446 446 - } 447 447 - for _, h := range highlights { 448 448 - allDIDs[h.AuthorDID] = true 449 449 - } 450 450 - for _, b := range bookmarks { 451 451 - allDIDs[b.AuthorDID] = true 452 452 - } 453 453 - for _, ci := range collectionItems { 454 454 - allDIDs[ci.AuthorDID] = true 455 455 - } 456 456 - didSlice := make([]string, 0, len(allDIDs)) 457 457 - for did := range allDIDs { 458 458 - didSlice = append(didSlice, did) 459 459 - } 460 460 - profiles := fetchProfilesForDIDs(h.db, didSlice) 461 461 - shared := &hydrationData{profiles: profiles} 462 462 - 463 463 - var ( 464 464 - authAnnos []APIAnnotation 465 465 - authHighs []APIHighlight 466 466 - authBooks []APIBookmark 467 467 - authCollectionItems []APICollectionItem 468 468 - wg sync.WaitGroup 469 469 - ) 470 470 - 471 471 - wg.Add(3) 472 472 - go func() { 473 473 - defer wg.Done() 474 474 - authAnnos, _ = hydrateAnnotationsWithData(h.db, annotations, viewerDID, shared) 475 475 - }() 476 476 - go func() { 477 477 - defer wg.Done() 478 478 - authHighs, _ = hydrateHighlightsWithData(h.db, highlights, viewerDID, shared) 479 479 - }() 480 480 - go func() { 481 481 - defer wg.Done() 482 482 - authBooks, _ = hydrateBookmarksWithData(h.db, bookmarks, viewerDID, shared) 483 483 - }() 484 484 - 485 485 - if len(collectionItems) > 0 { 486 486 - var sembleURIs []string 487 487 - for _, item := range collectionItems { 488 488 - if strings.Contains(item.AnnotationURI, "network.cosmik.card") { 489 489 - sembleURIs = append(sembleURIs, item.AnnotationURI) 490 490 - } 491 491 - } 492 492 - if len(sembleURIs) > 0 { 493 493 - ctx, cancel := context.WithTimeout(r.Context(), 2*time.Second) 494 494 - defer cancel() 495 495 - ensureSembleCardsIndexed(ctx, h.db, sembleURIs) 351 351 + func mergeNotes(a, b []db.Note) []db.Note { 352 352 + seen := make(map[string]bool, len(a)) 353 353 + result := make([]db.Note, 0, len(a)+len(b)) 354 354 + for _, n := range a { 355 355 + if !seen[n.URI] { 356 356 + seen[n.URI] = true 357 357 + result = append(result, n) 496 358 } 497 497 - wg.Add(1) 498 498 - go func() { 499 499 - defer wg.Done() 500 500 - authCollectionItems, _ = hydrateCollectionItemsWithData(h.db, collectionItems, viewerDID, shared) 501 501 - }() 502 359 } 503 503 - 504 504 - wg.Wait() 505 505 - 506 506 - collectionItemURIs := make(map[string]string) 507 507 - for _, ci := range authCollectionItems { 508 508 - var annotationURI string 509 509 - if ci.Annotation != nil { 510 510 - annotationURI = ci.Annotation.ID 511 511 - } else if ci.Highlight != nil { 512 512 - annotationURI = ci.Highlight.ID 513 513 - } else if ci.Bookmark != nil { 514 514 - annotationURI = ci.Bookmark.ID 515 515 - } 516 516 - if annotationURI != "" { 517 517 - collectionItemURIs[annotationURI] = ci.Author.DID 360 360 + for _, n := range b { 361 361 + if !seen[n.URI] { 362 362 + seen[n.URI] = true 363 363 + result = append(result, n) 518 364 } 519 365 } 520 520 - 521 521 - var feed []interface{} 522 522 - for _, a := range authAnnos { 523 523 - if addedBy, exists := collectionItemURIs[a.ID]; exists && addedBy == a.Author.DID { 524 524 - continue 525 525 - } 526 526 - feed = append(feed, a) 527 527 - } 528 528 - for _, h := range authHighs { 529 529 - if addedBy, exists := collectionItemURIs[h.ID]; exists && addedBy == h.Author.DID { 530 530 - continue 531 531 - } 532 532 - feed = append(feed, h) 533 533 - } 534 534 - for _, b := range authBooks { 535 535 - if addedBy, exists := collectionItemURIs[b.ID]; exists && addedBy == b.Author.DID { 536 536 - continue 537 537 - } 538 538 - feed = append(feed, b) 539 539 - } 540 540 - for _, ci := range authCollectionItems { 541 541 - feed = append(feed, ci) 542 542 - } 543 543 - 544 544 - if feedType != "" && feedType != "all" && feedType != "my-feed" { 545 545 - var filtered []interface{} 546 546 - for _, item := range feed { 547 547 - isSemble := false 548 548 - var uri string 549 549 - switch v := item.(type) { 550 550 - case APIAnnotation: 551 551 - uri = v.ID 552 552 - case APIHighlight: 553 553 - uri = v.ID 554 554 - case APIBookmark: 555 555 - uri = v.ID 556 556 - case APICollectionItem: 557 557 - if v.Annotation != nil { 558 558 - uri = v.Annotation.ID 559 559 - } else if v.Highlight != nil { 560 560 - uri = v.Highlight.ID 561 561 - } else if v.Bookmark != nil { 562 562 - uri = v.Bookmark.ID 563 563 - } else { 564 564 - uri = v.ID 565 565 - } 566 566 - } 567 567 - if strings.Contains(uri, "network.cosmik") { 568 568 - isSemble = true 569 569 - } 570 570 - 571 571 - switch feedType { 572 572 - case "semble": 573 573 - if isSemble { 574 574 - filtered = append(filtered, item) 575 575 - } 576 576 - case "margin": 577 577 - if !isSemble { 578 578 - filtered = append(filtered, item) 579 579 - } 580 580 - case "popular", "shelved": 581 581 - filtered = append(filtered, item) 582 582 - } 583 583 - } 584 584 - feed = filtered 585 585 - } 586 586 - 587 587 - feed = h.filterFeedByModeration(feed, viewerDID) 366 366 + return result 367 367 + } 588 368 589 589 - switch feedType { 590 590 - case "popular": 591 591 - sortFeedByPopularity(feed) 592 592 - default: 593 593 - sortFeed(feed) 594 594 - } 369 369 + func (h *Handler) GetFeed(w http.ResponseWriter, r *http.Request) { 370 370 + limit := parseIntParam(r, "limit", 50) 371 371 + offset := parseIntParam(r, "offset", 0) 372 372 + tag := strings.ToLower(r.URL.Query().Get("tag")) 373 373 + creator := r.URL.Query().Get("creator") 374 374 + motivation := r.URL.Query().Get("motivation") 375 375 + feedTypeStr := r.URL.Query().Get("type") 595 376 596 596 - logger.Info("[DEBUG] FeedType: %s, Total Items before slice: %d", feedType, len(feed)) 597 597 - if len(feed) > 0 { 598 598 - first := feed[0] 599 599 - switch v := first.(type) { 600 600 - case APIAnnotation: 601 601 - logger.Info("[DEBUG] First Item (Annotation): %s, Likes: %d, Replies: %d", v.ID, v.LikeCount, v.ReplyCount) 602 602 - case APIHighlight: 603 603 - logger.Info("[DEBUG] First Item (Highlight): %s, Likes: %d, Replies: %d", v.ID, v.LikeCount, v.ReplyCount) 604 604 - } 377 377 + var motivations []string 378 378 + if motivation != "" { 379 379 + motivations = []string{motivation} 605 380 } 606 381 607 607 - if offset < len(feed) { 608 608 - feed = feed[offset:] 609 609 - } else { 610 610 - feed = []interface{}{} 382 382 + req := service.FeedRequest{ 383 383 + ViewerDID: h.getViewerDID(r), 384 384 + Motivations: motivations, 385 385 + AuthorDID: creator, 386 386 + Tag: tag, 387 387 + FeedType: parseFeedType(feedTypeStr), 388 388 + Limit: limit, 389 389 + Offset: offset, 611 390 } 612 391 613 613 - if len(feed) > limit { 614 614 - feed = feed[:limit] 392 392 + resp, err := h.feedSvc.GetFeed(r.Context(), req) 393 393 + if err != nil { 394 394 + WriteInternalError(w, "Internal server error") 395 395 + return 615 396 } 616 397 617 398 WriteSuccess(w, map[string]interface{}{ 618 399 "@context": "http://www.w3.org/ns/anno.jsonld", 619 400 "type": "Collection", 620 620 - "items": feed, 621 621 - "totalItems": len(feed), 622 622 - }) 623 623 - } 624 624 - 625 625 - func sortFeed(feed []interface{}) { 626 626 - sort.Slice(feed, func(i, j int) bool { 627 627 - t1 := getCreatedAt(feed[i]) 628 628 - t2 := getCreatedAt(feed[j]) 629 629 - return t1.After(t2) 401 401 + "items": resp.Items, 402 402 + "totalItems": resp.TotalItems, 630 403 }) 631 404 } 632 632 - 633 633 - func getCreatedAt(item interface{}) time.Time { 634 634 - switch v := item.(type) { 635 635 - case APIAnnotation: 636 636 - return v.CreatedAt 637 637 - case APIHighlight: 638 638 - return v.CreatedAt 639 639 - case APIBookmark: 640 640 - return v.CreatedAt 641 641 - case APICollectionItem: 642 642 - return v.CreatedAt 643 643 - default: 644 644 - return time.Time{} 645 645 - } 646 646 - } 647 647 - 648 648 - func sortFeedByPopularity(feed []interface{}) { 649 649 - sort.Slice(feed, func(i, j int) bool { 650 650 - p1 := getPopularity(feed[i]) 651 651 - p2 := getPopularity(feed[j]) 652 652 - if p1 != p2 { 653 653 - return p1 > p2 654 654 - } 655 655 - t1 := getCreatedAt(feed[i]) 656 656 - t2 := getCreatedAt(feed[j]) 657 657 - return t1.After(t2) 658 658 - }) 659 659 - } 660 660 - 661 661 - func getPopularity(item interface{}) int { 662 662 - switch v := item.(type) { 663 663 - case APIAnnotation: 664 664 - return v.LikeCount + v.ReplyCount 665 665 - case APIHighlight: 666 666 - return v.LikeCount + v.ReplyCount 667 667 - case APIBookmark: 668 668 - return v.LikeCount + v.ReplyCount 669 669 - case APICollectionItem: 670 670 - pop := 0 671 671 - if v.Annotation != nil { 672 672 - pop += v.Annotation.LikeCount + v.Annotation.ReplyCount 673 673 - } 674 674 - if v.Highlight != nil { 675 675 - pop += v.Highlight.LikeCount + v.Highlight.ReplyCount 676 676 - } 677 677 - if v.Bookmark != nil { 678 678 - pop += v.Bookmark.LikeCount + v.Bookmark.ReplyCount 679 679 - } 680 680 - return pop 681 681 - default: 682 682 - return 0 683 683 - } 684 684 - } 685 685 - 686 405 func (h *Handler) GetAnnotation(w http.ResponseWriter, r *http.Request) { 687 406 uri := r.URL.Query().Get("uri") 688 407 if uri == "" { ··· 690 409 return 691 410 } 692 411 693 693 - serveResponse := func(data interface{}, context string) { 694 694 - w.Header().Set("Content-Type", "application/json") 695 695 - response := map[string]interface{}{ 696 696 - "@context": context, 697 697 - } 698 698 - jsonData, _ := json.Marshal(data) 699 699 - json.Unmarshal(jsonData, &response) 700 700 - json.NewEncoder(w).Encode(response) 412 412 + note, err := h.noteRepo.GetByURI(r.Context(), uri) 413 413 + if err != nil { 414 414 + WriteInternalError(w, "Internal server error") 415 415 + return 701 416 } 702 417 703 703 - if annotation, err := h.db.GetAnnotationByURI(uri); err == nil { 704 704 - if annotation.CID == nil || *annotation.CID == "" { 705 705 - parts := parseATURI(uri) 706 706 - if len(parts) >= 3 { 707 707 - did := parts[0] 708 708 - collection := parts[1] 709 709 - rkey := parts[2] 710 710 - 711 711 - session, err := h.refresher.GetSessionWithAutoRefresh(r) 712 712 - if err == nil { 713 713 - _ = h.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, _ string) error { 714 714 - record, getErr := client.GetRecord(r.Context(), did, collection, rkey) 715 715 - if getErr == nil { 716 716 - h.db.UpdateAnnotation(uri, *annotation.BodyValue, *annotation.TagsJSON, record.CID) 717 717 - cid := record.CID 718 718 - annotation.CID = &cid 719 719 - } 720 720 - return nil 721 721 - }) 722 722 - } 723 723 - } 724 724 - } 725 725 - 726 726 - if enriched, _ := hydrateAnnotations(h.db, []db.Annotation{*annotation}, h.getViewerDID(r)); len(enriched) > 0 { 727 727 - serveResponse(enriched[0], "http://www.w3.org/ns/anno.jsonld") 728 728 - return 729 729 - } 418 418 + if note == nil && strings.Contains(uri, "at.margin.annotation") { 419 419 + altURI := strings.Replace(uri, "at.margin.annotation", "at.margin.highlight", 1) 420 420 + note, _ = h.noteRepo.GetByURI(r.Context(), altURI) 730 421 } 731 422 732 732 - if highlight, err := h.db.GetHighlightByURI(uri); err == nil { 733 733 - if highlight.CID == nil || *highlight.CID == "" { 734 734 - parts := parseATURI(uri) 735 735 - if len(parts) >= 3 { 736 736 - did := parts[0] 737 737 - collection := parts[1] 738 738 - rkey := parts[2] 739 739 - 740 740 - session, err := h.refresher.GetSessionWithAutoRefresh(r) 741 741 - if err == nil { 742 742 - _ = h.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, _ string) error { 743 743 - record, getErr := client.GetRecord(r.Context(), did, collection, rkey) 744 744 - if getErr == nil { 745 745 - tagsJSON := "" 746 746 - if highlight.TagsJSON != nil { 747 747 - tagsJSON = *highlight.TagsJSON 748 748 - } 749 749 - color := "" 750 750 - if highlight.Color != nil { 751 751 - color = *highlight.Color 752 752 - } 753 753 - h.db.UpdateHighlight(uri, color, tagsJSON, record.CID) 754 754 - cid := record.CID 755 755 - highlight.CID = &cid 756 756 - } 757 757 - return nil 758 758 - }) 759 759 - } 760 760 - } 761 761 - } 762 762 - 763 763 - if enriched, _ := hydrateHighlights(h.db, []db.Highlight{*highlight}, h.getViewerDID(r)); len(enriched) > 0 { 764 764 - serveResponse(enriched[0], "http://www.w3.org/ns/anno.jsonld") 765 765 - return 423 423 + if note == nil && strings.HasPrefix(uri, "at://") && 424 424 + (strings.Contains(uri, "at.margin.annotation") || strings.Contains(uri, "at.margin.bookmark")) { 425 425 + parts := strings.Split(strings.TrimPrefix(uri, "at://"), "/") 426 426 + if len(parts) >= 3 { 427 427 + sembleURI := fmt.Sprintf("at://%s/network.cosmik.card/%s", parts[0], parts[len(parts)-1]) 428 428 + note, _ = h.noteRepo.GetByURI(r.Context(), sembleURI) 766 429 } 767 430 } 768 431 769 769 - if strings.Contains(uri, "at.margin.annotation") { 770 770 - highlightURI := strings.Replace(uri, "at.margin.annotation", "at.margin.highlight", 1) 771 771 - if highlight, err := h.db.GetHighlightByURI(highlightURI); err == nil { 772 772 - if enriched, _ := hydrateHighlights(h.db, []db.Highlight{*highlight}, h.getViewerDID(r)); len(enriched) > 0 { 773 773 - serveResponse(enriched[0], "http://www.w3.org/ns/anno.jsonld") 774 774 - return 775 775 - } 776 776 - } 432 432 + if note == nil && strings.Contains(uri, "at.margin.annotation") { 433 433 + altURI := strings.Replace(uri, "at.margin.annotation", "at.margin.bookmark", 1) 434 434 + note, _ = h.noteRepo.GetByURI(r.Context(), altURI) 777 435 } 778 436 779 779 - if strings.Contains(uri, "at.margin.annotation") || strings.Contains(uri, "at.margin.bookmark") { 780 780 - if strings.HasPrefix(uri, "at://") { 781 781 - uriWithoutScheme := strings.TrimPrefix(uri, "at://") 782 782 - parts := strings.Split(uriWithoutScheme, "/") 783 783 - if len(parts) >= 3 { 784 784 - did := parts[0] 785 785 - rkey := parts[len(parts)-1] 786 786 - 787 787 - sembleURI := fmt.Sprintf("at://%s/network.cosmik.card/%s", did, rkey) 788 788 - 789 789 - if annotation, err := h.db.GetAnnotationByURI(sembleURI); err == nil { 790 790 - if enriched, _ := hydrateAnnotations(h.db, []db.Annotation{*annotation}, h.getViewerDID(r)); len(enriched) > 0 { 791 791 - serveResponse(enriched[0], "http://www.w3.org/ns/anno.jsonld") 792 792 - return 793 793 - } 794 794 - } 795 795 - 796 796 - if bookmark, err := h.db.GetBookmarkByURI(sembleURI); err == nil { 797 797 - if enriched, _ := hydrateBookmarks(h.db, []db.Bookmark{*bookmark}, h.getViewerDID(r)); len(enriched) > 0 { 798 798 - serveResponse(enriched[0], "http://www.w3.org/ns/anno.jsonld") 799 799 - return 800 800 - } 801 801 - } 802 802 - } 803 803 - } 437 437 + if note == nil { 438 438 + WriteNotFound(w, "Note not found") 439 439 + return 804 440 } 805 441 806 806 - if bookmark, err := h.db.GetBookmarkByURI(uri); err == nil { 807 807 - if bookmark.CID == nil || *bookmark.CID == "" { 808 808 - parts := parseATURI(uri) 809 809 - if len(parts) >= 3 { 810 810 - did := parts[0] 811 811 - collection := parts[1] 812 812 - rkey := parts[2] 813 813 - 814 814 - session, err := h.refresher.GetSessionWithAutoRefresh(r) 815 815 - if err == nil { 816 816 - _ = h.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, _ string) error { 817 817 - record, getErr := client.GetRecord(r.Context(), did, collection, rkey) 818 818 - if getErr == nil { 819 819 - tagsJSON := "" 820 820 - if bookmark.TagsJSON != nil { 821 821 - tagsJSON = *bookmark.TagsJSON 822 822 - } 823 823 - title := "" 824 824 - if bookmark.Title != nil { 825 825 - title = *bookmark.Title 826 826 - } 827 827 - desc := "" 828 828 - if bookmark.Description != nil { 829 829 - desc = *bookmark.Description 830 830 - } 831 831 - h.db.UpdateBookmark(uri, title, desc, tagsJSON, record.CID) 832 832 - cid := record.CID 833 833 - bookmark.CID = &cid 834 834 - } 835 835 - return nil 836 836 - }) 837 837 - } 838 838 - } 839 839 - } 840 840 - 841 841 - if enriched, _ := hydrateBookmarks(h.db, []db.Bookmark{*bookmark}, h.getViewerDID(r)); len(enriched) > 0 { 842 842 - serveResponse(enriched[0], "http://www.w3.org/ns/anno.jsonld") 843 843 - return 844 844 - } 845 845 - } 846 846 - 847 847 - if strings.Contains(uri, "at.margin.annotation") { 848 848 - bookmarkURI := strings.Replace(uri, "at.margin.annotation", "at.margin.bookmark", 1) 849 849 - if bookmark, err := h.db.GetBookmarkByURI(bookmarkURI); err == nil { 850 850 - if enriched, _ := hydrateBookmarks(h.db, []db.Bookmark{*bookmark}, h.getViewerDID(r)); len(enriched) > 0 { 851 851 - serveResponse(enriched[0], "http://www.w3.org/ns/anno.jsonld") 852 852 - return 853 853 - } 854 854 - } 855 855 - } 442 442 + lc, _ := h.hydration.Load(r.Context(), []db.Note{*note}, h.getViewerDID(r)) 443 443 + apiNote := h.hydration.ToAPINote(*note, lc) 856 444 857 857 - WriteNotFound(w, "Annotation, Highlight, or Bookmark not found") 858 858 - 445 445 + w.Header().Set("Content-Type", "application/json") 446 446 + response := map[string]interface{}{"@context": "http://www.w3.org/ns/anno.jsonld"} 447 447 + jsonData, _ := json.Marshal(apiNote) 448 448 + json.Unmarshal(jsonData, &response) 449 449 + json.NewEncoder(w).Encode(response) 859 450 } 860 451 861 452 func (h *Handler) GetByTarget(w http.ResponseWriter, r *http.Request) { ··· 874 465 urlHash := db.HashURL(source) 875 466 rawHash := db.HashString(source) 876 467 877 877 - annotations, _ := h.db.GetAnnotationsByTargetHash(urlHash, limit, offset) 878 878 - highlights, _ := h.db.GetHighlightsByTargetHash(urlHash, limit, offset) 879 879 - bookmarks, _ := h.db.GetBookmarksByTargetHash(urlHash, limit, offset) 880 880 - 468 468 + notes, err := h.noteRepo.List(r.Context(), db.NoteFilter{TargetHash: urlHash, Limit: limit, Offset: offset}) 469 469 + if err != nil { 470 470 + WriteInternalError(w, "Internal server error") 471 471 + return 472 472 + } 881 473 if rawHash != urlHash { 882 882 - rawAnnotations, _ := h.db.GetAnnotationsByTargetHash(rawHash, limit, offset) 883 883 - rawHighlights, _ := h.db.GetHighlightsByTargetHash(rawHash, limit, offset) 884 884 - rawBookmarks, _ := h.db.GetBookmarksByTargetHash(rawHash, limit, offset) 885 885 - 886 886 - annotations = mergeAnnotations(annotations, rawAnnotations) 887 887 - highlights = mergeHighlights(highlights, rawHighlights) 888 888 - bookmarks = mergeBookmarks(bookmarks, rawBookmarks) 474 474 + rawNotes, _ := h.noteRepo.List(r.Context(), db.NoteFilter{TargetHash: rawHash, Limit: limit, Offset: offset}) 475 475 + notes = mergeNotes(notes, rawNotes) 889 476 } 890 477 891 891 - enrichedAnnotations, _ := hydrateAnnotations(h.db, annotations, h.getViewerDID(r)) 892 892 - enrichedHighlights, _ := hydrateHighlights(h.db, highlights, h.getViewerDID(r)) 893 893 - enrichedBookmarks, _ := hydrateBookmarks(h.db, bookmarks, h.getViewerDID(r)) 894 894 - 895 895 - totalItems := len(enrichedAnnotations) + len(enrichedHighlights) + len(enrichedBookmarks) 478 478 + lc, _ := h.hydration.Load(r.Context(), notes, h.getViewerDID(r)) 479 479 + items := make([]service.APINote, len(notes)) 480 480 + for i, n := range notes { 481 481 + items[i] = h.hydration.ToAPINote(n, lc) 482 482 + } 483 483 + annotations, highlights, bookmarks := notesByMotivation(items) 896 484 897 897 - if totalItems == 0 { 485 485 + if len(items) == 0 { 898 486 w.Header().Set("Cache-Control", "public, max-age=60, s-maxage=300") 899 487 } else { 900 488 w.Header().Set("Cache-Control", "private, max-age=0, no-store") ··· 904 492 "@context": "http://www.w3.org/ns/anno.jsonld", 905 493 "source": source, 906 494 "sourceHash": urlHash, 907 907 - "annotations": enrichedAnnotations, 908 908 - "highlights": enrichedHighlights, 909 909 - "bookmarks": enrichedBookmarks, 495 495 + "annotations": annotations, 496 496 + "highlights": highlights, 497 497 + "bookmarks": bookmarks, 498 498 + }) 499 499 + } 500 500 + 501 501 + func (h *Handler) GetByTargetHash(w http.ResponseWriter, r *http.Request) { 502 502 + hashes := r.URL.Query()["h"] 503 503 + if len(hashes) == 0 { 504 504 + WriteBadRequest(w, "at least one hash parameter (h) required") 505 505 + return 506 506 + } 507 507 + 508 508 + limit := parseIntParam(r, "limit", 50) 509 509 + offset := parseIntParam(r, "offset", 0) 510 510 + 511 511 + var notes []db.Note 512 512 + for _, hash := range hashes { 513 513 + if len(hash) != 64 { 514 514 + continue 515 515 + } 516 516 + hashNotes, _ := h.noteRepo.List(r.Context(), db.NoteFilter{TargetHash: hash, Limit: limit, Offset: offset}) 517 517 + notes = mergeNotes(notes, hashNotes) 518 518 + } 519 519 + 520 520 + lc, _ := h.hydration.Load(r.Context(), notes, h.getViewerDID(r)) 521 521 + items := make([]service.APINote, len(notes)) 522 522 + for i, n := range notes { 523 523 + items[i] = h.hydration.ToAPINote(n, lc) 524 524 + } 525 525 + annotations, highlights, bookmarks := notesByMotivation(items) 526 526 + 527 527 + if len(items) == 0 { 528 528 + w.Header().Set("Cache-Control", "public, max-age=60, s-maxage=300") 529 529 + } else { 530 530 + w.Header().Set("Cache-Control", "private, max-age=0, no-store") 531 531 + } 532 532 + 533 533 + WriteSuccess(w, map[string]interface{}{ 534 534 + "@context": "http://www.w3.org/ns/anno.jsonld", 535 535 + "annotations": annotations, 536 536 + "highlights": highlights, 537 537 + "bookmarks": bookmarks, 910 538 }) 911 539 } 912 540 ··· 1020 648 limit := parseIntParam(r, "limit", 50) 1021 649 offset := parseIntParam(r, "offset", 0) 1022 650 1023 1023 - var highlights []db.Highlight 1024 1024 - var err error 1025 1025 - 651 651 + filter := db.NoteFilter{Motivations: []string{"highlighting"}, Limit: limit, Offset: offset} 1026 652 if did != "" { 1027 1027 - highlights, err = h.db.GetHighlightsByAuthor(did, limit, offset) 1028 1028 - } else if tag != "" { 1029 1029 - highlights, err = h.db.GetHighlightsByTag(tag, limit, offset) 1030 1030 - } else { 1031 1031 - highlights, err = h.db.GetRecentHighlights(limit, offset) 653 653 + filter.AuthorDID = did 654 654 + } 655 655 + if tag != "" { 656 656 + filter.Tag = tag 1032 657 } 1033 658 659 659 + notes, err := h.noteRepo.List(r.Context(), filter) 1034 660 if err != nil { 1035 661 WriteInternalError(w, "Internal server error") 1036 662 return 1037 663 } 1038 664 1039 1039 - enriched, _ := hydrateHighlights(h.db, highlights, h.getViewerDID(r)) 665 665 + lc, _ := h.hydration.Load(r.Context(), notes, h.getViewerDID(r)) 666 666 + items := make([]service.APINote, len(notes)) 667 667 + for i, n := range notes { 668 668 + items[i] = h.hydration.ToAPINote(n, lc) 669 669 + } 1040 670 1041 671 WriteSuccess(w, map[string]interface{}{ 1042 672 "@context": "http://www.w3.org/ns/anno.jsonld", 1043 673 "type": "HighlightCollection", 1044 1044 - "items": enriched, 1045 1045 - "totalItems": len(enriched), 674 674 + "items": items, 675 675 + "totalItems": len(items), 1046 676 }) 1047 677 } 1048 678 ··· 1056 686 return 1057 687 } 1058 688 1059 1059 - bookmarks, err := h.db.GetBookmarksByAuthor(did, limit, offset) 689 689 + notes, err := h.noteRepo.List(r.Context(), db.NoteFilter{ 690 690 + Motivations: []string{"bookmarking"}, 691 691 + AuthorDID: did, 692 692 + Limit: limit, 693 693 + Offset: offset, 694 694 + }) 1060 695 if err != nil { 1061 696 WriteInternalError(w, "Internal server error") 1062 697 return 1063 698 } 1064 699 1065 1065 - enriched, _ := hydrateBookmarks(h.db, bookmarks, h.getViewerDID(r)) 700 700 + lc, _ := h.hydration.Load(r.Context(), notes, h.getViewerDID(r)) 701 701 + items := make([]service.APINote, len(notes)) 702 702 + for i, n := range notes { 703 703 + items[i] = h.hydration.ToAPINote(n, lc) 704 704 + } 1066 705 1067 706 WriteSuccess(w, map[string]interface{}{ 1068 707 "@context": "http://www.w3.org/ns/anno.jsonld", 1069 708 "type": "BookmarkCollection", 1070 1070 - "items": enriched, 1071 1071 - "totalItems": len(enriched), 709 709 + "items": items, 710 710 + "totalItems": len(items), 1072 711 }) 1073 712 } 1074 713 ··· 1079 718 } 1080 719 limit := parseIntParam(r, "limit", 50) 1081 720 offset := parseIntParam(r, "offset", 0) 1082 1082 - 1083 1083 - var annotations []db.Annotation 1084 1084 - var err error 1085 1085 - 1086 721 viewerDID := h.getViewerDID(r) 1087 722 1088 723 if offset == 0 && viewerDID != "" && did == viewerDID { ··· 1093 728 }() 1094 729 } 1095 730 1096 1096 - annotations, err = h.db.GetAnnotationsByAuthor(did, limit, offset) 1097 1097 - 731 731 + notes, err := h.noteRepo.List(r.Context(), db.NoteFilter{ 732 732 + AuthorDID: did, 733 733 + Motivations: []string{"commenting"}, 734 734 + Limit: limit, 735 735 + Offset: offset, 736 736 + }) 1098 737 if err != nil { 1099 738 WriteInternalError(w, "Internal server error") 1100 739 return 1101 740 } 1102 741 1103 1103 - enriched, _ := hydrateAnnotations(h.db, annotations, h.getViewerDID(r)) 742 742 + lc, _ := h.hydration.Load(r.Context(), notes, viewerDID) 743 743 + items := make([]service.APINote, len(notes)) 744 744 + for i, n := range notes { 745 745 + items[i] = h.hydration.ToAPINote(n, lc) 746 746 + } 1104 747 1105 748 WriteSuccess(w, map[string]interface{}{ 1106 749 "@context": "http://www.w3.org/ns/anno.jsonld", 1107 750 "type": "AnnotationCollection", 1108 751 "creator": did, 1109 1109 - "items": enriched, 1110 1110 - "totalItems": len(enriched), 752 752 + "items": items, 753 753 + "totalItems": len(items), 1111 754 }) 1112 755 } 1113 756 ··· 1118 761 } 1119 762 limit := parseIntParam(r, "limit", 50) 1120 763 offset := parseIntParam(r, "offset", 0) 1121 1121 - 1122 1122 - var highlights []db.Highlight 1123 1123 - var err error 1124 1124 - 1125 764 viewerDID := h.getViewerDID(r) 1126 765 1127 766 if offset == 0 && viewerDID != "" && did == viewerDID { ··· 1132 771 }() 1133 772 } 1134 773 1135 1135 - highlights, err = h.db.GetHighlightsByAuthor(did, limit, offset) 1136 1136 - 774 774 + notes, err := h.noteRepo.List(r.Context(), db.NoteFilter{ 775 775 + AuthorDID: did, 776 776 + Motivations: []string{"highlighting"}, 777 777 + Limit: limit, 778 778 + Offset: offset, 779 779 + }) 1137 780 if err != nil { 1138 781 WriteInternalError(w, "Internal server error") 1139 782 return 1140 783 } 1141 784 1142 1142 - enriched, _ := hydrateHighlights(h.db, highlights, h.getViewerDID(r)) 785 785 + lc, _ := h.hydration.Load(r.Context(), notes, viewerDID) 786 786 + items := make([]service.APINote, len(notes)) 787 787 + for i, n := range notes { 788 788 + items[i] = h.hydration.ToAPINote(n, lc) 789 789 + } 1143 790 1144 791 WriteSuccess(w, map[string]interface{}{ 1145 792 "@context": "http://www.w3.org/ns/anno.jsonld", 1146 793 "type": "HighlightCollection", 1147 794 "creator": did, 1148 1148 - "items": enriched, 1149 1149 - "totalItems": len(enriched), 795 795 + "items": items, 796 796 + "totalItems": len(items), 1150 797 }) 1151 798 } 1152 799 ··· 1157 804 } 1158 805 limit := parseIntParam(r, "limit", 50) 1159 806 offset := parseIntParam(r, "offset", 0) 1160 1160 - 1161 1161 - var bookmarks []db.Bookmark 1162 1162 - var err error 1163 1163 - 1164 807 viewerDID := h.getViewerDID(r) 1165 808 1166 809 if offset == 0 && viewerDID != "" && did == viewerDID { ··· 1171 814 }() 1172 815 } 1173 816 1174 1174 - bookmarks, err = h.db.GetBookmarksByAuthor(did, limit, offset) 1175 1175 - 817 817 + notes, err := h.noteRepo.List(r.Context(), db.NoteFilter{ 818 818 + AuthorDID: did, 819 819 + Motivations: []string{"bookmarking"}, 820 820 + Limit: limit, 821 821 + Offset: offset, 822 822 + }) 1176 823 if err != nil { 1177 824 WriteInternalError(w, "Internal server error") 1178 825 return 1179 826 } 1180 827 1181 1181 - enriched, _ := hydrateBookmarks(h.db, bookmarks, h.getViewerDID(r)) 828 828 + lc, _ := h.hydration.Load(r.Context(), notes, viewerDID) 829 829 + items := make([]service.APINote, len(notes)) 830 830 + for i, n := range notes { 831 831 + items[i] = h.hydration.ToAPINote(n, lc) 832 832 + } 1182 833 1183 834 WriteSuccess(w, map[string]interface{}{ 1184 835 "@context": "http://www.w3.org/ns/anno.jsonld", 1185 836 "type": "BookmarkCollection", 1186 837 "creator": did, 1187 1187 - "items": enriched, 1188 1188 - "totalItems": len(enriched), 838 838 + "items": items, 839 839 + "totalItems": len(items), 1189 840 }) 1190 841 } 1191 842 ··· 1209 860 1210 861 urlHash := db.HashURL(source) 1211 862 1212 1212 - annotations, _ := h.db.GetAnnotationsByAuthorAndTargetHash(did, urlHash, limit, offset) 1213 1213 - highlights, _ := h.db.GetHighlightsByAuthorAndTargetHash(did, urlHash, limit, offset) 863 863 + notes, err := h.noteRepo.List(r.Context(), db.NoteFilter{ 864 864 + AuthorDID: did, 865 865 + TargetHash: urlHash, 866 866 + Motivations: []string{"commenting", "highlighting"}, 867 867 + Limit: limit, 868 868 + Offset: offset, 869 869 + }) 870 870 + if err != nil { 871 871 + WriteInternalError(w, "Internal server error") 872 872 + return 873 873 + } 1214 874 1215 1215 - enrichedAnnotations, _ := hydrateAnnotations(h.db, annotations, h.getViewerDID(r)) 1216 1216 - enrichedHighlights, _ := hydrateHighlights(h.db, highlights, h.getViewerDID(r)) 875 875 + lc, _ := h.hydration.Load(r.Context(), notes, h.getViewerDID(r)) 876 876 + items := make([]service.APINote, len(notes)) 877 877 + for i, n := range notes { 878 878 + items[i] = h.hydration.ToAPINote(n, lc) 879 879 + } 880 880 + annotations, highlights, _ := notesByMotivation(items) 1217 881 1218 882 WriteSuccess(w, map[string]interface{}{ 1219 883 "@context": "http://www.w3.org/ns/anno.jsonld", 1220 884 "creator": did, 1221 885 "source": source, 1222 886 "sourceHash": urlHash, 1223 1223 - "annotations": enrichedAnnotations, 1224 1224 - "highlights": enrichedHighlights, 887 887 + "annotations": annotations, 888 888 + "highlights": highlights, 1225 889 }) 1226 890 } 1227 891 ··· 1256 920 return 1257 921 } 1258 922 1259 1259 - count, err := h.db.GetLikeCount(uri) 923 923 + count, err := h.engagementRepo.GetLikeCount(r.Context(), uri) 1260 924 if err != nil { 1261 925 WriteInternalError(w, "Internal server error") 1262 926 return ··· 1267 931 if err == nil && cookie != nil { 1268 932 session, err := h.refresher.GetSessionWithAutoRefresh(r) 1269 933 if err == nil { 1270 1270 - userLike, err := h.db.GetLikeByUserAndSubject(session.DID, uri) 934 934 + userLike, err := h.noteRepo.GetLikeByUserAndSubject(r.Context(), session.DID, uri) 1271 935 if err == nil && userLike != nil { 1272 936 liked = true 1273 937 } ··· 1523 1187 limit := parseIntParam(r, "limit", 50) 1524 1188 offset := parseIntParam(r, "offset", 0) 1525 1189 1526 1526 - notifications, err := h.db.GetNotifications(session.DID, limit, offset) 1190 1190 + notifications, err := h.notificationRepo.GetNotifications(r.Context(), session.DID, limit, offset) 1527 1191 if err != nil { 1528 1192 WriteInternalError(w, "Failed to get notifications") 1529 1193 return ··· 1549 1213 return 1550 1214 } 1551 1215 1552 1552 - count, err := h.db.GetUnreadNotificationCount(session.DID) 1216 1216 + count, err := h.notificationRepo.GetUnreadNotificationCount(r.Context(), session.DID) 1553 1217 if err != nil { 1554 1218 WriteInternalError(w, "Failed to get count") 1555 1219 return ··· 1565 1229 return 1566 1230 } 1567 1231 1568 1568 - if err := h.db.MarkNotificationsRead(session.DID); err != nil { 1232 1232 + if err := h.notificationRepo.MarkNotificationsRead(r.Context(), session.DID); err != nil { 1569 1233 WriteInternalError(w, "Failed to mark as read") 1570 1234 return 1571 1235 } ··· 1577 1241 if err != nil { 1578 1242 return "" 1579 1243 } 1580 1580 - did, _, _, _, _, err := h.db.GetSession(cookie.Value) 1244 1244 + did, _, _, _, _, err := h.sessionRepo.GetSession(r.Context(), cookie.Value) 1581 1245 if err != nil { 1582 1246 return "" 1583 1247 } 1584 1248 return did 1585 1249 } 1586 1250 1587 1587 - func getItemAuthorDID(item interface{}) string { 1588 1588 - switch v := item.(type) { 1589 1589 - case APIAnnotation: 1590 1590 - return v.Author.DID 1591 1591 - case APIHighlight: 1592 1592 - return v.Author.DID 1593 1593 - case APIBookmark: 1594 1594 - return v.Author.DID 1595 1595 - case APICollectionItem: 1596 1596 - return v.Author.DID 1597 1597 - default: 1598 1598 - return "" 1599 1599 - } 1251 1251 + type fullProfileRepository struct { 1252 1252 + db *db.DB 1600 1253 } 1601 1254 1602 1602 - func (h *Handler) filterFeedByModeration(feed []interface{}, viewerDID string) []interface{} { 1603 1603 - if viewerDID == "" { 1604 1604 - return feed 1605 1605 - } 1606 1606 - 1607 1607 - hiddenDIDs, err := h.db.GetAllHiddenDIDs(viewerDID) 1608 1608 - if err != nil || len(hiddenDIDs) == 0 { 1609 1609 - return feed 1610 1610 - } 1611 1611 - 1612 1612 - var filtered []interface{} 1613 1613 - for _, item := range feed { 1614 1614 - authorDID := getItemAuthorDID(item) 1615 1615 - if authorDID != "" && hiddenDIDs[authorDID] { 1616 1616 - continue 1255 1255 + func (r *fullProfileRepository) GetProfiles(_ context.Context, dids []string) (map[string]domain.Author, error) { 1256 1256 + raw := fetchProfilesForDIDs(r.db, dids) 1257 1257 + result := make(map[string]domain.Author, len(raw)) 1258 1258 + for did, a := range raw { 1259 1259 + result[did] = domain.Author{ 1260 1260 + DID: a.DID, 1261 1261 + Handle: a.Handle, 1262 1262 + DisplayName: a.DisplayName, 1263 1263 + Avatar: a.Avatar, 1617 1264 } 1618 1618 - filtered = append(filtered, item) 1619 1265 } 1620 1620 - return filtered 1266 1266 + return result, nil 1621 1267 } 1622 1268 1623 1623 - func mergeAnnotations(a, b []db.Annotation) []db.Annotation { 1624 1624 - seen := make(map[string]bool) 1625 1625 - var result []db.Annotation 1626 1626 - for _, item := range a { 1627 1627 - if !seen[item.URI] { 1628 1628 - seen[item.URI] = true 1629 1629 - result = append(result, item) 1630 1630 - } 1631 1631 - } 1632 1632 - for _, item := range b { 1633 1633 - if !seen[item.URI] { 1634 1634 - seen[item.URI] = true 1635 1635 - result = append(result, item) 1636 1636 - } 1637 1637 - } 1638 1638 - return result 1269 1269 + func (r *fullProfileRepository) GetProfile(_ context.Context, did string) (*domain.Profile, error) { 1270 1270 + return r.db.GetProfile(did) 1639 1271 } 1640 1272 1641 1641 - func mergeHighlights(a, b []db.Highlight) []db.Highlight { 1642 1642 - seen := make(map[string]bool) 1643 1643 - var result []db.Highlight 1644 1644 - for _, item := range a { 1645 1645 - if !seen[item.URI] { 1646 1646 - seen[item.URI] = true 1647 1647 - result = append(result, item) 1648 1648 - } 1649 1649 - } 1650 1650 - for _, item := range b { 1651 1651 - if !seen[item.URI] { 1652 1652 - seen[item.URI] = true 1653 1653 - result = append(result, item) 1654 1654 - } 1655 1655 - } 1656 1656 - return result 1657 1657 - } 1658 1658 - 1659 1659 - func mergeBookmarks(a, b []db.Bookmark) []db.Bookmark { 1660 1660 - seen := make(map[string]bool) 1661 1661 - var result []db.Bookmark 1662 1662 - for _, item := range a { 1663 1663 - if !seen[item.URI] { 1664 1664 - seen[item.URI] = true 1665 1665 - result = append(result, item) 1666 1666 - } 1667 1667 - } 1668 1668 - for _, item := range b { 1669 1669 - if !seen[item.URI] { 1670 1670 - seen[item.URI] = true 1671 1671 - result = append(result, item) 1672 1672 - } 1673 1673 - } 1674 1674 - return result 1273 1273 + func (r *fullProfileRepository) UpsertProfile(_ context.Context, p *domain.Profile) error { 1274 1274 + return r.db.UpsertProfile(p) 1675 1275 } 1676 1276 1677 1277 func (h *Handler) Search(w http.ResponseWriter, r *http.Request) { ··· 1684 1284 creator := r.URL.Query().Get("creator") 1685 1285 limit := parseIntParam(r, "limit", 50) 1686 1286 offset := parseIntParam(r, "offset", 0) 1687 1687 - viewerDID := h.getViewerDID(r) 1688 1287 1689 1689 - annotations, _ := h.db.SearchAnnotations(query, creator, limit, offset) 1690 1690 - highlights, _ := h.db.SearchHighlights(query, creator, limit, offset) 1691 1691 - bookmarks, _ := h.db.SearchBookmarks(query, creator, limit, offset) 1692 1692 - 1693 1693 - hydratedAnnotations, _ := hydrateAnnotations(h.db, annotations, viewerDID) 1694 1694 - hydratedHighlights, _ := hydrateHighlights(h.db, highlights, viewerDID) 1695 1695 - hydratedBookmarks, _ := hydrateBookmarks(h.db, bookmarks, viewerDID) 1696 1696 - 1697 1697 - var feed []interface{} 1698 1698 - for _, a := range hydratedAnnotations { 1699 1699 - feed = append(feed, a) 1700 1700 - } 1701 1701 - for _, hl := range hydratedHighlights { 1702 1702 - feed = append(feed, hl) 1288 1288 + filter := db.NoteFilter{Query: query, Limit: limit, Offset: offset} 1289 1289 + if creator != "" { 1290 1290 + filter.AuthorDID = creator 1703 1291 } 1704 1704 - for _, b := range hydratedBookmarks { 1705 1705 - feed = append(feed, b) 1292 1292 + 1293 1293 + notes, err := h.noteRepo.List(r.Context(), filter) 1294 1294 + if err != nil { 1295 1295 + WriteInternalError(w, "Internal server error") 1296 1296 + return 1706 1297 } 1707 1298 1708 1708 - sortFeed(feed) 1299 1299 + lc, _ := h.hydration.Load(r.Context(), notes, h.getViewerDID(r)) 1300 1300 + items := make([]service.APINote, len(notes)) 1301 1301 + for i, n := range notes { 1302 1302 + items[i] = h.hydration.ToAPINote(n, lc) 1303 1303 + } 1709 1304 1710 1305 WriteSuccess(w, map[string]interface{}{ 1711 1711 - "items": feed, 1712 1712 - "fetchedCount": len(feed), 1306 1306 + "items": items, 1307 1307 + "fetchedCount": len(items), 1713 1308 }) 1714 1309 } 1715 1310

+1415

backend/internal/api/notes.go

reviewed

··· 1 1 + package api 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "encoding/json" 6 6 + "fmt" 7 7 + "net/http" 8 8 + "regexp" 9 9 + "strings" 10 10 + "time" 11 11 + 12 12 + "margin.at/internal/db" 13 13 + "margin.at/internal/domain" 14 14 + "margin.at/internal/logger" 15 15 + "margin.at/internal/xrpc" 16 16 + ) 17 17 + 18 18 + type NoteIndexDB interface { 19 19 + CreateNote(n *domain.Note) error 20 20 + GetNoteByURI(uri string) (*domain.Note, error) 21 21 + DeleteNote(uri string) error 22 22 + UpdateNoteAnnotation(uri, bodyValue, tagsJSON, cid string) error 23 23 + UpdateNoteHighlight(uri, color, tagsJSON, cid string) error 24 24 + UpdateNoteBookmark(uri, title, description, tagsJSON, cid string) error 25 25 + CreateAnnotation(a *domain.Annotation) error 26 26 + GetAnnotationByURI(uri string) (*domain.Annotation, error) 27 27 + GetAnnotationsByAuthor(authorDID string, limit, offset int) ([]domain.Annotation, error) 28 28 + UpdateAnnotation(uri, bodyValue, tagsJSON, cid string) error 29 29 + DeleteAnnotation(uri string) error 30 30 + CreateHighlight(h *domain.Highlight) error 31 31 + GetHighlightByURI(uri string) (*domain.Highlight, error) 32 32 + GetHighlightsByAuthor(authorDID string, limit, offset int) ([]domain.Highlight, error) 33 33 + UpdateHighlight(uri, color, tagsJSON, cid string) error 34 34 + DeleteHighlight(uri string) error 35 35 + CreateBookmark(b *domain.Bookmark) error 36 36 + GetBookmarkByURI(uri string) (*domain.Bookmark, error) 37 37 + GetBookmarksByTargetHash(targetHash string, limit, offset int) ([]domain.Bookmark, error) 38 38 + UpdateBookmark(uri, title, description, tagsJSON, cid string) error 39 39 + DeleteBookmark(uri string) error 40 40 + CreateLike(l *domain.Like) error 41 41 + GetLikeByUserAndSubject(userDID, subjectURI string) (*domain.Like, error) 42 42 + DeleteLike(uri string) error 43 43 + CreateReply(rep *domain.Reply) error 44 44 + GetReplyByURI(uri string) (*domain.Reply, error) 45 45 + DeleteReply(uri string) error 46 46 + CreateNotification(n *domain.Notification) error 47 47 + GetAuthorByURI(uri string) (string, error) 48 48 + GetPreferences(did string) (*domain.Preferences, error) 49 49 + SyncSelfLabels(authorDID, uri string, labels []string) error 50 50 + CreateContentLabel(src, uri, val, createdBy string) error 51 51 + SaveEditHistory(uri, recordType, previousContent string, previousCID *string) error 52 52 + HashURL(rawURL string) string 53 53 + CommunityBookmarkExists(authorDID, targetHash, tagsJSON string) (bool, error) 54 54 + } 55 55 + 56 56 + type dbAdapter struct{ d *db.DB } 57 57 + 58 58 + func (a *dbAdapter) CreateNote(n *domain.Note) error { return a.d.CreateNote(n) } 59 59 + func (a *dbAdapter) GetNoteByURI(uri string) (*domain.Note, error) { return a.d.GetNoteByURI(uri) } 60 60 + func (a *dbAdapter) DeleteNote(uri string) error { return a.d.DeleteNote(uri) } 61 61 + func (a *dbAdapter) UpdateNoteAnnotation(uri, body, tags, cid string) error { 62 62 + return a.d.UpdateNoteAnnotation(uri, body, tags, cid) 63 63 + } 64 64 + func (a *dbAdapter) UpdateNoteHighlight(uri, color, tags, cid string) error { 65 65 + return a.d.UpdateNoteHighlight(uri, color, tags, cid) 66 66 + } 67 67 + func (a *dbAdapter) UpdateNoteBookmark(uri, title, desc, tags, cid string) error { 68 68 + return a.d.UpdateNoteBookmark(uri, title, desc, tags, cid) 69 69 + } 70 70 + func (a *dbAdapter) CreateAnnotation(ann *domain.Annotation) error { return a.d.CreateAnnotation(ann) } 71 71 + func (a *dbAdapter) GetAnnotationByURI(uri string) (*domain.Annotation, error) { 72 72 + return a.d.GetAnnotationByURI(uri) 73 73 + } 74 74 + func (a *dbAdapter) GetAnnotationsByAuthor(did string, limit, offset int) ([]domain.Annotation, error) { 75 75 + return a.d.GetAnnotationsByAuthor(did, limit, offset) 76 76 + } 77 77 + func (a *dbAdapter) UpdateAnnotation(uri, body, tags, cid string) error { 78 78 + return a.d.UpdateAnnotation(uri, body, tags, cid) 79 79 + } 80 80 + func (a *dbAdapter) DeleteAnnotation(uri string) error { return a.d.DeleteAnnotation(uri) } 81 81 + func (a *dbAdapter) CreateHighlight(h *domain.Highlight) error { return a.d.CreateHighlight(h) } 82 82 + func (a *dbAdapter) GetHighlightByURI(uri string) (*domain.Highlight, error) { 83 83 + return a.d.GetHighlightByURI(uri) 84 84 + } 85 85 + func (a *dbAdapter) GetHighlightsByAuthor(did string, limit, offset int) ([]domain.Highlight, error) { 86 86 + return a.d.GetHighlightsByAuthor(did, limit, offset) 87 87 + } 88 88 + func (a *dbAdapter) UpdateHighlight(uri, color, tags, cid string) error { 89 89 + return a.d.UpdateHighlight(uri, color, tags, cid) 90 90 + } 91 91 + func (a *dbAdapter) DeleteHighlight(uri string) error { return a.d.DeleteHighlight(uri) } 92 92 + func (a *dbAdapter) CreateBookmark(b *domain.Bookmark) error { return a.d.CreateBookmark(b) } 93 93 + func (a *dbAdapter) GetBookmarkByURI(uri string) (*domain.Bookmark, error) { 94 94 + return a.d.GetBookmarkByURI(uri) 95 95 + } 96 96 + func (a *dbAdapter) GetBookmarksByTargetHash(hash string, limit, offset int) ([]domain.Bookmark, error) { 97 97 + return a.d.GetBookmarksByTargetHash(hash, limit, offset) 98 98 + } 99 99 + func (a *dbAdapter) UpdateBookmark(uri, title, desc, tags, cid string) error { 100 100 + return a.d.UpdateBookmark(uri, title, desc, tags, cid) 101 101 + } 102 102 + func (a *dbAdapter) DeleteBookmark(uri string) error { return a.d.DeleteBookmark(uri) } 103 103 + func (a *dbAdapter) CreateLike(l *domain.Like) error { return a.d.CreateLike(l) } 104 104 + func (a *dbAdapter) GetLikeByUserAndSubject(did, sub string) (*domain.Like, error) { 105 105 + return a.d.GetLikeByUserAndSubject(did, sub) 106 106 + } 107 107 + func (a *dbAdapter) DeleteLike(uri string) error { return a.d.DeleteLike(uri) } 108 108 + func (a *dbAdapter) CreateReply(rep *domain.Reply) error { return a.d.CreateReply(rep) } 109 109 + func (a *dbAdapter) GetReplyByURI(uri string) (*domain.Reply, error) { 110 110 + return a.d.GetReplyByURI(uri) 111 111 + } 112 112 + func (a *dbAdapter) DeleteReply(uri string) error { return a.d.DeleteReply(uri) } 113 113 + func (a *dbAdapter) CreateNotification(n *domain.Notification) error { 114 114 + return a.d.CreateNotification(n) 115 115 + } 116 116 + func (a *dbAdapter) GetAuthorByURI(uri string) (string, error) { return a.d.GetAuthorByURI(uri) } 117 117 + func (a *dbAdapter) GetPreferences(did string) (*domain.Preferences, error) { 118 118 + return a.d.GetPreferences(did) 119 119 + } 120 120 + func (a *dbAdapter) SyncSelfLabels(author, uri string, labels []string) error { 121 121 + return a.d.SyncSelfLabels(author, uri, labels) 122 122 + } 123 123 + func (a *dbAdapter) CreateContentLabel(src, uri, val, by string) error { 124 124 + return a.d.CreateContentLabel(src, uri, val, by) 125 125 + } 126 126 + func (a *dbAdapter) SaveEditHistory(uri, rt, prev string, cid *string) error { 127 127 + return a.d.SaveEditHistory(uri, rt, prev, cid) 128 128 + } 129 129 + func (a *dbAdapter) HashURL(rawURL string) string { return db.HashURL(rawURL) } 130 130 + func (a *dbAdapter) CommunityBookmarkExists(did, hash, tags string) (bool, error) { 131 131 + return a.d.CommunityBookmarkExists(did, hash, tags) 132 132 + } 133 133 + 134 134 + type NoteWriteService struct { 135 135 + db NoteIndexDB 136 136 + refresher *TokenRefresher 137 137 + } 138 138 + 139 139 + func NewNoteWriteService(database *db.DB, refresher *TokenRefresher) *NoteWriteService { 140 140 + return &NoteWriteService{db: &dbAdapter{d: database}, refresher: refresher} 141 141 + } 142 142 + 143 143 + type CreateAnnotationRequest struct { 144 144 + URL string `json:"url"` 145 145 + Text string `json:"text"` 146 146 + Selector json.RawMessage `json:"selector,omitempty"` 147 147 + Title string `json:"title,omitempty"` 148 148 + Tags []string `json:"tags,omitempty"` 149 149 + Labels []string `json:"labels,omitempty"` 150 150 + } 151 151 + 152 152 + type CreateAnnotationResponse struct { 153 153 + URI string `json:"uri"` 154 154 + CID string `json:"cid"` 155 155 + } 156 156 + 157 157 + func (s *NoteWriteService) CreateAnnotation(w http.ResponseWriter, r *http.Request) { 158 158 + session, err := s.refresher.GetSessionWithAutoRefresh(r) 159 159 + if err != nil { 160 160 + WriteUnauthorized(w, err.Error()) 161 161 + return 162 162 + } 163 163 + 164 164 + var req CreateAnnotationRequest 165 165 + if err := json.NewDecoder(r.Body).Decode(&req); err != nil { 166 166 + WriteBadRequest(w, "Invalid request body") 167 167 + return 168 168 + } 169 169 + 170 170 + if req.URL == "" { 171 171 + WriteBadRequest(w, "URL is required") 172 172 + return 173 173 + } 174 174 + 175 175 + if req.Text == "" && req.Selector == nil && len(req.Tags) == 0 { 176 176 + WriteBadRequest(w, "Must provide text, selector, or tags") 177 177 + return 178 178 + } 179 179 + 180 180 + if len(req.Text) > 3000 { 181 181 + WriteBadRequest(w, "Text too long (max 3000 chars)") 182 182 + return 183 183 + } 184 184 + 185 185 + for i, t := range req.Tags { 186 186 + req.Tags[i] = strings.ToLower(t) 187 187 + } 188 188 + 189 189 + urlHash := db.HashURL(req.URL) 190 190 + 191 191 + motivation := "commenting" 192 192 + if req.Selector != nil && req.Text == "" { 193 193 + motivation = "highlighting" 194 194 + } else if len(req.Tags) > 0 { 195 195 + motivation = "tagging" 196 196 + } 197 197 + 198 198 + var facets []xrpc.Facet 199 199 + var mentionedDIDs []string 200 200 + 201 201 + mentionRegex := regexp.MustCompile(`(^|\s|@)@([a-zA-Z0-9.-]+)(\b)`) 202 202 + matches := mentionRegex.FindAllStringSubmatchIndex(req.Text, -1) 203 203 + 204 204 + for _, m := range matches { 205 205 + handle := req.Text[m[4]:m[5]] 206 206 + 207 207 + if !strings.Contains(handle, ".") { 208 208 + continue 209 209 + } 210 210 + 211 211 + var did string 212 212 + err := s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, _ string) error { 213 213 + var resolveErr error 214 214 + did, resolveErr = client.ResolveHandle(r.Context(), handle) 215 215 + return resolveErr 216 216 + }) 217 217 + 218 218 + if err == nil && did != "" { 219 219 + start := m[2] 220 220 + end := m[5] 221 221 + 222 222 + facets = append(facets, xrpc.Facet{ 223 223 + Index: xrpc.FacetIndex{ 224 224 + ByteStart: start, 225 225 + ByteEnd: end, 226 226 + }, 227 227 + Features: []xrpc.FacetFeature{ 228 228 + { 229 229 + Type: "app.bsky.richtext.facet#mention", 230 230 + Did: did, 231 231 + }, 232 232 + }, 233 233 + }) 234 234 + mentionedDIDs = append(mentionedDIDs, did) 235 235 + } 236 236 + } 237 237 + 238 238 + urlRegex := regexp.MustCompile(`(https?://[^\s]+)`) 239 239 + urlMatches := urlRegex.FindAllStringIndex(req.Text, -1) 240 240 + 241 241 + for _, m := range urlMatches { 242 242 + facets = append(facets, xrpc.Facet{ 243 243 + Index: xrpc.FacetIndex{ 244 244 + ByteStart: m[0], 245 245 + ByteEnd: m[1], 246 246 + }, 247 247 + Features: []xrpc.FacetFeature{ 248 248 + { 249 249 + Type: "app.bsky.richtext.facet#link", 250 250 + Uri: req.Text[m[0]:m[1]], 251 251 + }, 252 252 + }, 253 253 + }) 254 254 + } 255 255 + 256 256 + record := xrpc.NewNoteRecord(req.URL, urlHash, req.Text, req.Selector, req.Title, "", "", motivation) 257 257 + if len(req.Tags) > 0 { 258 258 + record.Tags = req.Tags 259 259 + } 260 260 + if len(facets) > 0 { 261 261 + record.Facets = facets 262 262 + } 263 263 + 264 264 + record.Labels = xrpc.NewSelfLabels(filterSelfLabels(req.Labels)) 265 265 + 266 266 + var result *xrpc.CreateRecordOutput 267 267 + 268 268 + if existing, err := s.checkDuplicateAnnotation(session.DID, req.URL, req.Text); err == nil && existing != nil { 269 269 + w.Header().Set("Content-Type", "application/json") 270 270 + json.NewEncoder(w).Encode(CreateAnnotationResponse{ 271 271 + URI: existing.URI, 272 272 + CID: *existing.CID, 273 273 + }) 274 274 + return 275 275 + } 276 276 + 277 277 + err = s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 278 278 + var createErr error 279 279 + result, createErr = client.CreateRecord(r.Context(), did, xrpc.CollectionNote, record) 280 280 + return createErr 281 281 + }) 282 282 + if err != nil { 283 283 + HandleAPIError(w, r, err, "Failed to create annotation: ", http.StatusInternalServerError) 284 284 + return 285 285 + } 286 286 + 287 287 + for _, mentionedDID := range mentionedDIDs { 288 288 + if mentionedDID != session.DID { 289 289 + s.db.CreateNotification(&db.Notification{ 290 290 + RecipientDID: mentionedDID, 291 291 + ActorDID: session.DID, 292 292 + Type: "mention", 293 293 + SubjectURI: result.URI, 294 294 + CreatedAt: time.Now(), 295 295 + }) 296 296 + } 297 297 + } 298 298 + 299 299 + bodyValue := req.Text 300 300 + var bodyValuePtr, targetTitlePtr, selectorJSONPtr *string 301 301 + if bodyValue != "" { 302 302 + bodyValuePtr = &bodyValue 303 303 + } 304 304 + if req.Title != "" { 305 305 + targetTitlePtr = &req.Title 306 306 + } 307 307 + if req.Selector != nil { 308 308 + selectorBytes, _ := json.Marshal(req.Selector) 309 309 + selectorStr := string(selectorBytes) 310 310 + selectorJSONPtr = &selectorStr 311 311 + } 312 312 + 313 313 + var tagsJSONPtr *string 314 314 + if len(req.Tags) > 0 { 315 315 + tagsBytes, _ := json.Marshal(req.Tags) 316 316 + tagsStr := string(tagsBytes) 317 317 + tagsJSONPtr = &tagsStr 318 318 + } 319 319 + 320 320 + cid := result.CID 321 321 + did := session.DID 322 322 + note := &db.Note{ 323 323 + URI: result.URI, 324 324 + CID: &cid, 325 325 + AuthorDID: did, 326 326 + Motivation: motivation, 327 327 + BodyValue: bodyValuePtr, 328 328 + TargetSource: req.URL, 329 329 + TargetHash: urlHash, 330 330 + TargetTitle: targetTitlePtr, 331 331 + SelectorJSON: selectorJSONPtr, 332 332 + TagsJSON: tagsJSONPtr, 333 333 + CreatedAt: time.Now(), 334 334 + IndexedAt: time.Now(), 335 335 + } 336 336 + 337 337 + if err := s.db.CreateNote(note); err != nil { 338 338 + logger.Error("Warning: failed to index note in local DB: %v", err) 339 339 + } 340 340 + 341 341 + for _, label := range filterSelfLabels(req.Labels) { 342 342 + if err := s.db.CreateContentLabel(session.DID, result.URI, label, session.DID); err != nil { 343 343 + logger.Error("Warning: failed to create self-label %s: %v", label, err) 344 344 + } 345 345 + } 346 346 + 347 347 + WriteSuccess(w, CreateAnnotationResponse{ 348 348 + URI: result.URI, 349 349 + CID: result.CID, 350 350 + }) 351 351 + } 352 352 + 353 353 + func (s *NoteWriteService) DeleteAnnotation(w http.ResponseWriter, r *http.Request) { 354 354 + session, err := s.refresher.GetSessionWithAutoRefresh(r) 355 355 + if err != nil { 356 356 + WriteUnauthorized(w, err.Error()) 357 357 + return 358 358 + } 359 359 + 360 360 + rkey := r.URL.Query().Get("rkey") 361 361 + collectionType := r.URL.Query().Get("type") 362 362 + 363 363 + if rkey == "" { 364 364 + WriteBadRequest(w, "rkey required") 365 365 + return 366 366 + } 367 367 + 368 368 + did := session.DID 369 369 + 370 370 + collection := xrpc.CollectionAnnotation 371 371 + if collectionType == "reply" { 372 372 + collection = xrpc.CollectionReply 373 373 + } else { 374 374 + candidateCollections := []string{xrpc.CollectionNote, xrpc.CollectionAnnotation, xrpc.CollectionHighlight, xrpc.CollectionBookmark, xrpc.CollectionCommunityBookmark, "network.cosmik.card"} 375 375 + for _, col := range candidateCollections { 376 376 + uri := "at://" + did + "/" + col + "/" + rkey 377 377 + if note, dbErr := s.db.GetNoteByURI(uri); dbErr == nil && note != nil { 378 378 + collection = col 379 379 + break 380 380 + } else if _, dbErr := s.db.GetAnnotationByURI(uri); dbErr == nil { 381 381 + collection = col 382 382 + break 383 383 + } 384 384 + } 385 385 + } 386 386 + 387 387 + pdsErr := s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 388 388 + return client.DeleteRecord(r.Context(), did, collection, rkey) 389 389 + }) 390 390 + if pdsErr != nil { 391 391 + logger.Error("PDS delete failed (will still clean local DB): %v", pdsErr) 392 392 + } 393 393 + 394 394 + if collectionType == "reply" { 395 395 + uri := "at://" + did + "/" + xrpc.CollectionReply + "/" + rkey 396 396 + s.db.DeleteReply(uri) 397 397 + } else { 398 398 + uri := "at://" + did + "/" + collection + "/" + rkey 399 399 + s.db.DeleteAnnotation(uri) 400 400 + s.db.DeleteHighlight(uri) 401 401 + s.db.DeleteBookmark(uri) 402 402 + s.db.DeleteNote(uri) 403 403 + } 404 404 + 405 405 + WriteSuccess(w, map[string]bool{"success": true}) 406 406 + } 407 407 + 408 408 + type UpdateAnnotationRequest struct { 409 409 + Text string `json:"text"` 410 410 + Tags []string `json:"tags"` 411 411 + Labels []string `json:"labels,omitempty"` 412 412 + } 413 413 + 414 414 + func (s *NoteWriteService) UpdateAnnotation(w http.ResponseWriter, r *http.Request) { 415 415 + uri := r.URL.Query().Get("uri") 416 416 + if uri == "" { 417 417 + WriteBadRequest(w, "uri query parameter required") 418 418 + return 419 419 + } 420 420 + 421 421 + session, err := s.refresher.GetSessionWithAutoRefresh(r) 422 422 + if err != nil { 423 423 + WriteUnauthorized(w, err.Error()) 424 424 + return 425 425 + } 426 426 + 427 427 + annotation, err := s.db.GetAnnotationByURI(uri) 428 428 + if err != nil || annotation == nil { 429 429 + WriteNotFound(w, "Annotation not found") 430 430 + return 431 431 + } 432 432 + 433 433 + if annotation.AuthorDID != session.DID { 434 434 + WriteForbidden(w, "Not authorized to edit this annotation") 435 435 + return 436 436 + } 437 437 + 438 438 + var req UpdateAnnotationRequest 439 439 + if err := json.NewDecoder(r.Body).Decode(&req); err != nil { 440 440 + WriteBadRequest(w, "Invalid request body") 441 441 + return 442 442 + } 443 443 + 444 444 + parts := parseATURI(uri) 445 445 + if len(parts) < 3 { 446 446 + WriteBadRequest(w, "Invalid URI format") 447 447 + return 448 448 + } 449 449 + rkey := parts[2] 450 450 + 451 451 + for i, t := range req.Tags { 452 452 + req.Tags[i] = strings.ToLower(t) 453 453 + } 454 454 + 455 455 + tagsJSON := "" 456 456 + if len(req.Tags) > 0 { 457 457 + tagsBytes, _ := json.Marshal(req.Tags) 458 458 + tagsJSON = string(tagsBytes) 459 459 + } 460 460 + 461 461 + if annotation.BodyValue != nil { 462 462 + previousContent := *annotation.BodyValue 463 463 + logger.Info("[DEBUG] Saving edit history for %s. Previous content: %s", uri, previousContent) 464 464 + if err := s.db.SaveEditHistory(uri, "annotation", previousContent, annotation.CID); err != nil { 465 465 + logger.Error("Failed to save edit history for %s: %v", uri, err) 466 466 + } else { 467 467 + logger.Info("[DEBUG] Successfully saved edit history for %s", uri) 468 468 + } 469 469 + } else { 470 470 + logger.Info("[DEBUG] Annotation BodyValue is nil for %s", uri) 471 471 + } 472 472 + 473 473 + var result *xrpc.PutRecordOutput 474 474 + err = s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 475 475 + collection := parts[1] 476 476 + existing, getErr := client.GetRecord(r.Context(), did, collection, rkey) 477 477 + if getErr != nil { 478 478 + return fmt.Errorf("failed to fetch existing record: %w", getErr) 479 479 + } 480 480 + 481 481 + var updateErr error 482 482 + if collection == xrpc.CollectionNote { 483 483 + var record xrpc.NoteRecord 484 484 + if err := json.Unmarshal(existing.Value, &record); err != nil { 485 485 + return fmt.Errorf("failed to parse existing record: %w", err) 486 486 + } 487 487 + record.Body = &xrpc.AnnotationBody{ 488 488 + Value: req.Text, 489 489 + Format: "text/plain", 490 490 + } 491 491 + if len(req.Tags) > 0 { 492 492 + record.Tags = req.Tags 493 493 + } else { 494 494 + record.Tags = nil 495 495 + } 496 496 + 497 497 + record.Labels = xrpc.NewSelfLabels(filterSelfLabels(req.Labels)) 498 498 + 499 499 + if err := record.Validate(); err != nil { 500 500 + return fmt.Errorf("validation failed: %w", err) 501 501 + } 502 502 + result, updateErr = client.PutRecord(r.Context(), did, collection, rkey, record) 503 503 + if updateErr != nil { 504 504 + _ = client.DeleteRecord(r.Context(), did, collection, rkey) 505 505 + result, updateErr = client.PutRecord(r.Context(), did, collection, rkey, record) 506 506 + } 507 507 + } else { 508 508 + var record xrpc.AnnotationRecord 509 509 + if err := json.Unmarshal(existing.Value, &record); err != nil { 510 510 + return fmt.Errorf("failed to parse existing record: %w", err) 511 511 + } 512 512 + record.Body = &xrpc.AnnotationBody{ 513 513 + Value: req.Text, 514 514 + Format: "text/plain", 515 515 + } 516 516 + if len(req.Tags) > 0 { 517 517 + record.Tags = req.Tags 518 518 + } else { 519 519 + record.Tags = nil 520 520 + } 521 521 + 522 522 + record.Labels = xrpc.NewSelfLabels(filterSelfLabels(req.Labels)) 523 523 + 524 524 + if err := record.Validate(); err != nil { 525 525 + return fmt.Errorf("validation failed: %w", err) 526 526 + } 527 527 + result, updateErr = client.PutRecord(r.Context(), did, collection, rkey, record) 528 528 + if updateErr != nil { 529 529 + _ = client.DeleteRecord(r.Context(), did, collection, rkey) 530 530 + result, updateErr = client.PutRecord(r.Context(), did, collection, rkey, record) 531 531 + } 532 532 + } 533 533 + return updateErr 534 534 + }) 535 535 + 536 536 + if err != nil { 537 537 + logger.Error("[UpdateAnnotation] Failed: %v", err) 538 538 + HandleAPIError(w, r, err, "Failed to update record: ", http.StatusInternalServerError) 539 539 + return 540 540 + } 541 541 + 542 542 + if parts[1] == xrpc.CollectionNote { 543 543 + s.db.UpdateNoteAnnotation(uri, req.Text, tagsJSON, result.CID) 544 544 + } else { 545 545 + s.db.UpdateAnnotation(uri, req.Text, tagsJSON, result.CID) 546 546 + } 547 547 + 548 548 + if err := s.db.SyncSelfLabels(session.DID, uri, filterSelfLabels(req.Labels)); err != nil { 549 549 + logger.Error("Warning: failed to sync self-labels: %v", err) 550 550 + } 551 551 + 552 552 + WriteSuccess(w, map[string]interface{}{ 553 553 + "success": true, 554 554 + "uri": result.URI, 555 555 + "cid": result.CID, 556 556 + }) 557 557 + } 558 558 + 559 559 + func parseATURI(uri string) []string { 560 560 + 561 561 + if len(uri) < 5 || uri[:5] != "at://" { 562 562 + return nil 563 563 + } 564 564 + return strings.Split(uri[5:], "/") 565 565 + } 566 566 + 567 567 + type CreateLikeRequest struct { 568 568 + SubjectURI string `json:"subjectUri"` 569 569 + SubjectCID string `json:"subjectCid"` 570 570 + } 571 571 + 572 572 + func (s *NoteWriteService) LikeAnnotation(w http.ResponseWriter, r *http.Request) { 573 573 + session, err := s.refresher.GetSessionWithAutoRefresh(r) 574 574 + if err != nil { 575 575 + WriteUnauthorized(w, err.Error()) 576 576 + return 577 577 + } 578 578 + 579 579 + var req CreateLikeRequest 580 580 + if err := json.NewDecoder(r.Body).Decode(&req); err != nil { 581 581 + WriteBadRequest(w, "Invalid request body") 582 582 + return 583 583 + } 584 584 + 585 585 + if req.SubjectURI == "" || req.SubjectCID == "" { 586 586 + WriteBadRequest(w, "subjectUri and subjectCid are required") 587 587 + return 588 588 + } 589 589 + 590 590 + existingLike, _ := s.db.GetLikeByUserAndSubject(session.DID, req.SubjectURI) 591 591 + if existingLike != nil { 592 592 + w.Header().Set("Content-Type", "application/json") 593 593 + json.NewEncoder(w).Encode(map[string]string{"uri": existingLike.URI, "existing": "true"}) 594 594 + return 595 595 + } 596 596 + 597 597 + record := xrpc.NewLikeRecord(req.SubjectURI, req.SubjectCID) 598 598 + 599 599 + if err := record.Validate(); err != nil { 600 600 + WriteBadRequest(w, "Validation error: "+err.Error()) 601 601 + return 602 602 + } 603 603 + 604 604 + var result *xrpc.CreateRecordOutput 605 605 + err = s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 606 606 + var createErr error 607 607 + result, createErr = client.CreateRecord(r.Context(), did, xrpc.CollectionLike, record) 608 608 + return createErr 609 609 + }) 610 610 + if err != nil { 611 611 + HandleAPIError(w, r, err, "Failed to create like: ", http.StatusInternalServerError) 612 612 + return 613 613 + } 614 614 + 615 615 + did := session.DID 616 616 + like := &db.Like{ 617 617 + URI: result.URI, 618 618 + AuthorDID: did, 619 619 + SubjectURI: req.SubjectURI, 620 620 + CreatedAt: time.Now(), 621 621 + IndexedAt: time.Now(), 622 622 + } 623 623 + s.db.CreateLike(like) 624 624 + 625 625 + if authorDID, err := s.db.GetAuthorByURI(req.SubjectURI); err == nil && authorDID != did { 626 626 + s.db.CreateNotification(&db.Notification{ 627 627 + RecipientDID: authorDID, 628 628 + ActorDID: did, 629 629 + Type: "like", 630 630 + SubjectURI: req.SubjectURI, 631 631 + CreatedAt: time.Now(), 632 632 + }) 633 633 + } 634 634 + 635 635 + WriteSuccess(w, map[string]string{"uri": result.URI}) 636 636 + } 637 637 + 638 638 + func (s *NoteWriteService) UnlikeAnnotation(w http.ResponseWriter, r *http.Request) { 639 639 + session, err := s.refresher.GetSessionWithAutoRefresh(r) 640 640 + if err != nil { 641 641 + WriteUnauthorized(w, err.Error()) 642 642 + return 643 643 + } 644 644 + 645 645 + subjectURI := r.URL.Query().Get("uri") 646 646 + if subjectURI == "" { 647 647 + WriteBadRequest(w, "uri query parameter required") 648 648 + return 649 649 + } 650 650 + 651 651 + userLike, err := s.db.GetLikeByUserAndSubject(session.DID, subjectURI) 652 652 + if err != nil { 653 653 + WriteNotFound(w, "Like not found") 654 654 + return 655 655 + } 656 656 + 657 657 + parts := strings.Split(userLike.URI, "/") 658 658 + rkey := parts[len(parts)-1] 659 659 + 660 660 + err = s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 661 661 + return client.DeleteRecord(r.Context(), did, xrpc.CollectionLike, rkey) 662 662 + }) 663 663 + if err != nil { 664 664 + HandleAPIError(w, r, err, "Failed to delete like: ", http.StatusInternalServerError) 665 665 + return 666 666 + } 667 667 + 668 668 + s.db.DeleteLike(userLike.URI) 669 669 + 670 670 + WriteSuccess(w, map[string]bool{"success": true}) 671 671 + } 672 672 + 673 673 + type CreateReplyRequest struct { 674 674 + ParentURI string `json:"parentUri"` 675 675 + ParentCID string `json:"parentCid"` 676 676 + RootURI string `json:"rootUri"` 677 677 + RootCID string `json:"rootCid"` 678 678 + Text string `json:"text"` 679 679 + } 680 680 + 681 681 + func (s *NoteWriteService) CreateReply(w http.ResponseWriter, r *http.Request) { 682 682 + session, err := s.refresher.GetSessionWithAutoRefresh(r) 683 683 + if err != nil { 684 684 + WriteUnauthorized(w, err.Error()) 685 685 + return 686 686 + } 687 687 + 688 688 + var req CreateReplyRequest 689 689 + if err := json.NewDecoder(r.Body).Decode(&req); err != nil { 690 690 + WriteBadRequest(w, "Invalid request body") 691 691 + return 692 692 + } 693 693 + 694 694 + if req.ParentURI == "" || req.ParentCID == "" { 695 695 + WriteBadRequest(w, "parentUri and parentCid are required") 696 696 + return 697 697 + } 698 698 + if req.RootURI == "" || req.RootCID == "" { 699 699 + WriteBadRequest(w, "rootUri and rootCid are required") 700 700 + return 701 701 + } 702 702 + if req.Text == "" { 703 703 + WriteBadRequest(w, "text is required") 704 704 + return 705 705 + } 706 706 + 707 707 + record := xrpc.NewReplyRecord(req.ParentURI, req.ParentCID, req.RootURI, req.RootCID, req.Text) 708 708 + 709 709 + if err := record.Validate(); err != nil { 710 710 + WriteBadRequest(w, "Validation error: "+err.Error()) 711 711 + return 712 712 + } 713 713 + 714 714 + var result *xrpc.CreateRecordOutput 715 715 + err = s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 716 716 + var createErr error 717 717 + result, createErr = client.CreateRecord(r.Context(), did, xrpc.CollectionReply, record) 718 718 + return createErr 719 719 + }) 720 720 + if err != nil { 721 721 + HandleAPIError(w, r, err, "Failed to create reply: ", http.StatusInternalServerError) 722 722 + return 723 723 + } 724 724 + 725 725 + reply := &db.Reply{ 726 726 + URI: result.URI, 727 727 + AuthorDID: session.DID, 728 728 + ParentURI: req.ParentURI, 729 729 + RootURI: req.RootURI, 730 730 + Text: req.Text, 731 731 + CreatedAt: time.Now(), 732 732 + IndexedAt: time.Now(), 733 733 + CID: &result.CID, 734 734 + } 735 735 + s.db.CreateReply(reply) 736 736 + 737 737 + if authorDID, err := s.db.GetAuthorByURI(req.ParentURI); err == nil && authorDID != session.DID { 738 738 + s.db.CreateNotification(&db.Notification{ 739 739 + RecipientDID: authorDID, 740 740 + ActorDID: session.DID, 741 741 + Type: "reply", 742 742 + SubjectURI: result.URI, 743 743 + CreatedAt: time.Now(), 744 744 + }) 745 745 + } 746 746 + 747 747 + if req.RootURI != req.ParentURI { 748 748 + if rootAuthorDID, err := s.db.GetAuthorByURI(req.RootURI); err == nil && rootAuthorDID != session.DID { 749 749 + parentAuthorDID, _ := s.db.GetAuthorByURI(req.ParentURI) 750 750 + if rootAuthorDID != parentAuthorDID { 751 751 + s.db.CreateNotification(&db.Notification{ 752 752 + RecipientDID: rootAuthorDID, 753 753 + ActorDID: session.DID, 754 754 + Type: "reply", 755 755 + SubjectURI: result.URI, 756 756 + CreatedAt: time.Now(), 757 757 + }) 758 758 + } 759 759 + } 760 760 + } 761 761 + 762 762 + WriteSuccess(w, map[string]string{"uri": result.URI}) 763 763 + } 764 764 + 765 765 + func (s *NoteWriteService) DeleteReply(w http.ResponseWriter, r *http.Request) { 766 766 + uri := r.URL.Query().Get("uri") 767 767 + if uri == "" { 768 768 + WriteBadRequest(w, "uri query parameter required") 769 769 + return 770 770 + } 771 771 + 772 772 + session, err := s.refresher.GetSessionWithAutoRefresh(r) 773 773 + if err != nil { 774 774 + WriteUnauthorized(w, err.Error()) 775 775 + return 776 776 + } 777 777 + 778 778 + reply, err := s.db.GetReplyByURI(uri) 779 779 + if err != nil || reply == nil { 780 780 + WriteNotFound(w, "reply not found") 781 781 + return 782 782 + } 783 783 + 784 784 + if reply.AuthorDID != session.DID { 785 785 + WriteForbidden(w, "not authorized to delete this reply") 786 786 + return 787 787 + } 788 788 + 789 789 + parts := strings.Split(uri, "/") 790 790 + if len(parts) >= 2 { 791 791 + rkey := parts[len(parts)-1] 792 792 + _ = s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 793 793 + return client.DeleteRecord(r.Context(), did, "at.margin.reply", rkey) 794 794 + }) 795 795 + } 796 796 + 797 797 + s.db.DeleteReply(uri) 798 798 + 799 799 + WriteSuccess(w, map[string]bool{"success": true}) 800 800 + } 801 801 + 802 802 + type CreateHighlightRequest struct { 803 803 + URL string `json:"url"` 804 804 + Title string `json:"title,omitempty"` 805 805 + Selector json.RawMessage `json:"selector"` 806 806 + Color string `json:"color,omitempty"` 807 807 + Tags []string `json:"tags,omitempty"` 808 808 + Labels []string `json:"labels,omitempty"` 809 809 + } 810 810 + 811 811 + func (s *NoteWriteService) CreateHighlight(w http.ResponseWriter, r *http.Request) { 812 812 + session, err := s.refresher.GetSessionWithAutoRefresh(r) 813 813 + if err != nil { 814 814 + WriteUnauthorized(w, err.Error()) 815 815 + return 816 816 + } 817 817 + 818 818 + var req CreateHighlightRequest 819 819 + if err := json.NewDecoder(r.Body).Decode(&req); err != nil { 820 820 + WriteBadRequest(w, "Invalid request body") 821 821 + return 822 822 + } 823 823 + 824 824 + if req.URL == "" || req.Selector == nil { 825 825 + WriteBadRequest(w, "URL and selector are required") 826 826 + return 827 827 + } 828 828 + 829 829 + for i, t := range req.Tags { 830 830 + req.Tags[i] = strings.ToLower(t) 831 831 + } 832 832 + 833 833 + urlHash := db.HashURL(req.URL) 834 834 + record := xrpc.NewNoteRecord(req.URL, urlHash, "", req.Selector, req.Title, req.Color, "", "highlighting") 835 835 + if len(req.Tags) > 0 { 836 836 + record.Tags = req.Tags 837 837 + } 838 838 + 839 839 + record.Labels = xrpc.NewSelfLabels(filterSelfLabels(req.Labels)) 840 840 + 841 841 + if err := record.Validate(); err != nil { 842 842 + WriteBadRequest(w, "Validation error: "+err.Error()) 843 843 + return 844 844 + } 845 845 + 846 846 + var result *xrpc.CreateRecordOutput 847 847 + 848 848 + if existing, err := s.checkDuplicateHighlight(session.DID, req.URL, req.Selector); err == nil && existing != nil { 849 849 + w.Header().Set("Content-Type", "application/json") 850 850 + json.NewEncoder(w).Encode(map[string]string{"uri": existing.URI, "cid": *existing.CID}) 851 851 + return 852 852 + } 853 853 + 854 854 + err = s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 855 855 + var createErr error 856 856 + result, createErr = client.CreateRecord(r.Context(), did, xrpc.CollectionNote, record) 857 857 + return createErr 858 858 + }) 859 859 + if err != nil { 860 860 + HandleAPIError(w, r, err, "Failed to create highlight: ", http.StatusInternalServerError) 861 861 + return 862 862 + } 863 863 + 864 864 + var selectorJSONPtr *string 865 865 + if len(record.Target.Selector) > 0 { 866 866 + selectorStr := string(record.Target.Selector) 867 867 + selectorJSONPtr = &selectorStr 868 868 + } 869 869 + 870 870 + var titlePtr *string 871 871 + if req.Title != "" { 872 872 + titlePtr = &req.Title 873 873 + } 874 874 + 875 875 + var colorPtr *string 876 876 + if req.Color != "" { 877 877 + colorPtr = &req.Color 878 878 + } 879 879 + 880 880 + var tagsJSONPtr *string 881 881 + if len(req.Tags) > 0 { 882 882 + tagsBytes, _ := json.Marshal(req.Tags) 883 883 + tagsStr := string(tagsBytes) 884 884 + tagsJSONPtr = &tagsStr 885 885 + } 886 886 + 887 887 + cid := result.CID 888 888 + note := &db.Note{ 889 889 + URI: result.URI, 890 890 + AuthorDID: session.DID, 891 891 + Motivation: "highlighting", 892 892 + TargetSource: req.URL, 893 893 + TargetHash: urlHash, 894 894 + TargetTitle: titlePtr, 895 895 + SelectorJSON: selectorJSONPtr, 896 896 + Color: colorPtr, 897 897 + TagsJSON: tagsJSONPtr, 898 898 + CreatedAt: time.Now(), 899 899 + IndexedAt: time.Now(), 900 900 + CID: &cid, 901 901 + } 902 902 + if err := s.db.CreateNote(note); err != nil { 903 903 + WriteInternalError(w, "Failed to index highlight node") 904 904 + return 905 905 + } 906 906 + 907 907 + for _, label := range filterSelfLabels(req.Labels) { 908 908 + if err := s.db.CreateContentLabel(session.DID, result.URI, label, session.DID); err != nil { 909 909 + logger.Error("Warning: failed to create self-label %s: %v", label, err) 910 910 + } 911 911 + } 912 912 + 913 913 + WriteSuccess(w, map[string]string{"uri": result.URI, "cid": result.CID}) 914 914 + } 915 915 + 916 916 + type CreateBookmarkRequest struct { 917 917 + URL string `json:"url"` 918 918 + Title string `json:"title,omitempty"` 919 919 + Description string `json:"description,omitempty"` 920 920 + Tags []string `json:"tags,omitempty"` 921 921 + } 922 922 + 923 923 + func (s *NoteWriteService) CreateBookmark(w http.ResponseWriter, r *http.Request) { 924 924 + session, err := s.refresher.GetSessionWithAutoRefresh(r) 925 925 + if err != nil { 926 926 + WriteUnauthorized(w, err.Error()) 927 927 + return 928 928 + } 929 929 + 930 930 + var req CreateBookmarkRequest 931 931 + if err := json.NewDecoder(r.Body).Decode(&req); err != nil { 932 932 + WriteBadRequest(w, "Invalid request body") 933 933 + return 934 934 + } 935 935 + 936 936 + if req.URL == "" { 937 937 + WriteBadRequest(w, "URL is required") 938 938 + return 939 939 + } 940 940 + 941 941 + for i, t := range req.Tags { 942 942 + req.Tags[i] = strings.ToLower(t) 943 943 + } 944 944 + 945 945 + urlHash := db.HashURL(req.URL) 946 946 + record := xrpc.NewNoteRecord(req.URL, urlHash, "", nil, req.Title, "", req.Description, "bookmarking") 947 947 + if len(req.Tags) > 0 { 948 948 + record.Tags = req.Tags 949 949 + } 950 950 + 951 951 + if err := record.Validate(); err != nil { 952 952 + WriteBadRequest(w, "Validation error: "+err.Error()) 953 953 + return 954 954 + } 955 955 + 956 956 + var result *xrpc.CreateRecordOutput 957 957 + 958 958 + if existing, err := s.checkDuplicateBookmark(session.DID, req.URL); err == nil && existing != nil { 959 959 + WriteConflict(w, "Bookmark already exists") 960 960 + return 961 961 + } 962 962 + 963 963 + err = s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 964 964 + var createErr error 965 965 + result, createErr = client.CreateRecord(r.Context(), did, xrpc.CollectionNote, record) 966 966 + return createErr 967 967 + }) 968 968 + if err != nil { 969 969 + HandleAPIError(w, r, err, "Failed to create bookmark: ", http.StatusInternalServerError) 970 970 + return 971 971 + } 972 972 + 973 973 + capturedSession := session 974 974 + capturedTags := append([]string(nil), req.Tags...) 975 975 + capturedURL := req.URL 976 976 + capturedURLHash := urlHash 977 977 + go func() { 978 978 + prefs, dbErr := s.db.GetPreferences(capturedSession.DID) 979 979 + communityEnabled := dbErr == nil && prefs != nil && (prefs.EnableCommunityBookmarks == nil || *prefs.EnableCommunityBookmarks) 980 980 + if !communityEnabled { 981 981 + return 982 982 + } 983 983 + 984 984 + tagsJSON := "" 985 985 + if len(capturedTags) > 0 { 986 986 + if b, err := json.Marshal(capturedTags); err == nil { 987 987 + tagsJSON = string(b) 988 988 + } 989 989 + } 990 990 + if exists, err := s.db.CommunityBookmarkExists(capturedSession.DID, capturedURLHash, tagsJSON); err == nil && exists { 991 991 + return 992 992 + } 993 993 + 994 994 + client := s.refresher.CreateClientFromSession(capturedSession) 995 995 + ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) 996 996 + defer cancel() 997 997 + communityRecord := map[string]interface{}{ 998 998 + "$type": xrpc.CollectionCommunityBookmark, 999 999 + "subject": capturedURL, 1000 1000 + "createdAt": time.Now().UTC().Format(time.RFC3339), 1001 1001 + } 1002 1002 + if len(capturedTags) > 0 { 1003 1003 + communityRecord["tags"] = capturedTags 1004 1004 + } 1005 1005 + _, _ = client.CreateRecord(ctx, capturedSession.DID, xrpc.CollectionCommunityBookmark, communityRecord) 1006 1006 + }() 1007 1007 + 1008 1008 + var titlePtr *string 1009 1009 + if req.Title != "" { 1010 1010 + titlePtr = &req.Title 1011 1011 + } 1012 1012 + var descPtr *string 1013 1013 + if req.Description != "" { 1014 1014 + descPtr = &req.Description 1015 1015 + } 1016 1016 + 1017 1017 + var tagsJSONPtr *string 1018 1018 + if len(req.Tags) > 0 { 1019 1019 + tagsBytes, _ := json.Marshal(req.Tags) 1020 1020 + tagsStr := string(tagsBytes) 1021 1021 + tagsJSONPtr = &tagsStr 1022 1022 + } 1023 1023 + 1024 1024 + cid := result.CID 1025 1025 + note := &db.Note{ 1026 1026 + URI: result.URI, 1027 1027 + AuthorDID: session.DID, 1028 1028 + Motivation: "bookmarking", 1029 1029 + TargetSource: req.URL, 1030 1030 + TargetHash: urlHash, 1031 1031 + TargetTitle: titlePtr, 1032 1032 + BodyValue: descPtr, 1033 1033 + TagsJSON: tagsJSONPtr, 1034 1034 + CreatedAt: time.Now(), 1035 1035 + IndexedAt: time.Now(), 1036 1036 + CID: &cid, 1037 1037 + } 1038 1038 + if err := s.db.CreateNote(note); err != nil { 1039 1039 + logger.Error("Warning: failed to index bookmark in local DB: %v", err) 1040 1040 + } 1041 1041 + 1042 1042 + WriteSuccess(w, map[string]string{"uri": result.URI, "cid": result.CID}) 1043 1043 + } 1044 1044 + 1045 1045 + func (s *NoteWriteService) DeleteHighlight(w http.ResponseWriter, r *http.Request) { 1046 1046 + session, err := s.refresher.GetSessionWithAutoRefresh(r) 1047 1047 + if err != nil { 1048 1048 + WriteUnauthorized(w, err.Error()) 1049 1049 + return 1050 1050 + } 1051 1051 + 1052 1052 + rkey := r.URL.Query().Get("rkey") 1053 1053 + if rkey == "" { 1054 1054 + WriteBadRequest(w, "rkey required") 1055 1055 + return 1056 1056 + } 1057 1057 + 1058 1058 + did := session.DID 1059 1059 + collection := xrpc.CollectionNote 1060 1060 + for _, col := range []string{xrpc.CollectionNote, xrpc.CollectionHighlight} { 1061 1061 + uri := "at://" + did + "/" + col + "/" + rkey 1062 1062 + if note, dbErr := s.db.GetNoteByURI(uri); dbErr == nil && note != nil { 1063 1063 + collection = col 1064 1064 + break 1065 1065 + } else if _, dbErr := s.db.GetHighlightByURI(uri); dbErr == nil { 1066 1066 + collection = col 1067 1067 + break 1068 1068 + } 1069 1069 + } 1070 1070 + 1071 1071 + pdsErr := s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 1072 1072 + return client.DeleteRecord(r.Context(), did, collection, rkey) 1073 1073 + }) 1074 1074 + if pdsErr != nil { 1075 1075 + logger.Error("PDS delete highlight failed (will still clean local DB): %v", pdsErr) 1076 1076 + } 1077 1077 + 1078 1078 + uri := "at://" + did + "/" + collection + "/" + rkey 1079 1079 + s.db.DeleteHighlight(uri) 1080 1080 + s.db.DeleteNote(uri) 1081 1081 + 1082 1082 + WriteSuccess(w, map[string]bool{"success": true}) 1083 1083 + } 1084 1084 + 1085 1085 + func (s *NoteWriteService) DeleteBookmark(w http.ResponseWriter, r *http.Request) { 1086 1086 + session, err := s.refresher.GetSessionWithAutoRefresh(r) 1087 1087 + if err != nil { 1088 1088 + WriteUnauthorized(w, err.Error()) 1089 1089 + return 1090 1090 + } 1091 1091 + 1092 1092 + rkey := r.URL.Query().Get("rkey") 1093 1093 + if rkey == "" { 1094 1094 + WriteBadRequest(w, "rkey required") 1095 1095 + return 1096 1096 + } 1097 1097 + 1098 1098 + did := session.DID 1099 1099 + collection := xrpc.CollectionNote 1100 1100 + for _, col := range []string{xrpc.CollectionNote, xrpc.CollectionBookmark, xrpc.CollectionCommunityBookmark} { 1101 1101 + uri := "at://" + did + "/" + col + "/" + rkey 1102 1102 + if note, dbErr := s.db.GetNoteByURI(uri); dbErr == nil && note != nil { 1103 1103 + collection = col 1104 1104 + break 1105 1105 + } else if _, dbErr := s.db.GetBookmarkByURI(uri); dbErr == nil { 1106 1106 + collection = col 1107 1107 + break 1108 1108 + } 1109 1109 + } 1110 1110 + 1111 1111 + pdsErr := s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 1112 1112 + return client.DeleteRecord(r.Context(), did, collection, rkey) 1113 1113 + }) 1114 1114 + if pdsErr != nil { 1115 1115 + logger.Error("PDS delete bookmark failed (will still clean local DB): %v", pdsErr) 1116 1116 + } 1117 1117 + 1118 1118 + uri := "at://" + did + "/" + collection + "/" + rkey 1119 1119 + s.db.DeleteBookmark(uri) 1120 1120 + s.db.DeleteNote(uri) 1121 1121 + 1122 1122 + WriteSuccess(w, map[string]bool{"success": true}) 1123 1123 + } 1124 1124 + 1125 1125 + type UpdateHighlightRequest struct { 1126 1126 + Color string `json:"color"` 1127 1127 + Tags []string `json:"tags,omitempty"` 1128 1128 + Labels []string `json:"labels,omitempty"` 1129 1129 + } 1130 1130 + 1131 1131 + func (s *NoteWriteService) UpdateHighlight(w http.ResponseWriter, r *http.Request) { 1132 1132 + uri := r.URL.Query().Get("uri") 1133 1133 + if uri == "" { 1134 1134 + WriteBadRequest(w, "uri query parameter required") 1135 1135 + return 1136 1136 + } 1137 1137 + 1138 1138 + session, err := s.refresher.GetSessionWithAutoRefresh(r) 1139 1139 + if err != nil { 1140 1140 + WriteUnauthorized(w, err.Error()) 1141 1141 + return 1142 1142 + } 1143 1143 + 1144 1144 + if len(uri) < 5 || !strings.HasPrefix(uri[5:], session.DID) { 1145 1145 + WriteForbidden(w, "Not authorized") 1146 1146 + return 1147 1147 + } 1148 1148 + 1149 1149 + var req UpdateHighlightRequest 1150 1150 + if err := json.NewDecoder(r.Body).Decode(&req); err != nil { 1151 1151 + WriteBadRequest(w, "Invalid request body") 1152 1152 + return 1153 1153 + } 1154 1154 + 1155 1155 + parts := parseATURI(uri) 1156 1156 + if len(parts) < 3 { 1157 1157 + WriteBadRequest(w, "Invalid URI") 1158 1158 + return 1159 1159 + } 1160 1160 + rkey := parts[2] 1161 1161 + 1162 1162 + for i, t := range req.Tags { 1163 1163 + req.Tags[i] = strings.ToLower(t) 1164 1164 + } 1165 1165 + 1166 1166 + var result *xrpc.PutRecordOutput 1167 1167 + err = s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 1168 1168 + collection := parts[1] 1169 1169 + existing, getErr := client.GetRecord(r.Context(), did, collection, rkey) 1170 1170 + if getErr != nil { 1171 1171 + return fmt.Errorf("failed to fetch record: %w", getErr) 1172 1172 + } 1173 1173 + 1174 1174 + var updateErr error 1175 1175 + if collection == xrpc.CollectionNote { 1176 1176 + var record xrpc.NoteRecord 1177 1177 + json.Unmarshal(existing.Value, &record) 1178 1178 + 1179 1179 + if req.Color != "" { 1180 1180 + record.Color = req.Color 1181 1181 + } 1182 1182 + if req.Tags != nil { 1183 1183 + record.Tags = req.Tags 1184 1184 + } 1185 1185 + 1186 1186 + record.Labels = xrpc.NewSelfLabels(filterSelfLabels(req.Labels)) 1187 1187 + 1188 1188 + if err := record.Validate(); err != nil { 1189 1189 + return fmt.Errorf("validation failed: %w", err) 1190 1190 + } 1191 1191 + result, updateErr = client.PutRecord(r.Context(), did, collection, rkey, record) 1192 1192 + if updateErr != nil { 1193 1193 + _ = client.DeleteRecord(r.Context(), did, collection, rkey) 1194 1194 + result, updateErr = client.PutRecord(r.Context(), did, collection, rkey, record) 1195 1195 + } 1196 1196 + } else { 1197 1197 + var record xrpc.HighlightRecord 1198 1198 + json.Unmarshal(existing.Value, &record) 1199 1199 + 1200 1200 + if req.Color != "" { 1201 1201 + record.Color = req.Color 1202 1202 + } 1203 1203 + if req.Tags != nil { 1204 1204 + record.Tags = req.Tags 1205 1205 + } 1206 1206 + 1207 1207 + record.Labels = xrpc.NewSelfLabels(filterSelfLabels(req.Labels)) 1208 1208 + 1209 1209 + if err := record.Validate(); err != nil { 1210 1210 + return fmt.Errorf("validation failed: %w", err) 1211 1211 + } 1212 1212 + result, updateErr = client.PutRecord(r.Context(), did, collection, rkey, record) 1213 1213 + if updateErr != nil { 1214 1214 + _ = client.DeleteRecord(r.Context(), did, collection, rkey) 1215 1215 + result, updateErr = client.PutRecord(r.Context(), did, collection, rkey, record) 1216 1216 + } 1217 1217 + } 1218 1218 + return updateErr 1219 1219 + }) 1220 1220 + 1221 1221 + if err != nil { 1222 1222 + HandleAPIError(w, r, err, "Failed to update: ", http.StatusInternalServerError) 1223 1223 + return 1224 1224 + } 1225 1225 + 1226 1226 + tagsJSON := "" 1227 1227 + if req.Tags != nil { 1228 1228 + b, _ := json.Marshal(req.Tags) 1229 1229 + tagsJSON = string(b) 1230 1230 + } 1231 1231 + if parts[1] == xrpc.CollectionNote { 1232 1232 + s.db.UpdateNoteHighlight(uri, req.Color, tagsJSON, result.CID) 1233 1233 + } else { 1234 1234 + s.db.UpdateHighlight(uri, req.Color, tagsJSON, result.CID) 1235 1235 + } 1236 1236 + 1237 1237 + if err := s.db.SyncSelfLabels(session.DID, uri, filterSelfLabels(req.Labels)); err != nil { 1238 1238 + logger.Error("Warning: failed to sync self-labels: %v", err) 1239 1239 + } 1240 1240 + 1241 1241 + WriteSuccess(w, map[string]interface{}{"success": true, "uri": result.URI, "cid": result.CID}) 1242 1242 + } 1243 1243 + 1244 1244 + type UpdateBookmarkRequest struct { 1245 1245 + Title string `json:"title"` 1246 1246 + Description string `json:"description"` 1247 1247 + Tags []string `json:"tags,omitempty"` 1248 1248 + Labels []string `json:"labels,omitempty"` 1249 1249 + } 1250 1250 + 1251 1251 + func (s *NoteWriteService) UpdateBookmark(w http.ResponseWriter, r *http.Request) { 1252 1252 + uri := r.URL.Query().Get("uri") 1253 1253 + if uri == "" { 1254 1254 + WriteBadRequest(w, "uri query parameter required") 1255 1255 + return 1256 1256 + } 1257 1257 + 1258 1258 + session, err := s.refresher.GetSessionWithAutoRefresh(r) 1259 1259 + if err != nil { 1260 1260 + WriteUnauthorized(w, err.Error()) 1261 1261 + return 1262 1262 + } 1263 1263 + 1264 1264 + if len(uri) < 5 || !strings.HasPrefix(uri[5:], session.DID) { 1265 1265 + WriteForbidden(w, "Not authorized") 1266 1266 + return 1267 1267 + } 1268 1268 + 1269 1269 + var req UpdateBookmarkRequest 1270 1270 + if err := json.NewDecoder(r.Body).Decode(&req); err != nil { 1271 1271 + WriteBadRequest(w, "Invalid request body") 1272 1272 + return 1273 1273 + } 1274 1274 + 1275 1275 + parts := parseATURI(uri) 1276 1276 + if len(parts) < 3 { 1277 1277 + WriteBadRequest(w, "Invalid URI") 1278 1278 + return 1279 1279 + } 1280 1280 + rkey := parts[2] 1281 1281 + 1282 1282 + var result *xrpc.PutRecordOutput 1283 1283 + for i, t := range req.Tags { 1284 1284 + req.Tags[i] = strings.ToLower(t) 1285 1285 + } 1286 1286 + 1287 1287 + err = s.refresher.ExecuteWithAutoRefresh(r, session, func(client *xrpc.Client, did string) error { 1288 1288 + collection := parts[1] 1289 1289 + existing, getErr := client.GetRecord(r.Context(), did, collection, rkey) 1290 1290 + if getErr != nil { 1291 1291 + return fmt.Errorf("failed to fetch record: %w", getErr) 1292 1292 + } 1293 1293 + 1294 1294 + var updateErr error 1295 1295 + if collection == xrpc.CollectionNote { 1296 1296 + var record xrpc.NoteRecord 1297 1297 + json.Unmarshal(existing.Value, &record) 1298 1298 + 1299 1299 + if req.Title != "" { 1300 1300 + record.Target.Title = req.Title 1301 1301 + } 1302 1302 + if req.Description != "" { 1303 1303 + if record.Body == nil { 1304 1304 + record.Body = &xrpc.AnnotationBody{Format: "text/plain"} 1305 1305 + } 1306 1306 + record.Body.Value = req.Description 1307 1307 + } 1308 1308 + if req.Tags != nil { 1309 1309 + record.Tags = req.Tags 1310 1310 + } 1311 1311 + 1312 1312 + record.Labels = xrpc.NewSelfLabels(filterSelfLabels(req.Labels)) 1313 1313 + 1314 1314 + if err := record.Validate(); err != nil { 1315 1315 + return fmt.Errorf("validation failed: %w", err) 1316 1316 + } 1317 1317 + result, updateErr = client.PutRecord(r.Context(), did, collection, rkey, record) 1318 1318 + if updateErr != nil { 1319 1319 + _ = client.DeleteRecord(r.Context(), did, collection, rkey) 1320 1320 + result, updateErr = client.PutRecord(r.Context(), did, collection, rkey, record) 1321 1321 + } 1322 1322 + } else { 1323 1323 + var record xrpc.BookmarkRecord 1324 1324 + json.Unmarshal(existing.Value, &record) 1325 1325 + 1326 1326 + if req.Title != "" { 1327 1327 + record.Title = req.Title 1328 1328 + } 1329 1329 + if req.Description != "" { 1330 1330 + record.Description = req.Description 1331 1331 + } 1332 1332 + if req.Tags != nil { 1333 1333 + record.Tags = req.Tags 1334 1334 + } 1335 1335 + 1336 1336 + record.Labels = xrpc.NewSelfLabels(filterSelfLabels(req.Labels)) 1337 1337 + 1338 1338 + if err := record.Validate(); err != nil { 1339 1339 + return fmt.Errorf("validation failed: %w", err) 1340 1340 + } 1341 1341 + result, updateErr = client.PutRecord(r.Context(), did, collection, rkey, record) 1342 1342 + if updateErr != nil { 1343 1343 + _ = client.DeleteRecord(r.Context(), did, collection, rkey) 1344 1344 + result, updateErr = client.PutRecord(r.Context(), did, collection, rkey, record) 1345 1345 + } 1346 1346 + } 1347 1347 + return updateErr 1348 1348 + }) 1349 1349 + 1350 1350 + if err != nil { 1351 1351 + HandleAPIError(w, r, err, "Failed to update: ", http.StatusInternalServerError) 1352 1352 + return 1353 1353 + } 1354 1354 + 1355 1355 + tagsJSON := "" 1356 1356 + if req.Tags != nil { 1357 1357 + b, _ := json.Marshal(req.Tags) 1358 1358 + tagsJSON = string(b) 1359 1359 + } 1360 1360 + if parts[1] == xrpc.CollectionNote { 1361 1361 + s.db.UpdateNoteBookmark(uri, req.Title, req.Description, tagsJSON, result.CID) 1362 1362 + } else { 1363 1363 + s.db.UpdateBookmark(uri, req.Title, req.Description, tagsJSON, result.CID) 1364 1364 + } 1365 1365 + 1366 1366 + if err := s.db.SyncSelfLabels(session.DID, uri, filterSelfLabels(req.Labels)); err != nil { 1367 1367 + logger.Error("Warning: failed to sync self-labels: %v", err) 1368 1368 + } 1369 1369 + 1370 1370 + if req.Tags != nil { 1371 1371 + capturedSession := session 1372 1372 + capturedTags := append([]string(nil), req.Tags...) 1373 1373 + capturedURI := uri 1374 1374 + go func() { 1375 1375 + note, err := s.db.GetNoteByURI(capturedURI) 1376 1376 + if err != nil || note == nil || note.TargetSource == "" { 1377 1377 + return 1378 1378 + } 1379 1379 + targetURL := note.TargetSource 1380 1380 + client := s.refresher.CreateClientFromSession(capturedSession) 1381 1381 + ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) 1382 1382 + defer cancel() 1383 1383 + records, err := client.ListRecords(ctx, capturedSession.DID, xrpc.CollectionCommunityBookmark, 100) 1384 1384 + if err != nil { 1385 1385 + return 1386 1386 + } 1387 1387 + for _, rec := range records.Records { 1388 1388 + var cb struct { 1389 1389 + Subject string `json:"subject"` 1390 1390 + CreatedAt string `json:"createdAt"` 1391 1391 + Tags []string `json:"tags"` 1392 1392 + } 1393 1393 + if err := json.Unmarshal(rec.Value, &cb); err != nil { 1394 1394 + continue 1395 1395 + } 1396 1396 + if cb.Subject != targetURL { 1397 1397 + continue 1398 1398 + } 1399 1399 + parts := parseATURI(rec.URI) 1400 1400 + if len(parts) < 3 { 1401 1401 + continue 1402 1402 + } 1403 1403 + _, _ = client.PutRecord(ctx, capturedSession.DID, xrpc.CollectionCommunityBookmark, parts[2], map[string]interface{}{ 1404 1404 + "$type": xrpc.CollectionCommunityBookmark, 1405 1405 + "subject": cb.Subject, 1406 1406 + "createdAt": cb.CreatedAt, 1407 1407 + "tags": capturedTags, 1408 1408 + }) 1409 1409 + return 1410 1410 + } 1411 1411 + }() 1412 1412 + } 1413 1413 + 1414 1414 + WriteSuccess(w, map[string]interface{}{"success": true, "uri": result.URI, "cid": result.CID}) 1415 1415 + }

+103

backend/internal/api/notes_helpers.go

reviewed

··· 1 1 + package api 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "encoding/json" 6 6 + "time" 7 7 + 8 8 + "margin.at/internal/domain" 9 9 + "margin.at/internal/xrpc" 10 10 + ) 11 11 + 12 12 + var validSelfLabelSet = map[string]bool{ 13 13 + "sexual": true, 14 14 + "nudity": true, 15 15 + "violence": true, 16 16 + "gore": true, 17 17 + "spam": true, 18 18 + "misleading": true, 19 19 + } 20 20 + 21 21 + func filterSelfLabels(labels []string) []string { 22 22 + if len(labels) == 0 { 23 23 + return nil 24 24 + } 25 25 + out := make([]string, 0, len(labels)) 26 26 + for _, l := range labels { 27 27 + if validSelfLabelSet[l] { 28 28 + out = append(out, l) 29 29 + } 30 30 + } 31 31 + return out 32 32 + } 33 33 + 34 34 + func putRecordWithRetry( 35 35 + ctx context.Context, 36 36 + client *xrpc.Client, 37 37 + did, collection, rkey string, 38 38 + record interface{ Validate() error }, 39 39 + ) (*xrpc.PutRecordOutput, error) { 40 40 + if err := record.Validate(); err != nil { 41 41 + return nil, err 42 42 + } 43 43 + result, err := client.PutRecord(ctx, did, collection, rkey, record) 44 44 + if err != nil { 45 45 + _ = client.DeleteRecord(ctx, did, collection, rkey) 46 46 + result, err = client.PutRecord(ctx, did, collection, rkey, record) 47 47 + } 48 48 + return result, err 49 49 + } 50 50 + 51 51 + func (s *NoteWriteService) checkDuplicateAnnotation(did, url, text string) (*domain.Annotation, error) { 52 52 + recent, err := s.db.GetAnnotationsByAuthor(did, 5, 0) 53 53 + if err != nil { 54 54 + return nil, err 55 55 + } 56 56 + for i := range recent { 57 57 + a := &recent[i] 58 58 + if a.TargetSource == url && 59 59 + ((a.BodyValue == nil && text == "") || (a.BodyValue != nil && *a.BodyValue == text)) && 60 60 + time.Since(a.CreatedAt) < 10*time.Second { 61 61 + return a, nil 62 62 + } 63 63 + } 64 64 + return nil, nil 65 65 + } 66 66 + 67 67 + func (s *NoteWriteService) checkDuplicateHighlight(did, url string, selector json.RawMessage) (*domain.Highlight, error) { 68 68 + recent, err := s.db.GetHighlightsByAuthor(did, 5, 0) 69 69 + if err != nil { 70 70 + return nil, err 71 71 + } 72 72 + for i := range recent { 73 73 + h := &recent[i] 74 74 + if h.TargetSource != url || time.Since(h.CreatedAt) >= 10*time.Second { 75 75 + continue 76 76 + } 77 77 + if selector == nil && h.SelectorJSON == nil { 78 78 + return h, nil 79 79 + } 80 80 + if selector != nil && h.SelectorJSON != nil { 81 81 + b, _ := json.Marshal(selector) 82 82 + if *h.SelectorJSON == string(b) { 83 83 + return h, nil 84 84 + } 85 85 + } 86 86 + } 87 87 + return nil, nil 88 88 + } 89 89 + 90 90 + func (s *NoteWriteService) checkDuplicateBookmark(did, url string) (*domain.Bookmark, error) { 91 91 + urlHash := s.db.HashURL(url) 92 92 + bookmarks, err := s.db.GetBookmarksByTargetHash(urlHash, 50, 0) 93 93 + if err != nil { 94 94 + return nil, err 95 95 + } 96 96 + for i := range bookmarks { 97 97 + b := &bookmarks[i] 98 98 + if b.AuthorDID == did && b.Source == url { 99 99 + return b, nil 100 100 + } 101 101 + } 102 102 + return nil, nil 103 103 + }

+9 -1

backend/internal/api/preferences.go

reviewed

··· 27 27 SubscribedLabelers []LabelerSubscription `json:"subscribedLabelers"` 28 28 LabelPreferences []LabelPreference `json:"labelPreferences"` 29 29 DisableExternalLinkWarning bool `json:"disableExternalLinkWarning"` 30 30 + EnableCommunityBookmarks bool `json:"enableCommunityBookmarks"` 30 31 } 31 32 32 33 func (h *Handler) GetPreferences(w http.ResponseWriter, r *http.Request) { ··· 72 73 disableWarning = *prefs.DisableExternalLinkWarning 73 74 } 74 75 76 76 + enableCommunityBookmarks := true 77 77 + if prefs != nil && prefs.EnableCommunityBookmarks != nil { 78 78 + enableCommunityBookmarks = *prefs.EnableCommunityBookmarks 79 79 + } 80 80 + 75 81 WriteSuccess(w, PreferencesResponse{ 76 82 ExternalLinkSkippedHostnames: hostnames, 77 83 SubscribedLabelers: labelers, 78 84 LabelPreferences: labelPrefs, 79 85 DisableExternalLinkWarning: disableWarning, 86 86 + EnableCommunityBookmarks: enableCommunityBookmarks, 80 87 }) 81 88 } 82 89 ··· 110 117 }) 111 118 } 112 119 113 113 - record := xrpc.NewPreferencesRecord(input.ExternalLinkSkippedHostnames, xrpcLabelers, xrpcLabelPrefs, &input.DisableExternalLinkWarning) 120 120 + record := xrpc.NewPreferencesRecord(input.ExternalLinkSkippedHostnames, xrpcLabelers, xrpcLabelPrefs, &input.DisableExternalLinkWarning, &input.EnableCommunityBookmarks) 114 121 if err := record.Validate(); err != nil { 115 122 WriteBadRequest(w, fmt.Sprintf("Invalid record: %v", err)) 116 123 return ··· 152 159 SubscribedLabelers: subscribedLabelersPtr, 153 160 LabelPreferences: labelPrefsPtr, 154 161 DisableExternalLinkWarning: &input.DisableExternalLinkWarning, 162 162 + EnableCommunityBookmarks: &input.EnableCommunityBookmarks, 155 163 CreatedAt: createdAt, 156 164 IndexedAt: time.Now(), 157 165 })

+1 -1

backend/internal/api/token_refresh.go

reviewed

··· 48 48 baseURL = baseURL[:len(baseURL)-1] 49 49 } 50 50 51 51 - clientID := baseURL + "/client-metadata.json" 51 51 + clientID := baseURL + "/oauth-client-metadata.json" 52 52 redirectURI := baseURL + "/auth/callback" 53 53 54 54 return oauth.NewClient(clientID, redirectURI, tr.privateKey)

+34 -763

backend/internal/db/db.go

reviewed

··· 8 8 "time" 9 9 10 10 _ "github.com/lib/pq" 11 11 + "margin.at/internal/domain" 11 12 ) 12 13 13 14 type DB struct { 14 15 *sql.DB 15 16 } 16 17 17 17 - type Annotation struct { 18 18 - URI string `json:"uri"` 19 19 - AuthorDID string `json:"authorDid"` 20 20 - Motivation string `json:"motivation,omitempty"` 21 21 - BodyValue *string `json:"bodyValue,omitempty"` 22 22 - BodyFormat *string `json:"bodyFormat,omitempty"` 23 23 - BodyURI *string `json:"bodyUri,omitempty"` 24 24 - TargetSource string `json:"targetSource"` 25 25 - TargetHash string `json:"targetHash"` 26 26 - TargetTitle *string `json:"targetTitle,omitempty"` 27 27 - SelectorJSON *string `json:"selector,omitempty"` 28 28 - TagsJSON *string `json:"tags,omitempty"` 29 29 - CreatedAt time.Time `json:"createdAt"` 30 30 - IndexedAt time.Time `json:"indexedAt"` 31 31 - CID *string `json:"cid,omitempty"` 32 32 - } 33 33 - 34 34 - type Selector struct { 35 35 - Type string `json:"type"` 36 36 - Exact string `json:"exact,omitempty"` 37 37 - Prefix string `json:"prefix,omitempty"` 38 38 - Suffix string `json:"suffix,omitempty"` 39 39 - Start *int `json:"start,omitempty"` 40 40 - End *int `json:"end,omitempty"` 41 41 - Value string `json:"value,omitempty"` 42 42 - } 43 43 - 44 44 - type Highlight struct { 45 45 - URI string `json:"uri"` 46 46 - AuthorDID string `json:"authorDid"` 47 47 - TargetSource string `json:"targetSource"` 48 48 - TargetHash string `json:"targetHash"` 49 49 - TargetTitle *string `json:"targetTitle,omitempty"` 50 50 - SelectorJSON *string `json:"selector,omitempty"` 51 51 - Color *string `json:"color,omitempty"` 52 52 - TagsJSON *string `json:"tags,omitempty"` 53 53 - CreatedAt time.Time `json:"createdAt"` 54 54 - IndexedAt time.Time `json:"indexedAt"` 55 55 - CID *string `json:"cid,omitempty"` 56 56 - } 57 57 - 58 58 - type Bookmark struct { 59 59 - URI string `json:"uri"` 60 60 - AuthorDID string `json:"authorDid"` 61 61 - Source string `json:"source"` 62 62 - SourceHash string `json:"sourceHash"` 63 63 - Title *string `json:"title,omitempty"` 64 64 - Description *string `json:"description,omitempty"` 65 65 - TagsJSON *string `json:"tags,omitempty"` 66 66 - CreatedAt time.Time `json:"createdAt"` 67 67 - IndexedAt time.Time `json:"indexedAt"` 68 68 - CID *string `json:"cid,omitempty"` 69 69 - } 70 70 - 71 71 - type Reply struct { 72 72 - URI string `json:"uri"` 73 73 - AuthorDID string `json:"authorDid"` 74 74 - ParentURI string `json:"parentUri"` 75 75 - RootURI string `json:"rootUri"` 76 76 - Text string `json:"text"` 77 77 - Format *string `json:"format,omitempty"` 78 78 - CreatedAt time.Time `json:"createdAt"` 79 79 - IndexedAt time.Time `json:"indexedAt"` 80 80 - CID *string `json:"cid,omitempty"` 81 81 - } 82 82 - 83 83 - type Like struct { 84 84 - URI string `json:"uri"` 85 85 - AuthorDID string `json:"authorDid"` 86 86 - SubjectURI string `json:"subjectUri"` 87 87 - CreatedAt time.Time `json:"createdAt"` 88 88 - IndexedAt time.Time `json:"indexedAt"` 89 89 - } 90 90 - 91 91 - type Collection struct { 92 92 - URI string `json:"uri"` 93 93 - AuthorDID string `json:"authorDid"` 94 94 - Name string `json:"name"` 95 95 - Description *string `json:"description,omitempty"` 96 96 - Icon *string `json:"icon,omitempty"` 97 97 - CreatedAt time.Time `json:"createdAt"` 98 98 - IndexedAt time.Time `json:"indexedAt"` 99 99 - } 100 100 - 101 101 - type CollectionItem struct { 102 102 - URI string `json:"uri"` 103 103 - AuthorDID string `json:"authorDid"` 104 104 - CollectionURI string `json:"collectionUri"` 105 105 - AnnotationURI string `json:"annotationUri"` 106 106 - Position int `json:"position"` 107 107 - CreatedAt time.Time `json:"createdAt"` 108 108 - IndexedAt time.Time `json:"indexedAt"` 109 109 - } 110 110 - 111 111 - type Notification struct { 112 112 - ID int `json:"id"` 113 113 - RecipientDID string `json:"recipientDid"` 114 114 - ActorDID string `json:"actorDid"` 115 115 - Type string `json:"type"` 116 116 - SubjectURI string `json:"subjectUri"` 117 117 - CreatedAt time.Time `json:"createdAt"` 118 118 - ReadAt *time.Time `json:"readAt,omitempty"` 119 119 - } 120 120 - 121 121 - type APIKey struct { 122 122 - ID string `json:"id"` 123 123 - OwnerDID string `json:"ownerDid"` 124 124 - Name string `json:"name"` 125 125 - KeyHash string `json:"-"` 126 126 - CreatedAt time.Time `json:"createdAt"` 127 127 - LastUsedAt *time.Time `json:"lastUsedAt,omitempty"` 128 128 - URI string `json:"uri"` 129 129 - CID *string `json:"cid,omitempty"` 130 130 - IndexedAt time.Time `json:"indexedAt"` 131 131 - } 132 132 - 133 133 - type Profile struct { 134 134 - URI string `json:"uri"` 135 135 - AuthorDID string `json:"authorDid"` 136 136 - DisplayName *string `json:"displayName,omitempty"` 137 137 - Avatar *string `json:"avatar,omitempty"` 138 138 - Bio *string `json:"bio,omitempty"` 139 139 - Website *string `json:"website,omitempty"` 140 140 - LinksJSON *string `json:"links,omitempty"` 141 141 - CreatedAt time.Time `json:"createdAt"` 142 142 - IndexedAt time.Time `json:"indexedAt"` 143 143 - CID *string `json:"cid,omitempty"` 144 144 - } 145 145 - 146 146 - type Preferences struct { 147 147 - URI string `json:"uri"` 148 148 - AuthorDID string `json:"authorDid"` 149 149 - ExternalLinkSkippedHostnames *string `json:"externalLinkSkippedHostnames,omitempty"` 150 150 - SubscribedLabelers *string `json:"subscribedLabelers,omitempty"` 151 151 - LabelPreferences *string `json:"labelPreferences,omitempty"` 152 152 - DisableExternalLinkWarning *bool `json:"disableExternalLinkWarning,omitempty"` 153 153 - CreatedAt time.Time `json:"createdAt"` 154 154 - IndexedAt time.Time `json:"indexedAt"` 155 155 - CID *string `json:"cid,omitempty"` 156 156 - } 157 157 - 158 158 - type Block struct { 159 159 - ID int `json:"id"` 160 160 - ActorDID string `json:"actorDid"` 161 161 - SubjectDID string `json:"subjectDid"` 162 162 - CreatedAt time.Time `json:"createdAt"` 163 163 - } 164 164 - 165 165 - type Mute struct { 166 166 - ID int `json:"id"` 167 167 - ActorDID string `json:"actorDid"` 168 168 - SubjectDID string `json:"subjectDid"` 169 169 - CreatedAt time.Time `json:"createdAt"` 170 170 - } 171 171 - 172 172 - type ModerationReport struct { 173 173 - ID int `json:"id"` 174 174 - ReporterDID string `json:"reporterDid"` 175 175 - SubjectDID string `json:"subjectDid"` 176 176 - SubjectURI *string `json:"subjectUri,omitempty"` 177 177 - ReasonType string `json:"reasonType"` 178 178 - ReasonText *string `json:"reasonText,omitempty"` 179 179 - Status string `json:"status"` 180 180 - CreatedAt time.Time `json:"createdAt"` 181 181 - ResolvedAt *time.Time `json:"resolvedAt,omitempty"` 182 182 - ResolvedBy *string `json:"resolvedBy,omitempty"` 183 183 - } 184 184 - 185 185 - type ModerationAction struct { 186 186 - ID int `json:"id"` 187 187 - ReportID int `json:"reportId"` 188 188 - ActorDID string `json:"actorDid"` 189 189 - Action string `json:"action"` 190 190 - Comment *string `json:"comment,omitempty"` 191 191 - CreatedAt time.Time `json:"createdAt"` 192 192 - } 193 193 - 194 194 - type ContentLabel struct { 195 195 - ID int `json:"id"` 196 196 - Src string `json:"src"` 197 197 - URI string `json:"uri"` 198 198 - Val string `json:"val"` 199 199 - Neg bool `json:"neg"` 200 200 - CreatedBy string `json:"createdBy"` 201 201 - CreatedAt time.Time `json:"createdAt"` 202 202 - } 18 18 + type ( 19 19 + Note = domain.Note 20 20 + Annotation = domain.Annotation 21 21 + Selector = domain.Selector 22 22 + Highlight = domain.Highlight 23 23 + Bookmark = domain.Bookmark 24 24 + Reply = domain.Reply 25 25 + Like = domain.Like 26 26 + Collection = domain.Collection 27 27 + CollectionItem = domain.CollectionItem 28 28 + Notification = domain.Notification 29 29 + APIKey = domain.APIKey 30 30 + Profile = domain.Profile 31 31 + Preferences = domain.Preferences 32 32 + Block = domain.Block 33 33 + Mute = domain.Mute 34 34 + ModerationReport = domain.ModerationReport 35 35 + ModerationAction = domain.ModerationAction 36 36 + ContentLabel = domain.ContentLabel 37 37 + ) 203 38 204 39 func New(dsn string) (*DB, error) { 205 40 if !strings.HasPrefix(dsn, "postgres://") && !strings.HasPrefix(dsn, "postgresql://") { 206 206 - return nil, fmt.Errorf("only PostgreSQL is supported, DSN must start with postgres:// or postgresql://") 41 41 + return nil, fmt.Errorf("only PostgreSQL is supported; DSN must start with postgres:// or postgresql://") 207 42 } 208 43 209 209 - db, err := sql.Open("postgres", dsn) 44 44 + sqlDB, err := sql.Open("postgres", dsn) 210 45 if err != nil { 211 211 - return nil, fmt.Errorf("failed to open database connection: %w", err) 46 46 + return nil, fmt.Errorf("open database: %w", err) 212 47 } 213 48 214 214 - db.SetMaxOpenConns(25) 215 215 - db.SetMaxIdleConns(10) 216 216 - db.SetConnMaxLifetime(5 * time.Minute) 217 217 - db.SetConnMaxIdleTime(2 * time.Minute) 49 49 + sqlDB.SetMaxOpenConns(25) 50 50 + sqlDB.SetMaxIdleConns(10) 51 51 + sqlDB.SetConnMaxLifetime(5 * time.Minute) 52 52 + sqlDB.SetConnMaxIdleTime(2 * time.Minute) 218 53 219 219 - if err := db.Ping(); err != nil { 220 220 - return nil, fmt.Errorf("failed to ping database: %w", err) 54 54 + if err := sqlDB.Ping(); err != nil { 55 55 + return nil, fmt.Errorf("ping database: %w", err) 221 56 } 222 57 223 223 - return &DB{DB: db}, nil 58 58 + return &DB{DB: sqlDB}, nil 224 59 } 225 60 226 226 - func (db *DB) Migrate() error { 227 227 - _, err := db.Exec(` 228 228 - CREATE TABLE IF NOT EXISTS annotations ( 229 229 - uri TEXT PRIMARY KEY, 230 230 - author_did TEXT NOT NULL, 231 231 - motivation TEXT, 232 232 - body_value TEXT, 233 233 - body_format TEXT DEFAULT 'text/plain', 234 234 - body_uri TEXT, 235 235 - target_source TEXT NOT NULL, 236 236 - target_hash TEXT NOT NULL, 237 237 - target_title TEXT, 238 238 - selector_json TEXT, 239 239 - tags_json TEXT, 240 240 - created_at TIMESTAMP NOT NULL, 241 241 - indexed_at TIMESTAMP NOT NULL, 242 242 - cid TEXT 243 243 - )`) 244 244 - if err != nil { 245 245 - return err 246 246 - } 247 247 - 248 248 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_annotations_target_hash ON annotations(target_hash)`) 249 249 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_annotations_target_source ON annotations(target_source)`) 250 250 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_annotations_author_did ON annotations(author_did)`) 251 251 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_annotations_motivation ON annotations(motivation)`) 252 252 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_annotations_created_at ON annotations(created_at DESC)`) 253 253 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_annotations_author_created ON annotations(author_did, created_at DESC)`) 254 254 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_annotations_uri_pattern ON annotations(uri text_pattern_ops)`) 255 255 - 256 256 - db.Exec(`CREATE TABLE IF NOT EXISTS highlights ( 257 257 - uri TEXT PRIMARY KEY, 258 258 - author_did TEXT NOT NULL, 259 259 - target_source TEXT NOT NULL, 260 260 - target_hash TEXT NOT NULL, 261 261 - target_title TEXT, 262 262 - selector_json TEXT, 263 263 - color TEXT, 264 264 - tags_json TEXT, 265 265 - created_at TIMESTAMP NOT NULL, 266 266 - indexed_at TIMESTAMP NOT NULL, 267 267 - cid TEXT 268 268 - )`) 269 269 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_highlights_target_hash ON highlights(target_hash)`) 270 270 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_highlights_author_did ON highlights(author_did)`) 271 271 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_highlights_created_at ON highlights(created_at DESC)`) 272 272 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_highlights_author_created ON highlights(author_did, created_at DESC)`) 273 273 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_highlights_uri_pattern ON highlights(uri text_pattern_ops)`) 274 274 - 275 275 - db.Exec(`CREATE TABLE IF NOT EXISTS bookmarks ( 276 276 - uri TEXT PRIMARY KEY, 277 277 - author_did TEXT NOT NULL, 278 278 - source TEXT NOT NULL, 279 279 - source_hash TEXT NOT NULL, 280 280 - title TEXT, 281 281 - description TEXT, 282 282 - tags_json TEXT, 283 283 - created_at TIMESTAMP NOT NULL, 284 284 - indexed_at TIMESTAMP NOT NULL, 285 285 - cid TEXT 286 286 - )`) 287 287 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_bookmarks_source_hash ON bookmarks(source_hash)`) 288 288 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_bookmarks_author_did ON bookmarks(author_did)`) 289 289 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_bookmarks_created_at ON bookmarks(created_at DESC)`) 290 290 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_bookmarks_author_created ON bookmarks(author_did, created_at DESC)`) 291 291 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_bookmarks_uri_pattern ON bookmarks(uri text_pattern_ops)`) 292 292 - 293 293 - db.Exec(`CREATE TABLE IF NOT EXISTS replies ( 294 294 - uri TEXT PRIMARY KEY, 295 295 - author_did TEXT NOT NULL, 296 296 - parent_uri TEXT NOT NULL, 297 297 - root_uri TEXT NOT NULL, 298 298 - text TEXT NOT NULL, 299 299 - format TEXT DEFAULT 'text/plain', 300 300 - created_at TIMESTAMP NOT NULL, 301 301 - indexed_at TIMESTAMP NOT NULL, 302 302 - cid TEXT 303 303 - )`) 304 304 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_replies_parent_uri ON replies(parent_uri)`) 305 305 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_replies_root_uri ON replies(root_uri)`) 306 306 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_replies_created_at ON replies(created_at DESC)`) 307 307 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_replies_author_did ON replies(author_did)`) 308 308 - 309 309 - db.Exec(`CREATE TABLE IF NOT EXISTS likes ( 310 310 - uri TEXT PRIMARY KEY, 311 311 - author_did TEXT NOT NULL, 312 312 - subject_uri TEXT NOT NULL, 313 313 - created_at TIMESTAMP NOT NULL, 314 314 - indexed_at TIMESTAMP NOT NULL 315 315 - )`) 316 316 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_likes_subject_uri ON likes(subject_uri)`) 317 317 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_likes_author_did ON likes(author_did)`) 318 318 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_likes_author_subject ON likes(author_did, subject_uri)`) 319 319 - 320 320 - db.Exec(`CREATE TABLE IF NOT EXISTS collections ( 321 321 - uri TEXT PRIMARY KEY, 322 322 - author_did TEXT NOT NULL, 323 323 - name TEXT NOT NULL, 324 324 - description TEXT, 325 325 - icon TEXT, 326 326 - created_at TIMESTAMP NOT NULL, 327 327 - indexed_at TIMESTAMP NOT NULL 328 328 - )`) 329 329 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_collections_author_did ON collections(author_did)`) 330 330 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_collections_created_at ON collections(created_at DESC)`) 331 331 - 332 332 - db.Exec(`CREATE TABLE IF NOT EXISTS collection_items ( 333 333 - uri TEXT PRIMARY KEY, 334 334 - author_did TEXT NOT NULL, 335 335 - collection_uri TEXT NOT NULL, 336 336 - annotation_uri TEXT NOT NULL, 337 337 - position INTEGER DEFAULT 0, 338 338 - created_at TIMESTAMP NOT NULL, 339 339 - indexed_at TIMESTAMP NOT NULL 340 340 - )`) 341 341 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_collection_items_collection ON collection_items(collection_uri)`) 342 342 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_collection_items_annotation ON collection_items(annotation_uri)`) 343 343 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_collection_items_created_at ON collection_items(created_at DESC)`) 344 344 - 345 345 - db.Exec(`CREATE TABLE IF NOT EXISTS sessions ( 346 346 - id TEXT PRIMARY KEY, 347 347 - did TEXT NOT NULL, 348 348 - handle TEXT NOT NULL, 349 349 - access_token TEXT NOT NULL, 350 350 - refresh_token TEXT NOT NULL, 351 351 - dpop_key TEXT, 352 352 - created_at TIMESTAMP NOT NULL, 353 353 - expires_at TIMESTAMP NOT NULL 354 354 - )`) 355 355 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_sessions_did ON sessions(did)`) 356 356 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_sessions_expires ON sessions(expires_at)`) 357 357 - 358 358 - db.Exec(`CREATE TABLE IF NOT EXISTS edit_history ( 359 359 - id SERIAL PRIMARY KEY, 360 360 - uri TEXT NOT NULL, 361 361 - record_type TEXT NOT NULL, 362 362 - previous_content TEXT NOT NULL, 363 363 - previous_cid TEXT, 364 364 - edited_at TIMESTAMP NOT NULL 365 365 - )`) 366 366 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_edit_history_uri ON edit_history(uri)`) 367 367 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_edit_history_edited_at ON edit_history(edited_at DESC)`) 368 368 - 369 369 - db.Exec(`CREATE TABLE IF NOT EXISTS notifications ( 370 370 - id SERIAL PRIMARY KEY, 371 371 - recipient_did TEXT NOT NULL, 372 372 - actor_did TEXT NOT NULL, 373 373 - type TEXT NOT NULL, 374 374 - subject_uri TEXT NOT NULL, 375 375 - created_at TIMESTAMP NOT NULL, 376 376 - read_at TIMESTAMP 377 377 - )`) 378 378 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_notifications_recipient ON notifications(recipient_did)`) 379 379 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_notifications_created_at ON notifications(created_at DESC)`) 380 380 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_notifications_unread ON notifications(recipient_did) WHERE read_at IS NULL`) 381 381 - 382 382 - db.Exec(`CREATE TABLE IF NOT EXISTS api_keys ( 383 383 - id TEXT PRIMARY KEY, 384 384 - owner_did TEXT NOT NULL, 385 385 - name TEXT NOT NULL, 386 386 - key_hash TEXT NOT NULL, 387 387 - created_at TIMESTAMP NOT NULL, 388 388 - last_used_at TIMESTAMP, 389 389 - uri TEXT, 390 390 - cid TEXT, 391 391 - indexed_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP 392 392 - )`) 393 393 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_api_keys_owner ON api_keys(owner_did)`) 394 394 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_api_keys_hash ON api_keys(key_hash)`) 395 395 - 396 396 - db.Exec(`CREATE TABLE IF NOT EXISTS profiles ( 397 397 - uri TEXT PRIMARY KEY, 398 398 - author_did TEXT NOT NULL, 399 399 - display_name TEXT, 400 400 - avatar TEXT, 401 401 - bio TEXT, 402 402 - website TEXT, 403 403 - links_json TEXT, 404 404 - created_at TIMESTAMP NOT NULL, 405 405 - indexed_at TIMESTAMP NOT NULL, 406 406 - cid TEXT 407 407 - )`) 408 408 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_profiles_author_did ON profiles(author_did)`) 409 409 - 410 410 - db.Exec(`CREATE TABLE IF NOT EXISTS preferences ( 411 411 - uri TEXT PRIMARY KEY, 412 412 - author_did TEXT NOT NULL, 413 413 - external_link_skipped_hostnames TEXT, 414 414 - subscribed_labelers TEXT, 415 415 - label_preferences TEXT, 416 416 - disable_external_link_warning BOOLEAN, 417 417 - created_at TIMESTAMP NOT NULL, 418 418 - indexed_at TIMESTAMP NOT NULL, 419 419 - cid TEXT 420 420 - )`) 421 421 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_preferences_author_did ON preferences(author_did)`) 422 422 - 423 423 - db.runMigrations() 424 424 - 425 425 - db.Exec(`CREATE TABLE IF NOT EXISTS cursors ( 426 426 - id TEXT PRIMARY KEY, 427 427 - last_cursor BIGINT NOT NULL, 428 428 - updated_at TIMESTAMP NOT NULL 429 429 - )`) 430 430 - 431 431 - db.Exec(`CREATE TABLE IF NOT EXISTS blocks ( 432 432 - id SERIAL PRIMARY KEY, 433 433 - actor_did TEXT NOT NULL, 434 434 - subject_did TEXT NOT NULL, 435 435 - created_at TIMESTAMP NOT NULL, 436 436 - UNIQUE(actor_did, subject_did) 437 437 - )`) 438 438 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_blocks_actor ON blocks(actor_did)`) 439 439 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_blocks_subject ON blocks(subject_did)`) 440 440 - 441 441 - db.Exec(`CREATE TABLE IF NOT EXISTS mutes ( 442 442 - id SERIAL PRIMARY KEY, 443 443 - actor_did TEXT NOT NULL, 444 444 - subject_did TEXT NOT NULL, 445 445 - created_at TIMESTAMP NOT NULL, 446 446 - UNIQUE(actor_did, subject_did) 447 447 - )`) 448 448 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_mutes_actor ON mutes(actor_did)`) 449 449 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_mutes_subject ON mutes(subject_did)`) 450 450 - 451 451 - db.Exec(`CREATE TABLE IF NOT EXISTS moderation_reports ( 452 452 - id SERIAL PRIMARY KEY, 453 453 - reporter_did TEXT NOT NULL, 454 454 - subject_did TEXT NOT NULL, 455 455 - subject_uri TEXT, 456 456 - reason_type TEXT NOT NULL, 457 457 - reason_text TEXT, 458 458 - status TEXT NOT NULL DEFAULT 'pending', 459 459 - created_at TIMESTAMP NOT NULL, 460 460 - resolved_at TIMESTAMP, 461 461 - resolved_by TEXT 462 462 - )`) 463 463 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_mod_reports_status ON moderation_reports(status)`) 464 464 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_mod_reports_subject ON moderation_reports(subject_did)`) 465 465 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_mod_reports_reporter ON moderation_reports(reporter_did)`) 466 466 - 467 467 - db.Exec(`CREATE TABLE IF NOT EXISTS moderation_actions ( 468 468 - id SERIAL PRIMARY KEY, 469 469 - report_id INTEGER NOT NULL, 470 470 - actor_did TEXT NOT NULL, 471 471 - action TEXT NOT NULL, 472 472 - comment TEXT, 473 473 - created_at TIMESTAMP NOT NULL 474 474 - )`) 475 475 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_mod_actions_report ON moderation_actions(report_id)`) 476 476 - 477 477 - db.Exec(`CREATE TABLE IF NOT EXISTS content_labels ( 478 478 - id SERIAL PRIMARY KEY, 479 479 - src TEXT NOT NULL, 480 480 - uri TEXT NOT NULL, 481 481 - val TEXT NOT NULL, 482 482 - neg INTEGER NOT NULL DEFAULT 0, 483 483 - created_by TEXT NOT NULL, 484 484 - created_at TIMESTAMP NOT NULL 485 485 - )`) 486 486 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_content_labels_uri ON content_labels(uri)`) 487 487 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_content_labels_src ON content_labels(src)`) 488 488 - 489 489 - db.Exec(`CREATE TABLE IF NOT EXISTS publications ( 490 490 - uri TEXT PRIMARY KEY, 491 491 - author_did TEXT NOT NULL, 492 492 - url TEXT NOT NULL, 493 493 - name TEXT NOT NULL, 494 494 - description TEXT, 495 495 - show_in_discover BOOLEAN NOT NULL DEFAULT true, 496 496 - indexed_at TIMESTAMP NOT NULL 497 497 - )`) 498 498 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_publications_author ON publications(author_did)`) 499 499 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_publications_url ON publications(url)`) 500 500 - 501 501 - db.Exec(`CREATE TABLE IF NOT EXISTS documents ( 502 502 - uri TEXT PRIMARY KEY, 503 503 - author_did TEXT NOT NULL, 504 504 - site TEXT NOT NULL, 505 505 - path TEXT, 506 506 - title TEXT NOT NULL, 507 507 - description TEXT, 508 508 - text_content TEXT, 509 509 - tags_json TEXT, 510 510 - canonical_url TEXT, 511 511 - published_at TIMESTAMP NOT NULL, 512 512 - indexed_at TIMESTAMP NOT NULL 513 513 - )`) 514 514 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_documents_author ON documents(author_did)`) 515 515 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_documents_site ON documents(site)`) 516 516 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_documents_canonical ON documents(canonical_url)`) 517 517 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_documents_published ON documents(published_at DESC)`) 518 518 - 519 519 - db.runMigrations() 520 520 - 521 521 - return nil 522 522 - } 523 523 - 524 524 - func (db *DB) GetProfilesByDIDs(dids []string) (map[string]*Profile, error) { 525 525 - if len(dids) == 0 { 526 526 - return nil, nil 527 527 - } 528 528 - 529 529 - placeholders := make([]string, len(dids)) 530 530 - args := make([]interface{}, len(dids)) 531 531 - for i, did := range dids { 532 532 - placeholders[i] = fmt.Sprintf("$%d", i+1) 533 533 - args[i] = did 534 534 - } 535 535 - 536 536 - query := `SELECT uri, author_did, display_name, bio, avatar, website, links_json, created_at, indexed_at FROM profiles WHERE author_did IN (` + strings.Join(placeholders, ",") + ")" 537 537 - 538 538 - rows, err := db.Query(query, args...) 539 539 - if err != nil { 540 540 - return nil, err 541 541 - } 542 542 - defer rows.Close() 543 543 - 544 544 - profiles := make(map[string]*Profile) 545 545 - for rows.Next() { 546 546 - var p Profile 547 547 - if err := rows.Scan(&p.URI, &p.AuthorDID, &p.DisplayName, &p.Bio, &p.Avatar, &p.Website, &p.LinksJSON, &p.CreatedAt, &p.IndexedAt); err != nil { 548 548 - continue 549 549 - } 550 550 - profiles[p.AuthorDID] = &p 551 551 - } 552 552 - 553 553 - return profiles, nil 554 554 - } 555 555 - 556 556 - func (db *DB) GetCursor(id string) (int64, error) { 557 557 - var cursor int64 558 558 - err := db.QueryRow("SELECT last_cursor FROM cursors WHERE id = $1", id).Scan(&cursor) 559 559 - if err == sql.ErrNoRows { 560 560 - return 0, nil 561 561 - } 562 562 - if err != nil { 563 563 - return 0, err 564 564 - } 565 565 - return cursor, nil 566 566 - } 567 567 - 568 568 - func (db *DB) SetCursor(id string, cursor int64) error { 569 569 - query := ` 570 570 - INSERT INTO cursors (id, last_cursor, updated_at) 571 571 - VALUES ($1, $2, $3) 572 572 - ON CONFLICT(id) DO UPDATE SET 573 573 - last_cursor = EXCLUDED.last_cursor, 574 574 - updated_at = EXCLUDED.updated_at 575 575 - ` 576 576 - _, err := db.Exec(query, id, cursor, time.Now()) 577 577 - return err 578 578 - } 579 579 - 580 580 - func (db *DB) GetProfile(did string) (*Profile, error) { 581 581 - var p Profile 582 582 - err := db.QueryRow("SELECT uri, author_did, display_name, avatar, bio, website, links_json, created_at, indexed_at FROM profiles WHERE author_did = $1", did).Scan( 583 583 - &p.URI, &p.AuthorDID, &p.DisplayName, &p.Avatar, &p.Bio, &p.Website, &p.LinksJSON, &p.CreatedAt, &p.IndexedAt, 584 584 - ) 585 585 - if err == sql.ErrNoRows { 586 586 - return nil, nil 587 587 - } 588 588 - if err != nil { 589 589 - return nil, err 590 590 - } 591 591 - return &p, nil 592 592 - } 593 593 - 594 594 - func (db *DB) UpsertProfile(p *Profile) error { 595 595 - query := ` 596 596 - INSERT INTO profiles (uri, author_did, display_name, avatar, bio, website, links_json, created_at, indexed_at) 597 597 - VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) 598 598 - ON CONFLICT(uri) DO UPDATE SET 599 599 - display_name = EXCLUDED.display_name, 600 600 - avatar = EXCLUDED.avatar, 601 601 - bio = EXCLUDED.bio, 602 602 - website = EXCLUDED.website, 603 603 - links_json = EXCLUDED.links_json, 604 604 - indexed_at = EXCLUDED.indexed_at 605 605 - ` 606 606 - _, err := db.Exec(query, p.URI, p.AuthorDID, p.DisplayName, p.Avatar, p.Bio, p.Website, p.LinksJSON, p.CreatedAt, p.IndexedAt) 607 607 - return err 608 608 - } 609 609 - 610 610 - func (db *DB) DeleteProfile(uri string) error { 611 611 - _, err := db.Exec("DELETE FROM profiles WHERE uri = $1", uri) 612 612 - return err 613 613 - } 614 614 - 615 615 - func (db *DB) DeleteAPIKey(id, ownerDID string) (string, error) { 616 616 - var uri string 617 617 - err := db.QueryRow("SELECT uri FROM api_keys WHERE id = $1 AND owner_did = $2", id, ownerDID).Scan(&uri) 618 618 - if err != nil { 619 619 - if err == sql.ErrNoRows { 620 620 - return "", nil 621 621 - } 622 622 - return "", err 623 623 - } 624 624 - 625 625 - _, err = db.Exec("DELETE FROM api_keys WHERE id = $1 AND owner_did = $2", id, ownerDID) 626 626 - return uri, err 627 627 - } 628 628 - 629 629 - func (db *DB) GetPreferences(did string) (*Preferences, error) { 630 630 - var p Preferences 631 631 - err := db.QueryRow("SELECT uri, author_did, external_link_skipped_hostnames, subscribed_labelers, label_preferences, disable_external_link_warning, created_at, indexed_at, cid FROM preferences WHERE author_did = $1", did).Scan( 632 632 - &p.URI, &p.AuthorDID, &p.ExternalLinkSkippedHostnames, &p.SubscribedLabelers, &p.LabelPreferences, &p.DisableExternalLinkWarning, &p.CreatedAt, &p.IndexedAt, &p.CID, 633 633 - ) 634 634 - if err == sql.ErrNoRows { 635 635 - return nil, nil 636 636 - } 637 637 - if err != nil { 638 638 - return nil, err 639 639 - } 640 640 - return &p, nil 641 641 - } 642 642 - 643 643 - func (db *DB) UpsertPreferences(p *Preferences) error { 644 644 - query := ` 645 645 - INSERT INTO preferences (uri, author_did, external_link_skipped_hostnames, subscribed_labelers, label_preferences, disable_external_link_warning, created_at, indexed_at, cid) 646 646 - VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) 647 647 - ON CONFLICT(uri) DO UPDATE SET 648 648 - external_link_skipped_hostnames = EXCLUDED.external_link_skipped_hostnames, 649 649 - subscribed_labelers = EXCLUDED.subscribed_labelers, 650 650 - label_preferences = EXCLUDED.label_preferences, 651 651 - disable_external_link_warning = EXCLUDED.disable_external_link_warning, 652 652 - indexed_at = EXCLUDED.indexed_at, 653 653 - cid = EXCLUDED.cid 654 654 - ` 655 655 - _, err := db.Exec(query, p.URI, p.AuthorDID, p.ExternalLinkSkippedHostnames, p.SubscribedLabelers, p.LabelPreferences, p.DisableExternalLinkWarning, p.CreatedAt, p.IndexedAt, p.CID) 656 656 - return err 657 657 - } 658 658 - 659 659 - func (db *DB) DeleteAPIKeyByURI(uri string) error { 660 660 - _, err := db.Exec("DELETE FROM api_keys WHERE uri = $1", uri) 661 661 - return err 662 662 - } 663 663 - 664 664 - func (db *DB) DeletePreferences(uri string) error { 665 665 - _, err := db.Exec("DELETE FROM preferences WHERE uri = $1", uri) 666 666 - return err 667 667 - } 668 668 - 669 669 - func (db *DB) GetAPIKeyURIs(ownerDID string) ([]string, error) { 670 670 - rows, err := db.Query("SELECT uri FROM api_keys WHERE owner_did = $1 AND uri IS NOT NULL AND uri != ''", ownerDID) 671 671 - if err != nil { 672 672 - return nil, err 673 673 - } 674 674 - defer rows.Close() 675 675 - var uris []string 676 676 - for rows.Next() { 677 677 - var uri string 678 678 - if err := rows.Scan(&uri); err != nil { 679 679 - return nil, err 680 680 - } 681 681 - uris = append(uris, uri) 682 682 - } 683 683 - return uris, nil 684 684 - } 685 685 - 686 686 - func (db *DB) GetPreferenceURIs(did string) ([]string, error) { 687 687 - rows, err := db.Query("SELECT uri FROM preferences WHERE author_did = $1 AND uri IS NOT NULL AND uri != ''", did) 688 688 - if err != nil { 689 689 - return nil, err 690 690 - } 691 691 - defer rows.Close() 692 692 - var uris []string 693 693 - for rows.Next() { 694 694 - var uri string 695 695 - if err := rows.Scan(&uri); err != nil { 696 696 - return nil, err 697 697 - } 698 698 - uris = append(uris, uri) 699 699 - } 700 700 - return uris, nil 701 701 - } 702 702 - 703 703 - func (db *DB) runMigrations() { 704 704 - db.Exec(`ALTER TABLE sessions ADD COLUMN IF NOT EXISTS dpop_key TEXT`) 705 705 - 706 706 - db.Exec(`ALTER TABLE annotations ADD COLUMN IF NOT EXISTS motivation TEXT`) 707 707 - db.Exec(`ALTER TABLE annotations ADD COLUMN IF NOT EXISTS body_value TEXT`) 708 708 - db.Exec(`ALTER TABLE annotations ADD COLUMN IF NOT EXISTS body_format TEXT DEFAULT 'text/plain'`) 709 709 - db.Exec(`ALTER TABLE annotations ADD COLUMN IF NOT EXISTS body_uri TEXT`) 710 710 - db.Exec(`ALTER TABLE annotations ADD COLUMN IF NOT EXISTS target_source TEXT`) 711 711 - db.Exec(`ALTER TABLE annotations ADD COLUMN IF NOT EXISTS target_hash TEXT`) 712 712 - db.Exec(`ALTER TABLE annotations ADD COLUMN IF NOT EXISTS target_title TEXT`) 713 713 - db.Exec(`ALTER TABLE annotations ADD COLUMN IF NOT EXISTS selector_json TEXT`) 714 714 - db.Exec(`ALTER TABLE annotations ADD COLUMN IF NOT EXISTS tags_json TEXT`) 715 715 - db.Exec(`ALTER TABLE annotations ADD COLUMN IF NOT EXISTS cid TEXT`) 716 716 - 717 717 - db.Exec(`UPDATE annotations SET target_source = url WHERE target_source IS NULL AND url IS NOT NULL`) 718 718 - db.Exec(`UPDATE annotations SET target_hash = url_hash WHERE target_hash IS NULL AND url_hash IS NOT NULL`) 719 719 - db.Exec(`UPDATE annotations SET body_value = text WHERE body_value IS NULL AND text IS NOT NULL`) 720 720 - db.Exec(`UPDATE annotations SET target_title = title WHERE target_title IS NULL AND title IS NOT NULL`) 721 721 - db.Exec(`UPDATE annotations SET motivation = 'commenting' WHERE motivation IS NULL`) 722 722 - 723 723 - db.Exec(`ALTER TABLE profiles ADD COLUMN IF NOT EXISTS website TEXT`) 724 724 - db.Exec(`ALTER TABLE profiles ADD COLUMN IF NOT EXISTS display_name TEXT`) 725 725 - db.Exec(`ALTER TABLE profiles ADD COLUMN IF NOT EXISTS avatar TEXT`) 726 726 - 727 727 - db.Exec(`ALTER TABLE cursors ALTER COLUMN last_cursor TYPE BIGINT`) 728 728 - 729 729 - db.Exec(`ALTER TABLE api_keys ADD COLUMN IF NOT EXISTS uri TEXT`) 730 730 - db.Exec(`ALTER TABLE api_keys ADD COLUMN IF NOT EXISTS cid TEXT`) 731 731 - db.Exec(`ALTER TABLE api_keys ADD COLUMN IF NOT EXISTS indexed_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP`) 732 732 - 733 733 - db.migrateModeration() 734 734 - 735 735 - db.Exec(`ALTER TABLE preferences ADD COLUMN IF NOT EXISTS subscribed_labelers TEXT`) 736 736 - db.Exec(`ALTER TABLE preferences ADD COLUMN IF NOT EXISTS label_preferences TEXT`) 737 737 - db.Exec(`ALTER TABLE preferences ADD COLUMN IF NOT EXISTS disable_external_link_warning BOOLEAN`) 738 738 - } 739 739 - 740 740 - func (db *DB) migrateModeration() { 741 741 - _, err := db.Exec(`SELECT subject_did FROM moderation_reports LIMIT 0`) 742 742 - if err != nil { 743 743 - db.Exec(`DROP TABLE IF EXISTS moderation_reports`) 744 744 - db.Exec(`DROP TABLE IF EXISTS moderation_actions`) 745 745 - 746 746 - db.Exec(`CREATE TABLE IF NOT EXISTS moderation_reports ( 747 747 - id SERIAL PRIMARY KEY, 748 748 - reporter_did TEXT NOT NULL, 749 749 - subject_did TEXT NOT NULL, 750 750 - subject_uri TEXT, 751 751 - reason_type TEXT NOT NULL, 752 752 - reason_text TEXT, 753 753 - status TEXT NOT NULL DEFAULT 'pending', 754 754 - created_at TIMESTAMP NOT NULL, 755 755 - resolved_at TIMESTAMP, 756 756 - resolved_by TEXT 757 757 - )`) 758 758 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_mod_reports_status ON moderation_reports(status)`) 759 759 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_mod_reports_subject ON moderation_reports(subject_did)`) 760 760 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_mod_reports_reporter ON moderation_reports(reporter_did)`) 761 761 - 762 762 - db.Exec(`CREATE TABLE IF NOT EXISTS moderation_actions ( 763 763 - id SERIAL PRIMARY KEY, 764 764 - report_id INTEGER NOT NULL, 765 765 - actor_did TEXT NOT NULL, 766 766 - action TEXT NOT NULL, 767 767 - comment TEXT, 768 768 - created_at TIMESTAMP NOT NULL 769 769 - )`) 770 770 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_mod_actions_report ON moderation_actions(report_id)`) 771 771 - } 772 772 - 773 773 - db.Exec(`CREATE TABLE IF NOT EXISTS content_labels ( 774 774 - id SERIAL PRIMARY KEY, 775 775 - src TEXT NOT NULL, 776 776 - uri TEXT NOT NULL, 777 777 - val TEXT NOT NULL, 778 778 - neg INTEGER NOT NULL DEFAULT 0, 779 779 - created_by TEXT NOT NULL, 780 780 - created_at TIMESTAMP NOT NULL 781 781 - )`) 782 782 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_content_labels_uri ON content_labels(uri)`) 783 783 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_content_labels_src ON content_labels(src)`) 784 784 - } 785 785 - 786 786 - func (db *DB) Close() error { 787 787 - return db.DB.Close() 788 788 - } 61 61 + func (db *DB) Close() error { return db.DB.Close() } 789 62 790 63 func ParseSelector(selectorJSON *string) (*Selector, error) { 791 64 if selectorJSON == nil || *selectorJSON == "" { 792 65 return nil, nil 793 66 } 794 67 var s Selector 795 795 - err := json.Unmarshal([]byte(*selectorJSON), &s) 796 796 - if err != nil { 68 68 + if err := json.Unmarshal([]byte(*selectorJSON), &s); err != nil { 797 69 return nil, err 798 70 } 799 71 return &s, nil ··· 804 76 return nil, nil 805 77 } 806 78 var tags []string 807 807 - err := json.Unmarshal([]byte(*tagsJSON), &tags) 808 808 - if err != nil { 79 79 + if err := json.Unmarshal([]byte(*tagsJSON), &tags); err != nil { 809 80 return nil, err 810 81 } 811 82 return tags, nil

+230

backend/internal/db/filter.go

reviewed

··· 1 1 + package db 2 2 + 3 3 + import ( 4 4 + "database/sql" 5 5 + "fmt" 6 6 + "strings" 7 7 + "time" 8 8 + 9 9 + "margin.at/internal/domain" 10 10 + ) 11 11 + 12 12 + type FeedType = domain.FeedType 13 13 + type NoteFilter = domain.NoteFilter 14 14 + 15 15 + const ( 16 16 + FeedTypeRecent = domain.FeedTypeRecent 17 17 + FeedTypePopular = domain.FeedTypePopular 18 18 + FeedTypeShelved = domain.FeedTypeShelved 19 19 + FeedTypeMargin = domain.FeedTypeMargin 20 20 + FeedTypeSemble = domain.FeedTypeSemble 21 21 + ) 22 22 + 23 23 + func (db *DB) ListNotes(f NoteFilter) ([]Note, error) { 24 24 + var where []string 25 25 + var args []interface{} 26 26 + n := 1 27 27 + 28 28 + if len(f.Motivations) == 1 { 29 29 + where = append(where, fmt.Sprintf("motivation = $%d", n)) 30 30 + args = append(args, f.Motivations[0]) 31 31 + n++ 32 32 + } else if len(f.Motivations) > 1 { 33 33 + placeholders := make([]string, len(f.Motivations)) 34 34 + for i, m := range f.Motivations { 35 35 + placeholders[i] = fmt.Sprintf("$%d", n) 36 36 + args = append(args, m) 37 37 + n++ 38 38 + } 39 39 + where = append(where, fmt.Sprintf("motivation IN (%s)", strings.Join(placeholders, ", "))) 40 40 + } 41 41 + 42 42 + if f.AuthorDID != "" { 43 43 + where = append(where, fmt.Sprintf("author_did = $%d", n)) 44 44 + args = append(args, f.AuthorDID) 45 45 + n++ 46 46 + } 47 47 + 48 48 + if f.TargetHash != "" { 49 49 + where = append(where, fmt.Sprintf("target_hash = $%d", n)) 50 50 + args = append(args, f.TargetHash) 51 51 + n++ 52 52 + } 53 53 + 54 54 + if f.Tag != "" { 55 55 + where = append(where, fmt.Sprintf( 56 56 + "tags_json IS NOT NULL AND EXISTS(SELECT 1 FROM jsonb_array_elements_text(tags_json::jsonb) elem WHERE lower(elem) = lower($%d))", 57 57 + n, 58 58 + )) 59 59 + args = append(args, f.Tag) 60 60 + n++ 61 61 + } 62 62 + 63 63 + if f.Query != "" { 64 64 + pattern := "%" + escapeLike(f.Query) + "%" 65 65 + where = append(where, fmt.Sprintf( 66 66 + "(body_value ILIKE $%d OR target_source ILIKE $%d OR target_title ILIKE $%d OR tags_json::text ILIKE $%d)", 67 67 + n, n+1, n+2, n+3, 68 68 + )) 69 69 + args = append(args, pattern, pattern, pattern, pattern) 70 70 + n += 4 71 71 + } 72 72 + 73 73 + switch f.FeedType { 74 74 + case FeedTypeMargin: 75 75 + where = append(where, "uri NOT LIKE '%network.cosmik%'") 76 76 + case FeedTypeSemble: 77 77 + where = append(where, "uri LIKE '%network.cosmik%'") 78 78 + case FeedTypePopular: 79 79 + since := time.Now().AddDate(0, 0, -14) 80 80 + where = append(where, fmt.Sprintf("created_at > $%d", n)) 81 81 + args = append(args, since) 82 82 + n++ 83 83 + case FeedTypeShelved: 84 84 + olderThan := time.Now().AddDate(0, 0, -1) 85 85 + since := time.Now().AddDate(0, 0, -14) 86 86 + where = append(where, fmt.Sprintf("created_at < $%d AND created_at > $%d", n, n+1)) 87 87 + where = append(where, "NOT EXISTS (SELECT 1 FROM likes WHERE subject_uri = uri)") 88 88 + where = append(where, "NOT EXISTS (SELECT 1 FROM replies WHERE root_uri = uri)") 89 89 + args = append(args, olderThan, since) 90 90 + n += 2 91 91 + } 92 92 + 93 93 + whereClause := "" 94 94 + if len(where) > 0 { 95 95 + whereClause = "WHERE " + strings.Join(where, " AND ") 96 96 + } 97 97 + 98 98 + orderClause := "ORDER BY created_at DESC" 99 99 + switch f.FeedType { 100 100 + case FeedTypePopular: 101 101 + orderClause = `ORDER BY ( 102 102 + SELECT COUNT(*) FROM likes WHERE subject_uri = uri 103 103 + ) + ( 104 104 + SELECT COUNT(*) FROM replies WHERE root_uri = uri 105 105 + ) DESC, created_at DESC` 106 106 + case FeedTypeShelved: 107 107 + orderClause = "ORDER BY RANDOM()" 108 108 + } 109 109 + 110 110 + limit := f.Limit 111 111 + if limit <= 0 { 112 112 + limit = 50 113 113 + } 114 114 + 115 115 + query := fmt.Sprintf(` 116 116 + SELECT uri, author_did, motivation, color, description, body_value, body_format, body_uri, 117 117 + target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 118 118 + FROM unified_notes 119 119 + %s 120 120 + %s 121 121 + LIMIT $%d OFFSET $%d 122 122 + `, whereClause, orderClause, n, n+1) 123 123 + 124 124 + args = append(args, limit, f.Offset) 125 125 + 126 126 + rows, err := db.Query(query, args...) 127 127 + if err != nil { 128 128 + return nil, err 129 129 + } 130 130 + defer rows.Close() 131 131 + return scanNotes(rows) 132 132 + } 133 133 + 134 134 + func (db *DB) GetNoteByURIFromUnified(uri string) (*Note, error) { 135 135 + query := ` 136 136 + SELECT uri, author_did, motivation, color, description, body_value, body_format, body_uri, 137 137 + target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 138 138 + FROM unified_notes 139 139 + WHERE uri = $1 140 140 + ` 141 141 + var note Note 142 142 + err := db.QueryRow(query, uri).Scan( 143 143 + &note.URI, &note.AuthorDID, &note.Motivation, &note.Color, &note.Description, 144 144 + &note.BodyValue, &note.BodyFormat, &note.BodyURI, 145 145 + &note.TargetSource, &note.TargetHash, &note.TargetTitle, 146 146 + &note.SelectorJSON, &note.TagsJSON, &note.CreatedAt, &note.IndexedAt, &note.CID, 147 147 + ) 148 148 + if err == sql.ErrNoRows { 149 149 + return nil, nil 150 150 + } 151 151 + if err != nil { 152 152 + return nil, err 153 153 + } 154 154 + return &note, nil 155 155 + } 156 156 + 157 157 + func scanNotes(rows interface { 158 158 + Next() bool 159 159 + Scan(...interface{}) error 160 160 + }) ([]Note, error) { 161 161 + var notes []Note 162 162 + for rows.Next() { 163 163 + var note Note 164 164 + if err := rows.Scan( 165 165 + &note.URI, &note.AuthorDID, &note.Motivation, &note.Color, &note.Description, 166 166 + &note.BodyValue, &note.BodyFormat, &note.BodyURI, 167 167 + &note.TargetSource, &note.TargetHash, &note.TargetTitle, 168 168 + &note.SelectorJSON, &note.TagsJSON, &note.CreatedAt, &note.IndexedAt, &note.CID, 169 169 + ); err != nil { 170 170 + return nil, err 171 171 + } 172 172 + notes = append(notes, note) 173 173 + } 174 174 + return notes, nil 175 175 + } 176 176 + 177 177 + func (db *DB) MigrateUnifiedNotes() { 178 178 + db.Exec(` 179 179 + CREATE OR REPLACE VIEW unified_notes AS 180 180 + -- New notes table (primary path) 181 181 + SELECT 182 182 + uri, author_did, 183 183 + COALESCE(motivation, 'commenting') AS motivation, 184 184 + color, description, body_value, body_format, body_uri, 185 185 + target_source, target_hash, target_title, selector_json, tags_json, 186 186 + created_at, indexed_at, cid 187 187 + FROM notes 188 188 + UNION ALL 189 189 + -- Legacy annotations (motivation is 'commenting' or similar, never 'highlighting'/'bookmarking') 190 190 + SELECT 191 191 + uri, author_did, 192 192 + COALESCE(motivation, 'commenting') AS motivation, 193 193 + NULL::TEXT AS color, 194 194 + NULL::TEXT AS description, 195 195 + body_value, body_format, body_uri, 196 196 + target_source, target_hash, target_title, selector_json, tags_json, 197 197 + created_at, indexed_at, cid 198 198 + FROM annotations 199 199 + UNION ALL 200 200 + -- Legacy highlights 201 201 + SELECT 202 202 + uri, author_did, 203 203 + 'highlighting' AS motivation, 204 204 + color, 205 205 + NULL::TEXT AS description, 206 206 + NULL::TEXT AS body_value, 207 207 + 'text/plain' AS body_format, 208 208 + NULL::TEXT AS body_uri, 209 209 + target_source, target_hash, target_title, selector_json, tags_json, 210 210 + created_at, indexed_at, cid 211 211 + FROM highlights 212 212 + UNION ALL 213 213 + -- Legacy bookmarks (column mapping to Note layout) 214 214 + SELECT 215 215 + uri, author_did, 216 216 + 'bookmarking' AS motivation, 217 217 + NULL::TEXT AS color, 218 218 + description, 219 219 + NULL::TEXT AS body_value, 220 220 + 'text/plain' AS body_format, 221 221 + NULL::TEXT AS body_uri, 222 222 + source AS target_source, 223 223 + source_hash AS target_hash, 224 224 + title AS target_title, 225 225 + NULL::TEXT AS selector_json, 226 226 + tags_json, 227 227 + created_at, indexed_at, cid 228 228 + FROM bookmarks 229 229 + `) 230 230 + }

+46

backend/internal/db/migrate.go

reviewed

··· 1 1 + package db 2 2 + 3 3 + import ( 4 4 + "database/sql" 5 5 + "embed" 6 6 + "time" 7 7 + 8 8 + "github.com/pressly/goose/v3" 9 9 + ) 10 10 + 11 11 + //go:embed migrations 12 12 + var migrationsFS embed.FS 13 13 + 14 14 + func (db *DB) Migrate() error { 15 15 + goose.SetBaseFS(migrationsFS) 16 16 + 17 17 + if err := goose.SetDialect("postgres"); err != nil { 18 18 + return err 19 19 + } 20 20 + 21 21 + return goose.Up(db.DB, "migrations") 22 22 + } 23 23 + 24 24 + func (db *DB) GetCursor(id string) (int64, error) { 25 25 + var cursor int64 26 26 + err := db.QueryRow("SELECT last_cursor FROM cursors WHERE id = $1", id).Scan(&cursor) 27 27 + switch err { 28 28 + case nil: 29 29 + return cursor, nil 30 30 + case sql.ErrNoRows: 31 31 + return 0, nil 32 32 + default: 33 33 + return 0, err 34 34 + } 35 35 + } 36 36 + 37 37 + func (db *DB) SetCursor(id string, cursor int64) error { 38 38 + _, err := db.Exec(` 39 39 + INSERT INTO cursors (id, last_cursor, updated_at) 40 40 + VALUES ($1, $2, $3) 41 41 + ON CONFLICT(id) DO UPDATE SET 42 42 + last_cursor = EXCLUDED.last_cursor, 43 43 + updated_at = EXCLUDED.updated_at 44 44 + `, id, cursor, time.Now()) 45 45 + return err 46 46 + }

+204

backend/internal/db/migrations/00001_core_tables.sql

reviewed

··· 1 1 + -- +goose Up 2 2 + CREATE TABLE IF NOT EXISTS notes ( 3 3 + uri TEXT PRIMARY KEY, 4 4 + author_did TEXT NOT NULL, 5 5 + motivation TEXT, 6 6 + color TEXT, 7 7 + description TEXT, 8 8 + body_value TEXT, 9 9 + body_format TEXT DEFAULT 'text/plain', 10 10 + body_uri TEXT, 11 11 + target_source TEXT NOT NULL, 12 12 + target_hash TEXT NOT NULL, 13 13 + target_title TEXT, 14 14 + selector_json TEXT, 15 15 + tags_json TEXT, 16 16 + created_at TIMESTAMP NOT NULL, 17 17 + indexed_at TIMESTAMP NOT NULL, 18 18 + cid TEXT 19 19 + ); 20 20 + CREATE INDEX IF NOT EXISTS idx_notes_target_hash ON notes(target_hash); 21 21 + CREATE INDEX IF NOT EXISTS idx_notes_target_source ON notes(target_source); 22 22 + CREATE INDEX IF NOT EXISTS idx_notes_author_did ON notes(author_did); 23 23 + CREATE INDEX IF NOT EXISTS idx_notes_created_at ON notes(created_at DESC); 24 24 + 25 25 + CREATE TABLE IF NOT EXISTS annotations ( 26 26 + uri TEXT PRIMARY KEY, 27 27 + author_did TEXT NOT NULL, 28 28 + motivation TEXT, 29 29 + body_value TEXT, 30 30 + body_format TEXT DEFAULT 'text/plain', 31 31 + body_uri TEXT, 32 32 + target_source TEXT, 33 33 + target_hash TEXT, 34 34 + target_title TEXT, 35 35 + selector_json TEXT, 36 36 + tags_json TEXT, 37 37 + created_at TIMESTAMP NOT NULL, 38 38 + indexed_at TIMESTAMP NOT NULL, 39 39 + cid TEXT 40 40 + ); 41 41 + CREATE INDEX IF NOT EXISTS idx_annotations_target_hash ON annotations(target_hash); 42 42 + CREATE INDEX IF NOT EXISTS idx_annotations_target_source ON annotations(target_source); 43 43 + CREATE INDEX IF NOT EXISTS idx_annotations_author_did ON annotations(author_did); 44 44 + CREATE INDEX IF NOT EXISTS idx_annotations_motivation ON annotations(motivation); 45 45 + CREATE INDEX IF NOT EXISTS idx_annotations_created_at ON annotations(created_at DESC); 46 46 + CREATE INDEX IF NOT EXISTS idx_annotations_author_created ON annotations(author_did, created_at DESC); 47 47 + CREATE INDEX IF NOT EXISTS idx_annotations_uri_pattern ON annotations(uri text_pattern_ops); 48 48 + 49 49 + CREATE TABLE IF NOT EXISTS highlights ( 50 50 + uri TEXT PRIMARY KEY, 51 51 + author_did TEXT NOT NULL, 52 52 + target_source TEXT NOT NULL, 53 53 + target_hash TEXT NOT NULL, 54 54 + target_title TEXT, 55 55 + selector_json TEXT, 56 56 + color TEXT, 57 57 + tags_json TEXT, 58 58 + created_at TIMESTAMP NOT NULL, 59 59 + indexed_at TIMESTAMP NOT NULL, 60 60 + cid TEXT 61 61 + ); 62 62 + CREATE INDEX IF NOT EXISTS idx_highlights_target_hash ON highlights(target_hash); 63 63 + CREATE INDEX IF NOT EXISTS idx_highlights_author_did ON highlights(author_did); 64 64 + CREATE INDEX IF NOT EXISTS idx_highlights_created_at ON highlights(created_at DESC); 65 65 + CREATE INDEX IF NOT EXISTS idx_highlights_author_created ON highlights(author_did, created_at DESC); 66 66 + CREATE INDEX IF NOT EXISTS idx_highlights_uri_pattern ON highlights(uri text_pattern_ops); 67 67 + 68 68 + CREATE TABLE IF NOT EXISTS bookmarks ( 69 69 + uri TEXT PRIMARY KEY, 70 70 + author_did TEXT NOT NULL, 71 71 + source TEXT NOT NULL, 72 72 + source_hash TEXT NOT NULL, 73 73 + title TEXT, 74 74 + description TEXT, 75 75 + tags_json TEXT, 76 76 + created_at TIMESTAMP NOT NULL, 77 77 + indexed_at TIMESTAMP NOT NULL, 78 78 + cid TEXT 79 79 + ); 80 80 + CREATE INDEX IF NOT EXISTS idx_bookmarks_source_hash ON bookmarks(source_hash); 81 81 + CREATE INDEX IF NOT EXISTS idx_bookmarks_author_did ON bookmarks(author_did); 82 82 + CREATE INDEX IF NOT EXISTS idx_bookmarks_created_at ON bookmarks(created_at DESC); 83 83 + CREATE INDEX IF NOT EXISTS idx_bookmarks_author_created ON bookmarks(author_did, created_at DESC); 84 84 + CREATE INDEX IF NOT EXISTS idx_bookmarks_uri_pattern ON bookmarks(uri text_pattern_ops); 85 85 + 86 86 + CREATE TABLE IF NOT EXISTS replies ( 87 87 + uri TEXT PRIMARY KEY, 88 88 + author_did TEXT NOT NULL, 89 89 + parent_uri TEXT NOT NULL, 90 90 + root_uri TEXT NOT NULL, 91 91 + text TEXT NOT NULL, 92 92 + format TEXT DEFAULT 'text/plain', 93 93 + created_at TIMESTAMP NOT NULL, 94 94 + indexed_at TIMESTAMP NOT NULL, 95 95 + cid TEXT 96 96 + ); 97 97 + CREATE INDEX IF NOT EXISTS idx_replies_parent_uri ON replies(parent_uri); 98 98 + CREATE INDEX IF NOT EXISTS idx_replies_root_uri ON replies(root_uri); 99 99 + CREATE INDEX IF NOT EXISTS idx_replies_created_at ON replies(created_at DESC); 100 100 + CREATE INDEX IF NOT EXISTS idx_replies_author_did ON replies(author_did); 101 101 + 102 102 + CREATE TABLE IF NOT EXISTS likes ( 103 103 + uri TEXT PRIMARY KEY, 104 104 + author_did TEXT NOT NULL, 105 105 + subject_uri TEXT NOT NULL, 106 106 + created_at TIMESTAMP NOT NULL, 107 107 + indexed_at TIMESTAMP NOT NULL 108 108 + ); 109 109 + CREATE INDEX IF NOT EXISTS idx_likes_subject_uri ON likes(subject_uri); 110 110 + CREATE INDEX IF NOT EXISTS idx_likes_author_did ON likes(author_did); 111 111 + CREATE INDEX IF NOT EXISTS idx_likes_author_subject ON likes(author_did, subject_uri); 112 112 + 113 113 + CREATE TABLE IF NOT EXISTS sessions ( 114 114 + id TEXT PRIMARY KEY, 115 115 + did TEXT NOT NULL, 116 116 + handle TEXT NOT NULL, 117 117 + access_token TEXT NOT NULL, 118 118 + refresh_token TEXT NOT NULL, 119 119 + dpop_key TEXT, 120 120 + created_at TIMESTAMP NOT NULL, 121 121 + expires_at TIMESTAMP NOT NULL 122 122 + ); 123 123 + CREATE INDEX IF NOT EXISTS idx_sessions_did ON sessions(did); 124 124 + CREATE INDEX IF NOT EXISTS idx_sessions_expires ON sessions(expires_at); 125 125 + 126 126 + CREATE TABLE IF NOT EXISTS edit_history ( 127 127 + id SERIAL PRIMARY KEY, 128 128 + uri TEXT NOT NULL, 129 129 + record_type TEXT NOT NULL, 130 130 + previous_content TEXT NOT NULL, 131 131 + previous_cid TEXT, 132 132 + edited_at TIMESTAMP NOT NULL 133 133 + ); 134 134 + CREATE INDEX IF NOT EXISTS idx_edit_history_uri ON edit_history(uri); 135 135 + CREATE INDEX IF NOT EXISTS idx_edit_history_edited_at ON edit_history(edited_at DESC); 136 136 + 137 137 + CREATE TABLE IF NOT EXISTS notifications ( 138 138 + id SERIAL PRIMARY KEY, 139 139 + recipient_did TEXT NOT NULL, 140 140 + actor_did TEXT NOT NULL, 141 141 + type TEXT NOT NULL, 142 142 + subject_uri TEXT NOT NULL, 143 143 + created_at TIMESTAMP NOT NULL, 144 144 + read_at TIMESTAMP 145 145 + ); 146 146 + CREATE INDEX IF NOT EXISTS idx_notifications_recipient ON notifications(recipient_did); 147 147 + CREATE INDEX IF NOT EXISTS idx_notifications_created_at ON notifications(created_at DESC); 148 148 + CREATE INDEX IF NOT EXISTS idx_notifications_unread ON notifications(recipient_did) WHERE read_at IS NULL; 149 149 + 150 150 + CREATE TABLE IF NOT EXISTS api_keys ( 151 151 + id TEXT PRIMARY KEY, 152 152 + owner_did TEXT NOT NULL, 153 153 + name TEXT NOT NULL, 154 154 + key_hash TEXT NOT NULL, 155 155 + created_at TIMESTAMP NOT NULL, 156 156 + last_used_at TIMESTAMP, 157 157 + uri TEXT, 158 158 + cid TEXT, 159 159 + indexed_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP 160 160 + ); 161 161 + CREATE INDEX IF NOT EXISTS idx_api_keys_owner ON api_keys(owner_did); 162 162 + CREATE INDEX IF NOT EXISTS idx_api_keys_hash ON api_keys(key_hash); 163 163 + 164 164 + CREATE TABLE IF NOT EXISTS profiles ( 165 165 + uri TEXT PRIMARY KEY, 166 166 + author_did TEXT NOT NULL, 167 167 + display_name TEXT, 168 168 + avatar TEXT, 169 169 + bio TEXT, 170 170 + website TEXT, 171 171 + links_json TEXT, 172 172 + created_at TIMESTAMP NOT NULL, 173 173 + indexed_at TIMESTAMP NOT NULL, 174 174 + cid TEXT 175 175 + ); 176 176 + CREATE INDEX IF NOT EXISTS idx_profiles_author_did ON profiles(author_did); 177 177 + 178 178 + CREATE TABLE IF NOT EXISTS preferences ( 179 179 + uri TEXT PRIMARY KEY, 180 180 + author_did TEXT NOT NULL, 181 181 + external_link_skipped_hostnames TEXT, 182 182 + subscribed_labelers TEXT, 183 183 + label_preferences TEXT, 184 184 + disable_external_link_warning BOOLEAN, 185 185 + enable_community_bookmarks BOOLEAN DEFAULT false, 186 186 + created_at TIMESTAMP NOT NULL, 187 187 + indexed_at TIMESTAMP NOT NULL, 188 188 + cid TEXT 189 189 + ); 190 190 + CREATE INDEX IF NOT EXISTS idx_preferences_author_did ON preferences(author_did); 191 191 + 192 192 + -- +goose Down 193 193 + DROP TABLE IF EXISTS preferences; 194 194 + DROP TABLE IF EXISTS profiles; 195 195 + DROP TABLE IF EXISTS api_keys; 196 196 + DROP TABLE IF EXISTS notifications; 197 197 + DROP TABLE IF EXISTS edit_history; 198 198 + DROP TABLE IF EXISTS sessions; 199 199 + DROP TABLE IF EXISTS likes; 200 200 + DROP TABLE IF EXISTS replies; 201 201 + DROP TABLE IF EXISTS bookmarks; 202 202 + DROP TABLE IF EXISTS highlights; 203 203 + DROP TABLE IF EXISTS annotations; 204 204 + DROP TABLE IF EXISTS notes;

+131

backend/internal/db/migrations/00002_support_tables.sql

reviewed

··· 1 1 + -- +goose Up 2 2 + CREATE TABLE IF NOT EXISTS cursors ( 3 3 + id TEXT PRIMARY KEY, 4 4 + last_cursor BIGINT NOT NULL, 5 5 + updated_at TIMESTAMP NOT NULL 6 6 + ); 7 7 + 8 8 + CREATE TABLE IF NOT EXISTS collections ( 9 9 + uri TEXT PRIMARY KEY, 10 10 + author_did TEXT NOT NULL, 11 11 + name TEXT NOT NULL, 12 12 + description TEXT, 13 13 + icon TEXT, 14 14 + created_at TIMESTAMP NOT NULL, 15 15 + indexed_at TIMESTAMP NOT NULL 16 16 + ); 17 17 + CREATE INDEX IF NOT EXISTS idx_collections_author_did ON collections(author_did); 18 18 + CREATE INDEX IF NOT EXISTS idx_collections_created_at ON collections(created_at DESC); 19 19 + 20 20 + CREATE TABLE IF NOT EXISTS collection_items ( 21 21 + uri TEXT PRIMARY KEY, 22 22 + author_did TEXT NOT NULL, 23 23 + collection_uri TEXT NOT NULL, 24 24 + annotation_uri TEXT NOT NULL, 25 25 + position INTEGER DEFAULT 0, 26 26 + created_at TIMESTAMP NOT NULL, 27 27 + indexed_at TIMESTAMP NOT NULL 28 28 + ); 29 29 + CREATE INDEX IF NOT EXISTS idx_collection_items_collection ON collection_items(collection_uri); 30 30 + CREATE INDEX IF NOT EXISTS idx_collection_items_annotation ON collection_items(annotation_uri); 31 31 + CREATE INDEX IF NOT EXISTS idx_collection_items_created_at ON collection_items(created_at DESC); 32 32 + 33 33 + CREATE TABLE IF NOT EXISTS blocks ( 34 34 + id SERIAL PRIMARY KEY, 35 35 + actor_did TEXT NOT NULL, 36 36 + subject_did TEXT NOT NULL, 37 37 + created_at TIMESTAMP NOT NULL, 38 38 + UNIQUE(actor_did, subject_did) 39 39 + ); 40 40 + CREATE INDEX IF NOT EXISTS idx_blocks_actor ON blocks(actor_did); 41 41 + CREATE INDEX IF NOT EXISTS idx_blocks_subject ON blocks(subject_did); 42 42 + 43 43 + CREATE TABLE IF NOT EXISTS mutes ( 44 44 + id SERIAL PRIMARY KEY, 45 45 + actor_did TEXT NOT NULL, 46 46 + subject_did TEXT NOT NULL, 47 47 + created_at TIMESTAMP NOT NULL, 48 48 + UNIQUE(actor_did, subject_did) 49 49 + ); 50 50 + CREATE INDEX IF NOT EXISTS idx_mutes_actor ON mutes(actor_did); 51 51 + CREATE INDEX IF NOT EXISTS idx_mutes_subject ON mutes(subject_did); 52 52 + 53 53 + CREATE TABLE IF NOT EXISTS content_labels ( 54 54 + id SERIAL PRIMARY KEY, 55 55 + src TEXT NOT NULL, 56 56 + uri TEXT NOT NULL, 57 57 + val TEXT NOT NULL, 58 58 + neg INTEGER NOT NULL DEFAULT 0, 59 59 + created_by TEXT NOT NULL, 60 60 + created_at TIMESTAMP NOT NULL 61 61 + ); 62 62 + CREATE INDEX IF NOT EXISTS idx_content_labels_uri ON content_labels(uri); 63 63 + CREATE INDEX IF NOT EXISTS idx_content_labels_src ON content_labels(src); 64 64 + 65 65 + CREATE TABLE IF NOT EXISTS moderation_reports ( 66 66 + id SERIAL PRIMARY KEY, 67 67 + reporter_did TEXT NOT NULL, 68 68 + subject_did TEXT NOT NULL, 69 69 + subject_uri TEXT, 70 70 + reason_type TEXT NOT NULL, 71 71 + reason_text TEXT, 72 72 + status TEXT NOT NULL DEFAULT 'pending', 73 73 + created_at TIMESTAMP NOT NULL, 74 74 + resolved_at TIMESTAMP, 75 75 + resolved_by TEXT 76 76 + ); 77 77 + CREATE INDEX IF NOT EXISTS idx_mod_reports_status ON moderation_reports(status); 78 78 + CREATE INDEX IF NOT EXISTS idx_mod_reports_subject ON moderation_reports(subject_did); 79 79 + CREATE INDEX IF NOT EXISTS idx_mod_reports_reporter ON moderation_reports(reporter_did); 80 80 + 81 81 + CREATE TABLE IF NOT EXISTS moderation_actions ( 82 82 + id SERIAL PRIMARY KEY, 83 83 + report_id INTEGER NOT NULL, 84 84 + actor_did TEXT NOT NULL, 85 85 + action TEXT NOT NULL, 86 86 + comment TEXT, 87 87 + created_at TIMESTAMP NOT NULL 88 88 + ); 89 89 + CREATE INDEX IF NOT EXISTS idx_mod_actions_report ON moderation_actions(report_id); 90 90 + 91 91 + CREATE TABLE IF NOT EXISTS publications ( 92 92 + uri TEXT PRIMARY KEY, 93 93 + author_did TEXT NOT NULL, 94 94 + url TEXT NOT NULL, 95 95 + name TEXT NOT NULL, 96 96 + description TEXT, 97 97 + show_in_discover BOOLEAN NOT NULL DEFAULT true, 98 98 + indexed_at TIMESTAMP NOT NULL 99 99 + ); 100 100 + CREATE INDEX IF NOT EXISTS idx_publications_author ON publications(author_did); 101 101 + CREATE INDEX IF NOT EXISTS idx_publications_url ON publications(url); 102 102 + 103 103 + CREATE TABLE IF NOT EXISTS documents ( 104 104 + uri TEXT PRIMARY KEY, 105 105 + author_did TEXT NOT NULL, 106 106 + site TEXT NOT NULL, 107 107 + path TEXT, 108 108 + title TEXT NOT NULL, 109 109 + description TEXT, 110 110 + text_content TEXT, 111 111 + tags_json TEXT, 112 112 + canonical_url TEXT, 113 113 + published_at TIMESTAMP NOT NULL, 114 114 + indexed_at TIMESTAMP NOT NULL 115 115 + ); 116 116 + CREATE INDEX IF NOT EXISTS idx_documents_author ON documents(author_did); 117 117 + CREATE INDEX IF NOT EXISTS idx_documents_site ON documents(site); 118 118 + CREATE INDEX IF NOT EXISTS idx_documents_canonical ON documents(canonical_url); 119 119 + CREATE INDEX IF NOT EXISTS idx_documents_published ON documents(published_at DESC); 120 120 + 121 121 + -- +goose Down 122 122 + DROP TABLE IF EXISTS documents; 123 123 + DROP TABLE IF EXISTS publications; 124 124 + DROP TABLE IF EXISTS moderation_actions; 125 125 + DROP TABLE IF EXISTS moderation_reports; 126 126 + DROP TABLE IF EXISTS content_labels; 127 127 + DROP TABLE IF EXISTS mutes; 128 128 + DROP TABLE IF EXISTS blocks; 129 129 + DROP TABLE IF EXISTS collection_items; 130 130 + DROP TABLE IF EXISTS collections; 131 131 + DROP TABLE IF EXISTS cursors;

+43

backend/internal/db/migrations/00003_alter_columns.sql

reviewed

··· 1 1 + -- +goose Up 2 2 + ALTER TABLE sessions ADD COLUMN IF NOT EXISTS dpop_key TEXT; 3 3 + 4 4 + ALTER TABLE annotations ADD COLUMN IF NOT EXISTS motivation TEXT; 5 5 + ALTER TABLE annotations ADD COLUMN IF NOT EXISTS body_value TEXT; 6 6 + ALTER TABLE annotations ADD COLUMN IF NOT EXISTS body_format TEXT DEFAULT 'text/plain'; 7 7 + ALTER TABLE annotations ADD COLUMN IF NOT EXISTS body_uri TEXT; 8 8 + ALTER TABLE annotations ADD COLUMN IF NOT EXISTS target_source TEXT; 9 9 + ALTER TABLE annotations ADD COLUMN IF NOT EXISTS target_hash TEXT; 10 10 + ALTER TABLE annotations ADD COLUMN IF NOT EXISTS target_title TEXT; 11 11 + ALTER TABLE annotations ADD COLUMN IF NOT EXISTS selector_json TEXT; 12 12 + ALTER TABLE annotations ADD COLUMN IF NOT EXISTS tags_json TEXT; 13 13 + ALTER TABLE annotations ADD COLUMN IF NOT EXISTS cid TEXT; 14 14 + 15 15 + -- +goose StatementBegin 16 16 + DO $$ 17 17 + BEGIN 18 18 + IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name = 'annotations' AND column_name = 'url') THEN 19 19 + UPDATE annotations SET target_source = url WHERE target_source IS NULL AND url IS NOT NULL; 20 20 + UPDATE annotations SET target_hash = url_hash WHERE target_hash IS NULL AND url_hash IS NOT NULL; 21 21 + UPDATE annotations SET body_value = text WHERE body_value IS NULL AND text IS NOT NULL; 22 22 + UPDATE annotations SET target_title = title WHERE target_title IS NULL AND title IS NOT NULL; 23 23 + END IF; 24 24 + UPDATE annotations SET motivation = 'commenting' WHERE motivation IS NULL; 25 25 + END $$; 26 26 + -- +goose StatementEnd 27 27 + 28 28 + ALTER TABLE profiles ADD COLUMN IF NOT EXISTS website TEXT; 29 29 + ALTER TABLE profiles ADD COLUMN IF NOT EXISTS display_name TEXT; 30 30 + ALTER TABLE profiles ADD COLUMN IF NOT EXISTS avatar TEXT; 31 31 + 32 32 + ALTER TABLE cursors ALTER COLUMN last_cursor TYPE BIGINT; 33 33 + 34 34 + ALTER TABLE api_keys ADD COLUMN IF NOT EXISTS uri TEXT; 35 35 + ALTER TABLE api_keys ADD COLUMN IF NOT EXISTS cid TEXT; 36 36 + ALTER TABLE api_keys ADD COLUMN IF NOT EXISTS indexed_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP; 37 37 + 38 38 + ALTER TABLE preferences ADD COLUMN IF NOT EXISTS subscribed_labelers TEXT; 39 39 + ALTER TABLE preferences ADD COLUMN IF NOT EXISTS label_preferences TEXT; 40 40 + ALTER TABLE preferences ADD COLUMN IF NOT EXISTS disable_external_link_warning BOOLEAN; 41 41 + ALTER TABLE preferences ADD COLUMN IF NOT EXISTS enable_community_bookmarks BOOLEAN DEFAULT false; 42 42 + 43 43 + -- +goose Down

+33

backend/internal/db/migrations/00004_views.sql

reviewed

··· 1 1 + -- +goose Up 2 2 + -- +goose StatementBegin 3 3 + CREATE OR REPLACE VIEW all_highlights AS 4 4 + SELECT uri, author_did, target_source, target_hash, target_title, selector_json, color, tags_json, created_at, indexed_at, cid 5 5 + FROM highlights 6 6 + UNION ALL 7 7 + SELECT uri, author_did, target_source, target_hash, target_title, selector_json, color, tags_json, created_at, indexed_at, cid 8 8 + FROM notes WHERE motivation = 'highlighting'; 9 9 + -- +goose StatementEnd 10 10 + 11 11 + -- +goose StatementBegin 12 12 + CREATE OR REPLACE VIEW all_annotations AS 13 13 + SELECT uri, author_did, motivation, body_value, body_format, body_uri, target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 14 14 + FROM annotations 15 15 + UNION ALL 16 16 + SELECT uri, author_did, motivation, body_value, body_format, body_uri, target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 17 17 + FROM notes WHERE motivation NOT IN ('highlighting', 'bookmarking'); 18 18 + -- +goose StatementEnd 19 19 + 20 20 + -- +goose StatementBegin 21 21 + CREATE OR REPLACE VIEW all_bookmarks AS 22 22 + SELECT uri, author_did, source, source_hash, title, description, tags_json, created_at, indexed_at, cid 23 23 + FROM bookmarks 24 24 + UNION ALL 25 25 + SELECT uri, author_did, target_source AS source, target_hash AS source_hash, target_title AS title, 26 26 + COALESCE(body_value, description) AS description, tags_json, created_at, indexed_at, cid 27 27 + FROM notes WHERE motivation = 'bookmarking'; 28 28 + -- +goose StatementEnd 29 29 + 30 30 + -- +goose Down 31 31 + DROP VIEW IF EXISTS all_bookmarks; 32 32 + DROP VIEW IF EXISTS all_annotations; 33 33 + DROP VIEW IF EXISTS all_highlights;

+29

backend/internal/db/migrations/00005_recommendations.sql

reviewed

··· 1 1 + -- +goose Up 2 2 + CREATE TABLE IF NOT EXISTS document_embeddings ( 3 3 + document_uri TEXT PRIMARY KEY, 4 4 + embedding TEXT NOT NULL, 5 5 + updated_at TIMESTAMP NOT NULL 6 6 + ); 7 7 + 8 8 + CREATE TABLE IF NOT EXISTS annotation_embeddings ( 9 9 + annotation_uri TEXT PRIMARY KEY, 10 10 + author_did TEXT NOT NULL, 11 11 + document_uri TEXT, 12 12 + embedding TEXT NOT NULL, 13 13 + updated_at TIMESTAMP NOT NULL 14 14 + ); 15 15 + CREATE INDEX IF NOT EXISTS idx_ann_emb_author ON annotation_embeddings(author_did); 16 16 + CREATE INDEX IF NOT EXISTS idx_ann_emb_document ON annotation_embeddings(document_uri); 17 17 + 18 18 + CREATE TABLE IF NOT EXISTS user_profiles ( 19 19 + author_did TEXT PRIMARY KEY, 20 20 + embedding TEXT NOT NULL, 21 21 + tag_affinities TEXT DEFAULT '{}', 22 22 + annotation_count INTEGER NOT NULL DEFAULT 0, 23 23 + updated_at TIMESTAMP NOT NULL 24 24 + ); 25 25 + 26 26 + -- +goose Down 27 27 + DROP TABLE IF EXISTS user_profiles; 28 28 + DROP TABLE IF EXISTS annotation_embeddings; 29 29 + DROP TABLE IF EXISTS document_embeddings;

+20 -20

backend/internal/db/queries_annotations.go

reviewed

··· 28 28 var a Annotation 29 29 err := db.QueryRow(` 30 30 SELECT uri, author_did, motivation, body_value, body_format, body_uri, target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 31 31 - FROM annotations 31 31 + FROM all_annotations 32 32 WHERE uri = $1 33 33 `, uri).Scan(&a.URI, &a.AuthorDID, &a.Motivation, &a.BodyValue, &a.BodyFormat, &a.BodyURI, &a.TargetSource, &a.TargetHash, &a.TargetTitle, &a.SelectorJSON, &a.TagsJSON, &a.CreatedAt, &a.IndexedAt, &a.CID) 34 34 if err != nil { ··· 40 40 func (db *DB) GetAnnotationsByTargetHash(targetHash string, limit, offset int) ([]Annotation, error) { 41 41 rows, err := db.Query(` 42 42 SELECT uri, author_did, motivation, body_value, body_format, body_uri, target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 43 43 - FROM annotations 43 43 + FROM all_annotations 44 44 WHERE target_hash = $1 45 45 ORDER BY created_at DESC 46 46 LIMIT $2 OFFSET $3 ··· 56 56 func (db *DB) GetAnnotationsByAuthor(authorDID string, limit, offset int) ([]Annotation, error) { 57 57 rows, err := db.Query(` 58 58 SELECT uri, author_did, motivation, body_value, body_format, body_uri, target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 59 59 - FROM annotations 59 59 + FROM all_annotations 60 60 WHERE author_did = $1 61 61 ORDER BY created_at DESC 62 62 LIMIT $2 OFFSET $3 ··· 72 72 func (db *DB) GetMarginAnnotationsByAuthor(authorDID string, limit, offset int) ([]Annotation, error) { 73 73 rows, err := db.Query(` 74 74 SELECT uri, author_did, motivation, body_value, body_format, body_uri, target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 75 75 - FROM annotations 75 75 + FROM all_annotations 76 76 WHERE author_did = $1 AND uri NOT LIKE '%network.cosmik%' 77 77 ORDER BY created_at DESC 78 78 LIMIT $2 OFFSET $3 ··· 88 88 func (db *DB) GetSembleAnnotationsByAuthor(authorDID string, limit, offset int) ([]Annotation, error) { 89 89 rows, err := db.Query(` 90 90 SELECT uri, author_did, motivation, body_value, body_format, body_uri, target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 91 91 - FROM annotations 91 91 + FROM all_annotations 92 92 WHERE author_did = $1 AND uri LIKE '%network.cosmik%' 93 93 ORDER BY created_at DESC 94 94 LIMIT $2 OFFSET $3 ··· 104 104 func (db *DB) GetAnnotationsByMotivation(motivation string, limit, offset int) ([]Annotation, error) { 105 105 rows, err := db.Query(` 106 106 SELECT uri, author_did, motivation, body_value, body_format, body_uri, target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 107 107 - FROM annotations 107 107 + FROM all_annotations 108 108 WHERE motivation = $1 109 109 ORDER BY created_at DESC 110 110 LIMIT $2 OFFSET $3 ··· 120 120 func (db *DB) GetRecentAnnotations(limit, offset int) ([]Annotation, error) { 121 121 rows, err := db.Query(` 122 122 SELECT uri, author_did, motivation, body_value, body_format, body_uri, target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 123 123 - FROM annotations 123 123 + FROM all_annotations 124 124 ORDER BY created_at DESC 125 125 LIMIT $1 OFFSET $2 126 126 `, limit, offset) ··· 139 139 a.uri, a.author_did, a.motivation, a.body_value, a.body_format, 140 140 a.body_uri, a.target_source, a.target_hash, a.target_title, 141 141 a.selector_json, a.tags_json, a.created_at, a.indexed_at, a.cid 142 142 - FROM annotations a 142 142 + FROM all_annotations a 143 143 LEFT JOIN LATERAL ( 144 144 SELECT COUNT(*) as cnt FROM likes WHERE subject_uri = a.uri 145 145 ) l ON true ··· 166 166 a.uri, a.author_did, a.motivation, a.body_value, a.body_format, 167 167 a.body_uri, a.target_source, a.target_hash, a.target_title, 168 168 a.selector_json, a.tags_json, a.created_at, a.indexed_at, a.cid 169 169 - FROM annotations a 169 169 + FROM all_annotations a 170 170 WHERE a.created_at < $1 AND a.created_at > $2 171 171 AND NOT EXISTS (SELECT 1 FROM likes WHERE subject_uri = a.uri) 172 172 AND NOT EXISTS (SELECT 1 FROM replies WHERE root_uri = a.uri) ··· 184 184 func (db *DB) GetMarginAnnotations(limit, offset int) ([]Annotation, error) { 185 185 rows, err := db.Query(` 186 186 SELECT uri, author_did, motivation, body_value, body_format, body_uri, target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 187 187 - FROM annotations 187 187 + FROM all_annotations 188 188 WHERE uri NOT LIKE '%network.cosmik%' 189 189 ORDER BY created_at DESC 190 190 LIMIT $1 OFFSET $2 ··· 200 200 func (db *DB) GetSembleAnnotations(limit, offset int) ([]Annotation, error) { 201 201 rows, err := db.Query(` 202 202 SELECT uri, author_did, motivation, body_value, body_format, body_uri, target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 203 203 - FROM annotations 203 203 + FROM all_annotations 204 204 WHERE uri LIKE '%network.cosmik%' 205 205 ORDER BY created_at DESC 206 206 LIMIT $1 OFFSET $2 ··· 216 216 func (db *DB) GetAnnotationsByTag(tag string, limit, offset int) ([]Annotation, error) { 217 217 rows, err := db.Query(` 218 218 SELECT uri, author_did, motivation, body_value, body_format, body_uri, target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 219 219 - FROM annotations 219 219 + FROM all_annotations 220 220 WHERE EXISTS(SELECT 1 FROM jsonb_array_elements_text(tags_json::jsonb) elem WHERE lower(elem) = $1) 221 221 ORDER BY created_at DESC 222 222 LIMIT $2 OFFSET $3 ··· 232 232 func (db *DB) GetMarginAnnotationsByTag(tag string, limit, offset int) ([]Annotation, error) { 233 233 rows, err := db.Query(` 234 234 SELECT uri, author_did, motivation, body_value, body_format, body_uri, target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 235 235 - FROM annotations 235 235 + FROM all_annotations 236 236 WHERE EXISTS(SELECT 1 FROM jsonb_array_elements_text(tags_json::jsonb) elem WHERE lower(elem) = $1) AND uri NOT LIKE '%network.cosmik%' 237 237 ORDER BY created_at DESC 238 238 LIMIT $2 OFFSET $3 ··· 248 248 func (db *DB) GetSembleAnnotationsByTag(tag string, limit, offset int) ([]Annotation, error) { 249 249 rows, err := db.Query(` 250 250 SELECT uri, author_did, motivation, body_value, body_format, body_uri, target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 251 251 - FROM annotations 251 251 + FROM all_annotations 252 252 WHERE EXISTS(SELECT 1 FROM jsonb_array_elements_text(tags_json::jsonb) elem WHERE lower(elem) = $1) AND uri LIKE '%network.cosmik%' 253 253 ORDER BY created_at DESC 254 254 LIMIT $2 OFFSET $3 ··· 278 278 func (db *DB) GetAnnotationsByTagAndAuthor(tag, authorDID string, limit, offset int) ([]Annotation, error) { 279 279 rows, err := db.Query(` 280 280 SELECT uri, author_did, motivation, body_value, body_format, body_uri, target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 281 281 - FROM annotations 281 281 + FROM all_annotations 282 282 WHERE author_did = $1 AND EXISTS(SELECT 1 FROM jsonb_array_elements_text(tags_json::jsonb) elem WHERE lower(elem) = $2) 283 283 ORDER BY created_at DESC 284 284 LIMIT $3 OFFSET $4 ··· 294 294 func (db *DB) GetMarginAnnotationsByTagAndAuthor(tag, authorDID string, limit, offset int) ([]Annotation, error) { 295 295 rows, err := db.Query(` 296 296 SELECT uri, author_did, motivation, body_value, body_format, body_uri, target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 297 297 - FROM annotations 297 297 + FROM all_annotations 298 298 WHERE author_did = $1 AND EXISTS(SELECT 1 FROM jsonb_array_elements_text(tags_json::jsonb) elem WHERE lower(elem) = $2) AND uri NOT LIKE '%network.cosmik%' 299 299 ORDER BY created_at DESC 300 300 LIMIT $3 OFFSET $4 ··· 310 310 func (db *DB) GetSembleAnnotationsByTagAndAuthor(tag, authorDID string, limit, offset int) ([]Annotation, error) { 311 311 rows, err := db.Query(` 312 312 SELECT uri, author_did, motivation, body_value, body_format, body_uri, target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 313 313 - FROM annotations 313 313 + FROM all_annotations 314 314 WHERE author_did = $1 AND EXISTS(SELECT 1 FROM jsonb_array_elements_text(tags_json::jsonb) elem WHERE lower(elem) = $2) AND uri LIKE '%network.cosmik%' 315 315 ORDER BY created_at DESC 316 316 LIMIT $3 OFFSET $4 ··· 326 326 func (db *DB) GetAnnotationsByAuthorAndTargetHash(authorDID, targetHash string, limit, offset int) ([]Annotation, error) { 327 327 rows, err := db.Query(` 328 328 SELECT uri, author_did, motivation, body_value, body_format, body_uri, target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 329 329 - FROM annotations 329 329 + FROM all_annotations 330 330 WHERE author_did = $1 AND target_hash = $2 331 331 ORDER BY created_at DESC 332 332 LIMIT $3 OFFSET $4 ··· 346 346 347 347 query := ` 348 348 SELECT uri, author_did, motivation, body_value, body_format, body_uri, target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 349 349 - FROM annotations 349 349 + FROM all_annotations 350 350 WHERE uri = ANY($1) 351 351 ` 352 352 ··· 361 361 362 362 func (db *DB) GetAnnotationURIs(authorDID string) ([]string, error) { 363 363 rows, err := db.Query(` 364 364 - SELECT uri FROM annotations WHERE author_did = $1 364 364 + SELECT uri FROM all_annotations WHERE author_did = $1 365 365 `, authorDID) 366 366 if err != nil { 367 367 return nil, err

+18 -18

backend/internal/db/queries_bookmarks.go

reviewed

··· 24 24 var b Bookmark 25 25 err := db.QueryRow(` 26 26 SELECT uri, author_did, source, source_hash, title, description, tags_json, created_at, indexed_at, cid 27 27 - FROM bookmarks 27 27 + FROM all_bookmarks 28 28 WHERE uri = $1 29 29 `, uri).Scan(&b.URI, &b.AuthorDID, &b.Source, &b.SourceHash, &b.Title, &b.Description, &b.TagsJSON, &b.CreatedAt, &b.IndexedAt, &b.CID) 30 30 if err != nil { ··· 36 36 func (db *DB) GetRecentBookmarks(limit, offset int) ([]Bookmark, error) { 37 37 rows, err := db.Query(` 38 38 SELECT uri, author_did, source, source_hash, title, description, tags_json, created_at, indexed_at, cid 39 39 - FROM bookmarks 39 39 + FROM all_bookmarks 40 40 ORDER BY created_at DESC 41 41 LIMIT $1 OFFSET $2 42 42 `, limit, offset) ··· 54 54 SELECT 55 55 b.uri, b.author_did, b.source, b.source_hash, b.title, 56 56 b.description, b.tags_json, b.created_at, b.indexed_at, b.cid 57 57 - FROM bookmarks b 57 57 + FROM all_bookmarks b 58 58 LEFT JOIN LATERAL ( 59 59 SELECT COUNT(*) as cnt FROM likes WHERE subject_uri = b.uri 60 60 ) l ON true ··· 80 80 SELECT 81 81 b.uri, b.author_did, b.source, b.source_hash, b.title, 82 82 b.description, b.tags_json, b.created_at, b.indexed_at, b.cid 83 83 - FROM bookmarks b 83 83 + FROM all_bookmarks b 84 84 WHERE b.created_at < $1 AND b.created_at > $2 85 85 AND NOT EXISTS (SELECT 1 FROM likes WHERE subject_uri = b.uri) 86 86 AND NOT EXISTS (SELECT 1 FROM replies WHERE root_uri = b.uri) ··· 98 98 func (db *DB) GetMarginBookmarks(limit, offset int) ([]Bookmark, error) { 99 99 rows, err := db.Query(` 100 100 SELECT uri, author_did, source, source_hash, title, description, tags_json, created_at, indexed_at, cid 101 101 - FROM bookmarks 101 101 + FROM all_bookmarks 102 102 WHERE uri NOT LIKE '%network.cosmik%' 103 103 ORDER BY created_at DESC 104 104 LIMIT $1 OFFSET $2 ··· 114 114 func (db *DB) GetSembleBookmarks(limit, offset int) ([]Bookmark, error) { 115 115 rows, err := db.Query(` 116 116 SELECT uri, author_did, source, source_hash, title, description, tags_json, created_at, indexed_at, cid 117 117 - FROM bookmarks 117 117 + FROM all_bookmarks 118 118 WHERE uri LIKE '%network.cosmik%' 119 119 ORDER BY created_at DESC 120 120 LIMIT $1 OFFSET $2 ··· 130 130 func (db *DB) GetBookmarksByTag(tag string, limit, offset int) ([]Bookmark, error) { 131 131 rows, err := db.Query(` 132 132 SELECT uri, author_did, source, source_hash, title, description, tags_json, created_at, indexed_at, cid 133 133 - FROM bookmarks 133 133 + FROM all_bookmarks 134 134 WHERE EXISTS(SELECT 1 FROM jsonb_array_elements_text(tags_json::jsonb) elem WHERE lower(elem) = $1) 135 135 ORDER BY created_at DESC 136 136 LIMIT $2 OFFSET $3 ··· 146 146 func (db *DB) GetMarginBookmarksByTag(tag string, limit, offset int) ([]Bookmark, error) { 147 147 rows, err := db.Query(` 148 148 SELECT uri, author_did, source, source_hash, title, description, tags_json, created_at, indexed_at, cid 149 149 - FROM bookmarks 149 149 + FROM all_bookmarks 150 150 WHERE EXISTS(SELECT 1 FROM jsonb_array_elements_text(tags_json::jsonb) elem WHERE lower(elem) = $1) AND uri NOT LIKE '%network.cosmik%' 151 151 ORDER BY created_at DESC 152 152 LIMIT $2 OFFSET $3 ··· 162 162 func (db *DB) GetSembleBookmarksByTag(tag string, limit, offset int) ([]Bookmark, error) { 163 163 rows, err := db.Query(` 164 164 SELECT uri, author_did, source, source_hash, title, description, tags_json, created_at, indexed_at, cid 165 165 - FROM bookmarks 165 165 + FROM all_bookmarks 166 166 WHERE EXISTS(SELECT 1 FROM jsonb_array_elements_text(tags_json::jsonb) elem WHERE lower(elem) = $1) AND uri LIKE '%network.cosmik%' 167 167 ORDER BY created_at DESC 168 168 LIMIT $2 OFFSET $3 ··· 178 178 func (db *DB) GetBookmarksByTagAndAuthor(tag, authorDID string, limit, offset int) ([]Bookmark, error) { 179 179 rows, err := db.Query(` 180 180 SELECT uri, author_did, source, source_hash, title, description, tags_json, created_at, indexed_at, cid 181 181 - FROM bookmarks 181 181 + FROM all_bookmarks 182 182 WHERE author_did = $1 AND EXISTS(SELECT 1 FROM jsonb_array_elements_text(tags_json::jsonb) elem WHERE lower(elem) = $2) 183 183 ORDER BY created_at DESC 184 184 LIMIT $3 OFFSET $4 ··· 194 194 func (db *DB) GetMarginBookmarksByTagAndAuthor(tag, authorDID string, limit, offset int) ([]Bookmark, error) { 195 195 rows, err := db.Query(` 196 196 SELECT uri, author_did, source, source_hash, title, description, tags_json, created_at, indexed_at, cid 197 197 - FROM bookmarks 197 197 + FROM all_bookmarks 198 198 WHERE author_did = $1 AND EXISTS(SELECT 1 FROM jsonb_array_elements_text(tags_json::jsonb) elem WHERE lower(elem) = $2) AND uri NOT LIKE '%network.cosmik%' 199 199 ORDER BY created_at DESC 200 200 LIMIT $3 OFFSET $4 ··· 210 210 func (db *DB) GetSembleBookmarksByTagAndAuthor(tag, authorDID string, limit, offset int) ([]Bookmark, error) { 211 211 rows, err := db.Query(` 212 212 SELECT uri, author_did, source, source_hash, title, description, tags_json, created_at, indexed_at, cid 213 213 - FROM bookmarks 213 213 + FROM all_bookmarks 214 214 WHERE author_did = $1 AND EXISTS(SELECT 1 FROM jsonb_array_elements_text(tags_json::jsonb) elem WHERE lower(elem) = $2) AND uri LIKE '%network.cosmik%' 215 215 ORDER BY created_at DESC 216 216 LIMIT $3 OFFSET $4 ··· 226 226 func (db *DB) GetBookmarksByAuthor(authorDID string, limit, offset int) ([]Bookmark, error) { 227 227 rows, err := db.Query(` 228 228 SELECT uri, author_did, source, source_hash, title, description, tags_json, created_at, indexed_at, cid 229 229 - FROM bookmarks 229 229 + FROM all_bookmarks 230 230 WHERE author_did = $1 231 231 ORDER BY created_at DESC 232 232 LIMIT $2 OFFSET $3 ··· 242 242 func (db *DB) GetMarginBookmarksByAuthor(authorDID string, limit, offset int) ([]Bookmark, error) { 243 243 rows, err := db.Query(` 244 244 SELECT uri, author_did, source, source_hash, title, description, tags_json, created_at, indexed_at, cid 245 245 - FROM bookmarks 245 245 + FROM all_bookmarks 246 246 WHERE author_did = $1 AND uri NOT LIKE '%network.cosmik%' 247 247 ORDER BY created_at DESC 248 248 LIMIT $2 OFFSET $3 ··· 258 258 func (db *DB) GetSembleBookmarksByAuthor(authorDID string, limit, offset int) ([]Bookmark, error) { 259 259 rows, err := db.Query(` 260 260 SELECT uri, author_did, source, source_hash, title, description, tags_json, created_at, indexed_at, cid 261 261 - FROM bookmarks 261 261 + FROM all_bookmarks 262 262 WHERE author_did = $1 AND uri LIKE '%network.cosmik%' 263 263 ORDER BY created_at DESC 264 264 LIMIT $2 OFFSET $3 ··· 292 292 293 293 rows, err := db.Query(` 294 294 SELECT uri, author_did, source, source_hash, title, description, tags_json, created_at, indexed_at, cid 295 295 - FROM bookmarks 295 295 + FROM all_bookmarks 296 296 WHERE uri = ANY($1) 297 297 `, pqStringArray(uris)) 298 298 if err != nil { ··· 305 305 306 306 func (db *DB) GetBookmarkURIs(authorDID string) ([]string, error) { 307 307 rows, err := db.Query(` 308 308 - SELECT uri FROM bookmarks WHERE author_did = $1 308 308 + SELECT uri FROM all_bookmarks WHERE author_did = $1 309 309 `, authorDID) 310 310 if err != nil { 311 311 return nil, err ··· 326 326 func (db *DB) GetBookmarksByTargetHash(targetHash string, limit, offset int) ([]Bookmark, error) { 327 327 rows, err := db.Query(` 328 328 SELECT uri, author_did, source, source_hash, title, description, tags_json, created_at, indexed_at, cid 329 329 - FROM bookmarks 329 329 + FROM all_bookmarks 330 330 WHERE source_hash = $1 331 331 ORDER BY created_at DESC 332 332 LIMIT $2 OFFSET $3

+19 -19

backend/internal/db/queries_highlights.go

reviewed

··· 25 25 var h Highlight 26 26 err := db.QueryRow(` 27 27 SELECT uri, author_did, target_source, target_hash, target_title, selector_json, color, tags_json, created_at, indexed_at, cid 28 28 - FROM highlights 28 28 + FROM all_highlights 29 29 WHERE uri = $1 30 30 `, uri).Scan(&h.URI, &h.AuthorDID, &h.TargetSource, &h.TargetHash, &h.TargetTitle, &h.SelectorJSON, &h.Color, &h.TagsJSON, &h.CreatedAt, &h.IndexedAt, &h.CID) 31 31 if err != nil { ··· 37 37 func (db *DB) GetRecentHighlights(limit, offset int) ([]Highlight, error) { 38 38 rows, err := db.Query(` 39 39 SELECT uri, author_did, target_source, target_hash, target_title, selector_json, color, tags_json, created_at, indexed_at, cid 40 40 - FROM highlights 40 40 + FROM all_highlights 41 41 ORDER BY created_at DESC 42 42 LIMIT $1 OFFSET $2 43 43 `, limit, offset) ··· 55 55 SELECT 56 56 h.uri, h.author_did, h.target_source, h.target_hash, h.target_title, 57 57 h.selector_json, h.color, h.tags_json, h.created_at, h.indexed_at, h.cid 58 58 - FROM highlights h 58 58 + FROM all_highlights h 59 59 LEFT JOIN LATERAL ( 60 60 SELECT COUNT(*) as cnt FROM likes WHERE subject_uri = h.uri 61 61 ) l ON true ··· 81 81 SELECT 82 82 h.uri, h.author_did, h.target_source, h.target_hash, h.target_title, 83 83 h.selector_json, h.color, h.tags_json, h.created_at, h.indexed_at, h.cid 84 84 - FROM highlights h 84 84 + FROM all_highlights h 85 85 WHERE h.created_at < $1 AND h.created_at > $2 86 86 AND NOT EXISTS (SELECT 1 FROM likes WHERE subject_uri = h.uri) 87 87 AND NOT EXISTS (SELECT 1 FROM replies WHERE root_uri = h.uri) ··· 99 99 func (db *DB) GetMarginHighlights(limit, offset int) ([]Highlight, error) { 100 100 rows, err := db.Query(` 101 101 SELECT uri, author_did, target_source, target_hash, target_title, selector_json, color, tags_json, created_at, indexed_at, cid 102 102 - FROM highlights 102 102 + FROM all_highlights 103 103 WHERE uri NOT LIKE '%network.cosmik%' 104 104 ORDER BY created_at DESC 105 105 LIMIT $1 OFFSET $2 ··· 115 115 func (db *DB) GetSembleHighlights(limit, offset int) ([]Highlight, error) { 116 116 rows, err := db.Query(` 117 117 SELECT uri, author_did, target_source, target_hash, target_title, selector_json, color, tags_json, created_at, indexed_at, cid 118 118 - FROM highlights 118 118 + FROM all_highlights 119 119 WHERE uri LIKE '%network.cosmik%' 120 120 ORDER BY created_at DESC 121 121 LIMIT $1 OFFSET $2 ··· 131 131 func (db *DB) GetHighlightsByTag(tag string, limit, offset int) ([]Highlight, error) { 132 132 rows, err := db.Query(` 133 133 SELECT uri, author_did, target_source, target_hash, target_title, selector_json, color, tags_json, created_at, indexed_at, cid 134 134 - FROM highlights 134 134 + FROM all_highlights 135 135 WHERE EXISTS(SELECT 1 FROM jsonb_array_elements_text(tags_json::jsonb) elem WHERE lower(elem) = $1) 136 136 ORDER BY created_at DESC 137 137 LIMIT $2 OFFSET $3 ··· 147 147 func (db *DB) GetMarginHighlightsByTag(tag string, limit, offset int) ([]Highlight, error) { 148 148 rows, err := db.Query(` 149 149 SELECT uri, author_did, target_source, target_hash, target_title, selector_json, color, tags_json, created_at, indexed_at, cid 150 150 - FROM highlights 150 150 + FROM all_highlights 151 151 WHERE EXISTS(SELECT 1 FROM jsonb_array_elements_text(tags_json::jsonb) elem WHERE lower(elem) = $1) AND uri NOT LIKE '%network.cosmik%' 152 152 ORDER BY created_at DESC 153 153 LIMIT $2 OFFSET $3 ··· 163 163 func (db *DB) GetSembleHighlightsByTag(tag string, limit, offset int) ([]Highlight, error) { 164 164 rows, err := db.Query(` 165 165 SELECT uri, author_did, target_source, target_hash, target_title, selector_json, color, tags_json, created_at, indexed_at, cid 166 166 - FROM highlights 166 166 + FROM all_highlights 167 167 WHERE EXISTS(SELECT 1 FROM jsonb_array_elements_text(tags_json::jsonb) elem WHERE lower(elem) = $1) AND uri LIKE '%network.cosmik%' 168 168 ORDER BY created_at DESC 169 169 LIMIT $2 OFFSET $3 ··· 179 179 func (db *DB) GetHighlightsByTagAndAuthor(tag, authorDID string, limit, offset int) ([]Highlight, error) { 180 180 rows, err := db.Query(` 181 181 SELECT uri, author_did, target_source, target_hash, target_title, selector_json, color, tags_json, created_at, indexed_at, cid 182 182 - FROM highlights 182 182 + FROM all_highlights 183 183 WHERE author_did = $1 AND EXISTS(SELECT 1 FROM jsonb_array_elements_text(tags_json::jsonb) elem WHERE lower(elem) = $2) 184 184 ORDER BY created_at DESC 185 185 LIMIT $3 OFFSET $4 ··· 195 195 func (db *DB) GetMarginHighlightsByTagAndAuthor(tag, authorDID string, limit, offset int) ([]Highlight, error) { 196 196 rows, err := db.Query(` 197 197 SELECT uri, author_did, target_source, target_hash, target_title, selector_json, color, tags_json, created_at, indexed_at, cid 198 198 - FROM highlights 198 198 + FROM all_highlights 199 199 WHERE author_did = $1 AND EXISTS(SELECT 1 FROM jsonb_array_elements_text(tags_json::jsonb) elem WHERE lower(elem) = $2) AND uri NOT LIKE '%network.cosmik%' 200 200 ORDER BY created_at DESC 201 201 LIMIT $3 OFFSET $4 ··· 211 211 func (db *DB) GetSembleHighlightsByTagAndAuthor(tag, authorDID string, limit, offset int) ([]Highlight, error) { 212 212 rows, err := db.Query(` 213 213 SELECT uri, author_did, target_source, target_hash, target_title, selector_json, color, tags_json, created_at, indexed_at, cid 214 214 - FROM highlights 214 214 + FROM all_highlights 215 215 WHERE author_did = $1 AND EXISTS(SELECT 1 FROM jsonb_array_elements_text(tags_json::jsonb) elem WHERE lower(elem) = $2) AND uri LIKE '%network.cosmik%' 216 216 ORDER BY created_at DESC 217 217 LIMIT $3 OFFSET $4 ··· 227 227 func (db *DB) GetHighlightsByTargetHash(targetHash string, limit, offset int) ([]Highlight, error) { 228 228 rows, err := db.Query(` 229 229 SELECT uri, author_did, target_source, target_hash, target_title, selector_json, color, tags_json, created_at, indexed_at, cid 230 230 - FROM highlights 230 230 + FROM all_highlights 231 231 WHERE target_hash = $1 232 232 ORDER BY created_at DESC 233 233 LIMIT $2 OFFSET $3 ··· 243 243 func (db *DB) GetHighlightsByAuthor(authorDID string, limit, offset int) ([]Highlight, error) { 244 244 rows, err := db.Query(` 245 245 SELECT uri, author_did, target_source, target_hash, target_title, selector_json, color, tags_json, created_at, indexed_at, cid 246 246 - FROM highlights 246 246 + FROM all_highlights 247 247 WHERE author_did = $1 248 248 ORDER BY created_at DESC 249 249 LIMIT $2 OFFSET $3 ··· 259 259 func (db *DB) GetMarginHighlightsByAuthor(authorDID string, limit, offset int) ([]Highlight, error) { 260 260 rows, err := db.Query(` 261 261 SELECT uri, author_did, target_source, target_hash, target_title, selector_json, color, tags_json, created_at, indexed_at, cid 262 262 - FROM highlights 262 262 + FROM all_highlights 263 263 WHERE author_did = $1 AND uri NOT LIKE '%network.cosmik%' 264 264 ORDER BY created_at DESC 265 265 LIMIT $2 OFFSET $3 ··· 275 275 func (db *DB) GetSembleHighlightsByAuthor(authorDID string, limit, offset int) ([]Highlight, error) { 276 276 rows, err := db.Query(` 277 277 SELECT uri, author_did, target_source, target_hash, target_title, selector_json, color, tags_json, created_at, indexed_at, cid 278 278 - FROM highlights 278 278 + FROM all_highlights 279 279 WHERE author_did = $1 AND uri LIKE '%network.cosmik%' 280 280 ORDER BY created_at DESC 281 281 LIMIT $2 OFFSET $3 ··· 291 291 func (db *DB) GetHighlightsByAuthorAndTargetHash(authorDID, targetHash string, limit, offset int) ([]Highlight, error) { 292 292 rows, err := db.Query(` 293 293 SELECT uri, author_did, target_source, target_hash, target_title, selector_json, color, tags_json, created_at, indexed_at, cid 294 294 - FROM highlights 294 294 + FROM all_highlights 295 295 WHERE author_did = $1 AND target_hash = $2 296 296 ORDER BY created_at DESC 297 297 LIMIT $3 OFFSET $4 ··· 325 325 326 326 rows, err := db.Query(` 327 327 SELECT uri, author_did, target_source, target_hash, target_title, selector_json, color, tags_json, created_at, indexed_at, cid 328 328 - FROM highlights 328 328 + FROM all_highlights 329 329 WHERE uri = ANY($1) 330 330 `, pqStringArray(uris)) 331 331 if err != nil { ··· 338 338 339 339 func (db *DB) GetHighlightURIs(authorDID string) ([]string, error) { 340 340 rows, err := db.Query(` 341 341 - SELECT uri FROM highlights WHERE author_did = $1 341 341 + SELECT uri FROM all_highlights WHERE author_did = $1 342 342 `, authorDID) 343 343 if err != nil { 344 344 return nil, err

+130

backend/internal/db/queries_notes.go

reviewed

··· 1 1 + package db 2 2 + 3 3 + import ( 4 4 + "database/sql" 5 5 + "time" 6 6 + ) 7 7 + 8 8 + func (db *DB) CreateNote(n *Note) error { 9 9 + query := ` 10 10 + INSERT INTO notes ( 11 11 + uri, author_did, motivation, color, description, body_value, body_format, body_uri, 12 12 + target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 13 13 + ) VALUES ( 14 14 + $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16 15 15 + ) ON CONFLICT (uri) DO UPDATE SET 16 16 + motivation = EXCLUDED.motivation, 17 17 + color = EXCLUDED.color, 18 18 + description = EXCLUDED.description, 19 19 + body_value = EXCLUDED.body_value, 20 20 + body_format = EXCLUDED.body_format, 21 21 + body_uri = EXCLUDED.body_uri, 22 22 + target_source = EXCLUDED.target_source, 23 23 + target_hash = EXCLUDED.target_hash, 24 24 + target_title = EXCLUDED.target_title, 25 25 + selector_json = EXCLUDED.selector_json, 26 26 + tags_json = EXCLUDED.tags_json, 27 27 + indexed_at = EXCLUDED.indexed_at, 28 28 + cid = EXCLUDED.cid 29 29 + ` 30 30 + _, err := db.Exec(query, 31 31 + n.URI, n.AuthorDID, n.Motivation, n.Color, n.Description, n.BodyValue, n.BodyFormat, n.BodyURI, 32 32 + n.TargetSource, n.TargetHash, n.TargetTitle, n.SelectorJSON, n.TagsJSON, n.CreatedAt, n.IndexedAt, n.CID, 33 33 + ) 34 34 + return err 35 35 + } 36 36 + 37 37 + func (db *DB) GetNoteByURI(uri string) (*Note, error) { 38 38 + query := ` 39 39 + SELECT uri, author_did, motivation, color, description, body_value, body_format, body_uri, 40 40 + target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 41 41 + FROM notes WHERE uri = $1 42 42 + ` 43 43 + var n Note 44 44 + err := db.QueryRow(query, uri).Scan( 45 45 + &n.URI, &n.AuthorDID, &n.Motivation, &n.Color, &n.Description, &n.BodyValue, &n.BodyFormat, &n.BodyURI, 46 46 + &n.TargetSource, &n.TargetHash, &n.TargetTitle, &n.SelectorJSON, &n.TagsJSON, &n.CreatedAt, &n.IndexedAt, &n.CID, 47 47 + ) 48 48 + if err == sql.ErrNoRows { 49 49 + return nil, nil 50 50 + } 51 51 + if err != nil { 52 52 + return nil, err 53 53 + } 54 54 + return &n, nil 55 55 + } 56 56 + 57 57 + func (db *DB) MarginNoteBookmarkExists(authorDID, targetHash string) (bool, error) { 58 58 + var dummy int 59 59 + err := db.QueryRow(` 60 60 + SELECT 1 FROM notes 61 61 + WHERE author_did = $1 62 62 + AND target_hash = $2 63 63 + AND motivation = 'bookmarking' 64 64 + AND uri LIKE 'at://%/at.margin.note/%' 65 65 + LIMIT 1 66 66 + `, authorDID, targetHash).Scan(&dummy) 67 67 + if err == sql.ErrNoRows { 68 68 + return false, nil 69 69 + } 70 70 + if err != nil { 71 71 + return false, err 72 72 + } 73 73 + return true, nil 74 74 + } 75 75 + 76 76 + func (db *DB) CommunityBookmarkExists(authorDID, targetHash, tagsJSON string) (bool, error) { 77 77 + query := ` 78 78 + SELECT 1 FROM notes 79 79 + WHERE author_did = $1 80 80 + AND target_hash = $2 81 81 + AND uri LIKE 'at://%/community.lexicon.bookmarks.bookmark/%' 82 82 + AND COALESCE(tags_json, '[]') = COALESCE($3, '[]') 83 83 + LIMIT 1 84 84 + ` 85 85 + normalized := tagsJSON 86 86 + if normalized == "" { 87 87 + normalized = "[]" 88 88 + } 89 89 + var dummy int 90 90 + err := db.QueryRow(query, authorDID, targetHash, normalized).Scan(&dummy) 91 91 + if err == sql.ErrNoRows { 92 92 + return false, nil 93 93 + } 94 94 + if err != nil { 95 95 + return false, err 96 96 + } 97 97 + return true, nil 98 98 + } 99 99 + 100 100 + func (db *DB) DeleteNote(uri string) error { 101 101 + _, err := db.Exec("DELETE FROM notes WHERE uri = $1", uri) 102 102 + return err 103 103 + } 104 104 + 105 105 + func (db *DB) UpdateNoteAnnotation(uri, bodyValue, tagsJSON, cid string) error { 106 106 + _, err := db.Exec(` 107 107 + UPDATE notes 108 108 + SET body_value = $1, tags_json = NULLIF($2, ''), cid = $3, indexed_at = $4 109 109 + WHERE uri = $5 110 110 + `, bodyValue, tagsJSON, cid, time.Now(), uri) 111 111 + return err 112 112 + } 113 113 + 114 114 + func (db *DB) UpdateNoteHighlight(uri, color, tagsJSON, cid string) error { 115 115 + _, err := db.Exec(` 116 116 + UPDATE notes 117 117 + SET color = NULLIF($1, ''), tags_json = NULLIF($2, ''), cid = $3, indexed_at = $4 118 118 + WHERE uri = $5 119 119 + `, color, tagsJSON, cid, time.Now(), uri) 120 120 + return err 121 121 + } 122 122 + 123 123 + func (db *DB) UpdateNoteBookmark(uri, title, description, tagsJSON, cid string) error { 124 124 + _, err := db.Exec(` 125 125 + UPDATE notes 126 126 + SET target_title = NULLIF($1, ''), body_value = NULLIF($2, ''), tags_json = NULLIF($3, ''), cid = $4, indexed_at = $5 127 127 + WHERE uri = $6 128 128 + `, title, description, tagsJSON, cid, time.Now(), uri) 129 129 + return err 130 130 + }

+180

backend/internal/db/queries_profiles.go

reviewed

··· 1 1 + package db 2 2 + 3 3 + import ( 4 4 + "database/sql" 5 5 + "fmt" 6 6 + "strings" 7 7 + ) 8 8 + 9 9 + func (db *DB) GetProfile(did string) (*Profile, error) { 10 10 + var p Profile 11 11 + err := db.QueryRow( 12 12 + `SELECT uri, author_did, display_name, avatar, bio, website, links_json, created_at, indexed_at 13 13 + FROM profiles WHERE author_did = $1`, did, 14 14 + ).Scan(&p.URI, &p.AuthorDID, &p.DisplayName, &p.Avatar, &p.Bio, &p.Website, &p.LinksJSON, &p.CreatedAt, &p.IndexedAt) 15 15 + switch err { 16 16 + case nil: 17 17 + return &p, nil 18 18 + case sql.ErrNoRows: 19 19 + return nil, nil 20 20 + default: 21 21 + return nil, err 22 22 + } 23 23 + } 24 24 + 25 25 + func (db *DB) GetProfilesByDIDs(dids []string) (map[string]*Profile, error) { 26 26 + if len(dids) == 0 { 27 27 + return nil, nil 28 28 + } 29 29 + 30 30 + placeholders := make([]string, len(dids)) 31 31 + args := make([]interface{}, len(dids)) 32 32 + for i, did := range dids { 33 33 + placeholders[i] = fmt.Sprintf("$%d", i+1) 34 34 + args[i] = did 35 35 + } 36 36 + 37 37 + rows, err := db.Query( 38 38 + `SELECT uri, author_did, display_name, bio, avatar, website, links_json, created_at, indexed_at 39 39 + FROM profiles WHERE author_did IN (`+strings.Join(placeholders, ",")+`)`, 40 40 + args..., 41 41 + ) 42 42 + if err != nil { 43 43 + return nil, err 44 44 + } 45 45 + defer rows.Close() 46 46 + 47 47 + profiles := make(map[string]*Profile) 48 48 + for rows.Next() { 49 49 + var p Profile 50 50 + if err := rows.Scan(&p.URI, &p.AuthorDID, &p.DisplayName, &p.Bio, &p.Avatar, &p.Website, &p.LinksJSON, &p.CreatedAt, &p.IndexedAt); err != nil { 51 51 + continue 52 52 + } 53 53 + profiles[p.AuthorDID] = &p 54 54 + } 55 55 + return profiles, rows.Err() 56 56 + } 57 57 + 58 58 + func (db *DB) UpsertProfile(p *Profile) error { 59 59 + _, err := db.Exec(` 60 60 + INSERT INTO profiles (uri, author_did, display_name, avatar, bio, website, links_json, created_at, indexed_at) 61 61 + VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) 62 62 + ON CONFLICT(uri) DO UPDATE SET 63 63 + display_name = EXCLUDED.display_name, 64 64 + avatar = EXCLUDED.avatar, 65 65 + bio = EXCLUDED.bio, 66 66 + website = EXCLUDED.website, 67 67 + links_json = EXCLUDED.links_json, 68 68 + indexed_at = EXCLUDED.indexed_at 69 69 + `, p.URI, p.AuthorDID, p.DisplayName, p.Avatar, p.Bio, p.Website, p.LinksJSON, p.CreatedAt, p.IndexedAt) 70 70 + return err 71 71 + } 72 72 + 73 73 + func (db *DB) DeleteProfile(uri string) error { 74 74 + _, err := db.Exec("DELETE FROM profiles WHERE uri = $1", uri) 75 75 + return err 76 76 + } 77 77 + 78 78 + func (db *DB) GetPreferences(did string) (*Preferences, error) { 79 79 + var p Preferences 80 80 + err := db.QueryRow( 81 81 + `SELECT uri, author_did, external_link_skipped_hostnames, subscribed_labelers, 82 82 + label_preferences, disable_external_link_warning, enable_community_bookmarks, 83 83 + created_at, indexed_at, cid 84 84 + FROM preferences WHERE author_did = $1`, did, 85 85 + ).Scan( 86 86 + &p.URI, &p.AuthorDID, &p.ExternalLinkSkippedHostnames, &p.SubscribedLabelers, 87 87 + &p.LabelPreferences, &p.DisableExternalLinkWarning, &p.EnableCommunityBookmarks, 88 88 + &p.CreatedAt, &p.IndexedAt, &p.CID, 89 89 + ) 90 90 + switch err { 91 91 + case nil: 92 92 + return &p, nil 93 93 + case sql.ErrNoRows: 94 94 + return nil, nil 95 95 + default: 96 96 + return nil, err 97 97 + } 98 98 + } 99 99 + 100 100 + func (db *DB) UpsertPreferences(p *Preferences) error { 101 101 + _, err := db.Exec(` 102 102 + INSERT INTO preferences ( 103 103 + uri, author_did, external_link_skipped_hostnames, subscribed_labelers, 104 104 + label_preferences, disable_external_link_warning, enable_community_bookmarks, 105 105 + created_at, indexed_at, cid 106 106 + ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) 107 107 + ON CONFLICT(uri) DO UPDATE SET 108 108 + external_link_skipped_hostnames = EXCLUDED.external_link_skipped_hostnames, 109 109 + subscribed_labelers = EXCLUDED.subscribed_labelers, 110 110 + label_preferences = EXCLUDED.label_preferences, 111 111 + disable_external_link_warning = EXCLUDED.disable_external_link_warning, 112 112 + enable_community_bookmarks = EXCLUDED.enable_community_bookmarks, 113 113 + indexed_at = EXCLUDED.indexed_at, 114 114 + cid = EXCLUDED.cid 115 115 + `, p.URI, p.AuthorDID, p.ExternalLinkSkippedHostnames, p.SubscribedLabelers, 116 116 + p.LabelPreferences, p.DisableExternalLinkWarning, p.EnableCommunityBookmarks, 117 117 + p.CreatedAt, p.IndexedAt, p.CID) 118 118 + return err 119 119 + } 120 120 + 121 121 + func (db *DB) DeletePreferences(uri string) error { 122 122 + _, err := db.Exec("DELETE FROM preferences WHERE uri = $1", uri) 123 123 + return err 124 124 + } 125 125 + 126 126 + func (db *DB) GetPreferenceURIs(did string) ([]string, error) { 127 127 + rows, err := db.Query( 128 128 + "SELECT uri FROM preferences WHERE author_did = $1 AND uri IS NOT NULL AND uri != ''", did, 129 129 + ) 130 130 + if err != nil { 131 131 + return nil, err 132 132 + } 133 133 + defer rows.Close() 134 134 + var uris []string 135 135 + for rows.Next() { 136 136 + var uri string 137 137 + if err := rows.Scan(&uri); err != nil { 138 138 + return nil, err 139 139 + } 140 140 + uris = append(uris, uri) 141 141 + } 142 142 + return uris, rows.Err() 143 143 + } 144 144 + 145 145 + func (db *DB) DeleteAPIKey(id, ownerDID string) (string, error) { 146 146 + var uri string 147 147 + err := db.QueryRow("SELECT uri FROM api_keys WHERE id = $1 AND owner_did = $2", id, ownerDID).Scan(&uri) 148 148 + if err != nil { 149 149 + if err == sql.ErrNoRows { 150 150 + return "", nil 151 151 + } 152 152 + return "", err 153 153 + } 154 154 + _, err = db.Exec("DELETE FROM api_keys WHERE id = $1 AND owner_did = $2", id, ownerDID) 155 155 + return uri, err 156 156 + } 157 157 + 158 158 + func (db *DB) DeleteAPIKeyByURI(uri string) error { 159 159 + _, err := db.Exec("DELETE FROM api_keys WHERE uri = $1", uri) 160 160 + return err 161 161 + } 162 162 + 163 163 + func (db *DB) GetAPIKeyURIs(ownerDID string) ([]string, error) { 164 164 + rows, err := db.Query( 165 165 + "SELECT uri FROM api_keys WHERE owner_did = $1 AND uri IS NOT NULL AND uri != ''", ownerDID, 166 166 + ) 167 167 + if err != nil { 168 168 + return nil, err 169 169 + } 170 170 + defer rows.Close() 171 171 + var uris []string 172 172 + for rows.Next() { 173 173 + var uri string 174 174 + if err := rows.Scan(&uri); err != nil { 175 175 + return nil, err 176 176 + } 177 177 + uris = append(uris, uri) 178 178 + } 179 179 + return uris, rows.Err() 180 180 + }

-40

backend/internal/db/queries_recommendations.go

reviewed

··· 54 54 UpdatedAt time.Time `json:"updatedAt"` 55 55 } 56 56 57 57 - func (db *DB) MigrateRecommendations() error { 58 58 - _, err := db.Exec(` 59 59 - CREATE TABLE IF NOT EXISTS document_embeddings ( 60 60 - document_uri TEXT PRIMARY KEY, 61 61 - embedding TEXT NOT NULL, 62 62 - updated_at TIMESTAMP NOT NULL 63 63 - )`) 64 64 - if err != nil { 65 65 - return fmt.Errorf("create document_embeddings table: %w", err) 66 66 - } 67 67 - 68 68 - _, err = db.Exec(` 69 69 - CREATE TABLE IF NOT EXISTS annotation_embeddings ( 70 70 - annotation_uri TEXT PRIMARY KEY, 71 71 - author_did TEXT NOT NULL, 72 72 - document_uri TEXT, 73 73 - embedding TEXT NOT NULL, 74 74 - updated_at TIMESTAMP NOT NULL 75 75 - )`) 76 76 - if err != nil { 77 77 - return fmt.Errorf("create annotation_embeddings table: %w", err) 78 78 - } 79 79 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_ann_emb_author ON annotation_embeddings(author_did)`) 80 80 - db.Exec(`CREATE INDEX IF NOT EXISTS idx_ann_emb_document ON annotation_embeddings(document_uri)`) 81 81 - 82 82 - _, err = db.Exec(` 83 83 - CREATE TABLE IF NOT EXISTS user_profiles ( 84 84 - author_did TEXT PRIMARY KEY, 85 85 - embedding TEXT NOT NULL, 86 86 - tag_affinities TEXT DEFAULT '{}', 87 87 - annotation_count INTEGER NOT NULL DEFAULT 0, 88 88 - updated_at TIMESTAMP NOT NULL 89 89 - )`) 90 90 - if err != nil { 91 91 - return fmt.Errorf("create user_profiles table: %w", err) 92 92 - } 93 93 - 94 94 - return nil 95 95 - } 96 96 - 97 57 func (db *DB) UpsertPublication(p *Publication) error { 98 58 query := ` 99 59 INSERT INTO publications (uri, author_did, url, name, description, show_in_discover, indexed_at)

+9

backend/internal/db/queries_sessions.go

reviewed

··· 35 35 _, err := db.Exec(`DELETE FROM sessions WHERE expires_at <= $1`, time.Now()) 36 36 return err 37 37 } 38 38 + 39 39 + func (db *DB) CountSessionsByDID(did string) (int, error) { 40 40 + var n int 41 41 + err := db.QueryRow( 42 42 + `SELECT COUNT(*) FROM sessions WHERE did = $1 AND expires_at > $2`, 43 43 + did, time.Now(), 44 44 + ).Scan(&n) 45 45 + return n, err 46 46 + }

+22

backend/internal/domain/filters.go

reviewed

··· 1 1 + package domain 2 2 + 3 3 + type FeedType string 4 4 + 5 5 + const ( 6 6 + FeedTypeRecent FeedType = "recent" 7 7 + FeedTypePopular FeedType = "popular" 8 8 + FeedTypeShelved FeedType = "shelved" 9 9 + FeedTypeMargin FeedType = "margin" 10 10 + FeedTypeSemble FeedType = "semble" 11 11 + ) 12 12 + 13 13 + type NoteFilter struct { 14 14 + Motivations []string 15 15 + AuthorDID string 16 16 + TargetHash string 17 17 + Tag string 18 18 + FeedType FeedType 19 19 + Query string 20 20 + Limit int 21 21 + Offset int 22 22 + }

+65

backend/internal/domain/interfaces.go

reviewed

··· 1 1 + package domain 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "time" 6 6 + ) 7 7 + 8 8 + type Author struct { 9 9 + DID string `json:"did"` 10 10 + Handle string `json:"handle"` 11 11 + DisplayName string `json:"displayName,omitempty"` 12 12 + Avatar string `json:"avatar,omitempty"` 13 13 + } 14 14 + 15 15 + type NoteRepository interface { 16 16 + List(ctx context.Context, f NoteFilter) ([]Note, error) 17 17 + GetByURI(ctx context.Context, uri string) (*Note, error) 18 18 + GetLikeByUserAndSubject(ctx context.Context, did, subjectURI string) (*Like, error) 19 19 + CreateNote(ctx context.Context, note *Note) error 20 20 + DeleteNote(ctx context.Context, uri string) error 21 21 + UpdateNoteAnnotation(ctx context.Context, uri, text, tags string, cid *string) error 22 22 + CreateLike(ctx context.Context, like *Like) error 23 23 + DeleteLike(ctx context.Context, uri string) error 24 24 + CreateReply(ctx context.Context, reply *Reply) error 25 25 + GetReplyByURI(ctx context.Context, uri string) (*Reply, error) 26 26 + DeleteReply(ctx context.Context, uri string) error 27 27 + DeleteAnnotation(ctx context.Context, uri string) error 28 28 + DeleteHighlight(ctx context.Context, uri string) error 29 29 + DeleteBookmark(ctx context.Context, uri string) error 30 30 + UpdateAnnotation(ctx context.Context, uri, text, tags string, cid *string) error 31 31 + GetAnnotationByURI(ctx context.Context, uri string) (*Annotation, error) 32 32 + CheckDuplicateAnnotation(ctx context.Context, did, url, text string) (*Annotation, error) 33 33 + CheckDuplicateHighlight(ctx context.Context, did, url string, selector []byte) (*Highlight, error) 34 34 + } 35 35 + 36 36 + type EngagementRepository interface { 37 37 + GetLikeCount(ctx context.Context, uri string) (int, error) 38 38 + GetLikeCounts(ctx context.Context, uris []string) (map[string]int, error) 39 39 + GetReplyCounts(ctx context.Context, uris []string) (map[string]int, error) 40 40 + GetViewerLikes(ctx context.Context, viewerDID string, uris []string) (map[string]bool, error) 41 41 + GetLabelsForURIs(ctx context.Context, uris []string, labelerDIDs []string) (map[string][]ContentLabel, error) 42 42 + GetLabelsForDIDs(ctx context.Context, dids []string, labelerDIDs []string) (map[string][]ContentLabel, error) 43 43 + GetLatestEditTimes(ctx context.Context, uris []string) (map[string]time.Time, error) 44 44 + } 45 45 + 46 46 + type ProfileRepository interface { 47 47 + GetProfiles(ctx context.Context, dids []string) (map[string]Author, error) 48 48 + GetProfile(ctx context.Context, did string) (*Profile, error) 49 49 + UpsertProfile(ctx context.Context, p *Profile) error 50 50 + } 51 51 + 52 52 + type NotificationRepository interface { 53 53 + GetNotifications(ctx context.Context, recipientDID string, limit, offset int) ([]Notification, error) 54 54 + GetUnreadNotificationCount(ctx context.Context, recipientDID string) (int, error) 55 55 + MarkNotificationsRead(ctx context.Context, recipientDID string) error 56 56 + CreateNotification(ctx context.Context, n *Notification) error 57 57 + } 58 58 + 59 59 + type SessionRepository interface { 60 60 + GetSession(ctx context.Context, id string) (did, handle, accessToken, refreshToken, dpopKey string, err error) 61 61 + } 62 62 + 63 63 + type NoteService interface{} 64 64 + 65 65 + type ProfileService interface{}

+212

backend/internal/domain/models.go

reviewed

··· 1 1 + package domain 2 2 + 3 3 + import ( 4 4 + "time" 5 5 + ) 6 6 + 7 7 + type Note struct { 8 8 + URI string `json:"uri"` 9 9 + AuthorDID string `json:"authorDid"` 10 10 + Motivation string `json:"motivation,omitempty"` 11 11 + Color *string `json:"color,omitempty"` 12 12 + Description *string `json:"description,omitempty"` 13 13 + BodyValue *string `json:"bodyValue,omitempty"` 14 14 + BodyFormat *string `json:"bodyFormat,omitempty"` 15 15 + BodyURI *string `json:"bodyUri,omitempty"` 16 16 + TargetSource string `json:"targetSource"` 17 17 + TargetHash string `json:"targetHash"` 18 18 + TargetTitle *string `json:"targetTitle,omitempty"` 19 19 + SelectorJSON *string `json:"selector,omitempty"` 20 20 + TagsJSON *string `json:"tags,omitempty"` 21 21 + CreatedAt time.Time `json:"createdAt"` 22 22 + IndexedAt time.Time `json:"indexedAt"` 23 23 + CID *string `json:"cid,omitempty"` 24 24 + } 25 25 + 26 26 + type Annotation struct { 27 27 + URI string `json:"uri"` 28 28 + AuthorDID string `json:"authorDid"` 29 29 + Motivation string `json:"motivation,omitempty"` 30 30 + BodyValue *string `json:"bodyValue,omitempty"` 31 31 + BodyFormat *string `json:"bodyFormat,omitempty"` 32 32 + BodyURI *string `json:"bodyUri,omitempty"` 33 33 + TargetSource string `json:"targetSource"` 34 34 + TargetHash string `json:"targetHash"` 35 35 + TargetTitle *string `json:"targetTitle,omitempty"` 36 36 + SelectorJSON *string `json:"selector,omitempty"` 37 37 + TagsJSON *string `json:"tags,omitempty"` 38 38 + CreatedAt time.Time `json:"createdAt"` 39 39 + IndexedAt time.Time `json:"indexedAt"` 40 40 + CID *string `json:"cid,omitempty"` 41 41 + } 42 42 + 43 43 + type Selector struct { 44 44 + Type string `json:"type"` 45 45 + Exact string `json:"exact,omitempty"` 46 46 + Prefix string `json:"prefix,omitempty"` 47 47 + Suffix string `json:"suffix,omitempty"` 48 48 + Start *int `json:"start,omitempty"` 49 49 + End *int `json:"end,omitempty"` 50 50 + Value string `json:"value,omitempty"` 51 51 + } 52 52 + 53 53 + type Highlight struct { 54 54 + URI string `json:"uri"` 55 55 + AuthorDID string `json:"authorDid"` 56 56 + TargetSource string `json:"targetSource"` 57 57 + TargetHash string `json:"targetHash"` 58 58 + TargetTitle *string `json:"targetTitle,omitempty"` 59 59 + SelectorJSON *string `json:"selector,omitempty"` 60 60 + Color *string `json:"color,omitempty"` 61 61 + TagsJSON *string `json:"tags,omitempty"` 62 62 + CreatedAt time.Time `json:"createdAt"` 63 63 + IndexedAt time.Time `json:"indexedAt"` 64 64 + CID *string `json:"cid,omitempty"` 65 65 + } 66 66 + 67 67 + type Bookmark struct { 68 68 + URI string `json:"uri"` 69 69 + AuthorDID string `json:"authorDid"` 70 70 + Source string `json:"source"` 71 71 + SourceHash string `json:"sourceHash"` 72 72 + Title *string `json:"title,omitempty"` 73 73 + Description *string `json:"description,omitempty"` 74 74 + TagsJSON *string `json:"tags,omitempty"` 75 75 + CreatedAt time.Time `json:"createdAt"` 76 76 + IndexedAt time.Time `json:"indexedAt"` 77 77 + CID *string `json:"cid,omitempty"` 78 78 + } 79 79 + 80 80 + type Reply struct { 81 81 + URI string `json:"uri"` 82 82 + AuthorDID string `json:"authorDid"` 83 83 + ParentURI string `json:"parentUri"` 84 84 + RootURI string `json:"rootUri"` 85 85 + Text string `json:"text"` 86 86 + Format *string `json:"format,omitempty"` 87 87 + CreatedAt time.Time `json:"createdAt"` 88 88 + IndexedAt time.Time `json:"indexedAt"` 89 89 + CID *string `json:"cid,omitempty"` 90 90 + } 91 91 + 92 92 + type Like struct { 93 93 + URI string `json:"uri"` 94 94 + AuthorDID string `json:"authorDid"` 95 95 + SubjectURI string `json:"subjectUri"` 96 96 + CreatedAt time.Time `json:"createdAt"` 97 97 + IndexedAt time.Time `json:"indexedAt"` 98 98 + } 99 99 + 100 100 + type Collection struct { 101 101 + URI string `json:"uri"` 102 102 + AuthorDID string `json:"authorDid"` 103 103 + Name string `json:"name"` 104 104 + Description *string `json:"description,omitempty"` 105 105 + Icon *string `json:"icon,omitempty"` 106 106 + CreatedAt time.Time `json:"createdAt"` 107 107 + IndexedAt time.Time `json:"indexedAt"` 108 108 + } 109 109 + 110 110 + type CollectionItem struct { 111 111 + URI string `json:"uri"` 112 112 + AuthorDID string `json:"authorDid"` 113 113 + CollectionURI string `json:"collectionUri"` 114 114 + AnnotationURI string `json:"annotationUri"` 115 115 + Position int `json:"position"` 116 116 + CreatedAt time.Time `json:"createdAt"` 117 117 + IndexedAt time.Time `json:"indexedAt"` 118 118 + } 119 119 + 120 120 + type Notification struct { 121 121 + ID int `json:"id"` 122 122 + RecipientDID string `json:"recipientDid"` 123 123 + ActorDID string `json:"actorDid"` 124 124 + Type string `json:"type"` 125 125 + SubjectURI string `json:"subjectUri"` 126 126 + CreatedAt time.Time `json:"createdAt"` 127 127 + ReadAt *time.Time `json:"readAt,omitempty"` 128 128 + } 129 129 + 130 130 + type APIKey struct { 131 131 + ID string `json:"id"` 132 132 + OwnerDID string `json:"ownerDid"` 133 133 + Name string `json:"name"` 134 134 + KeyHash string `json:"-"` 135 135 + CreatedAt time.Time `json:"createdAt"` 136 136 + LastUsedAt *time.Time `json:"lastUsedAt,omitempty"` 137 137 + URI string `json:"uri"` 138 138 + CID *string `json:"cid,omitempty"` 139 139 + IndexedAt time.Time `json:"indexedAt"` 140 140 + } 141 141 + 142 142 + type Profile struct { 143 143 + URI string `json:"uri"` 144 144 + AuthorDID string `json:"authorDid"` 145 145 + DisplayName *string `json:"displayName,omitempty"` 146 146 + Avatar *string `json:"avatar,omitempty"` 147 147 + Bio *string `json:"bio,omitempty"` 148 148 + Website *string `json:"website,omitempty"` 149 149 + LinksJSON *string `json:"links,omitempty"` 150 150 + CreatedAt time.Time `json:"createdAt"` 151 151 + IndexedAt time.Time `json:"indexedAt"` 152 152 + CID *string `json:"cid,omitempty"` 153 153 + } 154 154 + 155 155 + type Preferences struct { 156 156 + URI string `json:"uri"` 157 157 + AuthorDID string `json:"authorDid"` 158 158 + ExternalLinkSkippedHostnames *string `json:"externalLinkSkippedHostnames,omitempty"` 159 159 + SubscribedLabelers *string `json:"subscribedLabelers,omitempty"` 160 160 + LabelPreferences *string `json:"labelPreferences,omitempty"` 161 161 + DisableExternalLinkWarning *bool `json:"disableExternalLinkWarning,omitempty"` 162 162 + EnableCommunityBookmarks *bool `json:"enableCommunityBookmarks,omitempty"` 163 163 + CreatedAt time.Time `json:"createdAt"` 164 164 + IndexedAt time.Time `json:"indexedAt"` 165 165 + CID *string `json:"cid,omitempty"` 166 166 + } 167 167 + 168 168 + type Block struct { 169 169 + ID int `json:"id"` 170 170 + ActorDID string `json:"actorDid"` 171 171 + SubjectDID string `json:"subjectDid"` 172 172 + CreatedAt time.Time `json:"createdAt"` 173 173 + } 174 174 + 175 175 + type Mute struct { 176 176 + ID int `json:"id"` 177 177 + ActorDID string `json:"actorDid"` 178 178 + SubjectDID string `json:"subjectDid"` 179 179 + CreatedAt time.Time `json:"createdAt"` 180 180 + } 181 181 + 182 182 + type ModerationReport struct { 183 183 + ID int `json:"id"` 184 184 + ReporterDID string `json:"reporterDid"` 185 185 + SubjectDID string `json:"subjectDid"` 186 186 + SubjectURI *string `json:"subjectUri,omitempty"` 187 187 + ReasonType string `json:"reasonType"` 188 188 + ReasonText *string `json:"reasonText,omitempty"` 189 189 + Status string `json:"status"` 190 190 + CreatedAt time.Time `json:"createdAt"` 191 191 + ResolvedAt *time.Time `json:"resolvedAt,omitempty"` 192 192 + ResolvedBy *string `json:"resolvedBy,omitempty"` 193 193 + } 194 194 + 195 195 + type ModerationAction struct { 196 196 + ID int `json:"id"` 197 197 + ReportID int `json:"reportId"` 198 198 + ActorDID string `json:"actorDid"` 199 199 + Action string `json:"action"` 200 200 + Comment *string `json:"comment,omitempty"` 201 201 + CreatedAt time.Time `json:"createdAt"` 202 202 + } 203 203 + 204 204 + type ContentLabel struct { 205 205 + ID int `json:"id"` 206 206 + Src string `json:"src"` 207 207 + URI string `json:"uri"` 208 208 + Val string `json:"val"` 209 209 + Neg bool `json:"neg"` 210 210 + CreatedBy string `json:"createdBy"` 211 211 + CreatedAt time.Time `json:"createdAt"` 212 212 + }

+158

backend/internal/firehose/ingester.go

reviewed

··· 93 93 i.RegisterHandler(CollectionSembleCollection, i.handleSembleCollection) 94 94 i.RegisterHandler(xrpc.CollectionSembleCollectionLink, i.handleSembleCollectionLink) 95 95 i.RegisterHandler(CollectionDocument, i.handleDocument) 96 96 + i.RegisterHandler(xrpc.CollectionNote, i.handleNote) 97 97 + i.RegisterHandler(xrpc.CollectionCommunityBookmark, i.handleCommunityBookmark) 96 98 97 99 return i 98 100 } ··· 325 327 i.db.RemoveFromCollection(uri) 326 328 case CollectionDocument: 327 329 i.db.DeleteDocument(uri) 330 330 + case xrpc.CollectionNote: 331 331 + i.db.DeleteNote(uri) 332 332 + case xrpc.CollectionCommunityBookmark: 333 333 + i.db.DeleteNote(uri) 328 334 } 329 335 } 330 336 ··· 460 466 } 461 467 } 462 468 469 469 + func (i *Ingester) handleNote(event *FirehoseEvent) { 470 470 + var record struct { 471 471 + Motivation string `json:"motivation"` 472 472 + Color string `json:"color"` 473 473 + Description string `json:"description"` 474 474 + Body struct { 475 475 + Value string `json:"value"` 476 476 + Format string `json:"format"` 477 477 + URI string `json:"uri"` 478 478 + } `json:"body"` 479 479 + Target struct { 480 480 + Source string `json:"source"` 481 481 + SourceHash string `json:"sourceHash"` 482 482 + Title string `json:"title"` 483 483 + Selector json.RawMessage `json:"selector"` 484 484 + } `json:"target"` 485 485 + Tags []string `json:"tags"` 486 486 + CreatedAt string `json:"createdAt"` 487 487 + } 488 488 + 489 489 + if err := json.Unmarshal(event.Record, &record); err != nil { 490 490 + return 491 491 + } 492 492 + 493 493 + uri := fmt.Sprintf("at://%s/%s/%s", event.Repo, event.Collection, event.Rkey) 494 494 + 495 495 + createdAt, err := time.Parse(time.RFC3339, record.CreatedAt) 496 496 + if err != nil { 497 497 + createdAt = time.Now() 498 498 + } 499 499 + 500 500 + targetSource := record.Target.Source 501 501 + var targetHash string 502 502 + if targetSource != "" { 503 503 + targetHash = db.HashURL(targetSource) 504 504 + } 505 505 + 506 506 + motivation := record.Motivation 507 507 + if motivation == "" { 508 508 + motivation = "commenting" 509 509 + } 510 510 + 511 511 + bodyText := record.Body.Value 512 512 + if bodyText == "" && record.Description != "" { 513 513 + bodyText = record.Description 514 514 + } 515 515 + 516 516 + var bodyValuePtr, bodyFormatPtr, bodyURIPtr, targetTitlePtr, selectorJSONPtr, tagsJSONPtr, colorPtr *string 517 517 + if bodyText != "" { 518 518 + bodyValuePtr = &bodyText 519 519 + } 520 520 + if record.Body.Format != "" { 521 521 + bodyFormatPtr = &record.Body.Format 522 522 + } 523 523 + if record.Body.URI != "" { 524 524 + bodyURIPtr = &record.Body.URI 525 525 + } 526 526 + if record.Target.Title != "" { 527 527 + targetTitlePtr = &record.Target.Title 528 528 + } 529 529 + if len(record.Target.Selector) > 0 && string(record.Target.Selector) != "null" { 530 530 + selectorStr := string(record.Target.Selector) 531 531 + selectorJSONPtr = &selectorStr 532 532 + } 533 533 + if len(record.Tags) > 0 { 534 534 + tagsBytes, _ := json.Marshal(record.Tags) 535 535 + tagsStr := string(tagsBytes) 536 536 + tagsJSONPtr = &tagsStr 537 537 + } 538 538 + if record.Color != "" { 539 539 + colorPtr = &record.Color 540 540 + } 541 541 + 542 542 + note := &db.Note{ 543 543 + URI: uri, 544 544 + AuthorDID: event.Repo, 545 545 + Motivation: motivation, 546 546 + Color: colorPtr, 547 547 + BodyValue: bodyValuePtr, 548 548 + BodyFormat: bodyFormatPtr, 549 549 + BodyURI: bodyURIPtr, 550 550 + TargetSource: targetSource, 551 551 + TargetHash: targetHash, 552 552 + TargetTitle: targetTitlePtr, 553 553 + SelectorJSON: selectorJSONPtr, 554 554 + TagsJSON: tagsJSONPtr, 555 555 + CreatedAt: createdAt, 556 556 + IndexedAt: time.Now(), 557 557 + } 558 558 + 559 559 + if err := i.db.CreateNote(note); err != nil { 560 560 + logger.Error("Failed to index note: %v", err) 561 561 + } else { 562 562 + logger.Info("Indexed note from %s on %s", event.Repo, targetSource) 563 563 + } 564 564 + } 565 565 + 566 566 + func (i *Ingester) handleCommunityBookmark(event *FirehoseEvent) { 567 567 + var record struct { 568 568 + Subject string `json:"subject"` 569 569 + Tags []string `json:"tags"` 570 570 + CreatedAt string `json:"createdAt"` 571 571 + } 572 572 + 573 573 + if err := json.Unmarshal(event.Record, &record); err != nil { 574 574 + return 575 575 + } 576 576 + 577 577 + if record.Subject == "" { 578 578 + return 579 579 + } 580 580 + 581 581 + uri := fmt.Sprintf("at://%s/%s/%s", event.Repo, event.Collection, event.Rkey) 582 582 + 583 583 + createdAt, err := time.Parse(time.RFC3339, record.CreatedAt) 584 584 + if err != nil { 585 585 + createdAt = time.Now() 586 586 + } 587 587 + 588 588 + targetHash := db.HashURL(record.Subject) 589 589 + 590 590 + if exists, err := i.db.MarginNoteBookmarkExists(event.Repo, targetHash); err == nil && exists { 591 591 + return 592 592 + } 593 593 + 594 594 + var tagsJSONPtr *string 595 595 + if len(record.Tags) > 0 { 596 596 + tagsBytes, _ := json.Marshal(record.Tags) 597 597 + tagsStr := string(tagsBytes) 598 598 + tagsJSONPtr = &tagsStr 599 599 + } 600 600 + 601 601 + note := &db.Note{ 602 602 + URI: uri, 603 603 + AuthorDID: event.Repo, 604 604 + Motivation: "bookmarking", 605 605 + TargetSource: record.Subject, 606 606 + TargetHash: targetHash, 607 607 + TagsJSON: tagsJSONPtr, 608 608 + CreatedAt: createdAt, 609 609 + IndexedAt: time.Now(), 610 610 + } 611 611 + 612 612 + if err := i.db.CreateNote(note); err != nil { 613 613 + logger.Error("Failed to index community bookmark: %v", err) 614 614 + } else { 615 615 + logger.Info("Indexed community bookmark from %s on %s", event.Repo, record.Subject) 616 616 + } 617 617 + } 618 618 + 463 619 func (i *Ingester) handleReply(event *FirehoseEvent) { 464 620 var record struct { 465 621 Parent struct { ··· 842 998 SubscribedLabelers json.RawMessage `json:"subscribedLabelers"` 843 999 LabelPreferences json.RawMessage `json:"labelPreferences"` 844 1000 DisableExternalLinkWarning *bool `json:"disableExternalLinkWarning,omitempty"` 1001 1001 + EnableCommunityBookmarks *bool `json:"enableCommunityBookmarks,omitempty"` 845 1002 CreatedAt string `json:"createdAt"` 846 1003 } 847 1004 ··· 886 1043 ExternalLinkSkippedHostnames: skippedHostnamesPtr, 887 1044 SubscribedLabelers: subscribedLabelersPtr, 888 1045 DisableExternalLinkWarning: record.DisableExternalLinkWarning, 1046 1046 + EnableCommunityBookmarks: record.EnableCommunityBookmarks, 889 1047 LabelPreferences: labelPrefsPtr, 890 1048 CreatedAt: createdAt, 891 1049 IndexedAt: time.Now(),

+1 -25

backend/internal/middleware/logger.go

reviewed

··· 2 2 3 3 import ( 4 4 "net/http" 5 5 - "net/url" 6 6 - "strings" 7 5 "time" 8 6 9 7 "github.com/go-chi/chi/v5/middleware" ··· 16 14 t1 := time.Now() 17 15 18 16 defer func() { 19 19 - safeURL := redactURL(r.URL) 20 20 - 21 17 logger.Info("[%d] %s %s %s", 22 18 ww.Status(), 23 19 r.Method, 24 24 - safeURL, 20 20 + r.URL.String(), 25 21 time.Since(t1), 26 22 ) 27 23 }() ··· 29 25 next.ServeHTTP(ww, r) 30 26 }) 31 27 } 32 32 - 33 33 - func redactURL(u *url.URL) string { 34 34 - redacted := *u 35 35 - q := redacted.Query() 36 36 - 37 37 - sensitiveKeys := []string{"source", "url", "target", "parent", "root", "uri"} 38 38 - 39 39 - for _, key := range sensitiveKeys { 40 40 - if q.Has(key) { 41 41 - val := q.Get(key) 42 42 - if strings.Contains(val, "margin.at") { 43 43 - continue 44 44 - } 45 45 - q.Set(key, "[REDACTED]") 46 46 - } 47 47 - } 48 48 - 49 49 - redacted.RawQuery = q.Encode() 50 50 - return redacted.String() 51 51 - }

+27 -7

backend/internal/oauth/handler.go

reviewed

··· 16 16 "sync" 17 17 "time" 18 18 19 19 + "margin.at/internal/analytics" 19 20 "margin.at/internal/db" 20 21 "margin.at/internal/logger" 21 22 internal_sync "margin.at/internal/sync" ··· 29 30 pending map[string]*PendingAuth 30 31 pendingMu sync.RWMutex 31 32 syncService *internal_sync.Service 33 33 + analytics *analytics.Client 32 34 } 33 35 34 34 - func NewHandler(database *db.DB, syncService *internal_sync.Service) (*Handler, error) { 36 36 + func NewHandler(database *db.DB, syncService *internal_sync.Service, ac *analytics.Client) (*Handler, error) { 35 37 36 38 configuredBaseURL := os.Getenv("BASE_URL") 37 39 ··· 46 48 privateKey: privateKey, 47 49 pending: make(map[string]*PendingAuth), 48 50 syncService: syncService, 51 51 + analytics: ac, 49 52 }, nil 50 53 } 51 54 ··· 105 108 baseURL = baseURL[:len(baseURL)-1] 106 109 } 107 110 108 108 - clientID := baseURL + "/client-metadata.json" 111 111 + clientID := baseURL + "/oauth-client-metadata.json" 109 112 redirectURI := baseURL + "/auth/callback" 110 113 111 114 return NewClient(clientID, redirectURI, h.privateKey) ··· 148 151 149 152 pkceVerifier, pkceChallenge := client.GeneratePKCE() 150 153 151 151 - scope := "atproto blob:* blob:image/jpeg blob:image/png include:at.margin.authFull" 154 154 + scope := "atproto blob:* blob:image/jpeg blob:image/png include:at.margin.authFull repo:community.lexicon.bookmarks.bookmark" 152 155 153 156 parResp, state, dpopNonce, err := client.SendPAR(meta, handle, scope, dpopKey, pkceChallenge) 154 157 if err != nil { ··· 236 239 } 237 240 238 241 pkceVerifier, pkceChallenge := client.GeneratePKCE() 239 239 - scope := "atproto blob:* blob:image/jpeg blob:image/png include:at.margin.authFull" 242 242 + scope := "atproto blob:* blob:image/jpeg blob:image/png include:at.margin.authFull repo:community.lexicon.bookmarks.bookmark" 240 243 241 244 parResp, state, dpopNonce, err := client.SendPAR(meta, req.Handle, scope, dpopKey, pkceChallenge) 242 245 if err != nil { ··· 316 319 } 317 320 318 321 pkceVerifier, pkceChallenge := client.GeneratePKCE() 319 319 - scope := "atproto blob:* blob:image/jpeg blob:image/png include:at.margin.authFull" 322 322 + scope := "atproto blob:* blob:image/jpeg blob:image/png include:at.margin.authFull repo:community.lexicon.bookmarks.bookmark" 320 323 321 324 parResp, state, dpopNonce, err := client.SendPARWithPrompt(meta, "", scope, dpopKey, pkceChallenge, "create") 322 325 if err != nil { ··· 482 485 }() 483 486 484 487 http.Redirect(w, r, "/home?logged_in=true", http.StatusFound) 488 488 + 489 489 + go func() { 490 490 + if h.analytics == nil { 491 491 + return 492 492 + } 493 493 + existingCount, _ := h.db.CountSessionsByDID(tokenResp.Sub) 494 494 + if existingCount <= 1 { 495 495 + h.analytics.Capture(tokenResp.Sub, "account_created", map[string]interface{}{ 496 496 + "pds": pending.PDS, 497 497 + }) 498 498 + } else { 499 499 + h.analytics.Capture(tokenResp.Sub, "login_success", map[string]interface{}{ 500 500 + "handle": pending.Handle, 501 501 + "pds": pending.PDS, 502 502 + }) 503 503 + } 504 504 + }() 485 505 } 486 506 487 507 func (h *Handler) cleanupOrphanedReplies(did, accessToken, dpopKeyPEM, pds string) { ··· 604 624 605 625 func (h *Handler) HandleClientMetadata(w http.ResponseWriter, r *http.Request) { 606 626 client := h.getDynamicClient(r) 607 607 - baseURL := client.ClientID[:len(client.ClientID)-len("/client-metadata.json")] 627 627 + baseURL := client.ClientID[:len(client.ClientID)-len("/oauth-client-metadata.json")] 608 628 609 629 w.Header().Set("Content-Type", "application/json") 610 630 json.NewEncoder(w).Encode(map[string]interface{}{ ··· 617 637 "redirect_uris": []string{client.RedirectURI}, 618 638 "grant_types": []string{"authorization_code", "refresh_token"}, 619 639 "response_types": []string{"code"}, 620 620 - "scope": "atproto blob:* blob:image/jpeg blob:image/png include:at.margin.authFull", 640 640 + "scope": "atproto blob:* blob:image/jpeg blob:image/png include:at.margin.authFull repo:community.lexicon.bookmarks.bookmark", 621 641 "token_endpoint_auth_method": "private_key_jwt", 622 642 "token_endpoint_auth_signing_alg": "ES256", 623 643 "dpop_bound_access_tokens": true,

+200

backend/internal/repository/postgres/pg_engagement_repo.go

reviewed

··· 1 1 + package postgres 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "database/sql/driver" 6 6 + "fmt" 7 7 + "strings" 8 8 + "time" 9 9 + 10 10 + "margin.at/internal/domain" 11 11 + ) 12 12 + 13 13 + type EngagementRepository struct { 14 14 + db DB 15 15 + } 16 16 + 17 17 + func NewEngagementRepository(db DB) *EngagementRepository { 18 18 + return &EngagementRepository{db: db} 19 19 + } 20 20 + 21 21 + func (r *EngagementRepository) GetLikeCount(ctx context.Context, uri string) (int, error) { 22 22 + var count int 23 23 + err := r.db.QueryRowContext(ctx, 24 24 + `SELECT COUNT(*) FROM likes WHERE subject_uri = $1`, uri, 25 25 + ).Scan(&count) 26 26 + return count, err 27 27 + } 28 28 + 29 29 + func (r *EngagementRepository) GetLikeCounts(ctx context.Context, uris []string) (map[string]int, error) { 30 30 + if len(uris) == 0 { 31 31 + return map[string]int{}, nil 32 32 + } 33 33 + rows, err := r.db.QueryContext(ctx, 34 34 + `SELECT subject_uri, COUNT(*) FROM likes WHERE subject_uri = ANY($1) GROUP BY subject_uri`, 35 35 + pqArray(uris), 36 36 + ) 37 37 + if err != nil { 38 38 + return nil, err 39 39 + } 40 40 + defer rows.Close() 41 41 + 42 42 + counts := make(map[string]int, len(uris)) 43 43 + for rows.Next() { 44 44 + var uri string 45 45 + var count int 46 46 + if err := rows.Scan(&uri, &count); err != nil { 47 47 + return nil, err 48 48 + } 49 49 + counts[uri] = count 50 50 + } 51 51 + return counts, rows.Err() 52 52 + } 53 53 + 54 54 + func (r *EngagementRepository) GetReplyCounts(ctx context.Context, uris []string) (map[string]int, error) { 55 55 + if len(uris) == 0 { 56 56 + return map[string]int{}, nil 57 57 + } 58 58 + rows, err := r.db.QueryContext(ctx, 59 59 + `SELECT root_uri, COUNT(*) FROM replies WHERE root_uri = ANY($1) GROUP BY root_uri`, 60 60 + pqArray(uris), 61 61 + ) 62 62 + if err != nil { 63 63 + return nil, err 64 64 + } 65 65 + defer rows.Close() 66 66 + 67 67 + counts := make(map[string]int, len(uris)) 68 68 + for rows.Next() { 69 69 + var uri string 70 70 + var count int 71 71 + if err := rows.Scan(&uri, &count); err != nil { 72 72 + return nil, err 73 73 + } 74 74 + counts[uri] = count 75 75 + } 76 76 + return counts, rows.Err() 77 77 + } 78 78 + 79 79 + func (r *EngagementRepository) GetViewerLikes(ctx context.Context, viewerDID string, uris []string) (map[string]bool, error) { 80 80 + if len(uris) == 0 { 81 81 + return map[string]bool{}, nil 82 82 + } 83 83 + 84 84 + placeholders := make([]string, len(uris)) 85 85 + args := make([]interface{}, len(uris)+1) 86 86 + args[0] = viewerDID 87 87 + for i, uri := range uris { 88 88 + placeholders[i] = fmt.Sprintf("$%d", i+2) 89 89 + args[i+1] = uri 90 90 + } 91 91 + 92 92 + rows, err := r.db.QueryContext(ctx, 93 93 + `SELECT subject_uri FROM likes WHERE author_did = $1 AND subject_uri IN (`+ 94 94 + strings.Join(placeholders, ", ")+`)`, 95 95 + args..., 96 96 + ) 97 97 + if err != nil { 98 98 + return nil, err 99 99 + } 100 100 + defer rows.Close() 101 101 + 102 102 + likes := make(map[string]bool, len(uris)) 103 103 + for rows.Next() { 104 104 + var uri string 105 105 + if err := rows.Scan(&uri); err != nil { 106 106 + return nil, err 107 107 + } 108 108 + likes[uri] = true 109 109 + } 110 110 + return likes, rows.Err() 111 111 + } 112 112 + 113 113 + func (r *EngagementRepository) GetLabelsForURIs(ctx context.Context, uris []string, labelerDIDs []string) (map[string][]domain.ContentLabel, error) { 114 114 + return r.queryLabels(ctx, uris, labelerDIDs) 115 115 + } 116 116 + 117 117 + func (r *EngagementRepository) GetLabelsForDIDs(ctx context.Context, dids []string, labelerDIDs []string) (map[string][]domain.ContentLabel, error) { 118 118 + return r.queryLabels(ctx, dids, labelerDIDs) 119 119 + } 120 120 + 121 121 + func (r *EngagementRepository) queryLabels(ctx context.Context, subjects []string, labelerDIDs []string) (map[string][]domain.ContentLabel, error) { 122 122 + result := make(map[string][]domain.ContentLabel) 123 123 + if len(subjects) == 0 { 124 124 + return result, nil 125 125 + } 126 126 + 127 127 + query := `SELECT id, src, uri, val, neg, created_by, created_at 128 128 + FROM content_labels WHERE uri = ANY($1) AND neg = 0` 129 129 + args := []interface{}{pqArray(subjects)} 130 130 + 131 131 + if len(labelerDIDs) > 0 { 132 132 + query += ` AND src = ANY($2)` 133 133 + args = append(args, pqArray(labelerDIDs)) 134 134 + } 135 135 + query += ` ORDER BY created_at DESC` 136 136 + 137 137 + rows, err := r.db.QueryContext(ctx, query, args...) 138 138 + if err != nil { 139 139 + return result, err 140 140 + } 141 141 + defer rows.Close() 142 142 + 143 143 + for rows.Next() { 144 144 + var l domain.ContentLabel 145 145 + if err := rows.Scan(&l.ID, &l.Src, &l.URI, &l.Val, &l.Neg, &l.CreatedBy, &l.CreatedAt); err != nil { 146 146 + continue 147 147 + } 148 148 + result[l.URI] = append(result[l.URI], l) 149 149 + } 150 150 + return result, rows.Err() 151 151 + } 152 152 + 153 153 + func (r *EngagementRepository) GetLatestEditTimes(ctx context.Context, uris []string) (map[string]time.Time, error) { 154 154 + if len(uris) == 0 { 155 155 + return nil, nil 156 156 + } 157 157 + 158 158 + placeholders := make([]string, len(uris)) 159 159 + args := make([]interface{}, len(uris)) 160 160 + for i, uri := range uris { 161 161 + placeholders[i] = fmt.Sprintf("$%d", i+1) 162 162 + args[i] = uri 163 163 + } 164 164 + 165 165 + rows, err := r.db.QueryContext(ctx, 166 166 + `SELECT uri, MAX(edited_at) FROM edit_history WHERE uri IN (`+ 167 167 + strings.Join(placeholders, ",")+`) GROUP BY uri`, 168 168 + args..., 169 169 + ) 170 170 + if err != nil { 171 171 + return nil, err 172 172 + } 173 173 + defer rows.Close() 174 174 + 175 175 + result := make(map[string]time.Time, len(uris)) 176 176 + for rows.Next() { 177 177 + var uri string 178 178 + var editedAt time.Time 179 179 + if err := rows.Scan(&uri, &editedAt); err != nil { 180 180 + continue 181 181 + } 182 182 + result[uri] = editedAt 183 183 + } 184 184 + return result, rows.Err() 185 185 + } 186 186 + 187 187 + type pqArray []string 188 188 + 189 189 + func (a pqArray) Value() (driver.Value, error) { 190 190 + if a == nil { 191 191 + return "{}", nil 192 192 + } 193 193 + parts := make([]string, len(a)) 194 194 + for i, s := range a { 195 195 + escaped := strings.ReplaceAll(s, `\`, `\\`) 196 196 + escaped = strings.ReplaceAll(escaped, `"`, `\"`) 197 197 + parts[i] = fmt.Sprintf(`"%s"`, escaped) 198 198 + } 199 199 + return "{" + strings.Join(parts, ",") + "}", nil 200 200 + }

+342

backend/internal/repository/postgres/pg_note_repo.go

reviewed

··· 1 1 + package postgres 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "database/sql" 6 6 + "fmt" 7 7 + "strings" 8 8 + "time" 9 9 + 10 10 + "margin.at/internal/domain" 11 11 + ) 12 12 + 13 13 + type DB interface { 14 14 + ExecContext(ctx context.Context, query string, args ...interface{}) (sql.Result, error) 15 15 + QueryContext(ctx context.Context, query string, args ...interface{}) (*sql.Rows, error) 16 16 + QueryRowContext(ctx context.Context, query string, args ...interface{}) *sql.Row 17 17 + } 18 18 + 19 19 + type NoteRepository struct { 20 20 + db DB 21 21 + } 22 22 + 23 23 + func NewNoteRepository(db DB) *NoteRepository { 24 24 + return &NoteRepository{db: db} 25 25 + } 26 26 + 27 27 + func (r *NoteRepository) List(ctx context.Context, f domain.NoteFilter) ([]domain.Note, error) { 28 28 + var where []string 29 29 + var args []interface{} 30 30 + n := 1 31 31 + 32 32 + if len(f.Motivations) == 1 { 33 33 + where = append(where, fmt.Sprintf("motivation = $%d", n)) 34 34 + args = append(args, f.Motivations[0]) 35 35 + n++ 36 36 + } else if len(f.Motivations) > 1 { 37 37 + placeholders := make([]string, len(f.Motivations)) 38 38 + for i, m := range f.Motivations { 39 39 + placeholders[i] = fmt.Sprintf("$%d", n) 40 40 + args = append(args, m) 41 41 + n++ 42 42 + } 43 43 + where = append(where, fmt.Sprintf("motivation IN (%s)", strings.Join(placeholders, ", "))) 44 44 + } 45 45 + 46 46 + if f.AuthorDID != "" { 47 47 + where = append(where, fmt.Sprintf("author_did = $%d", n)) 48 48 + args = append(args, f.AuthorDID) 49 49 + n++ 50 50 + } 51 51 + 52 52 + if f.TargetHash != "" { 53 53 + where = append(where, fmt.Sprintf("target_hash = $%d", n)) 54 54 + args = append(args, f.TargetHash) 55 55 + n++ 56 56 + } 57 57 + 58 58 + if f.Tag != "" { 59 59 + where = append(where, fmt.Sprintf( 60 60 + "tags_json IS NOT NULL AND EXISTS(SELECT 1 FROM jsonb_array_elements_text(tags_json::jsonb) elem WHERE lower(elem) = lower($%d))", 61 61 + n, 62 62 + )) 63 63 + args = append(args, f.Tag) 64 64 + n++ 65 65 + } 66 66 + 67 67 + if f.Query != "" { 68 68 + pattern := "%" + escapeLike(f.Query) + "%" 69 69 + where = append(where, fmt.Sprintf( 70 70 + "(body_value ILIKE $%d OR target_source ILIKE $%d OR target_title ILIKE $%d OR tags_json::text ILIKE $%d)", 71 71 + n, n+1, n+2, n+3, 72 72 + )) 73 73 + args = append(args, pattern, pattern, pattern, pattern) 74 74 + n += 4 75 75 + } 76 76 + 77 77 + switch f.FeedType { 78 78 + case domain.FeedTypeMargin: 79 79 + where = append(where, "uri NOT LIKE '%network.cosmik%'") 80 80 + case domain.FeedTypeSemble: 81 81 + where = append(where, "uri LIKE '%network.cosmik%'") 82 82 + case domain.FeedTypePopular: 83 83 + since := time.Now().AddDate(0, 0, -14) 84 84 + where = append(where, fmt.Sprintf("created_at > $%d", n)) 85 85 + args = append(args, since) 86 86 + n++ 87 87 + case domain.FeedTypeShelved: 88 88 + olderThan := time.Now().AddDate(0, 0, -1) 89 89 + since := time.Now().AddDate(0, 0, -14) 90 90 + where = append(where, fmt.Sprintf("created_at < $%d AND created_at > $%d", n, n+1)) 91 91 + where = append(where, "NOT EXISTS (SELECT 1 FROM likes WHERE subject_uri = uri)") 92 92 + where = append(where, "NOT EXISTS (SELECT 1 FROM replies WHERE root_uri = uri)") 93 93 + args = append(args, olderThan, since) 94 94 + n += 2 95 95 + } 96 96 + 97 97 + whereClause := "" 98 98 + if len(where) > 0 { 99 99 + whereClause = "WHERE " + strings.Join(where, " AND ") 100 100 + } 101 101 + 102 102 + orderClause := "ORDER BY created_at DESC" 103 103 + switch f.FeedType { 104 104 + case domain.FeedTypePopular: 105 105 + orderClause = `ORDER BY ( 106 106 + SELECT COUNT(*) FROM likes WHERE subject_uri = uri 107 107 + ) + ( 108 108 + SELECT COUNT(*) FROM replies WHERE root_uri = uri 109 109 + ) DESC, created_at DESC` 110 110 + case domain.FeedTypeShelved: 111 111 + orderClause = "ORDER BY RANDOM()" 112 112 + } 113 113 + 114 114 + limit := f.Limit 115 115 + if limit <= 0 { 116 116 + limit = 50 117 117 + } 118 118 + 119 119 + query := fmt.Sprintf(` 120 120 + SELECT uri, author_did, motivation, color, description, body_value, body_format, body_uri, 121 121 + target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 122 122 + FROM unified_notes 123 123 + %s 124 124 + %s 125 125 + LIMIT $%d OFFSET $%d 126 126 + `, whereClause, orderClause, n, n+1) 127 127 + 128 128 + args = append(args, limit, f.Offset) 129 129 + 130 130 + rows, err := r.db.QueryContext(ctx, query, args...) 131 131 + if err != nil { 132 132 + return nil, err 133 133 + } 134 134 + defer rows.Close() 135 135 + return scanNotes(rows) 136 136 + } 137 137 + 138 138 + func (r *NoteRepository) GetByURI(ctx context.Context, uri string) (*domain.Note, error) { 139 139 + query := ` 140 140 + SELECT uri, author_did, motivation, color, description, body_value, body_format, body_uri, 141 141 + target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 142 142 + FROM unified_notes 143 143 + WHERE uri = $1 144 144 + ` 145 145 + var note domain.Note 146 146 + err := r.db.QueryRowContext(ctx, query, uri).Scan( 147 147 + &note.URI, &note.AuthorDID, &note.Motivation, &note.Color, &note.Description, 148 148 + &note.BodyValue, &note.BodyFormat, &note.BodyURI, 149 149 + &note.TargetSource, &note.TargetHash, &note.TargetTitle, 150 150 + &note.SelectorJSON, &note.TagsJSON, &note.CreatedAt, &note.IndexedAt, &note.CID, 151 151 + ) 152 152 + if err == sql.ErrNoRows { 153 153 + return nil, nil 154 154 + } 155 155 + if err != nil { 156 156 + return nil, err 157 157 + } 158 158 + return &note, nil 159 159 + } 160 160 + 161 161 + func (r *NoteRepository) CreateNote(ctx context.Context, n *domain.Note) error { 162 162 + query := ` 163 163 + INSERT INTO notes ( 164 164 + uri, author_did, motivation, color, description, body_value, body_format, body_uri, 165 165 + target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 166 166 + ) VALUES ( 167 167 + $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16 168 168 + ) ON CONFLICT (uri) DO UPDATE SET 169 169 + motivation = EXCLUDED.motivation, 170 170 + color = EXCLUDED.color, 171 171 + description = EXCLUDED.description, 172 172 + body_value = EXCLUDED.body_value, 173 173 + body_format = EXCLUDED.body_format, 174 174 + body_uri = EXCLUDED.body_uri, 175 175 + target_source = EXCLUDED.target_source, 176 176 + target_hash = EXCLUDED.target_hash, 177 177 + target_title = EXCLUDED.target_title, 178 178 + selector_json = EXCLUDED.selector_json, 179 179 + tags_json = EXCLUDED.tags_json, 180 180 + indexed_at = EXCLUDED.indexed_at, 181 181 + cid = EXCLUDED.cid 182 182 + ` 183 183 + _, err := r.db.ExecContext(ctx, query, 184 184 + n.URI, n.AuthorDID, n.Motivation, n.Color, n.Description, n.BodyValue, n.BodyFormat, n.BodyURI, 185 185 + n.TargetSource, n.TargetHash, n.TargetTitle, n.SelectorJSON, n.TagsJSON, n.CreatedAt, n.IndexedAt, n.CID, 186 186 + ) 187 187 + return err 188 188 + } 189 189 + 190 190 + func (r *NoteRepository) DeleteNote(ctx context.Context, uri string) error { 191 191 + _, err := r.db.ExecContext(ctx, "DELETE FROM notes WHERE uri = $1", uri) 192 192 + return err 193 193 + } 194 194 + 195 195 + func (r *NoteRepository) UpdateNoteAnnotation(ctx context.Context, uri, bodyValue, tagsJSON string, cid *string) error { 196 196 + _, err := r.db.ExecContext(ctx, ` 197 197 + UPDATE notes 198 198 + SET body_value = $1, tags_json = NULLIF($2, ''), cid = $3, indexed_at = $4 199 199 + WHERE uri = $5 200 200 + `, bodyValue, tagsJSON, cid, time.Now(), uri) 201 201 + return err 202 202 + } 203 203 + 204 204 + func (r *NoteRepository) GetLikeByUserAndSubject(ctx context.Context, did, subjectURI string) (*domain.Like, error) { 205 205 + query := "SELECT uri, author_did, subject_uri, created_at, indexed_at FROM likes WHERE author_did = $1 AND subject_uri = $2" 206 206 + var l domain.Like 207 207 + err := r.db.QueryRowContext(ctx, query, did, subjectURI).Scan( 208 208 + &l.URI, &l.AuthorDID, &l.SubjectURI, &l.CreatedAt, &l.IndexedAt, 209 209 + ) 210 210 + if err == sql.ErrNoRows { 211 211 + return nil, nil 212 212 + } 213 213 + if err != nil { 214 214 + return nil, err 215 215 + } 216 216 + return &l, nil 217 217 + } 218 218 + 219 219 + func (r *NoteRepository) CreateLike(ctx context.Context, l *domain.Like) error { 220 220 + _, err := r.db.ExecContext(ctx, ` 221 221 + INSERT INTO likes (uri, author_did, subject_uri, created_at, indexed_at) 222 222 + VALUES ($1, $2, $3, $4, $5) 223 223 + ON CONFLICT(uri) DO NOTHING 224 224 + `, l.URI, l.AuthorDID, l.SubjectURI, l.CreatedAt, l.IndexedAt) 225 225 + return err 226 226 + } 227 227 + 228 228 + func (r *NoteRepository) DeleteLike(ctx context.Context, uri string) error { 229 229 + _, err := r.db.ExecContext(ctx, "DELETE FROM likes WHERE uri = $1", uri) 230 230 + return err 231 231 + } 232 232 + 233 233 + func (r *NoteRepository) CreateReply(ctx context.Context, rep *domain.Reply) error { 234 234 + _, err := r.db.ExecContext(ctx, ` 235 235 + INSERT INTO replies (uri, author_did, parent_uri, root_uri, text, format, created_at, indexed_at, cid) 236 236 + VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) 237 237 + ON CONFLICT(uri) DO NOTHING 238 238 + `, rep.URI, rep.AuthorDID, rep.ParentURI, rep.RootURI, rep.Text, rep.Format, rep.CreatedAt, rep.IndexedAt, rep.CID) 239 239 + return err 240 240 + } 241 241 + 242 242 + func (r *NoteRepository) GetReplyByURI(ctx context.Context, uri string) (*domain.Reply, error) { 243 243 + query := "SELECT uri, author_did, parent_uri, root_uri, text, format, created_at, indexed_at, cid FROM replies WHERE uri = $1" 244 244 + var rep domain.Reply 245 245 + err := r.db.QueryRowContext(ctx, query, uri).Scan( 246 246 + &rep.URI, &rep.AuthorDID, &rep.ParentURI, &rep.RootURI, &rep.Text, &rep.Format, &rep.CreatedAt, &rep.IndexedAt, &rep.CID, 247 247 + ) 248 248 + if err == sql.ErrNoRows { 249 249 + return nil, nil 250 250 + } 251 251 + return &rep, err 252 252 + } 253 253 + 254 254 + func (r *NoteRepository) DeleteReply(ctx context.Context, uri string) error { 255 255 + _, err := r.db.ExecContext(ctx, "DELETE FROM replies WHERE uri = $1", uri) 256 256 + return err 257 257 + } 258 258 + 259 259 + func (r *NoteRepository) DeleteAnnotation(ctx context.Context, uri string) error { 260 260 + _, err := r.db.ExecContext(ctx, "DELETE FROM annotations WHERE uri = $1", uri) 261 261 + return err 262 262 + } 263 263 + 264 264 + func (r *NoteRepository) DeleteHighlight(ctx context.Context, uri string) error { 265 265 + _, err := r.db.ExecContext(ctx, "DELETE FROM highlights WHERE uri = $1", uri) 266 266 + return err 267 267 + } 268 268 + 269 269 + func (r *NoteRepository) DeleteBookmark(ctx context.Context, uri string) error { 270 270 + _, err := r.db.ExecContext(ctx, "DELETE FROM bookmarks WHERE uri = $1", uri) 271 271 + return err 272 272 + } 273 273 + 274 274 + func (r *NoteRepository) UpdateAnnotation(ctx context.Context, uri, bodyValue, tagsJSON string, cid *string) error { 275 275 + _, err := r.db.ExecContext(ctx, ` 276 276 + UPDATE annotations 277 277 + SET body_value = $1, tags_json = NULLIF($2, ''), cid = $3, indexed_at = $4 278 278 + WHERE uri = $5 279 279 + `, bodyValue, tagsJSON, cid, time.Now(), uri) 280 280 + return err 281 281 + } 282 282 + 283 283 + func (r *NoteRepository) GetAnnotationByURI(ctx context.Context, uri string) (*domain.Annotation, error) { 284 284 + query := ` 285 285 + SELECT uri, author_did, motivation, body_value, body_format, body_uri, 286 286 + target_source, target_hash, target_title, selector_json, tags_json, created_at, indexed_at, cid 287 287 + FROM annotations WHERE uri = $1 288 288 + ` 289 289 + var a domain.Annotation 290 290 + err := r.db.QueryRowContext(ctx, query, uri).Scan( 291 291 + &a.URI, &a.AuthorDID, &a.Motivation, &a.BodyValue, &a.BodyFormat, &a.BodyURI, 292 292 + &a.TargetSource, &a.TargetHash, &a.TargetTitle, &a.SelectorJSON, &a.TagsJSON, &a.CreatedAt, &a.IndexedAt, &a.CID, 293 293 + ) 294 294 + if err == sql.ErrNoRows { 295 295 + return nil, nil 296 296 + } 297 297 + return &a, err 298 298 + } 299 299 + 300 300 + func (r *NoteRepository) CheckDuplicateAnnotation(ctx context.Context, did, url, text string) (*domain.Annotation, error) { 301 301 + query := "SELECT uri, cid FROM annotations WHERE author_did = $1 AND target_source = $2 AND body_value = $3 LIMIT 1" 302 302 + var a domain.Annotation 303 303 + err := r.db.QueryRowContext(ctx, query, did, url, text).Scan(&a.URI, &a.CID) 304 304 + if err == sql.ErrNoRows { 305 305 + return nil, nil 306 306 + } 307 307 + return &a, err 308 308 + } 309 309 + 310 310 + func (r *NoteRepository) CheckDuplicateHighlight(ctx context.Context, did, url string, selector []byte) (*domain.Highlight, error) { 311 311 + query := "SELECT uri, cid FROM highlights WHERE author_did = $1 AND target_source = $2 AND selector_json = $3 LIMIT 1" 312 312 + var h domain.Highlight 313 313 + err := r.db.QueryRowContext(ctx, query, did, url, selector).Scan(&h.URI, &h.CID) 314 314 + if err == sql.ErrNoRows { 315 315 + return nil, nil 316 316 + } 317 317 + return &h, err 318 318 + } 319 319 + 320 320 + func scanNotes(rows *sql.Rows) ([]domain.Note, error) { 321 321 + var notes []domain.Note 322 322 + for rows.Next() { 323 323 + var note domain.Note 324 324 + if err := rows.Scan( 325 325 + &note.URI, &note.AuthorDID, &note.Motivation, &note.Color, &note.Description, 326 326 + &note.BodyValue, &note.BodyFormat, &note.BodyURI, 327 327 + &note.TargetSource, &note.TargetHash, &note.TargetTitle, 328 328 + &note.SelectorJSON, &note.TagsJSON, &note.CreatedAt, &note.IndexedAt, &note.CID, 329 329 + ); err != nil { 330 330 + return nil, err 331 331 + } 332 332 + notes = append(notes, note) 333 333 + } 334 334 + return notes, rows.Err() 335 335 + } 336 336 + 337 337 + func escapeLike(s string) string { 338 338 + s = strings.ReplaceAll(s, `\`, `\\`) 339 339 + s = strings.ReplaceAll(s, `%`, `\%`) 340 340 + s = strings.ReplaceAll(s, `_`, `\_`) 341 341 + return s 342 342 + }

+63

backend/internal/repository/postgres/pg_notification_repo.go

reviewed

··· 1 1 + package postgres 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "time" 6 6 + 7 7 + "margin.at/internal/domain" 8 8 + ) 9 9 + 10 10 + type NotificationRepository struct { 11 11 + db DB 12 12 + } 13 13 + 14 14 + func NewNotificationRepository(db DB) *NotificationRepository { 15 15 + return &NotificationRepository{db: db} 16 16 + } 17 17 + 18 18 + func (r *NotificationRepository) CreateNotification(ctx context.Context, n *domain.Notification) error { 19 19 + _, err := r.db.ExecContext(ctx, ` 20 20 + INSERT INTO notifications (recipient_did, actor_did, type, subject_uri, created_at) 21 21 + VALUES ($1, $2, $3, $4, $5) 22 22 + `, n.RecipientDID, n.ActorDID, n.Type, n.SubjectURI, n.CreatedAt) 23 23 + return err 24 24 + } 25 25 + 26 26 + func (r *NotificationRepository) GetNotifications(ctx context.Context, recipientDID string, limit, offset int) ([]domain.Notification, error) { 27 27 + rows, err := r.db.QueryContext(ctx, ` 28 28 + SELECT id, recipient_did, actor_did, type, subject_uri, created_at, read_at 29 29 + FROM notifications 30 30 + WHERE recipient_did = $1 31 31 + ORDER BY created_at DESC 32 32 + LIMIT $2 OFFSET $3 33 33 + `, recipientDID, limit, offset) 34 34 + if err != nil { 35 35 + return nil, err 36 36 + } 37 37 + defer rows.Close() 38 38 + 39 39 + var out []domain.Notification 40 40 + for rows.Next() { 41 41 + var n domain.Notification 42 42 + if err := rows.Scan(&n.ID, &n.RecipientDID, &n.ActorDID, &n.Type, &n.SubjectURI, &n.CreatedAt, &n.ReadAt); err != nil { 43 43 + continue 44 44 + } 45 45 + out = append(out, n) 46 46 + } 47 47 + return out, rows.Err() 48 48 + } 49 49 + 50 50 + func (r *NotificationRepository) GetUnreadNotificationCount(ctx context.Context, recipientDID string) (int, error) { 51 51 + var count int 52 52 + err := r.db.QueryRowContext(ctx, ` 53 53 + SELECT COUNT(*) FROM notifications WHERE recipient_did = $1 AND read_at IS NULL 54 54 + `, recipientDID).Scan(&count) 55 55 + return count, err 56 56 + } 57 57 + 58 58 + func (r *NotificationRepository) MarkNotificationsRead(ctx context.Context, recipientDID string) error { 59 59 + _, err := r.db.ExecContext(ctx, ` 60 60 + UPDATE notifications SET read_at = $1 WHERE recipient_did = $2 AND read_at IS NULL 61 61 + `, time.Now(), recipientDID) 62 62 + return err 63 63 + }

+98

backend/internal/repository/postgres/pg_profile_repo.go

reviewed

··· 1 1 + package postgres 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "database/sql" 6 6 + "fmt" 7 7 + "strings" 8 8 + 9 9 + "margin.at/internal/domain" 10 10 + ) 11 11 + 12 12 + type ProfileRepository struct { 13 13 + db DB 14 14 + } 15 15 + 16 16 + func NewProfileRepository(db DB) *ProfileRepository { 17 17 + return &ProfileRepository{db: db} 18 18 + } 19 19 + 20 20 + func (r *ProfileRepository) GetProfiles(ctx context.Context, dids []string) (map[string]domain.Author, error) { 21 21 + if len(dids) == 0 { 22 22 + return map[string]domain.Author{}, nil 23 23 + } 24 24 + 25 25 + placeholders := make([]string, len(dids)) 26 26 + args := make([]interface{}, len(dids)) 27 27 + for i, did := range dids { 28 28 + placeholders[i] = fmt.Sprintf("$%d", i+1) 29 29 + args[i] = did 30 30 + } 31 31 + 32 32 + query := `SELECT author_did, display_name, avatar FROM profiles WHERE author_did IN (` + 33 33 + strings.Join(placeholders, ",") + `)` 34 34 + 35 35 + rows, err := r.db.QueryContext(ctx, query, args...) 36 36 + if err != nil { 37 37 + return nil, err 38 38 + } 39 39 + defer rows.Close() 40 40 + 41 41 + profiles := make(map[string]domain.Author, len(dids)) 42 42 + for rows.Next() { 43 43 + var did string 44 44 + var displayName, avatar *string 45 45 + if err := rows.Scan(&did, &displayName, &avatar); err != nil { 46 46 + continue 47 47 + } 48 48 + a := domain.Author{DID: did} 49 49 + if displayName != nil { 50 50 + a.DisplayName = *displayName 51 51 + } 52 52 + if avatar != nil { 53 53 + a.Avatar = *avatar 54 54 + } 55 55 + profiles[did] = a 56 56 + } 57 57 + 58 58 + result := make(map[string]domain.Author, len(dids)) 59 59 + for _, did := range dids { 60 60 + if a, ok := profiles[did]; ok { 61 61 + result[did] = a 62 62 + } else { 63 63 + result[did] = domain.Author{DID: did} 64 64 + } 65 65 + } 66 66 + return result, rows.Err() 67 67 + } 68 68 + 69 69 + func (r *ProfileRepository) GetProfile(ctx context.Context, did string) (*domain.Profile, error) { 70 70 + query := `SELECT uri, author_did, display_name, avatar, bio, website, links_json, created_at, indexed_at 71 71 + FROM profiles WHERE author_did = $1` 72 72 + var p domain.Profile 73 73 + err := r.db.QueryRowContext(ctx, query, did).Scan( 74 74 + &p.URI, &p.AuthorDID, &p.DisplayName, &p.Avatar, &p.Bio, &p.Website, &p.LinksJSON, &p.CreatedAt, &p.IndexedAt, 75 75 + ) 76 76 + if err == sql.ErrNoRows { 77 77 + return nil, nil 78 78 + } 79 79 + if err != nil { 80 80 + return nil, err 81 81 + } 82 82 + return &p, nil 83 83 + } 84 84 + 85 85 + func (r *ProfileRepository) UpsertProfile(ctx context.Context, p *domain.Profile) error { 86 86 + _, err := r.db.ExecContext(ctx, ` 87 87 + INSERT INTO profiles (uri, author_did, display_name, avatar, bio, website, links_json, created_at, indexed_at) 88 88 + VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) 89 89 + ON CONFLICT(uri) DO UPDATE SET 90 90 + display_name = EXCLUDED.display_name, 91 91 + avatar = EXCLUDED.avatar, 92 92 + bio = EXCLUDED.bio, 93 93 + website = EXCLUDED.website, 94 94 + links_json = EXCLUDED.links_json, 95 95 + indexed_at = EXCLUDED.indexed_at 96 96 + `, p.URI, p.AuthorDID, p.DisplayName, p.Avatar, p.Bio, p.Website, p.LinksJSON, p.CreatedAt, p.IndexedAt) 97 97 + return err 98 98 + }

+23

backend/internal/repository/postgres/pg_session_repo.go

reviewed

··· 1 1 + package postgres 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "time" 6 6 + ) 7 7 + 8 8 + type SessionRepository struct { 9 9 + db DB 10 10 + } 11 11 + 12 12 + func NewSessionRepository(db DB) *SessionRepository { 13 13 + return &SessionRepository{db: db} 14 14 + } 15 15 + 16 16 + func (r *SessionRepository) GetSession(ctx context.Context, id string) (did, handle, accessToken, refreshToken, dpopKey string, err error) { 17 17 + err = r.db.QueryRowContext(ctx, ` 18 18 + SELECT did, handle, access_token, refresh_token, COALESCE(dpop_key, '') 19 19 + FROM sessions 20 20 + WHERE id = $1 AND expires_at > $2 21 21 + `, id, time.Now()).Scan(&did, &handle, &accessToken, &refreshToken, &dpopKey) 22 22 + return 23 23 + }

+128

backend/internal/service/feed.go

reviewed

··· 1 1 + package service 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "sort" 6 6 + 7 7 + "margin.at/internal/domain" 8 8 + ) 9 9 + 10 10 + type FeedRequest struct { 11 11 + ViewerDID string 12 12 + Motivations []string 13 13 + AuthorDID string 14 14 + Tag string 15 15 + FeedType domain.FeedType 16 16 + Limit int 17 17 + Offset int 18 18 + } 19 19 + 20 20 + type FeedResponse struct { 21 21 + Items []APINote 22 22 + TotalItems int 23 23 + } 24 24 + 25 25 + type FeedService struct { 26 26 + notes domain.NoteRepository 27 27 + hydration *HydrationService 28 28 + database interface { 29 29 + GetAllHiddenDIDs(actorDID string) (map[string]bool, error) 30 30 + } 31 31 + } 32 32 + 33 33 + func NewFeedService( 34 34 + notes domain.NoteRepository, 35 35 + hydration *HydrationService, 36 36 + db interface { 37 37 + GetAllHiddenDIDs(actorDID string) (map[string]bool, error) 38 38 + }, 39 39 + ) *FeedService { 40 40 + return &FeedService{ 41 41 + notes: notes, 42 42 + hydration: hydration, 43 43 + database: db, 44 44 + } 45 45 + } 46 46 + 47 47 + func (s *FeedService) GetFeed(ctx context.Context, req FeedRequest) (*FeedResponse, error) { 48 48 + fetchLimit := req.Limit + req.Offset 49 49 + if fetchLimit <= 0 { 50 50 + fetchLimit = req.Limit 51 51 + } 52 52 + 53 53 + filter := domain.NoteFilter{ 54 54 + Motivations: req.Motivations, 55 55 + AuthorDID: req.AuthorDID, 56 56 + Tag: req.Tag, 57 57 + FeedType: req.FeedType, 58 58 + Limit: fetchLimit, 59 59 + Offset: 0, 60 60 + } 61 61 + 62 62 + notes, err := s.notes.List(ctx, filter) 63 63 + if err != nil { 64 64 + return nil, err 65 65 + } 66 66 + 67 67 + if req.ViewerDID != "" { 68 68 + hidden, _ := s.database.GetAllHiddenDIDs(req.ViewerDID) 69 69 + if len(hidden) > 0 { 70 70 + filtered := notes[:0] 71 71 + for _, n := range notes { 72 72 + if !hidden[n.AuthorDID] { 73 73 + filtered = append(filtered, n) 74 74 + } 75 75 + } 76 76 + notes = filtered 77 77 + } 78 78 + } 79 79 + 80 80 + lc, err := s.hydration.Load(ctx, notes, req.ViewerDID) 81 81 + if err != nil { 82 82 + return nil, err 83 83 + } 84 84 + 85 85 + items := make([]APINote, len(notes)) 86 86 + for i, n := range notes { 87 87 + items[i] = s.hydration.ToAPINote(n, lc) 88 88 + } 89 89 + 90 90 + if len(req.Motivations) != 1 { 91 91 + if req.FeedType == domain.FeedTypePopular { 92 92 + sortByEngagement(items) 93 93 + } else { 94 94 + sortByTime(items) 95 95 + } 96 96 + } 97 97 + 98 98 + if req.Offset < len(items) { 99 99 + items = items[req.Offset:] 100 100 + } else { 101 101 + items = nil 102 102 + } 103 103 + if len(items) > req.Limit { 104 104 + items = items[:req.Limit] 105 105 + } 106 106 + if items == nil { 107 107 + items = []APINote{} 108 108 + } 109 109 + 110 110 + return &FeedResponse{Items: items, TotalItems: len(items)}, nil 111 111 + } 112 112 + 113 113 + func sortByTime(items []APINote) { 114 114 + sort.Slice(items, func(i, j int) bool { 115 115 + return items[i].CreatedAt.After(items[j].CreatedAt) 116 116 + }) 117 117 + } 118 118 + 119 119 + func sortByEngagement(items []APINote) { 120 120 + sort.Slice(items, func(i, j int) bool { 121 121 + si := items[i].LikeCount + items[i].ReplyCount 122 122 + sj := items[j].LikeCount + items[j].ReplyCount 123 123 + if si != sj { 124 124 + return si > sj 125 125 + } 126 126 + return items[i].CreatedAt.After(items[j].CreatedAt) 127 127 + }) 128 128 + }

+298

backend/internal/service/hydration.go

reviewed

··· 1 1 + package service 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "encoding/json" 6 6 + "sync" 7 7 + "time" 8 8 + 9 9 + "margin.at/internal/domain" 10 10 + ) 11 11 + 12 12 + type APISelector struct { 13 13 + Type string `json:"type"` 14 14 + Exact string `json:"exact,omitempty"` 15 15 + Prefix string `json:"prefix,omitempty"` 16 16 + Suffix string `json:"suffix,omitempty"` 17 17 + Start *int `json:"start,omitempty"` 18 18 + End *int `json:"end,omitempty"` 19 19 + Value string `json:"value,omitempty"` 20 20 + ConformsTo string `json:"conformsTo,omitempty"` 21 21 + } 22 22 + 23 23 + type APIBody struct { 24 24 + Value string `json:"value,omitempty"` 25 25 + Format string `json:"format,omitempty"` 26 26 + URI string `json:"uri,omitempty"` 27 27 + } 28 28 + 29 29 + type APITarget struct { 30 30 + Source string `json:"source"` 31 31 + Title string `json:"title,omitempty"` 32 32 + Selector *APISelector `json:"selector,omitempty"` 33 33 + } 34 34 + 35 35 + type APILabel struct { 36 36 + Val string `json:"val"` 37 37 + Src string `json:"src"` 38 38 + Scope string `json:"scope"` 39 39 + } 40 40 + 41 41 + type APIGenerator struct { 42 42 + ID string `json:"id"` 43 43 + Type string `json:"type"` 44 44 + Name string `json:"name"` 45 45 + } 46 46 + 47 47 + type APINote struct { 48 48 + ID string `json:"id"` 49 49 + CID string `json:"cid,omitempty"` 50 50 + Type string `json:"type"` 51 51 + Motivation string `json:"motivation,omitempty"` 52 52 + Author domain.Author `json:"creator"` 53 53 + Body *APIBody `json:"body,omitempty"` 54 54 + Target APITarget `json:"target"` 55 55 + Color string `json:"color,omitempty"` 56 56 + Description string `json:"description,omitempty"` 57 57 + Tags []string `json:"tags,omitempty"` 58 58 + Generator *APIGenerator `json:"generator,omitempty"` 59 59 + CreatedAt time.Time `json:"created"` 60 60 + IndexedAt time.Time `json:"indexed"` 61 61 + LikeCount int `json:"likeCount"` 62 62 + ReplyCount int `json:"replyCount"` 63 63 + ViewerHasLiked bool `json:"viewerHasLiked"` 64 64 + Labels []APILabel `json:"labels,omitempty"` 65 65 + EditedAt *time.Time `json:"editedAt,omitempty"` 66 66 + } 67 67 + 68 68 + type LoadContext struct { 69 69 + Profiles map[string]domain.Author 70 70 + LikeCounts map[string]int 71 71 + ReplyCounts map[string]int 72 72 + ViewerLikes map[string]bool 73 73 + URILabels map[string][]domain.ContentLabel 74 74 + DIDLabels map[string][]domain.ContentLabel 75 75 + EditTimes map[string]time.Time 76 76 + } 77 77 + 78 78 + type HydrationService struct { 79 79 + engagement domain.EngagementRepository 80 80 + profiles domain.ProfileRepository 81 81 + } 82 82 + 83 83 + func NewHydrationService( 84 84 + engagement domain.EngagementRepository, 85 85 + profiles domain.ProfileRepository, 86 86 + ) *HydrationService { 87 87 + return &HydrationService{ 88 88 + engagement: engagement, 89 89 + profiles: profiles, 90 90 + } 91 91 + } 92 92 + 93 93 + func (h *HydrationService) Load(ctx context.Context, notes []domain.Note, viewerDID string) (*LoadContext, error) { 94 94 + lc := &LoadContext{ 95 95 + Profiles: make(map[string]domain.Author), 96 96 + LikeCounts: make(map[string]int), 97 97 + ReplyCounts: make(map[string]int), 98 98 + ViewerLikes: make(map[string]bool), 99 99 + URILabels: make(map[string][]domain.ContentLabel), 100 100 + DIDLabels: make(map[string][]domain.ContentLabel), 101 101 + EditTimes: make(map[string]time.Time), 102 102 + } 103 103 + if len(notes) == 0 { 104 104 + return lc, nil 105 105 + } 106 106 + 107 107 + uris := make([]string, len(notes)) 108 108 + didSet := make(map[string]struct{}, len(notes)) 109 109 + for i, n := range notes { 110 110 + uris[i] = n.URI 111 111 + didSet[n.AuthorDID] = struct{}{} 112 112 + } 113 113 + dids := make([]string, 0, len(didSet)) 114 114 + for did := range didSet { 115 115 + dids = append(dids, did) 116 116 + } 117 117 + 118 118 + var wg sync.WaitGroup 119 119 + var mu sync.Mutex 120 120 + 121 121 + run := func(fn func() error) { 122 122 + wg.Add(1) 123 123 + go func() { 124 124 + defer wg.Done() 125 125 + fn() 126 126 + }() 127 127 + } 128 128 + 129 129 + run(func() error { 130 130 + p, err := h.profiles.GetProfiles(ctx, dids) 131 131 + if err == nil { 132 132 + mu.Lock() 133 133 + lc.Profiles = p 134 134 + mu.Unlock() 135 135 + } 136 136 + return err 137 137 + }) 138 138 + 139 139 + run(func() error { 140 140 + counts, err := h.engagement.GetLikeCounts(ctx, uris) 141 141 + if err == nil { 142 142 + mu.Lock() 143 143 + lc.LikeCounts = counts 144 144 + mu.Unlock() 145 145 + } 146 146 + return err 147 147 + }) 148 148 + 149 149 + run(func() error { 150 150 + counts, err := h.engagement.GetReplyCounts(ctx, uris) 151 151 + if err == nil { 152 152 + mu.Lock() 153 153 + lc.ReplyCounts = counts 154 154 + mu.Unlock() 155 155 + } 156 156 + return err 157 157 + }) 158 158 + 159 159 + if viewerDID != "" { 160 160 + run(func() error { 161 161 + vl, err := h.engagement.GetViewerLikes(ctx, viewerDID, uris) 162 162 + if err == nil { 163 163 + mu.Lock() 164 164 + lc.ViewerLikes = vl 165 165 + mu.Unlock() 166 166 + } 167 167 + return err 168 168 + }) 169 169 + } 170 170 + 171 171 + run(func() error { 172 172 + ul, err := h.engagement.GetLabelsForURIs(ctx, uris, dids) 173 173 + if err == nil { 174 174 + mu.Lock() 175 175 + lc.URILabels = ul 176 176 + mu.Unlock() 177 177 + } 178 178 + return err 179 179 + }) 180 180 + 181 181 + run(func() error { 182 182 + dl, err := h.engagement.GetLabelsForDIDs(ctx, dids, dids) 183 183 + if err == nil { 184 184 + mu.Lock() 185 185 + lc.DIDLabels = dl 186 186 + mu.Unlock() 187 187 + } 188 188 + return err 189 189 + }) 190 190 + 191 191 + run(func() error { 192 192 + et, err := h.engagement.GetLatestEditTimes(ctx, uris) 193 193 + if err == nil { 194 194 + mu.Lock() 195 195 + lc.EditTimes = et 196 196 + mu.Unlock() 197 197 + } 198 198 + return err 199 199 + }) 200 200 + 201 201 + wg.Wait() 202 202 + return lc, nil 203 203 + } 204 204 + 205 205 + func (h *HydrationService) ToAPINote(n domain.Note, lc *LoadContext) APINote { 206 206 + noteType := "Annotation" 207 207 + switch n.Motivation { 208 208 + case "highlighting": 209 209 + noteType = "Highlight" 210 210 + case "bookmarking": 211 211 + noteType = "Bookmark" 212 212 + } 213 213 + 214 214 + note := APINote{ 215 215 + ID: n.URI, 216 216 + Type: noteType, 217 217 + Motivation: n.Motivation, 218 218 + Author: lc.Profiles[n.AuthorDID], 219 219 + Target: APITarget{ 220 220 + Source: n.TargetSource, 221 221 + }, 222 222 + CreatedAt: n.CreatedAt, 223 223 + IndexedAt: n.IndexedAt, 224 224 + LikeCount: lc.LikeCounts[n.URI], 225 225 + ReplyCount: lc.ReplyCounts[n.URI], 226 226 + ViewerHasLiked: lc.ViewerLikes[n.URI], 227 227 + Labels: mergeLabels(lc.URILabels[n.URI], lc.DIDLabels[n.AuthorDID]), 228 228 + Generator: &APIGenerator{ 229 229 + ID: "https://margin.at", 230 230 + Type: "Software", 231 231 + Name: "Margin", 232 232 + }, 233 233 + } 234 234 + 235 235 + if n.CID != nil { 236 236 + note.CID = *n.CID 237 237 + } 238 238 + 239 239 + if n.TargetTitle != nil { 240 240 + note.Target.Title = *n.TargetTitle 241 241 + } 242 242 + 243 243 + if n.SelectorJSON != nil && *n.SelectorJSON != "" { 244 244 + sel := &APISelector{} 245 245 + if json.Unmarshal([]byte(*n.SelectorJSON), sel) == nil { 246 246 + note.Target.Selector = sel 247 247 + } 248 248 + } 249 249 + 250 250 + if n.BodyValue != nil || n.BodyURI != nil { 251 251 + body := &APIBody{} 252 252 + if n.BodyValue != nil { 253 253 + body.Value = *n.BodyValue 254 254 + } 255 255 + if n.BodyFormat != nil { 256 256 + body.Format = *n.BodyFormat 257 257 + } 258 258 + if n.BodyURI != nil { 259 259 + body.URI = *n.BodyURI 260 260 + } 261 261 + note.Body = body 262 262 + } 263 263 + 264 264 + if n.Color != nil { 265 265 + note.Color = *n.Color 266 266 + } 267 267 + 268 268 + if n.Description != nil { 269 269 + note.Description = *n.Description 270 270 + } 271 271 + 272 272 + if n.TagsJSON != nil && *n.TagsJSON != "" { 273 273 + var tags []string 274 274 + if json.Unmarshal([]byte(*n.TagsJSON), &tags) == nil { 275 275 + note.Tags = tags 276 276 + } 277 277 + } 278 278 + 279 279 + if t, ok := lc.EditTimes[n.URI]; ok { 280 280 + note.EditedAt = &t 281 281 + } 282 282 + 283 283 + return note 284 284 + } 285 285 + 286 286 + func mergeLabels(uriLabels, didLabels []domain.ContentLabel) []APILabel { 287 287 + if len(uriLabels) == 0 && len(didLabels) == 0 { 288 288 + return nil 289 289 + } 290 290 + result := make([]APILabel, 0, len(uriLabels)+len(didLabels)) 291 291 + for _, l := range uriLabels { 292 292 + result = append(result, APILabel{Val: l.Val, Src: l.Src, Scope: "content"}) 293 293 + } 294 294 + for _, l := range didLabels { 295 295 + result = append(result, APILabel{Val: l.Val, Src: l.Src, Scope: "author"}) 296 296 + } 297 297 + return result 298 298 + }

+80

backend/internal/service/profile.go

reviewed

··· 1 1 + package service 2 2 + 3 3 + import ( 4 4 + "context" 5 5 + "sync" 6 6 + "time" 7 7 + 8 8 + "margin.at/internal/domain" 9 9 + ) 10 10 + 11 11 + const defaultProfileTTL = 5 * time.Minute 12 12 + 13 13 + type profileCacheEntry struct { 14 14 + author domain.Author 15 15 + expiresAt time.Time 16 16 + } 17 17 + 18 18 + type ProfileService struct { 19 19 + repo domain.ProfileRepository 20 20 + ttl time.Duration 21 21 + mu sync.RWMutex 22 22 + cache map[string]profileCacheEntry 23 23 + } 24 24 + 25 25 + func NewProfileService(repo domain.ProfileRepository) *ProfileService { 26 26 + return &ProfileService{ 27 27 + repo: repo, 28 28 + ttl: defaultProfileTTL, 29 29 + cache: make(map[string]profileCacheEntry), 30 30 + } 31 31 + } 32 32 + 33 33 + func (s *ProfileService) GetProfiles(ctx context.Context, dids []string) (map[string]domain.Author, error) { 34 34 + now := time.Now() 35 35 + result := make(map[string]domain.Author, len(dids)) 36 36 + var missing []string 37 37 + 38 38 + s.mu.RLock() 39 39 + for _, did := range dids { 40 40 + if e, ok := s.cache[did]; ok && now.Before(e.expiresAt) { 41 41 + result[did] = e.author 42 42 + } else { 43 43 + missing = append(missing, did) 44 44 + } 45 45 + } 46 46 + s.mu.RUnlock() 47 47 + 48 48 + if len(missing) == 0 { 49 49 + return result, nil 50 50 + } 51 51 + 52 52 + fetched, err := s.repo.GetProfiles(ctx, missing) 53 53 + if err != nil { 54 54 + return result, err 55 55 + } 56 56 + 57 57 + expiry := now.Add(s.ttl) 58 58 + s.mu.Lock() 59 59 + for did, author := range fetched { 60 60 + s.cache[did] = profileCacheEntry{author: author, expiresAt: expiry} 61 61 + result[did] = author 62 62 + } 63 63 + s.mu.Unlock() 64 64 + 65 65 + return result, nil 66 66 + } 67 67 + 68 68 + func (s *ProfileService) GetProfile(ctx context.Context, did string) (*domain.Profile, error) { 69 69 + return s.repo.GetProfile(ctx, did) 70 70 + } 71 71 + 72 72 + func (s *ProfileService) UpsertProfile(ctx context.Context, p *domain.Profile) error { 73 73 + if err := s.repo.UpsertProfile(ctx, p); err != nil { 74 74 + return err 75 75 + } 76 76 + s.mu.Lock() 77 77 + delete(s.cache, p.AuthorDID) 78 78 + s.mu.Unlock() 79 79 + return nil 80 80 + }

+2 -2

backend/internal/verification/verify.go

reviewed

··· 253 253 select { 254 254 case verifyQueue <- verifyTask{url: pubURL, uri: uri, onVerified: onVerified, isDoc: false}: 255 255 default: 256 256 - // Queue full — drop silently to protect network 256 256 + // Queue full 257 257 } 258 258 } 259 259 ··· 264 264 select { 265 265 case verifyQueue <- verifyTask{url: docURL, uri: uri, onVerified: onVerified, isDoc: true}: 266 266 default: 267 267 - // Queue full — drop silently to protect network 267 267 + // Queue full 268 268 } 269 269 }

+47

backend/internal/xrpc/client.go

reviewed

··· 275 275 return &output, nil 276 276 } 277 277 278 278 + type ListRecordsRecord struct { 279 279 + URI string `json:"uri"` 280 280 + CID string `json:"cid"` 281 281 + Value json.RawMessage `json:"value"` 282 282 + } 283 283 + 284 284 + type ListRecordsOutput struct { 285 285 + Cursor string `json:"cursor"` 286 286 + Records []ListRecordsRecord `json:"records"` 287 287 + } 288 288 + 289 289 + func (c *Client) ListRecords(ctx context.Context, repo, collection string, limit int) (*ListRecordsOutput, error) { 290 290 + url := fmt.Sprintf("%s/xrpc/com.atproto.repo.listRecords?repo=%s&collection=%s&limit=%d", 291 291 + c.PDS, repo, collection, limit) 292 292 + 293 293 + req, err := http.NewRequestWithContext(ctx, "GET", url, nil) 294 294 + if err != nil { 295 295 + return nil, err 296 296 + } 297 297 + 298 298 + dpopProof, err := c.createDPoPProof("GET", url) 299 299 + if err != nil { 300 300 + return nil, err 301 301 + } 302 302 + 303 303 + req.Header.Set("Authorization", "DPoP "+c.AccessToken) 304 304 + req.Header.Set("DPoP", dpopProof) 305 305 + 306 306 + resp, err := http.DefaultClient.Do(req) 307 307 + if err != nil { 308 308 + return nil, err 309 309 + } 310 310 + defer resp.Body.Close() 311 311 + 312 312 + if resp.StatusCode >= 400 { 313 313 + bodyBytes, _ := io.ReadAll(resp.Body) 314 314 + return nil, fmt.Errorf("XRPC error %d: %s", resp.StatusCode, string(bodyBytes)) 315 315 + } 316 316 + 317 317 + var output ListRecordsOutput 318 318 + if err := json.NewDecoder(resp.Body).Decode(&output); err != nil { 319 319 + return nil, err 320 320 + } 321 321 + 322 322 + return &output, nil 323 323 + } 324 324 + 278 325 type ResolveHandleOutput struct { 279 326 Did string `json:"did"` 280 327 }

+115 -113

backend/internal/xrpc/records.go

reviewed

··· 8 8 ) 9 9 10 10 const ( 11 11 - CollectionAnnotation = "at.margin.annotation" 12 12 - CollectionHighlight = "at.margin.highlight" 13 13 - CollectionBookmark = "at.margin.bookmark" 14 14 - CollectionReply = "at.margin.reply" 15 15 - CollectionLike = "at.margin.like" 16 16 - CollectionCollection = "at.margin.collection" 17 17 - CollectionCollectionItem = "at.margin.collectionItem" 18 18 - CollectionProfile = "at.margin.profile" 19 19 - CollectionPreferences = "at.margin.preferences" 20 20 - CollectionAPIKey = "at.margin.apikey" 21 21 - CollectionDocument = "site.standard.document" 22 22 - CollectionPublication = "site.standard.publication" 11 11 + CollectionNote = "at.margin.note" 12 12 + CollectionCommunityBookmark = "community.lexicon.bookmarks.bookmark" 13 13 + CollectionAnnotation = "at.margin.annotation" 14 14 + CollectionHighlight = "at.margin.highlight" 15 15 + CollectionBookmark = "at.margin.bookmark" 16 16 + CollectionReply = "at.margin.reply" 17 17 + CollectionLike = "at.margin.like" 18 18 + CollectionCollection = "at.margin.collection" 19 19 + CollectionCollectionItem = "at.margin.collectionItem" 20 20 + CollectionProfile = "at.margin.profile" 21 21 + CollectionPreferences = "at.margin.preferences" 22 22 + CollectionAPIKey = "at.margin.apikey" 23 23 + CollectionDocument = "site.standard.document" 24 24 + CollectionPublication = "site.standard.publication" 23 25 ) 24 26 25 27 const ( ··· 102 104 Homepage string `json:"homepage,omitempty"` 103 105 } 104 106 105 105 - type AnnotationRecord struct { 107 107 + type NoteRecord struct { 106 108 Type string `json:"$type"` 107 107 - Motivation string `json:"motivation,omitempty"` 109 109 + Motivation string `json:"motivation"` 110 110 + Color string `json:"color,omitempty"` 108 111 Body *AnnotationBody `json:"body,omitempty"` 109 112 Target AnnotationTarget `json:"target"` 110 113 Tags []string `json:"tags,omitempty"` ··· 113 116 Rights string `json:"rights,omitempty"` 114 117 Labels *SelfLabels `json:"labels,omitempty"` 115 118 CreatedAt string `json:"createdAt"` 116 116 - } 117 117 - 118 118 - type Facet struct { 119 119 - Index FacetIndex `json:"index"` 120 120 - Features []FacetFeature `json:"features"` 121 121 - } 122 122 - 123 123 - type FacetIndex struct { 124 124 - ByteStart int `json:"byteStart"` 125 125 - ByteEnd int `json:"byteEnd"` 126 126 - } 127 127 - 128 128 - type FacetFeature struct { 129 129 - Type string `json:"$type"` 130 130 - Did string `json:"did,omitempty"` 131 131 - Uri string `json:"uri,omitempty"` 132 132 - } 133 133 - 134 134 - type AnnotationBody struct { 135 135 - Value string `json:"value,omitempty"` 136 136 - Format string `json:"format,omitempty"` 137 137 - } 138 138 - 139 139 - type AnnotationTarget struct { 140 140 - Source string `json:"source"` 141 141 - SourceHash string `json:"sourceHash"` 142 142 - Title string `json:"title,omitempty"` 143 143 - Selector json.RawMessage `json:"selector,omitempty"` 119 119 + ModifiedAt string `json:"modifiedAt,omitempty"` 144 120 } 145 121 146 146 - func (r *AnnotationRecord) Validate() error { 122 122 + func (r *NoteRecord) Validate() error { 123 123 + if r.Motivation == "" { 124 124 + return fmt.Errorf("motivation is required") 125 125 + } 147 126 if r.Target.Source == "" { 148 127 return fmt.Errorf("target source is required") 149 128 } ··· 163 142 return fmt.Errorf("tag too long: %s", tag) 164 143 } 165 144 } 166 166 - 167 145 if len(r.Target.Selector) > 0 { 168 146 var typeCheck Selector 169 147 if err := json.Unmarshal(r.Target.Selector, &typeCheck); err != nil { 170 148 return fmt.Errorf("invalid selector format") 171 149 } 172 172 - 173 150 switch typeCheck.Type { 174 151 case SelectorTypeQuote: 175 152 var s TextQuoteSelector ··· 185 162 return s.Validate() 186 163 } 187 164 } 188 188 - 189 165 return nil 190 166 } 191 167 192 192 - func NewAnnotationRecord(url, urlHash, text string, selector interface{}, title string) *AnnotationRecord { 193 193 - return NewAnnotationRecordWithMotivation(url, urlHash, text, selector, title, "commenting") 194 194 - } 195 195 - 196 196 - func NewAnnotationRecordWithMotivation(url, urlHash, text string, selector interface{}, title string, motivation string) *AnnotationRecord { 168 168 + func NewNoteRecord(url, urlHash, text string, selector interface{}, title, color, description, motivation string) *NoteRecord { 197 169 var selectorJSON json.RawMessage 198 170 if selector != nil { 199 171 b, _ := json.Marshal(selector) 200 172 selectorJSON = b 201 173 } 202 174 203 203 - record := &AnnotationRecord{ 204 204 - Type: CollectionAnnotation, 175 175 + record := &NoteRecord{ 176 176 + Type: CollectionNote, 205 177 Motivation: motivation, 178 178 + Color: color, 206 179 Target: AnnotationTarget{ 207 180 Source: url, 208 181 SourceHash: urlHash, ··· 212 185 CreatedAt: time.Now().UTC().Format(time.RFC3339), 213 186 } 214 187 215 215 - if text != "" { 188 188 + bodyText := text 189 189 + if bodyText == "" { 190 190 + bodyText = description 191 191 + } 192 192 + if bodyText != "" { 216 193 record.Body = &AnnotationBody{ 217 217 - Value: text, 194 194 + Value: bodyText, 218 195 Format: "text/plain", 219 196 } 220 197 } ··· 222 199 return record 223 200 } 224 201 202 202 + type AnnotationRecord struct { 203 203 + Type string `json:"$type"` 204 204 + Motivation string `json:"motivation,omitempty"` 205 205 + Body *AnnotationBody `json:"body,omitempty"` 206 206 + Target AnnotationTarget `json:"target"` 207 207 + Tags []string `json:"tags,omitempty"` 208 208 + Facets []Facet `json:"facets,omitempty"` 209 209 + Generator *Generator `json:"generator,omitempty"` 210 210 + Rights string `json:"rights,omitempty"` 211 211 + Labels *SelfLabels `json:"labels,omitempty"` 212 212 + CreatedAt string `json:"createdAt"` 213 213 + } 214 214 + 215 215 + type Facet struct { 216 216 + Index FacetIndex `json:"index"` 217 217 + Features []FacetFeature `json:"features"` 218 218 + } 219 219 + 220 220 + type FacetIndex struct { 221 221 + ByteStart int `json:"byteStart"` 222 222 + ByteEnd int `json:"byteEnd"` 223 223 + } 224 224 + 225 225 + type FacetFeature struct { 226 226 + Type string `json:"$type"` 227 227 + Did string `json:"did,omitempty"` 228 228 + Uri string `json:"uri,omitempty"` 229 229 + } 230 230 + 231 231 + type AnnotationBody struct { 232 232 + Value string `json:"value,omitempty"` 233 233 + Format string `json:"format,omitempty"` 234 234 + } 235 235 + 236 236 + type AnnotationTarget struct { 237 237 + Source string `json:"source"` 238 238 + SourceHash string `json:"sourceHash"` 239 239 + Title string `json:"title,omitempty"` 240 240 + Selector json.RawMessage `json:"selector,omitempty"` 241 241 + } 242 242 + 243 243 + func (r *AnnotationRecord) Validate() error { 244 244 + if r.Target.Source == "" { 245 245 + return fmt.Errorf("target source is required") 246 246 + } 247 247 + if r.Body != nil && utf8.RuneCountInString(r.Body.Value) > 3000 { 248 248 + return fmt.Errorf("body too long") 249 249 + } 250 250 + if len(r.Tags) > 10 { 251 251 + return fmt.Errorf("too many tags") 252 252 + } 253 253 + return nil 254 254 + } 255 255 + 225 256 type HighlightRecord struct { 226 257 Type string `json:"$type"` 227 258 Target AnnotationTarget `json:"target"` ··· 238 269 return fmt.Errorf("target source is required") 239 270 } 240 271 if len(r.Tags) > 10 { 241 241 - return fmt.Errorf("too many tags: %d", len(r.Tags)) 272 272 + return fmt.Errorf("too many tags") 242 273 } 243 274 if len(r.Color) > 20 { 244 275 return fmt.Errorf("color too long") ··· 246 277 return nil 247 278 } 248 279 249 249 - func NewHighlightRecord(url, urlHash string, selector interface{}, color string, tags []string) *HighlightRecord { 250 250 - var selectorJSON json.RawMessage 251 251 - if selector != nil { 252 252 - b, _ := json.Marshal(selector) 253 253 - selectorJSON = b 254 254 - } 280 280 + type BookmarkRecord struct { 281 281 + Type string `json:"$type"` 282 282 + Source string `json:"source"` 283 283 + SourceHash string `json:"sourceHash"` 284 284 + Title string `json:"title,omitempty"` 285 285 + Description string `json:"description,omitempty"` 286 286 + Tags []string `json:"tags,omitempty"` 287 287 + Generator *Generator `json:"generator,omitempty"` 288 288 + Rights string `json:"rights,omitempty"` 289 289 + Labels *SelfLabels `json:"labels,omitempty"` 290 290 + CreatedAt string `json:"createdAt"` 291 291 + } 255 292 256 256 - return &HighlightRecord{ 257 257 - Type: CollectionHighlight, 258 258 - Target: AnnotationTarget{ 259 259 - Source: url, 260 260 - SourceHash: urlHash, 261 261 - Selector: selectorJSON, 262 262 - }, 263 263 - Color: color, 264 264 - Tags: tags, 265 265 - CreatedAt: time.Now().UTC().Format(time.RFC3339), 293 293 + func (r *BookmarkRecord) Validate() error { 294 294 + if r.Source == "" { 295 295 + return fmt.Errorf("source is required") 266 296 } 297 297 + if len(r.Title) > 500 { 298 298 + return fmt.Errorf("title too long") 299 299 + } 300 300 + if len(r.Description) > 1000 { 301 301 + return fmt.Errorf("description too long") 302 302 + } 303 303 + if len(r.Tags) > 10 { 304 304 + return fmt.Errorf("too many tags") 305 305 + } 306 306 + return nil 267 307 } 268 308 269 309 type ReplyRef struct { ··· 333 373 } 334 374 } 335 375 336 336 - type BookmarkRecord struct { 337 337 - Type string `json:"$type"` 338 338 - Source string `json:"source"` 339 339 - SourceHash string `json:"sourceHash"` 340 340 - Title string `json:"title,omitempty"` 341 341 - Description string `json:"description,omitempty"` 342 342 - Tags []string `json:"tags,omitempty"` 343 343 - Generator *Generator `json:"generator,omitempty"` 344 344 - Rights string `json:"rights,omitempty"` 345 345 - Labels *SelfLabels `json:"labels,omitempty"` 346 346 - CreatedAt string `json:"createdAt"` 347 347 - } 348 348 - 349 349 - func (r *BookmarkRecord) Validate() error { 350 350 - if r.Source == "" { 351 351 - return fmt.Errorf("source is required") 352 352 - } 353 353 - if len(r.Title) > 500 { 354 354 - return fmt.Errorf("title too long") 355 355 - } 356 356 - if len(r.Description) > 1000 { 357 357 - return fmt.Errorf("description too long") 358 358 - } 359 359 - if len(r.Tags) > 10 { 360 360 - return fmt.Errorf("too many tags") 361 361 - } 362 362 - return nil 363 363 - } 364 364 - 365 365 - func NewBookmarkRecord(url, urlHash, title, description string) *BookmarkRecord { 366 366 - return &BookmarkRecord{ 367 367 - Type: CollectionBookmark, 368 368 - Source: url, 369 369 - SourceHash: urlHash, 370 370 - Title: title, 371 371 - Description: description, 372 372 - CreatedAt: time.Now().UTC().Format(time.RFC3339), 373 373 - } 374 374 - } 375 375 - 376 376 type CollectionRecord struct { 377 377 Type string `json:"$type"` 378 378 Name string `json:"name"` ··· 481 481 SubscribedLabelers []LabelerSubscription `json:"subscribedLabelers,omitempty"` 482 482 LabelPreferences []LabelPreference `json:"labelPreferences,omitempty"` 483 483 DisableExternalLinkWarning *bool `json:"disableExternalLinkWarning,omitempty"` 484 484 + EnableCommunityBookmarks *bool `json:"enableCommunityBookmarks,omitempty"` 484 485 CreatedAt string `json:"createdAt"` 485 486 } 486 487 ··· 502 503 return nil 503 504 } 504 505 505 505 - func NewPreferencesRecord(skippedHostnames []string, labelers interface{}, labelPrefs interface{}, disableExternalLinkWarning *bool) *PreferencesRecord { 506 506 + func NewPreferencesRecord(skippedHostnames []string, labelers interface{}, labelPrefs interface{}, disableExternalLinkWarning *bool, enableCommunityBookmarks *bool) *PreferencesRecord { 506 507 record := &PreferencesRecord{ 507 508 Type: CollectionPreferences, 508 509 ExternalLinkSkippedHostnames: skippedHostnames, 509 510 DisableExternalLinkWarning: disableExternalLinkWarning, 511 511 + EnableCommunityBookmarks: enableCommunityBookmarks, 510 512 CreatedAt: time.Now().UTC().Format(time.RFC3339), 511 513 } 512 514

+54 -31

extension/src/components/popup/App.tsx

reviewed

··· 1 1 import { useState, useEffect } from 'react'; 2 2 + import { capture } from '@/utils/analytics'; 2 3 import { sendMessage } from '@/utils/messaging'; 3 4 import { themeItem, apiUrlItem, overlayEnabledItem } from '@/utils/storage'; 4 5 import type { MarginSession, Annotation, Bookmark, Highlight, Collection } from '@/utils/types'; ··· 59 60 const [bookmarkTags, setBookmarkTags] = useState<string[]>([]); 60 61 const [showBookmarkTags, setShowBookmarkTags] = useState(false); 61 62 const [tagSuggestions, setTagSuggestions] = useState<string[]>([]); 62 62 - 63 63 useEffect(() => { 64 64 checkSession(); 65 65 loadCurrentTab(); 66 66 loadTheme(); 67 67 loadSettings(); 68 68 + 69 69 + sendMessage('checkSession', undefined) 70 70 + .then((s) => 71 71 + capture('popup_opened', { authenticated: s?.authenticated ?? false }, s?.did ?? undefined) 72 72 + ) 73 73 + .catch(() => {}); 68 74 }, []); 69 75 70 76 useEffect(() => { ··· 329 335 setText(''); 330 336 setTags([]); 331 337 loadAnnotations(); 338 338 + capture( 339 339 + 'annotation_created', 340 340 + { url: currentUrl, tag_count: tags.length, source: 'extension' }, 341 341 + session?.did ?? undefined 342 342 + ); 332 343 } else { 333 344 alert('Failed to post annotation'); 334 345 } ··· 352 363 setBookmarked(true); 353 364 setBookmarkTags([]); 354 365 setShowBookmarkTags(false); 366 366 + capture( 367 367 + 'bookmark_created', 368 368 + { url: currentUrl, tag_count: bookmarkTags.length, source: 'extension' }, 369 369 + session?.did ?? undefined 370 370 + ); 355 371 } else { 356 372 alert('Failed to bookmark page'); 357 373 } ··· 454 470 <img src="/icons/logo.svg" alt="Margin" className="w-8 h-8" /> 455 471 </div> 456 472 <h2 className="font-display text-xl font-bold tracking-tight mb-2">Welcome to Margin</h2> 457 457 - <p className="text-[var(--text-secondary)] text-sm leading-relaxed mb-8 max-w-[280px]"> 473 473 + <p className="text-[var(--text-secondary)] text-sm leading-relaxed mb-5 max-w-[280px]"> 458 474 Annotate, highlight, and bookmark the web with your AT Protocol identity. 459 475 </p> 460 476 <button 461 477 onClick={() => browser.tabs.create({ url: `${apiUrl}/login` })} 462 462 - className="w-full max-w-[240px] px-6 py-2.5 bg-[var(--accent)] text-white rounded-xl text-sm font-semibold hover:bg-[var(--accent-hover)] transition-colors" 478 478 + className="w-full max-w-[280px] px-6 py-2.5 bg-[var(--accent)] text-white rounded-xl text-sm font-semibold hover:bg-[var(--accent-hover)] transition-colors" 463 479 > 464 480 Sign In 465 481 </button> 482 482 + 466 483 <button 467 484 onClick={() => setShowSettings(true)} 468 485 className="mt-4 text-xs text-[var(--text-tertiary)] hover:text-[var(--text-primary)] flex items-center gap-1.5 px-3 py-1.5 rounded-lg hover:bg-[var(--bg-hover)] transition-colors" ··· 577 594 <button 578 595 onClick={() => browser.tabs.create({ url: apiUrl })} 579 596 className="text-[11px] text-[var(--text-tertiary)] hover:text-[var(--accent)] px-2 py-1 rounded-md hover:bg-[var(--bg-hover)] transition-colors" 597 597 + style={{ display: session.handle ? undefined : 'none' }} 580 598 > 581 599 @{session.handle} 582 600 </button> ··· 591 609 </header> 592 610 593 611 <div className="flex border-b border-[var(--border)] px-2 gap-0.5"> 594 594 - {(['page', 'bookmarks', 'highlights', 'collections'] as Tab[]).map((tab) => { 595 595 - const icons: Record<Tab, JSX.Element> = { 596 596 - page: <Globe size={13} />, 597 597 - bookmarks: <BookmarkIcon size={13} />, 598 598 - highlights: <Highlighter size={13} />, 599 599 - collections: <Folder size={13} />, 600 600 - }; 601 601 - const labels: Record<Tab, string> = { 602 602 - page: 'Page', 603 603 - bookmarks: 'Bookmarks', 604 604 - highlights: 'Highlights', 605 605 - collections: 'Collections', 606 606 - }; 607 607 - return ( 608 608 - <button 609 609 - key={tab} 610 610 - onClick={() => setActiveTab(tab)} 611 611 - className={`flex-1 py-2.5 text-[11px] font-medium flex items-center justify-center gap-1 border-b-2 transition-all ${ 612 612 - activeTab === tab 613 613 - ? 'border-[var(--accent)] text-[var(--accent)]' 614 614 - : 'border-transparent text-[var(--text-tertiary)] hover:text-[var(--text-secondary)]' 615 615 - }`} 616 616 - > 617 617 - {icons[tab]} 618 618 - {labels[tab]} 619 619 - </button> 620 620 - ); 621 621 - })} 612 612 + {(['page', 'bookmarks', 'highlights', 'collections'] as Tab[]) 613 613 + .filter((tab) => tab === 'page' || !!session.did) 614 614 + .map((tab) => { 615 615 + const icons: Record<Tab, JSX.Element> = { 616 616 + page: <Globe size={13} />, 617 617 + bookmarks: <BookmarkIcon size={13} />, 618 618 + highlights: <Highlighter size={13} />, 619 619 + collections: <Folder size={13} />, 620 620 + }; 621 621 + const labels: Record<Tab, string> = { 622 622 + page: 'Page', 623 623 + bookmarks: 'Bookmarks', 624 624 + highlights: 'Highlights', 625 625 + collections: 'Collections', 626 626 + }; 627 627 + return ( 628 628 + <button 629 629 + key={tab} 630 630 + onClick={() => { 631 631 + setActiveTab(tab); 632 632 + capture('extension_tab_switched', { tab }, session?.did ?? undefined); 633 633 + }} 634 634 + className={`flex-1 py-2.5 text-[11px] font-medium flex items-center justify-center gap-1 border-b-2 transition-all ${ 635 635 + activeTab === tab 636 636 + ? 'border-[var(--accent)] text-[var(--accent)]' 637 637 + : 'border-transparent text-[var(--text-tertiary)] hover:text-[var(--text-secondary)]' 638 638 + }`} 639 639 + > 640 640 + {icons[tab]} 641 641 + {labels[tab]} 642 642 + </button> 643 643 + ); 644 644 + })} 622 645 </div> 623 646 624 647 <div className="flex-1 overflow-y-auto">

+6 -1

extension/src/components/sidepanel/App.tsx

reviewed

··· 592 592 {showBookmarkTags && !bookmarked && ( 593 593 <div className="mt-2 pt-2 border-t border-[var(--border)]"> 594 594 <div className="mb-1.5"> 595 595 - <TagInput tags={bookmarkTags} onChange={setBookmarkTags} suggestions={tagSuggestions} placeholder="Add bookmark tags..." /> 595 595 + <TagInput 596 596 + tags={bookmarkTags} 597 597 + onChange={setBookmarkTags} 598 598 + suggestions={tagSuggestions} 599 599 + placeholder="Add bookmark tags..." 600 600 + /> 596 601 </div> 597 602 <button 598 603 onClick={handleBookmark}

+50 -3

extension/src/entrypoints/background.ts

reviewed

··· 1 1 import { onMessage } from '@/utils/messaging'; 2 2 import type { Annotation } from '@/utils/types'; 3 3 + import * as analytics from '@/utils/analytics'; 3 4 import { 4 5 checkSession, 5 6 getAnnotations, ··· 244 245 }); 245 246 } 246 247 247 247 - browser.runtime.onInstalled.addListener(async () => { 248 248 + browser.runtime.onInstalled.addListener(async (details) => { 248 249 await ensureContextMenus(); 250 250 + if (details.reason === 'install') { 251 251 + const manifest = browser.runtime.getManifest(); 252 252 + analytics.capture('extension_installed', { 253 253 + version: manifest.version, 254 254 + browser: import.meta.env.BROWSER ?? 'unknown', 255 255 + }); 256 256 + } else if (details.reason === 'update' && details.previousVersion) { 257 257 + const manifest = browser.runtime.getManifest(); 258 258 + analytics.capture('extension_updated', { 259 259 + previous_version: details.previousVersion, 260 260 + version: manifest.version, 261 261 + }); 262 262 + } 249 263 }); 250 264 251 265 browser.runtime.onStartup.addListener(async () => { ··· 287 301 288 302 if (result.success) { 289 303 showNotification('Margin', 'Page bookmarked!'); 304 304 + const session = await checkSession(); 305 305 + analytics.capture( 306 306 + 'bookmark_created', 307 307 + { url: resolveTabUrl(tab.url), tag_count: 0, source: 'extension' }, 308 308 + session.did ?? undefined 309 309 + ); 290 310 } 291 311 return; 292 312 } ··· 352 372 353 373 if (result.success) { 354 374 showNotification('Margin', 'Text highlighted!'); 375 375 + const session = await checkSession(); 376 376 + analytics.capture( 377 377 + 'highlight_created', 378 378 + { url: highlightUrl, tag_count: 0, has_color: false, source: 'extension' }, 379 379 + session.did ?? undefined 380 380 + ); 355 381 try { 356 382 await browser.tabs.sendMessage(tab.id!, { type: 'REFRESH_ANNOTATIONS' }); 357 383 const uri = result.data?.uri || result.data?.id || ''; ··· 441 467 442 468 if (result.success) { 443 469 showNotification('Margin', 'Page bookmarked!'); 470 470 + const session = await checkSession(); 471 471 + analytics.capture( 472 472 + 'bookmark_created', 473 473 + { url: resolveTabUrl(tab.url), tag_count: 0, source: 'extension' }, 474 474 + session.did ?? undefined 475 475 + ); 444 476 } 445 477 return; 446 478 } ··· 448 480 if ((command === 'annotate-selection' || command === 'highlight-selection') && tab?.id) { 449 481 try { 450 482 const selection = (await browser.tabs.sendMessage(tab.id, { type: 'GET_SELECTION' })) as 451 451 - | { text?: string } 483 483 + | { text?: string; prefix?: string; suffix?: string } 452 484 | undefined; 453 485 if (!selection?.text) return; 454 486 ··· 462 494 if (command === 'annotate-selection') { 463 495 await browser.tabs.sendMessage(tab.id, { 464 496 type: 'SHOW_INLINE_ANNOTATE', 465 465 - data: { selector: { exact: selection.text } }, 497 497 + data: { 498 498 + selector: { 499 499 + type: 'TextQuoteSelector', 500 500 + exact: selection.text, 501 501 + prefix: selection.prefix, 502 502 + suffix: selection.suffix, 503 503 + }, 504 504 + }, 466 505 }); 467 506 } else if (command === 'highlight-selection') { 468 507 const result = await createHighlight({ ··· 471 510 selector: { 472 511 type: 'TextQuoteSelector', 473 512 exact: selection.text, 513 513 + prefix: selection.prefix, 514 514 + suffix: selection.suffix, 474 515 }, 475 516 }); 476 517 477 518 if (result.success) { 478 519 showNotification('Margin', 'Text highlighted!'); 520 520 + const session = await checkSession(); 521 521 + analytics.capture( 522 522 + 'highlight_created', 523 523 + { url: resolveTabUrl(tab.url!), tag_count: 0, has_color: false, source: 'extension' }, 524 524 + session.did ?? undefined 525 525 + ); 479 526 await browser.tabs.sendMessage(tab.id, { type: 'REFRESH_ANNOTATIONS' }); 480 527 } 481 528 }

+38

extension/src/utils/analytics.ts

reviewed

··· 1 1 + import { apiUrlItem } from './storage'; 2 2 + 3 3 + export type ExtensionEvents = { 4 4 + extension_installed: { version: string; browser: string }; 5 5 + extension_updated: { previous_version: string; version: string }; 6 6 + popup_opened: { authenticated: boolean }; 7 7 + extension_tab_switched: { tab: string }; 8 8 + annotation_created: { url: string; tag_count: number; source: 'extension' }; 9 9 + highlight_created: { url: string; tag_count: number; has_color: boolean; source: 'extension' }; 10 10 + bookmark_created: { url: string; tag_count: number; source: 'extension' }; 11 11 + extension_connected: { did: string }; 12 12 + api_key_created: Record<string, never>; 13 13 + }; 14 14 + 15 15 + export async function capture<E extends keyof ExtensionEvents>( 16 16 + event: E, 17 17 + properties: ExtensionEvents[E], 18 18 + distinctId?: string 19 19 + ): Promise<void> { 20 20 + try { 21 21 + const apiUrl = await apiUrlItem.getValue(); 22 22 + await fetch(`${apiUrl}/api/analytics/capture`, { 23 23 + method: 'POST', 24 24 + headers: { 'Content-Type': 'application/json' }, 25 25 + body: JSON.stringify({ 26 26 + event, 27 27 + distinct_id: distinctId ?? 'anonymous_extension', 28 28 + properties: { 29 29 + ...properties, 30 30 + $lib: 'margin-extension', 31 31 + }, 32 32 + }), 33 33 + keepalive: true, 34 34 + }); 35 35 + } catch { 36 36 + // ignore 37 37 + } 38 38 + }

+44 -43

extension/src/utils/api.ts

reviewed

··· 1 1 - import type { MarginSession, TextSelector } from './types'; 1 1 + import type { MarginSession, TextSelector, Annotation } from './types'; 2 2 import { apiUrlItem } from './storage'; 3 3 4 4 async function getApiUrl(): Promise<string> { ··· 24 24 const apiUrl = await getApiUrl(); 25 25 const cookie = await getSessionCookie(); 26 26 27 27 - if (!cookie) { 28 28 - return { authenticated: false }; 29 29 - } 27 27 + if (!cookie) return { authenticated: false }; 30 28 31 29 const res = await fetch(`${apiUrl}/auth/session`, { 32 32 - headers: { 33 33 - 'X-Session-Token': cookie, 34 34 - }, 30 30 + headers: { 'X-Session-Token': cookie }, 35 31 }); 36 32 37 37 - if (!res.ok) { 38 38 - return { authenticated: false }; 39 39 - } 33 33 + if (!res.ok) return { authenticated: false }; 40 34 41 35 const sessionData = await res.json(); 42 42 - 43 43 - if (!sessionData.did || !sessionData.handle) { 44 44 - return { authenticated: false }; 45 45 - } 36 36 + if (!sessionData.did || !sessionData.handle) return { authenticated: false }; 46 37 47 38 return { 48 39 authenticated: true, ··· 81 72 return response; 82 73 } 83 74 75 75 + async function hashUrl(rawUrl: string): Promise<string> { 76 76 + let toHash: string; 77 77 + try { 78 78 + const parsed = new URL(rawUrl); 79 79 + let host = parsed.host.toLowerCase(); 80 80 + if (host.startsWith('www.')) host = host.slice(4); 81 81 + let normalized = host + parsed.pathname; 82 82 + if (parsed.search) normalized += parsed.search; 83 83 + normalized = normalized.replace(/\/$/, ''); 84 84 + toHash = normalized; 85 85 + } catch { 86 86 + toHash = rawUrl; 87 87 + } 88 88 + const buf = await crypto.subtle.digest('SHA-256', new TextEncoder().encode(toHash)); 89 89 + return Array.from(new Uint8Array(buf)) 90 90 + .map((b) => b.toString(16).padStart(2, '0')) 91 91 + .join(''); 92 92 + } 93 93 + 84 94 export async function getAnnotations( 85 95 url: string, 86 96 citedUrls: string[] = [], ··· 90 100 const apiUrl = await getApiUrl(); 91 101 const uniqueUrls = [...new Set([url, ...citedUrls])]; 92 102 93 93 - const fetchPromises = uniqueUrls.map(async (u) => { 94 94 - try { 95 95 - let requestUrl = `${apiUrl}/api/targets?source=${encodeURIComponent(u)}`; 96 96 - if (cacheBust) { 97 97 - requestUrl += `&t=${Date.now()}`; 98 98 - } 99 99 - const res = await fetch(requestUrl); 100 100 - if (!res.ok) return { annotations: [], highlights: [], bookmarks: [] }; 101 101 - return await res.json(); 102 102 - } catch { 103 103 - return { annotations: [], highlights: [], bookmarks: [] }; 104 104 - } 105 105 - }); 103 103 + const hashes = await Promise.all(uniqueUrls.map(hashUrl)); 104 104 + 105 105 + const params = new URLSearchParams(); 106 106 + hashes.forEach((h) => params.append('h', h)); 107 107 + if (cacheBust) params.append('t', Date.now().toString()); 108 108 + 109 109 + const res = await fetch(`${apiUrl}/api/targets/hash?${params}`); 110 110 + const data = res.ok ? await res.json() : { annotations: [], highlights: [], bookmarks: [] }; 106 111 107 107 - const results = await Promise.all(fetchPromises); 108 112 const allItems: any[] = []; 109 113 const seenIds = new Set<string>(); 110 110 - 111 111 - results.forEach((data) => { 112 112 - const items = [ 113 113 - ...(data.annotations || []), 114 114 - ...(data.highlights || []), 115 115 - ...(data.bookmarks || []), 116 116 - ]; 117 117 - items.forEach((item: any) => { 118 118 - const id = item.uri || item.id; 119 119 - if (id && !seenIds.has(id)) { 120 120 - seenIds.add(id); 121 121 - allItems.push(item); 122 122 - } 123 123 - }); 114 114 + const items = [ 115 115 + ...(data.annotations || []), 116 116 + ...(data.highlights || []), 117 117 + ...(data.bookmarks || []), 118 118 + ]; 119 119 + items.forEach((item: any) => { 120 120 + const id = item.uri || item.id; 121 121 + if (id && !seenIds.has(id)) { 122 122 + seenIds.add(id); 123 123 + allItems.push(item); 124 124 + } 124 125 }); 125 126 126 127 return allItems; ··· 136 137 title?: string; 137 138 selector?: TextSelector; 138 139 tags?: string[]; 139 139 - }) { 140 140 + }): Promise<{ success: boolean; data?: Annotation; error?: string }> { 140 141 try { 141 142 const res = await apiRequest('/annotations', { 142 143 method: 'POST',

+275 -122

extension/src/utils/overlay.ts

reviewed

··· 36 36 .replace(/'/g, '&#039;'); 37 37 } 38 38 39 39 + function debounce<T extends (...args: any[]) => void>(fn: T, ms: number): T { 40 40 + let t: ReturnType<typeof setTimeout> | null = null; 41 41 + return ((...args: any[]) => { 42 42 + if (t) clearTimeout(t); 43 43 + t = setTimeout(() => fn(...args), ms); 44 44 + }) as T; 45 45 + } 46 46 + 39 47 export async function initContentScript(ctx: { onInvalidated: (cb: () => void) => void }) { 40 48 let overlayHost: HTMLElement | null = null; 41 49 let shadowRoot: ShadowRoot | null = null; ··· 44 52 let composeModal: HTMLElement | null = null; 45 53 let activeItems: Array<{ range: Range; item: Annotation }> = []; 46 54 let cachedMatcher: DOMTextMatcher | null = null; 55 55 + let matcherNeedsRebuild = false; 47 56 const injectedStyles = new Set<string>(); 48 57 let overlayEnabled = true; 49 58 let currentUserDid: string | null = null; ··· 114 123 115 124 function getCiteUrlForText(text: string): string | null { 116 125 if (!text) return null; 117 117 - if (!cachedMatcher) cachedMatcher = new DOMTextMatcher(); 126 126 + if (!cachedMatcher || matcherNeedsRebuild) { 127 127 + cachedMatcher = new DOMTextMatcher(); 128 128 + matcherNeedsRebuild = false; 129 129 + } 118 130 const range = cachedMatcher.findRange(text); 119 131 if (!range) return null; 120 132 ··· 276 288 } 277 289 } 278 290 279 279 - function showComposeModal(quoteText: string) { 291 291 + function getSelectionContext(exact: string): { prefix?: string; suffix?: string } { 292 292 + const sel = window.getSelection(); 293 293 + if (!sel || sel.rangeCount === 0) return {}; 294 294 + const range = sel.getRangeAt(0); 295 295 + if (sel.toString().trim() !== exact.trim()) return {}; 296 296 + 297 297 + try { 298 298 + const prefixRange = document.createRange(); 299 299 + prefixRange.setStart(range.startContainer, 0); 300 300 + prefixRange.setEnd(range.startContainer, range.startOffset); 301 301 + const rawPrefix = prefixRange.toString(); 302 302 + const prefix = rawPrefix.length > 0 ? rawPrefix.slice(-150) : undefined; 303 303 + 304 304 + const endNode = range.endContainer; 305 305 + const endLen = 306 306 + endNode.nodeType === Node.TEXT_NODE 307 307 + ? (endNode as Text).length 308 308 + : ((endNode as Element).textContent?.length ?? 0); 309 309 + const suffixRange = document.createRange(); 310 310 + suffixRange.setStart(range.endContainer, range.endOffset); 311 311 + suffixRange.setEnd(range.endContainer, endLen); 312 312 + const rawSuffix = suffixRange.toString(); 313 313 + const suffix = rawSuffix.length > 0 ? rawSuffix.slice(0, 150) : undefined; 314 314 + 315 315 + return { prefix: prefix || undefined, suffix: suffix || undefined }; 316 316 + } catch { 317 317 + return {}; 318 318 + } 319 319 + } 320 320 + 321 321 + function showComposeModal( 322 322 + quoteText: string, 323 323 + selectorContext?: { prefix?: string; suffix?: string } 324 324 + ) { 280 325 if (!shadowRoot) return; 281 326 282 327 const container = shadowRoot.getElementById('margin-overlay-container'); ··· 396 441 }); 397 442 } 398 443 399 399 - tagInput.addEventListener('input', showTagSuggestions); 444 444 + tagInput.addEventListener('input', debounce(showTagSuggestions, 120)); 400 445 tagInput.addEventListener('keydown', (e) => { 401 446 if (e.key === 'Enter' || e.key === ',') { 402 447 e.preventDefault(); ··· 450 495 451 496 try { 452 497 const citeUrl = getCiteUrlForText(quoteText); 498 498 + const selector = { 499 499 + type: 'TextQuoteSelector', 500 500 + exact: quoteText, 501 501 + prefix: selectorContext?.prefix, 502 502 + suffix: selectorContext?.suffix, 503 503 + }; 453 504 const res = await sendMessage('createAnnotation', { 454 505 url: citeUrl || getPageUrl(), 455 506 title: document.title, 456 507 text, 457 457 - selector: { type: 'TextQuoteSelector', exact: quoteText }, 508 508 + selector, 458 509 tags: composeTags.length > 0 ? composeTags : undefined, 459 510 }); 460 511 ··· 480 531 } 481 532 browser.runtime.onMessage.addListener((message: any) => { 482 533 if (message.type === 'SHOW_INLINE_ANNOTATE' && message.data?.selector?.exact) { 483 483 - showComposeModal(message.data.selector.exact); 534 534 + const exact = message.data.selector.exact as string; 535 535 + showComposeModal(exact, getSelectionContext(exact)); 484 536 } 485 537 if (message.type === 'REFRESH_ANNOTATIONS') { 486 538 fetchAnnotations(0, true); ··· 494 546 if (message.type === 'GET_SELECTION') { 495 547 const selection = window.getSelection(); 496 548 const text = selection?.toString().trim() || ''; 497 497 - return Promise.resolve({ text }); 549 549 + const context = text ? getSelectionContext(text) : {}; 550 550 + return Promise.resolve({ text, ...context }); 498 551 } 499 552 if (message.type === 'GET_DOI') { 500 553 return Promise.resolve({ doiUrl: getPageDOIUrl() }); ··· 507 560 function scrollToText(text: string) { 508 561 if (!text || text.length < 3) return; 509 562 510 510 - if (!cachedMatcher) { 563 563 + if (!cachedMatcher || matcherNeedsRebuild) { 511 564 cachedMatcher = new DOMTextMatcher(); 565 565 + matcherNeedsRebuild = false; 512 566 } 513 567 514 568 const range = cachedMatcher.findRange(text); ··· 668 722 } 669 723 }); 670 724 671 671 - input.addEventListener('input', () => { 672 672 - const val = input.value.toLowerCase().trim(); 673 673 - if (!val) { 674 674 - suggestionsEl.style.display = 'none'; 675 675 - return; 676 676 - } 677 677 - const matches = cachedUserTags.filter((t) => t.includes(val) && !tags.includes(t)); 678 678 - if (matches.length === 0) { 679 679 - suggestionsEl.style.display = 'none'; 680 680 - return; 681 681 - } 682 682 - suggestionsEl.innerHTML = matches 683 683 - .slice(0, 5) 684 684 - .map((t) => `<button class="tag-suggestion-btn">${escapeHtml(t)}</button>`) 685 685 - .join(''); 686 686 - suggestionsEl.style.display = 'flex'; 687 687 - suggestionsEl.querySelectorAll('.tag-suggestion-btn').forEach((btn) => { 688 688 - btn.addEventListener('click', () => addTag(btn.textContent || '')); 689 689 - }); 690 690 - }); 725 725 + input.addEventListener( 726 726 + 'input', 727 727 + debounce(() => { 728 728 + const val = input.value.toLowerCase().trim(); 729 729 + if (!val) { 730 730 + suggestionsEl.style.display = 'none'; 731 731 + return; 732 732 + } 733 733 + const matches = cachedUserTags.filter((t) => t.includes(val) && !tags.includes(t)); 734 734 + if (matches.length === 0) { 735 735 + suggestionsEl.style.display = 'none'; 736 736 + return; 737 737 + } 738 738 + suggestionsEl.innerHTML = matches 739 739 + .slice(0, 5) 740 740 + .map((t) => `<button class="tag-suggestion-btn">${escapeHtml(t)}</button>`) 741 741 + .join(''); 742 742 + suggestionsEl.style.display = 'flex'; 743 743 + suggestionsEl.querySelectorAll('.tag-suggestion-btn').forEach((btn) => { 744 744 + btn.addEventListener('click', () => addTag(btn.textContent || '')); 745 745 + }); 746 746 + }, 120) 747 747 + ); 691 748 692 749 function dismiss() { 693 750 toast.classList.add('toast-out'); ··· 714 771 715 772 setTimeout(() => input.focus(), 50); 716 773 } 774 774 + 775 775 + let isFetching = false; 717 776 718 777 async function fetchAnnotations(retryCount = 0, cacheBust = false) { 719 778 if (!overlayEnabled) { ··· 721 780 return; 722 781 } 723 782 783 783 + if (isFetching && !cacheBust) return; 784 784 + isFetching = true; 785 785 + 724 786 try { 725 787 const pageUrl = getPageUrl(); 726 788 const doiUrl = getPageDOIUrl(); ··· 749 811 if (retryCount < 3) { 750 812 setTimeout(() => fetchAnnotations(retryCount + 1, cacheBust), 1000 * (retryCount + 1)); 751 813 } 814 814 + } finally { 815 815 + isFetching = false; 752 816 } 753 817 } 754 818 ··· 758 822 activeItems = []; 759 823 const rangesByColor: Record<string, Range[]> = {}; 760 824 761 761 - if (!cachedMatcher) { 825 825 + if (matcherNeedsRebuild || !cachedMatcher) { 762 826 cachedMatcher = new DOMTextMatcher(); 827 827 + matcherNeedsRebuild = false; 763 828 } 764 829 const matcher = cachedMatcher; 765 830 766 766 - annotations.forEach((item) => { 767 767 - const selector = item.target?.selector || item.selector; 768 768 - if (!selector?.exact) return; 831 831 + const CHUNK_SIZE = 20; 832 832 + let index = 0; 769 833 770 770 - const range = matcher.findRange(selector.exact); 771 771 - if (range) { 772 772 - activeItems.push({ range, item }); 834 834 + function processChunk() { 835 835 + const end = Math.min(index + CHUNK_SIZE, annotations.length); 836 836 + for (let i = index; i < end; i++) { 837 837 + const item = annotations[i]; 838 838 + const selector = item.target?.selector || item.selector; 839 839 + if (!selector?.exact) continue; 840 840 + 841 841 + const range = matcher.findRange(selector.exact); 842 842 + if (range) { 843 843 + activeItems.push({ range, item }); 844 844 + 845 845 + const isHighlight = (item as any).type === 'Highlight'; 846 846 + const defaultColor = isHighlight ? '#f59e0b' : '#3b82f6'; 847 847 + const color = item.color || defaultColor; 848 848 + if (!rangesByColor[color]) rangesByColor[color] = []; 849 849 + rangesByColor[color].push(range); 850 850 + } 851 851 + } 852 852 + index = end; 773 853 774 774 - const isHighlight = (item as any).type === 'Highlight'; 775 775 - const defaultColor = isHighlight ? '#f59e0b' : '#3b82f6'; 776 776 - const color = item.color || defaultColor; 777 777 - if (!rangesByColor[color]) rangesByColor[color] = []; 778 778 - rangesByColor[color].push(range); 854 854 + if (index < annotations.length) { 855 855 + if ('requestIdleCallback' in window) { 856 856 + requestIdleCallback(processChunk, { timeout: 500 }); 857 857 + } else { 858 858 + setTimeout(processChunk, 0); 859 859 + } 860 860 + } else { 861 861 + commitHighlights(); 779 862 } 780 780 - }); 863 863 + } 781 864 782 782 - if (typeof CSS !== 'undefined' && CSS.highlights) { 783 783 - CSS.highlights.clear(); 784 784 - for (const [color, ranges] of Object.entries(rangesByColor)) { 785 785 - const highlight = new Highlight(...ranges); 786 786 - const safeColor = color.replace(/[^a-zA-Z0-9]/g, ''); 787 787 - const name = `margin-hl-${safeColor}`; 788 788 - CSS.highlights.set(name, highlight); 789 789 - injectHighlightStyle(name, color); 865 865 + function commitHighlights() { 866 866 + if (typeof CSS !== 'undefined' && CSS.highlights) { 867 867 + CSS.highlights.clear(); 868 868 + for (const [color, ranges] of Object.entries(rangesByColor)) { 869 869 + const highlight = new Highlight(...ranges); 870 870 + const safeColor = color.replace(/[^a-zA-Z0-9]/g, ''); 871 871 + const name = `margin-hl-${safeColor}`; 872 872 + CSS.highlights.set(name, highlight); 873 873 + injectHighlightStyle(name, color); 874 874 + } 790 875 } 791 876 } 877 877 + 878 878 + processChunk(); 792 879 } 793 880 794 881 function injectHighlightStyle(name: string, color: string) { 795 882 if (injectedStyles.has(name)) return; 796 883 const style = document.createElement('style'); 797 884 885 885 + const hex = color.replace('#', ''); 886 886 + const r = parseInt(hex.substring(0, 2), 16) || 99; 887 887 + const g = parseInt(hex.substring(2, 4), 16) || 102; 888 888 + const b = parseInt(hex.substring(4, 6), 16) || 241; 889 889 + 798 890 if (isPdfContext()) { 799 799 - const hex = color.replace('#', ''); 800 800 - const r = parseInt(hex.substring(0, 2), 16) || 99; 801 801 - const g = parseInt(hex.substring(2, 4), 16) || 102; 802 802 - const b = parseInt(hex.substring(4, 6), 16) || 241; 803 891 style.textContent = ` 804 892 ::highlight(${name}) { 805 893 background-color: rgba(${r}, ${g}, ${b}, 0.35); ··· 823 911 } 824 912 825 913 let hoverRafId: number | null = null; 914 914 + let hoverIntentTimer: ReturnType<typeof setTimeout> | null = null; 915 915 + let lastHoverX = -1; 916 916 + let lastHoverY = -1; 826 917 827 918 function handleMouseMove(e: MouseEvent) { 828 919 if (!overlayEnabled || !overlayHost) return; 829 920 830 830 - if (hoverRafId) cancelAnimationFrame(hoverRafId); 921 921 + lastHoverX = e.clientX; 922 922 + lastHoverY = e.clientY; 923 923 + 924 924 + if (hoverRafId !== null) { 925 925 + cancelAnimationFrame(hoverRafId); 926 926 + hoverRafId = null; 927 927 + } 928 928 + 831 929 hoverRafId = requestAnimationFrame(() => { 832 832 - processHover(e.clientX, e.clientY, e); 930 930 + hoverRafId = null; 931 931 + if (hoverIntentTimer) clearTimeout(hoverIntentTimer); 932 932 + hoverIntentTimer = setTimeout(() => { 933 933 + hoverIntentTimer = null; 934 934 + processHover(lastHoverX, lastHoverY, e); 935 935 + }, 150); 833 936 }); 834 937 } 938 938 + function getAnnotationsAtPoint( 939 939 + x: number, 940 940 + y: number 941 941 + ): Array<{ range: Range; item: Annotation; rect: DOMRect }> { 942 942 + const results: Array<{ range: Range; item: Annotation; rect: DOMRect }> = []; 835 943 836 836 - function processHover(x: number, y: number, e: MouseEvent) { 837 837 - const foundItems: Array<{ range: Range; item: Annotation; rect: DOMRect }> = []; 838 838 - let firstRange: Range | null = null; 944 944 + let caretRange: Range | null = null; 945 945 + try { 946 946 + if (typeof (document as any).caretPositionFromPoint === 'function') { 947 947 + const pos = (document as any).caretPositionFromPoint(x, y); 948 948 + if (pos) { 949 949 + caretRange = document.createRange(); 950 950 + caretRange.setStart(pos.offsetNode, pos.offset); 951 951 + caretRange.collapse(true); 952 952 + } 953 953 + } else if (typeof (document as any).caretRangeFromPoint === 'function') { 954 954 + caretRange = (document as any).caretRangeFromPoint(x, y); 955 955 + } 956 956 + } catch { 957 957 + /* ignore */ 958 958 + } 839 959 840 960 for (const { range, item } of activeItems) { 841 841 - const rects = range.getClientRects(); 842 842 - for (const rect of rects) { 843 843 - if (x >= rect.left && x <= rect.right && y >= rect.top && y <= rect.bottom) { 844 844 - let container: Node | null = range.commonAncestorContainer; 845 845 - if (container.nodeType === Node.TEXT_NODE) { 846 846 - container = container.parentNode; 961 961 + let hit = false; 962 962 + 963 963 + if (caretRange) { 964 964 + try { 965 965 + const afterStart = range.compareBoundaryPoints(Range.START_TO_START, caretRange) <= 0; 966 966 + const beforeEnd = range.compareBoundaryPoints(Range.END_TO_START, caretRange) >= 0; 967 967 + hit = afterStart && beforeEnd; 968 968 + } catch { 969 969 + /* ignore */ 970 970 + } 971 971 + } 972 972 + 973 973 + if (!hit) { 974 974 + for (const rect of range.getClientRects()) { 975 975 + if (x >= rect.left && x <= rect.right && y >= rect.top && y <= rect.bottom) { 976 976 + hit = true; 977 977 + break; 847 978 } 979 979 + } 980 980 + } 848 981 849 849 - if ( 850 850 - container && 851 851 - ((e.target as Node).contains(container) || container.contains(e.target as Node)) 852 852 - ) { 853 853 - if (!firstRange) firstRange = range; 854 854 - if (!foundItems.some((f) => f.item === item)) { 855 855 - foundItems.push({ range, item, rect }); 856 856 - } 857 857 - } 858 858 - break; 982 982 + if (hit) { 983 983 + const firstRect = range.getClientRects()[0]; 984 984 + if (firstRect && !results.some((r) => r.item === item)) { 985 985 + results.push({ range, item, rect: firstRect }); 859 986 } 860 987 } 861 988 } 989 989 + 990 990 + return results; 991 991 + } 992 992 + 993 993 + function processHover(x: number, y: number, e: MouseEvent) { 994 994 + const target = e.target as HTMLElement; 995 995 + if ( 996 996 + target.closest( 997 997 + 'a[href], button, input, select, textarea, [role="button"], [role="link"], [contenteditable]' 998 998 + ) 999 999 + ) { 1000 1000 + document.body.style.cursor = ''; 1001 1001 + if (hoverIndicator) hoverIndicator.classList.remove('visible'); 1002 1002 + return; 1003 1003 + } 1004 1004 + 1005 1005 + const foundItems = getAnnotationsAtPoint(x, y); 1006 1006 + const firstRange = foundItems[0]?.range ?? null; 862 1007 863 1008 if (foundItems.length > 0 && shadowRoot) { 864 1009 document.body.style.cursor = 'pointer'; ··· 910 1055 const firstRect = firstRange.getClientRects()[0]; 911 1056 const totalWidth = 912 1057 Math.min(uniqueAuthors.length, maxShow + (overflow > 0 ? 1 : 0)) * 18 + 8; 913 913 - const leftPos = firstRect.left - totalWidth; 914 914 - const topPos = firstRect.top + firstRect.height / 2 - 12; 1058 1058 + const indicatorHeight = 28; 1059 1059 + const gap = 4; 1060 1060 + 1061 1061 + let leftPos = firstRect.left - totalWidth; 1062 1062 + leftPos = Math.max(gap, Math.min(leftPos, window.innerWidth - totalWidth - gap)); 1063 1063 + 1064 1064 + const topPos = Math.max( 1065 1065 + gap, 1066 1066 + Math.min( 1067 1067 + firstRect.top + firstRect.height / 2 - indicatorHeight / 2, 1068 1068 + window.innerHeight - indicatorHeight - gap 1069 1069 + ) 1070 1070 + ); 915 1071 916 1072 hoverIndicator.style.left = `${leftPos}px`; 917 1073 hoverIndicator.style.top = `${topPos}px`; ··· 919 1075 } 920 1076 } else { 921 1077 document.body.style.cursor = ''; 922 922 - if (hoverIndicator) { 923 923 - hoverIndicator.classList.remove('visible'); 1078 1078 + if (hoverIndicator && hoverIndicator.classList.contains('visible')) { 1079 1079 + if (hoverIntentTimer) clearTimeout(hoverIntentTimer); 1080 1080 + hoverIntentTimer = setTimeout(() => { 1081 1081 + hoverIntentTimer = null; 1082 1082 + if (hoverIndicator) hoverIndicator.classList.remove('visible'); 1083 1083 + }, 80); 924 1084 } 925 1085 } 926 1086 } ··· 947 1107 composeModal = null; 948 1108 } 949 1109 950 950 - const clickedItems: Annotation[] = []; 951 951 - for (const { range, item } of activeItems) { 952 952 - const rects = range.getClientRects(); 953 953 - for (const rect of rects) { 954 954 - if (x >= rect.left && x <= rect.right && y >= rect.top && y <= rect.bottom) { 955 955 - let container: Node | null = range.commonAncestorContainer; 956 956 - if (container.nodeType === Node.TEXT_NODE) { 957 957 - container = container.parentNode; 958 958 - } 959 959 - 960 960 - if ( 961 961 - container && 962 962 - ((e.target as Node).contains(container) || container.contains(e.target as Node)) 963 963 - ) { 964 964 - if (!clickedItems.includes(item)) { 965 965 - clickedItems.push(item); 966 966 - } 967 967 - } 968 968 - break; 969 969 - } 970 970 - } 971 971 - } 1110 1110 + const clickedItems: Annotation[] = getAnnotationsAtPoint(x, y).map((r) => r.item); 972 1111 973 1112 if (clickedItems.length > 0) { 974 1113 const target = e.target as HTMLElement; 975 975 - if (target.closest('a[href]')) return; 1114 1114 + if ( 1115 1115 + target.closest( 1116 1116 + 'a[href], button, input, select, textarea, [role="button"], [role="link"], [contenteditable]' 1117 1117 + ) 1118 1118 + ) 1119 1119 + return; 976 1120 977 1121 e.preventDefault(); 978 1122 e.stopPropagation(); ··· 1219 1363 let lastPolledUrl = getPageUrl(); 1220 1364 1221 1365 function onUrlChange() { 1222 1222 - lastPolledUrl = getPageUrl(); 1366 1366 + const currentUrl = getPageUrl(); 1367 1367 + if (currentUrl === lastPolledUrl) return; 1368 1368 + lastPolledUrl = currentUrl; 1223 1369 if (typeof CSS !== 'undefined' && CSS.highlights) { 1224 1370 CSS.highlights.clear(); 1225 1371 } ··· 1236 1382 } 1237 1383 1238 1384 window.addEventListener('popstate', onUrlChange); 1385 1385 + window.addEventListener('hashchange', onUrlChange); 1239 1386 1240 1387 const originalPushState = history.pushState; 1241 1388 const originalReplaceState = history.replaceState; ··· 1250 1397 onUrlChange(); 1251 1398 }; 1252 1399 1253 1253 - // Only re-fetch when the URL actually changes (not every 500ms) 1254 1254 - setInterval(() => { 1255 1255 - const currentUrl = getPageUrl(); 1256 1256 - if (currentUrl !== lastPolledUrl) { 1257 1257 - onUrlChange(); 1400 1400 + let domChangeTimeout: ReturnType<typeof setTimeout> | null = null; 1401 1401 + let domChangeCount = 0; 1402 1402 + 1403 1403 + function isMeaningfulMutation(mutations: MutationRecord[]): boolean { 1404 1404 + for (const m of mutations) { 1405 1405 + if (m.type !== 'childList') continue; 1406 1406 + for (const node of [...m.addedNodes, ...m.removedNodes]) { 1407 1407 + if ((node as Element).id === 'margin-overlay-host') continue; 1408 1408 + if (node.nodeType === Node.TEXT_NODE && (node.textContent?.trim().length ?? 0) > 20) 1409 1409 + return true; 1410 1410 + if (node.nodeType === Node.ELEMENT_NODE) { 1411 1411 + const tag = (node as Element).tagName; 1412 1412 + if (['STYLE', 'SCRIPT', 'SVG', 'IMG', 'VIDEO', 'CANVAS'].includes(tag)) continue; 1413 1413 + if ((node as Element).textContent?.trim().length ?? 0 > 20) return true; 1414 1414 + } 1415 1415 + } 1258 1416 } 1259 1259 - }, 500); 1417 1417 + return false; 1418 1418 + } 1260 1419 1261 1261 - let domChangeTimeout: ReturnType<typeof setTimeout> | null = null; 1262 1262 - let domChangeCount = 0; 1263 1420 const observer = new MutationObserver((mutations) => { 1264 1264 - const hasSignificantChange = mutations.some( 1265 1265 - (m) => m.type === 'childList' && (m.addedNodes.length > 3 || m.removedNodes.length > 3) 1266 1266 - ); 1267 1267 - if (hasSignificantChange && overlayEnabled) { 1268 1268 - domChangeCount++; 1269 1269 - if (domChangeTimeout) clearTimeout(domChangeTimeout); 1270 1270 - const delay = Math.min(500 + domChangeCount * 100, 2000); 1271 1271 - domChangeTimeout = setTimeout(() => { 1272 1272 - cachedMatcher = null; 1273 1273 - domChangeCount = 0; 1274 1274 - fetchAnnotations(); 1275 1275 - }, delay); 1276 1276 - } 1421 1421 + if (!overlayEnabled || !isMeaningfulMutation(mutations)) return; 1422 1422 + domChangeCount++; 1423 1423 + if (domChangeTimeout) clearTimeout(domChangeTimeout); 1424 1424 + const delay = Math.min(800 + domChangeCount * 200, 3000); 1425 1425 + domChangeTimeout = setTimeout(() => { 1426 1426 + matcherNeedsRebuild = true; 1427 1427 + domChangeCount = 0; 1428 1428 + fetchAnnotations(); 1429 1429 + }, delay); 1277 1430 }); 1278 1431 observer.observe(document.body || document.documentElement, { 1279 1432 childList: true,

-305

lexicons/at/margin/annotation.json

reviewed

··· 1 1 - { 2 2 - "lexicon": 1, 3 3 - "id": "at.margin.annotation", 4 4 - "revision": 2, 5 5 - "description": "W3C Web Annotation Data Model compliant annotation record for ATProto", 6 6 - "defs": { 7 7 - "main": { 8 8 - "type": "record", 9 9 - "description": "A W3C-compliant web annotation stored on the AT Protocol", 10 10 - "key": "tid", 11 11 - "record": { 12 12 - "type": "object", 13 13 - "required": ["target", "createdAt"], 14 14 - "properties": { 15 15 - "motivation": { 16 16 - "type": "string", 17 17 - "description": "W3C motivation for the annotation", 18 18 - "knownValues": [ 19 19 - "commenting", 20 20 - "highlighting", 21 21 - "bookmarking", 22 22 - "tagging", 23 23 - "describing", 24 24 - "linking", 25 25 - "replying", 26 26 - "editing", 27 27 - "questioning", 28 28 - "assessing" 29 29 - ] 30 30 - }, 31 31 - "body": { 32 32 - "type": "ref", 33 33 - "ref": "#body", 34 34 - "description": "The annotation content (text or reference)" 35 35 - }, 36 36 - "target": { 37 37 - "type": "ref", 38 38 - "ref": "#target", 39 39 - "description": "The resource being annotated with optional selector" 40 40 - }, 41 41 - "tags": { 42 42 - "type": "array", 43 43 - "description": "Tags for categorization", 44 44 - "items": { 45 45 - "type": "string", 46 46 - "maxLength": 64, 47 47 - "maxGraphemes": 32 48 48 - }, 49 49 - "maxLength": 10 50 50 - }, 51 51 - "generator": { 52 52 - "type": "ref", 53 53 - "ref": "#generator", 54 54 - "description": "The client/agent that created this record" 55 55 - }, 56 56 - "rights": { 57 57 - "type": "string", 58 58 - "format": "uri", 59 59 - "description": "License URI (e.g., https://creativecommons.org/licenses/by/4.0/)" 60 60 - }, 61 61 - "labels": { 62 62 - "type": "ref", 63 63 - "ref": "com.atproto.label.defs#selfLabels", 64 64 - "description": "Self-applied content labels for this annotation" 65 65 - }, 66 66 - "createdAt": { 67 67 - "type": "string", 68 68 - "format": "datetime" 69 69 - } 70 70 - } 71 71 - } 72 72 - }, 73 73 - "generator": { 74 74 - "type": "object", 75 75 - "description": "The client/agent that created this record", 76 76 - "properties": { 77 77 - "id": { 78 78 - "type": "string", 79 79 - "format": "uri" 80 80 - }, 81 81 - "name": { 82 82 - "type": "string" 83 83 - }, 84 84 - "homepage": { 85 85 - "type": "string", 86 86 - "format": "uri" 87 87 - } 88 88 - } 89 89 - }, 90 90 - "body": { 91 91 - "type": "object", 92 92 - "description": "Annotation body - the content of the annotation", 93 93 - "properties": { 94 94 - "value": { 95 95 - "type": "string", 96 96 - "maxLength": 10000, 97 97 - "maxGraphemes": 3000, 98 98 - "description": "Text content of the annotation" 99 99 - }, 100 100 - "format": { 101 101 - "type": "string", 102 102 - "description": "MIME type of the body content", 103 103 - "default": "text/plain" 104 104 - }, 105 105 - "language": { 106 106 - "type": "string", 107 107 - "description": "BCP47 language tag" 108 108 - }, 109 109 - "uri": { 110 110 - "type": "string", 111 111 - "format": "uri", 112 112 - "description": "Reference to external body content" 113 113 - } 114 114 - } 115 115 - }, 116 116 - "target": { 117 117 - "type": "object", 118 118 - "description": "W3C SpecificResource - the target with optional selector", 119 119 - "required": ["source"], 120 120 - "properties": { 121 121 - "source": { 122 122 - "type": "string", 123 123 - "format": "uri", 124 124 - "description": "The URL being annotated" 125 125 - }, 126 126 - "sourceHash": { 127 127 - "type": "string", 128 128 - "description": "SHA256 hash of normalized URL for indexing" 129 129 - }, 130 130 - "title": { 131 131 - "type": "string", 132 132 - "maxLength": 500, 133 133 - "description": "Page title at time of annotation" 134 134 - }, 135 135 - "selector": { 136 136 - "type": "union", 137 137 - "description": "Selector to identify the specific segment", 138 138 - "refs": [ 139 139 - "#textQuoteSelector", 140 140 - "#textPositionSelector", 141 141 - "#cssSelector", 142 142 - "#xpathSelector", 143 143 - "#fragmentSelector", 144 144 - "#rangeSelector" 145 145 - ] 146 146 - }, 147 147 - "state": { 148 148 - "type": "ref", 149 149 - "ref": "#timeState", 150 150 - "description": "State of the resource at annotation time" 151 151 - } 152 152 - } 153 153 - }, 154 154 - "textQuoteSelector": { 155 155 - "type": "object", 156 156 - "description": "W3C TextQuoteSelector - select text by quoting it with context", 157 157 - "required": ["exact"], 158 158 - "properties": { 159 159 - "type": { 160 160 - "type": "string", 161 161 - "const": "TextQuoteSelector" 162 162 - }, 163 163 - "exact": { 164 164 - "type": "string", 165 165 - "maxLength": 5000, 166 166 - "maxGraphemes": 1500, 167 167 - "description": "The exact text to match" 168 168 - }, 169 169 - "prefix": { 170 170 - "type": "string", 171 171 - "maxLength": 500, 172 172 - "maxGraphemes": 150, 173 173 - "description": "Text immediately before the selection" 174 174 - }, 175 175 - "suffix": { 176 176 - "type": "string", 177 177 - "maxLength": 500, 178 178 - "maxGraphemes": 150, 179 179 - "description": "Text immediately after the selection" 180 180 - } 181 181 - } 182 182 - }, 183 183 - "textPositionSelector": { 184 184 - "type": "object", 185 185 - "description": "W3C TextPositionSelector - select by character offsets", 186 186 - "required": ["start", "end"], 187 187 - "properties": { 188 188 - "type": { 189 189 - "type": "string", 190 190 - "const": "TextPositionSelector" 191 191 - }, 192 192 - "start": { 193 193 - "type": "integer", 194 194 - "minimum": 0, 195 195 - "description": "Starting character position (0-indexed, inclusive)" 196 196 - }, 197 197 - "end": { 198 198 - "type": "integer", 199 199 - "minimum": 0, 200 200 - "description": "Ending character position (exclusive)" 201 201 - } 202 202 - } 203 203 - }, 204 204 - "cssSelector": { 205 205 - "type": "object", 206 206 - "description": "W3C CssSelector - select DOM elements by CSS selector", 207 207 - "required": ["value"], 208 208 - "properties": { 209 209 - "type": { 210 210 - "type": "string", 211 211 - "const": "CssSelector" 212 212 - }, 213 213 - "value": { 214 214 - "type": "string", 215 215 - "maxLength": 2000, 216 216 - "description": "CSS selector string" 217 217 - } 218 218 - } 219 219 - }, 220 220 - "xpathSelector": { 221 221 - "type": "object", 222 222 - "description": "W3C XPathSelector - select by XPath expression", 223 223 - "required": ["value"], 224 224 - "properties": { 225 225 - "type": { 226 226 - "type": "string", 227 227 - "const": "XPathSelector" 228 228 - }, 229 229 - "value": { 230 230 - "type": "string", 231 231 - "maxLength": 2000, 232 232 - "description": "XPath expression" 233 233 - } 234 234 - } 235 235 - }, 236 236 - "fragmentSelector": { 237 237 - "type": "object", 238 238 - "description": "W3C FragmentSelector - select by URI fragment", 239 239 - "required": ["value"], 240 240 - "properties": { 241 241 - "type": { 242 242 - "type": "string", 243 243 - "const": "FragmentSelector" 244 244 - }, 245 245 - "value": { 246 246 - "type": "string", 247 247 - "maxLength": 1000, 248 248 - "description": "Fragment identifier value" 249 249 - }, 250 250 - "conformsTo": { 251 251 - "type": "string", 252 252 - "format": "uri", 253 253 - "description": "Specification the fragment conforms to" 254 254 - } 255 255 - } 256 256 - }, 257 257 - "rangeSelector": { 258 258 - "type": "object", 259 259 - "description": "W3C RangeSelector - select range between two selectors", 260 260 - "required": ["startSelector", "endSelector"], 261 261 - "properties": { 262 262 - "type": { 263 263 - "type": "string", 264 264 - "const": "RangeSelector" 265 265 - }, 266 266 - "startSelector": { 267 267 - "type": "union", 268 268 - "description": "Selector for range start", 269 269 - "refs": [ 270 270 - "#textQuoteSelector", 271 271 - "#textPositionSelector", 272 272 - "#cssSelector", 273 273 - "#xpathSelector" 274 274 - ] 275 275 - }, 276 276 - "endSelector": { 277 277 - "type": "union", 278 278 - "description": "Selector for range end", 279 279 - "refs": [ 280 280 - "#textQuoteSelector", 281 281 - "#textPositionSelector", 282 282 - "#cssSelector", 283 283 - "#xpathSelector" 284 284 - ] 285 285 - } 286 286 - } 287 287 - }, 288 288 - "timeState": { 289 289 - "type": "object", 290 290 - "description": "W3C TimeState - record when content was captured", 291 291 - "properties": { 292 292 - "sourceDate": { 293 293 - "type": "string", 294 294 - "format": "datetime", 295 295 - "description": "When the source was accessed" 296 296 - }, 297 297 - "cached": { 298 298 - "type": "string", 299 299 - "format": "uri", 300 300 - "description": "URL to cached/archived version" 301 301 - } 302 302 - } 303 303 - } 304 304 - } 305 305 - }

+2 -4

lexicons/at/margin/authFull.json

reviewed

··· 6 6 "type": "permission-set", 7 7 "title": "Margin", 8 8 "title:langs": {}, 9 9 - "detail": "Full access to Margin features including annotations, highlights, bookmarks, and collections.", 9 9 + "detail": "Full access to Margin features including notes, replies, likes, and collections.", 10 10 "detail:langs": {}, 11 11 "permissions": [ 12 12 { ··· 14 14 "resource": "repo", 15 15 "action": ["create", "update", "delete"], 16 16 "collection": [ 17 17 - "at.margin.annotation", 18 18 - "at.margin.highlight", 19 19 - "at.margin.bookmark", 17 17 + "at.margin.note", 20 18 "at.margin.reply", 21 19 "at.margin.like", 22 20 "at.margin.collection",

-79

lexicons/at/margin/bookmark.json

reviewed

··· 1 1 - { 2 2 - "lexicon": 1, 3 3 - "id": "at.margin.bookmark", 4 4 - "description": "A bookmark record - save URL for later", 5 5 - "defs": { 6 6 - "main": { 7 7 - "type": "record", 8 8 - "description": "A bookmarked URL (motivation: bookmarking)", 9 9 - "key": "tid", 10 10 - "record": { 11 11 - "type": "object", 12 12 - "required": ["source", "createdAt"], 13 13 - "properties": { 14 14 - "source": { 15 15 - "type": "string", 16 16 - "format": "uri", 17 17 - "description": "The bookmarked URL" 18 18 - }, 19 19 - "sourceHash": { 20 20 - "type": "string", 21 21 - "description": "SHA256 hash of normalized URL for indexing" 22 22 - }, 23 23 - "title": { 24 24 - "type": "string", 25 25 - "maxLength": 500, 26 26 - "description": "Page title" 27 27 - }, 28 28 - "description": { 29 29 - "type": "string", 30 30 - "maxLength": 1000, 31 31 - "maxGraphemes": 300, 32 32 - "description": "Optional description/note" 33 33 - }, 34 34 - "tags": { 35 35 - "type": "array", 36 36 - "description": "Tags for categorization", 37 37 - "items": { 38 38 - "type": "string", 39 39 - "maxLength": 64, 40 40 - "maxGraphemes": 32 41 41 - }, 42 42 - "maxLength": 10 43 43 - }, 44 44 - "generator": { 45 45 - "type": "object", 46 46 - "description": "The client/agent that created this record", 47 47 - "properties": { 48 48 - "id": { 49 49 - "type": "string", 50 50 - "format": "uri" 51 51 - }, 52 52 - "name": { 53 53 - "type": "string" 54 54 - }, 55 55 - "homepage": { 56 56 - "type": "string", 57 57 - "format": "uri" 58 58 - } 59 59 - } 60 60 - }, 61 61 - "rights": { 62 62 - "type": "string", 63 63 - "format": "uri", 64 64 - "description": "License URI (e.g., https://creativecommons.org/licenses/by/4.0/)" 65 65 - }, 66 66 - "labels": { 67 67 - "type": "ref", 68 68 - "ref": "com.atproto.label.defs#selfLabels", 69 69 - "description": "Self-applied content labels for this bookmark" 70 70 - }, 71 71 - "createdAt": { 72 72 - "type": "string", 73 73 - "format": "datetime" 74 74 - } 75 75 - } 76 76 - } 77 77 - } 78 78 - } 79 79 - }

-69

lexicons/at/margin/highlight.json

reviewed

··· 1 1 - { 2 2 - "lexicon": 1, 3 3 - "id": "at.margin.highlight", 4 4 - "description": "A lightweight highlight record - annotation without body text", 5 5 - "defs": { 6 6 - "main": { 7 7 - "type": "record", 8 8 - "description": "A highlight on a web page (motivation: highlighting)", 9 9 - "key": "tid", 10 10 - "record": { 11 11 - "type": "object", 12 12 - "required": ["target", "createdAt"], 13 13 - "properties": { 14 14 - "target": { 15 15 - "type": "ref", 16 16 - "ref": "at.margin.annotation#target", 17 17 - "description": "The resource and segment being highlighted" 18 18 - }, 19 19 - "color": { 20 20 - "type": "string", 21 21 - "description": "Highlight color (hex or named)", 22 22 - "maxLength": 20 23 23 - }, 24 24 - "tags": { 25 25 - "type": "array", 26 26 - "description": "Tags for categorization", 27 27 - "items": { 28 28 - "type": "string", 29 29 - "maxLength": 64, 30 30 - "maxGraphemes": 32 31 31 - }, 32 32 - "maxLength": 10 33 33 - }, 34 34 - "generator": { 35 35 - "type": "object", 36 36 - "description": "The client/agent that created this record", 37 37 - "properties": { 38 38 - "id": { 39 39 - "type": "string", 40 40 - "format": "uri" 41 41 - }, 42 42 - "name": { 43 43 - "type": "string" 44 44 - }, 45 45 - "homepage": { 46 46 - "type": "string", 47 47 - "format": "uri" 48 48 - } 49 49 - } 50 50 - }, 51 51 - "rights": { 52 52 - "type": "string", 53 53 - "format": "uri", 54 54 - "description": "License URI (e.g., https://creativecommons.org/licenses/by/4.0/)" 55 55 - }, 56 56 - "labels": { 57 57 - "type": "ref", 58 58 - "ref": "com.atproto.label.defs#selfLabels", 59 59 - "description": "Self-applied content labels for this highlight" 60 60 - }, 61 61 - "createdAt": { 62 62 - "type": "string", 63 63 - "format": "datetime" 64 64 - } 65 65 - } 66 66 - } 67 67 - } 68 68 - } 69 69 - }

+235

lexicons/at/margin/note.json

reviewed

··· 1 1 + { 2 2 + "lexicon": 1, 3 3 + "id": "at.margin.note", 4 4 + "revision": 3, 5 5 + "description": "W3C Web Annotation Data Model compliant unified note record for ATProto", 6 6 + "defs": { 7 7 + "main": { 8 8 + "type": "record", 9 9 + "description": "A W3C-compliant web annotation stored on the AT Protocol", 10 10 + "key": "tid", 11 11 + "record": { 12 12 + "type": "object", 13 13 + "required": ["motivation", "target", "createdAt"], 14 14 + "properties": { 15 15 + "motivation": { 16 16 + "type": "string", 17 17 + "description": "W3C motivation for the annotation", 18 18 + "knownValues": [ 19 19 + "commenting", 20 20 + "highlighting", 21 21 + "bookmarking", 22 22 + "tagging", 23 23 + "describing", 24 24 + "linking", 25 25 + "replying", 26 26 + "editing", 27 27 + "questioning", 28 28 + "assessing" 29 29 + ] 30 30 + }, 31 31 + "color": { 32 32 + "type": "string", 33 33 + "description": "Highlight color tint", 34 34 + "maxLength": 20 35 35 + }, 36 36 + "body": { 37 37 + "type": "ref", 38 38 + "ref": "#body", 39 39 + "description": "The annotation content (text or reference). For bookmarks, use body.value for the description." 40 40 + }, 41 41 + "target": { 42 42 + "type": "ref", 43 43 + "ref": "#target", 44 44 + "description": "The resource being annotated with optional selector" 45 45 + }, 46 46 + "tags": { 47 47 + "type": "array", 48 48 + "description": "Tags for categorization", 49 49 + "items": { 50 50 + "type": "string", 51 51 + "maxLength": 64, 52 52 + "maxGraphemes": 32 53 53 + }, 54 54 + "maxLength": 10 55 55 + }, 56 56 + "facets": { 57 57 + "type": "array", 58 58 + "description": "Rich text facets (e.g. mentions, links)", 59 59 + "items": { 60 60 + "type": "ref", 61 61 + "ref": "app.bsky.richtext.facet" 62 62 + } 63 63 + }, 64 64 + "generator": { 65 65 + "type": "ref", 66 66 + "ref": "#generator", 67 67 + "description": "The client/agent that created this record" 68 68 + }, 69 69 + "rights": { 70 70 + "type": "string", 71 71 + "format": "uri", 72 72 + "description": "License URI (e.g., https://creativecommons.org/licenses/by/4.0/)" 73 73 + }, 74 74 + "labels": { 75 75 + "type": "ref", 76 76 + "ref": "com.atproto.label.defs#selfLabels", 77 77 + "description": "Self-applied content labels for this annotation" 78 78 + }, 79 79 + "createdAt": { 80 80 + "type": "string", 81 81 + "format": "datetime" 82 82 + }, 83 83 + "modifiedAt": { 84 84 + "type": "string", 85 85 + "format": "datetime", 86 86 + "description": "When this record was last modified" 87 87 + } 88 88 + } 89 89 + } 90 90 + }, 91 91 + "generator": { 92 92 + "type": "object", 93 93 + "description": "The client/agent that created this record", 94 94 + "properties": { 95 95 + "id": { 96 96 + "type": "string", 97 97 + "format": "uri" 98 98 + }, 99 99 + "name": { 100 100 + "type": "string" 101 101 + }, 102 102 + "homepage": { 103 103 + "type": "string", 104 104 + "format": "uri" 105 105 + } 106 106 + } 107 107 + }, 108 108 + "body": { 109 109 + "type": "object", 110 110 + "description": "Annotation body - the content of the annotation", 111 111 + "properties": { 112 112 + "value": { 113 113 + "type": "string", 114 114 + "maxLength": 10000, 115 115 + "maxGraphemes": 3000, 116 116 + "description": "Text content of the annotation. For bookmarks, this is the description." 117 117 + }, 118 118 + "format": { 119 119 + "type": "string", 120 120 + "description": "MIME type of the body content", 121 121 + "default": "text/plain" 122 122 + }, 123 123 + "uri": { 124 124 + "type": "string", 125 125 + "format": "uri", 126 126 + "description": "Reference to external body content" 127 127 + } 128 128 + } 129 129 + }, 130 130 + "target": { 131 131 + "type": "object", 132 132 + "description": "W3C SpecificResource - the target with optional selector", 133 133 + "required": ["source"], 134 134 + "properties": { 135 135 + "source": { 136 136 + "type": "string", 137 137 + "format": "uri", 138 138 + "description": "The URL being annotated" 139 139 + }, 140 140 + "sourceHash": { 141 141 + "type": "string", 142 142 + "description": "SHA256 hash of normalized URL for indexing" 143 143 + }, 144 144 + "title": { 145 145 + "type": "string", 146 146 + "maxLength": 500, 147 147 + "description": "Page title at time of annotation" 148 148 + }, 149 149 + "selector": { 150 150 + "type": "ref", 151 151 + "ref": "#selector", 152 152 + "description": "W3C Selector to identify the annotated segment. Uses W3C 'type' field (not ATProto $type) per the Web Annotation Data Model." 153 153 + }, 154 154 + "state": { 155 155 + "type": "ref", 156 156 + "ref": "#timeState", 157 157 + "description": "State of the resource at annotation time" 158 158 + } 159 159 + } 160 160 + }, 161 161 + "selector": { 162 162 + "type": "object", 163 163 + "description": "W3C Web Annotation Selector. The 'type' field discriminates the selector kind using W3C type names (e.g. TextQuoteSelector). This follows W3C conventions, not ATProto union $type.", 164 164 + "required": ["type"], 165 165 + "properties": { 166 166 + "type": { 167 167 + "type": "string", 168 168 + "description": "W3C selector type identifier", 169 169 + "knownValues": [ 170 170 + "TextQuoteSelector", 171 171 + "TextPositionSelector", 172 172 + "CssSelector", 173 173 + "XPathSelector", 174 174 + "FragmentSelector", 175 175 + "RangeSelector" 176 176 + ] 177 177 + }, 178 178 + "exact": { 179 179 + "type": "string", 180 180 + "maxLength": 5000, 181 181 + "maxGraphemes": 1500, 182 182 + "description": "TextQuoteSelector: the exact text being selected" 183 183 + }, 184 184 + "prefix": { 185 185 + "type": "string", 186 186 + "maxLength": 500, 187 187 + "maxGraphemes": 150, 188 188 + "description": "TextQuoteSelector: text immediately before the selection, for disambiguation" 189 189 + }, 190 190 + "suffix": { 191 191 + "type": "string", 192 192 + "maxLength": 500, 193 193 + "maxGraphemes": 150, 194 194 + "description": "TextQuoteSelector: text immediately after the selection, for disambiguation" 195 195 + }, 196 196 + "start": { 197 197 + "type": "integer", 198 198 + "minimum": 0, 199 199 + "description": "TextPositionSelector: start character offset (inclusive)" 200 200 + }, 201 201 + "end": { 202 202 + "type": "integer", 203 203 + "minimum": 0, 204 204 + "description": "TextPositionSelector: end character offset (exclusive)" 205 205 + }, 206 206 + "value": { 207 207 + "type": "string", 208 208 + "maxLength": 2000, 209 209 + "description": "CssSelector/XPathSelector/FragmentSelector: the selector expression or fragment value" 210 210 + }, 211 211 + "conformsTo": { 212 212 + "type": "string", 213 213 + "format": "uri", 214 214 + "description": "FragmentSelector: URI of the specification the fragment conforms to" 215 215 + } 216 216 + } 217 217 + }, 218 218 + "timeState": { 219 219 + "type": "object", 220 220 + "description": "W3C TimeState - record when content was captured", 221 221 + "properties": { 222 222 + "sourceDate": { 223 223 + "type": "string", 224 224 + "format": "datetime", 225 225 + "description": "When the source was accessed" 226 226 + }, 227 227 + "cached": { 228 228 + "type": "string", 229 229 + "format": "uri", 230 230 + "description": "URL to cached/archived version" 231 231 + } 232 232 + } 233 233 + } 234 234 + } 235 235 + }

+5

lexicons/at/margin/preferences.json

reviewed

··· 44 44 "disableExternalLinkWarning": { 45 45 "type": "boolean", 46 46 "description": "If true, do not show the confirmation modal when opening external links." 47 47 + }, 48 48 + "enableCommunityBookmarks": { 49 49 + "type": "boolean", 50 50 + "description": "If true, dual-write bookmarks to the standard for ATProto interop.", 51 51 + "default": false 47 52 } 48 53 } 49 54 }

+9

web/astro.config.mjs

reviewed

··· 3 3 import react from "@astrojs/react"; 4 4 import tailwind from "@astrojs/tailwind"; 5 5 import node from "@astrojs/node"; 6 6 + import { fileURLToPath } from "url"; 7 7 + import { dirname, resolve } from "path"; 8 8 + 9 9 + const __dirname = dirname(fileURLToPath(import.meta.url)); 6 10 7 11 const API_PORT = process.env.API_PORT || 8081; 8 12 ··· 17 21 defaultStrategy: "viewport", 18 22 }, 19 23 vite: { 24 24 + resolve: { 25 25 + alias: { 26 26 + "@": resolve(__dirname, "src"), 27 27 + }, 28 28 + }, 20 29 ssr: { 21 30 external: ["@resvg/resvg-js"], 22 31 },

+2

web/src/api/client.ts

reviewed

··· 1101 1101 subscribedLabelers?: LabelerSubscription[]; 1102 1102 labelPreferences?: LabelPreference[]; 1103 1103 disableExternalLinkWarning?: boolean; 1104 1104 + enableCommunityBookmarks?: boolean; 1104 1105 } 1105 1106 1106 1107 export async function getPreferences(): Promise<PreferencesResponse> { ··· 1121 1122 subscribedLabelers?: LabelerSubscription[]; 1122 1123 labelPreferences?: LabelPreference[]; 1123 1124 disableExternalLinkWarning?: boolean; 1125 1125 + enableCommunityBookmarks?: boolean; 1124 1126 }): Promise<boolean> { 1125 1127 try { 1126 1128 const res = await apiRequest("/api/preferences", {

+34 -2

web/src/components/common/Card.tsx

reviewed

··· 19 19 Tag, 20 20 Send, 21 21 X, 22 22 + Bookmark, 22 23 } from "lucide-react"; 23 24 import ShareMenu from "../modals/ShareMenu"; 24 25 import AddToCollectionModal from "../modals/AddToCollectionModal"; ··· 47 48 import { Avatar } from "../ui"; 48 49 import CollectionIcon from "./CollectionIcon"; 49 50 import ProfileHoverCard from "./ProfileHoverCard"; 51 51 + import { analytics } from "../../lib/analytics"; 50 52 51 53 const LABEL_DESCRIPTIONS: Record<string, string> = { 52 54 sexual: "Sexual Content", ··· 172 174 const isSemble = 173 175 item.uri?.includes("network.cosmik") || item.uri?.includes("semble"); 174 176 177 177 + const isCommunityBookmark = item.uri?.includes( 178 178 + "community.lexicon.bookmarks.bookmark", 179 179 + ); 180 180 + 175 181 const safeUrlHostname = (url: string | null | undefined) => { 176 182 if (!url) return null; 177 183 try { ··· 212 218 if (!success) { 213 219 setLiked(prev.liked); 214 220 setLikes(prev.likes); 221 221 + } else { 222 222 + analytics.capture("item_liked", { 223 223 + type, 224 224 + action: liked ? "unlike" : "like", 225 225 + }); 215 226 } 216 227 }; 217 228 218 229 const handleDelete = async () => { 219 230 if (window.confirm("Delete this item?")) { 220 231 const success = await deleteItem(item.uri, type); 221 221 - if (success && onDelete) onDelete(item.uri); 232 232 + if (success && onDelete) { 233 233 + analytics.capture("item_deleted", { type }); 234 234 + onDelete(item.uri); 235 235 + } 222 236 } 223 237 }; 224 238 ··· 479 493 </span> 480 494 ); 481 495 })()} 496 496 + 497 497 + {isCommunityBookmark && ( 498 498 + <span className="relative inline-flex items-center"> 499 499 + <span className="text-surface-300 dark:text-surface-600"> 500 500 + · 501 501 + </span> 502 502 + <span className="group/cb relative inline-flex items-center ml-1"> 503 503 + <Bookmark 504 504 + size={12} 505 505 + className="text-surface-400 dark:text-surface-500 fill-current" 506 506 + /> 507 507 + <span className="pointer-events-none absolute bottom-full left-1/2 -translate-x-1/2 mb-2 px-2.5 py-1 rounded-lg bg-surface-800 dark:bg-surface-700 text-white text-[11px] font-medium whitespace-nowrap opacity-0 group-hover/cb:opacity-100 transition-opacity shadow-lg"> 508 508 + Community bookmark 509 509 + <span className="absolute top-full left-1/2 -translate-x-1/2 -mt-px border-4 border-transparent border-t-surface-800 dark:border-t-surface-700" /> 510 510 + </span> 511 511 + </span> 512 512 + </span> 513 513 + )} 482 514 </div> 483 515 484 516 {pageUrl && !isBookmark && !(contentWarning && !contentRevealed) && ( ··· 638 670 const url = `${pageUrl}#:~:text=${sel.prefix ? encodeURIComponent(sel.prefix) + "-," : ""}${encodeURIComponent(sel.exact)}${sel.suffix ? ",-" + encodeURIComponent(sel.suffix) : ""}`; 639 671 handleExternalClick(e, url); 640 672 }} 641 641 - className="block" 673 673 + className="block break-words" 642 674 > 643 675 "{item.target?.selector?.exact}" 644 676 </a>

+13

web/src/components/feed/Composer.tsx

reviewed

··· 9 9 import type { Selector, ContentLabelValue } from "../../types"; 10 10 import { X, ShieldAlert } from "lucide-react"; 11 11 import TagInput from "../ui/TagInput"; 12 12 + import { analytics } from "../../lib/analytics"; 12 13 13 14 const SELF_LABEL_OPTIONS: { value: ContentLabelValue; label: string }[] = [ 14 15 { value: "sexual", label: "Sexual" }, ··· 99 100 tags: tagList, 100 101 labels: selfLabels.length > 0 ? selfLabels : undefined, 101 102 }); 103 103 + analytics.capture("highlight_created", { 104 104 + url, 105 105 + tag_count: tagList.length, 106 106 + has_labels: selfLabels.length > 0, 107 107 + }); 102 108 } else { 103 109 await createAnnotation({ 104 110 url, ··· 107 113 tags: tagList, 108 114 labels: selfLabels.length > 0 ? selfLabels : undefined, 109 115 }); 116 116 + analytics.capture("annotation_created", { 117 117 + url, 118 118 + has_quote: !!finalSelector, 119 119 + tag_count: tagList.length, 120 120 + has_labels: selfLabels.length > 0, 121 121 + }); 110 122 } 111 123 112 124 setText(""); ··· 115 127 setSelector(null); 116 128 if (onSuccess) onSuccess(); 117 129 } catch (err) { 130 130 + analytics.captureException(err); 118 131 setError( 119 132 (err instanceof Error ? err.message : "Unknown error") || 120 133 "Failed to post",

+2 -2

web/src/components/feed/ReplyList.tsx

reviewed

··· 108 108 </div> 109 109 <p 110 110 className={clsx( 111 111 - "text-surface-800 dark:text-surface-200 whitespace-pre-wrap leading-relaxed", 111 111 + "text-surface-800 dark:text-surface-200 whitespace-pre-wrap break-words leading-relaxed", 112 112 depth > 0 ? "text-sm" : "text-sm", 113 113 )} 114 114 > ··· 147 147 : ""} 148 148 </span> 149 149 </div> 150 150 - <p className="text-surface-800 dark:text-surface-200 text-sm pl-9 mb-2 whitespace-pre-wrap"> 150 150 + <p className="text-surface-800 dark:text-surface-200 text-sm pl-9 mb-2 whitespace-pre-wrap break-words"> 151 151 {reply.text || reply.body?.value} 152 152 </p> 153 153 <div className="flex items-center justify-end gap-2 pl-9">

+2

web/src/components/modals/AddToCollectionModal.tsx

reviewed

··· 14 14 import { useStore } from "@nanostores/react"; 15 15 import { $user } from "../../store/auth"; 16 16 import { $theme } from "../../store/theme"; 17 17 + import { analytics } from "../../lib/analytics"; 17 18 import { 18 19 getCollections, 19 20 addCollectionItem, ··· 88 89 setAddingTo(collectionUri); 89 90 await addCollectionItem(collectionUri, annotationUri); 90 91 setAddedTo((prev) => new Set([...prev, collectionUri])); 92 92 + analytics.capture("item_added_to_collection"); 91 93 } catch (err) { 92 94 console.error(err); 93 95 setError("Failed to add to collection");

+11

web/src/components/modals/ShareMenu.tsx

reviewed

··· 14 14 CatskyIcon, 15 15 DeerIcon, 16 16 } from "../common/Icons"; 17 17 + import { analytics } from "../../lib/analytics"; 17 18 18 19 const SembleLogo = () => ( 19 20 <img src="/semble-logo.svg" alt="Semble" className="w-4 h-4 opacity-90" /> ··· 84 85 try { 85 86 await navigator.clipboard.writeText(textToCopy); 86 87 setCopied(key); 88 88 + analytics.capture("item_shared", { 89 89 + method: "copy_link", 90 90 + destination: key, 91 91 + item_type: type, 92 92 + }); 87 93 setTimeout(() => { 88 94 setCopied(null); 89 95 setIsOpen(false); ··· 98 104 ? `${text.substring(0, 200)}...\n\n${shareUrl}` 99 105 : shareUrl; 100 106 const composeUrl = `https://${domain}/intent/compose?text=${encodeURIComponent(composeText)}`; 107 107 + analytics.capture("item_shared", { 108 108 + method: "social_app", 109 109 + destination: domain, 110 110 + item_type: type, 111 111 + }); 101 112 window.open(composeUrl, "_blank"); 102 113 setIsOpen(false); 103 114 };

+5

web/src/components/modals/SignUpModal.tsx

reviewed

··· 8 8 MarginIcon, 9 9 } from "../common/Icons"; 10 10 import { startSignup } from "../../api/client"; 11 11 + import { analytics } from "../../lib/analytics"; 11 12 12 13 interface Provider { 13 14 id: string; ··· 169 170 setError(null); 170 171 171 172 try { 173 173 + analytics.capture("signup_initiated", { provider: provider.id }); 172 174 const result = await startSignup(provider.service); 173 175 if (result.authorizationUrl) { 174 176 window.location.assign(result.authorizationUrl); 175 177 } 176 178 } catch (err) { 177 179 console.error(err); 180 180 + analytics.captureException(err); 178 181 setError("Could not connect to this provider. Please try again."); 179 182 setLoading(false); 180 183 } ··· 193 196 } 194 197 195 198 try { 199 199 + analytics.capture("signup_initiated", { provider: "custom" }); 196 200 const result = await startSignup(serviceUrl); 197 201 if (result.authorizationUrl) { 198 202 const url = new URL(result.authorizationUrl); ··· 202 206 } 203 207 } catch (err) { 204 208 console.error(err); 209 209 + analytics.captureException(err); 205 210 setError("Could not connect to this PDS. Please check the URL."); 206 211 setLoading(false); 207 212 }

+13

web/src/components/posthog.astro

reviewed

··· 1 1 + <script is:inline define:vars={{ apiKey: import.meta.env.POSTHOG_PROJECT_TOKEN, apiHost: import.meta.env.POSTHOG_HOST, uiHost: import.meta.env.POSTHOG_UI_HOST }}> 2 2 + if (!window.__posthog_initialized) { 3 3 + window.__posthog_initialized = true; 4 4 + !function(t,e){var o,n,p,r;e.__SV||(window.posthog=e,e._i=[],e.init=function(i,s,a){function g(t,e){var o=e.split(".");2==o.length&&(t=t[o[0]],e=o[1]),t[e]=function(){t.push([e].concat(Array.prototype.slice.call(arguments,0)))}}(p=t.createElement("script")).type="text/javascript",p.crossOrigin="anonymous",p.async=!0,p.src=s.api_host+"/static/array.js",(r=t.getElementsByTagName("script")[0]).parentNode.insertBefore(p,r);var u=e;for(void 0!==a?u=e[a]=[]:a="posthog",u.people=u.people||[],u.toString=function(t){var e="posthog";return"posthog"!==a&&(e+="."+a),t||(e+=" (stub)"),e},u.people.toString=function(){return u.toString(1)+".people (stub)"},o="capture identify alias people.set people.set_once set_config register register_once unregister opt_out_capturing has_opted_out_capturing opt_in_capturing reset isFeatureEnabled onFeatureFlags getFeatureFlag getFeatureFlagPayload reloadFeatureFlags group updateEarlyAccessFeatureEnrollment getEarlyAccessFeatures getActiveMatchingSurveys getSurveys getNextSurveyStep onSessionId".split(" "),n=0;n<o.length;n++)g(u,o[n]);e._i.push([i,s,a])},e.__SV=1)}(document,window.posthog||[]); 5 5 + posthog.init(apiKey || '', { 6 6 + api_host: apiHost, 7 7 + ui_host: uiHost, 8 8 + defaults: '2026-01-30', 9 9 + person_profiles: 'identified_only', 10 10 + capture_pageview: 'history_change' 11 11 + }) 12 12 + } 13 13 + </script>

+5

web/src/env.d.ts

reviewed

··· 5 5 user: import("./types").UserProfile | null; 6 6 } 7 7 } 8 8 + 9 9 + interface Window { 10 10 + __posthog_initialized?: boolean; 11 11 + posthog?: import("posthog-js").PostHog; 12 12 + }

+2

web/src/layouts/BaseLayout.astro

reviewed

··· 1 1 --- 2 2 import { ClientRouter } from 'astro:transitions'; 3 3 import '../styles/global.css'; 4 4 + import PostHog from '../components/posthog.astro'; 4 5 5 6 interface Props { 6 7 title?: string; ··· 39 40 <title>{title}</title> 40 41 41 42 <ClientRouter /> 43 43 + <PostHog /> 42 44 43 45 <script is:inline> 44 46 (function() {

+114

web/src/lib/analytics.ts

reviewed

··· 1 1 + export type AnalyticsEvents = { 2 2 + login_initiated: { handle: string }; 3 3 + login_success: { handle: string; pds?: string }; 4 4 + signup_initiated: { provider: string }; 5 5 + user_logged_out: Record<string, never>; 6 6 + 7 7 + annotation_created: { 8 8 + url: string; 9 9 + has_quote: boolean; 10 10 + tag_count: number; 11 11 + has_labels: boolean; 12 12 + source?: "web" | "extension"; 13 13 + }; 14 14 + highlight_created: { 15 15 + url: string; 16 16 + tag_count: number; 17 17 + has_color: boolean; 18 18 + has_labels: boolean; 19 19 + source?: "web" | "extension"; 20 20 + }; 21 21 + bookmark_created: { 22 22 + url: string; 23 23 + tag_count: number; 24 24 + source?: "web" | "extension"; 25 25 + }; 26 26 + reply_created: { parent_uri: string; root_uri: string }; 27 27 + 28 28 + item_liked: { 29 29 + action: "like" | "unlike"; 30 30 + type: "annotation" | "highlight" | "bookmark"; 31 31 + }; 32 32 + item_deleted: { type: "annotation" | "highlight" | "bookmark" }; 33 33 + item_shared: { 34 34 + method: "copy" | "bluesky" | "twitter" | "mastodon" | "email"; 35 35 + item_type?: string; 36 36 + }; 37 37 + item_added_to_collection: Record<string, never>; 38 38 + 39 39 + collection_created: { name: string }; 40 40 + collection_deleted: Record<string, never>; 41 41 + 42 42 + extension_installed: { version: string; browser: string }; 43 43 + extension_connected: { did: string }; 44 44 + popup_opened: { authenticated: boolean }; 45 45 + extension_tab_switched: { tab: string }; 46 46 + 47 47 + highlights_imported: { total: number; completed: number; failed: number }; 48 48 + 49 49 + search_performed: { query: string }; 50 50 + 51 51 + api_key_created: Record<string, never>; 52 52 + theme_changed: { theme: string }; 53 53 + }; 54 54 + 55 55 + function getPostHog() { 56 56 + if (typeof window === "undefined") return null; 57 57 + return window.posthog ?? null; 58 58 + } 59 59 + 60 60 + export const analytics = { 61 61 + capture<E extends keyof AnalyticsEvents>( 62 62 + event: E, 63 63 + properties?: AnalyticsEvents[E], 64 64 + ): void { 65 65 + try { 66 66 + getPostHog()?.capture( 67 67 + event as string, 68 68 + properties as Record<string, unknown>, 69 69 + ); 70 70 + } catch { 71 71 + // ignore 72 72 + } 73 73 + }, 74 74 + 75 75 + identify( 76 76 + did: string, 77 77 + properties: { handle: string; displayName?: string }, 78 78 + ): void { 79 79 + try { 80 80 + getPostHog()?.identify(did, { 81 81 + handle: properties.handle, 82 82 + display_name: properties.displayName ?? undefined, 83 83 + $set_once: { first_seen_at: new Date().toISOString() }, 84 84 + }); 85 85 + } catch { 86 86 + // noop 87 87 + } 88 88 + }, 89 89 + 90 90 + reset(): void { 91 91 + try { 92 92 + getPostHog()?.reset(); 93 93 + } catch { 94 94 + // noop 95 95 + } 96 96 + }, 97 97 + 98 98 + captureException(error: unknown, properties?: Record<string, unknown>): void { 99 99 + try { 100 100 + const ph = getPostHog(); 101 101 + if (!ph) return; 102 102 + if (typeof ph.captureException === "function") { 103 103 + ph.captureException(error, properties); 104 104 + } else { 105 105 + ph.capture("$exception", { 106 106 + message: error instanceof Error ? error.message : String(error), 107 107 + ...properties, 108 108 + }); 109 109 + } 110 110 + } catch { 111 111 + // noop 112 112 + } 113 113 + }, 114 114 + };

+6 -1

web/src/middleware.ts

reviewed

··· 6 6 const API_PORT = process.env.API_PORT || 8081; 7 7 const API_URL = process.env.API_URL || `http://localhost:${API_PORT}`; 8 8 9 9 - const PROXY_PATHS = ["/api/", "/auth/", "/client-metadata.json", "/jwks.json"]; 9 9 + const PROXY_PATHS = [ 10 10 + "/api/", 11 11 + "/auth/", 12 12 + "/oauth-client-metadata.json", 13 13 + "/jwks.json", 14 14 + ]; 10 15 11 16 const CORS_HEADERS = { 12 17 "Access-Control-Allow-Methods": "GET, POST, PUT, DELETE, OPTIONS",

+63 -47

web/src/pages/privacy.astro

reviewed

··· 11 11 12 12 <div class="prose prose-surface dark:prose-invert max-w-none"> 13 13 <h1 class="font-display font-bold text-3xl mb-2 text-surface-900 dark:text-white">Privacy Policy</h1> 14 14 - <p class="text-surface-500 dark:text-surface-400 mb-8">Last updated: March 4, 2026</p> 14 14 + <p class="text-surface-500 dark:text-surface-400 mb-8">Last updated: April 14, 2026</p> 15 15 16 16 <section class="mb-8"> 17 17 <h2 class="text-xl font-bold text-surface-900 dark:text-white mb-4">Overview</h2> 18 18 <p class="text-surface-700 dark:text-surface-300 leading-relaxed"> 19 19 - Margin ("we", "our", or "us") is a web annotation tool that lets you highlight, annotate, and bookmark any webpage. Your data is stored on the decentralized AT Protocol network, giving you ownership and control over your content. 19 19 + Margin is a web annotation tool built on the AT Protocol, operated by <strong>Padding Labs LLC</strong> ("we", "our", or "us"). It lets you highlight, take notes, and bookmark any webpage. Because Margin is built on the AT Protocol, your notes are stored as records in your Personal Data Server (PDS) — you own your content and can take it with you. You must be at least 13 years old to use Margin. 20 20 </p> 21 21 </section> 22 22 23 23 <section class="mb-8"> 24 24 <h2 class="text-xl font-bold text-surface-900 dark:text-white mb-4">Data We Collect</h2> 25 25 + 25 26 <h3 class="text-lg font-semibold text-surface-900 dark:text-white mb-2">Account Information</h3> 26 27 <p class="text-surface-700 dark:text-surface-300 mb-4"> 27 27 - When you log in with your Bluesky/AT Protocol account, we access your: 28 28 + When you log in with your AT Protocol account (e.g. Bluesky), we access your: 28 29 </p> 29 30 <ul class="list-disc pl-5 mb-4 text-surface-700 dark:text-surface-300 space-y-1"> 30 31 <li>Decentralized Identifier (DID)</li> 31 32 <li>Handle (username)</li> 32 32 - <li>Display name and avatar (for showing your profile)</li> 33 33 + <li>Display name, avatar, bio, and website (for showing your profile)</li> 33 34 </ul> 34 35 35 35 - <h3 class="text-lg font-semibold text-surface-900 dark:text-white mb-2">Annotations & Content</h3> 36 36 - <p class="text-surface-700 dark:text-surface-300 mb-4">When you use Margin, we store:</p> 36 36 + <h3 class="text-lg font-semibold text-surface-900 dark:text-white mb-2">Notes & Content</h3> 37 37 + <p class="text-surface-700 dark:text-surface-300 mb-4">When you create a note, we store:</p> 37 38 <ul class="list-disc pl-5 mb-4 text-surface-700 dark:text-surface-300 space-y-1"> 38 38 - <li>URLs of pages you annotate</li> 39 39 - <li>Text you highlight or select</li> 40 40 - <li>Annotations and comments you create</li> 41 41 - <li>Bookmarks you save</li> 42 42 - <li>Collections you organize content into</li> 39 39 + <li>The full URL of the page you noted on</li> 40 40 + <li>The page title at the time of the note</li> 41 41 + <li>The text you selected (up to 5,000 characters)</li> 42 42 + <li>Surrounding context around your selection (up to 500 characters before and after), used to re-locate the note on the page</li> 43 43 + <li>Any text you write as part of the note</li> 44 44 + <li>Tags you apply</li> 45 45 + <li>Highlight color (if set)</li> 46 46 + <li>Replies and likes on notes</li> 47 47 + <li>Collections you create, and which notes belong to them</li> 48 48 + <li>An edit history of any changes you make to your notes</li> 43 49 </ul> 44 50 45 45 - <h3 class="text-lg font-semibold text-surface-900 dark:text-white mb-2">Discover & Recommendations</h3> 51 51 + <h3 class="text-lg font-semibold text-surface-900 dark:text-white mb-2">Overlay Lookups (Browser Extension)</h3> 52 52 + <p class="text-surface-700 dark:text-surface-300 mb-4"> 53 53 + When you browse the web with the extension enabled, it checks each page for existing notes. For these lookups, the extension computes a SHA-256 hash of the page URL locally and sends only that hash to our server — <strong>the raw URL is not sent for lookups.</strong> A hash cannot be reversed to recover the original URL. You can disable overlay lookups entirely by turning off page overlays in the extension settings. 54 54 + </p> 46 55 <p class="text-surface-700 dark:text-surface-300 mb-4"> 47 47 - To power the Discover page and personalized recommendations, we generate mathematical representations (embeddings) of: 56 56 + Note: when you <em>create</em> a note, the full URL is included as part of the record stored on your PDS. 57 57 + </p> 58 58 + 59 59 + <h3 class="text-lg font-semibold text-surface-900 dark:text-white mb-2">Recommendations</h3> 60 60 + <p class="text-surface-700 dark:text-surface-300 mb-4"> 61 61 + To power the Discover page, we generate vector embeddings of your notes and public documents on the AT Protocol network. These embeddings are used to build an interest profile and surface relevant content. Your interest profile is stored on our server and is not shared with other users. 62 62 + </p> 63 63 + <p class="text-surface-700 dark:text-surface-300 mb-4"> 64 64 + Embeddings are generated via the <strong>OpenAI</strong> API. The text content of your notes and public AT Protocol documents is sent to OpenAI for this purpose. OpenAI does not use API inputs to train their models — see their <a href="https://openai.com/policies/usage-policies/" class="text-primary-600 dark:text-primary-400 hover:text-primary-700 dark:hover:text-primary-300 hover:underline" target="_blank" rel="noopener noreferrer">API data usage policy</a>. Recommendations are only generated if you have used Margin to annotate content. 48 65 </p> 49 49 - <ul class="list-disc pl-5 mb-4 text-surface-700 dark:text-surface-300 space-y-1"> 50 50 - <li>Your annotations, highlights, and their associated tags</li> 51 51 - <li>Publicly published documents from the AT Protocol network</li> 52 52 - </ul> 66 66 + 67 67 + <h3 class="text-lg font-semibold text-surface-900 dark:text-white mb-2">Analytics</h3> 53 68 <p class="text-surface-700 dark:text-surface-300 mb-4"> 54 54 - These embeddings are used to build an interest profile that helps us suggest relevant content. Your interest profile is stored on our server and is not shared with other users. 69 69 + We use <strong>PostHog</strong> for product analytics to understand how Margin is used and improve the product. Analytics events — such as page views, note creation, and feature interactions — are collected on the Margin website and server. These events may include the URL of the page being noted on, your browser type, and extension version. PostHog may set cookies for this purpose. We do not use analytics to track you across other websites or share analytics data with advertisers. See PostHog's <a href="https://posthog.com/privacy" class="text-primary-600 dark:text-primary-400 hover:text-primary-700 dark:hover:text-primary-300 hover:underline" target="_blank" rel="noopener noreferrer">privacy policy</a>. 55 70 </p> 56 71 57 72 <h3 class="text-lg font-semibold text-surface-900 dark:text-white mb-2">Authentication</h3> 58 73 <p class="text-surface-700 dark:text-surface-300 mb-4"> 59 59 - We store OAuth session tokens locally in your browser to keep you logged in. These tokens are used solely for authenticating API requests. 74 74 + We store your OAuth session tokens (access token, refresh token, and DPoP proof key) in our database to keep you logged in. These are used solely for authenticating requests to the AT Protocol on your behalf and expire when your session ends. 60 75 </p> 61 76 </section> 62 77 63 78 <section class="mb-8"> 64 79 <h2 class="text-xl font-bold text-surface-900 dark:text-white mb-4">How We Use Your Data</h2> 65 65 - <p class="text-surface-700 dark:text-surface-300 mb-4">Your data is used exclusively to:</p> 80 80 + <p class="text-surface-700 dark:text-surface-300 mb-4">Your data is used to:</p> 66 81 <ul class="list-disc pl-5 mb-4 text-surface-700 dark:text-surface-300 space-y-1"> 67 67 - <li>Display your annotations on webpages</li> 82 82 + <li>Display your notes on webpages via the browser extension</li> 68 83 <li>Sync your content across devices</li> 69 69 - <li>Show your public annotations to other users</li> 84 84 + <li>Show your public notes to other users on the same page</li> 70 85 <li>Enable social features like replies and likes</li> 71 86 <li>Generate personalized content recommendations on the Discover page</li> 87 87 + <li>Understand product usage and improve the service</li> 72 88 </ul> 73 73 - 74 74 - <h3 class="text-lg font-semibold text-surface-900 dark:text-white mb-2">Third-Party Services</h3> 75 75 - <p class="text-surface-700 dark:text-surface-300 mb-4"> 76 76 - We use <strong>OpenAI</strong> to generate text embeddings for powering recommendations. When generating embeddings, the text content of your annotations and public documents is sent to OpenAI's API. OpenAI processes this data according to their <a href="https://openai.com/policies/api-data-usage-policies" class="text-primary-600 dark:text-primary-400 hover:text-primary-700 dark:hover:text-primary-300 hover:underline" target="_blank" rel="noopener noreferrer">API data usage policy</a>, which states that API inputs are not used to train their models. No other third-party services receive your data. 89 89 + <p class="text-surface-700 dark:text-surface-300"> 90 90 + <strong>We do not sell your data.</strong> We do not share your data with third parties for advertising or marketing purposes. 77 91 </p> 78 92 </section> 79 93 80 94 <section class="mb-8"> 81 81 - <h2 class="text-xl font-bold text-surface-900 dark:text-white mb-4">Data Storage</h2> 95 95 + <h2 class="text-xl font-bold text-surface-900 dark:text-white mb-4">The AT Protocol & Data Portability</h2> 82 96 <p class="text-surface-700 dark:text-surface-300 mb-4"> 83 83 - Your annotations are stored on the AT Protocol network through your Personal Data Server (PDS). This means: 97 97 + Margin is built on the AT Protocol. Your notes, collections, and profile are stored as records in your Personal Data Server (PDS). This means: 84 98 </p> 85 99 <ul class="list-disc pl-5 mb-4 text-surface-700 dark:text-surface-300 space-y-1"> 86 86 - <li>You own your data</li> 87 87 - <li>You can export or delete it at any time</li> 88 88 - <li>Your data is portable across AT Protocol services</li> 100 100 + <li>You own your content</li> 101 101 + <li>You can export your full data repository from your PDS at any time</li> 102 102 + <li>Your data is portable — you can use it with other AT Protocol-compatible services</li> 103 103 + <li>You can migrate your account to a different PDS without losing your content</li> 89 104 </ul> 90 105 <p class="text-surface-700 dark:text-surface-300 mb-4"> 91 91 - We also maintain a local index of annotations to provide faster search and discovery features. 106 106 + We also maintain a server-side index of public notes to power features like search, discovery, and the extension overlay. This index is derived from the public AT Protocol firehose and is used solely to operate the service. 92 107 </p> 93 108 94 109 <h3 class="text-lg font-semibold text-surface-900 dark:text-white mb-2">Margin PDS (margin.cafe)</h3> 95 110 <p class="text-surface-700 dark:text-surface-300 mb-4"> 96 96 - We operate a Personal Data Server at <strong>margin.cafe</strong>. If you create an account on this PDS, we additionally store: 111 111 + We operate an optional Personal Data Server at <strong>margin.cafe</strong>. If you create an account there, we additionally store: 97 112 </p> 98 113 <ul class="list-disc pl-5 mb-4 text-surface-700 dark:text-surface-300 space-y-1"> 99 99 - <li>Your account credentials (password hashed, never stored in plain text)</li> 114 114 + <li>Your account credentials (password is hashed and never stored in plain text)</li> 100 115 <li>Your email address (for account recovery)</li> 101 116 <li>All AT Protocol data repositories you create on this server</li> 102 117 </ul> 103 118 <p class="text-surface-700 dark:text-surface-300"> 104 104 - You can migrate your account and data to a different PDS at any time using standard AT Protocol account migration. Using the margin.cafe PDS is entirely optional as you can use Margin with any AT Protocol PDS. 119 119 + Using margin.cafe is entirely optional — Margin works with any AT Protocol PDS. You can migrate your account to a different PDS at any time using standard AT Protocol account migration. 105 120 </p> 106 121 </section> 107 122 108 123 <section class="mb-8"> 109 109 - <h2 class="text-xl font-bold text-surface-900 dark:text-white mb-4">Data Sharing</h2> 124 124 + <h2 class="text-xl font-bold text-surface-900 dark:text-white mb-4">Public Content</h2> 110 125 <p class="text-surface-700 dark:text-surface-300 mb-4"> 111 111 - <strong>We do not sell your data.</strong> We do not share your data with third parties for advertising or marketing purposes. 126 126 + Notes you create are public by default on the AT Protocol network. This means they may be visible to: 112 127 </p> 113 113 - <p class="text-surface-700 dark:text-surface-300 mb-4">Your public annotations may be visible to:</p> 114 128 <ul class="list-disc pl-5 mb-4 text-surface-700 dark:text-surface-300 space-y-1"> 115 129 <li>Other Margin users viewing the same webpage</li> 116 116 - <li>Anyone on the AT Protocol network (for public content)</li> 130 130 + <li>Anyone on the AT Protocol network who subscribes to public records</li> 117 131 </ul> 118 132 </section> 119 133 120 134 <section class="mb-8"> 121 135 <h2 class="text-xl font-bold text-surface-900 dark:text-white mb-4">Browser Extension Permissions</h2> 122 122 - <p class="text-surface-700 dark:text-surface-300 mb-4">The Margin browser extension requires certain permissions:</p> 136 136 + <p class="text-surface-700 dark:text-surface-300 mb-4">The Margin browser extension requires the following permissions:</p> 123 137 <ul class="list-disc pl-5 mb-4 text-surface-700 dark:text-surface-300 space-y-1"> 124 124 - <li> 125 125 - <strong>All URLs:</strong> To display and create annotations on any webpage. When checking a page for annotations, the URL is sent to our server. <strong>We do not store these requests, the URLs are redacted, and we do not link your identity to the URLs you visit.</strong> You can disable sending URLs to Margin by turning off page overlays in the extension settings. 126 126 - </li> 138 138 + <li><strong>All URLs:</strong> To display and create notes on any webpage. Overlay lookups use a local SHA-256 hash of the URL — the raw URL is only sent when you actively create a note.</li> 127 139 <li><strong>Storage:</strong> To save your preferences and session locally</li> 128 140 <li><strong>Cookies:</strong> To maintain your logged-in session</li> 129 129 - <li><strong>Tabs:</strong> To know which page you're viewing</li> 141 141 + <li><strong>Tabs:</strong> To know which page you're currently viewing</li> 130 142 </ul> 131 143 </section> 132 144 ··· 134 146 <h2 class="text-xl font-bold text-surface-900 dark:text-white mb-4">Your Rights</h2> 135 147 <p class="text-surface-700 dark:text-surface-300 mb-4">You can:</p> 136 148 <ul class="list-disc pl-5 mb-4 text-surface-700 dark:text-surface-300 space-y-1"> 137 137 - <li>Delete any annotation, highlight, or bookmark you've created</li> 149 149 + <li>Delete any note or reply you've created</li> 138 150 <li>Delete your collections</li> 139 139 - <li>Export your data from your PDS</li> 140 140 - <li>Revoke the extension's access at any time</li> 151 151 + <li>Export your full data repository from your PDS</li> 152 152 + <li>Revoke Margin's OAuth access to your account at any time</li> 153 153 + <li>Request deletion of your margin.cafe account by contacting us — deletion of AT Protocol data on your PDS is governed by your PDS provider</li> 141 154 </ul> 155 155 + <p class="text-surface-700 dark:text-surface-300"> 156 156 + To exercise any of these rights, email us at <a href="mailto:hello@margin.at" class="text-primary-600 dark:text-primary-400 hover:text-primary-700 dark:hover:text-primary-300 hover:underline">hello@margin.at</a>. 157 157 + </p> 142 158 </section> 143 159 144 160 <section class="mb-8">

+48 -10

web/src/pages/terms.astro

reviewed

··· 11 11 12 12 <div class="prose prose-surface dark:prose-invert max-w-none"> 13 13 <h1 class="font-display font-bold text-3xl mb-2 text-surface-900 dark:text-white">Terms of Service</h1> 14 14 - <p class="text-surface-500 dark:text-surface-400 mb-8">Last updated: January 17, 2026</p> 14 14 + <p class="text-surface-500 dark:text-surface-400 mb-8">Last updated: April 14, 2026</p> 15 15 16 16 <section class="mb-8"> 17 17 <h2 class="text-xl font-bold text-surface-900 dark:text-white mb-4">Overview</h2> 18 18 <p class="text-surface-700 dark:text-surface-300 leading-relaxed"> 19 19 - Margin is an open-source project. By using our service, you agree to these terms ("Terms"). If you do not agree to these Terms, please do not use the Service. 19 19 + Margin is a web annotation tool built on the AT Protocol, operated by Padding Labs LLC ("we", "our", or "us"). By using Margin (the "Service"), you agree to these Terms. If you do not agree, please do not use the Service. You must be at least 13 years old to use Margin. 20 20 </p> 21 21 </section> 22 22 23 23 <section class="mb-8"> 24 24 <h2 class="text-xl font-bold text-surface-900 dark:text-white mb-4">Open Source</h2> 25 25 <p class="text-surface-700 dark:text-surface-300 leading-relaxed"> 26 26 - Margin is open source software. The code is available publicly and is provided "as is", without warranty of any kind, express or implied. 26 26 + Margin is open source software. The source code is publicly available and provided "as is", without warranty of any kind, express or implied. These Terms govern your use of the hosted service at margin.at, not the source code itself. 27 27 + </p> 28 28 + </section> 29 29 + 30 30 + <section class="mb-8"> 31 31 + <h2 class="text-xl font-bold text-surface-900 dark:text-white mb-4">Your Content</h2> 32 32 + <p class="text-surface-700 dark:text-surface-300 mb-4"> 33 33 + You retain full ownership of all notes and other content you create ("Your Content"). By using the Service, you grant Padding Labs LLC a limited, non-exclusive, royalty-free license to store, index, display, and sync Your Content solely as needed to operate and improve the Service. 34 34 + </p> 35 35 + <p class="text-surface-700 dark:text-surface-300"> 36 36 + Because Margin is built on the AT Protocol, Your Content is stored as records on your Personal Data Server (PDS). It is portable and exportable at any time — we do not lock you in. 37 37 + </p> 38 38 + </section> 39 39 + 40 40 + <section class="mb-8"> 41 41 + <h2 class="text-xl font-bold text-surface-900 dark:text-white mb-4">Public Notes</h2> 42 42 + <p class="text-surface-700 dark:text-surface-300 leading-relaxed"> 43 43 + Notes you create are public by default on the AT Protocol network and may be visible to other users and services that interact with the network. Do not include sensitive or private information in your notes if you do not want it to be publicly visible. 27 44 </p> 28 45 </section> 29 46 ··· 33 50 You are responsible for your use of the Service and for any content you provide, including compliance with applicable laws, rules, and regulations. 34 51 </p> 35 52 <p class="text-surface-700 dark:text-surface-300 mb-4"> 36 36 - We reserve the right to remove any content that violates these terms, including but not limited to: 53 53 + We reserve the right to remove content or suspend access for violations of these Terms, including but not limited to: 37 54 </p> 38 55 <ul class="list-disc pl-5 mb-4 text-surface-700 dark:text-surface-300 space-y-1"> 39 56 <li>Illegal content</li> ··· 43 60 </section> 44 61 45 62 <section class="mb-8"> 46 46 - <h2 class="text-xl font-bold text-surface-900 dark:text-white mb-4">Decentralized Nature</h2> 63 63 + <h2 class="text-xl font-bold text-surface-900 dark:text-white mb-4">The AT Protocol</h2> 47 64 <p class="text-surface-700 dark:text-surface-300 leading-relaxed"> 48 48 - Margin interacts with the AT Protocol network. We do not control the network itself or the data stored on your Personal Data Server (PDS). Please refer to the terms of your PDS provider for data storage policies. 65 65 + Margin interacts with the AT Protocol network. We do not control the network itself, other services on the network, or the data stored on your Personal Data Server. Your PDS provider's own terms govern data stored there. Content published to the AT Protocol is public and may be indexed by other services beyond Margin's control. 49 66 </p> 50 67 </section> 51 68 52 69 <section class="mb-8"> 53 53 - <h2 class="text-xl font-bold text-surface-900 dark:text-white mb-4">Disclaimer</h2> 54 54 - <p class="text-surface-700 dark:text-surface-300 leading-relaxed uppercase"> 55 55 - THE SERVICE IS PROVIDED "AS IS" AND "AS AVAILABLE". WE DISCLAIM ALL CONDITIONS, REPRESENTATIONS AND WARRANTIES NOT EXPRESSLY SET OUT IN THESE TERMS. 70 70 + <h2 class="text-xl font-bold text-surface-900 dark:text-white mb-4">Disclaimer of Warranties</h2> 71 71 + <p class="text-surface-700 dark:text-surface-300 leading-relaxed"> 72 72 + The Service is provided "as is" and "as available" without warranties of any kind, either express or implied, including but not limited to implied warranties of merchantability, fitness for a particular purpose, or non-infringement. We do not warrant that the Service will be uninterrupted, error-free, or free of harmful components. 73 73 + </p> 74 74 + </section> 75 75 + 76 76 + <section class="mb-8"> 77 77 + <h2 class="text-xl font-bold text-surface-900 dark:text-white mb-4">Limitation of Liability</h2> 78 78 + <p class="text-surface-700 dark:text-surface-300 leading-relaxed"> 79 79 + To the fullest extent permitted by law, Padding Labs LLC shall not be liable for any indirect, incidental, special, consequential, or punitive damages arising out of or related to your use of the Service. Because Margin is provided free of charge, our total aggregate liability to you shall not exceed $0. 80 80 + </p> 81 81 + </section> 82 82 + 83 83 + <section class="mb-8"> 84 84 + <h2 class="text-xl font-bold text-surface-900 dark:text-white mb-4">Governing Law</h2> 85 85 + <p class="text-surface-700 dark:text-surface-300 leading-relaxed"> 86 86 + These Terms are governed by the laws of the State of Wyoming, without regard to its conflict of law provisions. 87 87 + </p> 88 88 + </section> 89 89 + 90 90 + <section class="mb-8"> 91 91 + <h2 class="text-xl font-bold text-surface-900 dark:text-white mb-4">Changes to These Terms</h2> 92 92 + <p class="text-surface-700 dark:text-surface-300 leading-relaxed"> 93 93 + We may update these Terms from time to time. We will note the date of the last update at the top of this page. Continued use of the Service after changes constitutes acceptance of the updated Terms. 56 94 </p> 57 95 </section> 58 96 59 97 <section class="mb-8"> 60 98 <h2 class="text-xl font-bold text-surface-900 dark:text-white mb-4">Contact</h2> 61 99 <p class="text-surface-700 dark:text-surface-300"> 62 62 - For questions about these Terms, please contact us at <a href="mailto:hello@margin.at" class="text-primary-600 dark:text-primary-400 hover:text-primary-700 dark:hover:text-primary-300 hover:underline">hello@margin.at</a> 100 100 + For questions about these Terms, contact us at <a href="mailto:hello@margin.at" class="text-primary-600 dark:text-primary-400 hover:text-primary-700 dark:hover:text-primary-300 hover:underline">hello@margin.at</a> 63 101 </p> 64 102 </section> 65 103 </div>

+7

web/src/store/auth.ts

reviewed

··· 1 1 import { atom } from "nanostores"; 2 2 import { loadPreferences } from "./preferences"; 3 3 import type { UserProfile } from "../types"; 4 4 + import { analytics } from "../lib/analytics"; 4 5 5 6 export const $user = atom<UserProfile | null>(null); 6 7 7 8 $user.subscribe((user) => { 8 9 if (user) { 9 10 loadPreferences(); 11 11 + analytics.identify(user.did, { 12 12 + handle: user.handle, 13 13 + displayName: user.displayName, 14 14 + }); 10 15 } 11 16 }); 12 17 13 18 export function logout() { 19 19 + analytics.capture("user_logged_out"); 20 20 + analytics.reset(); 14 21 $user.set(null); 15 22 fetch("/auth/logout", { method: "POST" }).finally(() => { 16 23 window.location.href = "/";

+15

web/src/store/preferences.ts

reviewed

··· 11 11 subscribedLabelers: LabelerSubscription[]; 12 12 labelPreferences: LabelPreference[]; 13 13 disableExternalLinkWarning: boolean; 14 14 + enableCommunityBookmarks: boolean; 14 15 } 15 16 16 17 export const $preferences = atom<Preferences>({ ··· 18 19 subscribedLabelers: [], 19 20 labelPreferences: [], 20 21 disableExternalLinkWarning: false, 22 22 + enableCommunityBookmarks: true, 21 23 }); 22 24 23 25 export async function loadPreferences() { ··· 27 29 subscribedLabelers: prefs.subscribedLabelers || [], 28 30 labelPreferences: prefs.labelPreferences || [], 29 31 disableExternalLinkWarning: !!prefs.disableExternalLinkWarning, 32 32 + enableCommunityBookmarks: !!prefs.enableCommunityBookmarks, 30 33 }); 31 34 } 32 35 ··· 107 110 $preferences.set(updated); 108 111 await updatePreferences(updated); 109 112 } 113 113 + 114 114 + export async function setEnableCommunityBookmarks(enabled: boolean) { 115 115 + const current = $preferences.get(); 116 116 + if (current.enableCommunityBookmarks === enabled) return; 117 117 + 118 118 + const updated = { 119 119 + ...current, 120 120 + enableCommunityBookmarks: enabled, 121 121 + }; 122 122 + $preferences.set(updated); 123 123 + await updatePreferences(updated); 124 124 + }

+15

web/src/views/AppShell.tsx

reviewed

··· 23 23 import RightSidebar from "../components/navigation/RightSidebar"; 24 24 import Sidebar from "../components/navigation/Sidebar"; 25 25 import { $user } from "../store/auth"; 26 26 + import { analytics } from "../lib/analytics"; 27 27 + 26 28 import AdminModeration from "./core/AdminModeration"; 27 29 import Discover from "./core/Discover"; 28 30 import Feed from "./core/Feed"; ··· 112 114 useEffect(() => { 113 115 document.title = PAGE_TITLES[location.pathname] ?? "Margin"; 114 116 }, [location.pathname]); 117 117 + 118 118 + useEffect(() => { 119 119 + if (searchParams.get("logged_in") !== "true") return; 120 120 + const user = $user.get(); 121 121 + analytics.capture("login_success", { 122 122 + handle: user?.handle ?? "", 123 123 + pds: undefined, 124 124 + }); 125 125 + const url = new URL(window.location.href); 126 126 + url.searchParams.delete("logged_in"); 127 127 + window.history.replaceState({}, "", url.toString()); 128 128 + // eslint-disable-next-line react-hooks/exhaustive-deps 129 129 + }, [location.search]); 115 130 116 131 useEffect(() => { 117 132 const SERVER_PATHS = [

+5

web/src/views/auth/Login.tsx

reviewed

··· 9 9 import { Avatar } from "../../components/ui"; 10 10 import { useStore } from "@nanostores/react"; 11 11 import { $theme } from "../../store/theme"; 12 12 + import { analytics } from "../../lib/analytics"; 12 13 13 14 interface LoginProps { 14 15 initialError?: string; ··· 36 37 "AT Protocol", 37 38 "Margin", 38 39 "Bluesky", 40 40 + "Eurosky", 39 41 "Blacksky", 40 42 "Tangled", 41 43 "Northsky", 44 44 + "selfhosted.social", 42 45 "witchcraft.systems", 43 46 "tophhie.social", 44 47 "altq.net", ··· 135 138 setError(null); 136 139 137 140 try { 141 141 + analytics.capture("login_initiated", { handle: handle.trim() }); 138 142 const result = await startLogin(handle.trim()); 139 143 if (result.authorizationUrl) { 140 144 const url = new URL(result.authorizationUrl); ··· 144 148 } 145 149 } catch (err) { 146 150 const message = err instanceof Error ? err.message : "Unknown error"; 151 151 + analytics.captureException(err); 147 152 setError(message || "Failed to initiate login. Please try again."); 148 153 setLoading(false); 149 154 }

+5

web/src/views/collections/Collections.tsx

reviewed

··· 16 16 import { formatDistanceToNow } from "date-fns"; 17 17 import { clsx } from "clsx"; 18 18 import { Button, Input, EmptyState, Skeleton } from "../../components/ui"; 19 19 + import { analytics } from "../../lib/analytics"; 19 20 20 21 const collectionsCache = { 21 22 data: null as Collection[] | null, ··· 97 98 setNewItemIcon("folder"); 98 99 setActiveTab("icon"); 99 100 fetchCollections(); 101 101 + analytics.capture("collection_created", { 102 102 + has_description: !!newItemDesc.trim(), 103 103 + }); 100 104 } 101 105 setCreating(false); 102 106 }; ··· 112 116 collectionsCache.timestamp = Date.now(); 113 117 return updated; 114 118 }); 119 119 + analytics.capture("collection_deleted"); 115 120 } 116 121 } 117 122 };

+5

web/src/views/content/AnnotationDetail.tsx

reviewed

··· 20 20 AlertTriangle, 21 21 } from "lucide-react"; 22 22 import { getAvatarUrl } from "../../api/client"; 23 23 + import { analytics } from "../../lib/analytics"; 23 24 24 25 interface AnnotationDetailProps { 25 26 handle?: string; ··· 159 160 replyText, 160 161 ); 161 162 163 163 + analytics.capture("reply_created", { 164 164 + parent_uri: parentUri, 165 165 + root_uri: targetUri, 166 166 + }); 162 167 setReplyText(""); 163 168 setReplyingTo(null); 164 169 await refreshReplies();

+7

web/src/views/core/HighlightImporter.tsx

reviewed

··· 9 9 import { useRef, useState } from "react"; 10 10 import { createHighlight } from "../../api/client"; 11 11 import type { Selector } from "../../types"; 12 12 + import { analytics } from "../../lib/analytics"; 12 13 13 14 interface Highlight { 14 15 url: string; ··· 214 215 await new Promise((resolve) => setTimeout(resolve, 500)); 215 216 } 216 217 218 218 + analytics.capture("highlights_imported", { 219 219 + total: importState.total, 220 220 + completed: importState.completed, 221 221 + failed: importState.failed, 222 222 + }); 217 223 setIsImporting(false); 218 224 } catch (error) { 225 225 + analytics.captureException(error); 219 226 alert( 220 227 `Error parsing CSV: ${error instanceof Error ? error.message : "Unknown error"}`, 221 228 );

+2

web/src/views/core/Search.tsx

reviewed

··· 16 16 import LayoutToggle from "../../components/ui/LayoutToggle"; 17 17 import { $user } from "../../store/auth"; 18 18 import { $feedLayout } from "../../store/feedLayout"; 19 19 + import { analytics } from "../../lib/analytics"; 19 20 20 21 const searchCache = new Map< 21 22 string, ··· 165 166 const url = new URL(window.location.href); 166 167 url.searchParams.set("q", query.trim()); 167 168 window.history.replaceState({}, "", url.toString()); 169 169 + analytics.capture("search_performed", { query: query.trim() }); 168 170 doSearch(query.trim()); 169 171 } 170 172 };

+24 -1

web/src/views/core/Settings.tsx

reviewed

··· 10 10 setLabelVisibility, 11 11 getLabelVisibility, 12 12 setDisableExternalLinkWarning, 13 13 + setEnableCommunityBookmarks, 13 14 } from "../../store/preferences"; 14 15 import { 15 16 getAPIKeys, ··· 61 62 import { AppleIcon } from "../../components/common/Icons"; 62 63 import { HighlightImporter } from "./HighlightImporter"; 63 64 import IOSShortcutModal from "../../components/modals/IOSShortcutModal"; 65 65 + import { analytics } from "../../lib/analytics"; 64 66 65 67 export default function Settings() { 66 68 const user = useStore($user); ··· 115 117 setKeys([res, ...keys]); 116 118 setCreatedKey(res.key || null); 117 119 setNewKeyName(""); 120 120 + analytics.capture("api_key_created"); 118 121 } 119 122 setCreating(false); 120 123 }; ··· 178 181 {themeOptions.map((opt) => ( 179 182 <button 180 183 key={opt.value} 181 181 - onClick={() => setTheme(opt.value)} 184 184 + onClick={() => { 185 185 + setTheme(opt.value); 186 186 + analytics.capture("theme_changed", { 187 187 + theme: opt.value, 188 188 + }); 189 189 + }} 182 190 className={`flex-1 flex flex-col items-center gap-2 p-4 rounded-xl border-2 transition-all ${ 183 191 theme === opt.value 184 192 ? "border-primary-500 bg-primary-50 dark:bg-primary-900/20" ··· 214 222 <Switch 215 223 checked={preferences.disableExternalLinkWarning} 216 224 onCheckedChange={setDisableExternalLinkWarning} 225 225 + /> 226 226 + </div> 227 227 + 228 228 + <div className="mt-6 flex items-center justify-between"> 229 229 + <div> 230 230 + <h3 className="text-sm font-medium text-surface-900 dark:text-white"> 231 231 + Share bookmarks to community feed 232 232 + </h3> 233 233 + <p className="text-sm text-surface-500 dark:text-surface-400"> 234 234 + Your saved bookmarks will appear in the community bookmarks feed 235 235 + </p> 236 236 + </div> 237 237 + <Switch 238 238 + checked={preferences.enableCommunityBookmarks} 239 239 + onCheckedChange={setEnableCommunityBookmarks} 217 240 /> 218 241 </div> 219 242 </section>