comparing e2826acfa65504b336495683235852b9e86c2fc4 and main on bretton.dev/coves

.beads/beads.left.jsonl

···

       1
       1
       +
       {"id":"Coves-95q","content_hash":"8ec99d598f067780436b985f9ad57f0fa19632026981038df4f65f192186620b","title":"Add comprehensive API documentation","description":"","status":"open","priority":2,"issue_type":"task","created_at":"2025-11-17T20:30:34.835721854-08:00","updated_at":"2025-11-17T20:30:34.835721854-08:00","source_repo":".","dependencies":[{"issue_id":"Coves-95q","depends_on_id":"Coves-e16","type":"blocks","created_at":"2025-11-17T20:30:46.273899399-08:00","created_by":"daemon"}]}

     

       2
       2
       +
       {"id":"Coves-e16","content_hash":"7c5d0fc8f0e7f626be3dad62af0e8412467330bad01a244e5a7e52ac5afff1c1","title":"Complete post creation and moderation features","description":"","status":"open","priority":1,"issue_type":"feature","created_at":"2025-11-17T20:30:12.885991306-08:00","updated_at":"2025-11-17T20:30:12.885991306-08:00","source_repo":"."}

     

       3
       3
       +
       {"id":"Coves-fce","content_hash":"26b3e16b99f827316ee0d741cc959464bd0c813446c95aef8105c7fd1e6b09ff","title":"Implement aggregator feed federation","description":"","status":"open","priority":1,"issue_type":"feature","created_at":"2025-11-17T20:30:21.453326012-08:00","updated_at":"2025-11-17T20:30:21.453326012-08:00","source_repo":"."}

.beads/beads.left.meta.json

···

       1
       1
       +
       {"version":"0.23.1","timestamp":"2025-12-02T18:25:24.009187871-08:00","commit":"00d7d8d"}

+2 -8

internal/api/handlers/vote/delete_vote_test.go

···

       239
       239
        
       

     

       240
       240
        
       func TestDeleteVoteHandler_ServiceError(t *testing.T) {

     

       241
       241
        
       	tests := []struct {

     

       242
       242
       -
       		name           string

     

       243
       242
        
       		serviceError   error

     

       244
       244
       -
       		expectedStatus int

     

       243
       243
       +
       		name           string

     

       245
       244
        
       		expectedError  string

     

       245
       245
       +
       		expectedStatus int

     

       246
       246
        
       	}{

     

       247
       247
        
       		{

     

       248
       248
        
       			name:           "vote not found",

     
···

       250
       250
        
       			expectedStatus: http.StatusNotFound,

     

       251
       251
        
       			expectedError:  "VoteNotFound", // Per lexicon: social.coves.feed.vote.delete#VoteNotFound

     

       252
       252
        
       		},

     

       253
       253
       -
       		{

     

       254
       254
       -
       			name:           "subject not found",

     

       255
       255
       -
       			serviceError:   votes.ErrSubjectNotFound,

     

       256
       256
       -
       			expectedStatus: http.StatusNotFound,

     

       257
       257
       -
       			expectedError:  "SubjectNotFound", // Per lexicon: social.coves.feed.vote.create#SubjectNotFound

     

       258
       258
       -
       		},

     

       259
       253
        
       		{

     

       260
       254
        
       			name:           "invalid subject",

     

       261
       255
        
       			serviceError:   votes.ErrInvalidSubject,

-3

internal/api/handlers/vote/errors.go

···

       34
       34
        
       	case errors.Is(err, votes.ErrVoteNotFound):

     

       35
       35
        
       		// Matches: social.coves.feed.vote.delete#VoteNotFound

     

       36
       36
        
       		writeError(w, http.StatusNotFound, "VoteNotFound", "No vote found for this subject")

     

       37
       37
       -
       	case errors.Is(err, votes.ErrSubjectNotFound):

     

       38
       38
       -
       		// Matches: social.coves.feed.vote.create#SubjectNotFound

     

       39
       39
       -
       		writeError(w, http.StatusNotFound, "SubjectNotFound", "The subject post or comment was not found")

     

       40
       37
        
       	case errors.Is(err, votes.ErrInvalidDirection):

     

       41
       38
        
       		writeError(w, http.StatusBadRequest, "InvalidRequest", "Vote direction must be 'up' or 'down'")

     

       42
       39
        
       	case errors.Is(err, votes.ErrInvalidSubject):

+4 -4

internal/atproto/oauth/handlers_security.go

···

       25
       25
        
       // - Android: Verified via /.well-known/assetlinks.json

     

       26
       26
        
       var allowedMobileRedirectURIs = map[string]bool{

     

       27
       27
        
       	// Custom scheme per atproto spec (reverse-domain of coves.social)

     

       28
       28
       -
       	"social.coves:/callback":                  true,

     

       29
       29
       -
       	"social.coves://callback":                 true, // Some platforms add double slash

     

       30
       30
       -
       	"social.coves:/oauth/callback":            true, // Alternative path

     

       31
       31
       -
       	"social.coves://oauth/callback":           true,

     

       28
       28
       +
       	"social.coves:/callback":        true,

     

       29
       29
       +
       	"social.coves://callback":       true, // Some platforms add double slash

     

       30
       30
       +
       	"social.coves:/oauth/callback":  true, // Alternative path

     

       31
       31
       +
       	"social.coves://oauth/callback": true,

     

       32
       32
        
       	// Universal Links - cryptographically bound to app (preferred for security)

     

       33
       33
        
       	"https://coves.social/app/oauth/callback": true,

     

       34
       34
        
       }

-3

internal/core/votes/errors.go

···

       6
       6
        
       	// ErrVoteNotFound indicates the requested vote doesn't exist

     

       7
       7
        
       	ErrVoteNotFound = errors.New("vote not found")

     

       8
       8
        
       

     

       9
       9
       -
       	// ErrSubjectNotFound indicates the post/comment being voted on doesn't exist

     

       10
       10
       -
       	ErrSubjectNotFound = errors.New("subject not found")

     

       11
       11
       -
       

     

       12
       9
        
       	// ErrInvalidDirection indicates the vote direction is not "up" or "down"

     

       13
       10
        
       	ErrInvalidDirection = errors.New("invalid vote direction: must be 'up' or 'down'")

     

       14
       11

-50

internal/core/votes/subject_validator.go

···

       1
       1
       -
       package votes

     

       2
       2
       -
       

     

       3
       3
       -
       import (

     

       4
       4
       -
       	"context"

     

       5
       5
       -
       	"strings"

     

       6
       6
       -
       )

     

       7
       7
       -
       

     

       8
       8
       -
       // SubjectExistsFunc is a function type that checks if a subject exists

     

       9
       9
       -
       type SubjectExistsFunc func(ctx context.Context, uri string) (bool, error)

     

       10
       10
       -
       

     

       11
       11
       -
       // CompositeSubjectValidator validates subjects by checking both posts and comments

     

       12
       12
       -
       type CompositeSubjectValidator struct {

     

       13
       13
       -
       	postExists    SubjectExistsFunc

     

       14
       14
       -
       	commentExists SubjectExistsFunc

     

       15
       15
       -
       }

     

       16
       16
       -
       

     

       17
       17
       -
       // NewCompositeSubjectValidator creates a validator that checks both posts and comments

     

       18
       18
       -
       // Pass nil for either function to skip validation for that type

     

       19
       19
       -
       func NewCompositeSubjectValidator(postExists, commentExists SubjectExistsFunc) *CompositeSubjectValidator {

     

       20
       20
       -
       	return &CompositeSubjectValidator{

     

       21
       21
       -
       		postExists:    postExists,

     

       22
       22
       -
       		commentExists: commentExists,

     

       23
       23
       -
       	}

     

       24
       24
       -
       }

     

       25
       25
       -
       

     

       26
       26
       -
       // SubjectExists checks if a post or comment exists at the given URI

     

       27
       27
       -
       // Determines type from the collection in the URI (e.g., social.coves.feed.post vs social.coves.feed.comment)

     

       28
       28
       -
       func (v *CompositeSubjectValidator) SubjectExists(ctx context.Context, uri string) (bool, error) {

     

       29
       29
       -
       	// Parse collection from AT-URI: at://did/collection/rkey

     

       30
       30
       -
       	// Example: at://did:plc:xxx/social.coves.feed.post/abc123

     

       31
       31
       -
       	if strings.Contains(uri, "/social.coves.feed.post/") {

     

       32
       32
       -
       		if v.postExists != nil {

     

       33
       33
       -
       			return v.postExists(ctx, uri)

     

       34
       34
       -
       		}

     

       35
       35
       -
       		// If no post checker, assume exists (for testing)

     

       36
       36
       -
       		return true, nil

     

       37
       37
       -
       	}

     

       38
       38
       -
       

     

       39
       39
       -
       	if strings.Contains(uri, "/social.coves.feed.comment/") {

     

       40
       40
       -
       		if v.commentExists != nil {

     

       41
       41
       -
       			return v.commentExists(ctx, uri)

     

       42
       42
       -
       		}

     

       43
       43
       -
       		// If no comment checker, assume exists (for testing)

     

       44
       44
       -
       		return true, nil

     

       45
       45
       -
       	}

     

       46
       46
       -
       

     

       47
       47
       -
       	// Unknown collection type - could be from another app

     

       48
       48
       -
       	// For now, allow voting on unknown types (future-proofing)

     

       49
       49
       -
       	return true, nil

     

       50
       50
       -
       }

-9

internal/core/votes/vote.go

···

       1
       1
        
       package votes

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       -
       	"context"

     

       5
       4
        
       	"time"

     

       6
       5
        
       )

     

       7
       6
        
       

     

       8
       8
       -
       // SubjectValidator validates that vote subjects (posts/comments) exist

     

       9
       9
       -
       // This prevents creating votes on non-existent content

     

       10
       10
       -
       type SubjectValidator interface {

     

       11
       11
       -
       	// SubjectExists checks if a post or comment exists at the given URI

     

       12
       12
       -
       	// Returns true if found, false if not found

     

       13
       13
       -
       	SubjectExists(ctx context.Context, uri string) (bool, error)

     

       14
       14
       -
       }

     

       15
       15
       -
       

     

       16
       7
        
       // Vote represents a vote in the AppView database

     

       17
       8
        
       // Votes are indexed from the firehose after being written to user repositories

     

       18
       9
        
       type Vote struct {

+3 -2

internal/db/postgres/vote_repo.go

···

       64
       64
        
       	return nil

     

       65
       65
        
       }

     

       66
       66
        
       

     

       67
       67
       -
       // GetByURI retrieves a vote by its AT-URI

     

       67
       67
       +
       // GetByURI retrieves an active vote by its AT-URI

     

       68
       68
        
       // Used by Jetstream consumer for DELETE operations

     

       69
       69
       +
       // Returns ErrVoteNotFound for soft-deleted votes

     

       69
       70
        
       func (r *postgresVoteRepo) GetByURI(ctx context.Context, uri string) (*votes.Vote, error) {

     

       70
       71
        
       	query := `

     

       71
       72
        
       		SELECT

     
···

       73
       74
        
       			subject_uri, subject_cid, direction,

     

       74
       75
        
       			created_at, indexed_at, deleted_at

     

       75
       76
        
       		FROM votes

     

       76
       76
       -
       		WHERE uri = $1

     

       77
       77
       +
       		WHERE uri = $1 AND deleted_at IS NULL

     

       77
       78
        
       	`

     

       78
       79
        
       

     

       79
       80
        
       	var vote votes.Vote

+18

.env.dev

···

       181
       181
        
       #

     

       182
       182
        
       PLC_DIRECTORY_URL=http://localhost:3002

     

       183
       183
        
       

     

       184
       184
       +
       # =============================================================================

     

       185
       185
       +
       # Dev Mode Quick Reference

     

       186
       186
       +
       # =============================================================================

     

       187
       187
       +
       # REQUIRED for local OAuth to work with local PDS:

     

       188
       188
       +
       #   IS_DEV_ENV=true              # Master switch for dev mode

     

       189
       189
       +
       #   PDS_URL=http://localhost:3001  # Local PDS for handle resolution

     

       190
       190
       +
       #   PLC_DIRECTORY_URL=http://localhost:3002  # Local PLC directory

     

       191
       191
       +
       #   APPVIEW_PUBLIC_URL=http://127.0.0.1:8081  # Use IP not localhost (RFC 8252)

     

       192
       192
       +
       #

     

       193
       193
       +
       # BUILD TAGS:

     

       194
       194
       +
       #   make run      - Runs with -tags dev (includes localhost OAuth resolvers)

     

       195
       195
       +
       #   make build    - Production binary (no dev code)

     

       196
       196
       +
       #   make build-dev - Dev binary (includes dev code)

     

       197
       197
       +
       #

     

       198
       198
       +
       # Dev-only code (only compiled with -tags dev):

     

       199
       199
       +
       #   - internal/atproto/oauth/dev_resolver.go (handle resolution via local PDS)

     

       200
       200
       +
       #   - internal/atproto/oauth/dev_auth_resolver.go (localhost OAuth bypass)

     

       201
       201
       +
       #

     

       184
       202
        
       # =============================================================================

     

       185
       203
        
       # Notes

     

       186
       204
        
       # =============================================================================

+92

.env.dev.example

···

       1
       1
       +
       # Coves Local Development Environment Configuration

     

       2
       2
       +
       # Copy this to .env.dev and fill in your values

     

       3
       3
       +
       #

     

       4
       4
       +
       # Quick Start:

     

       5
       5
       +
       #   1. cp .env.dev.example .env.dev

     

       6
       6
       +
       #   2. Generate OAuth key: go run cmd/genjwks/main.go (copy output to OAUTH_PRIVATE_JWK)

     

       7
       7
       +
       #   3. Generate cookie secret: openssl rand -hex 32

     

       8
       8
       +
       #   4. make dev-up  # Start Docker services

     

       9
       9
       +
       #   5. make run     # Start the server (uses -tags dev)

     

       10
       10
       +
       

     

       11
       11
       +
       # =============================================================================

     

       12
       12
       +
       # Dev Mode Quick Reference

     

       13
       13
       +
       # =============================================================================

     

       14
       14
       +
       # REQUIRED for local OAuth to work with local PDS:

     

       15
       15
       +
       #   IS_DEV_ENV=true              # Master switch for dev mode

     

       16
       16
       +
       #   PDS_URL=http://localhost:3001  # Local PDS for handle resolution

     

       17
       17
       +
       #   PLC_DIRECTORY_URL=http://localhost:3002  # Local PLC directory

     

       18
       18
       +
       #   APPVIEW_PUBLIC_URL=http://127.0.0.1:8081  # Use IP not localhost (RFC 8252)

     

       19
       19
       +
       #

     

       20
       20
       +
       # BUILD TAGS:

     

       21
       21
       +
       #   make run      - Runs with -tags dev (includes localhost OAuth resolvers)

     

       22
       22
       +
       #   make build    - Production binary (no dev code)

     

       23
       23
       +
       #   make build-dev - Dev binary (includes dev code)

     

       24
       24
       +
       

     

       25
       25
       +
       # =============================================================================

     

       26
       26
       +
       # PostgreSQL Configuration

     

       27
       27
       +
       # =============================================================================

     

       28
       28
       +
       POSTGRES_HOST=localhost

     

       29
       29
       +
       POSTGRES_PORT=5435

     

       30
       30
       +
       POSTGRES_DB=coves_dev

     

       31
       31
       +
       POSTGRES_USER=dev_user

     

       32
       32
       +
       POSTGRES_PASSWORD=dev_password

     

       33
       33
       +
       

     

       34
       34
       +
       # Test database

     

       35
       35
       +
       POSTGRES_TEST_DB=coves_test

     

       36
       36
       +
       POSTGRES_TEST_USER=test_user

     

       37
       37
       +
       POSTGRES_TEST_PASSWORD=test_password

     

       38
       38
       +
       POSTGRES_TEST_PORT=5434

     

       39
       39
       +
       

     

       40
       40
       +
       # =============================================================================

     

       41
       41
       +
       # PDS Configuration

     

       42
       42
       +
       # =============================================================================

     

       43
       43
       +
       PDS_HOSTNAME=localhost

     

       44
       44
       +
       PDS_PORT=3001

     

       45
       45
       +
       PDS_SERVICE_ENDPOINT=http://localhost:3000

     

       46
       46
       +
       PDS_DID_PLC_URL=http://plc-directory:3000

     

       47
       47
       +
       PDS_JWT_SECRET=local-dev-jwt-secret-change-in-production

     

       48
       48
       +
       PDS_ADMIN_PASSWORD=admin

     

       49
       49
       +
       PDS_SERVICE_HANDLE_DOMAINS=.local.coves.dev,.community.coves.social

     

       50
       50
       +
       PDS_PLC_ROTATION_KEY=<generate-a-random-hex-key>

     

       51
       51
       +
       

     

       52
       52
       +
       # =============================================================================

     

       53
       53
       +
       # AppView Configuration

     

       54
       54
       +
       # =============================================================================

     

       55
       55
       +
       APPVIEW_PORT=8081

     

       56
       56
       +
       FIREHOSE_URL=ws://localhost:3001/xrpc/com.atproto.sync.subscribeRepos

     

       57
       57
       +
       PDS_URL=http://localhost:3001

     

       58
       58
       +
       APPVIEW_PUBLIC_URL=http://127.0.0.1:8081

     

       59
       59
       +
       

     

       60
       60
       +
       # =============================================================================

     

       61
       61
       +
       # Jetstream Configuration

     

       62
       62
       +
       # =============================================================================

     

       63
       63
       +
       JETSTREAM_URL=ws://localhost:6008/subscribe

     

       64
       64
       +
       

     

       65
       65
       +
       # =============================================================================

     

       66
       66
       +
       # Identity Resolution

     

       67
       67
       +
       # =============================================================================

     

       68
       68
       +
       IDENTITY_CACHE_TTL=24h

     

       69
       69
       +
       PLC_DIRECTORY_URL=http://localhost:3002

     

       70
       70
       +
       

     

       71
       71
       +
       # =============================================================================

     

       72
       72
       +
       # OAuth Configuration (MUST GENERATE YOUR OWN)

     

       73
       73
       +
       # =============================================================================

     

       74
       74
       +
       # Generate with: go run cmd/genjwks/main.go

     

       75
       75
       +
       OAUTH_PRIVATE_JWK=<generate-your-own-jwk>

     

       76
       76
       +
       

     

       77
       77
       +
       # Generate with: openssl rand -hex 32

     

       78
       78
       +
       OAUTH_COOKIE_SECRET=<generate-your-own-secret>

     

       79
       79
       +
       

     

       80
       80
       +
       # =============================================================================

     

       81
       81
       +
       # Development Settings

     

       82
       82
       +
       # =============================================================================

     

       83
       83
       +
       ENV=development

     

       84
       84
       +
       NODE_ENV=development

     

       85
       85
       +
       IS_DEV_ENV=true

     

       86
       86
       +
       LOG_LEVEL=debug

     

       87
       87
       +
       LOG_ENABLED=true

     

       88
       88
       +
       

     

       89
       89
       +
       # Security settings (ONLY for local dev - set to false in production!)

     

       90
       90
       +
       SKIP_DID_WEB_VERIFICATION=true

     

       91
       91
       +
       AUTH_SKIP_VERIFY=true

     

       92
       92
       +
       HS256_ISSUERS=http://localhost:3001

+13 -2

internal/atproto/oauth/client.go

···

       3
       3
        
       import (

     

       4
       4
        
       	"encoding/base64"

     

       5
       5
        
       	"fmt"

     

       6
       6
       +
       	"log/slog"

     

       6
       7
        
       	"net/url"

     

       7
       8
        
       	"time"

     

       8
       9
        
       

     
···

       22
       23
        
       	PublicURL       string

     

       23
       24
        
       	SealSecret      string

     

       24
       25
        
       	PLCURL          string

     

       26
       26
       +
       	PDSURL          string // For dev mode: resolve handles via local PDS

     

       25
       27
        
       	Scopes          []string

     

       26
       28
        
       	SessionTTL      time.Duration

     

       27
       29
        
       	SealedTokenTTL  time.Duration

     
···

       77
       79
        
       	// Create indigo client config

     

       78
       80
        
       	var clientConfig oauth.ClientConfig

     

       79
       81
        
       	if config.DevMode {

     

       80
       80
       -
       		// Dev mode: localhost with HTTP

     

       81
       81
       -
       		callbackURL := "http://localhost:3000/oauth/callback"

     

       82
       82
       +
       		// Dev mode: loopback with HTTP

     

       83
       83
       +
       		// IMPORTANT: Use 127.0.0.1 instead of localhost per RFC 8252 - PDS rejects localhost

     

       84
       84
       +
       		// The callback URL must match the APPVIEW_PUBLIC_URL from .env.dev

     

       85
       85
       +
       		callbackURL := config.PublicURL + "/oauth/callback"

     

       82
       86
        
       		clientConfig = oauth.NewLocalhostConfig(callbackURL, config.Scopes)

     

       87
       87
       +
       		slog.Info("dev mode: OAuth client configured",

     

       88
       88
       +
       			"callback_url", callbackURL,

     

       89
       89
       +
       			"client_id", clientConfig.ClientID)

     

       83
       90
        
       	} else {

     

       84
       91
        
       		// Production mode: public OAuth client with HTTPS

     

       85
       92
        
       		// client_id must be the URL of the client metadata document per atproto OAuth spec

     
···

       112
       119
        
       		// Use pointer since CacheDirectory methods have pointer receivers

     

       113
       120
        
       		cacheDir := identity.NewCacheDirectory(baseDir, 100_000, time.Hour*24, time.Minute*2, time.Minute*5)

     

       114
       121
        
       		clientApp.Dir = &cacheDir

     

       122
       122
       +
       		// Log the PLC URL being used for OAuth directory resolution

     

       123
       123
       +
       		fmt.Printf("🔐 OAuth client directory configured with PLC URL: %s (AllowPrivateIPs: %v)\n", config.PLCURL, config.AllowPrivateIPs)

     

       124
       124
       +
       	} else {

     

       125
       125
       +
       		fmt.Println("⚠️  OAuth client using DEFAULT PLC directory (production plc.directory)")

     

       115
       126
        
       	}

     

       116
       127
        
       

     

       117
       128
        
       	return &OAuthClient{

+285

internal/atproto/oauth/dev_auth_resolver.go

···

       1
       1
       +
       //go:build dev

     

       2
       2
       +
       

     

       3
       3
       +
       package oauth

     

       4
       4
       +
       

     

       5
       5
       +
       import (

     

       6
       6
       +
       	"context"

     

       7
       7
       +
       	"encoding/json"

     

       8
       8
       +
       	"fmt"

     

       9
       9
       +
       	"log/slog"

     

       10
       10
       +
       	"net/http"

     

       11
       11
       +
       	"net/url"

     

       12
       12
       +
       	"strings"

     

       13
       13
       +
       

     

       14
       14
       +
       	oauthlib "github.com/bluesky-social/indigo/atproto/auth/oauth"

     

       15
       15
       +
       	"github.com/bluesky-social/indigo/atproto/identity"

     

       16
       16
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       17
       17
       +
       )

     

       18
       18
       +
       

     

       19
       19
       +
       // DevAuthResolver is a custom OAuth resolver that allows HTTP localhost URLs for development.

     

       20
       20
       +
       // The standard indigo OAuth resolver requires HTTPS and no port numbers, which breaks local testing.

     

       21
       21
       +
       type DevAuthResolver struct {

     

       22
       22
       +
       	Client         *http.Client

     

       23
       23
       +
       	UserAgent      string

     

       24
       24
       +
       	PDSURL         string // For resolving handles via local PDS

     

       25
       25
       +
       	handleResolver *DevHandleResolver

     

       26
       26
       +
       }

     

       27
       27
       +
       

     

       28
       28
       +
       // ProtectedResourceMetadata matches the OAuth protected resource metadata document format

     

       29
       29
       +
       type ProtectedResourceMetadata struct {

     

       30
       30
       +
       	Resource             string   `json:"resource"`

     

       31
       31
       +
       	AuthorizationServers []string `json:"authorization_servers"`

     

       32
       32
       +
       }

     

       33
       33
       +
       

     

       34
       34
       +
       // NewDevAuthResolver creates a resolver that accepts localhost HTTP URLs

     

       35
       35
       +
       func NewDevAuthResolver(pdsURL string, allowPrivateIPs bool) *DevAuthResolver {

     

       36
       36
       +
       	resolver := &DevAuthResolver{

     

       37
       37
       +
       		Client:    NewSSRFSafeHTTPClient(allowPrivateIPs),

     

       38
       38
       +
       		UserAgent: "Coves/1.0",

     

       39
       39
       +
       		PDSURL:    pdsURL,

     

       40
       40
       +
       	}

     

       41
       41
       +
       	// Create handle resolver for resolving handles via local PDS

     

       42
       42
       +
       	if pdsURL != "" {

     

       43
       43
       +
       		resolver.handleResolver = NewDevHandleResolver(pdsURL, allowPrivateIPs)

     

       44
       44
       +
       	}

     

       45
       45
       +
       	return resolver

     

       46
       46
       +
       }

     

       47
       47
       +
       

     

       48
       48
       +
       // ResolveAuthServerURL resolves a PDS URL to an auth server URL.

     

       49
       49
       +
       // Unlike indigo's standard resolver, this allows HTTP and ports for localhost.

     

       50
       50
       +
       func (r *DevAuthResolver) ResolveAuthServerURL(ctx context.Context, hostURL string) (string, error) {

     

       51
       51
       +
       	u, err := url.Parse(hostURL)

     

       52
       52
       +
       	if err != nil {

     

       53
       53
       +
       		return "", err

     

       54
       54
       +
       	}

     

       55
       55
       +
       

     

       56
       56
       +
       	// For localhost, allow HTTP and port numbers

     

       57
       57
       +
       	isLocalhost := u.Hostname() == "localhost" || u.Hostname() == "127.0.0.1"

     

       58
       58
       +
       	if !isLocalhost {

     

       59
       59
       +
       		// For non-localhost, enforce HTTPS and no port (standard rules)

     

       60
       60
       +
       		if u.Scheme != "https" || u.Port() != "" {

     

       61
       61
       +
       			return "", fmt.Errorf("not a valid public host URL: %s", hostURL)

     

       62
       62
       +
       		}

     

       63
       63
       +
       	}

     

       64
       64
       +
       

     

       65
       65
       +
       	// Build the protected resource document URL

     

       66
       66
       +
       	var docURL string

     

       67
       67
       +
       	if isLocalhost {

     

       68
       68
       +
       		// For localhost, preserve the port and use HTTP

     

       69
       69
       +
       		port := u.Port()

     

       70
       70
       +
       		if port == "" {

     

       71
       71
       +
       			port = "3001" // Default PDS port

     

       72
       72
       +
       		}

     

       73
       73
       +
       		docURL = fmt.Sprintf("http://%s:%s/.well-known/oauth-protected-resource", u.Hostname(), port)

     

       74
       74
       +
       	} else {

     

       75
       75
       +
       		docURL = fmt.Sprintf("https://%s/.well-known/oauth-protected-resource", u.Hostname())

     

       76
       76
       +
       	}

     

       77
       77
       +
       

     

       78
       78
       +
       	// Fetch the protected resource document

     

       79
       79
       +
       	req, err := http.NewRequestWithContext(ctx, "GET", docURL, nil)

     

       80
       80
       +
       	if err != nil {

     

       81
       81
       +
       		return "", err

     

       82
       82
       +
       	}

     

       83
       83
       +
       	if r.UserAgent != "" {

     

       84
       84
       +
       		req.Header.Set("User-Agent", r.UserAgent)

     

       85
       85
       +
       	}

     

       86
       86
       +
       

     

       87
       87
       +
       	resp, err := r.Client.Do(req)

     

       88
       88
       +
       	if err != nil {

     

       89
       89
       +
       		return "", fmt.Errorf("fetching protected resource document: %w", err)

     

       90
       90
       +
       	}

     

       91
       91
       +
       	defer resp.Body.Close()

     

       92
       92
       +
       

     

       93
       93
       +
       	if resp.StatusCode != http.StatusOK {

     

       94
       94
       +
       		return "", fmt.Errorf("HTTP error fetching protected resource document: %d", resp.StatusCode)

     

       95
       95
       +
       	}

     

       96
       96
       +
       

     

       97
       97
       +
       	var body ProtectedResourceMetadata

     

       98
       98
       +
       	if err := json.NewDecoder(resp.Body).Decode(&body); err != nil {

     

       99
       99
       +
       		return "", fmt.Errorf("invalid protected resource document: %w", err)

     

       100
       100
       +
       	}

     

       101
       101
       +
       

     

       102
       102
       +
       	if len(body.AuthorizationServers) < 1 {

     

       103
       103
       +
       		return "", fmt.Errorf("no auth server URL in protected resource document")

     

       104
       104
       +
       	}

     

       105
       105
       +
       

     

       106
       106
       +
       	authURL := body.AuthorizationServers[0]

     

       107
       107
       +
       

     

       108
       108
       +
       	// Validate the auth server URL (with localhost exception)

     

       109
       109
       +
       	au, err := url.Parse(authURL)

     

       110
       110
       +
       	if err != nil {

     

       111
       111
       +
       		return "", fmt.Errorf("invalid auth server URL: %w", err)

     

       112
       112
       +
       	}

     

       113
       113
       +
       

     

       114
       114
       +
       	authIsLocalhost := au.Hostname() == "localhost" || au.Hostname() == "127.0.0.1"

     

       115
       115
       +
       	if !authIsLocalhost {

     

       116
       116
       +
       		if au.Scheme != "https" || au.Port() != "" {

     

       117
       117
       +
       			return "", fmt.Errorf("invalid auth server URL: %s", authURL)

     

       118
       118
       +
       		}

     

       119
       119
       +
       	}

     

       120
       120
       +
       

     

       121
       121
       +
       	return authURL, nil

     

       122
       122
       +
       }

     

       123
       123
       +
       

     

       124
       124
       +
       // ResolveAuthServerMetadataDev fetches OAuth server metadata from a given auth server URL.

     

       125
       125
       +
       // Unlike indigo's resolver, this allows HTTP and ports for localhost.

     

       126
       126
       +
       func (r *DevAuthResolver) ResolveAuthServerMetadataDev(ctx context.Context, serverURL string) (*oauthlib.AuthServerMetadata, error) {

     

       127
       127
       +
       	u, err := url.Parse(serverURL)

     

       128
       128
       +
       	if err != nil {

     

       129
       129
       +
       		return nil, err

     

       130
       130
       +
       	}

     

       131
       131
       +
       

     

       132
       132
       +
       	// Build metadata URL - preserve port for localhost

     

       133
       133
       +
       	var metaURL string

     

       134
       134
       +
       	isLocalhost := u.Hostname() == "localhost" || u.Hostname() == "127.0.0.1"

     

       135
       135
       +
       	if isLocalhost && u.Port() != "" {

     

       136
       136
       +
       		metaURL = fmt.Sprintf("%s://%s:%s/.well-known/oauth-authorization-server", u.Scheme, u.Hostname(), u.Port())

     

       137
       137
       +
       	} else if isLocalhost {

     

       138
       138
       +
       		metaURL = fmt.Sprintf("%s://%s/.well-known/oauth-authorization-server", u.Scheme, u.Hostname())

     

       139
       139
       +
       	} else {

     

       140
       140
       +
       		metaURL = fmt.Sprintf("https://%s/.well-known/oauth-authorization-server", u.Hostname())

     

       141
       141
       +
       	}

     

       142
       142
       +
       

     

       143
       143
       +
       	slog.Debug("dev mode: fetching auth server metadata", "url", metaURL)

     

       144
       144
       +
       

     

       145
       145
       +
       	req, err := http.NewRequestWithContext(ctx, "GET", metaURL, nil)

     

       146
       146
       +
       	if err != nil {

     

       147
       147
       +
       		return nil, err

     

       148
       148
       +
       	}

     

       149
       149
       +
       	if r.UserAgent != "" {

     

       150
       150
       +
       		req.Header.Set("User-Agent", r.UserAgent)

     

       151
       151
       +
       	}

     

       152
       152
       +
       

     

       153
       153
       +
       	resp, err := r.Client.Do(req)

     

       154
       154
       +
       	if err != nil {

     

       155
       155
       +
       		return nil, fmt.Errorf("fetching auth server metadata: %w", err)

     

       156
       156
       +
       	}

     

       157
       157
       +
       	defer resp.Body.Close()

     

       158
       158
       +
       

     

       159
       159
       +
       	if resp.StatusCode != http.StatusOK {

     

       160
       160
       +
       		return nil, fmt.Errorf("HTTP error fetching auth server metadata: %d", resp.StatusCode)

     

       161
       161
       +
       	}

     

       162
       162
       +
       

     

       163
       163
       +
       	var metadata oauthlib.AuthServerMetadata

     

       164
       164
       +
       	if err := json.NewDecoder(resp.Body).Decode(&metadata); err != nil {

     

       165
       165
       +
       		return nil, fmt.Errorf("invalid auth server metadata: %w", err)

     

       166
       166
       +
       	}

     

       167
       167
       +
       

     

       168
       168
       +
       	// Skip validation for localhost (indigo's Validate checks HTTPS)

     

       169
       169
       +
       	if !isLocalhost {

     

       170
       170
       +
       		if err := metadata.Validate(serverURL); err != nil {

     

       171
       171
       +
       			return nil, fmt.Errorf("invalid auth server metadata: %w", err)

     

       172
       172
       +
       		}

     

       173
       173
       +
       	}

     

       174
       174
       +
       

     

       175
       175
       +
       	return &metadata, nil

     

       176
       176
       +
       }

     

       177
       177
       +
       

     

       178
       178
       +
       // StartDevAuthFlow performs OAuth flow for localhost development.

     

       179
       179
       +
       // This bypasses indigo's HTTPS validation for the auth server URL.

     

       180
       180
       +
       // It resolves the identity, gets the PDS endpoint, fetches auth server metadata,

     

       181
       181
       +
       // and returns a redirect URL for the user to approve.

     

       182
       182
       +
       func (r *DevAuthResolver) StartDevAuthFlow(ctx context.Context, client *OAuthClient, identifier string, dir identity.Directory) (string, error) {

     

       183
       183
       +
       	var accountDID syntax.DID

     

       184
       184
       +
       	var pdsEndpoint string

     

       185
       185
       +
       

     

       186
       186
       +
       	// Check if identifier is a handle or DID

     

       187
       187
       +
       	if strings.HasPrefix(identifier, "did:") {

     

       188
       188
       +
       		// It's a DID - look up via directory (PLC)

     

       189
       189
       +
       		atid, err := syntax.ParseAtIdentifier(identifier)

     

       190
       190
       +
       		if err != nil {

     

       191
       191
       +
       			return "", fmt.Errorf("not a valid DID (%s): %w", identifier, err)

     

       192
       192
       +
       		}

     

       193
       193
       +
       		ident, err := dir.Lookup(ctx, *atid)

     

       194
       194
       +
       		if err != nil {

     

       195
       195
       +
       			return "", fmt.Errorf("failed to resolve DID (%s): %w", identifier, err)

     

       196
       196
       +
       		}

     

       197
       197
       +
       		accountDID = ident.DID

     

       198
       198
       +
       		pdsEndpoint = ident.PDSEndpoint()

     

       199
       199
       +
       	} else {

     

       200
       200
       +
       		// It's a handle - resolve via local PDS first

     

       201
       201
       +
       		if r.handleResolver == nil {

     

       202
       202
       +
       			return "", fmt.Errorf("handle resolution not configured (PDS URL not set)")

     

       203
       203
       +
       		}

     

       204
       204
       +
       

     

       205
       205
       +
       		// Resolve handle to DID via local PDS

     

       206
       206
       +
       		did, err := r.handleResolver.ResolveHandle(ctx, identifier)

     

       207
       207
       +
       		if err != nil {

     

       208
       208
       +
       			return "", fmt.Errorf("failed to resolve handle via PDS (%s): %w", identifier, err)

     

       209
       209
       +
       		}

     

       210
       210
       +
       		if did == "" {

     

       211
       211
       +
       			return "", fmt.Errorf("handle not found: %s", identifier)

     

       212
       212
       +
       		}

     

       213
       213
       +
       

     

       214
       214
       +
       		slog.Info("dev mode: resolved handle via local PDS", "handle", identifier, "did", did)

     

       215
       215
       +
       

     

       216
       216
       +
       		// Parse the DID

     

       217
       217
       +
       		parsedDID, err := syntax.ParseDID(did)

     

       218
       218
       +
       		if err != nil {

     

       219
       219
       +
       			return "", fmt.Errorf("invalid DID from PDS (%s): %w", did, err)

     

       220
       220
       +
       		}

     

       221
       221
       +
       		accountDID = parsedDID

     

       222
       222
       +
       

     

       223
       223
       +
       		// Now look up the DID document via PLC to get PDS endpoint

     

       224
       224
       +
       		atid, err := syntax.ParseAtIdentifier(did)

     

       225
       225
       +
       		if err != nil {

     

       226
       226
       +
       			return "", fmt.Errorf("not a valid DID (%s): %w", did, err)

     

       227
       227
       +
       		}

     

       228
       228
       +
       		ident, err := dir.Lookup(ctx, *atid)

     

       229
       229
       +
       		if err != nil {

     

       230
       230
       +
       			return "", fmt.Errorf("failed to resolve DID document (%s): %w", did, err)

     

       231
       231
       +
       		}

     

       232
       232
       +
       		pdsEndpoint = ident.PDSEndpoint()

     

       233
       233
       +
       	}

     

       234
       234
       +
       

     

       235
       235
       +
       	if pdsEndpoint == "" {

     

       236
       236
       +
       		return "", fmt.Errorf("identity does not link to an atproto host (PDS)")

     

       237
       237
       +
       	}

     

       238
       238
       +
       

     

       239
       239
       +
       	slog.Debug("dev mode: resolving auth server",

     

       240
       240
       +
       		"did", accountDID,

     

       241
       241
       +
       		"pds", pdsEndpoint)

     

       242
       242
       +
       

     

       243
       243
       +
       	// Resolve auth server URL (allowing HTTP for localhost)

     

       244
       244
       +
       	authServerURL, err := r.ResolveAuthServerURL(ctx, pdsEndpoint)

     

       245
       245
       +
       	if err != nil {

     

       246
       246
       +
       		return "", fmt.Errorf("resolving auth server: %w", err)

     

       247
       247
       +
       	}

     

       248
       248
       +
       

     

       249
       249
       +
       	slog.Info("dev mode: resolved auth server", "url", authServerURL)

     

       250
       250
       +
       

     

       251
       251
       +
       	// Fetch auth server metadata using our dev-friendly resolver

     

       252
       252
       +
       	authMeta, err := r.ResolveAuthServerMetadataDev(ctx, authServerURL)

     

       253
       253
       +
       	if err != nil {

     

       254
       254
       +
       		return "", fmt.Errorf("fetching auth server metadata: %w", err)

     

       255
       255
       +
       	}

     

       256
       256
       +
       

     

       257
       257
       +
       	slog.Debug("dev mode: got auth server metadata",

     

       258
       258
       +
       		"issuer", authMeta.Issuer,

     

       259
       259
       +
       		"authorization_endpoint", authMeta.AuthorizationEndpoint,

     

       260
       260
       +
       		"token_endpoint", authMeta.TokenEndpoint)

     

       261
       261
       +
       

     

       262
       262
       +
       	// Send auth request (PAR) using indigo's method

     

       263
       263
       +
       	info, err := client.ClientApp.SendAuthRequest(ctx, authMeta, client.Config.Scopes, identifier)

     

       264
       264
       +
       	if err != nil {

     

       265
       265
       +
       		return "", fmt.Errorf("auth request failed: %w", err)

     

       266
       266
       +
       	}

     

       267
       267
       +
       

     

       268
       268
       +
       	// Set the account DID

     

       269
       269
       +
       	info.AccountDID = &accountDID

     

       270
       270
       +
       

     

       271
       271
       +
       	// Persist auth request info

     

       272
       272
       +
       	client.ClientApp.Store.SaveAuthRequestInfo(ctx, *info)

     

       273
       273
       +
       

     

       274
       274
       +
       	// Build redirect URL

     

       275
       275
       +
       	params := url.Values{}

     

       276
       276
       +
       	params.Set("client_id", client.ClientApp.Config.ClientID)

     

       277
       277
       +
       	params.Set("request_uri", info.RequestURI)

     

       278
       278
       +
       

     

       279
       279
       +
       	authEndpoint := authMeta.AuthorizationEndpoint

     

       280
       280
       +
       	redirectURL := fmt.Sprintf("%s?%s", authEndpoint, params.Encode())

     

       281
       281
       +
       

     

       282
       282
       +
       	slog.Info("dev mode: OAuth redirect URL built", "url_prefix", authEndpoint)

     

       283
       283
       +
       

     

       284
       284
       +
       	return redirectURL, nil

     

       285
       285
       +
       }

+106

internal/atproto/oauth/dev_resolver.go

···

       1
       1
       +
       //go:build dev

     

       2
       2
       +
       

     

       3
       3
       +
       package oauth

     

       4
       4
       +
       

     

       5
       5
       +
       import (

     

       6
       6
       +
       	"context"

     

       7
       7
       +
       	"encoding/json"

     

       8
       8
       +
       	"fmt"

     

       9
       9
       +
       	"log/slog"

     

       10
       10
       +
       	"net/http"

     

       11
       11
       +
       	"net/url"

     

       12
       12
       +
       	"strings"

     

       13
       13
       +
       	"time"

     

       14
       14
       +
       )

     

       15
       15
       +
       

     

       16
       16
       +
       // DevHandleResolver resolves handles via local PDS for development

     

       17
       17
       +
       // This is needed because local handles (e.g., user.local.coves.dev) can't be

     

       18
       18
       +
       // resolved via standard DNS/HTTP well-known methods - they only exist on the local PDS.

     

       19
       19
       +
       type DevHandleResolver struct {

     

       20
       20
       +
       	pdsURL     string

     

       21
       21
       +
       	httpClient *http.Client

     

       22
       22
       +
       }

     

       23
       23
       +
       

     

       24
       24
       +
       // NewDevHandleResolver creates a resolver that queries local PDS for handle resolution

     

       25
       25
       +
       func NewDevHandleResolver(pdsURL string, allowPrivateIPs bool) *DevHandleResolver {

     

       26
       26
       +
       	return &DevHandleResolver{

     

       27
       27
       +
       		pdsURL:     strings.TrimSuffix(pdsURL, "/"),

     

       28
       28
       +
       		httpClient: NewSSRFSafeHTTPClient(allowPrivateIPs),

     

       29
       29
       +
       	}

     

       30
       30
       +
       }

     

       31
       31
       +
       

     

       32
       32
       +
       // ResolveHandle queries the local PDS to resolve a handle to a DID

     

       33
       33
       +
       // Returns the DID if successful, or empty string if not found

     

       34
       34
       +
       func (r *DevHandleResolver) ResolveHandle(ctx context.Context, handle string) (string, error) {

     

       35
       35
       +
       	if r.pdsURL == "" {

     

       36
       36
       +
       		return "", fmt.Errorf("PDS URL not configured")

     

       37
       37
       +
       	}

     

       38
       38
       +
       

     

       39
       39
       +
       	// Build the resolve handle URL

     

       40
       40
       +
       	resolveURL := fmt.Sprintf("%s/xrpc/com.atproto.identity.resolveHandle?handle=%s",

     

       41
       41
       +
       		r.pdsURL, url.QueryEscape(handle))

     

       42
       42
       +
       

     

       43
       43
       +
       	// Create request with context and timeout

     

       44
       44
       +
       	ctx, cancel := context.WithTimeout(ctx, 10*time.Second)

     

       45
       45
       +
       	defer cancel()

     

       46
       46
       +
       

     

       47
       47
       +
       	req, err := http.NewRequestWithContext(ctx, "GET", resolveURL, nil)

     

       48
       48
       +
       	if err != nil {

     

       49
       49
       +
       		return "", fmt.Errorf("failed to create request: %w", err)

     

       50
       50
       +
       	}

     

       51
       51
       +
       	req.Header.Set("User-Agent", "Coves/1.0")

     

       52
       52
       +
       

     

       53
       53
       +
       	// Execute request

     

       54
       54
       +
       	resp, err := r.httpClient.Do(req)

     

       55
       55
       +
       	if err != nil {

     

       56
       56
       +
       		return "", fmt.Errorf("failed to query PDS: %w", err)

     

       57
       57
       +
       	}

     

       58
       58
       +
       	defer resp.Body.Close()

     

       59
       59
       +
       

     

       60
       60
       +
       	// Check response status

     

       61
       61
       +
       	if resp.StatusCode == http.StatusNotFound || resp.StatusCode == http.StatusBadRequest {

     

       62
       62
       +
       		return "", nil // Handle not found

     

       63
       63
       +
       	}

     

       64
       64
       +
       	if resp.StatusCode != http.StatusOK {

     

       65
       65
       +
       		return "", fmt.Errorf("PDS returned status %d", resp.StatusCode)

     

       66
       66
       +
       	}

     

       67
       67
       +
       

     

       68
       68
       +
       	// Parse response

     

       69
       69
       +
       	var result struct {

     

       70
       70
       +
       		DID string `json:"did"`

     

       71
       71
       +
       	}

     

       72
       72
       +
       	if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {

     

       73
       73
       +
       		return "", fmt.Errorf("failed to parse PDS response: %w", err)

     

       74
       74
       +
       	}

     

       75
       75
       +
       

     

       76
       76
       +
       	if result.DID == "" {

     

       77
       77
       +
       		return "", nil // No DID in response

     

       78
       78
       +
       	}

     

       79
       79
       +
       

     

       80
       80
       +
       	slog.Debug("resolved handle via local PDS",

     

       81
       81
       +
       		"handle", handle,

     

       82
       82
       +
       		"did", result.DID,

     

       83
       83
       +
       		"pds_url", r.pdsURL)

     

       84
       84
       +
       

     

       85
       85
       +
       	return result.DID, nil

     

       86
       86
       +
       }

     

       87
       87
       +
       

     

       88
       88
       +
       // ResolveIdentifier attempts to resolve a handle to DID, or returns the DID if already provided

     

       89
       89
       +
       // This is the main entry point for the handlers

     

       90
       90
       +
       func (r *DevHandleResolver) ResolveIdentifier(ctx context.Context, identifier string) (string, error) {

     

       91
       91
       +
       	// If it's already a DID, return as-is

     

       92
       92
       +
       	if strings.HasPrefix(identifier, "did:") {

     

       93
       93
       +
       		return identifier, nil

     

       94
       94
       +
       	}

     

       95
       95
       +
       

     

       96
       96
       +
       	// Try to resolve the handle via local PDS

     

       97
       97
       +
       	did, err := r.ResolveHandle(ctx, identifier)

     

       98
       98
       +
       	if err != nil {

     

       99
       99
       +
       		return "", fmt.Errorf("failed to resolve handle via PDS: %w", err)

     

       100
       100
       +
       	}

     

       101
       101
       +
       	if did == "" {

     

       102
       102
       +
       		return "", fmt.Errorf("handle not found on local PDS: %s", identifier)

     

       103
       103
       +
       	}

     

       104
       104
       +
       

     

       105
       105
       +
       	return did, nil

     

       106
       106
       +
       }

+41

internal/atproto/oauth/dev_stubs.go

···

       1
       1
       +
       //go:build !dev

     

       2
       2
       +
       

     

       3
       3
       +
       package oauth

     

       4
       4
       +
       

     

       5
       5
       +
       import (

     

       6
       6
       +
       	"context"

     

       7
       7
       +
       

     

       8
       8
       +
       	"github.com/bluesky-social/indigo/atproto/identity"

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       // DevHandleResolver is a stub for production builds.

     

       12
       12
       +
       // The actual implementation is in dev_resolver.go (only compiled with -tags dev).

     

       13
       13
       +
       type DevHandleResolver struct{}

     

       14
       14
       +
       

     

       15
       15
       +
       // NewDevHandleResolver returns nil in production builds.

     

       16
       16
       +
       // Dev mode features are only available when built with -tags dev.

     

       17
       17
       +
       func NewDevHandleResolver(pdsURL string, allowPrivateIPs bool) *DevHandleResolver {

     

       18
       18
       +
       	return nil

     

       19
       19
       +
       }

     

       20
       20
       +
       

     

       21
       21
       +
       // ResolveHandle is a stub that should never be called in production.

     

       22
       22
       +
       // The nil check in handlers.go prevents this from being reached.

     

       23
       23
       +
       func (r *DevHandleResolver) ResolveHandle(ctx context.Context, handle string) (string, error) {

     

       24
       24
       +
       	panic("dev mode: ResolveHandle called in production build - this should never happen")

     

       25
       25
       +
       }

     

       26
       26
       +
       

     

       27
       27
       +
       // DevAuthResolver is a stub for production builds.

     

       28
       28
       +
       // The actual implementation is in dev_auth_resolver.go (only compiled with -tags dev).

     

       29
       29
       +
       type DevAuthResolver struct{}

     

       30
       30
       +
       

     

       31
       31
       +
       // NewDevAuthResolver returns nil in production builds.

     

       32
       32
       +
       // Dev mode features are only available when built with -tags dev.

     

       33
       33
       +
       func NewDevAuthResolver(pdsURL string, allowPrivateIPs bool) *DevAuthResolver {

     

       34
       34
       +
       	return nil

     

       35
       35
       +
       }

     

       36
       36
       +
       

     

       37
       37
       +
       // StartDevAuthFlow is a stub that should never be called in production.

     

       38
       38
       +
       // The nil check in handlers.go prevents this from being reached.

     

       39
       39
       +
       func (r *DevAuthResolver) StartDevAuthFlow(ctx context.Context, client *OAuthClient, identifier string, dir identity.Directory) (string, error) {

     

       40
       40
       +
       	panic("dev mode: StartDevAuthFlow called in production build - this should never happen")

     

       41
       41
       +
       }

+5 -1

scripts/dev-run.sh

···

       1
       1
        
       #!/bin/bash

     

       2
       2
        
       # Development server runner - loads .env.dev before starting

     

       3
       3
       +
       # Uses -tags dev to include dev-only code (localhost OAuth resolvers, etc.)

     

       3
       4
        
       

     

       4
       5
        
       set -a  # automatically export all variables

     

       5
       6
        
       source .env.dev

     
···

       9
       10
        
       echo "   IS_DEV_ENV: $IS_DEV_ENV"

     

       10
       11
        
       echo "   PLC_DIRECTORY_URL: $PLC_DIRECTORY_URL"

     

       11
       12
        
       echo "   JETSTREAM_URL: $JETSTREAM_URL"

     

       13
       13
       +
       echo "   APPVIEW_PUBLIC_URL: $APPVIEW_PUBLIC_URL"

     

       14
       14
       +
       echo "   PDS_URL: $PDS_URL"

     

       15
       15
       +
       echo "   Build tags: dev"

     

       12
       16
        
       echo ""

     

       13
       17
        
       

     

       14
       14
       -
       go run ./cmd/server

     

       18
       18
       +
       go run -tags dev ./cmd/server

+125

internal/atproto/pds/factory.go

···

       1
       1
       +
       package pds

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       	"fmt"

     

       6
       6
       +
       	"net/http"

     

       7
       7
       +
       

     

       8
       8
       +
       	"github.com/bluesky-social/indigo/atproto/atclient"

     

       9
       9
       +
       	"github.com/bluesky-social/indigo/atproto/auth/oauth"

     

       10
       10
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       11
       11
       +
       )

     

       12
       12
       +
       

     

       13
       13
       +
       // NewFromOAuthSession creates a PDS client from an OAuth session.

     

       14
       14
       +
       // This uses DPoP authentication - the correct method for OAuth tokens.

     

       15
       15
       +
       //

     

       16
       16
       +
       // The oauthClient is used to resume the session and get a properly configured

     

       17
       17
       +
       // APIClient that handles DPoP proof generation and nonce rotation automatically.

     

       18
       18
       +
       func NewFromOAuthSession(ctx context.Context, oauthClient *oauth.ClientApp, sessionData *oauth.ClientSessionData) (Client, error) {

     

       19
       19
       +
       	if oauthClient == nil {

     

       20
       20
       +
       		return nil, fmt.Errorf("oauthClient is required")

     

       21
       21
       +
       	}

     

       22
       22
       +
       	if sessionData == nil {

     

       23
       23
       +
       		return nil, fmt.Errorf("sessionData is required")

     

       24
       24
       +
       	}

     

       25
       25
       +
       

     

       26
       26
       +
       	// ResumeSession reconstructs the OAuth session with DPoP key

     

       27
       27
       +
       	// and returns a ClientSession that can generate authenticated requests

     

       28
       28
       +
       	sess, err := oauthClient.ResumeSession(ctx, sessionData.AccountDID, sessionData.SessionID)

     

       29
       29
       +
       	if err != nil {

     

       30
       30
       +
       		return nil, fmt.Errorf("failed to resume OAuth session: %w", err)

     

       31
       31
       +
       	}

     

       32
       32
       +
       

     

       33
       33
       +
       	// APIClient() returns an *atclient.APIClient configured with DPoP auth

     

       34
       34
       +
       	apiClient := sess.APIClient()

     

       35
       35
       +
       

     

       36
       36
       +
       	return &client{

     

       37
       37
       +
       		apiClient: apiClient,

     

       38
       38
       +
       		did:       sessionData.AccountDID.String(),

     

       39
       39
       +
       		host:      sessionData.HostURL,

     

       40
       40
       +
       	}, nil

     

       41
       41
       +
       }

     

       42
       42
       +
       

     

       43
       43
       +
       // NewFromPasswordAuth creates a PDS client using password authentication.

     

       44
       44
       +
       // This uses Bearer token authentication from com.atproto.server.createSession.

     

       45
       45
       +
       //

     

       46
       46
       +
       // Primarily used for:

     

       47
       47
       +
       // - E2E tests with local PDS

     

       48
       48
       +
       // - Development/debugging tools

     

       49
       49
       +
       // - Non-OAuth clients

     

       50
       50
       +
       //

     

       51
       51
       +
       // Note: This establishes a new session with the PDS. For repeated calls,

     

       52
       52
       +
       // consider using NewFromAccessToken if you already have a valid access token.

     

       53
       53
       +
       func NewFromPasswordAuth(ctx context.Context, host, handle, password string) (Client, error) {

     

       54
       54
       +
       	if host == "" {

     

       55
       55
       +
       		return nil, fmt.Errorf("host is required")

     

       56
       56
       +
       	}

     

       57
       57
       +
       	if handle == "" {

     

       58
       58
       +
       		return nil, fmt.Errorf("handle is required")

     

       59
       59
       +
       	}

     

       60
       60
       +
       	if password == "" {

     

       61
       61
       +
       		return nil, fmt.Errorf("password is required")

     

       62
       62
       +
       	}

     

       63
       63
       +
       

     

       64
       64
       +
       	// LoginWithPasswordHost creates a session and returns an authenticated APIClient

     

       65
       65
       +
       	// This handles the createSession call and Bearer token setup

     

       66
       66
       +
       	apiClient, err := atclient.LoginWithPasswordHost(ctx, host, handle, password, "", nil)

     

       67
       67
       +
       	if err != nil {

     

       68
       68
       +
       		return nil, fmt.Errorf("failed to login with password: %w", err)

     

       69
       69
       +
       	}

     

       70
       70
       +
       

     

       71
       71
       +
       	// Get DID from the authenticated client

     

       72
       72
       +
       	did := ""

     

       73
       73
       +
       	if apiClient.AccountDID != nil {

     

       74
       74
       +
       		did = apiClient.AccountDID.String()

     

       75
       75
       +
       	}

     

       76
       76
       +
       

     

       77
       77
       +
       	return &client{

     

       78
       78
       +
       		apiClient: apiClient,

     

       79
       79
       +
       		did:       did,

     

       80
       80
       +
       		host:      host,

     

       81
       81
       +
       	}, nil

     

       82
       82
       +
       }

     

       83
       83
       +
       

     

       84
       84
       +
       // NewFromAccessToken creates a PDS client from an existing access token.

     

       85
       85
       +
       // This is useful when you already have a valid Bearer token (e.g., from createSession)

     

       86
       86
       +
       // and don't want to re-authenticate.

     

       87
       87
       +
       //

     

       88
       88
       +
       // WARNING: This creates a client with Bearer auth only. Do NOT use this with

     

       89
       89
       +
       // OAuth access tokens - those require DPoP proofs. Use NewFromOAuthSession instead.

     

       90
       90
       +
       func NewFromAccessToken(host, did, accessToken string) (Client, error) {

     

       91
       91
       +
       	if host == "" {

     

       92
       92
       +
       		return nil, fmt.Errorf("host is required")

     

       93
       93
       +
       	}

     

       94
       94
       +
       	if did == "" {

     

       95
       95
       +
       		return nil, fmt.Errorf("did is required")

     

       96
       96
       +
       	}

     

       97
       97
       +
       	if accessToken == "" {

     

       98
       98
       +
       		return nil, fmt.Errorf("accessToken is required")

     

       99
       99
       +
       	}

     

       100
       100
       +
       

     

       101
       101
       +
       	// Create APIClient with Bearer auth

     

       102
       102
       +
       	apiClient := atclient.NewAPIClient(host)

     

       103
       103
       +
       	apiClient.Auth = &bearerAuth{token: accessToken}

     

       104
       104
       +
       

     

       105
       105
       +
       	return &client{

     

       106
       106
       +
       		apiClient: apiClient,

     

       107
       107
       +
       		did:       did,

     

       108
       108
       +
       		host:      host,

     

       109
       109
       +
       	}, nil

     

       110
       110
       +
       }

     

       111
       111
       +
       

     

       112
       112
       +
       // bearerAuth implements atclient.AuthMethod for simple Bearer token auth.

     

       113
       113
       +
       // This is used for password-based sessions where DPoP is not required.

     

       114
       114
       +
       type bearerAuth struct {

     

       115
       115
       +
       	token string

     

       116
       116
       +
       }

     

       117
       117
       +
       

     

       118
       118
       +
       // Ensure bearerAuth implements atclient.AuthMethod.

     

       119
       119
       +
       var _ atclient.AuthMethod = (*bearerAuth)(nil)

     

       120
       120
       +
       

     

       121
       121
       +
       // DoWithAuth adds the Bearer token to the request and executes it.

     

       122
       122
       +
       func (b *bearerAuth) DoWithAuth(c *http.Client, req *http.Request, _ syntax.NSID) (*http.Response, error) {

     

       123
       123
       +
       	req.Header.Set("Authorization", "Bearer "+b.token)

     

       124
       124
       +
       	return c.Do(req)

     

       125
       125
       +
       }

+18

tests/integration/helpers.go

···

       3
       3
        
       import (

     

       4
       4
        
       	"Coves/internal/api/middleware"

     

       5
       5
        
       	"Coves/internal/atproto/oauth"

     

       6
       6
       +
       	"Coves/internal/atproto/pds"

     

       6
       7
        
       	"Coves/internal/core/users"

     

       8
       8
       +
       	"Coves/internal/core/votes"

     

       7
       9
        
       	"bytes"

     

       8
       10
        
       	"context"

     

       9
       11
        
       	"database/sql"

     
···

       425
       427
        
       	e.store.AddSessionWithPDS(did, sessionID, pdsAccessToken, pdsURL)

     

       426
       428
        
       	return token

     

       427
       429
        
       }

     

       430
       430
       +
       

     

       431
       431
       +
       // PasswordAuthPDSClientFactory creates a PDSClientFactory that uses password-based Bearer auth.

     

       432
       432
       +
       // This is for E2E tests that use createSession instead of OAuth.

     

       433
       433
       +
       // The factory extracts the access token and host URL from the session data.

     

       434
       434
       +
       func PasswordAuthPDSClientFactory() votes.PDSClientFactory {

     

       435
       435
       +
       	return func(ctx context.Context, session *oauthlib.ClientSessionData) (pds.Client, error) {

     

       436
       436
       +
       		if session.AccessToken == "" {

     

       437
       437
       +
       			return nil, fmt.Errorf("session has no access token")

     

       438
       438
       +
       		}

     

       439
       439
       +
       		if session.HostURL == "" {

     

       440
       440
       +
       			return nil, fmt.Errorf("session has no host URL")

     

       441
       441
       +
       		}

     

       442
       442
       +
       

     

       443
       443
       +
       		return pds.NewFromAccessToken(session.HostURL, session.AccountDID.String(), session.AccessToken)

     

       444
       444
       +
       	}

     

       445
       445
       +
       }

+267

cmd/reindex-votes/main.go

···

       1
       1
       +
       // cmd/reindex-votes/main.go

     

       2
       2
       +
       // Quick tool to reindex votes from PDS to AppView database

     

       3
       3
       +
       package main

     

       4
       4
       +
       

     

       5
       5
       +
       import (

     

       6
       6
       +
       	"context"

     

       7
       7
       +
       	"database/sql"

     

       8
       8
       +
       	"encoding/json"

     

       9
       9
       +
       	"fmt"

     

       10
       10
       +
       	"log"

     

       11
       11
       +
       	"net/http"

     

       12
       12
       +
       	"net/url"

     

       13
       13
       +
       	"os"

     

       14
       14
       +
       	"strings"

     

       15
       15
       +
       	"time"

     

       16
       16
       +
       

     

       17
       17
       +
       	_ "github.com/lib/pq"

     

       18
       18
       +
       )

     

       19
       19
       +
       

     

       20
       20
       +
       type ListRecordsResponse struct {

     

       21
       21
       +
       	Records []Record `json:"records"`

     

       22
       22
       +
       	Cursor  string   `json:"cursor"`

     

       23
       23
       +
       }

     

       24
       24
       +
       

     

       25
       25
       +
       type Record struct {

     

       26
       26
       +
       	URI   string                 `json:"uri"`

     

       27
       27
       +
       	CID   string                 `json:"cid"`

     

       28
       28
       +
       	Value map[string]interface{} `json:"value"`

     

       29
       29
       +
       }

     

       30
       30
       +
       

     

       31
       31
       +
       func main() {

     

       32
       32
       +
       	// Get config from env

     

       33
       33
       +
       	dbURL := os.Getenv("DATABASE_URL")

     

       34
       34
       +
       	if dbURL == "" {

     

       35
       35
       +
       		dbURL = "postgres://dev_user:dev_password@localhost:5435/coves_dev?sslmode=disable"

     

       36
       36
       +
       	}

     

       37
       37
       +
       	pdsURL := os.Getenv("PDS_URL")

     

       38
       38
       +
       	if pdsURL == "" {

     

       39
       39
       +
       		pdsURL = "http://localhost:3001"

     

       40
       40
       +
       	}

     

       41
       41
       +
       

     

       42
       42
       +
       	log.Printf("Connecting to database...")

     

       43
       43
       +
       	db, err := sql.Open("postgres", dbURL)

     

       44
       44
       +
       	if err != nil {

     

       45
       45
       +
       		log.Fatalf("Failed to connect to database: %v", err)

     

       46
       46
       +
       	}

     

       47
       47
       +
       	defer db.Close()

     

       48
       48
       +
       

     

       49
       49
       +
       	ctx := context.Background()

     

       50
       50
       +
       

     

       51
       51
       +
       	// Get all accounts directly from the PDS

     

       52
       52
       +
       	log.Printf("Fetching accounts from PDS (%s)...", pdsURL)

     

       53
       53
       +
       	dids, err := fetchAllAccountsFromPDS(pdsURL)

     

       54
       54
       +
       	if err != nil {

     

       55
       55
       +
       		log.Fatalf("Failed to fetch accounts from PDS: %v", err)

     

       56
       56
       +
       	}

     

       57
       57
       +
       	log.Printf("Found %d accounts on PDS to check for votes", len(dids))

     

       58
       58
       +
       

     

       59
       59
       +
       	// Reset vote counts first

     

       60
       60
       +
       	log.Printf("Resetting all vote counts...")

     

       61
       61
       +
       	if _, err := db.ExecContext(ctx, "DELETE FROM votes"); err != nil {

     

       62
       62
       +
       		log.Fatalf("Failed to clear votes table: %v", err)

     

       63
       63
       +
       	}

     

       64
       64
       +
       	if _, err := db.ExecContext(ctx, "UPDATE posts SET upvote_count = 0, downvote_count = 0, score = 0"); err != nil {

     

       65
       65
       +
       		log.Fatalf("Failed to reset post vote counts: %v", err)

     

       66
       66
       +
       	}

     

       67
       67
       +
       	if _, err := db.ExecContext(ctx, "UPDATE comments SET upvote_count = 0, downvote_count = 0, score = 0"); err != nil {

     

       68
       68
       +
       		log.Fatalf("Failed to reset comment vote counts: %v", err)

     

       69
       69
       +
       	}

     

       70
       70
       +
       

     

       71
       71
       +
       	// For each user, fetch their votes from PDS

     

       72
       72
       +
       	totalVotes := 0

     

       73
       73
       +
       	for _, did := range dids {

     

       74
       74
       +
       		votes, err := fetchVotesFromPDS(pdsURL, did)

     

       75
       75
       +
       		if err != nil {

     

       76
       76
       +
       			log.Printf("Warning: failed to fetch votes for %s: %v", did, err)

     

       77
       77
       +
       			continue

     

       78
       78
       +
       		}

     

       79
       79
       +
       

     

       80
       80
       +
       		if len(votes) == 0 {

     

       81
       81
       +
       			continue

     

       82
       82
       +
       		}

     

       83
       83
       +
       

     

       84
       84
       +
       		log.Printf("Found %d votes for %s", len(votes), did)

     

       85
       85
       +
       

     

       86
       86
       +
       		// Index each vote

     

       87
       87
       +
       		for _, vote := range votes {

     

       88
       88
       +
       			if err := indexVote(ctx, db, did, vote); err != nil {

     

       89
       89
       +
       				log.Printf("Warning: failed to index vote %s: %v", vote.URI, err)

     

       90
       90
       +
       				continue

     

       91
       91
       +
       			}

     

       92
       92
       +
       			totalVotes++

     

       93
       93
       +
       		}

     

       94
       94
       +
       	}

     

       95
       95
       +
       

     

       96
       96
       +
       	log.Printf("✓ Reindexed %d votes from PDS", totalVotes)

     

       97
       97
       +
       }

     

       98
       98
       +
       

     

       99
       99
       +
       // fetchAllAccountsFromPDS queries the PDS sync API to get all repo DIDs

     

       100
       100
       +
       func fetchAllAccountsFromPDS(pdsURL string) ([]string, error) {

     

       101
       101
       +
       	// Use com.atproto.sync.listRepos to get all repos on this PDS

     

       102
       102
       +
       	var allDIDs []string

     

       103
       103
       +
       	cursor := ""

     

       104
       104
       +
       

     

       105
       105
       +
       	for {

     

       106
       106
       +
       		reqURL := fmt.Sprintf("%s/xrpc/com.atproto.sync.listRepos?limit=100", pdsURL)

     

       107
       107
       +
       		if cursor != "" {

     

       108
       108
       +
       			reqURL += "&cursor=" + url.QueryEscape(cursor)

     

       109
       109
       +
       		}

     

       110
       110
       +
       

     

       111
       111
       +
       		resp, err := http.Get(reqURL)

     

       112
       112
       +
       		if err != nil {

     

       113
       113
       +
       			return nil, fmt.Errorf("HTTP request failed: %w", err)

     

       114
       114
       +
       		}

     

       115
       115
       +
       		defer resp.Body.Close()

     

       116
       116
       +
       

     

       117
       117
       +
       		if resp.StatusCode != 200 {

     

       118
       118
       +
       			return nil, fmt.Errorf("unexpected status code: %d", resp.StatusCode)

     

       119
       119
       +
       		}

     

       120
       120
       +
       

     

       121
       121
       +
       		var result struct {

     

       122
       122
       +
       			Repos []struct {

     

       123
       123
       +
       				DID string `json:"did"`

     

       124
       124
       +
       			} `json:"repos"`

     

       125
       125
       +
       			Cursor string `json:"cursor"`

     

       126
       126
       +
       		}

     

       127
       127
       +
       		if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {

     

       128
       128
       +
       			return nil, fmt.Errorf("failed to decode response: %w", err)

     

       129
       129
       +
       		}

     

       130
       130
       +
       

     

       131
       131
       +
       		for _, repo := range result.Repos {

     

       132
       132
       +
       			allDIDs = append(allDIDs, repo.DID)

     

       133
       133
       +
       		}

     

       134
       134
       +
       

     

       135
       135
       +
       		if result.Cursor == "" {

     

       136
       136
       +
       			break

     

       137
       137
       +
       		}

     

       138
       138
       +
       		cursor = result.Cursor

     

       139
       139
       +
       	}

     

       140
       140
       +
       

     

       141
       141
       +
       	return allDIDs, nil

     

       142
       142
       +
       }

     

       143
       143
       +
       

     

       144
       144
       +
       func fetchVotesFromPDS(pdsURL, did string) ([]Record, error) {

     

       145
       145
       +
       	var allRecords []Record

     

       146
       146
       +
       	cursor := ""

     

       147
       147
       +
       	collection := "social.coves.feed.vote"

     

       148
       148
       +
       

     

       149
       149
       +
       	for {

     

       150
       150
       +
       		reqURL := fmt.Sprintf("%s/xrpc/com.atproto.repo.listRecords?repo=%s&collection=%s&limit=100",

     

       151
       151
       +
       			pdsURL, url.QueryEscape(did), url.QueryEscape(collection))

     

       152
       152
       +
       		if cursor != "" {

     

       153
       153
       +
       			reqURL += "&cursor=" + url.QueryEscape(cursor)

     

       154
       154
       +
       		}

     

       155
       155
       +
       

     

       156
       156
       +
       		resp, err := http.Get(reqURL)

     

       157
       157
       +
       		if err != nil {

     

       158
       158
       +
       			return nil, fmt.Errorf("HTTP request failed: %w", err)

     

       159
       159
       +
       		}

     

       160
       160
       +
       		defer resp.Body.Close()

     

       161
       161
       +
       

     

       162
       162
       +
       		if resp.StatusCode == 400 {

     

       163
       163
       +
       			// User doesn't exist on this PDS or has no records - that's OK

     

       164
       164
       +
       			return nil, nil

     

       165
       165
       +
       		}

     

       166
       166
       +
       		if resp.StatusCode != 200 {

     

       167
       167
       +
       			return nil, fmt.Errorf("unexpected status code: %d", resp.StatusCode)

     

       168
       168
       +
       		}

     

       169
       169
       +
       

     

       170
       170
       +
       		var result ListRecordsResponse

     

       171
       171
       +
       		if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {

     

       172
       172
       +
       			return nil, fmt.Errorf("failed to decode response: %w", err)

     

       173
       173
       +
       		}

     

       174
       174
       +
       

     

       175
       175
       +
       		allRecords = append(allRecords, result.Records...)

     

       176
       176
       +
       

     

       177
       177
       +
       		if result.Cursor == "" {

     

       178
       178
       +
       			break

     

       179
       179
       +
       		}

     

       180
       180
       +
       		cursor = result.Cursor

     

       181
       181
       +
       	}

     

       182
       182
       +
       

     

       183
       183
       +
       	return allRecords, nil

     

       184
       184
       +
       }

     

       185
       185
       +
       

     

       186
       186
       +
       func indexVote(ctx context.Context, db *sql.DB, voterDID string, record Record) error {

     

       187
       187
       +
       	// Extract vote data from record

     

       188
       188
       +
       	subject, ok := record.Value["subject"].(map[string]interface{})

     

       189
       189
       +
       	if !ok {

     

       190
       190
       +
       		return fmt.Errorf("missing subject")

     

       191
       191
       +
       	}

     

       192
       192
       +
       	subjectURI, _ := subject["uri"].(string)

     

       193
       193
       +
       	subjectCID, _ := subject["cid"].(string)

     

       194
       194
       +
       	direction, _ := record.Value["direction"].(string)

     

       195
       195
       +
       	createdAtStr, _ := record.Value["createdAt"].(string)

     

       196
       196
       +
       

     

       197
       197
       +
       	if subjectURI == "" || direction == "" {

     

       198
       198
       +
       		return fmt.Errorf("invalid vote record: missing required fields")

     

       199
       199
       +
       	}

     

       200
       200
       +
       

     

       201
       201
       +
       	// Parse created_at

     

       202
       202
       +
       	createdAt, err := time.Parse(time.RFC3339, createdAtStr)

     

       203
       203
       +
       	if err != nil {

     

       204
       204
       +
       		createdAt = time.Now()

     

       205
       205
       +
       	}

     

       206
       206
       +
       

     

       207
       207
       +
       	// Extract rkey from URI (at://did/collection/rkey)

     

       208
       208
       +
       	parts := strings.Split(record.URI, "/")

     

       209
       209
       +
       	if len(parts) < 5 {

     

       210
       210
       +
       		return fmt.Errorf("invalid URI format: %s", record.URI)

     

       211
       211
       +
       	}

     

       212
       212
       +
       	rkey := parts[len(parts)-1]

     

       213
       213
       +
       

     

       214
       214
       +
       	// Start transaction

     

       215
       215
       +
       	tx, err := db.BeginTx(ctx, nil)

     

       216
       216
       +
       	if err != nil {

     

       217
       217
       +
       		return fmt.Errorf("failed to begin transaction: %w", err)

     

       218
       218
       +
       	}

     

       219
       219
       +
       	defer tx.Rollback()

     

       220
       220
       +
       

     

       221
       221
       +
       	// Insert vote

     

       222
       222
       +
       	_, err = tx.ExecContext(ctx, `

     

       223
       223
       +
       		INSERT INTO votes (uri, cid, rkey, voter_did, subject_uri, subject_cid, direction, created_at, indexed_at)

     

       224
       224
       +
       		VALUES ($1, $2, $3, $4, $5, $6, $7, $8, NOW())

     

       225
       225
       +
       		ON CONFLICT (uri) DO NOTHING

     

       226
       226
       +
       	`, record.URI, record.CID, rkey, voterDID, subjectURI, subjectCID, direction, createdAt)

     

       227
       227
       +
       	if err != nil {

     

       228
       228
       +
       		return fmt.Errorf("failed to insert vote: %w", err)

     

       229
       229
       +
       	}

     

       230
       230
       +
       

     

       231
       231
       +
       	// Update post/comment counts

     

       232
       232
       +
       	collection := extractCollectionFromURI(subjectURI)

     

       233
       233
       +
       	var updateQuery string

     

       234
       234
       +
       

     

       235
       235
       +
       	switch collection {

     

       236
       236
       +
       	case "social.coves.community.post":

     

       237
       237
       +
       		if direction == "up" {

     

       238
       238
       +
       			updateQuery = `UPDATE posts SET upvote_count = upvote_count + 1, score = upvote_count + 1 - downvote_count WHERE uri = $1 AND deleted_at IS NULL`

     

       239
       239
       +
       		} else {

     

       240
       240
       +
       			updateQuery = `UPDATE posts SET downvote_count = downvote_count + 1, score = upvote_count - (downvote_count + 1) WHERE uri = $1 AND deleted_at IS NULL`

     

       241
       241
       +
       		}

     

       242
       242
       +
       	case "social.coves.community.comment":

     

       243
       243
       +
       		if direction == "up" {

     

       244
       244
       +
       			updateQuery = `UPDATE comments SET upvote_count = upvote_count + 1, score = upvote_count + 1 - downvote_count WHERE uri = $1 AND deleted_at IS NULL`

     

       245
       245
       +
       		} else {

     

       246
       246
       +
       			updateQuery = `UPDATE comments SET downvote_count = downvote_count + 1, score = upvote_count - (downvote_count + 1) WHERE uri = $1 AND deleted_at IS NULL`

     

       247
       247
       +
       		}

     

       248
       248
       +
       	default:

     

       249
       249
       +
       		// Unknown collection, just index the vote

     

       250
       250
       +
       		return tx.Commit()

     

       251
       251
       +
       	}

     

       252
       252
       +
       

     

       253
       253
       +
       	if _, err := tx.ExecContext(ctx, updateQuery, subjectURI); err != nil {

     

       254
       254
       +
       		return fmt.Errorf("failed to update vote counts: %w", err)

     

       255
       255
       +
       	}

     

       256
       256
       +
       

     

       257
       257
       +
       	return tx.Commit()

     

       258
       258
       +
       }

     

       259
       259
       +
       

     

       260
       260
       +
       func extractCollectionFromURI(uri string) string {

     

       261
       261
       +
       	// at://did:plc:xxx/social.coves.community.post/rkey

     

       262
       262
       +
       	parts := strings.Split(uri, "/")

     

       263
       263
       +
       	if len(parts) >= 4 {

     

       264
       264
       +
       		return parts[3]

     

       265
       265
       +
       	}

     

       266
       266
       +
       	return ""

     

       267
       267
       +
       }

+7 -5

internal/api/routes/communityFeed.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"Coves/internal/api/handlers/communityFeed"

     

       5
       5
       +
       	"Coves/internal/api/middleware"

     

       5
       6
        
       	"Coves/internal/core/communityFeeds"

     

       7
       7
       +
       	"Coves/internal/core/votes"

     

       6
       8
        
       

     

       7
       9
        
       	"github.com/go-chi/chi/v5"

     

       8
       10
        
       )

     
···

       11
       13
        
       func RegisterCommunityFeedRoutes(

     

       12
       14
        
       	r chi.Router,

     

       13
       15
        
       	feedService communityFeeds.Service,

     

       16
       16
       +
       	voteService votes.Service,

     

       17
       17
       +
       	authMiddleware *middleware.OAuthAuthMiddleware,

     

       14
       18
        
       ) {

     

       15
       19
        
       	// Create handlers

     

       16
       16
       -
       	getCommunityHandler := communityFeed.NewGetCommunityHandler(feedService)

     

       20
       20
       +
       	getCommunityHandler := communityFeed.NewGetCommunityHandler(feedService, voteService)

     

       17
       21
        
       

     

       18
       22
        
       	// GET /xrpc/social.coves.communityFeed.getCommunity

     

       19
       19
       -
       	// Public endpoint - basic community sorting only for Alpha

     

       20
       20
       -
       	// TODO(feed-generator): Add OptionalAuth middleware when implementing viewer-specific state

     

       21
       21
       -
       	//                       (blocks, upvotes, saves, etc.) in feed generator skeleton

     

       22
       22
       -
       	r.Get("/xrpc/social.coves.communityFeed.getCommunity", getCommunityHandler.HandleGetCommunity)

     

       23
       23
       +
       	// Public endpoint with optional auth for viewer-specific state (vote state)

     

       24
       24
       +
       	r.With(authMiddleware.OptionalAuth).Get("/xrpc/social.coves.communityFeed.getCommunity", getCommunityHandler.HandleGetCommunity)

     

       23
       25
        
       }

+3 -1

internal/api/routes/timeline.go

···

       4
       4
        
       	"Coves/internal/api/handlers/timeline"

     

       5
       5
        
       	"Coves/internal/api/middleware"

     

       6
       6
        
       	timelineCore "Coves/internal/core/timeline"

     

       7
       7
       +
       	"Coves/internal/core/votes"

     

       7
       8
        
       

     

       8
       9
        
       	"github.com/go-chi/chi/v5"

     

       9
       10
        
       )

     
···

       12
       13
        
       func RegisterTimelineRoutes(

     

       13
       14
        
       	r chi.Router,

     

       14
       15
        
       	timelineService timelineCore.Service,

     

       16
       16
       +
       	voteService votes.Service,

     

       15
       17
        
       	authMiddleware *middleware.OAuthAuthMiddleware,

     

       16
       18
        
       ) {

     

       17
       19
        
       	// Create handlers

     

       18
       18
       -
       	getTimelineHandler := timeline.NewGetTimelineHandler(timelineService)

     

       20
       20
       +
       	getTimelineHandler := timeline.NewGetTimelineHandler(timelineService, voteService)

     

       19
       21
        
       

     

       20
       22
        
       	// GET /xrpc/social.coves.feed.getTimeline

     

       21
       23
        
       	// Requires authentication - user must be logged in to see their timeline

+221

internal/core/votes/cache.go

···

       1
       1
       +
       package votes

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       	"fmt"

     

       6
       6
       +
       	"log/slog"

     

       7
       7
       +
       	"strings"

     

       8
       8
       +
       	"sync"

     

       9
       9
       +
       	"time"

     

       10
       10
       +
       

     

       11
       11
       +
       	"Coves/internal/atproto/pds"

     

       12
       12
       +
       )

     

       13
       13
       +
       

     

       14
       14
       +
       // CachedVote represents a vote stored in the cache

     

       15
       15
       +
       type CachedVote struct {

     

       16
       16
       +
       	Direction string // "up" or "down"

     

       17
       17
       +
       	URI       string // vote record URI (at://did/collection/rkey)

     

       18
       18
       +
       	RKey      string // record key

     

       19
       19
       +
       }

     

       20
       20
       +
       

     

       21
       21
       +
       // VoteCache provides an in-memory cache of user votes fetched from their PDS.

     

       22
       22
       +
       // This avoids eventual consistency issues with the AppView database.

     

       23
       23
       +
       type VoteCache struct {

     

       24
       24
       +
       	mu     sync.RWMutex

     

       25
       25
       +
       	votes  map[string]map[string]*CachedVote // userDID -> subjectURI -> vote

     

       26
       26
       +
       	expiry map[string]time.Time              // userDID -> expiry time

     

       27
       27
       +
       	ttl    time.Duration

     

       28
       28
       +
       	logger *slog.Logger

     

       29
       29
       +
       }

     

       30
       30
       +
       

     

       31
       31
       +
       // NewVoteCache creates a new vote cache with the specified TTL

     

       32
       32
       +
       func NewVoteCache(ttl time.Duration, logger *slog.Logger) *VoteCache {

     

       33
       33
       +
       	if logger == nil {

     

       34
       34
       +
       		logger = slog.Default()

     

       35
       35
       +
       	}

     

       36
       36
       +
       	return &VoteCache{

     

       37
       37
       +
       		votes:  make(map[string]map[string]*CachedVote),

     

       38
       38
       +
       		expiry: make(map[string]time.Time),

     

       39
       39
       +
       		ttl:    ttl,

     

       40
       40
       +
       		logger: logger,

     

       41
       41
       +
       	}

     

       42
       42
       +
       }

     

       43
       43
       +
       

     

       44
       44
       +
       // GetVotesForUser returns all cached votes for a user.

     

       45
       45
       +
       // Returns nil if cache is empty or expired for this user.

     

       46
       46
       +
       func (c *VoteCache) GetVotesForUser(userDID string) map[string]*CachedVote {

     

       47
       47
       +
       	c.mu.RLock()

     

       48
       48
       +
       	defer c.mu.RUnlock()

     

       49
       49
       +
       

     

       50
       50
       +
       	// Check if cache exists and is not expired

     

       51
       51
       +
       	expiry, exists := c.expiry[userDID]

     

       52
       52
       +
       	if !exists || time.Now().After(expiry) {

     

       53
       53
       +
       		return nil

     

       54
       54
       +
       	}

     

       55
       55
       +
       

     

       56
       56
       +
       	return c.votes[userDID]

     

       57
       57
       +
       }

     

       58
       58
       +
       

     

       59
       59
       +
       // GetVote returns the cached vote for a specific subject, or nil if not found/expired

     

       60
       60
       +
       func (c *VoteCache) GetVote(userDID, subjectURI string) *CachedVote {

     

       61
       61
       +
       	votes := c.GetVotesForUser(userDID)

     

       62
       62
       +
       	if votes == nil {

     

       63
       63
       +
       		return nil

     

       64
       64
       +
       	}

     

       65
       65
       +
       	return votes[subjectURI]

     

       66
       66
       +
       }

     

       67
       67
       +
       

     

       68
       68
       +
       // IsCached returns true if the user's votes are cached and not expired

     

       69
       69
       +
       func (c *VoteCache) IsCached(userDID string) bool {

     

       70
       70
       +
       	c.mu.RLock()

     

       71
       71
       +
       	defer c.mu.RUnlock()

     

       72
       72
       +
       

     

       73
       73
       +
       	expiry, exists := c.expiry[userDID]

     

       74
       74
       +
       	return exists && time.Now().Before(expiry)

     

       75
       75
       +
       }

     

       76
       76
       +
       

     

       77
       77
       +
       // SetVotesForUser replaces all cached votes for a user

     

       78
       78
       +
       func (c *VoteCache) SetVotesForUser(userDID string, votes map[string]*CachedVote) {

     

       79
       79
       +
       	c.mu.Lock()

     

       80
       80
       +
       	defer c.mu.Unlock()

     

       81
       81
       +
       

     

       82
       82
       +
       	c.votes[userDID] = votes

     

       83
       83
       +
       	c.expiry[userDID] = time.Now().Add(c.ttl)

     

       84
       84
       +
       

     

       85
       85
       +
       	c.logger.Debug("vote cache updated",

     

       86
       86
       +
       		"user", userDID,

     

       87
       87
       +
       		"vote_count", len(votes),

     

       88
       88
       +
       		"expires_at", c.expiry[userDID])

     

       89
       89
       +
       }

     

       90
       90
       +
       

     

       91
       91
       +
       // SetVote adds or updates a single vote in the cache

     

       92
       92
       +
       func (c *VoteCache) SetVote(userDID, subjectURI string, vote *CachedVote) {

     

       93
       93
       +
       	c.mu.Lock()

     

       94
       94
       +
       	defer c.mu.Unlock()

     

       95
       95
       +
       

     

       96
       96
       +
       	if c.votes[userDID] == nil {

     

       97
       97
       +
       		c.votes[userDID] = make(map[string]*CachedVote)

     

       98
       98
       +
       	}

     

       99
       99
       +
       

     

       100
       100
       +
       	c.votes[userDID][subjectURI] = vote

     

       101
       101
       +
       

     

       102
       102
       +
       	// Always extend expiry on vote action - active users keep their cache fresh

     

       103
       103
       +
       	c.expiry[userDID] = time.Now().Add(c.ttl)

     

       104
       104
       +
       

     

       105
       105
       +
       	c.logger.Debug("vote cached",

     

       106
       106
       +
       		"user", userDID,

     

       107
       107
       +
       		"subject", subjectURI,

     

       108
       108
       +
       		"direction", vote.Direction)

     

       109
       109
       +
       }

     

       110
       110
       +
       

     

       111
       111
       +
       // RemoveVote removes a vote from the cache (for toggle-off)

     

       112
       112
       +
       func (c *VoteCache) RemoveVote(userDID, subjectURI string) {

     

       113
       113
       +
       	c.mu.Lock()

     

       114
       114
       +
       	defer c.mu.Unlock()

     

       115
       115
       +
       

     

       116
       116
       +
       	if c.votes[userDID] != nil {

     

       117
       117
       +
       		delete(c.votes[userDID], subjectURI)

     

       118
       118
       +
       

     

       119
       119
       +
       		// Extend expiry on vote action - active users keep their cache fresh

     

       120
       120
       +
       		c.expiry[userDID] = time.Now().Add(c.ttl)

     

       121
       121
       +
       

     

       122
       122
       +
       		c.logger.Debug("vote removed from cache",

     

       123
       123
       +
       			"user", userDID,

     

       124
       124
       +
       			"subject", subjectURI)

     

       125
       125
       +
       	}

     

       126
       126
       +
       }

     

       127
       127
       +
       

     

       128
       128
       +
       // Invalidate removes all cached votes for a user

     

       129
       129
       +
       func (c *VoteCache) Invalidate(userDID string) {

     

       130
       130
       +
       	c.mu.Lock()

     

       131
       131
       +
       	defer c.mu.Unlock()

     

       132
       132
       +
       

     

       133
       133
       +
       	delete(c.votes, userDID)

     

       134
       134
       +
       	delete(c.expiry, userDID)

     

       135
       135
       +
       

     

       136
       136
       +
       	c.logger.Debug("vote cache invalidated", "user", userDID)

     

       137
       137
       +
       }

     

       138
       138
       +
       

     

       139
       139
       +
       // FetchAndCacheFromPDS fetches all votes from the user's PDS and caches them.

     

       140
       140
       +
       // This should be called on first authenticated request or when cache is expired.

     

       141
       141
       +
       func (c *VoteCache) FetchAndCacheFromPDS(ctx context.Context, pdsClient pds.Client) error {

     

       142
       142
       +
       	userDID := pdsClient.DID()

     

       143
       143
       +
       

     

       144
       144
       +
       	c.logger.Debug("fetching votes from PDS",

     

       145
       145
       +
       		"user", userDID,

     

       146
       146
       +
       		"pds", pdsClient.HostURL())

     

       147
       147
       +
       

     

       148
       148
       +
       	votes, err := c.fetchAllVotesFromPDS(ctx, pdsClient)

     

       149
       149
       +
       	if err != nil {

     

       150
       150
       +
       		return fmt.Errorf("failed to fetch votes from PDS: %w", err)

     

       151
       151
       +
       	}

     

       152
       152
       +
       

     

       153
       153
       +
       	c.SetVotesForUser(userDID, votes)

     

       154
       154
       +
       

     

       155
       155
       +
       	c.logger.Info("vote cache populated from PDS",

     

       156
       156
       +
       		"user", userDID,

     

       157
       157
       +
       		"vote_count", len(votes))

     

       158
       158
       +
       

     

       159
       159
       +
       	return nil

     

       160
       160
       +
       }

     

       161
       161
       +
       

     

       162
       162
       +
       // fetchAllVotesFromPDS paginates through all vote records on the user's PDS

     

       163
       163
       +
       func (c *VoteCache) fetchAllVotesFromPDS(ctx context.Context, pdsClient pds.Client) (map[string]*CachedVote, error) {

     

       164
       164
       +
       	votes := make(map[string]*CachedVote)

     

       165
       165
       +
       	cursor := ""

     

       166
       166
       +
       	const pageSize = 100

     

       167
       167
       +
       	const collection = "social.coves.feed.vote"

     

       168
       168
       +
       

     

       169
       169
       +
       	for {

     

       170
       170
       +
       		result, err := pdsClient.ListRecords(ctx, collection, pageSize, cursor)

     

       171
       171
       +
       		if err != nil {

     

       172
       172
       +
       			if pds.IsAuthError(err) {

     

       173
       173
       +
       				return nil, ErrNotAuthorized

     

       174
       174
       +
       			}

     

       175
       175
       +
       			return nil, fmt.Errorf("listRecords failed: %w", err)

     

       176
       176
       +
       		}

     

       177
       177
       +
       

     

       178
       178
       +
       		for _, rec := range result.Records {

     

       179
       179
       +
       			// Extract subject from record value

     

       180
       180
       +
       			subject, ok := rec.Value["subject"].(map[string]any)

     

       181
       181
       +
       			if !ok {

     

       182
       182
       +
       				continue

     

       183
       183
       +
       			}

     

       184
       184
       +
       

     

       185
       185
       +
       			subjectURI, ok := subject["uri"].(string)

     

       186
       186
       +
       			if !ok || subjectURI == "" {

     

       187
       187
       +
       				continue

     

       188
       188
       +
       			}

     

       189
       189
       +
       

     

       190
       190
       +
       			direction, _ := rec.Value["direction"].(string)

     

       191
       191
       +
       			if direction == "" {

     

       192
       192
       +
       				continue

     

       193
       193
       +
       			}

     

       194
       194
       +
       

     

       195
       195
       +
       			// Extract rkey from URI

     

       196
       196
       +
       			rkey := extractRKeyFromURI(rec.URI)

     

       197
       197
       +
       

     

       198
       198
       +
       			votes[subjectURI] = &CachedVote{

     

       199
       199
       +
       				Direction: direction,

     

       200
       200
       +
       				URI:       rec.URI,

     

       201
       201
       +
       				RKey:      rkey,

     

       202
       202
       +
       			}

     

       203
       203
       +
       		}

     

       204
       204
       +
       

     

       205
       205
       +
       		if result.Cursor == "" {

     

       206
       206
       +
       			break

     

       207
       207
       +
       		}

     

       208
       208
       +
       		cursor = result.Cursor

     

       209
       209
       +
       	}

     

       210
       210
       +
       

     

       211
       211
       +
       	return votes, nil

     

       212
       212
       +
       }

     

       213
       213
       +
       

     

       214
       214
       +
       // extractRKeyFromURI extracts the rkey from an AT-URI (at://did/collection/rkey)

     

       215
       215
       +
       func extractRKeyFromURI(uri string) string {

     

       216
       216
       +
       	parts := strings.Split(uri, "/")

     

       217
       217
       +
       	if len(parts) >= 5 {

     

       218
       218
       +
       		return parts[len(parts)-1]

     

       219
       219
       +
       	}

     

       220
       220
       +
       	return ""

     

       221
       221
       +
       }

+84 -2

internal/core/votes/service_impl.go

···

       30
       30
        
       	oauthStore       oauth.ClientAuthStore

     

       31
       31
        
       	logger           *slog.Logger

     

       32
       32
        
       	pdsClientFactory PDSClientFactory // Optional, for testing. If nil, uses OAuth.

     

       33
       33
       +
       	cache            *VoteCache       // In-memory cache of user votes from PDS

     

       33
       34
        
       }

     

       34
       35
        
       

     

       35
       36
        
       // NewService creates a new vote service instance

     

       36
       36
       -
       func NewService(repo Repository, oauthClient *oauthclient.OAuthClient, oauthStore oauth.ClientAuthStore, logger *slog.Logger) Service {

     

       37
       37
       +
       func NewService(repo Repository, oauthClient *oauthclient.OAuthClient, oauthStore oauth.ClientAuthStore, cache *VoteCache, logger *slog.Logger) Service {

     

       37
       38
        
       	if logger == nil {

     

       38
       39
        
       		logger = slog.Default()

     

       39
       40
        
       	}

     
···

       41
       42
        
       		repo:        repo,

     

       42
       43
        
       		oauthClient: oauthClient,

     

       43
       44
        
       		oauthStore:  oauthStore,

     

       45
       45
       +
       		cache:       cache,

     

       44
       46
        
       		logger:      logger,

     

       45
       47
        
       	}

     

       46
       48
        
       }

     

       47
       49
        
       

     

       48
       50
        
       // NewServiceWithPDSFactory creates a vote service with a custom PDS client factory.

     

       49
       51
        
       // This is primarily for testing with password-based authentication.

     

       50
       50
       -
       func NewServiceWithPDSFactory(repo Repository, logger *slog.Logger, factory PDSClientFactory) Service {

     

       52
       52
       +
       func NewServiceWithPDSFactory(repo Repository, cache *VoteCache, logger *slog.Logger, factory PDSClientFactory) Service {

     

       51
       53
        
       	if logger == nil {

     

       52
       54
        
       		logger = slog.Default()

     

       53
       55
        
       	}

     

       54
       56
        
       	return &voteService{

     

       55
       57
        
       		repo:             repo,

     

       58
       58
       +
       		cache:            cache,

     

       56
       59
        
       		logger:           logger,

     

       57
       60
        
       		pdsClientFactory: factory,

     

       58
       61
        
       	}

     
···

       150
       153
        
       				"subject", req.Subject.URI,

     

       151
       154
        
       				"direction", req.Direction)

     

       152
       155
        
       

     

       156
       156
       +
       			// Update cache - remove the vote

     

       157
       157
       +
       			if s.cache != nil {

     

       158
       158
       +
       				s.cache.RemoveVote(session.AccountDID.String(), req.Subject.URI)

     

       159
       159
       +
       			}

     

       160
       160
       +
       

     

       153
       161
        
       			// Return empty response to indicate deletion

     

       154
       162
        
       			return &CreateVoteResponse{

     

       155
       163
        
       				URI: "",

     
···

       197
       205
        
       		"uri", uri,

     

       198
       206
        
       		"cid", cid)

     

       199
       207
        
       

     

       208
       208
       +
       	// Update cache - add the new vote

     

       209
       209
       +
       	if s.cache != nil {

     

       210
       210
       +
       		s.cache.SetVote(session.AccountDID.String(), req.Subject.URI, &CachedVote{

     

       211
       211
       +
       			Direction: req.Direction,

     

       212
       212
       +
       			URI:       uri,

     

       213
       213
       +
       			RKey:      extractRKeyFromURI(uri),

     

       214
       214
       +
       		})

     

       215
       215
       +
       	}

     

       216
       216
       +
       

     

       200
       217
        
       	return &CreateVoteResponse{

     

       201
       218
        
       		URI: uri,

     

       202
       219
        
       		CID: cid,

     
···

       253
       270
        
       		"subject", req.Subject.URI,

     

       254
       271
        
       		"uri", existing.URI)

     

       255
       272
        
       

     

       273
       273
       +
       	// Update cache - remove the vote

     

       274
       274
       +
       	if s.cache != nil {

     

       275
       275
       +
       		s.cache.RemoveVote(session.AccountDID.String(), req.Subject.URI)

     

       276
       276
       +
       	}

     

       277
       277
       +
       

     

       256
       278
        
       	return nil

     

       257
       279
        
       }

     

       258
       280
        
       

     
···

       350
       372
        
       	// No vote found for this subject after checking all pages

     

       351
       373
        
       	return nil, nil

     

       352
       374
        
       }

     

       375
       375
       +
       

     

       376
       376
       +
       // EnsureCachePopulated fetches the user's votes from their PDS if not already cached.

     

       377
       377
       +
       func (s *voteService) EnsureCachePopulated(ctx context.Context, session *oauth.ClientSessionData) error {

     

       378
       378
       +
       	if s.cache == nil {

     

       379
       379
       +
       		return nil // No cache configured

     

       380
       380
       +
       	}

     

       381
       381
       +
       

     

       382
       382
       +
       	// Check if already cached

     

       383
       383
       +
       	if s.cache.IsCached(session.AccountDID.String()) {

     

       384
       384
       +
       		return nil

     

       385
       385
       +
       	}

     

       386
       386
       +
       

     

       387
       387
       +
       	// Create PDS client for this session

     

       388
       388
       +
       	pdsClient, err := s.getPDSClient(ctx, session)

     

       389
       389
       +
       	if err != nil {

     

       390
       390
       +
       		s.logger.Error("failed to create PDS client for cache population",

     

       391
       391
       +
       			"error", err,

     

       392
       392
       +
       			"user", session.AccountDID)

     

       393
       393
       +
       		return fmt.Errorf("failed to create PDS client: %w", err)

     

       394
       394
       +
       	}

     

       395
       395
       +
       

     

       396
       396
       +
       	// Fetch and cache votes from PDS

     

       397
       397
       +
       	if err := s.cache.FetchAndCacheFromPDS(ctx, pdsClient); err != nil {

     

       398
       398
       +
       		s.logger.Error("failed to populate vote cache from PDS",

     

       399
       399
       +
       			"error", err,

     

       400
       400
       +
       			"user", session.AccountDID)

     

       401
       401
       +
       		return fmt.Errorf("failed to populate vote cache: %w", err)

     

       402
       402
       +
       	}

     

       403
       403
       +
       

     

       404
       404
       +
       	return nil

     

       405
       405
       +
       }

     

       406
       406
       +
       

     

       407
       407
       +
       // GetViewerVote returns the viewer's vote for a specific subject, or nil if not voted.

     

       408
       408
       +
       func (s *voteService) GetViewerVote(userDID, subjectURI string) *CachedVote {

     

       409
       409
       +
       	if s.cache == nil {

     

       410
       410
       +
       		return nil

     

       411
       411
       +
       	}

     

       412
       412
       +
       	return s.cache.GetVote(userDID, subjectURI)

     

       413
       413
       +
       }

     

       414
       414
       +
       

     

       415
       415
       +
       // GetViewerVotesForSubjects returns the viewer's votes for multiple subjects.

     

       416
       416
       +
       func (s *voteService) GetViewerVotesForSubjects(userDID string, subjectURIs []string) map[string]*CachedVote {

     

       417
       417
       +
       	result := make(map[string]*CachedVote)

     

       418
       418
       +
       	if s.cache == nil {

     

       419
       419
       +
       		return result

     

       420
       420
       +
       	}

     

       421
       421
       +
       

     

       422
       422
       +
       	allVotes := s.cache.GetVotesForUser(userDID)

     

       423
       423
       +
       	if allVotes == nil {

     

       424
       424
       +
       		return result

     

       425
       425
       +
       	}

     

       426
       426
       +
       

     

       427
       427
       +
       	for _, uri := range subjectURIs {

     

       428
       428
       +
       		if vote, exists := allVotes[uri]; exists {

     

       429
       429
       +
       			result[uri] = vote

     

       430
       430
       +
       		}

     

       431
       431
       +
       	}

     

       432
       432
       +
       

     

       433
       433
       +
       	return result

     

       434
       434
       +
       }

+76 -16

internal/atproto/jetstream/vote_consumer.go

···

       99
       99
        
       	}

     

       100
       100
        
       

     

       101
       101
        
       	// Atomically: Index vote + Update post counts

     

       102
       102
       -
       	if err := c.indexVoteAndUpdateCounts(ctx, vote); err != nil {

     

       102
       102
       +
       	wasNew, err := c.indexVoteAndUpdateCounts(ctx, vote)

     

       103
       103
       +
       	if err != nil {

     

       103
       104
        
       		return fmt.Errorf("failed to index vote and update counts: %w", err)

     

       104
       105
        
       	}

     

       105
       106
        
       

     

       106
       106
       -
       	log.Printf("✓ Indexed vote: %s (%s on %s)", uri, vote.Direction, vote.SubjectURI)

     

       107
       107
       +
       	if wasNew {

     

       108
       108
       +
       		log.Printf("✓ Indexed vote: %s (%s on %s)", uri, vote.Direction, vote.SubjectURI)

     

       109
       109
       +
       	}

     

       107
       110
        
       	return nil

     

       108
       111
        
       }

     

       109
       112
        
       

     
···

       133
       136
        
       }

     

       134
       137
        
       

     

       135
       138
        
       // indexVoteAndUpdateCounts atomically indexes a vote and updates post vote counts

     

       136
       136
       -
       func (c *VoteEventConsumer) indexVoteAndUpdateCounts(ctx context.Context, vote *votes.Vote) error {

     

       139
       139
       +
       // Returns (true, nil) if vote was newly inserted, (false, nil) if already existed (idempotent)

     

       140
       140
       +
       func (c *VoteEventConsumer) indexVoteAndUpdateCounts(ctx context.Context, vote *votes.Vote) (bool, error) {

     

       137
       141
        
       	tx, err := c.db.BeginTx(ctx, nil)

     

       138
       142
        
       	if err != nil {

     

       139
       139
       -
       		return fmt.Errorf("failed to begin transaction: %w", err)

     

       143
       143
       +
       		return false, fmt.Errorf("failed to begin transaction: %w", err)

     

       140
       144
        
       	}

     

       141
       145
        
       	defer func() {

     

       142
       146
        
       		if rollbackErr := tx.Rollback(); rollbackErr != nil && rollbackErr != sql.ErrTxDone {

     
···

       144
       148
        
       		}

     

       145
       149
        
       	}()

     

       146
       150
        
       

     

       147
       147
       -
       	// 1. Index the vote (idempotent with ON CONFLICT DO NOTHING)

     

       151
       151
       +
       	// 1. Check for existing active vote with different URI (stale record)

     

       152
       152
       +
       	// This handles cases where:

     

       153
       153
       +
       	// - User voted on another client and we missed the delete event

     

       154
       154
       +
       	// - Vote was reindexed but user created a new vote with different rkey

     

       155
       155
       +
       	// - Any other state mismatch between PDS and AppView

     

       156
       156
       +
       	var existingDirection sql.NullString

     

       157
       157
       +
       	checkQuery := `

     

       158
       158
       +
       		SELECT direction FROM votes

     

       159
       159
       +
       		WHERE voter_did = $1

     

       160
       160
       +
       		  AND subject_uri = $2

     

       161
       161
       +
       		  AND deleted_at IS NULL

     

       162
       162
       +
       		  AND uri != $3

     

       163
       163
       +
       		LIMIT 1

     

       164
       164
       +
       	`

     

       165
       165
       +
       	if err := tx.QueryRowContext(ctx, checkQuery, vote.VoterDID, vote.SubjectURI, vote.URI).Scan(&existingDirection); err != nil && err != sql.ErrNoRows {

     

       166
       166
       +
       		return false, fmt.Errorf("failed to check existing vote: %w", err)

     

       167
       167
       +
       	}

     

       168
       168
       +
       

     

       169
       169
       +
       	// If there's a stale vote, soft-delete it and adjust counts

     

       170
       170
       +
       	if existingDirection.Valid {

     

       171
       171
       +
       		softDeleteQuery := `

     

       172
       172
       +
       			UPDATE votes

     

       173
       173
       +
       			SET deleted_at = NOW()

     

       174
       174
       +
       			WHERE voter_did = $1

     

       175
       175
       +
       			  AND subject_uri = $2

     

       176
       176
       +
       			  AND deleted_at IS NULL

     

       177
       177
       +
       			  AND uri != $3

     

       178
       178
       +
       		`

     

       179
       179
       +
       		if _, err := tx.ExecContext(ctx, softDeleteQuery, vote.VoterDID, vote.SubjectURI, vote.URI); err != nil {

     

       180
       180
       +
       			return false, fmt.Errorf("failed to soft-delete existing votes: %w", err)

     

       181
       181
       +
       		}

     

       182
       182
       +
       

     

       183
       183
       +
       		// Decrement the old vote's count (will be re-incremented below if same direction)

     

       184
       184
       +
       		collection := utils.ExtractCollectionFromURI(vote.SubjectURI)

     

       185
       185
       +
       		var decrementQuery string

     

       186
       186
       +
       		if existingDirection.String == "up" {

     

       187
       187
       +
       			if collection == "social.coves.community.post" {

     

       188
       188
       +
       				decrementQuery = `UPDATE posts SET upvote_count = GREATEST(0, upvote_count - 1), score = upvote_count - 1 - downvote_count WHERE uri = $1 AND deleted_at IS NULL`

     

       189
       189
       +
       			} else if collection == "social.coves.community.comment" {

     

       190
       190
       +
       				decrementQuery = `UPDATE comments SET upvote_count = GREATEST(0, upvote_count - 1), score = upvote_count - 1 - downvote_count WHERE uri = $1 AND deleted_at IS NULL`

     

       191
       191
       +
       			}

     

       192
       192
       +
       		} else {

     

       193
       193
       +
       			if collection == "social.coves.community.post" {

     

       194
       194
       +
       				decrementQuery = `UPDATE posts SET downvote_count = GREATEST(0, downvote_count - 1), score = upvote_count - (downvote_count - 1) WHERE uri = $1 AND deleted_at IS NULL`

     

       195
       195
       +
       			} else if collection == "social.coves.community.comment" {

     

       196
       196
       +
       				decrementQuery = `UPDATE comments SET downvote_count = GREATEST(0, downvote_count - 1), score = upvote_count - (downvote_count - 1) WHERE uri = $1 AND deleted_at IS NULL`

     

       197
       197
       +
       			}

     

       198
       198
       +
       		}

     

       199
       199
       +
       		if decrementQuery != "" {

     

       200
       200
       +
       			if _, err := tx.ExecContext(ctx, decrementQuery, vote.SubjectURI); err != nil {

     

       201
       201
       +
       				return false, fmt.Errorf("failed to decrement old vote count: %w", err)

     

       202
       202
       +
       			}

     

       203
       203
       +
       		}

     

       204
       204
       +
       		log.Printf("Cleaned up stale vote for %s on %s (was %s)", vote.VoterDID, vote.SubjectURI, existingDirection.String)

     

       205
       205
       +
       	}

     

       206
       206
       +
       

     

       207
       207
       +
       	// 2. Index the vote (idempotent with ON CONFLICT DO NOTHING)

     

       148
       208
        
       	query := `

     

       149
       209
        
       		INSERT INTO votes (

     

       150
       210
        
       			uri, cid, rkey, voter_did,

     
···

       169
       229
        
       

     

       170
       230
        
       	// If no rows returned, vote already exists (idempotent - OK for Jetstream replays)

     

       171
       231
        
       	if err == sql.ErrNoRows {

     

       172
       172
       -
       		log.Printf("Vote already indexed: %s (idempotent)", vote.URI)

     

       232
       232
       +
       		// Silently handle idempotent case - no log needed for replayed events

     

       173
       233
        
       		if commitErr := tx.Commit(); commitErr != nil {

     

       174
       174
       -
       			return fmt.Errorf("failed to commit transaction: %w", commitErr)

     

       234
       234
       +
       			return false, fmt.Errorf("failed to commit transaction: %w", commitErr)

     

       175
       235
        
       		}

     

       176
       176
       -
       		return nil

     

       236
       236
       +
       		return false, nil // Vote already existed

     

       177
       237
        
       	}

     

       178
       238
        
       

     

       179
       239
        
       	if err != nil {

     

       180
       180
       -
       		return fmt.Errorf("failed to insert vote: %w", err)

     

       240
       240
       +
       		return false, fmt.Errorf("failed to insert vote: %w", err)

     

       181
       241
        
       	}

     

       182
       242
        
       

     

       183
       183
       -
       	// 2. Update vote counts on the subject (post or comment)

     

       243
       243
       +
       	// 3. Update vote counts on the subject (post or comment)

     

       184
       244
        
       	// Parse collection from subject URI to determine target table

     

       185
       245
        
       	collection := utils.ExtractCollectionFromURI(vote.SubjectURI)

     

       186
       246
        
       

     
···

       227
       287
        
       		// Vote is still indexed in votes table, we just don't update denormalized counts

     

       228
       288
        
       		log.Printf("Vote subject has unsupported collection: %s (vote indexed, counts not updated)", collection)

     

       229
       289
        
       		if commitErr := tx.Commit(); commitErr != nil {

     

       230
       230
       -
       			return fmt.Errorf("failed to commit transaction: %w", commitErr)

     

       290
       290
       +
       			return false, fmt.Errorf("failed to commit transaction: %w", commitErr)

     

       231
       291
        
       		}

     

       232
       232
       -
       		return nil

     

       292
       292
       +
       		return true, nil // Vote was newly indexed

     

       233
       293
        
       	}

     

       234
       294
        
       

     

       235
       295
        
       	result, err := tx.ExecContext(ctx, updateQuery, vote.SubjectURI)

     

       236
       296
        
       	if err != nil {

     

       237
       237
       -
       		return fmt.Errorf("failed to update vote counts: %w", err)

     

       297
       297
       +
       		return false, fmt.Errorf("failed to update vote counts: %w", err)

     

       238
       298
        
       	}

     

       239
       299
        
       

     

       240
       300
        
       	rowsAffected, err := result.RowsAffected()

     

       241
       301
        
       	if err != nil {

     

       242
       242
       -
       		return fmt.Errorf("failed to check update result: %w", err)

     

       302
       302
       +
       		return false, fmt.Errorf("failed to check update result: %w", err)

     

       243
       303
        
       	}

     

       244
       304
        
       

     

       245
       305
        
       	// If subject doesn't exist or is deleted, that's OK (vote still indexed)

     
···

       249
       309
        
       

     

       250
       310
        
       	// Commit transaction

     

       251
       311
        
       	if err := tx.Commit(); err != nil {

     

       252
       252
       -
       		return fmt.Errorf("failed to commit transaction: %w", err)

     

       312
       312
       +
       		return false, fmt.Errorf("failed to commit transaction: %w", err)

     

       253
       313
        
       	}

     

       254
       314
        
       

     

       255
       255
       -
       	return nil

     

       315
       315
       +
       	return true, nil // Vote was newly indexed

     

       256
       316
        
       }

     

       257
       317
        
       

     

       258
       318
        
       // deleteVoteAndUpdateCounts atomically soft-deletes a vote and updates post vote counts

+109

internal/atproto/lexicon/social/coves/community/comment/create.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "lexicon": 1,

     

       3
       3
       +
         "id": "social.coves.community.comment.create",

     

       4
       4
       +
         "defs": {

     

       5
       5
       +
           "main": {

     

       6
       6
       +
             "type": "procedure",

     

       7
       7
       +
             "description": "Create a comment on a post or another comment. Comments support nested threading, rich text, embeds, and self-labeling.",

     

       8
       8
       +
             "input": {

     

       9
       9
       +
               "encoding": "application/json",

     

       10
       10
       +
               "schema": {

     

       11
       11
       +
                 "type": "object",

     

       12
       12
       +
                 "required": ["reply", "content"],

     

       13
       13
       +
                 "properties": {

     

       14
       14
       +
                   "reply": {

     

       15
       15
       +
                     "type": "object",

     

       16
       16
       +
                     "description": "References for maintaining thread structure. Root always points to the original post, parent points to the immediate parent (post or comment).",

     

       17
       17
       +
                     "required": ["root", "parent"],

     

       18
       18
       +
                     "properties": {

     

       19
       19
       +
                       "root": {

     

       20
       20
       +
                         "type": "ref",

     

       21
       21
       +
                         "ref": "com.atproto.repo.strongRef",

     

       22
       22
       +
                         "description": "Strong reference to the original post that started the thread"

     

       23
       23
       +
                       },

     

       24
       24
       +
                       "parent": {

     

       25
       25
       +
                         "type": "ref",

     

       26
       26
       +
                         "ref": "com.atproto.repo.strongRef",

     

       27
       27
       +
                         "description": "Strong reference to the immediate parent (post or comment) being replied to"

     

       28
       28
       +
                       }

     

       29
       29
       +
                     }

     

       30
       30
       +
                   },

     

       31
       31
       +
                   "content": {

     

       32
       32
       +
                     "type": "string",

     

       33
       33
       +
                     "maxGraphemes": 10000,

     

       34
       34
       +
                     "maxLength": 100000,

     

       35
       35
       +
                     "description": "Comment text content"

     

       36
       36
       +
                   },

     

       37
       37
       +
                   "facets": {

     

       38
       38
       +
                     "type": "array",

     

       39
       39
       +
                     "description": "Annotations for rich text (mentions, links, etc.)",

     

       40
       40
       +
                     "items": {

     

       41
       41
       +
                       "type": "ref",

     

       42
       42
       +
                       "ref": "social.coves.richtext.facet"

     

       43
       43
       +
                     }

     

       44
       44
       +
                   },

     

       45
       45
       +
                   "embed": {

     

       46
       46
       +
                     "type": "union",

     

       47
       47
       +
                     "description": "Embedded media or quoted posts",

     

       48
       48
       +
                     "refs": [

     

       49
       49
       +
                       "social.coves.embed.images",

     

       50
       50
       +
                       "social.coves.embed.post"

     

       51
       51
       +
                     ]

     

       52
       52
       +
                   },

     

       53
       53
       +
                   "langs": {

     

       54
       54
       +
                     "type": "array",

     

       55
       55
       +
                     "description": "Languages used in the comment content (ISO 639-1)",

     

       56
       56
       +
                     "maxLength": 3,

     

       57
       57
       +
                     "items": {

     

       58
       58
       +
                       "type": "string",

     

       59
       59
       +
                       "format": "language"

     

       60
       60
       +
                     }

     

       61
       61
       +
                   },

     

       62
       62
       +
                   "labels": {

     

       63
       63
       +
                     "type": "ref",

     

       64
       64
       +
                     "ref": "com.atproto.label.defs#selfLabels",

     

       65
       65
       +
                     "description": "Self-applied content labels"

     

       66
       66
       +
                   }

     

       67
       67
       +
                 }

     

       68
       68
       +
               }

     

       69
       69
       +
             },

     

       70
       70
       +
             "output": {

     

       71
       71
       +
               "encoding": "application/json",

     

       72
       72
       +
               "schema": {

     

       73
       73
       +
                 "type": "object",

     

       74
       74
       +
                 "required": ["uri", "cid"],

     

       75
       75
       +
                 "properties": {

     

       76
       76
       +
                   "uri": {

     

       77
       77
       +
                     "type": "string",

     

       78
       78
       +
                     "format": "at-uri",

     

       79
       79
       +
                     "description": "AT-URI of the created comment"

     

       80
       80
       +
                   },

     

       81
       81
       +
                   "cid": {

     

       82
       82
       +
                     "type": "string",

     

       83
       83
       +
                     "format": "cid",

     

       84
       84
       +
                     "description": "CID of the created comment record"

     

       85
       85
       +
                   }

     

       86
       86
       +
                 }

     

       87
       87
       +
               }

     

       88
       88
       +
             },

     

       89
       89
       +
             "errors": [

     

       90
       90
       +
               {

     

       91
       91
       +
                 "name": "InvalidReply",

     

       92
       92
       +
                 "description": "The reply reference is invalid, malformed, or refers to non-existent content"

     

       93
       93
       +
               },

     

       94
       94
       +
               {

     

       95
       95
       +
                 "name": "ContentTooLong",

     

       96
       96
       +
                 "description": "Comment content exceeds maximum length constraints"

     

       97
       97
       +
               },

     

       98
       98
       +
               {

     

       99
       99
       +
                 "name": "ContentEmpty",

     

       100
       100
       +
                 "description": "Comment content is empty or contains only whitespace"

     

       101
       101
       +
               },

     

       102
       102
       +
               {

     

       103
       103
       +
                 "name": "NotAuthorized",

     

       104
       104
       +
                 "description": "User is not authorized to create comments on this content"

     

       105
       105
       +
               }

     

       106
       106
       +
             ]

     

       107
       107
       +
           }

     

       108
       108
       +
         }

     

       109
       109
       +
       }

+41

internal/atproto/lexicon/social/coves/community/comment/delete.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "lexicon": 1,

     

       3
       3
       +
         "id": "social.coves.community.comment.delete",

     

       4
       4
       +
         "defs": {

     

       5
       5
       +
           "main": {

     

       6
       6
       +
             "type": "procedure",

     

       7
       7
       +
             "description": "Delete a comment. Only the comment author can delete their own comments.",

     

       8
       8
       +
             "input": {

     

       9
       9
       +
               "encoding": "application/json",

     

       10
       10
       +
               "schema": {

     

       11
       11
       +
                 "type": "object",

     

       12
       12
       +
                 "required": ["uri"],

     

       13
       13
       +
                 "properties": {

     

       14
       14
       +
                   "uri": {

     

       15
       15
       +
                     "type": "string",

     

       16
       16
       +
                     "format": "at-uri",

     

       17
       17
       +
                     "description": "AT-URI of the comment to delete"

     

       18
       18
       +
                   }

     

       19
       19
       +
                 }

     

       20
       20
       +
               }

     

       21
       21
       +
             },

     

       22
       22
       +
             "output": {

     

       23
       23
       +
               "encoding": "application/json",

     

       24
       24
       +
               "schema": {

     

       25
       25
       +
                 "type": "object",

     

       26
       26
       +
                 "properties": {}

     

       27
       27
       +
               }

     

       28
       28
       +
             },

     

       29
       29
       +
             "errors": [

     

       30
       30
       +
               {

     

       31
       31
       +
                 "name": "CommentNotFound",

     

       32
       32
       +
                 "description": "Comment with the specified URI does not exist"

     

       33
       33
       +
               },

     

       34
       34
       +
               {

     

       35
       35
       +
                 "name": "NotAuthorized",

     

       36
       36
       +
                 "description": "User is not authorized to delete this comment (not the author)"

     

       37
       37
       +
               }

     

       38
       38
       +
             ]

     

       39
       39
       +
           }

     

       40
       40
       +
         }

     

       41
       41
       +
       }

+97

internal/atproto/lexicon/social/coves/community/comment/update.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "lexicon": 1,

     

       3
       3
       +
         "id": "social.coves.community.comment.update",

     

       4
       4
       +
         "defs": {

     

       5
       5
       +
           "main": {

     

       6
       6
       +
             "type": "procedure",

     

       7
       7
       +
             "description": "Update an existing comment's content, facets, embed, languages, or labels. Threading references (reply.root and reply.parent) are immutable and cannot be changed.",

     

       8
       8
       +
             "input": {

     

       9
       9
       +
               "encoding": "application/json",

     

       10
       10
       +
               "schema": {

     

       11
       11
       +
                 "type": "object",

     

       12
       12
       +
                 "required": ["uri", "content"],

     

       13
       13
       +
                 "properties": {

     

       14
       14
       +
                   "uri": {

     

       15
       15
       +
                     "type": "string",

     

       16
       16
       +
                     "format": "at-uri",

     

       17
       17
       +
                     "description": "AT-URI of the comment to update"

     

       18
       18
       +
                   },

     

       19
       19
       +
                   "content": {

     

       20
       20
       +
                     "type": "string",

     

       21
       21
       +
                     "maxGraphemes": 10000,

     

       22
       22
       +
                     "maxLength": 100000,

     

       23
       23
       +
                     "description": "Updated comment text content"

     

       24
       24
       +
                   },

     

       25
       25
       +
                   "facets": {

     

       26
       26
       +
                     "type": "array",

     

       27
       27
       +
                     "description": "Updated annotations for rich text (mentions, links, etc.)",

     

       28
       28
       +
                     "items": {

     

       29
       29
       +
                       "type": "ref",

     

       30
       30
       +
                       "ref": "social.coves.richtext.facet"

     

       31
       31
       +
                     }

     

       32
       32
       +
                   },

     

       33
       33
       +
                   "embed": {

     

       34
       34
       +
                     "type": "union",

     

       35
       35
       +
                     "description": "Updated embedded media or quoted posts",

     

       36
       36
       +
                     "refs": [

     

       37
       37
       +
                       "social.coves.embed.images",

     

       38
       38
       +
                       "social.coves.embed.post"

     

       39
       39
       +
                     ]

     

       40
       40
       +
                   },

     

       41
       41
       +
                   "langs": {

     

       42
       42
       +
                     "type": "array",

     

       43
       43
       +
                     "description": "Updated languages used in the comment content (ISO 639-1)",

     

       44
       44
       +
                     "maxLength": 3,

     

       45
       45
       +
                     "items": {

     

       46
       46
       +
                       "type": "string",

     

       47
       47
       +
                       "format": "language"

     

       48
       48
       +
                     }

     

       49
       49
       +
                   },

     

       50
       50
       +
                   "labels": {

     

       51
       51
       +
                     "type": "ref",

     

       52
       52
       +
                     "ref": "com.atproto.label.defs#selfLabels",

     

       53
       53
       +
                     "description": "Updated self-applied content labels"

     

       54
       54
       +
                   }

     

       55
       55
       +
                 }

     

       56
       56
       +
               }

     

       57
       57
       +
             },

     

       58
       58
       +
             "output": {

     

       59
       59
       +
               "encoding": "application/json",

     

       60
       60
       +
               "schema": {

     

       61
       61
       +
                 "type": "object",

     

       62
       62
       +
                 "required": ["uri", "cid"],

     

       63
       63
       +
                 "properties": {

     

       64
       64
       +
                   "uri": {

     

       65
       65
       +
                     "type": "string",

     

       66
       66
       +
                     "format": "at-uri",

     

       67
       67
       +
                     "description": "AT-URI of the updated comment (unchanged from input)"

     

       68
       68
       +
                   },

     

       69
       69
       +
                   "cid": {

     

       70
       70
       +
                     "type": "string",

     

       71
       71
       +
                     "format": "cid",

     

       72
       72
       +
                     "description": "New CID of the updated comment record"

     

       73
       73
       +
                   }

     

       74
       74
       +
                 }

     

       75
       75
       +
               }

     

       76
       76
       +
             },

     

       77
       77
       +
             "errors": [

     

       78
       78
       +
               {

     

       79
       79
       +
                 "name": "CommentNotFound",

     

       80
       80
       +
                 "description": "Comment with the specified URI does not exist"

     

       81
       81
       +
               },

     

       82
       82
       +
               {

     

       83
       83
       +
                 "name": "ContentTooLong",

     

       84
       84
       +
                 "description": "Updated comment content exceeds maximum length constraints"

     

       85
       85
       +
               },

     

       86
       86
       +
               {

     

       87
       87
       +
                 "name": "ContentEmpty",

     

       88
       88
       +
                 "description": "Updated comment content is empty or contains only whitespace"

     

       89
       89
       +
               },

     

       90
       90
       +
               {

     

       91
       91
       +
                 "name": "NotAuthorized",

     

       92
       92
       +
                 "description": "User is not authorized to update this comment (not the author)"

     

       93
       93
       +
               }

     

       94
       94
       +
             ]

     

       95
       95
       +
           }

     

       96
       96
       +
         }

     

       97
       97
       +
       }

+38

internal/core/comments/types.go

···

       1
       1
       +
       package comments

     

       2
       2
       +
       

     

       3
       3
       +
       // CreateCommentRequest contains parameters for creating a comment

     

       4
       4
       +
       type CreateCommentRequest struct {

     

       5
       5
       +
       	Reply   ReplyRef      `json:"reply"`

     

       6
       6
       +
       	Content string        `json:"content"`

     

       7
       7
       +
       	Facets  []interface{} `json:"facets,omitempty"`

     

       8
       8
       +
       	Embed   interface{}   `json:"embed,omitempty"`

     

       9
       9
       +
       	Langs   []string      `json:"langs,omitempty"`

     

       10
       10
       +
       	Labels  *SelfLabels   `json:"labels,omitempty"`

     

       11
       11
       +
       }

     

       12
       12
       +
       

     

       13
       13
       +
       // CreateCommentResponse contains the result of creating a comment

     

       14
       14
       +
       type CreateCommentResponse struct {

     

       15
       15
       +
       	URI string `json:"uri"`

     

       16
       16
       +
       	CID string `json:"cid"`

     

       17
       17
       +
       }

     

       18
       18
       +
       

     

       19
       19
       +
       // UpdateCommentRequest contains parameters for updating a comment

     

       20
       20
       +
       type UpdateCommentRequest struct {

     

       21
       21
       +
       	URI     string        `json:"uri"`

     

       22
       22
       +
       	Content string        `json:"content"`

     

       23
       23
       +
       	Facets  []interface{} `json:"facets,omitempty"`

     

       24
       24
       +
       	Embed   interface{}   `json:"embed,omitempty"`

     

       25
       25
       +
       	Langs   []string      `json:"langs,omitempty"`

     

       26
       26
       +
       	Labels  *SelfLabels   `json:"labels,omitempty"`

     

       27
       27
       +
       }

     

       28
       28
       +
       

     

       29
       29
       +
       // UpdateCommentResponse contains the result of updating a comment

     

       30
       30
       +
       type UpdateCommentResponse struct {

     

       31
       31
       +
       	URI string `json:"uri"`

     

       32
       32
       +
       	CID string `json:"cid"`

     

       33
       33
       +
       }

     

       34
       34
       +
       

     

       35
       35
       +
       // DeleteCommentRequest contains parameters for deleting a comment

     

       36
       36
       +
       type DeleteCommentRequest struct {

     

       37
       37
       +
       	URI string `json:"uri"`

     

       38
       38
       +
       }

+130

internal/api/handlers/comments/create_comment.go

···

       1
       1
       +
       package comments

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"Coves/internal/api/middleware"

     

       5
       5
       +
       	"Coves/internal/core/comments"

     

       6
       6
       +
       	"encoding/json"

     

       7
       7
       +
       	"log"

     

       8
       8
       +
       	"net/http"

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       // CreateCommentHandler handles comment creation requests

     

       12
       12
       +
       type CreateCommentHandler struct {

     

       13
       13
       +
       	service comments.Service

     

       14
       14
       +
       }

     

       15
       15
       +
       

     

       16
       16
       +
       // NewCreateCommentHandler creates a new handler for creating comments

     

       17
       17
       +
       func NewCreateCommentHandler(service comments.Service) *CreateCommentHandler {

     

       18
       18
       +
       	return &CreateCommentHandler{

     

       19
       19
       +
       		service: service,

     

       20
       20
       +
       	}

     

       21
       21
       +
       }

     

       22
       22
       +
       

     

       23
       23
       +
       // CreateCommentInput matches the lexicon input schema for social.coves.community.comment.create

     

       24
       24
       +
       type CreateCommentInput struct {

     

       25
       25
       +
       	Reply struct {

     

       26
       26
       +
       		Root struct {

     

       27
       27
       +
       			URI string `json:"uri"`

     

       28
       28
       +
       			CID string `json:"cid"`

     

       29
       29
       +
       		} `json:"root"`

     

       30
       30
       +
       		Parent struct {

     

       31
       31
       +
       			URI string `json:"uri"`

     

       32
       32
       +
       			CID string `json:"cid"`

     

       33
       33
       +
       		} `json:"parent"`

     

       34
       34
       +
       	} `json:"reply"`

     

       35
       35
       +
       	Content string        `json:"content"`

     

       36
       36
       +
       	Facets  []interface{} `json:"facets,omitempty"`

     

       37
       37
       +
       	Embed   interface{}   `json:"embed,omitempty"`

     

       38
       38
       +
       	Langs   []string      `json:"langs,omitempty"`

     

       39
       39
       +
       	Labels  interface{}   `json:"labels,omitempty"`

     

       40
       40
       +
       }

     

       41
       41
       +
       

     

       42
       42
       +
       // CreateCommentOutput matches the lexicon output schema

     

       43
       43
       +
       type CreateCommentOutput struct {

     

       44
       44
       +
       	URI string `json:"uri"`

     

       45
       45
       +
       	CID string `json:"cid"`

     

       46
       46
       +
       }

     

       47
       47
       +
       

     

       48
       48
       +
       // HandleCreate handles comment creation requests

     

       49
       49
       +
       // POST /xrpc/social.coves.community.comment.create

     

       50
       50
       +
       //

     

       51
       51
       +
       // Request body: { "reply": { "root": {...}, "parent": {...} }, "content": "..." }

     

       52
       52
       +
       // Response: { "uri": "at://...", "cid": "..." }

     

       53
       53
       +
       func (h *CreateCommentHandler) HandleCreate(w http.ResponseWriter, r *http.Request) {

     

       54
       54
       +
       	// 1. Check method is POST

     

       55
       55
       +
       	if r.Method != http.MethodPost {

     

       56
       56
       +
       		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)

     

       57
       57
       +
       		return

     

       58
       58
       +
       	}

     

       59
       59
       +
       

     

       60
       60
       +
       	// 2. Limit request body size to prevent DoS attacks (100KB should be plenty for comments)

     

       61
       61
       +
       	r.Body = http.MaxBytesReader(w, r.Body, 100*1024)

     

       62
       62
       +
       

     

       63
       63
       +
       	// 3. Parse JSON body into CreateCommentInput

     

       64
       64
       +
       	var input CreateCommentInput

     

       65
       65
       +
       	if err := json.NewDecoder(r.Body).Decode(&input); err != nil {

     

       66
       66
       +
       		writeError(w, http.StatusBadRequest, "InvalidRequest", "Invalid request body")

     

       67
       67
       +
       		return

     

       68
       68
       +
       	}

     

       69
       69
       +
       

     

       70
       70
       +
       	// 4. Get OAuth session from context (injected by auth middleware)

     

       71
       71
       +
       	session := middleware.GetOAuthSession(r)

     

       72
       72
       +
       	if session == nil {

     

       73
       73
       +
       		writeError(w, http.StatusUnauthorized, "AuthRequired", "Authentication required")

     

       74
       74
       +
       		return

     

       75
       75
       +
       	}

     

       76
       76
       +
       

     

       77
       77
       +
       	// 5. Convert labels interface{} to *comments.SelfLabels if provided

     

       78
       78
       +
       	var labels *comments.SelfLabels

     

       79
       79
       +
       	if input.Labels != nil {

     

       80
       80
       +
       		labelsJSON, err := json.Marshal(input.Labels)

     

       81
       81
       +
       		if err != nil {

     

       82
       82
       +
       			writeError(w, http.StatusBadRequest, "InvalidLabels", "Invalid labels format")

     

       83
       83
       +
       			return

     

       84
       84
       +
       		}

     

       85
       85
       +
       		var selfLabels comments.SelfLabels

     

       86
       86
       +
       		if err := json.Unmarshal(labelsJSON, &selfLabels); err != nil {

     

       87
       87
       +
       			writeError(w, http.StatusBadRequest, "InvalidLabels", "Invalid labels structure")

     

       88
       88
       +
       			return

     

       89
       89
       +
       		}

     

       90
       90
       +
       		labels = &selfLabels

     

       91
       91
       +
       	}

     

       92
       92
       +
       

     

       93
       93
       +
       	// 6. Convert input to CreateCommentRequest

     

       94
       94
       +
       	req := comments.CreateCommentRequest{

     

       95
       95
       +
       		Reply: comments.ReplyRef{

     

       96
       96
       +
       			Root: comments.StrongRef{

     

       97
       97
       +
       				URI: input.Reply.Root.URI,

     

       98
       98
       +
       				CID: input.Reply.Root.CID,

     

       99
       99
       +
       			},

     

       100
       100
       +
       			Parent: comments.StrongRef{

     

       101
       101
       +
       				URI: input.Reply.Parent.URI,

     

       102
       102
       +
       				CID: input.Reply.Parent.CID,

     

       103
       103
       +
       			},

     

       104
       104
       +
       		},

     

       105
       105
       +
       		Content: input.Content,

     

       106
       106
       +
       		Facets:  input.Facets,

     

       107
       107
       +
       		Embed:   input.Embed,

     

       108
       108
       +
       		Langs:   input.Langs,

     

       109
       109
       +
       		Labels:  labels,

     

       110
       110
       +
       	}

     

       111
       111
       +
       

     

       112
       112
       +
       	// 7. Call service to create comment

     

       113
       113
       +
       	response, err := h.service.CreateComment(r.Context(), session, req)

     

       114
       114
       +
       	if err != nil {

     

       115
       115
       +
       		handleServiceError(w, err)

     

       116
       116
       +
       		return

     

       117
       117
       +
       	}

     

       118
       118
       +
       

     

       119
       119
       +
       	// 8. Return JSON response with URI and CID

     

       120
       120
       +
       	output := CreateCommentOutput{

     

       121
       121
       +
       		URI: response.URI,

     

       122
       122
       +
       		CID: response.CID,

     

       123
       123
       +
       	}

     

       124
       124
       +
       

     

       125
       125
       +
       	w.Header().Set("Content-Type", "application/json")

     

       126
       126
       +
       	w.WriteHeader(http.StatusOK)

     

       127
       127
       +
       	if err := json.NewEncoder(w).Encode(output); err != nil {

     

       128
       128
       +
       		log.Printf("Failed to encode response: %v", err)

     

       129
       129
       +
       	}

     

       130
       130
       +
       }

+80

internal/api/handlers/comments/delete_comment.go

···

       1
       1
       +
       package comments

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"Coves/internal/api/middleware"

     

       5
       5
       +
       	"Coves/internal/core/comments"

     

       6
       6
       +
       	"encoding/json"

     

       7
       7
       +
       	"log"

     

       8
       8
       +
       	"net/http"

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       // DeleteCommentHandler handles comment deletion requests

     

       12
       12
       +
       type DeleteCommentHandler struct {

     

       13
       13
       +
       	service comments.Service

     

       14
       14
       +
       }

     

       15
       15
       +
       

     

       16
       16
       +
       // NewDeleteCommentHandler creates a new handler for deleting comments

     

       17
       17
       +
       func NewDeleteCommentHandler(service comments.Service) *DeleteCommentHandler {

     

       18
       18
       +
       	return &DeleteCommentHandler{

     

       19
       19
       +
       		service: service,

     

       20
       20
       +
       	}

     

       21
       21
       +
       }

     

       22
       22
       +
       

     

       23
       23
       +
       // DeleteCommentInput matches the lexicon input schema for social.coves.community.comment.delete

     

       24
       24
       +
       type DeleteCommentInput struct {

     

       25
       25
       +
       	URI string `json:"uri"`

     

       26
       26
       +
       }

     

       27
       27
       +
       

     

       28
       28
       +
       // DeleteCommentOutput is empty per lexicon specification

     

       29
       29
       +
       type DeleteCommentOutput struct{}

     

       30
       30
       +
       

     

       31
       31
       +
       // HandleDelete handles comment deletion requests

     

       32
       32
       +
       // POST /xrpc/social.coves.community.comment.delete

     

       33
       33
       +
       //

     

       34
       34
       +
       // Request body: { "uri": "at://..." }

     

       35
       35
       +
       // Response: {}

     

       36
       36
       +
       func (h *DeleteCommentHandler) HandleDelete(w http.ResponseWriter, r *http.Request) {

     

       37
       37
       +
       	// 1. Check method is POST

     

       38
       38
       +
       	if r.Method != http.MethodPost {

     

       39
       39
       +
       		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)

     

       40
       40
       +
       		return

     

       41
       41
       +
       	}

     

       42
       42
       +
       

     

       43
       43
       +
       	// 2. Limit request body size to prevent DoS attacks (100KB should be plenty for comments)

     

       44
       44
       +
       	r.Body = http.MaxBytesReader(w, r.Body, 100*1024)

     

       45
       45
       +
       

     

       46
       46
       +
       	// 3. Parse JSON body into DeleteCommentInput

     

       47
       47
       +
       	var input DeleteCommentInput

     

       48
       48
       +
       	if err := json.NewDecoder(r.Body).Decode(&input); err != nil {

     

       49
       49
       +
       		writeError(w, http.StatusBadRequest, "InvalidRequest", "Invalid request body")

     

       50
       50
       +
       		return

     

       51
       51
       +
       	}

     

       52
       52
       +
       

     

       53
       53
       +
       	// 4. Get OAuth session from context (injected by auth middleware)

     

       54
       54
       +
       	session := middleware.GetOAuthSession(r)

     

       55
       55
       +
       	if session == nil {

     

       56
       56
       +
       		writeError(w, http.StatusUnauthorized, "AuthRequired", "Authentication required")

     

       57
       57
       +
       		return

     

       58
       58
       +
       	}

     

       59
       59
       +
       

     

       60
       60
       +
       	// 5. Convert input to DeleteCommentRequest

     

       61
       61
       +
       	req := comments.DeleteCommentRequest{

     

       62
       62
       +
       		URI: input.URI,

     

       63
       63
       +
       	}

     

       64
       64
       +
       

     

       65
       65
       +
       	// 6. Call service to delete comment

     

       66
       66
       +
       	err := h.service.DeleteComment(r.Context(), session, req)

     

       67
       67
       +
       	if err != nil {

     

       68
       68
       +
       		handleServiceError(w, err)

     

       69
       69
       +
       		return

     

       70
       70
       +
       	}

     

       71
       71
       +
       

     

       72
       72
       +
       	// 7. Return empty JSON object per lexicon specification

     

       73
       73
       +
       	output := DeleteCommentOutput{}

     

       74
       74
       +
       

     

       75
       75
       +
       	w.Header().Set("Content-Type", "application/json")

     

       76
       76
       +
       	w.WriteHeader(http.StatusOK)

     

       77
       77
       +
       	if err := json.NewEncoder(w).Encode(output); err != nil {

     

       78
       78
       +
       		log.Printf("Failed to encode response: %v", err)

     

       79
       79
       +
       	}

     

       80
       80
       +
       }

+34 -2

internal/api/handlers/comments/errors.go

···

       3
       3
        
       import (

     

       4
       4
        
       	"Coves/internal/core/comments"

     

       5
       5
        
       	"encoding/json"

     

       6
       6
       +
       	"errors"

     

       6
       7
        
       	"log"

     

       7
       8
        
       	"net/http"

     

       8
       9
        
       )

     
···

       30
       31
        
       func handleServiceError(w http.ResponseWriter, err error) {

     

       31
       32
        
       	switch {

     

       32
       33
        
       	case comments.IsNotFound(err):

     

       33
       33
       -
       		writeError(w, http.StatusNotFound, "NotFound", err.Error())

     

       34
       34
       +
       		// Map specific not found errors to appropriate messages

     

       35
       35
       +
       		switch {

     

       36
       36
       +
       		case errors.Is(err, comments.ErrCommentNotFound):

     

       37
       37
       +
       			writeError(w, http.StatusNotFound, "CommentNotFound", "Comment not found")

     

       38
       38
       +
       		case errors.Is(err, comments.ErrParentNotFound):

     

       39
       39
       +
       			writeError(w, http.StatusNotFound, "ParentNotFound", "Parent post or comment not found")

     

       40
       40
       +
       		case errors.Is(err, comments.ErrRootNotFound):

     

       41
       41
       +
       			writeError(w, http.StatusNotFound, "RootNotFound", "Root post not found")

     

       42
       42
       +
       		default:

     

       43
       43
       +
       			writeError(w, http.StatusNotFound, "NotFound", err.Error())

     

       44
       44
       +
       		}

     

       34
       45
        
       

     

       35
       46
        
       	case comments.IsValidationError(err):

     

       36
       36
       -
       		writeError(w, http.StatusBadRequest, "InvalidRequest", err.Error())

     

       47
       47
       +
       		// Map specific validation errors to appropriate messages

     

       48
       48
       +
       		switch {

     

       49
       49
       +
       		case errors.Is(err, comments.ErrInvalidReply):

     

       50
       50
       +
       			writeError(w, http.StatusBadRequest, "InvalidReply", "The reply reference is invalid or malformed")

     

       51
       51
       +
       		case errors.Is(err, comments.ErrContentTooLong):

     

       52
       52
       +
       			writeError(w, http.StatusBadRequest, "ContentTooLong", "Comment content exceeds 10000 graphemes")

     

       53
       53
       +
       		case errors.Is(err, comments.ErrContentEmpty):

     

       54
       54
       +
       			writeError(w, http.StatusBadRequest, "ContentEmpty", "Comment content is required")

     

       55
       55
       +
       		default:

     

       56
       56
       +
       			writeError(w, http.StatusBadRequest, "InvalidRequest", err.Error())

     

       57
       57
       +
       		}

     

       58
       58
       +
       

     

       59
       59
       +
       	case errors.Is(err, comments.ErrNotAuthorized):

     

       60
       60
       +
       		writeError(w, http.StatusForbidden, "NotAuthorized", "User is not authorized to perform this action")

     

       61
       61
       +
       

     

       62
       62
       +
       	case errors.Is(err, comments.ErrBanned):

     

       63
       63
       +
       		writeError(w, http.StatusForbidden, "Banned", "User is banned from this community")

     

       64
       64
       +
       

     

       65
       65
       +
       	// NOTE: IsConflict case removed - the PDS handles duplicate detection via CreateRecord,

     

       66
       66
       +
       	// so ErrCommentAlreadyExists is never returned from the service layer. If the PDS rejects

     

       67
       67
       +
       	// a duplicate record, it returns an auth/validation error which is handled by other cases.

     

       68
       68
       +
       	// Keeping this code would be dead code that never executes.

     

       37
       69
        
       

     

       38
       70
        
       	default:

     

       39
       71
        
       		// Don't leak internal error details to clients

+112

internal/api/handlers/comments/update_comment.go

···

       1
       1
       +
       package comments

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"Coves/internal/api/middleware"

     

       5
       5
       +
       	"Coves/internal/core/comments"

     

       6
       6
       +
       	"encoding/json"

     

       7
       7
       +
       	"log"

     

       8
       8
       +
       	"net/http"

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       // UpdateCommentHandler handles comment update requests

     

       12
       12
       +
       type UpdateCommentHandler struct {

     

       13
       13
       +
       	service comments.Service

     

       14
       14
       +
       }

     

       15
       15
       +
       

     

       16
       16
       +
       // NewUpdateCommentHandler creates a new handler for updating comments

     

       17
       17
       +
       func NewUpdateCommentHandler(service comments.Service) *UpdateCommentHandler {

     

       18
       18
       +
       	return &UpdateCommentHandler{

     

       19
       19
       +
       		service: service,

     

       20
       20
       +
       	}

     

       21
       21
       +
       }

     

       22
       22
       +
       

     

       23
       23
       +
       // UpdateCommentInput matches the lexicon input schema for social.coves.community.comment.update

     

       24
       24
       +
       type UpdateCommentInput struct {

     

       25
       25
       +
       	URI     string        `json:"uri"`

     

       26
       26
       +
       	Content string        `json:"content"`

     

       27
       27
       +
       	Facets  []interface{} `json:"facets,omitempty"`

     

       28
       28
       +
       	Embed   interface{}   `json:"embed,omitempty"`

     

       29
       29
       +
       	Langs   []string      `json:"langs,omitempty"`

     

       30
       30
       +
       	Labels  interface{}   `json:"labels,omitempty"`

     

       31
       31
       +
       }

     

       32
       32
       +
       

     

       33
       33
       +
       // UpdateCommentOutput matches the lexicon output schema

     

       34
       34
       +
       type UpdateCommentOutput struct {

     

       35
       35
       +
       	URI string `json:"uri"`

     

       36
       36
       +
       	CID string `json:"cid"`

     

       37
       37
       +
       }

     

       38
       38
       +
       

     

       39
       39
       +
       // HandleUpdate handles comment update requests

     

       40
       40
       +
       // POST /xrpc/social.coves.community.comment.update

     

       41
       41
       +
       //

     

       42
       42
       +
       // Request body: { "uri": "at://...", "content": "..." }

     

       43
       43
       +
       // Response: { "uri": "at://...", "cid": "..." }

     

       44
       44
       +
       func (h *UpdateCommentHandler) HandleUpdate(w http.ResponseWriter, r *http.Request) {

     

       45
       45
       +
       	// 1. Check method is POST

     

       46
       46
       +
       	if r.Method != http.MethodPost {

     

       47
       47
       +
       		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)

     

       48
       48
       +
       		return

     

       49
       49
       +
       	}

     

       50
       50
       +
       

     

       51
       51
       +
       	// 2. Limit request body size to prevent DoS attacks (100KB should be plenty for comments)

     

       52
       52
       +
       	r.Body = http.MaxBytesReader(w, r.Body, 100*1024)

     

       53
       53
       +
       

     

       54
       54
       +
       	// 3. Parse JSON body into UpdateCommentInput

     

       55
       55
       +
       	var input UpdateCommentInput

     

       56
       56
       +
       	if err := json.NewDecoder(r.Body).Decode(&input); err != nil {

     

       57
       57
       +
       		writeError(w, http.StatusBadRequest, "InvalidRequest", "Invalid request body")

     

       58
       58
       +
       		return

     

       59
       59
       +
       	}

     

       60
       60
       +
       

     

       61
       61
       +
       	// 4. Get OAuth session from context (injected by auth middleware)

     

       62
       62
       +
       	session := middleware.GetOAuthSession(r)

     

       63
       63
       +
       	if session == nil {

     

       64
       64
       +
       		writeError(w, http.StatusUnauthorized, "AuthRequired", "Authentication required")

     

       65
       65
       +
       		return

     

       66
       66
       +
       	}

     

       67
       67
       +
       

     

       68
       68
       +
       	// 5. Convert labels interface{} to *comments.SelfLabels if provided

     

       69
       69
       +
       	var labels *comments.SelfLabels

     

       70
       70
       +
       	if input.Labels != nil {

     

       71
       71
       +
       		labelsJSON, err := json.Marshal(input.Labels)

     

       72
       72
       +
       		if err != nil {

     

       73
       73
       +
       			writeError(w, http.StatusBadRequest, "InvalidLabels", "Invalid labels format")

     

       74
       74
       +
       			return

     

       75
       75
       +
       		}

     

       76
       76
       +
       		var selfLabels comments.SelfLabels

     

       77
       77
       +
       		if err := json.Unmarshal(labelsJSON, &selfLabels); err != nil {

     

       78
       78
       +
       			writeError(w, http.StatusBadRequest, "InvalidLabels", "Invalid labels structure")

     

       79
       79
       +
       			return

     

       80
       80
       +
       		}

     

       81
       81
       +
       		labels = &selfLabels

     

       82
       82
       +
       	}

     

       83
       83
       +
       

     

       84
       84
       +
       	// 6. Convert input to UpdateCommentRequest

     

       85
       85
       +
       	req := comments.UpdateCommentRequest{

     

       86
       86
       +
       		URI:     input.URI,

     

       87
       87
       +
       		Content: input.Content,

     

       88
       88
       +
       		Facets:  input.Facets,

     

       89
       89
       +
       		Embed:   input.Embed,

     

       90
       90
       +
       		Langs:   input.Langs,

     

       91
       91
       +
       		Labels:  labels,

     

       92
       92
       +
       	}

     

       93
       93
       +
       

     

       94
       94
       +
       	// 7. Call service to update comment

     

       95
       95
       +
       	response, err := h.service.UpdateComment(r.Context(), session, req)

     

       96
       96
       +
       	if err != nil {

     

       97
       97
       +
       		handleServiceError(w, err)

     

       98
       98
       +
       		return

     

       99
       99
       +
       	}

     

       100
       100
       +
       

     

       101
       101
       +
       	// 8. Return JSON response with URI and CID

     

       102
       102
       +
       	output := UpdateCommentOutput{

     

       103
       103
       +
       		URI: response.URI,

     

       104
       104
       +
       		CID: response.CID,

     

       105
       105
       +
       	}

     

       106
       106
       +
       

     

       107
       107
       +
       	w.Header().Set("Content-Type", "application/json")

     

       108
       108
       +
       	w.WriteHeader(http.StatusOK)

     

       109
       109
       +
       	if err := json.NewEncoder(w).Encode(output); err != nil {

     

       110
       110
       +
       		log.Printf("Failed to encode response: %v", err)

     

       111
       111
       +
       	}

     

       112
       112
       +
       }

+35

internal/api/routes/comment.go

···

       1
       1
       +
       package routes

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"Coves/internal/api/handlers/comments"

     

       5
       5
       +
       	"Coves/internal/api/middleware"

     

       6
       6
       +
       	commentsCore "Coves/internal/core/comments"

     

       7
       7
       +
       

     

       8
       8
       +
       	"github.com/go-chi/chi/v5"

     

       9
       9
       +
       )

     

       10
       10
       +
       

     

       11
       11
       +
       // RegisterCommentRoutes registers comment-related XRPC endpoints on the router

     

       12
       12
       +
       // Implements social.coves.community.comment.* lexicon endpoints

     

       13
       13
       +
       // All write operations (create, update, delete) require authentication

     

       14
       14
       +
       func RegisterCommentRoutes(r chi.Router, service commentsCore.Service, authMiddleware *middleware.OAuthAuthMiddleware) {

     

       15
       15
       +
       	// Initialize handlers

     

       16
       16
       +
       	createHandler := comments.NewCreateCommentHandler(service)

     

       17
       17
       +
       	updateHandler := comments.NewUpdateCommentHandler(service)

     

       18
       18
       +
       	deleteHandler := comments.NewDeleteCommentHandler(service)

     

       19
       19
       +
       

     

       20
       20
       +
       	// Procedure endpoints (POST) - require authentication

     

       21
       21
       +
       	// social.coves.community.comment.create - create a new comment on a post or another comment

     

       22
       22
       +
       	r.With(authMiddleware.RequireAuth).Post(

     

       23
       23
       +
       		"/xrpc/social.coves.community.comment.create",

     

       24
       24
       +
       		createHandler.HandleCreate)

     

       25
       25
       +
       

     

       26
       26
       +
       	// social.coves.community.comment.update - update an existing comment's content

     

       27
       27
       +
       	r.With(authMiddleware.RequireAuth).Post(

     

       28
       28
       +
       		"/xrpc/social.coves.community.comment.update",

     

       29
       29
       +
       		updateHandler.HandleUpdate)

     

       30
       30
       +
       

     

       31
       31
       +
       	// social.coves.community.comment.delete - soft delete a comment

     

       32
       32
       +
       	r.With(authMiddleware.RequireAuth).Post(

     

       33
       33
       +
       		"/xrpc/social.coves.community.comment.delete",

     

       34
       34
       +
       		deleteHandler.HandleDelete)

     

       35
       35
       +
       }

+4 -2

tests/integration/comment_query_test.go

···

       785
       785
        
       	postRepo := postgres.NewPostRepository(db)

     

       786
       786
        
       	userRepo := postgres.NewUserRepository(db)

     

       787
       787
        
       	communityRepo := postgres.NewCommunityRepository(db)

     

       788
       788
       -
       	return comments.NewCommentService(commentRepo, userRepo, postRepo, communityRepo)

     

       788
       788
       +
       	// Use factory constructor with nil factory - these tests only use the read path (GetComments)

     

       789
       789
       +
       	return comments.NewCommentServiceWithPDSFactory(commentRepo, userRepo, postRepo, communityRepo, nil, nil)

     

       789
       790
        
       }

     

       790
       791
        
       

     

       791
       792
        
       // Helper: createTestCommentWithScore creates a comment with specific vote counts

     
···

       871
       872
        
       	postRepo := postgres.NewPostRepository(db)

     

       872
       873
        
       	userRepo := postgres.NewUserRepository(db)

     

       873
       874
        
       	communityRepo := postgres.NewCommunityRepository(db)

     

       874
       874
       -
       	service := comments.NewCommentService(commentRepo, userRepo, postRepo, communityRepo)

     

       875
       875
       +
       	// Use factory constructor with nil factory - these tests only use the read path (GetComments)

     

       876
       876
       +
       	service := comments.NewCommentServiceWithPDSFactory(commentRepo, userRepo, postRepo, communityRepo, nil, nil)

     

       875
       877
        
       	return &testCommentServiceAdapter{service: service}

     

       876
       878
        
       }

     

       877
       879

+6 -3

tests/integration/comment_vote_test.go

···

       417
       417
        
       		}

     

       418
       418
        
       

     

       419
       419
        
       		// Query comments with viewer authentication

     

       420
       420
       -
       		commentService := comments.NewCommentService(commentRepo, userRepo, postRepo, communityRepo)

     

       420
       420
       +
       		// Use factory constructor with nil factory - this test only uses the read path (GetComments)

     

       421
       421
       +
       		commentService := comments.NewCommentServiceWithPDSFactory(commentRepo, userRepo, postRepo, communityRepo, nil, nil)

     

       421
       422
        
       		response, err := commentService.GetComments(ctx, &comments.GetCommentsRequest{

     

       422
       423
        
       			PostURI:   testPostURI,

     

       423
       424
        
       			Sort:      "new",

     
···

       499
       500
        
       		}

     

       500
       501
        
       

     

       501
       502
        
       		// Query with authentication but no vote

     

       502
       502
       -
       		commentService := comments.NewCommentService(commentRepo, userRepo, postRepo, communityRepo)

     

       503
       503
       +
       		// Use factory constructor with nil factory - this test only uses the read path (GetComments)

     

       504
       504
       +
       		commentService := comments.NewCommentServiceWithPDSFactory(commentRepo, userRepo, postRepo, communityRepo, nil, nil)

     

       503
       505
        
       		response, err := commentService.GetComments(ctx, &comments.GetCommentsRequest{

     

       504
       506
        
       			PostURI:   testPostURI,

     

       505
       507
        
       			Sort:      "new",

     
···

       542
       544
        
       

     

       543
       545
        
       	t.Run("Unauthenticated request has no viewer state", func(t *testing.T) {

     

       544
       546
        
       		// Query without authentication

     

       545
       545
       -
       		commentService := comments.NewCommentService(commentRepo, userRepo, postRepo, communityRepo)

     

       547
       547
       +
       		// Use factory constructor with nil factory - this test only uses the read path (GetComments)

     

       548
       548
       +
       		commentService := comments.NewCommentServiceWithPDSFactory(commentRepo, userRepo, postRepo, communityRepo, nil, nil)

     

       546
       549
        
       		response, err := commentService.GetComments(ctx, &comments.GetCommentsRequest{

     

       547
       550
        
       			PostURI:   testPostURI,

     

       548
       551
        
       			Sort:      "new",

+1 -1

go.mod

···

       72
       72
        
       	github.com/prometheus/client_model v0.5.0 // indirect

     

       73
       73
        
       	github.com/prometheus/common v0.45.0 // indirect

     

       74
       74
        
       	github.com/prometheus/procfs v0.12.0 // indirect

     

       75
       75
       -
       	github.com/rivo/uniseg v0.1.0 // indirect

     

       75
       75
       +
       	github.com/rivo/uniseg v0.4.7 // indirect

     

       76
       76
        
       	github.com/segmentio/asm v1.2.0 // indirect

     

       77
       77
        
       	github.com/sethvargo/go-retry v0.3.0 // indirect

     

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

go.sum

···

       159
       159
        
       github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=

     

       160
       160
        
       github.com/rivo/uniseg v0.1.0 h1:+2KBaVoUmb9XzDsrx/Ct0W/EYOSFf/nWTauy++DprtY=

     

       161
       161
        
       github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=

     

       162
       162
       +
       github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=

     

       163
       163
       +
       github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=

     

       162
       164
        
       github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=

     

       163
       165
        
       github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=

     

       164
       166
        
       github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=

+66

internal/db/migrations/021_add_comment_deletion_metadata.sql

···

       1
       1
       +
       -- +goose Up

     

       2
       2
       +
       -- Add deletion reason tracking to preserve thread structure while respecting privacy

     

       3
       3
       +
       -- When comments are deleted, we blank content but keep the record for threading

     

       4
       4
       +
       

     

       5
       5
       +
       -- Create enum type for deletion reasons

     

       6
       6
       +
       CREATE TYPE deletion_reason AS ENUM ('author', 'moderator');

     

       7
       7
       +
       

     

       8
       8
       +
       -- Add new columns to comments table

     

       9
       9
       +
       ALTER TABLE comments ADD COLUMN deletion_reason deletion_reason;

     

       10
       10
       +
       ALTER TABLE comments ADD COLUMN deleted_by TEXT;

     

       11
       11
       +
       

     

       12
       12
       +
       -- Add comments for new columns

     

       13
       13
       +
       COMMENT ON COLUMN comments.deletion_reason IS 'Reason for deletion: author (user deleted), moderator (community mod removed)';

     

       14
       14
       +
       COMMENT ON COLUMN comments.deleted_by IS 'DID of the actor who performed the deletion';

     

       15
       15
       +
       

     

       16
       16
       +
       -- Backfill existing deleted comments as author-deleted

     

       17
       17
       +
       -- This handles existing soft-deleted comments gracefully

     

       18
       18
       +
       UPDATE comments

     

       19
       19
       +
       SET deletion_reason = 'author',

     

       20
       20
       +
           deleted_by = commenter_did

     

       21
       21
       +
       WHERE deleted_at IS NOT NULL AND deletion_reason IS NULL;

     

       22
       22
       +
       

     

       23
       23
       +
       -- Modify existing indexes to NOT filter deleted_at IS NULL

     

       24
       24
       +
       -- This allows deleted comments to appear in thread queries for structure preservation

     

       25
       25
       +
       -- Note: We drop and recreate to change the partial index condition

     

       26
       26
       +
       

     

       27
       27
       +
       -- Drop old partial indexes that exclude deleted comments

     

       28
       28
       +
       DROP INDEX IF EXISTS idx_comments_root;

     

       29
       29
       +
       DROP INDEX IF EXISTS idx_comments_parent;

     

       30
       30
       +
       DROP INDEX IF EXISTS idx_comments_parent_score;

     

       31
       31
       +
       DROP INDEX IF EXISTS idx_comments_uri_active;

     

       32
       32
       +
       

     

       33
       33
       +
       -- Recreate indexes without the deleted_at filter (include all comments for threading)

     

       34
       34
       +
       CREATE INDEX idx_comments_root ON comments(root_uri, created_at DESC);

     

       35
       35
       +
       CREATE INDEX idx_comments_parent ON comments(parent_uri, created_at DESC);

     

       36
       36
       +
       CREATE INDEX idx_comments_parent_score ON comments(parent_uri, score DESC, created_at DESC);

     

       37
       37
       +
       CREATE INDEX idx_comments_uri_lookup ON comments(uri);

     

       38
       38
       +
       

     

       39
       39
       +
       -- Add index for querying by deletion_reason (for moderation dashboard)

     

       40
       40
       +
       CREATE INDEX idx_comments_deleted_reason ON comments(deletion_reason, deleted_at DESC)

     

       41
       41
       +
       WHERE deleted_at IS NOT NULL;

     

       42
       42
       +
       

     

       43
       43
       +
       -- Add index for querying by deleted_by (for moderation audit/filtering)

     

       44
       44
       +
       CREATE INDEX idx_comments_deleted_by ON comments(deleted_by, deleted_at DESC)

     

       45
       45
       +
       WHERE deleted_at IS NOT NULL;

     

       46
       46
       +
       

     

       47
       47
       +
       -- +goose Down

     

       48
       48
       +
       -- Remove deletion metadata columns and restore original indexes

     

       49
       49
       +
       

     

       50
       50
       +
       DROP INDEX IF EXISTS idx_comments_deleted_by;

     

       51
       51
       +
       DROP INDEX IF EXISTS idx_comments_deleted_reason;

     

       52
       52
       +
       DROP INDEX IF EXISTS idx_comments_uri_lookup;

     

       53
       53
       +
       DROP INDEX IF EXISTS idx_comments_parent_score;

     

       54
       54
       +
       DROP INDEX IF EXISTS idx_comments_parent;

     

       55
       55
       +
       DROP INDEX IF EXISTS idx_comments_root;

     

       56
       56
       +
       

     

       57
       57
       +
       -- Restore original partial indexes (excluding deleted comments)

     

       58
       58
       +
       CREATE INDEX idx_comments_root ON comments(root_uri, created_at DESC) WHERE deleted_at IS NULL;

     

       59
       59
       +
       CREATE INDEX idx_comments_parent ON comments(parent_uri, created_at DESC) WHERE deleted_at IS NULL;

     

       60
       60
       +
       CREATE INDEX idx_comments_parent_score ON comments(parent_uri, score DESC, created_at DESC) WHERE deleted_at IS NULL;

     

       61
       61
       +
       CREATE INDEX idx_comments_uri_active ON comments(uri) WHERE deleted_at IS NULL;

     

       62
       62
       +
       

     

       63
       63
       +
       ALTER TABLE comments DROP COLUMN IF EXISTS deleted_by;

     

       64
       64
       +
       ALTER TABLE comments DROP COLUMN IF EXISTS deletion_reason;

     

       65
       65
       +
       

     

       66
       66
       +
       DROP TYPE IF EXISTS deletion_reason;

+17 -13

internal/core/comments/view_models.go

···

       7
       7
        
       // CommentView represents the full view of a comment with all metadata

     

       8
       8
        
       // Matches social.coves.community.comment.getComments#commentView lexicon

     

       9
       9
        
       // Used in thread views and get endpoints

     

       10
       10
       +
       // For deleted comments, IsDeleted=true and content-related fields are empty/nil

     

       10
       11
        
       type CommentView struct {

     

       11
       11
       -
       	Embed         interface{}         `json:"embed,omitempty"`

     

       12
       12
       -
       	Record        interface{}         `json:"record"`

     

       13
       13
       -
       	Viewer        *CommentViewerState `json:"viewer,omitempty"`

     

       14
       14
       -
       	Author        *posts.AuthorView   `json:"author"`

     

       15
       15
       -
       	Post          *CommentRef         `json:"post"`

     

       16
       16
       -
       	Parent        *CommentRef         `json:"parent,omitempty"`

     

       17
       17
       -
       	Stats         *CommentStats       `json:"stats"`

     

       18
       18
       -
       	Content       string              `json:"content"`

     

       19
       19
       -
       	CreatedAt     string              `json:"createdAt"`

     

       20
       20
       -
       	IndexedAt     string              `json:"indexedAt"`

     

       21
       21
       -
       	URI           string              `json:"uri"`

     

       22
       22
       -
       	CID           string              `json:"cid"`

     

       23
       23
       -
       	ContentFacets []interface{}       `json:"contentFacets,omitempty"`

     

       12
       12
       +
       	Embed          interface{}         `json:"embed,omitempty"`

     

       13
       13
       +
       	Record         interface{}         `json:"record"`

     

       14
       14
       +
       	Viewer         *CommentViewerState `json:"viewer,omitempty"`

     

       15
       15
       +
       	Author         *posts.AuthorView   `json:"author"`

     

       16
       16
       +
       	Post           *CommentRef         `json:"post"`

     

       17
       17
       +
       	Parent         *CommentRef         `json:"parent,omitempty"`

     

       18
       18
       +
       	Stats          *CommentStats       `json:"stats"`

     

       19
       19
       +
       	Content        string              `json:"content"`

     

       20
       20
       +
       	CreatedAt      string              `json:"createdAt"`

     

       21
       21
       +
       	IndexedAt      string              `json:"indexedAt"`

     

       22
       22
       +
       	URI            string              `json:"uri"`

     

       23
       23
       +
       	CID            string              `json:"cid"`

     

       24
       24
       +
       	ContentFacets  []interface{}       `json:"contentFacets,omitempty"`

     

       25
       25
       +
       	IsDeleted      bool                `json:"isDeleted,omitempty"`

     

       26
       26
       +
       	DeletionReason *string             `json:"deletionReason,omitempty"`

     

       27
       27
       +
       	DeletedAt      *string             `json:"deletedAt,omitempty"`

     

       24
       28
        
       }

     

       25
       29
        
       

     

       26
       30
        
       // ThreadViewComment represents a comment with its nested replies

+23 -1

internal/core/comments/interfaces.go

···

       1
       1
        
       package comments

     

       2
       2
        
       

     

       3
       3
       -
       import "context"

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       	"database/sql"

     

       6
       6
       +
       )

     

       4
       7
        
       

     

       5
       8
        
       // Repository defines the data access interface for comments

     

       6
       9
        
       // Used by Jetstream consumer to index comments from firehose

     
···

       25
       28
        
       

     

       26
       29
        
       	// Delete soft-deletes a comment (sets deleted_at)

     

       27
       30
        
       	// Called by Jetstream consumer after comment is deleted from PDS

     

       31
       31
       +
       	// Deprecated: Use SoftDeleteWithReason for new code to preserve thread structure

     

       28
       32
        
       	Delete(ctx context.Context, uri string) error

     

       29
       33
        
       

     

       34
       34
       +
       	// SoftDeleteWithReason performs a soft delete that blanks content but preserves thread structure

     

       35
       35
       +
       	// This allows deleted comments to appear as "[deleted]" placeholders in thread views

     

       36
       36
       +
       	// reason: "author" (user deleted) or "moderator" (mod removed)

     

       37
       37
       +
       	// deletedByDID: DID of the actor who performed the deletion

     

       38
       38
       +
       	SoftDeleteWithReason(ctx context.Context, uri, reason, deletedByDID string) error

     

       39
       39
       +
       

     

       30
       40
        
       	// ListByRoot retrieves all comments in a thread (flat)

     

       31
       41
        
       	// Used for fetching entire comment threads on posts

     

       32
       42
        
       	ListByRoot(ctx context.Context, rootURI string, limit, offset int) ([]*Comment, error)

     
···

       76
       86
        
       		limitPerParent int,

     

       77
       87
        
       	) (map[string][]*Comment, error)

     

       78
       88
        
       }

     

       89
       89
       +
       

     

       90
       90
       +
       // RepositoryTx provides transaction-aware operations for consumers that need atomicity

     

       91
       91
       +
       // Used by Jetstream consumer to perform atomic delete + count updates

     

       92
       92
       +
       // Implementations that support transactions should also implement this interface

     

       93
       93
       +
       type RepositoryTx interface {

     

       94
       94
       +
       	// SoftDeleteWithReasonTx performs a soft delete within a transaction

     

       95
       95
       +
       	// If tx is nil, executes directly against the database

     

       96
       96
       +
       	// Returns rows affected count for callers that need to check idempotency

     

       97
       97
       +
       	// reason: must be DeletionReasonAuthor or DeletionReasonModerator

     

       98
       98
       +
       	// deletedByDID: DID of the actor who performed the deletion

     

       99
       99
       +
       	SoftDeleteWithReasonTx(ctx context.Context, tx *sql.Tx, uri, reason, deletedByDID string) (int64, error)

     

       100
       100
       +
       }

+5 -6

internal/core/comments/comment_service.go

···

       750
       750
        
       		CreatedAt: createdAt, // Preserve original timestamp

     

       751
       751
        
       	}

     

       752
       752
        
       

     

       753
       753
       -
       	// Update the record on PDS (putRecord)

     

       754
       754
       -
       	// Note: This creates a new CID even though the URI stays the same

     

       755
       755
       -
       	// TODO: Use PutRecord instead of CreateRecord for proper update semantics with optimistic locking.

     

       756
       756
       -
       	// PutRecord should accept the existing CID (existingRecord.CID) to ensure concurrent updates are detected.

     

       757
       757
       -
       	// However, PutRecord is not yet implemented in internal/atproto/pds/client.go.

     

       758
       758
       -
       	uri, cid, err := pdsClient.CreateRecord(ctx, commentCollection, rkey, updatedRecord)

     

       753
       753
       +
       	// Update the record on PDS with optimistic locking via swapRecord CID

     

       754
       754
       +
       	uri, cid, err := pdsClient.PutRecord(ctx, commentCollection, rkey, updatedRecord, existingRecord.CID)

     

       759
       755
        
       	if err != nil {

     

       760
       756
        
       		s.logger.Error("failed to update comment on PDS",

     

       761
       757
        
       			"error", err,

     
···

       764
       760
        
       		if pds.IsAuthError(err) {

     

       765
       761
        
       			return nil, ErrNotAuthorized

     

       766
       762
        
       		}

     

       763
       763
       +
       		if errors.Is(err, pds.ErrConflict) {

     

       764
       764
       +
       			return nil, ErrConcurrentModification

     

       765
       765
       +
       		}

     

       767
       766
        
       		return nil, fmt.Errorf("failed to update comment: %w", err)

     

       768
       767
        
       	}

     

       769
       768

+73

internal/api/handlers/common/viewer_state.go

···

       1
       1
       +
       package common

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"Coves/internal/api/middleware"

     

       5
       5
       +
       	"Coves/internal/core/posts"

     

       6
       6
       +
       	"Coves/internal/core/votes"

     

       7
       7
       +
       	"context"

     

       8
       8
       +
       	"log"

     

       9
       9
       +
       	"net/http"

     

       10
       10
       +
       )

     

       11
       11
       +
       

     

       12
       12
       +
       // FeedPostProvider is implemented by any feed post wrapper that contains a PostView.

     

       13
       13
       +
       // This allows the helper to work with different feed post types (discover, timeline, communityFeed).

     

       14
       14
       +
       type FeedPostProvider interface {

     

       15
       15
       +
       	GetPost() *posts.PostView

     

       16
       16
       +
       }

     

       17
       17
       +
       

     

       18
       18
       +
       // PopulateViewerVoteState enriches feed posts with the authenticated user's vote state.

     

       19
       19
       +
       // This is a no-op if voteService is nil or the request is unauthenticated.

     

       20
       20
       +
       //

     

       21
       21
       +
       // Parameters:

     

       22
       22
       +
       //   - ctx: Request context for PDS calls

     

       23
       23
       +
       //   - r: HTTP request (used to extract OAuth session)

     

       24
       24
       +
       //   - voteService: Vote service for cache lookup (may be nil)

     

       25
       25
       +
       //   - feedPosts: Posts to enrich with viewer state (must implement FeedPostProvider)

     

       26
       26
       +
       //

     

       27
       27
       +
       // The function logs but does not fail on errors - viewer state is optional enrichment.

     

       28
       28
       +
       func PopulateViewerVoteState[T FeedPostProvider](

     

       29
       29
       +
       	ctx context.Context,

     

       30
       30
       +
       	r *http.Request,

     

       31
       31
       +
       	voteService votes.Service,

     

       32
       32
       +
       	feedPosts []T,

     

       33
       33
       +
       ) {

     

       34
       34
       +
       	if voteService == nil {

     

       35
       35
       +
       		return

     

       36
       36
       +
       	}

     

       37
       37
       +
       

     

       38
       38
       +
       	session := middleware.GetOAuthSession(r)

     

       39
       39
       +
       	if session == nil {

     

       40
       40
       +
       		return

     

       41
       41
       +
       	}

     

       42
       42
       +
       

     

       43
       43
       +
       	userDID := middleware.GetUserDID(r)

     

       44
       44
       +
       

     

       45
       45
       +
       	// Ensure vote cache is populated from PDS

     

       46
       46
       +
       	if err := voteService.EnsureCachePopulated(ctx, session); err != nil {

     

       47
       47
       +
       		log.Printf("Warning: failed to populate vote cache: %v", err)

     

       48
       48
       +
       		return

     

       49
       49
       +
       	}

     

       50
       50
       +
       

     

       51
       51
       +
       	// Collect post URIs to batch lookup

     

       52
       52
       +
       	postURIs := make([]string, 0, len(feedPosts))

     

       53
       53
       +
       	for _, feedPost := range feedPosts {

     

       54
       54
       +
       		if post := feedPost.GetPost(); post != nil {

     

       55
       55
       +
       			postURIs = append(postURIs, post.URI)

     

       56
       56
       +
       		}

     

       57
       57
       +
       	}

     

       58
       58
       +
       

     

       59
       59
       +
       	// Get viewer votes for all posts

     

       60
       60
       +
       	viewerVotes := voteService.GetViewerVotesForSubjects(userDID, postURIs)

     

       61
       61
       +
       

     

       62
       62
       +
       	// Populate viewer state on each post

     

       63
       63
       +
       	for _, feedPost := range feedPosts {

     

       64
       64
       +
       		if post := feedPost.GetPost(); post != nil {

     

       65
       65
       +
       			if vote, exists := viewerVotes[post.URI]; exists {

     

       66
       66
       +
       				post.Viewer = &posts.ViewerState{

     

       67
       67
       +
       					Vote:    &vote.Direction,

     

       68
       68
       +
       					VoteURI: &vote.URI,

     

       69
       69
       +
       				}

     

       70
       70
       +
       			}

     

       71
       71
       +
       		}

     

       72
       72
       +
       	}

     

       73
       73
       +
       }

+11 -4

internal/api/handlers/discover/get_discover.go

···

       1
       1
        
       package discover

     

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
       +
       	"Coves/internal/api/handlers/common"

     

       4
       5
        
       	"Coves/internal/core/discover"

     

       5
       6
        
       	"Coves/internal/core/posts"

     

       7
       7
       +
       	"Coves/internal/core/votes"

     

       6
       8
        
       	"encoding/json"

     

       7
       9
        
       	"log"

     

       8
       10
        
       	"net/http"

     
···

       11
       13
        
       

     

       12
       14
        
       // GetDiscoverHandler handles discover feed retrieval

     

       13
       15
        
       type GetDiscoverHandler struct {

     

       14
       14
       -
       	service discover.Service

     

       16
       16
       +
       	service     discover.Service

     

       17
       17
       +
       	voteService votes.Service

     

       15
       18
        
       }

     

       16
       19
        
       

     

       17
       20
        
       // NewGetDiscoverHandler creates a new discover handler

     

       18
       18
       -
       func NewGetDiscoverHandler(service discover.Service) *GetDiscoverHandler {

     

       21
       21
       +
       func NewGetDiscoverHandler(service discover.Service, voteService votes.Service) *GetDiscoverHandler {

     

       19
       22
        
       	return &GetDiscoverHandler{

     

       20
       20
       -
       		service: service,

     

       23
       23
       +
       		service:     service,

     

       24
       24
       +
       		voteService: voteService,

     

       21
       25
        
       	}

     

       22
       26
        
       }

     

       23
       27
        
       

     

       24
       28
        
       // HandleGetDiscover retrieves posts from all communities (public feed)

     

       25
       29
        
       // GET /xrpc/social.coves.feed.getDiscover?sort=hot&limit=15&cursor=...

     

       26
       26
       -
       // Public endpoint - no authentication required

     

       30
       30
       +
       // Public endpoint with optional auth - if authenticated, includes viewer vote state

     

       27
       31
        
       func (h *GetDiscoverHandler) HandleGetDiscover(w http.ResponseWriter, r *http.Request) {

     

       28
       32
        
       	if r.Method != http.MethodGet {

     

       29
       33
        
       		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)

     
···

       40
       44
        
       		return

     

       41
       45
        
       	}

     

       42
       46
        
       

     

       47
       47
       +
       	// Populate viewer vote state if authenticated

     

       48
       48
       +
       	common.PopulateViewerVoteState(r.Context(), r, h.voteService, response.Feed)

     

       49
       49
       +
       

     

       43
       50
        
       	// Transform blob refs to URLs for all posts

     

       44
       51
        
       	for _, feedPost := range response.Feed {

     

       45
       52
        
       		if feedPost.Post != nil {

+9 -4

internal/api/routes/discover.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"Coves/internal/api/handlers/discover"

     

       5
       5
       +
       	"Coves/internal/api/middleware"

     

       5
       6
        
       	discoverCore "Coves/internal/core/discover"

     

       7
       7
       +
       	"Coves/internal/core/votes"

     

       6
       8
        
       

     

       7
       9
        
       	"github.com/go-chi/chi/v5"

     

       8
       10
        
       )

     
···

       10
       12
        
       // RegisterDiscoverRoutes registers discover-related XRPC endpoints

     

       11
       13
        
       //

     

       12
       14
        
       // SECURITY & RATE LIMITING:

     

       13
       13
       -
       // - Discover feed is PUBLIC (no authentication required)

     

       15
       15
       +
       // - Discover feed is PUBLIC (works without authentication)

     

       16
       16
       +
       // - Optional auth: if authenticated, includes viewer vote state on posts

     

       14
       17
        
       // - Protected by global rate limiter: 100 requests/minute per IP (main.go:84)

     

       15
       18
        
       // - Query timeout enforced via context (prevents long-running queries)

     

       16
       19
        
       // - Result limit capped at 50 posts per request (validated in service layer)

     
···

       18
       21
        
       func RegisterDiscoverRoutes(

     

       19
       22
        
       	r chi.Router,

     

       20
       23
        
       	discoverService discoverCore.Service,

     

       24
       24
       +
       	voteService votes.Service,

     

       25
       25
       +
       	authMiddleware *middleware.OAuthAuthMiddleware,

     

       21
       26
        
       ) {

     

       22
       27
        
       	// Create handlers

     

       23
       23
       -
       	getDiscoverHandler := discover.NewGetDiscoverHandler(discoverService)

     

       28
       28
       +
       	getDiscoverHandler := discover.NewGetDiscoverHandler(discoverService, voteService)

     

       24
       29
        
       

     

       25
       30
        
       	// GET /xrpc/social.coves.feed.getDiscover

     

       26
       26
       -
       	// Public endpoint - no authentication required

     

       31
       31
       +
       	// Public endpoint with optional auth for viewer-specific state (vote state)

     

       27
       32
        
       	// Shows posts from ALL communities (not personalized)

     

       28
       33
        
       	// Rate limited: 100 req/min per IP via global middleware

     

       29
       29
       -
       	r.Get("/xrpc/social.coves.feed.getDiscover", getDiscoverHandler.HandleGetDiscover)

     

       34
       34
       +
       	r.With(authMiddleware.OptionalAuth).Get("/xrpc/social.coves.feed.getDiscover", getDiscoverHandler.HandleGetDiscover)

     

       30
       35
        
       }

internal/core/communityFeeds/types.go

···

       31
       31
        
       	Reply  *ReplyRef       `json:"reply,omitempty"`  // Reply context

     

       32
       32
        
       }

     

       33
       33
        
       

     

       34
       34
       +
       // GetPost returns the underlying PostView for viewer state enrichment

     

       35
       35
       +
       func (f *FeedViewPost) GetPost() *posts.PostView {

     

       36
       36
       +
       	return f.Post

     

       37
       37
       +
       }

     

       38
       38
       +
       

     

       34
       39
        
       // FeedReason is a union type for feed context

     

       35
       40
        
       // Can be reasonRepost or reasonPin

     

       36
       41
        
       type FeedReason struct {

internal/core/discover/types.go

···

       39
       39
        
       	Reply  *ReplyRef       `json:"reply,omitempty"`

     

       40
       40
        
       }

     

       41
       41
        
       

     

       42
       42
       +
       // GetPost returns the underlying PostView for viewer state enrichment

     

       43
       43
       +
       func (f *FeedViewPost) GetPost() *posts.PostView {

     

       44
       44
       +
       	return f.Post

     

       45
       45
       +
       }

     

       46
       46
       +
       

     

       42
       47
        
       // FeedReason is a union type for feed context

     

       43
       48
        
       type FeedReason struct {

     

       44
       49
        
       	Repost    *ReasonRepost    `json:"-"`

internal/core/timeline/types.go

···

       42
       42
        
       	Reply  *ReplyRef       `json:"reply,omitempty"`  // Reply context

     

       43
       43
        
       }

     

       44
       44
        
       

     

       45
       45
       +
       // GetPost returns the underlying PostView for viewer state enrichment

     

       46
       46
       +
       func (f *FeedViewPost) GetPost() *posts.PostView {

     

       47
       47
       +
       	return f.Post

     

       48
       48
       +
       }

     

       49
       49
       +
       

     

       45
       50
        
       // FeedReason is a union type for feed context

     

       46
       51
        
       // Future: Can be reasonRepost or reasonCommunity

     

       47
       52
        
       type FeedReason struct {

+193 -5

tests/integration/discover_test.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"Coves/internal/api/handlers/discover"

     

       5
       5
       +
       	"Coves/internal/api/middleware"

     

       6
       6
       +
       	"Coves/internal/core/votes"

     

       5
       7
        
       	"Coves/internal/db/postgres"

     

       6
       8
        
       	"context"

     

       7
       9
        
       	"encoding/json"

     
···

       13
       15
        
       

     

       14
       16
        
       	discoverCore "Coves/internal/core/discover"

     

       15
       17
        
       

     

       18
       18
       +
       	oauthlib "github.com/bluesky-social/indigo/atproto/auth/oauth"

     

       19
       19
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       16
       20
        
       	"github.com/stretchr/testify/assert"

     

       17
       21
        
       	"github.com/stretchr/testify/require"

     

       18
       22
        
       )

     

       19
       23
        
       

     

       24
       24
       +
       // mockVoteService implements votes.Service for testing viewer vote state

     

       25
       25
       +
       type mockVoteService struct {

     

       26
       26
       +
       	cachedVotes map[string]*votes.CachedVote // userDID:subjectURI -> vote

     

       27
       27
       +
       }

     

       28
       28
       +
       

     

       29
       29
       +
       func newMockVoteService() *mockVoteService {

     

       30
       30
       +
       	return &mockVoteService{

     

       31
       31
       +
       		cachedVotes: make(map[string]*votes.CachedVote),

     

       32
       32
       +
       	}

     

       33
       33
       +
       }

     

       34
       34
       +
       

     

       35
       35
       +
       func (m *mockVoteService) AddVote(userDID, subjectURI, direction, voteURI string) {

     

       36
       36
       +
       	key := userDID + ":" + subjectURI

     

       37
       37
       +
       	m.cachedVotes[key] = &votes.CachedVote{

     

       38
       38
       +
       		Direction: direction,

     

       39
       39
       +
       		URI:       voteURI,

     

       40
       40
       +
       	}

     

       41
       41
       +
       }

     

       42
       42
       +
       

     

       43
       43
       +
       func (m *mockVoteService) CreateVote(_ context.Context, _ *oauthlib.ClientSessionData, _ votes.CreateVoteRequest) (*votes.CreateVoteResponse, error) {

     

       44
       44
       +
       	return &votes.CreateVoteResponse{}, nil

     

       45
       45
       +
       }

     

       46
       46
       +
       

     

       47
       47
       +
       func (m *mockVoteService) DeleteVote(_ context.Context, _ *oauthlib.ClientSessionData, _ votes.DeleteVoteRequest) error {

     

       48
       48
       +
       	return nil

     

       49
       49
       +
       }

     

       50
       50
       +
       

     

       51
       51
       +
       func (m *mockVoteService) EnsureCachePopulated(_ context.Context, _ *oauthlib.ClientSessionData) error {

     

       52
       52
       +
       	return nil // Mock always succeeds - votes pre-populated via AddVote

     

       53
       53
       +
       }

     

       54
       54
       +
       

     

       55
       55
       +
       func (m *mockVoteService) GetViewerVote(userDID, subjectURI string) *votes.CachedVote {

     

       56
       56
       +
       	key := userDID + ":" + subjectURI

     

       57
       57
       +
       	return m.cachedVotes[key]

     

       58
       58
       +
       }

     

       59
       59
       +
       

     

       60
       60
       +
       func (m *mockVoteService) GetViewerVotesForSubjects(userDID string, subjectURIs []string) map[string]*votes.CachedVote {

     

       61
       61
       +
       	result := make(map[string]*votes.CachedVote)

     

       62
       62
       +
       	for _, uri := range subjectURIs {

     

       63
       63
       +
       		key := userDID + ":" + uri

     

       64
       64
       +
       		if vote, exists := m.cachedVotes[key]; exists {

     

       65
       65
       +
       			result[uri] = vote

     

       66
       66
       +
       		}

     

       67
       67
       +
       	}

     

       68
       68
       +
       	return result

     

       69
       69
       +
       }

     

       70
       70
       +
       

     

       20
       71
        
       // TestGetDiscover_ShowsAllCommunities tests discover feed shows posts from ALL communities

     

       21
       72
        
       func TestGetDiscover_ShowsAllCommunities(t *testing.T) {

     

       22
       73
        
       	if testing.Short() {

     
···

       29
       80
        
       	// Setup services

     

       30
       81
        
       	discoverRepo := postgres.NewDiscoverRepository(db, "test-cursor-secret")

     

       31
       82
        
       	discoverService := discoverCore.NewDiscoverService(discoverRepo)

     

       32
       32
       -
       	handler := discover.NewGetDiscoverHandler(discoverService)

     

       83
       83
       +
       	handler := discover.NewGetDiscoverHandler(discoverService, nil) // nil vote service - tests don't need vote state

     

       33
       84
        
       

     

       34
       85
        
       	ctx := context.Background()

     

       35
       86
        
       	testID := time.Now().UnixNano()

     
···

       100
       151
        
       	// Setup services

     

       101
       152
        
       	discoverRepo := postgres.NewDiscoverRepository(db, "test-cursor-secret")

     

       102
       153
        
       	discoverService := discoverCore.NewDiscoverService(discoverRepo)

     

       103
       103
       -
       	handler := discover.NewGetDiscoverHandler(discoverService)

     

       154
       154
       +
       	handler := discover.NewGetDiscoverHandler(discoverService, nil) // nil vote service - tests don't need vote state

     

       104
       155
        
       

     

       105
       156
        
       	ctx := context.Background()

     

       106
       157
        
       	testID := time.Now().UnixNano()

     
···

       147
       198
        
       	// Setup services

     

       148
       199
        
       	discoverRepo := postgres.NewDiscoverRepository(db, "test-cursor-secret")

     

       149
       200
        
       	discoverService := discoverCore.NewDiscoverService(discoverRepo)

     

       150
       150
       -
       	handler := discover.NewGetDiscoverHandler(discoverService)

     

       201
       201
       +
       	handler := discover.NewGetDiscoverHandler(discoverService, nil)

     

       151
       202
        
       

     

       152
       203
        
       	ctx := context.Background()

     

       153
       204
        
       	testID := time.Now().UnixNano()

     
···

       197
       248
        
       	// Setup services

     

       198
       249
        
       	discoverRepo := postgres.NewDiscoverRepository(db, "test-cursor-secret")

     

       199
       250
        
       	discoverService := discoverCore.NewDiscoverService(discoverRepo)

     

       200
       200
       -
       	handler := discover.NewGetDiscoverHandler(discoverService)

     

       251
       251
       +
       	handler := discover.NewGetDiscoverHandler(discoverService, nil)

     

       201
       252
        
       

     

       202
       253
        
       	ctx := context.Background()

     

       203
       254
        
       	testID := time.Now().UnixNano()

     
···

       254
       305
        
       	// Setup services

     

       255
       306
        
       	discoverRepo := postgres.NewDiscoverRepository(db, "test-cursor-secret")

     

       256
       307
        
       	discoverService := discoverCore.NewDiscoverService(discoverRepo)

     

       257
       257
       -
       	handler := discover.NewGetDiscoverHandler(discoverService)

     

       308
       308
       +
       	handler := discover.NewGetDiscoverHandler(discoverService, nil)

     

       258
       309
        
       

     

       259
       310
        
       	t.Run("Limit exceeds maximum", func(t *testing.T) {

     

       260
       311
        
       		req := httptest.NewRequest(http.MethodGet, "/xrpc/social.coves.feed.getDiscover?sort=new&limit=100", nil)

     
···

       271
       322
        
       		assert.Contains(t, errorResp["message"], "limit")

     

       272
       323
        
       	})

     

       273
       324
        
       }

     

       325
       325
       +
       

     

       326
       326
       +
       // TestGetDiscover_ViewerVoteState tests that authenticated users see their vote state on posts

     

       327
       327
       +
       func TestGetDiscover_ViewerVoteState(t *testing.T) {

     

       328
       328
       +
       	if testing.Short() {

     

       329
       329
       +
       		t.Skip("Skipping integration test in short mode")

     

       330
       330
       +
       	}

     

       331
       331
       +
       

     

       332
       332
       +
       	db := setupTestDB(t)

     

       333
       333
       +
       	t.Cleanup(func() { _ = db.Close() })

     

       334
       334
       +
       

     

       335
       335
       +
       	ctx := context.Background()

     

       336
       336
       +
       	testID := time.Now().UnixNano()

     

       337
       337
       +
       

     

       338
       338
       +
       	// Create community and posts

     

       339
       339
       +
       	communityDID, err := createFeedTestCommunity(db, ctx, fmt.Sprintf("votes-%d", testID), fmt.Sprintf("alice-%d.test", testID))

     

       340
       340
       +
       	require.NoError(t, err)

     

       341
       341
       +
       

     

       342
       342
       +
       	post1URI := createTestPost(t, db, communityDID, "did:plc:author1", "Post with upvote", 10, time.Now().Add(-1*time.Hour))

     

       343
       343
       +
       	post2URI := createTestPost(t, db, communityDID, "did:plc:author2", "Post with downvote", 5, time.Now().Add(-2*time.Hour))

     

       344
       344
       +
       	_ = createTestPost(t, db, communityDID, "did:plc:author3", "Post without vote", 3, time.Now().Add(-3*time.Hour))

     

       345
       345
       +
       

     

       346
       346
       +
       	// Setup mock vote service with pre-populated votes

     

       347
       347
       +
       	viewerDID := "did:plc:viewer123"

     

       348
       348
       +
       	mockVotes := newMockVoteService()

     

       349
       349
       +
       	mockVotes.AddVote(viewerDID, post1URI, "up", "at://"+viewerDID+"/social.coves.vote/vote1")

     

       350
       350
       +
       	mockVotes.AddVote(viewerDID, post2URI, "down", "at://"+viewerDID+"/social.coves.vote/vote2")

     

       351
       351
       +
       

     

       352
       352
       +
       	// Setup handler with mock vote service

     

       353
       353
       +
       	discoverRepo := postgres.NewDiscoverRepository(db, "test-cursor-secret")

     

       354
       354
       +
       	discoverService := discoverCore.NewDiscoverService(discoverRepo)

     

       355
       355
       +
       	handler := discover.NewGetDiscoverHandler(discoverService, mockVotes)

     

       356
       356
       +
       

     

       357
       357
       +
       	// Create request with authenticated user context

     

       358
       358
       +
       	req := httptest.NewRequest(http.MethodGet, "/xrpc/social.coves.feed.getDiscover?sort=new&limit=50", nil)

     

       359
       359
       +
       

     

       360
       360
       +
       	// Inject OAuth session into context (simulates OptionalAuth middleware)

     

       361
       361
       +
       	did, _ := syntax.ParseDID(viewerDID)

     

       362
       362
       +
       	session := &oauthlib.ClientSessionData{

     

       363
       363
       +
       		AccountDID:  did,

     

       364
       364
       +
       		AccessToken: "test_token",

     

       365
       365
       +
       	}

     

       366
       366
       +
       	reqCtx := context.WithValue(req.Context(), middleware.UserDIDKey, viewerDID)

     

       367
       367
       +
       	reqCtx = context.WithValue(reqCtx, middleware.OAuthSessionKey, session)

     

       368
       368
       +
       	req = req.WithContext(reqCtx)

     

       369
       369
       +
       

     

       370
       370
       +
       	rec := httptest.NewRecorder()

     

       371
       371
       +
       	handler.HandleGetDiscover(rec, req)

     

       372
       372
       +
       

     

       373
       373
       +
       	// Assertions

     

       374
       374
       +
       	assert.Equal(t, http.StatusOK, rec.Code)

     

       375
       375
       +
       

     

       376
       376
       +
       	var response discoverCore.DiscoverResponse

     

       377
       377
       +
       	err = json.Unmarshal(rec.Body.Bytes(), &response)

     

       378
       378
       +
       	require.NoError(t, err)

     

       379
       379
       +
       

     

       380
       380
       +
       	// Find our test posts and verify vote state

     

       381
       381
       +
       	var foundPost1, foundPost2, foundPost3 bool

     

       382
       382
       +
       	for _, feedPost := range response.Feed {

     

       383
       383
       +
       		switch feedPost.Post.URI {

     

       384
       384
       +
       		case post1URI:

     

       385
       385
       +
       			foundPost1 = true

     

       386
       386
       +
       			require.NotNil(t, feedPost.Post.Viewer, "Post1 should have viewer state")

     

       387
       387
       +
       			require.NotNil(t, feedPost.Post.Viewer.Vote, "Post1 should have vote direction")

     

       388
       388
       +
       			assert.Equal(t, "up", *feedPost.Post.Viewer.Vote, "Post1 should show upvote")

     

       389
       389
       +
       			require.NotNil(t, feedPost.Post.Viewer.VoteURI, "Post1 should have vote URI")

     

       390
       390
       +
       			assert.Contains(t, *feedPost.Post.Viewer.VoteURI, "vote1", "Post1 should have correct vote URI")

     

       391
       391
       +
       

     

       392
       392
       +
       		case post2URI:

     

       393
       393
       +
       			foundPost2 = true

     

       394
       394
       +
       			require.NotNil(t, feedPost.Post.Viewer, "Post2 should have viewer state")

     

       395
       395
       +
       			require.NotNil(t, feedPost.Post.Viewer.Vote, "Post2 should have vote direction")

     

       396
       396
       +
       			assert.Equal(t, "down", *feedPost.Post.Viewer.Vote, "Post2 should show downvote")

     

       397
       397
       +
       			require.NotNil(t, feedPost.Post.Viewer.VoteURI, "Post2 should have vote URI")

     

       398
       398
       +
       

     

       399
       399
       +
       		default:

     

       400
       400
       +
       			// Posts without votes should have nil Viewer or nil Vote

     

       401
       401
       +
       			if feedPost.Post.Viewer != nil && feedPost.Post.Viewer.Vote != nil {

     

       402
       402
       +
       				// This post has a vote from our viewer - it's not post3

     

       403
       403
       +
       				continue

     

       404
       404
       +
       			}

     

       405
       405
       +
       			foundPost3 = true

     

       406
       406
       +
       		}

     

       407
       407
       +
       	}

     

       408
       408
       +
       

     

       409
       409
       +
       	assert.True(t, foundPost1, "Should find post1 with upvote")

     

       410
       410
       +
       	assert.True(t, foundPost2, "Should find post2 with downvote")

     

       411
       411
       +
       	assert.True(t, foundPost3, "Should find post3 without vote")

     

       412
       412
       +
       }

     

       413
       413
       +
       

     

       414
       414
       +
       // TestGetDiscover_NoViewerStateWithoutAuth tests that unauthenticated users don't get viewer state

     

       415
       415
       +
       func TestGetDiscover_NoViewerStateWithoutAuth(t *testing.T) {

     

       416
       416
       +
       	if testing.Short() {

     

       417
       417
       +
       		t.Skip("Skipping integration test in short mode")

     

       418
       418
       +
       	}

     

       419
       419
       +
       

     

       420
       420
       +
       	db := setupTestDB(t)

     

       421
       421
       +
       	t.Cleanup(func() { _ = db.Close() })

     

       422
       422
       +
       

     

       423
       423
       +
       	ctx := context.Background()

     

       424
       424
       +
       	testID := time.Now().UnixNano()

     

       425
       425
       +
       

     

       426
       426
       +
       	// Create community and post

     

       427
       427
       +
       	communityDID, err := createFeedTestCommunity(db, ctx, fmt.Sprintf("noauth-%d", testID), fmt.Sprintf("alice-%d.test", testID))

     

       428
       428
       +
       	require.NoError(t, err)

     

       429
       429
       +
       

     

       430
       430
       +
       	postURI := createTestPost(t, db, communityDID, "did:plc:author", "Some post", 10, time.Now())

     

       431
       431
       +
       

     

       432
       432
       +
       	// Setup mock vote service with a vote (but request will be unauthenticated)

     

       433
       433
       +
       	mockVotes := newMockVoteService()

     

       434
       434
       +
       	mockVotes.AddVote("did:plc:someuser", postURI, "up", "at://did:plc:someuser/social.coves.vote/vote1")

     

       435
       435
       +
       

     

       436
       436
       +
       	// Setup handler with mock vote service

     

       437
       437
       +
       	discoverRepo := postgres.NewDiscoverRepository(db, "test-cursor-secret")

     

       438
       438
       +
       	discoverService := discoverCore.NewDiscoverService(discoverRepo)

     

       439
       439
       +
       	handler := discover.NewGetDiscoverHandler(discoverService, mockVotes)

     

       440
       440
       +
       

     

       441
       441
       +
       	// Create request WITHOUT auth context

     

       442
       442
       +
       	req := httptest.NewRequest(http.MethodGet, "/xrpc/social.coves.feed.getDiscover?sort=new&limit=50", nil)

     

       443
       443
       +
       	rec := httptest.NewRecorder()

     

       444
       444
       +
       	handler.HandleGetDiscover(rec, req)

     

       445
       445
       +
       

     

       446
       446
       +
       	// Should succeed

     

       447
       447
       +
       	assert.Equal(t, http.StatusOK, rec.Code)

     

       448
       448
       +
       

     

       449
       449
       +
       	var response discoverCore.DiscoverResponse

     

       450
       450
       +
       	err = json.Unmarshal(rec.Body.Bytes(), &response)

     

       451
       451
       +
       	require.NoError(t, err)

     

       452
       452
       +
       

     

       453
       453
       +
       	// Find our post and verify NO viewer state (unauthenticated)

     

       454
       454
       +
       	for _, feedPost := range response.Feed {

     

       455
       455
       +
       		if feedPost.Post.URI == postURI {

     

       456
       456
       +
       			assert.Nil(t, feedPost.Post.Viewer, "Unauthenticated request should not have viewer state")

     

       457
       457
       +
       			return

     

       458
       458
       +
       		}

     

       459
       459
       +
       	}

     

       460
       460
       +
       	t.Fatal("Test post not found in response")

     

       461
       461
       +
       }

+11 -11

tests/integration/feed_test.go

···

       37
       37
        
       		nil,

     

       38
       38
        
       	)

     

       39
       39
        
       	feedService := communityFeeds.NewCommunityFeedService(feedRepo, communityService)

     

       40
       40
       -
       	handler := communityFeed.NewGetCommunityHandler(feedService)

     

       40
       40
       +
       	handler := communityFeed.NewGetCommunityHandler(feedService, nil)

     

       41
       41
        
       

     

       42
       42
        
       	// Setup test data: community, users, and posts

     

       43
       43
        
       	ctx := context.Background()

     
···

       114
       114
        
       		nil,

     

       115
       115
        
       	)

     

       116
       116
        
       	feedService := communityFeeds.NewCommunityFeedService(feedRepo, communityService)

     

       117
       117
       -
       	handler := communityFeed.NewGetCommunityHandler(feedService)

     

       117
       117
       +
       	handler := communityFeed.NewGetCommunityHandler(feedService, nil)

     

       118
       118
        
       

     

       119
       119
        
       	// Setup test data

     

       120
       120
        
       	ctx := context.Background()

     
···

       190
       190
        
       		nil,

     

       191
       191
        
       	)

     

       192
       192
        
       	feedService := communityFeeds.NewCommunityFeedService(feedRepo, communityService)

     

       193
       193
       -
       	handler := communityFeed.NewGetCommunityHandler(feedService)

     

       193
       193
       +
       	handler := communityFeed.NewGetCommunityHandler(feedService, nil)

     

       194
       194
        
       

     

       195
       195
        
       	// Setup test data

     

       196
       196
        
       	ctx := context.Background()

     
···

       246
       246
        
       		nil,

     

       247
       247
        
       	)

     

       248
       248
        
       	feedService := communityFeeds.NewCommunityFeedService(feedRepo, communityService)

     

       249
       249
       -
       	handler := communityFeed.NewGetCommunityHandler(feedService)

     

       249
       249
       +
       	handler := communityFeed.NewGetCommunityHandler(feedService, nil)

     

       250
       250
        
       

     

       251
       251
        
       	// Setup test data with many posts

     

       252
       252
        
       	ctx := context.Background()

     
···

       337
       337
        
       		nil,

     

       338
       338
        
       	)

     

       339
       339
        
       	feedService := communityFeeds.NewCommunityFeedService(feedRepo, communityService)

     

       340
       340
       -
       	handler := communityFeed.NewGetCommunityHandler(feedService)

     

       340
       340
       +
       	handler := communityFeed.NewGetCommunityHandler(feedService, nil)

     

       341
       341
        
       

     

       342
       342
        
       	// Request feed for non-existent community

     

       343
       343
        
       	req := httptest.NewRequest(http.MethodGet, "/xrpc/social.coves.communityFeed.getCommunity?community=did:plc:nonexistent&sort=hot&limit=10", nil)

     
···

       373
       373
        
       		nil,

     

       374
       374
        
       	)

     

       375
       375
        
       	feedService := communityFeeds.NewCommunityFeedService(feedRepo, communityService)

     

       376
       376
       -
       	handler := communityFeed.NewGetCommunityHandler(feedService)

     

       376
       376
       +
       	handler := communityFeed.NewGetCommunityHandler(feedService, nil)

     

       377
       377
        
       

     

       378
       378
        
       	// Setup test community

     

       379
       379
        
       	ctx := context.Background()

     
···

       429
       429
        
       		nil,

     

       430
       430
        
       	)

     

       431
       431
        
       	feedService := communityFeeds.NewCommunityFeedService(feedRepo, communityService)

     

       432
       432
       -
       	handler := communityFeed.NewGetCommunityHandler(feedService)

     

       432
       432
       +
       	handler := communityFeed.NewGetCommunityHandler(feedService, nil)

     

       433
       433
        
       

     

       434
       434
        
       	// Create community with no posts

     

       435
       435
        
       	ctx := context.Background()

     
···

       473
       473
        
       		nil,

     

       474
       474
        
       	)

     

       475
       475
        
       	feedService := communityFeeds.NewCommunityFeedService(feedRepo, communityService)

     

       476
       476
       -
       	handler := communityFeed.NewGetCommunityHandler(feedService)

     

       476
       476
       +
       	handler := communityFeed.NewGetCommunityHandler(feedService, nil)

     

       477
       477
        
       

     

       478
       478
        
       	// Setup test community

     

       479
       479
        
       	ctx := context.Background()

     
···

       526
       526
        
       		nil,

     

       527
       527
        
       	)

     

       528
       528
        
       	feedService := communityFeeds.NewCommunityFeedService(feedRepo, communityService)

     

       529
       529
       -
       	handler := communityFeed.NewGetCommunityHandler(feedService)

     

       529
       529
       +
       	handler := communityFeed.NewGetCommunityHandler(feedService, nil)

     

       530
       530
        
       

     

       531
       531
        
       	// Setup test data

     

       532
       532
        
       	ctx := context.Background()

     
···

       627
       627
        
       		nil,

     

       628
       628
        
       	)

     

       629
       629
        
       	feedService := communityFeeds.NewCommunityFeedService(feedRepo, communityService)

     

       630
       630
       -
       	handler := communityFeed.NewGetCommunityHandler(feedService)

     

       630
       630
       +
       	handler := communityFeed.NewGetCommunityHandler(feedService, nil)

     

       631
       631
        
       

     

       632
       632
        
       	// Setup test data

     

       633
       633
        
       	ctx := context.Background()

     
···

       720
       720
        
       		nil,

     

       721
       721
        
       	)

     

       722
       722
        
       	feedService := communityFeeds.NewCommunityFeedService(feedRepo, communityService)

     

       723
       723
       -
       	handler := communityFeed.NewGetCommunityHandler(feedService)

     

       723
       723
       +
       	handler := communityFeed.NewGetCommunityHandler(feedService, nil)

     

       724
       724
        
       

     

       725
       725
        
       	// Setup test data

     

       726
       726
        
       	ctx := context.Background()

+7 -7

tests/integration/timeline_test.go

···

       30
       30
        
       	// Setup services

     

       31
       31
        
       	timelineRepo := postgres.NewTimelineRepository(db, "test-cursor-secret")

     

       32
       32
        
       	timelineService := timelineCore.NewTimelineService(timelineRepo)

     

       33
       33
       -
       	handler := timeline.NewGetTimelineHandler(timelineService)

     

       33
       33
       +
       	handler := timeline.NewGetTimelineHandler(timelineService, nil)

     

       34
       34
        
       

     

       35
       35
        
       	ctx := context.Background()

     

       36
       36
        
       	testID := time.Now().UnixNano()

     
···

       119
       119
        
       	// Setup services

     

       120
       120
        
       	timelineRepo := postgres.NewTimelineRepository(db, "test-cursor-secret")

     

       121
       121
        
       	timelineService := timelineCore.NewTimelineService(timelineRepo)

     

       122
       122
       -
       	handler := timeline.NewGetTimelineHandler(timelineService)

     

       122
       122
       +
       	handler := timeline.NewGetTimelineHandler(timelineService, nil)

     

       123
       123
        
       

     

       124
       124
        
       	ctx := context.Background()

     

       125
       125
        
       	testID := time.Now().UnixNano()

     
···

       190
       190
        
       	// Setup services

     

       191
       191
        
       	timelineRepo := postgres.NewTimelineRepository(db, "test-cursor-secret")

     

       192
       192
        
       	timelineService := timelineCore.NewTimelineService(timelineRepo)

     

       193
       193
       -
       	handler := timeline.NewGetTimelineHandler(timelineService)

     

       193
       193
       +
       	handler := timeline.NewGetTimelineHandler(timelineService, nil)

     

       194
       194
        
       

     

       195
       195
        
       	ctx := context.Background()

     

       196
       196
        
       	testID := time.Now().UnixNano()

     
···

       266
       266
        
       	// Setup services

     

       267
       267
        
       	timelineRepo := postgres.NewTimelineRepository(db, "test-cursor-secret")

     

       268
       268
        
       	timelineService := timelineCore.NewTimelineService(timelineRepo)

     

       269
       269
       -
       	handler := timeline.NewGetTimelineHandler(timelineService)

     

       269
       269
       +
       	handler := timeline.NewGetTimelineHandler(timelineService, nil)

     

       270
       270
        
       

     

       271
       271
        
       	ctx := context.Background()

     

       272
       272
        
       	testID := time.Now().UnixNano()

     
···

       308
       308
        
       	// Setup services

     

       309
       309
        
       	timelineRepo := postgres.NewTimelineRepository(db, "test-cursor-secret")

     

       310
       310
        
       	timelineService := timelineCore.NewTimelineService(timelineRepo)

     

       311
       311
       -
       	handler := timeline.NewGetTimelineHandler(timelineService)

     

       311
       311
       +
       	handler := timeline.NewGetTimelineHandler(timelineService, nil)

     

       312
       312
        
       

     

       313
       313
        
       	// Request timeline WITHOUT auth context

     

       314
       314
        
       	req := httptest.NewRequest(http.MethodGet, "/xrpc/social.coves.feed.getTimeline?sort=new&limit=10", nil)

     
···

       337
       337
        
       	// Setup services

     

       338
       338
        
       	timelineRepo := postgres.NewTimelineRepository(db, "test-cursor-secret")

     

       339
       339
        
       	timelineService := timelineCore.NewTimelineService(timelineRepo)

     

       340
       340
       -
       	handler := timeline.NewGetTimelineHandler(timelineService)

     

       340
       340
       +
       	handler := timeline.NewGetTimelineHandler(timelineService, nil)

     

       341
       341
        
       

     

       342
       342
        
       	ctx := context.Background()

     

       343
       343
        
       	testID := time.Now().UnixNano()

     
···

       388
       388
        
       	// Setup services

     

       389
       389
        
       	timelineRepo := postgres.NewTimelineRepository(db, "test-cursor-secret")

     

       390
       390
        
       	timelineService := timelineCore.NewTimelineService(timelineRepo)

     

       391
       391
       -
       	handler := timeline.NewGetTimelineHandler(timelineService)

     

       391
       391
       +
       	handler := timeline.NewGetTimelineHandler(timelineService, nil)

     

       392
       392
        
       

     

       393
       393
        
       	ctx := context.Background()

     

       394
       394
        
       	testID := time.Now().UnixNano()

scripts/generate_deep_thread.go

···

       1
       1
       +
       //go:build ignore

     

       2
       2
       +
       

     

       1
       3
        
       package main

     

       2
       4
        
       

     

       3
       5
        
       import (

scripts/generate_nba_comments.go

···

       1
       1
       +
       //go:build ignore

     

       2
       2
       +
       

     

       1
       3
        
       package main

     

       2
       4
        
       

     

       3
       5
        
       import (

scripts/generate_test_comments.go

···

       1
       1
       +
       //go:build ignore

     

       2
       2
       +
       

     

       1
       3
        
       package main

     

       2
       4
        
       

     

       3
       5
        
       import (

+38 -6

internal/atproto/jetstream/user_consumer.go

···

       13
       13
        
       	"github.com/gorilla/websocket"

     

       14
       14
        
       )

     

       15
       15
        
       

     

       16
       16
       +
       // SessionHandleUpdater is an interface for updating OAuth session handles

     

       17
       17
       +
       // when identity changes occur. This keeps active sessions in sync with

     

       18
       18
       +
       // the user's current handle.

     

       19
       19
       +
       type SessionHandleUpdater interface {

     

       20
       20
       +
       	UpdateHandleByDID(ctx context.Context, did, newHandle string) (int64, error)

     

       21
       21
       +
       }

     

       22
       22
       +
       

     

       16
       23
        
       // JetstreamEvent represents an event from the Jetstream firehose

     

       17
       24
        
       // Jetstream documentation: https://docs.bsky.app/docs/advanced-guides/jetstream

     

       18
       25
        
       type JetstreamEvent struct {

     
···

       50
       57
        
       

     

       51
       58
        
       // UserEventConsumer consumes user-related events from Jetstream

     

       52
       59
        
       type UserEventConsumer struct {

     

       53
       53
       -
       	userService      users.UserService

     

       54
       54
       -
       	identityResolver identity.Resolver

     

       55
       55
       -
       	wsURL            string

     

       56
       56
       -
       	pdsFilter        string // Optional: only index users from specific PDS

     

       60
       60
       +
       	userService          users.UserService

     

       61
       61
       +
       	identityResolver     identity.Resolver

     

       62
       62
       +
       	sessionHandleUpdater SessionHandleUpdater // Optional: updates OAuth sessions on handle change

     

       63
       63
       +
       	wsURL                string

     

       64
       64
       +
       	pdsFilter            string // Optional: only index users from specific PDS

     

       65
       65
       +
       }

     

       66
       66
       +
       

     

       67
       67
       +
       // ConsumerOption is a functional option for configuring UserEventConsumer

     

       68
       68
       +
       type ConsumerOption func(*UserEventConsumer)

     

       69
       69
       +
       

     

       70
       70
       +
       // WithSessionHandleUpdater sets the session handle updater for syncing OAuth sessions

     

       71
       71
       +
       // when identity changes occur. If not set, OAuth sessions won't be updated on handle changes.

     

       72
       72
       +
       func WithSessionHandleUpdater(updater SessionHandleUpdater) ConsumerOption {

     

       73
       73
       +
       	return func(c *UserEventConsumer) {

     

       74
       74
       +
       		c.sessionHandleUpdater = updater

     

       75
       75
       +
       	}

     

       57
       76
        
       }

     

       58
       77
        
       

     

       59
       78
        
       // NewUserEventConsumer creates a new Jetstream consumer for user events

     

       60
       60
       -
       func NewUserEventConsumer(userService users.UserService, identityResolver identity.Resolver, wsURL, pdsFilter string) *UserEventConsumer {

     

       61
       61
       -
       	return &UserEventConsumer{

     

       79
       79
       +
       func NewUserEventConsumer(userService users.UserService, identityResolver identity.Resolver, wsURL, pdsFilter string, opts ...ConsumerOption) *UserEventConsumer {

     

       80
       80
       +
       	c := &UserEventConsumer{

     

       62
       81
        
       		userService:      userService,

     

       63
       82
        
       		identityResolver: identityResolver,

     

       64
       83
        
       		wsURL:            wsURL,

     

       65
       84
        
       		pdsFilter:        pdsFilter,

     

       66
       85
        
       	}

     

       86
       86
       +
       	for _, opt := range opts {

     

       87
       87
       +
       		opt(c)

     

       88
       88
       +
       	}

     

       89
       89
       +
       	return c

     

       67
       90
        
       }

     

       68
       91
        
       

     

       69
       92
        
       // Start begins consuming events from Jetstream

     
···

       247
       270
        
       			log.Printf("Warning: failed to purge DID cache for %s: %v", did, purgeErr)

     

       248
       271
        
       		}

     

       249
       272
        
       

     

       273
       273
       +
       		// Update OAuth session handles to keep mobile/web sessions in sync

     

       274
       274
       +
       		if c.sessionHandleUpdater != nil {

     

       275
       275
       +
       			if sessionsUpdated, updateErr := c.sessionHandleUpdater.UpdateHandleByDID(ctx, did, handle); updateErr != nil {

     

       276
       276
       +
       				log.Printf("Warning: failed to update OAuth session handles for %s: %v", did, updateErr)

     

       277
       277
       +
       			} else if sessionsUpdated > 0 {

     

       278
       278
       +
       				log.Printf("Updated %d OAuth session(s) with new handle: %s", sessionsUpdated, handle)

     

       279
       279
       +
       			}

     

       280
       280
       +
       		}

     

       281
       281
       +
       

     

       250
       282
        
       		log.Printf("Updated handle and purged cache: %s → %s", existingUser.Handle, handle)

     

       251
       283
        
       	} else {

     

       252
       284
        
       		log.Printf("Handle unchanged for %s (%s)", handle, did)

+29

internal/atproto/oauth/store.go

···

       445
       445
        
       	return rows, nil

     

       446
       446
        
       }

     

       447
       447
        
       

     

       448
       448
       +
       // UpdateHandleByDID updates the handle for all OAuth sessions belonging to a DID.

     

       449
       449
       +
       // This is called when identity events indicate a handle change, keeping active

     

       450
       450
       +
       // sessions in sync with the user's current handle.

     

       451
       451
       +
       // Returns the number of sessions updated.

     

       452
       452
       +
       func (s *PostgresOAuthStore) UpdateHandleByDID(ctx context.Context, did, newHandle string) (int64, error) {

     

       453
       453
       +
       	query := `

     

       454
       454
       +
       		UPDATE oauth_sessions

     

       455
       455
       +
       		SET handle = $2, updated_at = NOW()

     

       456
       456
       +
       		WHERE did = $1 AND expires_at > NOW()

     

       457
       457
       +
       	`

     

       458
       458
       +
       

     

       459
       459
       +
       	result, err := s.db.ExecContext(ctx, query, did, newHandle)

     

       460
       460
       +
       	if err != nil {

     

       461
       461
       +
       		return 0, fmt.Errorf("failed to update session handle: %w", err)

     

       462
       462
       +
       	}

     

       463
       463
       +
       

     

       464
       464
       +
       	rows, err := result.RowsAffected()

     

       465
       465
       +
       	if err != nil {

     

       466
       466
       +
       		return 0, fmt.Errorf("failed to get rows affected: %w", err)

     

       467
       467
       +
       	}

     

       468
       468
       +
       

     

       469
       469
       +
       	if rows > 0 {

     

       470
       470
       +
       		slog.Info("updated OAuth session handles for identity change",

     

       471
       471
       +
       			"did", did, "new_handle", newHandle, "sessions_updated", rows)

     

       472
       472
       +
       	}

     

       473
       473
       +
       

     

       474
       474
       +
       	return rows, nil

     

       475
       475
       +
       }

     

       476
       476
       +
       

     

       448
       477
        
       // MobileOAuthData holds mobile-specific OAuth flow data

     

       449
       478
        
       type MobileOAuthData struct {

     

       450
       479
        
       	CSRFToken   string

+375

tests/integration/oauth_session_handle_sync_test.go

···

       1
       1
       +
       package integration

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"context"

     

       5
       5
       +
       	"fmt"

     

       6
       6
       +
       	"net/http"

     

       7
       7
       +
       	"testing"

     

       8
       8
       +
       	"time"

     

       9
       9
       +
       

     

       10
       10
       +
       	oauthlib "github.com/bluesky-social/indigo/atproto/auth/oauth"

     

       11
       11
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

       12
       12
       +
       	"github.com/stretchr/testify/require"

     

       13
       13
       +
       

     

       14
       14
       +
       	"Coves/internal/atproto/identity"

     

       15
       15
       +
       	"Coves/internal/atproto/jetstream"

     

       16
       16
       +
       	"Coves/internal/atproto/oauth"

     

       17
       17
       +
       	"Coves/internal/core/users"

     

       18
       18
       +
       	"Coves/internal/db/postgres"

     

       19
       19
       +
       )

     

       20
       20
       +
       

     

       21
       21
       +
       // TestOAuthSessionHandleSync tests that OAuth session handles are updated

     

       22
       22
       +
       // when identity events indicate a handle change.

     

       23
       23
       +
       //

     

       24
       24
       +
       // This ensures mobile/web apps display the correct handle after a user

     

       25
       25
       +
       // changes their handle on their PDS.

     

       26
       26
       +
       //

     

       27
       27
       +
       // Prerequisites:

     

       28
       28
       +
       //   - Test database on localhost:5434

     

       29
       29
       +
       //

     

       30
       30
       +
       // Run with:

     

       31
       31
       +
       //

     

       32
       32
       +
       //	docker-compose --profile test up -d postgres-test

     

       33
       33
       +
       //	TEST_DATABASE_URL="postgres://test_user:test_password@localhost:5434/coves_test?sslmode=disable" \

     

       34
       34
       +
       //	  go test -v ./tests/integration/ -run "TestOAuthSessionHandleSync"

     

       35
       35
       +
       func TestOAuthSessionHandleSync(t *testing.T) {

     

       36
       36
       +
       	db := setupTestDB(t)

     

       37
       37
       +
       	defer func() {

     

       38
       38
       +
       		if err := db.Close(); err != nil {

     

       39
       39
       +
       			t.Logf("Failed to close database: %v", err)

     

       40
       40
       +
       		}

     

       41
       41
       +
       	}()

     

       42
       42
       +
       

     

       43
       43
       +
       	ctx := context.Background()

     

       44
       44
       +
       

     

       45
       45
       +
       	// Set up real infrastructure components

     

       46
       46
       +
       	userRepo := postgres.NewUserRepository(db)

     

       47
       47
       +
       	resolver := identity.NewResolver(db, identity.DefaultConfig())

     

       48
       48
       +
       	userService := users.NewUserService(userRepo, resolver, "http://localhost:3001")

     

       49
       49
       +
       

     

       50
       50
       +
       	// Create real OAuth store (with session handle updater capability)

     

       51
       51
       +
       	baseOAuthStore := oauth.NewPostgresOAuthStore(db, 24*time.Hour)

     

       52
       52
       +
       

     

       53
       53
       +
       	t.Run("Handle change syncs to active OAuth sessions", func(t *testing.T) {

     

       54
       54
       +
       		testDID := "did:plc:oauthsync123"

     

       55
       55
       +
       		oldHandle := "oldhandle.oauth.sync.test"

     

       56
       56
       +
       		newHandle := "newhandle.oauth.sync.test"

     

       57
       57
       +
       		sessionID := "test-session-oauth-sync-001"

     

       58
       58
       +
       

     

       59
       59
       +
       		// 1. Create user with old handle

     

       60
       60
       +
       		_, err := userService.CreateUser(ctx, users.CreateUserRequest{

     

       61
       61
       +
       			DID:    testDID,

     

       62
       62
       +
       			Handle: oldHandle,

     

       63
       63
       +
       			PDSURL: "https://bsky.social",

     

       64
       64
       +
       		})

     

       65
       65
       +
       		require.NoError(t, err, "Failed to create test user")

     

       66
       66
       +
       		t.Logf("✅ Created user: %s (%s)", oldHandle, testDID)

     

       67
       67
       +
       

     

       68
       68
       +
       		// 2. Create OAuth session with old handle

     

       69
       69
       +
       		parsedDID, err := syntax.ParseDID(testDID)

     

       70
       70
       +
       		require.NoError(t, err, "Failed to parse DID")

     

       71
       71
       +
       

     

       72
       72
       +
       		session := oauthlib.ClientSessionData{

     

       73
       73
       +
       			AccountDID:   parsedDID,

     

       74
       74
       +
       			SessionID:    sessionID,

     

       75
       75
       +
       			HostURL:      "https://bsky.social",

     

       76
       76
       +
       			AccessToken:  "test-access-token",

     

       77
       77
       +
       			RefreshToken: "test-refresh-token",

     

       78
       78
       +
       			Scopes:       []string{"atproto"},

     

       79
       79
       +
       		}

     

       80
       80
       +
       		err = baseOAuthStore.SaveSession(ctx, session)

     

       81
       81
       +
       		require.NoError(t, err, "Failed to save OAuth session")

     

       82
       82
       +
       		t.Logf("✅ Created OAuth session: %s", sessionID)

     

       83
       83
       +
       

     

       84
       84
       +
       		// 3. Verify session was created with correct data

     

       85
       85
       +
       		savedSession, err := baseOAuthStore.GetSession(ctx, parsedDID, sessionID)

     

       86
       86
       +
       		require.NoError(t, err, "Failed to retrieve saved session")

     

       87
       87
       +
       		require.NotNil(t, savedSession, "Session should exist")

     

       88
       88
       +
       		t.Logf("✅ Verified session exists for DID: %s", testDID)

     

       89
       89
       +
       

     

       90
       90
       +
       		// 4. Cast store to SessionHandleUpdater (what the consumer uses)

     

       91
       91
       +
       		sessionUpdater, ok := baseOAuthStore.(jetstream.SessionHandleUpdater)

     

       92
       92
       +
       		require.True(t, ok, "OAuth store should implement SessionHandleUpdater")

     

       93
       93
       +
       

     

       94
       94
       +
       		// 5. Create consumer with session handle updater

     

       95
       95
       +
       		consumer := jetstream.NewUserEventConsumer(

     

       96
       96
       +
       			userService,

     

       97
       97
       +
       			resolver,

     

       98
       98
       +
       			"", // No WebSocket URL - we'll call HandleIdentityEventPublic directly

     

       99
       99
       +
       			"",

     

       100
       100
       +
       			jetstream.WithSessionHandleUpdater(sessionUpdater),

     

       101
       101
       +
       		)

     

       102
       102
       +
       

     

       103
       103
       +
       		// 6. Simulate identity event with NEW handle (as if PDS sent handle change)

     

       104
       104
       +
       		identityEvent := &jetstream.JetstreamEvent{

     

       105
       105
       +
       			Did:  testDID,

     

       106
       106
       +
       			Kind: "identity",

     

       107
       107
       +
       			Identity: &jetstream.IdentityEvent{

     

       108
       108
       +
       				Did:    testDID,

     

       109
       109
       +
       				Handle: newHandle,

     

       110
       110
       +
       				Seq:    999999,

     

       111
       111
       +
       				Time:   time.Now().Format(time.RFC3339),

     

       112
       112
       +
       			},

     

       113
       113
       +
       		}

     

       114
       114
       +
       

     

       115
       115
       +
       		t.Logf("📡 Simulating identity event: %s → %s", oldHandle, newHandle)

     

       116
       116
       +
       		err = consumer.HandleIdentityEventPublic(ctx, identityEvent)

     

       117
       117
       +
       		require.NoError(t, err, "Failed to handle identity event")

     

       118
       118
       +
       		t.Logf("✅ Identity event processed")

     

       119
       119
       +
       

     

       120
       120
       +
       		// 7. Verify users table was updated

     

       121
       121
       +
       		user, err := userService.GetUserByDID(ctx, testDID)

     

       122
       122
       +
       		require.NoError(t, err, "Failed to get user after handle change")

     

       123
       123
       +
       		require.Equal(t, newHandle, user.Handle, "User handle should be updated in database")

     

       124
       124
       +
       		t.Logf("✅ Users table updated: handle=%s", user.Handle)

     

       125
       125
       +
       

     

       126
       126
       +
       		// 8. Verify OAuth session handle was updated

     

       127
       127
       +
       		var sessionHandle string

     

       128
       128
       +
       		err = db.QueryRowContext(ctx,

     

       129
       129
       +
       			"SELECT handle FROM oauth_sessions WHERE did = $1 AND session_id = $2",

     

       130
       130
       +
       			testDID, sessionID,

     

       131
       131
       +
       		).Scan(&sessionHandle)

     

       132
       132
       +
       		require.NoError(t, err, "Failed to query session handle")

     

       133
       133
       +
       		require.Equal(t, newHandle, sessionHandle, "OAuth session handle should be updated")

     

       134
       134
       +
       		t.Logf("✅ OAuth session handle updated: %s", sessionHandle)

     

       135
       135
       +
       	})

     

       136
       136
       +
       

     

       137
       137
       +
       	t.Run("Multiple sessions updated on handle change", func(t *testing.T) {

     

       138
       138
       +
       		testDID := "did:plc:multisession456"

     

       139
       139
       +
       		oldHandle := "multi.old.handle.test"

     

       140
       140
       +
       		newHandle := "multi.new.handle.test"

     

       141
       141
       +
       

     

       142
       142
       +
       		// 1. Create user

     

       143
       143
       +
       		_, err := userService.CreateUser(ctx, users.CreateUserRequest{

     

       144
       144
       +
       			DID:    testDID,

     

       145
       145
       +
       			Handle: oldHandle,

     

       146
       146
       +
       			PDSURL: "https://bsky.social",

     

       147
       147
       +
       		})

     

       148
       148
       +
       		require.NoError(t, err)

     

       149
       149
       +
       

     

       150
       150
       +
       		// 2. Create multiple OAuth sessions (simulating login from multiple devices)

     

       151
       151
       +
       		parsedDID, _ := syntax.ParseDID(testDID)

     

       152
       152
       +
       		for i := 1; i <= 3; i++ {

     

       153
       153
       +
       			session := oauthlib.ClientSessionData{

     

       154
       154
       +
       				AccountDID:   parsedDID,

     

       155
       155
       +
       				SessionID:    fmt.Sprintf("multi-session-%d", i),

     

       156
       156
       +
       				HostURL:      "https://bsky.social",

     

       157
       157
       +
       				AccessToken:  fmt.Sprintf("access-token-%d", i),

     

       158
       158
       +
       				RefreshToken: fmt.Sprintf("refresh-token-%d", i),

     

       159
       159
       +
       				Scopes:       []string{"atproto"},

     

       160
       160
       +
       			}

     

       161
       161
       +
       			err = baseOAuthStore.SaveSession(ctx, session)

     

       162
       162
       +
       			require.NoError(t, err)

     

       163
       163
       +
       		}

     

       164
       164
       +
       		t.Logf("✅ Created 3 OAuth sessions for user")

     

       165
       165
       +
       

     

       166
       166
       +
       		// 3. Process identity event with new handle

     

       167
       167
       +
       		sessionUpdater := baseOAuthStore.(jetstream.SessionHandleUpdater)

     

       168
       168
       +
       		consumer := jetstream.NewUserEventConsumer(

     

       169
       169
       +
       			userService, resolver, "", "",

     

       170
       170
       +
       			jetstream.WithSessionHandleUpdater(sessionUpdater),

     

       171
       171
       +
       		)

     

       172
       172
       +
       

     

       173
       173
       +
       		identityEvent := &jetstream.JetstreamEvent{

     

       174
       174
       +
       			Did:  testDID,

     

       175
       175
       +
       			Kind: "identity",

     

       176
       176
       +
       			Identity: &jetstream.IdentityEvent{

     

       177
       177
       +
       				Did:    testDID,

     

       178
       178
       +
       				Handle: newHandle,

     

       179
       179
       +
       				Seq:    888888,

     

       180
       180
       +
       				Time:   time.Now().Format(time.RFC3339),

     

       181
       181
       +
       			},

     

       182
       182
       +
       		}

     

       183
       183
       +
       

     

       184
       184
       +
       		err = consumer.HandleIdentityEventPublic(ctx, identityEvent)

     

       185
       185
       +
       		require.NoError(t, err)

     

       186
       186
       +
       

     

       187
       187
       +
       		// 4. Verify ALL sessions were updated

     

       188
       188
       +
       		var count int

     

       189
       189
       +
       		err = db.QueryRowContext(ctx,

     

       190
       190
       +
       			"SELECT COUNT(*) FROM oauth_sessions WHERE did = $1 AND handle = $2",

     

       191
       191
       +
       			testDID, newHandle,

     

       192
       192
       +
       		).Scan(&count)

     

       193
       193
       +
       		require.NoError(t, err)

     

       194
       194
       +
       		require.Equal(t, 3, count, "All 3 sessions should have updated handles")

     

       195
       195
       +
       		t.Logf("✅ All %d sessions updated with new handle", count)

     

       196
       196
       +
       	})

     

       197
       197
       +
       

     

       198
       198
       +
       	t.Run("No sessions updated when user has no active sessions", func(t *testing.T) {

     

       199
       199
       +
       		testDID := "did:plc:nosessions789"

     

       200
       200
       +
       		oldHandle := "nosession.old.test"

     

       201
       201
       +
       		newHandle := "nosession.new.test"

     

       202
       202
       +
       

     

       203
       203
       +
       		// 1. Create user with no OAuth sessions

     

       204
       204
       +
       		_, err := userService.CreateUser(ctx, users.CreateUserRequest{

     

       205
       205
       +
       			DID:    testDID,

     

       206
       206
       +
       			Handle: oldHandle,

     

       207
       207
       +
       			PDSURL: "https://bsky.social",

     

       208
       208
       +
       		})

     

       209
       209
       +
       		require.NoError(t, err)

     

       210
       210
       +
       

     

       211
       211
       +
       		// 2. Process identity event

     

       212
       212
       +
       		sessionUpdater := baseOAuthStore.(jetstream.SessionHandleUpdater)

     

       213
       213
       +
       		consumer := jetstream.NewUserEventConsumer(

     

       214
       214
       +
       			userService, resolver, "", "",

     

       215
       215
       +
       			jetstream.WithSessionHandleUpdater(sessionUpdater),

     

       216
       216
       +
       		)

     

       217
       217
       +
       

     

       218
       218
       +
       		identityEvent := &jetstream.JetstreamEvent{

     

       219
       219
       +
       			Did:  testDID,

     

       220
       220
       +
       			Kind: "identity",

     

       221
       221
       +
       			Identity: &jetstream.IdentityEvent{

     

       222
       222
       +
       				Did:    testDID,

     

       223
       223
       +
       				Handle: newHandle,

     

       224
       224
       +
       				Seq:    777777,

     

       225
       225
       +
       				Time:   time.Now().Format(time.RFC3339),

     

       226
       226
       +
       			},

     

       227
       227
       +
       		}

     

       228
       228
       +
       

     

       229
       229
       +
       		// Should not error even when no sessions exist

     

       230
       230
       +
       		err = consumer.HandleIdentityEventPublic(ctx, identityEvent)

     

       231
       231
       +
       		require.NoError(t, err, "Should handle event gracefully with no sessions")

     

       232
       232
       +
       

     

       233
       233
       +
       		// 3. Verify user was still updated

     

       234
       234
       +
       		user, err := userService.GetUserByDID(ctx, testDID)

     

       235
       235
       +
       		require.NoError(t, err)

     

       236
       236
       +
       		require.Equal(t, newHandle, user.Handle)

     

       237
       237
       +
       		t.Logf("✅ User updated correctly even with no active sessions")

     

       238
       238
       +
       	})

     

       239
       239
       +
       

     

       240
       240
       +
       	t.Run("Consumer works without session updater (backward compat)", func(t *testing.T) {

     

       241
       241
       +
       		testDID := "did:plc:nosyncer000"

     

       242
       242
       +
       		oldHandle := "nosyncer.old.test"

     

       243
       243
       +
       		newHandle := "nosyncer.new.test"

     

       244
       244
       +
       

     

       245
       245
       +
       		// 1. Create user

     

       246
       246
       +
       		_, err := userService.CreateUser(ctx, users.CreateUserRequest{

     

       247
       247
       +
       			DID:    testDID,

     

       248
       248
       +
       			Handle: oldHandle,

     

       249
       249
       +
       			PDSURL: "https://bsky.social",

     

       250
       250
       +
       		})

     

       251
       251
       +
       		require.NoError(t, err)

     

       252
       252
       +
       

     

       253
       253
       +
       		// 2. Create consumer WITHOUT session handle updater

     

       254
       254
       +
       		consumer := jetstream.NewUserEventConsumer(

     

       255
       255
       +
       			userService, resolver, "", "",

     

       256
       256
       +
       			// No WithSessionHandleUpdater - testing backward compatibility

     

       257
       257
       +
       		)

     

       258
       258
       +
       

     

       259
       259
       +
       		// 3. Process identity event - should work without error

     

       260
       260
       +
       		identityEvent := &jetstream.JetstreamEvent{

     

       261
       261
       +
       			Did:  testDID,

     

       262
       262
       +
       			Kind: "identity",

     

       263
       263
       +
       			Identity: &jetstream.IdentityEvent{

     

       264
       264
       +
       				Did:    testDID,

     

       265
       265
       +
       				Handle: newHandle,

     

       266
       266
       +
       				Seq:    666666,

     

       267
       267
       +
       				Time:   time.Now().Format(time.RFC3339),

     

       268
       268
       +
       			},

     

       269
       269
       +
       		}

     

       270
       270
       +
       

     

       271
       271
       +
       		err = consumer.HandleIdentityEventPublic(ctx, identityEvent)

     

       272
       272
       +
       		require.NoError(t, err, "Consumer should work without session updater")

     

       273
       273
       +
       

     

       274
       274
       +
       		// 4. Verify user was updated

     

       275
       275
       +
       		user, err := userService.GetUserByDID(ctx, testDID)

     

       276
       276
       +
       		require.NoError(t, err)

     

       277
       277
       +
       		require.Equal(t, newHandle, user.Handle)

     

       278
       278
       +
       		t.Logf("✅ Consumer works correctly without session handle updater")

     

       279
       279
       +
       	})

     

       280
       280
       +
       }

     

       281
       281
       +
       

     

       282
       282
       +
       // TestOAuthSessionHandleSync_LiveJetstream tests the full flow with real Jetstream

     

       283
       283
       +
       // This requires the dev infrastructure to be running.

     

       284
       284
       +
       //

     

       285
       285
       +
       // Prerequisites:

     

       286
       286
       +
       //   - PDS running on localhost:3001

     

       287
       287
       +
       //   - Jetstream running on localhost:6008

     

       288
       288
       +
       //   - Test database on localhost:5434

     

       289
       289
       +
       //

     

       290
       290
       +
       // Run with:

     

       291
       291
       +
       //

     

       292
       292
       +
       //	docker-compose --profile test --profile jetstream up -d

     

       293
       293
       +
       //	TEST_DATABASE_URL="postgres://test_user:test_password@localhost:5434/coves_test?sslmode=disable" \

     

       294
       294
       +
       //	  go test -v ./tests/integration/ -run "TestOAuthSessionHandleSync_LiveJetstream"

     

       295
       295
       +
       func TestOAuthSessionHandleSync_LiveJetstream(t *testing.T) {

     

       296
       296
       +
       	if testing.Short() {

     

       297
       297
       +
       		t.Skip("Skipping live Jetstream test in short mode")

     

       298
       298
       +
       	}

     

       299
       299
       +
       

     

       300
       300
       +
       	// Check if Jetstream is available

     

       301
       301
       +
       	if !isServiceAvailable("http://localhost:6008") {

     

       302
       302
       +
       		t.Skip("Jetstream not available at localhost:6008 - run 'docker-compose --profile jetstream up -d' first")

     

       303
       303
       +
       	}

     

       304
       304
       +
       

     

       305
       305
       +
       	// Check if PDS is available

     

       306
       306
       +
       	if !isServiceAvailable("http://localhost:3001/xrpc/_health") {

     

       307
       307
       +
       		t.Skip("PDS not available at localhost:3001 - run 'docker-compose up -d pds' first")

     

       308
       308
       +
       	}

     

       309
       309
       +
       

     

       310
       310
       +
       	db := setupTestDB(t)

     

       311
       311
       +
       	defer func() {

     

       312
       312
       +
       		if err := db.Close(); err != nil {

     

       313
       313
       +
       			t.Logf("Failed to close database: %v", err)

     

       314
       314
       +
       		}

     

       315
       315
       +
       	}()

     

       316
       316
       +
       

     

       317
       317
       +
       	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)

     

       318
       318
       +
       	defer cancel()

     

       319
       319
       +
       

     

       320
       320
       +
       	// Set up real infrastructure

     

       321
       321
       +
       	userRepo := postgres.NewUserRepository(db)

     

       322
       322
       +
       	resolver := identity.NewResolver(db, identity.DefaultConfig())

     

       323
       323
       +
       	userService := users.NewUserService(userRepo, resolver, "http://localhost:3001")

     

       324
       324
       +
       	baseOAuthStore := oauth.NewPostgresOAuthStore(db, 24*time.Hour)

     

       325
       325
       +
       	sessionUpdater := baseOAuthStore.(jetstream.SessionHandleUpdater)

     

       326
       326
       +
       

     

       327
       327
       +
       	// Start consumer connected to real Jetstream

     

       328
       328
       +
       	consumer := jetstream.NewUserEventConsumer(

     

       329
       329
       +
       		userService,

     

       330
       330
       +
       		resolver,

     

       331
       331
       +
       		"ws://localhost:6008/subscribe",

     

       332
       332
       +
       		"",

     

       333
       333
       +
       		jetstream.WithSessionHandleUpdater(sessionUpdater),

     

       334
       334
       +
       	)

     

       335
       335
       +
       

     

       336
       336
       +
       	// Start consumer in background

     

       337
       337
       +
       	consumerCtx, consumerCancel := context.WithCancel(ctx)

     

       338
       338
       +
       	defer consumerCancel()

     

       339
       339
       +
       

     

       340
       340
       +
       	go func() {

     

       341
       341
       +
       		if err := consumer.Start(consumerCtx); err != nil && err != context.Canceled {

     

       342
       342
       +
       			t.Logf("Consumer stopped: %v", err)

     

       343
       343
       +
       		}

     

       344
       344
       +
       	}()

     

       345
       345
       +
       

     

       346
       346
       +
       	// Give consumer time to connect

     

       347
       347
       +
       	time.Sleep(500 * time.Millisecond)

     

       348
       348
       +
       

     

       349
       349
       +
       	t.Run("Real Jetstream integration", func(t *testing.T) {

     

       350
       350
       +
       		t.Log("🔌 Connected to live Jetstream - waiting for identity events...")

     

       351
       351
       +
       		t.Log("Note: This test verifies the consumer is properly configured with session sync.")

     

       352
       352
       +
       		t.Log("To fully test handle sync, create a user on the PDS and change their handle.")

     

       353
       353
       +
       

     

       354
       354
       +
       		// For now, just verify the consumer is running with the session updater

     

       355
       355
       +
       		// A full E2E test would require:

     

       356
       356
       +
       		// 1. Create user on PDS

     

       357
       357
       +
       		// 2. Create OAuth session

     

       358
       358
       +
       		// 3. Update handle on PDS (via user credentials)

     

       359
       359
       +
       		// 4. Wait for Jetstream to deliver identity event

     

       360
       360
       +
       		// 5. Verify session handle updated

     

       361
       361
       +
       

     

       362
       362
       +
       		t.Log("✅ Consumer running with OAuth session sync enabled")

     

       363
       363
       +
       	})

     

       364
       364
       +
       }

     

       365
       365
       +
       

     

       366
       366
       +
       // isServiceAvailable checks if an HTTP service is responding

     

       367
       367
       +
       func isServiceAvailable(url string) bool {

     

       368
       368
       +
       	client := &http.Client{Timeout: 2 * time.Second}

     

       369
       369
       +
       	resp, err := client.Get(url)

     

       370
       370
       +
       	if err != nil {

     

       371
       371
       +
       		return false

     

       372
       372
       +
       	}

     

       373
       373
       +
       	defer resp.Body.Close()

     

       374
       374
       +
       	return resp.StatusCode < 500

     

       375
       375
       +
       }

+13 -6

aggregators/kagi-news/src/coves_client.py

···

       147
       147
        
               self,

     

       148
       148
        
               uri: str,

     

       149
       149
        
               title: str,

     

       150
       150
       -
               description: str

     

       150
       150
       +
               description: str,

     

       151
       151
       +
               sources: Optional[List[Dict]] = None

     

       151
       152
        
           ) -> Dict:

     

       152
       153
        
               """

     

       153
       154
        
               Create external embed object for hot-linked content.

     
···

       156
       157
        
                   uri: URL of the external content

     

       157
       158
        
                   title: Title of the content

     

       158
       159
        
                   description: Description/summary

     

       160
       160
       +
                   sources: Optional list of source dicts with uri, title, domain

     

       159
       161
        
       

     

       160
       162
        
               Returns:

     

       161
       163
        
                   Embed dictionary ready for post creation

     

       162
       164
        
               """

     

       165
       165
       +
               external = {

     

       166
       166
       +
                   "uri": uri,

     

       167
       167
       +
                   "title": title,

     

       168
       168
       +
                   "description": description

     

       169
       169
       +
               }

     

       170
       170
       +
       

     

       171
       171
       +
               if sources:

     

       172
       172
       +
                   external["sources"] = sources

     

       173
       173
       +
       

     

       163
       174
        
               return {

     

       164
       175
        
                   "$type": "social.coves.embed.external",

     

       165
       165
       -
                   "external": {

     

       166
       166
       -
                       "uri": uri,

     

       167
       167
       -
                       "title": title,

     

       168
       168
       -
                       "description": description

     

       169
       169
       -
                   }

     

       176
       176
       +
                   "external": external

     

       170
       177
        
               }

     

       171
       178
        
       

     

       172
       179
        
           def _get_timestamp(self) -> str:

+8 -2

aggregators/kagi-news/src/main.py

···

       169
       169
        
                       # Format as rich text

     

       170
       170
        
                       rich_text = self.richtext_formatter.format_full(story)

     

       171
       171
        
       

     

       172
       172
       -
                       # Create external embed

     

       172
       172
       +
                       # Create external embed with sources

     

       173
       173
       +
                       sources = [

     

       174
       174
       +
                           {"uri": s.url, "title": s.title, "domain": s.domain}

     

       175
       175
       +
                           for s in story.sources

     

       176
       176
       +
                       ] if story.sources else None

     

       177
       177
       +
       

     

       173
       178
        
                       embed = self.coves_client.create_external_embed(

     

       174
       179
        
                           uri=story.link,

     

       175
       180
        
                           title=story.title,

     

       176
       176
       -
                           description=story.summary[:200] if len(story.summary) > 200 else story.summary

     

       181
       181
       +
                           description=story.summary[:200] if len(story.summary) > 200 else story.summary,

     

       182
       182
       +
                           sources=sources

     

       177
       183
        
                       )

     

       178
       184
        
       

     

       179
       185
        
                       # Post to community

+142

aggregators/kagi-news/tests/test_coves_client.py

···

       1
       1
       +
       """

     

       2
       2
       +
       Unit tests for CovesClient.

     

       3
       3
       +
       

     

       4
       4
       +
       Tests the client's local functionality without requiring live infrastructure.

     

       5
       5
       +
       """

     

       6
       6
       +
       import pytest

     

       7
       7
       +
       from src.coves_client import CovesClient

     

       8
       8
       +
       

     

       9
       9
       +
       

     

       10
       10
       +
       class TestCreateExternalEmbed:

     

       11
       11
       +
           """Tests for create_external_embed method."""

     

       12
       12
       +
       

     

       13
       13
       +
           @pytest.fixture

     

       14
       14
       +
           def client(self):

     

       15
       15
       +
               """Create a CovesClient instance for testing."""

     

       16
       16
       +
               return CovesClient(

     

       17
       17
       +
                   api_url="http://localhost:8081",

     

       18
       18
       +
                   handle="test.handle",

     

       19
       19
       +
                   password="test_password"

     

       20
       20
       +
               )

     

       21
       21
       +
       

     

       22
       22
       +
           def test_creates_embed_without_sources(self, client):

     

       23
       23
       +
               """Test basic embed creation without sources."""

     

       24
       24
       +
               embed = client.create_external_embed(

     

       25
       25
       +
                   uri="https://example.com/article",

     

       26
       26
       +
                   title="Test Article",

     

       27
       27
       +
                   description="Test description"

     

       28
       28
       +
               )

     

       29
       29
       +
       

     

       30
       30
       +
               assert embed["$type"] == "social.coves.embed.external"

     

       31
       31
       +
               assert embed["external"]["uri"] == "https://example.com/article"

     

       32
       32
       +
               assert embed["external"]["title"] == "Test Article"

     

       33
       33
       +
               assert embed["external"]["description"] == "Test description"

     

       34
       34
       +
               assert "sources" not in embed["external"]

     

       35
       35
       +
       

     

       36
       36
       +
           def test_creates_embed_with_sources(self, client):

     

       37
       37
       +
               """Test embed creation with sources array."""

     

       38
       38
       +
               sources = [

     

       39
       39
       +
                   {"uri": "https://source1.com/article", "title": "Source 1", "domain": "source1.com"},

     

       40
       40
       +
                   {"uri": "https://source2.com/article", "title": "Source 2", "domain": "source2.com"},

     

       41
       41
       +
               ]

     

       42
       42
       +
       

     

       43
       43
       +
               embed = client.create_external_embed(

     

       44
       44
       +
                   uri="https://example.com/article",

     

       45
       45
       +
                   title="Test Article",

     

       46
       46
       +
                   description="Test description",

     

       47
       47
       +
                   sources=sources

     

       48
       48
       +
               )

     

       49
       49
       +
       

     

       50
       50
       +
               assert embed["$type"] == "social.coves.embed.external"

     

       51
       51
       +
               assert embed["external"]["uri"] == "https://example.com/article"

     

       52
       52
       +
               assert "sources" in embed["external"]

     

       53
       53
       +
               assert len(embed["external"]["sources"]) == 2

     

       54
       54
       +
               assert embed["external"]["sources"][0]["uri"] == "https://source1.com/article"

     

       55
       55
       +
               assert embed["external"]["sources"][0]["title"] == "Source 1"

     

       56
       56
       +
               assert embed["external"]["sources"][0]["domain"] == "source1.com"

     

       57
       57
       +
               assert embed["external"]["sources"][1]["uri"] == "https://source2.com/article"

     

       58
       58
       +
       

     

       59
       59
       +
           def test_creates_embed_with_empty_sources_list(self, client):

     

       60
       60
       +
               """Test that empty sources list is excluded from embed."""

     

       61
       61
       +
               embed = client.create_external_embed(

     

       62
       62
       +
                   uri="https://example.com/article",

     

       63
       63
       +
                   title="Test Article",

     

       64
       64
       +
                   description="Test description",

     

       65
       65
       +
                   sources=[]

     

       66
       66
       +
               )

     

       67
       67
       +
       

     

       68
       68
       +
               assert embed["$type"] == "social.coves.embed.external"

     

       69
       69
       +
               assert "sources" not in embed["external"]

     

       70
       70
       +
       

     

       71
       71
       +
           def test_creates_embed_with_none_sources(self, client):

     

       72
       72
       +
               """Test that None sources is handled correctly."""

     

       73
       73
       +
               embed = client.create_external_embed(

     

       74
       74
       +
                   uri="https://example.com/article",

     

       75
       75
       +
                   title="Test Article",

     

       76
       76
       +
                   description="Test description",

     

       77
       77
       +
                   sources=None

     

       78
       78
       +
               )

     

       79
       79
       +
       

     

       80
       80
       +
               assert embed["$type"] == "social.coves.embed.external"

     

       81
       81
       +
               assert "sources" not in embed["external"]

     

       82
       82
       +
       

     

       83
       83
       +
           def test_creates_embed_with_single_source(self, client):

     

       84
       84
       +
               """Test embed creation with single source."""

     

       85
       85
       +
               sources = [

     

       86
       86
       +
                   {"uri": "https://single.com/article", "title": "Single Source", "domain": "single.com"}

     

       87
       87
       +
               ]

     

       88
       88
       +
       

     

       89
       89
       +
               embed = client.create_external_embed(

     

       90
       90
       +
                   uri="https://example.com/article",

     

       91
       91
       +
                   title="Test Article",

     

       92
       92
       +
                   description="Test description",

     

       93
       93
       +
                   sources=sources

     

       94
       94
       +
               )

     

       95
       95
       +
       

     

       96
       96
       +
               assert len(embed["external"]["sources"]) == 1

     

       97
       97
       +
               assert embed["external"]["sources"][0]["uri"] == "https://single.com/article"

     

       98
       98
       +
       

     

       99
       99
       +
           def test_embed_structure_matches_lexicon(self, client):

     

       100
       100
       +
               """Test that embed structure matches social.coves.embed.external lexicon."""

     

       101
       101
       +
               sources = [

     

       102
       102
       +
                   {"uri": "https://source.com/article", "title": "Source", "domain": "source.com"}

     

       103
       103
       +
               ]

     

       104
       104
       +
       

     

       105
       105
       +
               embed = client.create_external_embed(

     

       106
       106
       +
                   uri="https://example.com/article",

     

       107
       107
       +
                   title="Test Article",

     

       108
       108
       +
                   description="Test description",

     

       109
       109
       +
                   sources=sources

     

       110
       110
       +
               )

     

       111
       111
       +
       

     

       112
       112
       +
               # Verify top-level structure

     

       113
       113
       +
               assert "$type" in embed

     

       114
       114
       +
               assert "external" in embed

     

       115
       115
       +
               assert len(embed) == 2  # Only $type and external

     

       116
       116
       +
       

     

       117
       117
       +
               # Verify external object structure

     

       118
       118
       +
               external = embed["external"]

     

       119
       119
       +
               assert "uri" in external

     

       120
       120
       +
               assert "title" in external

     

       121
       121
       +
               assert "description" in external

     

       122
       122
       +
               assert "sources" in external

     

       123
       123
       +
       

     

       124
       124
       +
           def test_preserves_source_structure(self, client):

     

       125
       125
       +
               """Test that source dictionaries are passed through unchanged."""

     

       126
       126
       +
               sources = [

     

       127
       127
       +
                   {

     

       128
       128
       +
                       "uri": "https://source.com/article",

     

       129
       129
       +
                       "title": "Source Title",

     

       130
       130
       +
                       "domain": "source.com",

     

       131
       131
       +
                       "extra_field": "should be preserved"  # Extra fields should pass through

     

       132
       132
       +
                   }

     

       133
       133
       +
               ]

     

       134
       134
       +
       

     

       135
       135
       +
               embed = client.create_external_embed(

     

       136
       136
       +
                   uri="https://example.com/article",

     

       137
       137
       +
                   title="Test Article",

     

       138
       138
       +
                   description="Test description",

     

       139
       139
       +
                   sources=sources

     

       140
       140
       +
               )

     

       141
       141
       +
       

     

       142
       142
       +
               assert embed["external"]["sources"][0]["extra_field"] == "should be preserved"

+76 -1

aggregators/kagi-news/tests/test_e2e.py

···

       421
       421
        
           assert embed["external"]["description"] == "Test description"

     

       422
       422
        
           # Thumbnail is not included - server's unfurl service handles it

     

       423
       423
        
           assert "thumb" not in embed["external"]

     

       424
       424
       -
           print("\n✅ External embed format correct")

     

       424
       424
       +
           # Sources should not be present when not provided

     

       425
       425
       +
           assert "sources" not in embed["external"]

     

       426
       426
       +
           print("\n✅ External embed format correct (no sources)")

     

       427
       427
       +
       

     

       428
       428
       +
       

     

       429
       429
       +
       def test_coves_client_external_embed_with_sources(aggregator_credentials):

     

       430
       430
       +
           """

     

       431
       431
       +
           Test external embed formatting with sources.

     

       432
       432
       +
       

     

       433
       433
       +
           Verifies:

     

       434
       434
       +
           - Embed structure matches social.coves.embed.external

     

       435
       435
       +
           - Sources array is included when provided

     

       436
       436
       +
           - Each source has uri, title, domain

     

       437
       437
       +
           """

     

       438
       438
       +
           handle, password = aggregator_credentials

     

       439
       439
       +
       

     

       440
       440
       +
           client = CovesClient(

     

       441
       441
       +
               api_url="http://localhost:8081",

     

       442
       442
       +
               handle=handle,

     

       443
       443
       +
               password=password

     

       444
       444
       +
           )

     

       445
       445
       +
       

     

       446
       446
       +
           # Create external embed with sources

     

       447
       447
       +
           sources = [

     

       448
       448
       +
               {"uri": "https://source1.com/article", "title": "Source 1 Article", "domain": "source1.com"},

     

       449
       449
       +
               {"uri": "https://source2.com/story", "title": "Source 2 Story", "domain": "source2.com"},

     

       450
       450
       +
           ]

     

       451
       451
       +
       

     

       452
       452
       +
           embed = client.create_external_embed(

     

       453
       453
       +
               uri="https://example.com/story",

     

       454
       454
       +
               title="Test Story With Sources",

     

       455
       455
       +
               description="Test description with sources",

     

       456
       456
       +
               sources=sources

     

       457
       457
       +
           )

     

       458
       458
       +
       

     

       459
       459
       +
           assert embed["$type"] == "social.coves.embed.external"

     

       460
       460
       +
           assert embed["external"]["uri"] == "https://example.com/story"

     

       461
       461
       +
           assert embed["external"]["title"] == "Test Story With Sources"

     

       462
       462
       +
           assert embed["external"]["description"] == "Test description with sources"

     

       463
       463
       +
           # Sources should be present

     

       464
       464
       +
           assert "sources" in embed["external"]

     

       465
       465
       +
           assert len(embed["external"]["sources"]) == 2

     

       466
       466
       +
           assert embed["external"]["sources"][0]["uri"] == "https://source1.com/article"

     

       467
       467
       +
           assert embed["external"]["sources"][0]["title"] == "Source 1 Article"

     

       468
       468
       +
           assert embed["external"]["sources"][0]["domain"] == "source1.com"

     

       469
       469
       +
           assert embed["external"]["sources"][1]["uri"] == "https://source2.com/story"

     

       470
       470
       +
           print("\n✅ External embed format correct (with sources)")

     

       471
       471
       +
       

     

       472
       472
       +
       

     

       473
       473
       +
       def test_coves_client_external_embed_with_empty_sources(aggregator_credentials):

     

       474
       474
       +
           """

     

       475
       475
       +
           Test external embed formatting with empty sources list.

     

       476
       476
       +
       

     

       477
       477
       +
           Verifies:

     

       478
       478
       +
           - Empty sources list is not included in embed (regression test)

     

       479
       479
       +
           """

     

       480
       480
       +
           handle, password = aggregator_credentials

     

       481
       481
       +
       

     

       482
       482
       +
           client = CovesClient(

     

       483
       483
       +
               api_url="http://localhost:8081",

     

       484
       484
       +
               handle=handle,

     

       485
       485
       +
               password=password

     

       486
       486
       +
           )

     

       487
       487
       +
       

     

       488
       488
       +
           # Create external embed with empty sources list

     

       489
       489
       +
           embed = client.create_external_embed(

     

       490
       490
       +
               uri="https://example.com/story",

     

       491
       491
       +
               title="Test Story",

     

       492
       492
       +
               description="Test description",

     

       493
       493
       +
               sources=[]

     

       494
       494
       +
           )

     

       495
       495
       +
       

     

       496
       496
       +
           assert embed["$type"] == "social.coves.embed.external"

     

       497
       497
       +
           # Empty sources list should not be included

     

       498
       498
       +
           assert "sources" not in embed["external"]

     

       499
       499
       +
           print("\n✅ External embed format correct (empty sources excluded)")

+137

aggregators/kagi-news/tests/test_main.py

···

       459
       459
        
                   assert call_kwargs["embed"]["external"]["title"] == sample_story.title

     

       460
       460
        
                   # Thumbnail is not included - server's unfurl service handles it

     

       461
       461
        
                   assert "thumb" not in call_kwargs["embed"]["external"]

     

       462
       462
       +
       

     

       463
       463
       +
           def test_create_post_with_sources_in_embed(self, mock_config, mock_rss_feed, sample_story, tmp_path):

     

       464
       464
       +
               """Test that posts include sources in external embeds when available."""

     

       465
       465
       +
               state_file = tmp_path / "state.json"

     

       466
       466
       +
               mock_client = Mock()

     

       467
       467
       +
               mock_client.create_post.return_value = "at://did:plc:test/social.coves.post/abc123"

     

       468
       468
       +
       

     

       469
       469
       +
               # Mock create_external_embed to return proper embed structure with sources

     

       470
       470
       +
               mock_client.create_external_embed.return_value = {

     

       471
       471
       +
                   "$type": "social.coves.embed.external",

     

       472
       472
       +
                   "external": {

     

       473
       473
       +
                       "uri": sample_story.link,

     

       474
       474
       +
                       "title": sample_story.title,

     

       475
       475
       +
                       "description": sample_story.summary,

     

       476
       476
       +
                       "sources": [

     

       477
       477
       +
                           {"uri": "https://example.com/1", "title": "Source 1", "domain": "example.com"}

     

       478
       478
       +
                       ]

     

       479
       479
       +
                   }

     

       480
       480
       +
               }

     

       481
       481
       +
       

     

       482
       482
       +
               with patch('src.main.ConfigLoader') as MockConfigLoader, \

     

       483
       483
       +
                    patch('src.main.RSSFetcher') as MockRSSFetcher, \

     

       484
       484
       +
                    patch('src.main.KagiHTMLParser') as MockHTMLParser, \

     

       485
       485
       +
                    patch('src.main.RichTextFormatter') as MockFormatter:

     

       486
       486
       +
       

     

       487
       487
       +
                   # Setup mocks

     

       488
       488
       +
                   mock_loader = Mock()

     

       489
       489
       +
                   mock_loader.load.return_value = mock_config

     

       490
       490
       +
                   MockConfigLoader.return_value = mock_loader

     

       491
       491
       +
       

     

       492
       492
       +
                   mock_fetcher = Mock()

     

       493
       493
       +
                   single_entry_feed = MagicMock(bozo=0, entries=[mock_rss_feed.entries[0]])

     

       494
       494
       +
                   mock_fetcher.fetch_feed.return_value = single_entry_feed

     

       495
       495
       +
                   MockRSSFetcher.return_value = mock_fetcher

     

       496
       496
       +
       

     

       497
       497
       +
                   mock_parser = Mock()

     

       498
       498
       +
                   mock_parser.parse_to_story.return_value = sample_story

     

       499
       499
       +
                   MockHTMLParser.return_value = mock_parser

     

       500
       500
       +
       

     

       501
       501
       +
                   mock_formatter = Mock()

     

       502
       502
       +
                   mock_formatter.format_full.return_value = {

     

       503
       503
       +
                       "content": "Test content",

     

       504
       504
       +
                       "facets": []

     

       505
       505
       +
                   }

     

       506
       506
       +
                   MockFormatter.return_value = mock_formatter

     

       507
       507
       +
       

     

       508
       508
       +
                   # Run aggregator

     

       509
       509
       +
                   aggregator = Aggregator(

     

       510
       510
       +
                       config_path=Path("config.yaml"),

     

       511
       511
       +
                       state_file=state_file,

     

       512
       512
       +
                       coves_client=mock_client

     

       513
       513
       +
                   )

     

       514
       514
       +
                   aggregator.run()

     

       515
       515
       +
       

     

       516
       516
       +
                   # Verify create_external_embed was called with sources

     

       517
       517
       +
                   mock_client.create_external_embed.assert_called()

     

       518
       518
       +
                   call_kwargs = mock_client.create_external_embed.call_args.kwargs

     

       519
       519
       +
       

     

       520
       520
       +
                   # Verify sources were passed

     

       521
       521
       +
                   assert "sources" in call_kwargs

     

       522
       522
       +
                   assert len(call_kwargs["sources"]) == 1

     

       523
       523
       +
                   assert call_kwargs["sources"][0]["uri"] == "https://example.com/1"

     

       524
       524
       +
                   assert call_kwargs["sources"][0]["title"] == "Source 1"

     

       525
       525
       +
                   assert call_kwargs["sources"][0]["domain"] == "example.com"

     

       526
       526
       +
       

     

       527
       527
       +
           def test_create_post_without_sources(self, mock_config, mock_rss_feed, tmp_path):

     

       528
       528
       +
               """Test that posts without sources don't include sources in embed."""

     

       529
       529
       +
               state_file = tmp_path / "state.json"

     

       530
       530
       +
               mock_client = Mock()

     

       531
       531
       +
               mock_client.create_post.return_value = "at://did:plc:test/social.coves.post/abc123"

     

       532
       532
       +
       

     

       533
       533
       +
               # Create a story without sources

     

       534
       534
       +
               story_without_sources = KagiStory(

     

       535
       535
       +
                   title="Test Story No Sources",

     

       536
       536
       +
                   link="https://kite.kagi.com/test/world/1",

     

       537
       537
       +
                   guid="https://kite.kagi.com/test/world/1",

     

       538
       538
       +
                   pub_date=datetime(2024, 1, 15, 12, 0, 0),

     

       539
       539
       +
                   categories=["World"],

     

       540
       540
       +
                   summary="Test summary",

     

       541
       541
       +
                   highlights=[],

     

       542
       542
       +
                   perspectives=[],

     

       543
       543
       +
                   quote=None,

     

       544
       544
       +
                   sources=[],  # No sources

     

       545
       545
       +
                   image_url=None,

     

       546
       546
       +
                   image_alt=None

     

       547
       547
       +
               )

     

       548
       548
       +
       

     

       549
       549
       +
               # Mock create_external_embed to return proper embed structure without sources

     

       550
       550
       +
               mock_client.create_external_embed.return_value = {

     

       551
       551
       +
                   "$type": "social.coves.embed.external",

     

       552
       552
       +
                   "external": {

     

       553
       553
       +
                       "uri": story_without_sources.link,

     

       554
       554
       +
                       "title": story_without_sources.title,

     

       555
       555
       +
                       "description": story_without_sources.summary

     

       556
       556
       +
                   }

     

       557
       557
       +
               }

     

       558
       558
       +
       

     

       559
       559
       +
               with patch('src.main.ConfigLoader') as MockConfigLoader, \

     

       560
       560
       +
                    patch('src.main.RSSFetcher') as MockRSSFetcher, \

     

       561
       561
       +
                    patch('src.main.KagiHTMLParser') as MockHTMLParser, \

     

       562
       562
       +
                    patch('src.main.RichTextFormatter') as MockFormatter:

     

       563
       563
       +
       

     

       564
       564
       +
                   # Setup mocks

     

       565
       565
       +
                   mock_loader = Mock()

     

       566
       566
       +
                   mock_loader.load.return_value = mock_config

     

       567
       567
       +
                   MockConfigLoader.return_value = mock_loader

     

       568
       568
       +
       

     

       569
       569
       +
                   mock_fetcher = Mock()

     

       570
       570
       +
                   single_entry_feed = MagicMock(bozo=0, entries=[mock_rss_feed.entries[0]])

     

       571
       571
       +
                   mock_fetcher.fetch_feed.return_value = single_entry_feed

     

       572
       572
       +
                   MockRSSFetcher.return_value = mock_fetcher

     

       573
       573
       +
       

     

       574
       574
       +
                   mock_parser = Mock()

     

       575
       575
       +
                   mock_parser.parse_to_story.return_value = story_without_sources

     

       576
       576
       +
                   MockHTMLParser.return_value = mock_parser

     

       577
       577
       +
       

     

       578
       578
       +
                   mock_formatter = Mock()

     

       579
       579
       +
                   mock_formatter.format_full.return_value = {

     

       580
       580
       +
                       "content": "Test content",

     

       581
       581
       +
                       "facets": []

     

       582
       582
       +
                   }

     

       583
       583
       +
                   MockFormatter.return_value = mock_formatter

     

       584
       584
       +
       

     

       585
       585
       +
                   # Run aggregator

     

       586
       586
       +
                   aggregator = Aggregator(

     

       587
       587
       +
                       config_path=Path("config.yaml"),

     

       588
       588
       +
                       state_file=state_file,

     

       589
       589
       +
                       coves_client=mock_client

     

       590
       590
       +
                   )

     

       591
       591
       +
                   aggregator.run()

     

       592
       592
       +
       

     

       593
       593
       +
                   # Verify create_external_embed was called

     

       594
       594
       +
                   mock_client.create_external_embed.assert_called()

     

       595
       595
       +
                   call_kwargs = mock_client.create_external_embed.call_args.kwargs

     

       596
       596
       +
       

     

       597
       597
       +
                   # Verify sources is None (empty list becomes None)

     

       598
       598
       +
                   assert call_kwargs.get("sources") is None

+1188

tests/integration/comment_e2e_test.go

···

       1
       1
       +
       package integration

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"Coves/internal/atproto/jetstream"

     

       5
       5
       +
       	"Coves/internal/atproto/pds"

     

       6
       6
       +
       	"Coves/internal/atproto/utils"

     

       7
       7
       +
       	"Coves/internal/core/comments"

     

       8
       8
       +
       	"Coves/internal/db/postgres"

     

       9
       9
       +
       	"context"

     

       10
       10
       +
       	"database/sql"

     

       11
       11
       +
       	"encoding/json"

     

       12
       12
       +
       	"fmt"

     

       13
       13
       +
       	"io"

     

       14
       14
       +
       	"net"

     

       15
       15
       +
       	"net/http"

     

       16
       16
       +
       	"os"

     

       17
       17
       +
       	"strings"

     

       18
       18
       +
       	"testing"

     

       19
       19
       +
       	"time"

     

       20
       20
       +
       

     

       21
       21
       +
       	oauthlib "github.com/bluesky-social/indigo/atproto/auth/oauth"

     

       22
       22
       +
       	"github.com/bluesky-social/indigo/atproto/syntax"

     

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

     

       24
       24
       +
       	_ "github.com/lib/pq"

     

       25
       25
       +
       	"github.com/pressly/goose/v3"

     

       26
       26
       +
       )

     

       27
       27
       +
       

     

       28
       28
       +
       // TestCommentE2E_CreateWithJetstream tests the full comment creation flow with real Jetstream

     

       29
       29
       +
       // Flow: Client → Service → PDS Write → Jetstream Firehose → Consumer → AppView

     

       30
       30
       +
       func TestCommentE2E_CreateWithJetstream(t *testing.T) {

     

       31
       31
       +
       	if testing.Short() {

     

       32
       32
       +
       		t.Skip("Skipping E2E test in short mode")

     

       33
       33
       +
       	}

     

       34
       34
       +
       

     

       35
       35
       +
       	// Setup test database

     

       36
       36
       +
       	dbURL := os.Getenv("TEST_DATABASE_URL")

     

       37
       37
       +
       	if dbURL == "" {

     

       38
       38
       +
       		dbURL = "postgres://test_user:test_password@localhost:5434/coves_test?sslmode=disable"

     

       39
       39
       +
       	}

     

       40
       40
       +
       

     

       41
       41
       +
       	db, err := sql.Open("postgres", dbURL)

     

       42
       42
       +
       	if err != nil {

     

       43
       43
       +
       		t.Fatalf("Failed to connect to test database: %v", err)

     

       44
       44
       +
       	}

     

       45
       45
       +
       	defer func() { _ = db.Close() }()

     

       46
       46
       +
       

     

       47
       47
       +
       	// Run migrations

     

       48
       48
       +
       	if dialectErr := goose.SetDialect("postgres"); dialectErr != nil {

     

       49
       49
       +
       		t.Fatalf("Failed to set goose dialect: %v", dialectErr)

     

       50
       50
       +
       	}

     

       51
       51
       +
       	if migrateErr := goose.Up(db, "../../internal/db/migrations"); migrateErr != nil {

     

       52
       52
       +
       		t.Fatalf("Failed to run migrations: %v", migrateErr)

     

       53
       53
       +
       	}

     

       54
       54
       +
       

     

       55
       55
       +
       	// Check if PDS is running

     

       56
       56
       +
       	pdsURL := getTestPDSURL()

     

       57
       57
       +
       	healthResp, err := http.Get(pdsURL + "/xrpc/_health")

     

       58
       58
       +
       	if err != nil {

     

       59
       59
       +
       		t.Skipf("PDS not running at %s: %v", pdsURL, err)

     

       60
       60
       +
       	}

     

       61
       61
       +
       	_ = healthResp.Body.Close()

     

       62
       62
       +
       

     

       63
       63
       +
       	// Check if Jetstream is running

     

       64
       64
       +
       	pdsHostname := strings.TrimPrefix(pdsURL, "http://")

     

       65
       65
       +
       	pdsHostname = strings.TrimPrefix(pdsHostname, "https://")

     

       66
       66
       +
       	pdsHostname = strings.Split(pdsHostname, ":")[0]

     

       67
       67
       +
       	jetstreamURL := fmt.Sprintf("ws://%s:6008/subscribe?wantedCollections=social.coves.community.comment", pdsHostname)

     

       68
       68
       +
       

     

       69
       69
       +
       	testConn, _, err := websocket.DefaultDialer.Dial(jetstreamURL, nil)

     

       70
       70
       +
       	if err != nil {

     

       71
       71
       +
       		t.Skipf("Jetstream not running at %s: %v. Run 'docker-compose --profile jetstream up' to start.", jetstreamURL, err)

     

       72
       72
       +
       	}

     

       73
       73
       +
       	_ = testConn.Close()

     

       74
       74
       +
       

     

       75
       75
       +
       	ctx := context.Background()

     

       76
       76
       +
       

     

       77
       77
       +
       	// Setup repositories

     

       78
       78
       +
       	commentRepo := postgres.NewCommentRepository(db)

     

       79
       79
       +
       	postRepo := postgres.NewPostRepository(db)

     

       80
       80
       +
       

     

       81
       81
       +
       	// Create test user on PDS

     

       82
       82
       +
       	// Use shorter handle to avoid PDS length limits (max 20 chars for label)

     

       83
       83
       +
       	testUserHandle := fmt.Sprintf("cmt%d.local.coves.dev", time.Now().UnixNano()%1000000)

     

       84
       84
       +
       	testUserEmail := fmt.Sprintf("cmt%d@test.local", time.Now().UnixNano()%1000000)

     

       85
       85
       +
       	testUserPassword := "test-password-123"

     

       86
       86
       +
       

     

       87
       87
       +
       	t.Logf("Creating test user on PDS: %s", testUserHandle)

     

       88
       88
       +
       	pdsAccessToken, userDID, err := createPDSAccount(pdsURL, testUserHandle, testUserEmail, testUserPassword)

     

       89
       89
       +
       	if err != nil {

     

       90
       90
       +
       		t.Fatalf("Failed to create test user on PDS: %v", err)

     

       91
       91
       +
       	}

     

       92
       92
       +
       	t.Logf("Test user created: DID=%s", userDID)

     

       93
       93
       +
       

     

       94
       94
       +
       	// Index user in AppView

     

       95
       95
       +
       	testUser := createTestUser(t, db, testUserHandle, userDID)

     

       96
       96
       +
       

     

       97
       97
       +
       	// Create test community and post to comment on

     

       98
       98
       +
       	testCommunityDID, err := createFeedTestCommunity(db, ctx, "comment-e2e-community", "owner.test")

     

       99
       99
       +
       	if err != nil {

     

       100
       100
       +
       		t.Fatalf("Failed to create test community: %v", err)

     

       101
       101
       +
       	}

     

       102
       102
       +
       

     

       103
       103
       +
       	postURI := createTestPost(t, db, testCommunityDID, testUser.DID, "Test Post for Comments", 0, time.Now())

     

       104
       104
       +
       	postCID := "bafyposte2etest"

     

       105
       105
       +
       

     

       106
       106
       +
       	// Setup comment service with PDS factory

     

       107
       107
       +
       	commentPDSFactory := func(ctx context.Context, session *oauthlib.ClientSessionData) (pds.Client, error) {

     

       108
       108
       +
       		if session.AccessToken == "" {

     

       109
       109
       +
       			return nil, fmt.Errorf("session has no access token")

     

       110
       110
       +
       		}

     

       111
       111
       +
       		if session.HostURL == "" {

     

       112
       112
       +
       			return nil, fmt.Errorf("session has no host URL")

     

       113
       113
       +
       		}

     

       114
       114
       +
       		return pds.NewFromAccessToken(session.HostURL, session.AccountDID.String(), session.AccessToken)

     

       115
       115
       +
       	}

     

       116
       116
       +
       

     

       117
       117
       +
       	commentService := comments.NewCommentServiceWithPDSFactory(

     

       118
       118
       +
       		commentRepo,

     

       119
       119
       +
       		nil,

     

       120
       120
       +
       		postRepo,

     

       121
       121
       +
       		nil,

     

       122
       122
       +
       		nil,

     

       123
       123
       +
       		commentPDSFactory,

     

       124
       124
       +
       	)

     

       125
       125
       +
       

     

       126
       126
       +
       	// Create mock OAuth session

     

       127
       127
       +
       	mockStore := NewMockOAuthStore()

     

       128
       128
       +
       	mockStore.AddSessionWithPDS(userDID, "session-"+userDID, pdsAccessToken, pdsURL)

     

       129
       129
       +
       

     

       130
       130
       +
       	t.Run("create comment with real Jetstream indexing", func(t *testing.T) {

     

       131
       131
       +
       		// Setup Jetstream consumer

     

       132
       132
       +
       		commentConsumer := jetstream.NewCommentEventConsumer(commentRepo, db)

     

       133
       133
       +
       

     

       134
       134
       +
       		// Channels for event communication

     

       135
       135
       +
       		eventChan := make(chan *jetstream.JetstreamEvent, 10)

     

       136
       136
       +
       		errorChan := make(chan error, 1)

     

       137
       137
       +
       		done := make(chan bool)

     

       138
       138
       +
       

     

       139
       139
       +
       		// Start Jetstream consumer in background BEFORE writing to PDS

     

       140
       140
       +
       		t.Logf("\n🔄 Starting Jetstream consumer for comments...")

     

       141
       141
       +
       		go func() {

     

       142
       142
       +
       			subscribeErr := subscribeToJetstreamForComment(ctx, jetstreamURL, userDID, commentConsumer, eventChan, done)

     

       143
       143
       +
       			if subscribeErr != nil {

     

       144
       144
       +
       				errorChan <- subscribeErr

     

       145
       145
       +
       			}

     

       146
       146
       +
       		}()

     

       147
       147
       +
       

     

       148
       148
       +
       		// Give Jetstream a moment to connect

     

       149
       149
       +
       		time.Sleep(500 * time.Millisecond)

     

       150
       150
       +
       

     

       151
       151
       +
       		// Create comment via service (writes to PDS)

     

       152
       152
       +
       		t.Logf("\n📝 Creating comment via service (writes to PDS)...")

     

       153
       153
       +
       

     

       154
       154
       +
       		commentReq := comments.CreateCommentRequest{

     

       155
       155
       +
       			Reply: comments.ReplyRef{

     

       156
       156
       +
       				Root: comments.StrongRef{

     

       157
       157
       +
       					URI: postURI,

     

       158
       158
       +
       					CID: postCID,

     

       159
       159
       +
       				},

     

       160
       160
       +
       				Parent: comments.StrongRef{

     

       161
       161
       +
       					URI: postURI,

     

       162
       162
       +
       					CID: postCID,

     

       163
       163
       +
       				},

     

       164
       164
       +
       			},

     

       165
       165
       +
       			Content: "This is a TRUE E2E test comment via Jetstream!",

     

       166
       166
       +
       			Langs:   []string{"en"},

     

       167
       167
       +
       		}

     

       168
       168
       +
       

     

       169
       169
       +
       		parsedDID, parseErr := syntax.ParseDID(userDID)

     

       170
       170
       +
       		if parseErr != nil {

     

       171
       171
       +
       			t.Fatalf("Failed to parse DID: %v", parseErr)

     

       172
       172
       +
       		}

     

       173
       173
       +
       		session, sessionErr := mockStore.GetSession(ctx, parsedDID, "session-"+userDID)

     

       174
       174
       +
       		if sessionErr != nil {

     

       175
       175
       +
       			t.Fatalf("Failed to get session: %v", sessionErr)

     

       176
       176
       +
       		}

     

       177
       177
       +
       

     

       178
       178
       +
       		commentResp, err := commentService.CreateComment(ctx, session, commentReq)

     

       179
       179
       +
       		if err != nil {

     

       180
       180
       +
       			t.Fatalf("Failed to create comment: %v", err)

     

       181
       181
       +
       		}

     

       182
       182
       +
       

     

       183
       183
       +
       		t.Logf("✅ Comment written to PDS:")

     

       184
       184
       +
       		t.Logf("   URI: %s", commentResp.URI)

     

       185
       185
       +
       		t.Logf("   CID: %s", commentResp.CID)

     

       186
       186
       +
       

     

       187
       187
       +
       		// Wait for Jetstream event

     

       188
       188
       +
       		t.Logf("\n⏳ Waiting for Jetstream event (max 30 seconds)...")

     

       189
       189
       +
       

     

       190
       190
       +
       		select {

     

       191
       191
       +
       		case event := <-eventChan:

     

       192
       192
       +
       			t.Logf("✅ Received real Jetstream event!")

     

       193
       193
       +
       			t.Logf("   Event DID:    %s", event.Did)

     

       194
       194
       +
       			t.Logf("   Collection:   %s", event.Commit.Collection)

     

       195
       195
       +
       			t.Logf("   Operation:    %s", event.Commit.Operation)

     

       196
       196
       +
       			t.Logf("   RKey:         %s", event.Commit.RKey)

     

       197
       197
       +
       

     

       198
       198
       +
       			// Verify it's our comment

     

       199
       199
       +
       			if event.Did != userDID {

     

       200
       200
       +
       				t.Errorf("Expected DID %s, got %s", userDID, event.Did)

     

       201
       201
       +
       			}

     

       202
       202
       +
       			if event.Commit.Collection != "social.coves.community.comment" {

     

       203
       203
       +
       				t.Errorf("Expected collection social.coves.community.comment, got %s", event.Commit.Collection)

     

       204
       204
       +
       			}

     

       205
       205
       +
       			if event.Commit.Operation != "create" {

     

       206
       206
       +
       				t.Errorf("Expected operation create, got %s", event.Commit.Operation)

     

       207
       207
       +
       			}

     

       208
       208
       +
       

     

       209
       209
       +
       			// Verify indexed in AppView database

     

       210
       210
       +
       			t.Logf("\n🔍 Querying AppView database...")

     

       211
       211
       +
       			indexedComment, err := commentRepo.GetByURI(ctx, commentResp.URI)

     

       212
       212
       +
       			if err != nil {

     

       213
       213
       +
       				t.Fatalf("Comment not indexed in AppView: %v", err)

     

       214
       214
       +
       			}

     

       215
       215
       +
       

     

       216
       216
       +
       			t.Logf("✅ Comment indexed in AppView:")

     

       217
       217
       +
       			t.Logf("   CommenterDID: %s", indexedComment.CommenterDID)

     

       218
       218
       +
       			t.Logf("   Content:      %s", indexedComment.Content)

     

       219
       219
       +
       			t.Logf("   RootURI:      %s", indexedComment.RootURI)

     

       220
       220
       +
       			t.Logf("   ParentURI:    %s", indexedComment.ParentURI)

     

       221
       221
       +
       

     

       222
       222
       +
       			// Verify comment details

     

       223
       223
       +
       			if indexedComment.CommenterDID != userDID {

     

       224
       224
       +
       				t.Errorf("Expected commenter_did %s, got %s", userDID, indexedComment.CommenterDID)

     

       225
       225
       +
       			}

     

       226
       226
       +
       			if indexedComment.Content != "This is a TRUE E2E test comment via Jetstream!" {

     

       227
       227
       +
       				t.Errorf("Expected content mismatch, got %s", indexedComment.Content)

     

       228
       228
       +
       			}

     

       229
       229
       +
       

     

       230
       230
       +
       			close(done)

     

       231
       231
       +
       

     

       232
       232
       +
       		case err := <-errorChan:

     

       233
       233
       +
       			t.Fatalf("Jetstream error: %v", err)

     

       234
       234
       +
       

     

       235
       235
       +
       		case <-time.After(30 * time.Second):

     

       236
       236
       +
       			t.Fatalf("Timeout: No Jetstream event received within 30 seconds")

     

       237
       237
       +
       		}

     

       238
       238
       +
       

     

       239
       239
       +
       		t.Logf("\n✅ TRUE E2E COMMENT CREATE FLOW COMPLETE:")

     

       240
       240
       +
       		t.Logf("   Client → Service → PDS → Jetstream → Consumer → AppView ✓")

     

       241
       241
       +
       	})

     

       242
       242
       +
       }

     

       243
       243
       +
       

     

       244
       244
       +
       // TestCommentE2E_UpdateWithJetstream tests comment update with real Jetstream indexing

     

       245
       245
       +
       func TestCommentE2E_UpdateWithJetstream(t *testing.T) {

     

       246
       246
       +
       	if testing.Short() {

     

       247
       247
       +
       		t.Skip("Skipping E2E test in short mode")

     

       248
       248
       +
       	}

     

       249
       249
       +
       

     

       250
       250
       +
       	// Setup test database

     

       251
       251
       +
       	dbURL := os.Getenv("TEST_DATABASE_URL")

     

       252
       252
       +
       	if dbURL == "" {

     

       253
       253
       +
       		dbURL = "postgres://test_user:test_password@localhost:5434/coves_test?sslmode=disable"

     

       254
       254
       +
       	}

     

       255
       255
       +
       

     

       256
       256
       +
       	db, err := sql.Open("postgres", dbURL)

     

       257
       257
       +
       	if err != nil {

     

       258
       258
       +
       		t.Fatalf("Failed to connect to test database: %v", err)

     

       259
       259
       +
       	}

     

       260
       260
       +
       	defer func() { _ = db.Close() }()

     

       261
       261
       +
       

     

       262
       262
       +
       	// Run migrations

     

       263
       263
       +
       	if dialectErr := goose.SetDialect("postgres"); dialectErr != nil {

     

       264
       264
       +
       		t.Fatalf("Failed to set goose dialect: %v", dialectErr)

     

       265
       265
       +
       	}

     

       266
       266
       +
       	if migrateErr := goose.Up(db, "../../internal/db/migrations"); migrateErr != nil {

     

       267
       267
       +
       		t.Fatalf("Failed to run migrations: %v", migrateErr)

     

       268
       268
       +
       	}

     

       269
       269
       +
       

     

       270
       270
       +
       	// Check if PDS is running

     

       271
       271
       +
       	pdsURL := getTestPDSURL()

     

       272
       272
       +
       	healthResp, err := http.Get(pdsURL + "/xrpc/_health")

     

       273
       273
       +
       	if err != nil {

     

       274
       274
       +
       		t.Skipf("PDS not running at %s: %v", pdsURL, err)

     

       275
       275
       +
       	}

     

       276
       276
       +
       	_ = healthResp.Body.Close()

     

       277
       277
       +
       

     

       278
       278
       +
       	// Check if Jetstream is running

     

       279
       279
       +
       	pdsHostname := strings.TrimPrefix(pdsURL, "http://")

     

       280
       280
       +
       	pdsHostname = strings.TrimPrefix(pdsHostname, "https://")

     

       281
       281
       +
       	pdsHostname = strings.Split(pdsHostname, ":")[0]

     

       282
       282
       +
       	jetstreamURL := fmt.Sprintf("ws://%s:6008/subscribe?wantedCollections=social.coves.community.comment", pdsHostname)

     

       283
       283
       +
       

     

       284
       284
       +
       	testConn, _, err := websocket.DefaultDialer.Dial(jetstreamURL, nil)

     

       285
       285
       +
       	if err != nil {

     

       286
       286
       +
       		t.Skipf("Jetstream not running at %s: %v", jetstreamURL, err)

     

       287
       287
       +
       	}

     

       288
       288
       +
       	_ = testConn.Close()

     

       289
       289
       +
       

     

       290
       290
       +
       	ctx := context.Background()

     

       291
       291
       +
       

     

       292
       292
       +
       	// Setup repositories

     

       293
       293
       +
       	commentRepo := postgres.NewCommentRepository(db)

     

       294
       294
       +
       	postRepo := postgres.NewPostRepository(db)

     

       295
       295
       +
       

     

       296
       296
       +
       	// Create test user on PDS

     

       297
       297
       +
       	testUserHandle := fmt.Sprintf("cmtup%d.local.coves.dev", time.Now().UnixNano()%1000000)

     

       298
       298
       +
       	testUserEmail := fmt.Sprintf("cmtup%d@test.local", time.Now().UnixNano()%1000000)

     

       299
       299
       +
       	testUserPassword := "test-password-123"

     

       300
       300
       +
       

     

       301
       301
       +
       	pdsAccessToken, userDID, err := createPDSAccount(pdsURL, testUserHandle, testUserEmail, testUserPassword)

     

       302
       302
       +
       	if err != nil {

     

       303
       303
       +
       		t.Fatalf("Failed to create test user on PDS: %v", err)

     

       304
       304
       +
       	}

     

       305
       305
       +
       

     

       306
       306
       +
       	testUser := createTestUser(t, db, testUserHandle, userDID)

     

       307
       307
       +
       

     

       308
       308
       +
       	testCommunityDID, err := createFeedTestCommunity(db, ctx, "comment-upd-community", "owner.test")

     

       309
       309
       +
       	if err != nil {

     

       310
       310
       +
       		t.Fatalf("Failed to create test community: %v", err)

     

       311
       311
       +
       	}

     

       312
       312
       +
       

     

       313
       313
       +
       	postURI := createTestPost(t, db, testCommunityDID, testUser.DID, "Test Post for Update", 0, time.Now())

     

       314
       314
       +
       	postCID := "bafypostupdate"

     

       315
       315
       +
       

     

       316
       316
       +
       	commentPDSFactory := func(ctx context.Context, session *oauthlib.ClientSessionData) (pds.Client, error) {

     

       317
       317
       +
       		if session.AccessToken == "" {

     

       318
       318
       +
       			return nil, fmt.Errorf("session has no access token")

     

       319
       319
       +
       		}

     

       320
       320
       +
       		return pds.NewFromAccessToken(session.HostURL, session.AccountDID.String(), session.AccessToken)

     

       321
       321
       +
       	}

     

       322
       322
       +
       

     

       323
       323
       +
       	commentService := comments.NewCommentServiceWithPDSFactory(

     

       324
       324
       +
       		commentRepo,

     

       325
       325
       +
       		nil,

     

       326
       326
       +
       		postRepo,

     

       327
       327
       +
       		nil,

     

       328
       328
       +
       		nil,

     

       329
       329
       +
       		commentPDSFactory,

     

       330
       330
       +
       	)

     

       331
       331
       +
       

     

       332
       332
       +
       	mockStore := NewMockOAuthStore()

     

       333
       333
       +
       	mockStore.AddSessionWithPDS(userDID, "session-"+userDID, pdsAccessToken, pdsURL)

     

       334
       334
       +
       

     

       335
       335
       +
       	t.Run("update comment with real Jetstream indexing", func(t *testing.T) {

     

       336
       336
       +
       		commentConsumer := jetstream.NewCommentEventConsumer(commentRepo, db)

     

       337
       337
       +
       

     

       338
       338
       +
       		// First, create a comment and wait for it to be indexed

     

       339
       339
       +
       		eventChan := make(chan *jetstream.JetstreamEvent, 10)

     

       340
       340
       +
       		errorChan := make(chan error, 1)

     

       341
       341
       +
       		done := make(chan bool)

     

       342
       342
       +
       

     

       343
       343
       +
       		go func() {

     

       344
       344
       +
       			subscribeErr := subscribeToJetstreamForComment(ctx, jetstreamURL, userDID, commentConsumer, eventChan, done)

     

       345
       345
       +
       			if subscribeErr != nil {

     

       346
       346
       +
       				errorChan <- subscribeErr

     

       347
       347
       +
       			}

     

       348
       348
       +
       		}()

     

       349
       349
       +
       

     

       350
       350
       +
       		time.Sleep(500 * time.Millisecond)

     

       351
       351
       +
       

     

       352
       352
       +
       		// Create initial comment

     

       353
       353
       +
       		t.Logf("\n📝 Creating initial comment...")

     

       354
       354
       +
       		commentReq := comments.CreateCommentRequest{

     

       355
       355
       +
       			Reply: comments.ReplyRef{

     

       356
       356
       +
       				Root:   comments.StrongRef{URI: postURI, CID: postCID},

     

       357
       357
       +
       				Parent: comments.StrongRef{URI: postURI, CID: postCID},

     

       358
       358
       +
       			},

     

       359
       359
       +
       			Content: "Original comment content",

     

       360
       360
       +
       			Langs:   []string{"en"},

     

       361
       361
       +
       		}

     

       362
       362
       +
       

     

       363
       363
       +
       		parsedDID, parseErr := syntax.ParseDID(userDID)

     

       364
       364
       +
       		if parseErr != nil {

     

       365
       365
       +
       			t.Fatalf("Failed to parse DID: %v", parseErr)

     

       366
       366
       +
       		}

     

       367
       367
       +
       		session, sessionErr := mockStore.GetSession(ctx, parsedDID, "session-"+userDID)

     

       368
       368
       +
       		if sessionErr != nil {

     

       369
       369
       +
       			t.Fatalf("Failed to get session: %v", sessionErr)

     

       370
       370
       +
       		}

     

       371
       371
       +
       		commentResp, err := commentService.CreateComment(ctx, session, commentReq)

     

       372
       372
       +
       		if err != nil {

     

       373
       373
       +
       			t.Fatalf("Failed to create comment: %v", err)

     

       374
       374
       +
       		}

     

       375
       375
       +
       

     

       376
       376
       +
       		// Wait for create event

     

       377
       377
       +
       		select {

     

       378
       378
       +
       		case <-eventChan:

     

       379
       379
       +
       			t.Logf("✅ Create event received and indexed")

     

       380
       380
       +
       		case err := <-errorChan:

     

       381
       381
       +
       			t.Fatalf("Jetstream error: %v", err)

     

       382
       382
       +
       		case <-time.After(30 * time.Second):

     

       383
       383
       +
       			t.Fatalf("Timeout waiting for create event")

     

       384
       384
       +
       		}

     

       385
       385
       +
       		close(done)

     

       386
       386
       +
       

     

       387
       387
       +
       		// Now update the comment

     

       388
       388
       +
       		t.Logf("\n📝 Updating comment via service...")

     

       389
       389
       +
       

     

       390
       390
       +
       		// Start new Jetstream subscription for update event

     

       391
       391
       +
       		updateEventChan := make(chan *jetstream.JetstreamEvent, 10)

     

       392
       392
       +
       		updateErrorChan := make(chan error, 1)

     

       393
       393
       +
       		updateDone := make(chan bool)

     

       394
       394
       +
       

     

       395
       395
       +
       		go func() {

     

       396
       396
       +
       			subscribeErr := subscribeToJetstreamForCommentUpdate(ctx, jetstreamURL, userDID, commentConsumer, updateEventChan, updateDone)

     

       397
       397
       +
       			if subscribeErr != nil {

     

       398
       398
       +
       				updateErrorChan <- subscribeErr

     

       399
       399
       +
       			}

     

       400
       400
       +
       		}()

     

       401
       401
       +
       

     

       402
       402
       +
       		time.Sleep(500 * time.Millisecond)

     

       403
       403
       +
       

     

       404
       404
       +
       		// Get existing comment CID from PDS for optimistic locking

     

       405
       405
       +
       		rkey := utils.ExtractRKeyFromURI(commentResp.URI)

     

       406
       406
       +
       		pdsResp, httpErr := http.Get(fmt.Sprintf("%s/xrpc/com.atproto.repo.getRecord?repo=%s&collection=social.coves.community.comment&rkey=%s",

     

       407
       407
       +
       			pdsURL, userDID, rkey))

     

       408
       408
       +
       		if httpErr != nil {

     

       409
       409
       +
       			t.Fatalf("Failed to get record from PDS: %v", httpErr)

     

       410
       410
       +
       		}

     

       411
       411
       +
       		defer func() { _ = pdsResp.Body.Close() }()

     

       412
       412
       +
       		if pdsResp.StatusCode != http.StatusOK {

     

       413
       413
       +
       			body, _ := io.ReadAll(pdsResp.Body)

     

       414
       414
       +
       			t.Fatalf("Failed to get record from PDS: status=%d body=%s", pdsResp.StatusCode, string(body))

     

       415
       415
       +
       		}

     

       416
       416
       +
       		var pdsRecord struct {

     

       417
       417
       +
       			CID string `json:"cid"`

     

       418
       418
       +
       		}

     

       419
       419
       +
       		if decodeErr := json.NewDecoder(pdsResp.Body).Decode(&pdsRecord); decodeErr != nil {

     

       420
       420
       +
       			t.Fatalf("Failed to decode PDS response: %v", decodeErr)

     

       421
       421
       +
       		}

     

       422
       422
       +
       

     

       423
       423
       +
       		updateReq := comments.UpdateCommentRequest{

     

       424
       424
       +
       			URI:     commentResp.URI,

     

       425
       425
       +
       			Content: "Updated comment content via E2E test!",

     

       426
       426
       +
       			Langs:   []string{"en"},

     

       427
       427
       +
       		}

     

       428
       428
       +
       

     

       429
       429
       +
       		updatedComment, err := commentService.UpdateComment(ctx, session, updateReq)

     

       430
       430
       +
       		if err != nil {

     

       431
       431
       +
       			t.Fatalf("Failed to update comment: %v", err)

     

       432
       432
       +
       		}

     

       433
       433
       +
       

     

       434
       434
       +
       		t.Logf("✅ Comment updated on PDS:")

     

       435
       435
       +
       		t.Logf("   URI: %s", updatedComment.URI)

     

       436
       436
       +
       		t.Logf("   CID: %s", updatedComment.CID)

     

       437
       437
       +
       

     

       438
       438
       +
       		// Wait for update event from Jetstream

     

       439
       439
       +
       		t.Logf("\n⏳ Waiting for update event from Jetstream...")

     

       440
       440
       +
       

     

       441
       441
       +
       		select {

     

       442
       442
       +
       		case event := <-updateEventChan:

     

       443
       443
       +
       			t.Logf("✅ Received update event from Jetstream!")

     

       444
       444
       +
       			t.Logf("   Operation: %s", event.Commit.Operation)

     

       445
       445
       +
       

     

       446
       446
       +
       			if event.Commit.Operation != "update" {

     

       447
       447
       +
       				t.Errorf("Expected operation 'update', got '%s'", event.Commit.Operation)

     

       448
       448
       +
       			}

     

       449
       449
       +
       

     

       450
       450
       +
       			// Verify updated content in AppView

     

       451
       451
       +
       			indexedComment, err := commentRepo.GetByURI(ctx, commentResp.URI)

     

       452
       452
       +
       			if err != nil {

     

       453
       453
       +
       				t.Fatalf("Failed to get updated comment: %v", err)

     

       454
       454
       +
       			}

     

       455
       455
       +
       

     

       456
       456
       +
       			if indexedComment.Content != "Updated comment content via E2E test!" {

     

       457
       457
       +
       				t.Errorf("Expected updated content, got: %s", indexedComment.Content)

     

       458
       458
       +
       			}

     

       459
       459
       +
       

     

       460
       460
       +
       			t.Logf("✅ Comment updated in AppView:")

     

       461
       461
       +
       			t.Logf("   Content: %s", indexedComment.Content)

     

       462
       462
       +
       

     

       463
       463
       +
       			close(updateDone)

     

       464
       464
       +
       

     

       465
       465
       +
       		case err := <-updateErrorChan:

     

       466
       466
       +
       			t.Fatalf("Jetstream error: %v", err)

     

       467
       467
       +
       

     

       468
       468
       +
       		case <-time.After(30 * time.Second):

     

       469
       469
       +
       			t.Fatalf("Timeout: No update event received within 30 seconds")

     

       470
       470
       +
       		}

     

       471
       471
       +
       

     

       472
       472
       +
       		t.Logf("\n✅ TRUE E2E COMMENT UPDATE FLOW COMPLETE:")

     

       473
       473
       +
       		t.Logf("   Client → Service → PDS PutRecord → Jetstream → Consumer → AppView ✓")

     

       474
       474
       +
       	})

     

       475
       475
       +
       }

     

       476
       476
       +
       

     

       477
       477
       +
       // TestCommentE2E_DeleteWithJetstream tests comment deletion with real Jetstream indexing

     

       478
       478
       +
       func TestCommentE2E_DeleteWithJetstream(t *testing.T) {

     

       479
       479
       +
       	if testing.Short() {

     

       480
       480
       +
       		t.Skip("Skipping E2E test in short mode")

     

       481
       481
       +
       	}

     

       482
       482
       +
       

     

       483
       483
       +
       	// Setup test database

     

       484
       484
       +
       	dbURL := os.Getenv("TEST_DATABASE_URL")

     

       485
       485
       +
       	if dbURL == "" {

     

       486
       486
       +
       		dbURL = "postgres://test_user:test_password@localhost:5434/coves_test?sslmode=disable"

     

       487
       487
       +
       	}

     

       488
       488
       +
       

     

       489
       489
       +
       	db, err := sql.Open("postgres", dbURL)

     

       490
       490
       +
       	if err != nil {

     

       491
       491
       +
       		t.Fatalf("Failed to connect to test database: %v", err)

     

       492
       492
       +
       	}

     

       493
       493
       +
       	defer func() { _ = db.Close() }()

     

       494
       494
       +
       

     

       495
       495
       +
       	if dialectErr := goose.SetDialect("postgres"); dialectErr != nil {

     

       496
       496
       +
       		t.Fatalf("Failed to set goose dialect: %v", dialectErr)

     

       497
       497
       +
       	}

     

       498
       498
       +
       	if migrateErr := goose.Up(db, "../../internal/db/migrations"); migrateErr != nil {

     

       499
       499
       +
       		t.Fatalf("Failed to run migrations: %v", migrateErr)

     

       500
       500
       +
       	}

     

       501
       501
       +
       

     

       502
       502
       +
       	pdsURL := getTestPDSURL()

     

       503
       503
       +
       	healthResp, err := http.Get(pdsURL + "/xrpc/_health")

     

       504
       504
       +
       	if err != nil {

     

       505
       505
       +
       		t.Skipf("PDS not running at %s: %v", pdsURL, err)

     

       506
       506
       +
       	}

     

       507
       507
       +
       	_ = healthResp.Body.Close()

     

       508
       508
       +
       

     

       509
       509
       +
       	pdsHostname := strings.TrimPrefix(pdsURL, "http://")

     

       510
       510
       +
       	pdsHostname = strings.TrimPrefix(pdsHostname, "https://")

     

       511
       511
       +
       	pdsHostname = strings.Split(pdsHostname, ":")[0]

     

       512
       512
       +
       	jetstreamURL := fmt.Sprintf("ws://%s:6008/subscribe?wantedCollections=social.coves.community.comment", pdsHostname)

     

       513
       513
       +
       

     

       514
       514
       +
       	testConn, _, err := websocket.DefaultDialer.Dial(jetstreamURL, nil)

     

       515
       515
       +
       	if err != nil {

     

       516
       516
       +
       		t.Skipf("Jetstream not running at %s: %v", jetstreamURL, err)

     

       517
       517
       +
       	}

     

       518
       518
       +
       	_ = testConn.Close()

     

       519
       519
       +
       

     

       520
       520
       +
       	ctx := context.Background()

     

       521
       521
       +
       

     

       522
       522
       +
       	commentRepo := postgres.NewCommentRepository(db)

     

       523
       523
       +
       	postRepo := postgres.NewPostRepository(db)

     

       524
       524
       +
       

     

       525
       525
       +
       	testUserHandle := fmt.Sprintf("cmtdl%d.local.coves.dev", time.Now().UnixNano()%1000000)

     

       526
       526
       +
       	testUserEmail := fmt.Sprintf("cmtdl%d@test.local", time.Now().UnixNano()%1000000)

     

       527
       527
       +
       	testUserPassword := "test-password-123"

     

       528
       528
       +
       

     

       529
       529
       +
       	pdsAccessToken, userDID, err := createPDSAccount(pdsURL, testUserHandle, testUserEmail, testUserPassword)

     

       530
       530
       +
       	if err != nil {

     

       531
       531
       +
       		t.Fatalf("Failed to create test user on PDS: %v", err)

     

       532
       532
       +
       	}

     

       533
       533
       +
       

     

       534
       534
       +
       	testUser := createTestUser(t, db, testUserHandle, userDID)

     

       535
       535
       +
       

     

       536
       536
       +
       	testCommunityDID, err := createFeedTestCommunity(db, ctx, "comment-del-community", "owner.test")

     

       537
       537
       +
       	if err != nil {

     

       538
       538
       +
       		t.Fatalf("Failed to create test community: %v", err)

     

       539
       539
       +
       	}

     

       540
       540
       +
       

     

       541
       541
       +
       	postURI := createTestPost(t, db, testCommunityDID, testUser.DID, "Test Post for Delete", 0, time.Now())

     

       542
       542
       +
       	postCID := "bafypostdelete"

     

       543
       543
       +
       

     

       544
       544
       +
       	commentPDSFactory := func(ctx context.Context, session *oauthlib.ClientSessionData) (pds.Client, error) {

     

       545
       545
       +
       		if session.AccessToken == "" {

     

       546
       546
       +
       			return nil, fmt.Errorf("session has no access token")

     

       547
       547
       +
       		}

     

       548
       548
       +
       		return pds.NewFromAccessToken(session.HostURL, session.AccountDID.String(), session.AccessToken)

     

       549
       549
       +
       	}

     

       550
       550
       +
       

     

       551
       551
       +
       	commentService := comments.NewCommentServiceWithPDSFactory(

     

       552
       552
       +
       		commentRepo,

     

       553
       553
       +
       		nil,

     

       554
       554
       +
       		postRepo,

     

       555
       555
       +
       		nil,

     

       556
       556
       +
       		nil,

     

       557
       557
       +
       		commentPDSFactory,

     

       558
       558
       +
       	)

     

       559
       559
       +
       

     

       560
       560
       +
       	mockStore := NewMockOAuthStore()

     

       561
       561
       +
       	mockStore.AddSessionWithPDS(userDID, "session-"+userDID, pdsAccessToken, pdsURL)

     

       562
       562
       +
       

     

       563
       563
       +
       	t.Run("delete comment with real Jetstream indexing", func(t *testing.T) {

     

       564
       564
       +
       		commentConsumer := jetstream.NewCommentEventConsumer(commentRepo, db)

     

       565
       565
       +
       

     

       566
       566
       +
       		// First, create a comment

     

       567
       567
       +
       		eventChan := make(chan *jetstream.JetstreamEvent, 10)

     

       568
       568
       +
       		errorChan := make(chan error, 1)

     

       569
       569
       +
       		done := make(chan bool)

     

       570
       570
       +
       

     

       571
       571
       +
       		go func() {

     

       572
       572
       +
       			subscribeErr := subscribeToJetstreamForComment(ctx, jetstreamURL, userDID, commentConsumer, eventChan, done)

     

       573
       573
       +
       			if subscribeErr != nil {

     

       574
       574
       +
       				errorChan <- subscribeErr

     

       575
       575
       +
       			}

     

       576
       576
       +
       		}()

     

       577
       577
       +
       

     

       578
       578
       +
       		time.Sleep(500 * time.Millisecond)

     

       579
       579
       +
       

     

       580
       580
       +
       		t.Logf("\n📝 Creating comment to delete...")

     

       581
       581
       +
       		commentReq := comments.CreateCommentRequest{

     

       582
       582
       +
       			Reply: comments.ReplyRef{

     

       583
       583
       +
       				Root:   comments.StrongRef{URI: postURI, CID: postCID},

     

       584
       584
       +
       				Parent: comments.StrongRef{URI: postURI, CID: postCID},

     

       585
       585
       +
       			},

     

       586
       586
       +
       			Content: "This comment will be deleted",

     

       587
       587
       +
       			Langs:   []string{"en"},

     

       588
       588
       +
       		}

     

       589
       589
       +
       

     

       590
       590
       +
       		parsedDID, parseErr := syntax.ParseDID(userDID)

     

       591
       591
       +
       		if parseErr != nil {

     

       592
       592
       +
       			t.Fatalf("Failed to parse DID: %v", parseErr)

     

       593
       593
       +
       		}

     

       594
       594
       +
       		session, sessionErr := mockStore.GetSession(ctx, parsedDID, "session-"+userDID)

     

       595
       595
       +
       		if sessionErr != nil {

     

       596
       596
       +
       			t.Fatalf("Failed to get session: %v", sessionErr)

     

       597
       597
       +
       		}

     

       598
       598
       +
       		commentResp, err := commentService.CreateComment(ctx, session, commentReq)

     

       599
       599
       +
       		if err != nil {

     

       600
       600
       +
       			t.Fatalf("Failed to create comment: %v", err)

     

       601
       601
       +
       		}

     

       602
       602
       +
       

     

       603
       603
       +
       		// Wait for create event

     

       604
       604
       +
       		select {

     

       605
       605
       +
       		case <-eventChan:

     

       606
       606
       +
       			t.Logf("✅ Create event received")

     

       607
       607
       +
       		case err := <-errorChan:

     

       608
       608
       +
       			t.Fatalf("Jetstream error: %v", err)

     

       609
       609
       +
       		case <-time.After(30 * time.Second):

     

       610
       610
       +
       			t.Fatalf("Timeout waiting for create event")

     

       611
       611
       +
       		}

     

       612
       612
       +
       		close(done)

     

       613
       613
       +
       

     

       614
       614
       +
       		// Verify comment exists

     

       615
       615
       +
       		_, err = commentRepo.GetByURI(ctx, commentResp.URI)

     

       616
       616
       +
       		if err != nil {

     

       617
       617
       +
       			t.Fatalf("Comment should exist before delete: %v", err)

     

       618
       618
       +
       		}

     

       619
       619
       +
       

     

       620
       620
       +
       		// Now delete the comment

     

       621
       621
       +
       		t.Logf("\n🗑️ Deleting comment via service...")

     

       622
       622
       +
       

     

       623
       623
       +
       		deleteEventChan := make(chan *jetstream.JetstreamEvent, 10)

     

       624
       624
       +
       		deleteErrorChan := make(chan error, 1)

     

       625
       625
       +
       		deleteDone := make(chan bool)

     

       626
       626
       +
       

     

       627
       627
       +
       		go func() {

     

       628
       628
       +
       			subscribeErr := subscribeToJetstreamForCommentDelete(ctx, jetstreamURL, userDID, commentConsumer, deleteEventChan, deleteDone)

     

       629
       629
       +
       			if subscribeErr != nil {

     

       630
       630
       +
       				deleteErrorChan <- subscribeErr

     

       631
       631
       +
       			}

     

       632
       632
       +
       		}()

     

       633
       633
       +
       

     

       634
       634
       +
       		time.Sleep(500 * time.Millisecond)

     

       635
       635
       +
       

     

       636
       636
       +
       		err = commentService.DeleteComment(ctx, session, comments.DeleteCommentRequest{URI: commentResp.URI})

     

       637
       637
       +
       		if err != nil {

     

       638
       638
       +
       			t.Fatalf("Failed to delete comment: %v", err)

     

       639
       639
       +
       		}

     

       640
       640
       +
       

     

       641
       641
       +
       		t.Logf("✅ Comment delete request sent to PDS")

     

       642
       642
       +
       

     

       643
       643
       +
       		// Wait for delete event from Jetstream

     

       644
       644
       +
       		t.Logf("\n⏳ Waiting for delete event from Jetstream...")

     

       645
       645
       +
       

     

       646
       646
       +
       		select {

     

       647
       647
       +
       		case event := <-deleteEventChan:

     

       648
       648
       +
       			t.Logf("✅ Received delete event from Jetstream!")

     

       649
       649
       +
       			t.Logf("   Operation: %s", event.Commit.Operation)

     

       650
       650
       +
       

     

       651
       651
       +
       			if event.Commit.Operation != "delete" {

     

       652
       652
       +
       				t.Errorf("Expected operation 'delete', got '%s'", event.Commit.Operation)

     

       653
       653
       +
       			}

     

       654
       654
       +
       

     

       655
       655
       +
       			// Verify comment is soft-deleted in AppView

     

       656
       656
       +
       			deletedComment, err := commentRepo.GetByURI(ctx, commentResp.URI)

     

       657
       657
       +
       			if err != nil {

     

       658
       658
       +
       				t.Fatalf("Failed to get deleted comment: %v", err)

     

       659
       659
       +
       			}

     

       660
       660
       +
       

     

       661
       661
       +
       			if deletedComment.DeletedAt == nil {

     

       662
       662
       +
       				t.Errorf("Expected comment to be soft-deleted (deleted_at should be set)")

     

       663
       663
       +
       			} else {

     

       664
       664
       +
       				t.Logf("✅ Comment soft-deleted in AppView at: %v", *deletedComment.DeletedAt)

     

       665
       665
       +
       			}

     

       666
       666
       +
       

     

       667
       667
       +
       			close(deleteDone)

     

       668
       668
       +
       

     

       669
       669
       +
       		case err := <-deleteErrorChan:

     

       670
       670
       +
       			t.Fatalf("Jetstream error: %v", err)

     

       671
       671
       +
       

     

       672
       672
       +
       		case <-time.After(30 * time.Second):

     

       673
       673
       +
       			t.Fatalf("Timeout: No delete event received within 30 seconds")

     

       674
       674
       +
       		}

     

       675
       675
       +
       

     

       676
       676
       +
       		t.Logf("\n✅ TRUE E2E COMMENT DELETE FLOW COMPLETE:")

     

       677
       677
       +
       		t.Logf("   Client → Service → PDS DeleteRecord → Jetstream → Consumer → AppView ✓")

     

       678
       678
       +
       	})

     

       679
       679
       +
       }

     

       680
       680
       +
       

     

       681
       681
       +
       // subscribeToJetstreamForComment subscribes to real Jetstream firehose for comment create events

     

       682
       682
       +
       func subscribeToJetstreamForComment(

     

       683
       683
       +
       	ctx context.Context,

     

       684
       684
       +
       	jetstreamURL string,

     

       685
       685
       +
       	targetDID string,

     

       686
       686
       +
       	consumer *jetstream.CommentEventConsumer,

     

       687
       687
       +
       	eventChan chan<- *jetstream.JetstreamEvent,

     

       688
       688
       +
       	done <-chan bool,

     

       689
       689
       +
       ) error {

     

       690
       690
       +
       	conn, _, err := websocket.DefaultDialer.Dial(jetstreamURL, nil)

     

       691
       691
       +
       	if err != nil {

     

       692
       692
       +
       		return fmt.Errorf("failed to connect to Jetstream: %w", err)

     

       693
       693
       +
       	}

     

       694
       694
       +
       	defer func() { _ = conn.Close() }()

     

       695
       695
       +
       

     

       696
       696
       +
       	for {

     

       697
       697
       +
       		select {

     

       698
       698
       +
       		case <-done:

     

       699
       699
       +
       			return nil

     

       700
       700
       +
       		case <-ctx.Done():

     

       701
       701
       +
       			return ctx.Err()

     

       702
       702
       +
       		default:

     

       703
       703
       +
       			if err := conn.SetReadDeadline(time.Now().Add(5 * time.Second)); err != nil {

     

       704
       704
       +
       				return fmt.Errorf("failed to set read deadline: %w", err)

     

       705
       705
       +
       			}

     

       706
       706
       +
       

     

       707
       707
       +
       			var event jetstream.JetstreamEvent

     

       708
       708
       +
       			err := conn.ReadJSON(&event)

     

       709
       709
       +
       			if err != nil {

     

       710
       710
       +
       				if websocket.IsCloseError(err, websocket.CloseNormalClosure) {

     

       711
       711
       +
       					return nil

     

       712
       712
       +
       				}

     

       713
       713
       +
       				if netErr, ok := err.(net.Error); ok && netErr.Timeout() {

     

       714
       714
       +
       					continue

     

       715
       715
       +
       				}

     

       716
       716
       +
       				return fmt.Errorf("failed to read Jetstream message: %w", err)

     

       717
       717
       +
       			}

     

       718
       718
       +
       

     

       719
       719
       +
       			// Check if this is a comment create event for the target DID

     

       720
       720
       +
       			if event.Did == targetDID && event.Kind == "commit" &&

     

       721
       721
       +
       				event.Commit != nil && event.Commit.Collection == "social.coves.community.comment" &&

     

       722
       722
       +
       				event.Commit.Operation == "create" {

     

       723
       723
       +
       

     

       724
       724
       +
       				if err := consumer.HandleEvent(ctx, &event); err != nil {

     

       725
       725
       +
       					return fmt.Errorf("failed to process event: %w", err)

     

       726
       726
       +
       				}

     

       727
       727
       +
       

     

       728
       728
       +
       				select {

     

       729
       729
       +
       				case eventChan <- &event:

     

       730
       730
       +
       					return nil

     

       731
       731
       +
       				case <-time.After(1 * time.Second):

     

       732
       732
       +
       					return fmt.Errorf("timeout sending event to channel")

     

       733
       733
       +
       				}

     

       734
       734
       +
       			}

     

       735
       735
       +
       		}

     

       736
       736
       +
       	}

     

       737
       737
       +
       }

     

       738
       738
       +
       

     

       739
       739
       +
       // subscribeToJetstreamForCommentUpdate subscribes for comment update events

     

       740
       740
       +
       func subscribeToJetstreamForCommentUpdate(

     

       741
       741
       +
       	ctx context.Context,

     

       742
       742
       +
       	jetstreamURL string,

     

       743
       743
       +
       	targetDID string,

     

       744
       744
       +
       	consumer *jetstream.CommentEventConsumer,

     

       745
       745
       +
       	eventChan chan<- *jetstream.JetstreamEvent,

     

       746
       746
       +
       	done <-chan bool,

     

       747
       747
       +
       ) error {

     

       748
       748
       +
       	conn, _, err := websocket.DefaultDialer.Dial(jetstreamURL, nil)

     

       749
       749
       +
       	if err != nil {

     

       750
       750
       +
       		return fmt.Errorf("failed to connect to Jetstream: %w", err)

     

       751
       751
       +
       	}

     

       752
       752
       +
       	defer func() { _ = conn.Close() }()

     

       753
       753
       +
       

     

       754
       754
       +
       	for {

     

       755
       755
       +
       		select {

     

       756
       756
       +
       		case <-done:

     

       757
       757
       +
       			return nil

     

       758
       758
       +
       		case <-ctx.Done():

     

       759
       759
       +
       			return ctx.Err()

     

       760
       760
       +
       		default:

     

       761
       761
       +
       			if err := conn.SetReadDeadline(time.Now().Add(5 * time.Second)); err != nil {

     

       762
       762
       +
       				return fmt.Errorf("failed to set read deadline: %w", err)

     

       763
       763
       +
       			}

     

       764
       764
       +
       

     

       765
       765
       +
       			var event jetstream.JetstreamEvent

     

       766
       766
       +
       			err := conn.ReadJSON(&event)

     

       767
       767
       +
       			if err != nil {

     

       768
       768
       +
       				if websocket.IsCloseError(err, websocket.CloseNormalClosure) {

     

       769
       769
       +
       					return nil

     

       770
       770
       +
       				}

     

       771
       771
       +
       				if netErr, ok := err.(net.Error); ok && netErr.Timeout() {

     

       772
       772
       +
       					continue

     

       773
       773
       +
       				}

     

       774
       774
       +
       				return fmt.Errorf("failed to read Jetstream message: %w", err)

     

       775
       775
       +
       			}

     

       776
       776
       +
       

     

       777
       777
       +
       			if event.Did == targetDID && event.Kind == "commit" &&

     

       778
       778
       +
       				event.Commit != nil && event.Commit.Collection == "social.coves.community.comment" &&

     

       779
       779
       +
       				event.Commit.Operation == "update" {

     

       780
       780
       +
       

     

       781
       781
       +
       				if err := consumer.HandleEvent(ctx, &event); err != nil {

     

       782
       782
       +
       					return fmt.Errorf("failed to process event: %w", err)

     

       783
       783
       +
       				}

     

       784
       784
       +
       

     

       785
       785
       +
       				select {

     

       786
       786
       +
       				case eventChan <- &event:

     

       787
       787
       +
       					return nil

     

       788
       788
       +
       				case <-time.After(1 * time.Second):

     

       789
       789
       +
       					return fmt.Errorf("timeout sending event to channel")

     

       790
       790
       +
       				}

     

       791
       791
       +
       			}

     

       792
       792
       +
       		}

     

       793
       793
       +
       	}

     

       794
       794
       +
       }

     

       795
       795
       +
       

     

       796
       796
       +
       // subscribeToJetstreamForCommentDelete subscribes for comment delete events

     

       797
       797
       +
       func subscribeToJetstreamForCommentDelete(

     

       798
       798
       +
       	ctx context.Context,

     

       799
       799
       +
       	jetstreamURL string,

     

       800
       800
       +
       	targetDID string,

     

       801
       801
       +
       	consumer *jetstream.CommentEventConsumer,

     

       802
       802
       +
       	eventChan chan<- *jetstream.JetstreamEvent,

     

       803
       803
       +
       	done <-chan bool,

     

       804
       804
       +
       ) error {

     

       805
       805
       +
       	conn, _, err := websocket.DefaultDialer.Dial(jetstreamURL, nil)

     

       806
       806
       +
       	if err != nil {

     

       807
       807
       +
       		return fmt.Errorf("failed to connect to Jetstream: %w", err)

     

       808
       808
       +
       	}

     

       809
       809
       +
       	defer func() { _ = conn.Close() }()

     

       810
       810
       +
       

     

       811
       811
       +
       	for {

     

       812
       812
       +
       		select {

     

       813
       813
       +
       		case <-done:

     

       814
       814
       +
       			return nil

     

       815
       815
       +
       		case <-ctx.Done():

     

       816
       816
       +
       			return ctx.Err()

     

       817
       817
       +
       		default:

     

       818
       818
       +
       			if err := conn.SetReadDeadline(time.Now().Add(5 * time.Second)); err != nil {

     

       819
       819
       +
       				return fmt.Errorf("failed to set read deadline: %w", err)

     

       820
       820
       +
       			}

     

       821
       821
       +
       

     

       822
       822
       +
       			var event jetstream.JetstreamEvent

     

       823
       823
       +
       			err := conn.ReadJSON(&event)

     

       824
       824
       +
       			if err != nil {

     

       825
       825
       +
       				if websocket.IsCloseError(err, websocket.CloseNormalClosure) {

     

       826
       826
       +
       					return nil

     

       827
       827
       +
       				}

     

       828
       828
       +
       				if netErr, ok := err.(net.Error); ok && netErr.Timeout() {

     

       829
       829
       +
       					continue

     

       830
       830
       +
       				}

     

       831
       831
       +
       				return fmt.Errorf("failed to read Jetstream message: %w", err)

     

       832
       832
       +
       			}

     

       833
       833
       +
       

     

       834
       834
       +
       			if event.Did == targetDID && event.Kind == "commit" &&

     

       835
       835
       +
       				event.Commit != nil && event.Commit.Collection == "social.coves.community.comment" &&

     

       836
       836
       +
       				event.Commit.Operation == "delete" {

     

       837
       837
       +
       

     

       838
       838
       +
       				if err := consumer.HandleEvent(ctx, &event); err != nil {

     

       839
       839
       +
       					return fmt.Errorf("failed to process event: %w", err)

     

       840
       840
       +
       				}

     

       841
       841
       +
       

     

       842
       842
       +
       				select {

     

       843
       843
       +
       				case eventChan <- &event:

     

       844
       844
       +
       					return nil

     

       845
       845
       +
       				case <-time.After(1 * time.Second):

     

       846
       846
       +
       					return fmt.Errorf("timeout sending event to channel")

     

       847
       847
       +
       				}

     

       848
       848
       +
       			}

     

       849
       849
       +
       		}

     

       850
       850
       +
       	}

     

       851
       851
       +
       }

     

       852
       852
       +
       

     

       853
       853
       +
       // TestCommentE2E_Authorization tests that users cannot modify other users' comments

     

       854
       854
       +
       func TestCommentE2E_Authorization(t *testing.T) {

     

       855
       855
       +
       	if testing.Short() {

     

       856
       856
       +
       		t.Skip("Skipping E2E test in short mode")

     

       857
       857
       +
       	}

     

       858
       858
       +
       

     

       859
       859
       +
       	// Setup test database

     

       860
       860
       +
       	dbURL := os.Getenv("TEST_DATABASE_URL")

     

       861
       861
       +
       	if dbURL == "" {

     

       862
       862
       +
       		dbURL = "postgres://test_user:test_password@localhost:5434/coves_test?sslmode=disable"

     

       863
       863
       +
       	}

     

       864
       864
       +
       

     

       865
       865
       +
       	db, err := sql.Open("postgres", dbURL)

     

       866
       866
       +
       	if err != nil {

     

       867
       867
       +
       		t.Fatalf("Failed to connect to test database: %v", err)

     

       868
       868
       +
       	}

     

       869
       869
       +
       	defer func() { _ = db.Close() }()

     

       870
       870
       +
       

     

       871
       871
       +
       	if dialectErr := goose.SetDialect("postgres"); dialectErr != nil {

     

       872
       872
       +
       		t.Fatalf("Failed to set goose dialect: %v", dialectErr)

     

       873
       873
       +
       	}

     

       874
       874
       +
       	if migrateErr := goose.Up(db, "../../internal/db/migrations"); migrateErr != nil {

     

       875
       875
       +
       		t.Fatalf("Failed to run migrations: %v", migrateErr)

     

       876
       876
       +
       	}

     

       877
       877
       +
       

     

       878
       878
       +
       	pdsURL := getTestPDSURL()

     

       879
       879
       +
       	healthResp, err := http.Get(pdsURL + "/xrpc/_health")

     

       880
       880
       +
       	if err != nil {

     

       881
       881
       +
       		t.Skipf("PDS not running at %s: %v", pdsURL, err)

     

       882
       882
       +
       	}

     

       883
       883
       +
       	_ = healthResp.Body.Close()

     

       884
       884
       +
       

     

       885
       885
       +
       	ctx := context.Background()

     

       886
       886
       +
       

     

       887
       887
       +
       	commentRepo := postgres.NewCommentRepository(db)

     

       888
       888
       +
       	postRepo := postgres.NewPostRepository(db)

     

       889
       889
       +
       

     

       890
       890
       +
       	// Create two test users on PDS

     

       891
       891
       +
       	userAHandle := fmt.Sprintf("usera%d.local.coves.dev", time.Now().UnixNano()%1000000)

     

       892
       892
       +
       	userAEmail := fmt.Sprintf("usera%d@test.local", time.Now().UnixNano()%1000000)

     

       893
       893
       +
       	userAPassword := "test-password-123"

     

       894
       894
       +
       

     

       895
       895
       +
       	userBHandle := fmt.Sprintf("userb%d.local.coves.dev", time.Now().UnixNano()%1000000)

     

       896
       896
       +
       	userBEmail := fmt.Sprintf("userb%d@test.local", time.Now().UnixNano()%1000000)

     

       897
       897
       +
       	userBPassword := "test-password-123"

     

       898
       898
       +
       

     

       899
       899
       +
       	pdsAccessTokenA, userADID, err := createPDSAccount(pdsURL, userAHandle, userAEmail, userAPassword)

     

       900
       900
       +
       	if err != nil {

     

       901
       901
       +
       		t.Fatalf("Failed to create test user A on PDS: %v", err)

     

       902
       902
       +
       	}

     

       903
       903
       +
       

     

       904
       904
       +
       	pdsAccessTokenB, userBDID, err := createPDSAccount(pdsURL, userBHandle, userBEmail, userBPassword)

     

       905
       905
       +
       	if err != nil {

     

       906
       906
       +
       		t.Fatalf("Failed to create test user B on PDS: %v", err)

     

       907
       907
       +
       	}

     

       908
       908
       +
       

     

       909
       909
       +
       	testUserA := createTestUser(t, db, userAHandle, userADID)

     

       910
       910
       +
       	_ = createTestUser(t, db, userBHandle, userBDID)

     

       911
       911
       +
       

     

       912
       912
       +
       	testCommunityDID, err := createFeedTestCommunity(db, ctx, "auth-test-community", "owner.test")

     

       913
       913
       +
       	if err != nil {

     

       914
       914
       +
       		t.Fatalf("Failed to create test community: %v", err)

     

       915
       915
       +
       	}

     

       916
       916
       +
       

     

       917
       917
       +
       	postURI := createTestPost(t, db, testCommunityDID, testUserA.DID, "Auth Test Post", 0, time.Now())

     

       918
       918
       +
       	postCID := "bafypostauthtest"

     

       919
       919
       +
       

     

       920
       920
       +
       	commentPDSFactory := func(ctx context.Context, session *oauthlib.ClientSessionData) (pds.Client, error) {

     

       921
       921
       +
       		if session.AccessToken == "" {

     

       922
       922
       +
       			return nil, fmt.Errorf("session has no access token")

     

       923
       923
       +
       		}

     

       924
       924
       +
       		return pds.NewFromAccessToken(session.HostURL, session.AccountDID.String(), session.AccessToken)

     

       925
       925
       +
       	}

     

       926
       926
       +
       

     

       927
       927
       +
       	commentService := comments.NewCommentServiceWithPDSFactory(

     

       928
       928
       +
       		commentRepo,

     

       929
       929
       +
       		nil,

     

       930
       930
       +
       		postRepo,

     

       931
       931
       +
       		nil,

     

       932
       932
       +
       		nil,

     

       933
       933
       +
       		commentPDSFactory,

     

       934
       934
       +
       	)

     

       935
       935
       +
       

     

       936
       936
       +
       	mockStore := NewMockOAuthStore()

     

       937
       937
       +
       	mockStore.AddSessionWithPDS(userADID, "session-"+userADID, pdsAccessTokenA, pdsURL)

     

       938
       938
       +
       	mockStore.AddSessionWithPDS(userBDID, "session-"+userBDID, pdsAccessTokenB, pdsURL)

     

       939
       939
       +
       

     

       940
       940
       +
       	t.Run("user cannot update another user's comment", func(t *testing.T) {

     

       941
       941
       +
       		// User A creates a comment

     

       942
       942
       +
       		parsedDIDA, parseErr := syntax.ParseDID(userADID)

     

       943
       943
       +
       		if parseErr != nil {

     

       944
       944
       +
       			t.Fatalf("Failed to parse DID A: %v", parseErr)

     

       945
       945
       +
       		}

     

       946
       946
       +
       		sessionA, sessionErr := mockStore.GetSession(ctx, parsedDIDA, "session-"+userADID)

     

       947
       947
       +
       		if sessionErr != nil {

     

       948
       948
       +
       			t.Fatalf("Failed to get session A: %v", sessionErr)

     

       949
       949
       +
       		}

     

       950
       950
       +
       

     

       951
       951
       +
       		commentReq := comments.CreateCommentRequest{

     

       952
       952
       +
       			Reply: comments.ReplyRef{

     

       953
       953
       +
       				Root:   comments.StrongRef{URI: postURI, CID: postCID},

     

       954
       954
       +
       				Parent: comments.StrongRef{URI: postURI, CID: postCID},

     

       955
       955
       +
       			},

     

       956
       956
       +
       			Content: "User A's comment",

     

       957
       957
       +
       			Langs:   []string{"en"},

     

       958
       958
       +
       		}

     

       959
       959
       +
       

     

       960
       960
       +
       		commentResp, err := commentService.CreateComment(ctx, sessionA, commentReq)

     

       961
       961
       +
       		if err != nil {

     

       962
       962
       +
       			t.Fatalf("User A failed to create comment: %v", err)

     

       963
       963
       +
       		}

     

       964
       964
       +
       		t.Logf("User A created comment: %s", commentResp.URI)

     

       965
       965
       +
       

     

       966
       966
       +
       		// User B tries to update User A's comment

     

       967
       967
       +
       		parsedDIDB, parseErr := syntax.ParseDID(userBDID)

     

       968
       968
       +
       		if parseErr != nil {

     

       969
       969
       +
       			t.Fatalf("Failed to parse DID B: %v", parseErr)

     

       970
       970
       +
       		}

     

       971
       971
       +
       		sessionB, sessionErr := mockStore.GetSession(ctx, parsedDIDB, "session-"+userBDID)

     

       972
       972
       +
       		if sessionErr != nil {

     

       973
       973
       +
       			t.Fatalf("Failed to get session B: %v", sessionErr)

     

       974
       974
       +
       		}

     

       975
       975
       +
       

     

       976
       976
       +
       		updateReq := comments.UpdateCommentRequest{

     

       977
       977
       +
       			URI:     commentResp.URI,

     

       978
       978
       +
       			Content: "User B trying to update User A's comment",

     

       979
       979
       +
       			Langs:   []string{"en"},

     

       980
       980
       +
       		}

     

       981
       981
       +
       

     

       982
       982
       +
       		_, err = commentService.UpdateComment(ctx, sessionB, updateReq)

     

       983
       983
       +
       		if err == nil {

     

       984
       984
       +
       			t.Errorf("Expected error when User B tries to update User A's comment, got nil")

     

       985
       985
       +
       		} else if err != comments.ErrNotAuthorized {

     

       986
       986
       +
       			t.Errorf("Expected ErrNotAuthorized, got: %v", err)

     

       987
       987
       +
       		} else {

     

       988
       988
       +
       			t.Logf("✅ Correctly rejected: User B cannot update User A's comment")

     

       989
       989
       +
       		}

     

       990
       990
       +
       	})

     

       991
       991
       +
       

     

       992
       992
       +
       	t.Run("user cannot delete another user's comment", func(t *testing.T) {

     

       993
       993
       +
       		// User A creates a comment

     

       994
       994
       +
       		parsedDIDA, parseErr := syntax.ParseDID(userADID)

     

       995
       995
       +
       		if parseErr != nil {

     

       996
       996
       +
       			t.Fatalf("Failed to parse DID A: %v", parseErr)

     

       997
       997
       +
       		}

     

       998
       998
       +
       		sessionA, sessionErr := mockStore.GetSession(ctx, parsedDIDA, "session-"+userADID)

     

       999
       999
       +
       		if sessionErr != nil {

     

       1000
       1000
       +
       			t.Fatalf("Failed to get session A: %v", sessionErr)

     

       1001
       1001
       +
       		}

     

       1002
       1002
       +
       

     

       1003
       1003
       +
       		commentReq := comments.CreateCommentRequest{

     

       1004
       1004
       +
       			Reply: comments.ReplyRef{

     

       1005
       1005
       +
       				Root:   comments.StrongRef{URI: postURI, CID: postCID},

     

       1006
       1006
       +
       				Parent: comments.StrongRef{URI: postURI, CID: postCID},

     

       1007
       1007
       +
       			},

     

       1008
       1008
       +
       			Content: "User A's comment for delete test",

     

       1009
       1009
       +
       			Langs:   []string{"en"},

     

       1010
       1010
       +
       		}

     

       1011
       1011
       +
       

     

       1012
       1012
       +
       		commentResp, err := commentService.CreateComment(ctx, sessionA, commentReq)

     

       1013
       1013
       +
       		if err != nil {

     

       1014
       1014
       +
       			t.Fatalf("User A failed to create comment: %v", err)

     

       1015
       1015
       +
       		}

     

       1016
       1016
       +
       		t.Logf("User A created comment: %s", commentResp.URI)

     

       1017
       1017
       +
       

     

       1018
       1018
       +
       		// User B tries to delete User A's comment

     

       1019
       1019
       +
       		parsedDIDB, parseErr := syntax.ParseDID(userBDID)

     

       1020
       1020
       +
       		if parseErr != nil {

     

       1021
       1021
       +
       			t.Fatalf("Failed to parse DID B: %v", parseErr)

     

       1022
       1022
       +
       		}

     

       1023
       1023
       +
       		sessionB, sessionErr := mockStore.GetSession(ctx, parsedDIDB, "session-"+userBDID)

     

       1024
       1024
       +
       		if sessionErr != nil {

     

       1025
       1025
       +
       			t.Fatalf("Failed to get session B: %v", sessionErr)

     

       1026
       1026
       +
       		}

     

       1027
       1027
       +
       

     

       1028
       1028
       +
       		deleteReq := comments.DeleteCommentRequest{

     

       1029
       1029
       +
       			URI: commentResp.URI,

     

       1030
       1030
       +
       		}

     

       1031
       1031
       +
       

     

       1032
       1032
       +
       		err = commentService.DeleteComment(ctx, sessionB, deleteReq)

     

       1033
       1033
       +
       		if err == nil {

     

       1034
       1034
       +
       			t.Errorf("Expected error when User B tries to delete User A's comment, got nil")

     

       1035
       1035
       +
       		} else if err != comments.ErrNotAuthorized {

     

       1036
       1036
       +
       			t.Errorf("Expected ErrNotAuthorized, got: %v", err)

     

       1037
       1037
       +
       		} else {

     

       1038
       1038
       +
       			t.Logf("✅ Correctly rejected: User B cannot delete User A's comment")

     

       1039
       1039
       +
       		}

     

       1040
       1040
       +
       	})

     

       1041
       1041
       +
       }

     

       1042
       1042
       +
       

     

       1043
       1043
       +
       // TestCommentE2E_ValidationErrors tests that validation errors are properly returned

     

       1044
       1044
       +
       func TestCommentE2E_ValidationErrors(t *testing.T) {

     

       1045
       1045
       +
       	if testing.Short() {

     

       1046
       1046
       +
       		t.Skip("Skipping E2E test in short mode")

     

       1047
       1047
       +
       	}

     

       1048
       1048
       +
       

     

       1049
       1049
       +
       	// Setup test database

     

       1050
       1050
       +
       	dbURL := os.Getenv("TEST_DATABASE_URL")

     

       1051
       1051
       +
       	if dbURL == "" {

     

       1052
       1052
       +
       		dbURL = "postgres://test_user:test_password@localhost:5434/coves_test?sslmode=disable"

     

       1053
       1053
       +
       	}

     

       1054
       1054
       +
       

     

       1055
       1055
       +
       	db, err := sql.Open("postgres", dbURL)

     

       1056
       1056
       +
       	if err != nil {

     

       1057
       1057
       +
       		t.Fatalf("Failed to connect to test database: %v", err)

     

       1058
       1058
       +
       	}

     

       1059
       1059
       +
       	defer func() { _ = db.Close() }()

     

       1060
       1060
       +
       

     

       1061
       1061
       +
       	if dialectErr := goose.SetDialect("postgres"); dialectErr != nil {

     

       1062
       1062
       +
       		t.Fatalf("Failed to set goose dialect: %v", dialectErr)

     

       1063
       1063
       +
       	}

     

       1064
       1064
       +
       	if migrateErr := goose.Up(db, "../../internal/db/migrations"); migrateErr != nil {

     

       1065
       1065
       +
       		t.Fatalf("Failed to run migrations: %v", migrateErr)

     

       1066
       1066
       +
       	}

     

       1067
       1067
       +
       

     

       1068
       1068
       +
       	pdsURL := getTestPDSURL()

     

       1069
       1069
       +
       	healthResp, err := http.Get(pdsURL + "/xrpc/_health")

     

       1070
       1070
       +
       	if err != nil {

     

       1071
       1071
       +
       		t.Skipf("PDS not running at %s: %v", pdsURL, err)

     

       1072
       1072
       +
       	}

     

       1073
       1073
       +
       	_ = healthResp.Body.Close()

     

       1074
       1074
       +
       

     

       1075
       1075
       +
       	ctx := context.Background()

     

       1076
       1076
       +
       

     

       1077
       1077
       +
       	commentRepo := postgres.NewCommentRepository(db)

     

       1078
       1078
       +
       	postRepo := postgres.NewPostRepository(db)

     

       1079
       1079
       +
       

     

       1080
       1080
       +
       	// Create test user on PDS

     

       1081
       1081
       +
       	testUserHandle := fmt.Sprintf("valtest%d.local.coves.dev", time.Now().UnixNano()%1000000)

     

       1082
       1082
       +
       	testUserEmail := fmt.Sprintf("valtest%d@test.local", time.Now().UnixNano()%1000000)

     

       1083
       1083
       +
       	testUserPassword := "test-password-123"

     

       1084
       1084
       +
       

     

       1085
       1085
       +
       	pdsAccessToken, userDID, err := createPDSAccount(pdsURL, testUserHandle, testUserEmail, testUserPassword)

     

       1086
       1086
       +
       	if err != nil {

     

       1087
       1087
       +
       		t.Fatalf("Failed to create test user on PDS: %v", err)

     

       1088
       1088
       +
       	}

     

       1089
       1089
       +
       

     

       1090
       1090
       +
       	testUser := createTestUser(t, db, testUserHandle, userDID)

     

       1091
       1091
       +
       

     

       1092
       1092
       +
       	testCommunityDID, err := createFeedTestCommunity(db, ctx, "val-test-community", "owner.test")

     

       1093
       1093
       +
       	if err != nil {

     

       1094
       1094
       +
       		t.Fatalf("Failed to create test community: %v", err)

     

       1095
       1095
       +
       	}

     

       1096
       1096
       +
       

     

       1097
       1097
       +
       	postURI := createTestPost(t, db, testCommunityDID, testUser.DID, "Validation Test Post", 0, time.Now())

     

       1098
       1098
       +
       	postCID := "bafypostvaltest"

     

       1099
       1099
       +
       

     

       1100
       1100
       +
       	commentPDSFactory := func(ctx context.Context, session *oauthlib.ClientSessionData) (pds.Client, error) {

     

       1101
       1101
       +
       		if session.AccessToken == "" {

     

       1102
       1102
       +
       			return nil, fmt.Errorf("session has no access token")

     

       1103
       1103
       +
       		}

     

       1104
       1104
       +
       		return pds.NewFromAccessToken(session.HostURL, session.AccountDID.String(), session.AccessToken)

     

       1105
       1105
       +
       	}

     

       1106
       1106
       +
       

     

       1107
       1107
       +
       	commentService := comments.NewCommentServiceWithPDSFactory(

     

       1108
       1108
       +
       		commentRepo,

     

       1109
       1109
       +
       		nil,

     

       1110
       1110
       +
       		postRepo,

     

       1111
       1111
       +
       		nil,

     

       1112
       1112
       +
       		nil,

     

       1113
       1113
       +
       		commentPDSFactory,

     

       1114
       1114
       +
       	)

     

       1115
       1115
       +
       

     

       1116
       1116
       +
       	mockStore := NewMockOAuthStore()

     

       1117
       1117
       +
       	mockStore.AddSessionWithPDS(userDID, "session-"+userDID, pdsAccessToken, pdsURL)

     

       1118
       1118
       +
       

     

       1119
       1119
       +
       	parsedDID, parseErr := syntax.ParseDID(userDID)

     

       1120
       1120
       +
       	if parseErr != nil {

     

       1121
       1121
       +
       		t.Fatalf("Failed to parse DID: %v", parseErr)

     

       1122
       1122
       +
       	}

     

       1123
       1123
       +
       	session, sessionErr := mockStore.GetSession(ctx, parsedDID, "session-"+userDID)

     

       1124
       1124
       +
       	if sessionErr != nil {

     

       1125
       1125
       +
       		t.Fatalf("Failed to get session: %v", sessionErr)

     

       1126
       1126
       +
       	}

     

       1127
       1127
       +
       

     

       1128
       1128
       +
       	t.Run("empty content returns ErrContentEmpty", func(t *testing.T) {

     

       1129
       1129
       +
       		commentReq := comments.CreateCommentRequest{

     

       1130
       1130
       +
       			Reply: comments.ReplyRef{

     

       1131
       1131
       +
       				Root:   comments.StrongRef{URI: postURI, CID: postCID},

     

       1132
       1132
       +
       				Parent: comments.StrongRef{URI: postURI, CID: postCID},

     

       1133
       1133
       +
       			},

     

       1134
       1134
       +
       			Content: "",

     

       1135
       1135
       +
       			Langs:   []string{"en"},

     

       1136
       1136
       +
       		}

     

       1137
       1137
       +
       

     

       1138
       1138
       +
       		_, err := commentService.CreateComment(ctx, session, commentReq)

     

       1139
       1139
       +
       		if err == nil {

     

       1140
       1140
       +
       			t.Errorf("Expected error for empty content, got nil")

     

       1141
       1141
       +
       		} else if err != comments.ErrContentEmpty {

     

       1142
       1142
       +
       			t.Errorf("Expected ErrContentEmpty, got: %v", err)

     

       1143
       1143
       +
       		} else {

     

       1144
       1144
       +
       			t.Logf("✅ Correctly rejected: empty content returns ErrContentEmpty")

     

       1145
       1145
       +
       		}

     

       1146
       1146
       +
       	})

     

       1147
       1147
       +
       

     

       1148
       1148
       +
       	t.Run("whitespace-only content returns ErrContentEmpty", func(t *testing.T) {

     

       1149
       1149
       +
       		commentReq := comments.CreateCommentRequest{

     

       1150
       1150
       +
       			Reply: comments.ReplyRef{

     

       1151
       1151
       +
       				Root:   comments.StrongRef{URI: postURI, CID: postCID},

     

       1152
       1152
       +
       				Parent: comments.StrongRef{URI: postURI, CID: postCID},

     

       1153
       1153
       +
       			},

     

       1154
       1154
       +
       			Content: "   \t\n   ",

     

       1155
       1155
       +
       			Langs:   []string{"en"},

     

       1156
       1156
       +
       		}

     

       1157
       1157
       +
       

     

       1158
       1158
       +
       		_, err := commentService.CreateComment(ctx, session, commentReq)

     

       1159
       1159
       +
       		if err == nil {

     

       1160
       1160
       +
       			t.Errorf("Expected error for whitespace-only content, got nil")

     

       1161
       1161
       +
       		} else if err != comments.ErrContentEmpty {

     

       1162
       1162
       +
       			t.Errorf("Expected ErrContentEmpty, got: %v", err)

     

       1163
       1163
       +
       		} else {

     

       1164
       1164
       +
       			t.Logf("✅ Correctly rejected: whitespace-only content returns ErrContentEmpty")

     

       1165
       1165
       +
       		}

     

       1166
       1166
       +
       	})

     

       1167
       1167
       +
       

     

       1168
       1168
       +
       	t.Run("invalid reply reference returns ErrInvalidReply", func(t *testing.T) {

     

       1169
       1169
       +
       		commentReq := comments.CreateCommentRequest{

     

       1170
       1170
       +
       			Reply: comments.ReplyRef{

     

       1171
       1171
       +
       				Root:   comments.StrongRef{URI: "", CID: ""},

     

       1172
       1172
       +
       				Parent: comments.StrongRef{URI: "", CID: ""},

     

       1173
       1173
       +
       			},

     

       1174
       1174
       +
       			Content: "Valid content",

     

       1175
       1175
       +
       			Langs:   []string{"en"},

     

       1176
       1176
       +
       		}

     

       1177
       1177
       +
       

     

       1178
       1178
       +
       		_, err := commentService.CreateComment(ctx, session, commentReq)

     

       1179
       1179
       +
       		if err == nil {

     

       1180
       1180
       +
       			t.Errorf("Expected error for invalid reply, got nil")

     

       1181
       1181
       +
       		} else if err != comments.ErrInvalidReply {

     

       1182
       1182
       +
       			t.Errorf("Expected ErrInvalidReply, got: %v", err)

     

       1183
       1183
       +
       		} else {

     

       1184
       1184
       +
       			t.Logf("✅ Correctly rejected: invalid reply returns ErrInvalidReply")

     

       1185
       1185
       +
       		}

     

       1186
       1186
       +
       	})

     

       1187
       1187
       +
       }

     

       1188
       1188
       +

+381

tests/integration/community_update_e2e_test.go

···

       1
       1
       +
       package integration

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"Coves/internal/atproto/identity"

     

       5
       5
       +
       	"Coves/internal/atproto/jetstream"

     

       6
       6
       +
       	"Coves/internal/core/communities"

     

       7
       7
       +
       	"Coves/internal/db/postgres"

     

       8
       8
       +
       	"context"

     

       9
       9
       +
       	"database/sql"

     

       10
       10
       +
       	"fmt"

     

       11
       11
       +
       	"net"

     

       12
       12
       +
       	"net/http"

     

       13
       13
       +
       	"os"

     

       14
       14
       +
       	"strings"

     

       15
       15
       +
       	"testing"

     

       16
       16
       +
       	"time"

     

       17
       17
       +
       

     

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

     

       19
       19
       +
       	_ "github.com/lib/pq"

     

       20
       20
       +
       	"github.com/pressly/goose/v3"

     

       21
       21
       +
       )

     

       22
       22
       +
       

     

       23
       23
       +
       // TestCommunityUpdateE2E_WithJetstream tests the FULL community update flow with REAL Jetstream

     

       24
       24
       +
       // Flow: Service.UpdateCommunity() → PDS putRecord → REAL Jetstream Firehose → Consumer → AppView DB

     

       25
       25
       +
       //

     

       26
       26
       +
       // This is a TRUE E2E test - no simulated Jetstream events!

     

       27
       27
       +
       func TestCommunityUpdateE2E_WithJetstream(t *testing.T) {

     

       28
       28
       +
       	if testing.Short() {

     

       29
       29
       +
       		t.Skip("Skipping E2E test in short mode")

     

       30
       30
       +
       	}

     

       31
       31
       +
       

     

       32
       32
       +
       	// Setup test database

     

       33
       33
       +
       	dbURL := os.Getenv("TEST_DATABASE_URL")

     

       34
       34
       +
       	if dbURL == "" {

     

       35
       35
       +
       		dbURL = "postgres://test_user:test_password@localhost:5434/coves_test?sslmode=disable"

     

       36
       36
       +
       	}

     

       37
       37
       +
       

     

       38
       38
       +
       	db, err := sql.Open("postgres", dbURL)

     

       39
       39
       +
       	if err != nil {

     

       40
       40
       +
       		t.Fatalf("Failed to connect to test database: %v", err)

     

       41
       41
       +
       	}

     

       42
       42
       +
       	defer func() { _ = db.Close() }()

     

       43
       43
       +
       

     

       44
       44
       +
       	// Run migrations

     

       45
       45
       +
       	if dialectErr := goose.SetDialect("postgres"); dialectErr != nil {

     

       46
       46
       +
       		t.Fatalf("Failed to set goose dialect: %v", dialectErr)

     

       47
       47
       +
       	}

     

       48
       48
       +
       	if migrateErr := goose.Up(db, "../../internal/db/migrations"); migrateErr != nil {

     

       49
       49
       +
       		t.Fatalf("Failed to run migrations: %v", migrateErr)

     

       50
       50
       +
       	}

     

       51
       51
       +
       

     

       52
       52
       +
       	// Check if PDS is running

     

       53
       53
       +
       	pdsURL := os.Getenv("PDS_URL")

     

       54
       54
       +
       	if pdsURL == "" {

     

       55
       55
       +
       		pdsURL = "http://localhost:3001"

     

       56
       56
       +
       	}

     

       57
       57
       +
       

     

       58
       58
       +
       	healthResp, err := http.Get(pdsURL + "/xrpc/_health")

     

       59
       59
       +
       	if err != nil {

     

       60
       60
       +
       		t.Skipf("PDS not running at %s: %v. Run 'make dev-up' to start.", pdsURL, err)

     

       61
       61
       +
       	}

     

       62
       62
       +
       	_ = healthResp.Body.Close()

     

       63
       63
       +
       

     

       64
       64
       +
       	// Check if Jetstream is running

     

       65
       65
       +
       	pdsHostname := strings.TrimPrefix(pdsURL, "http://")

     

       66
       66
       +
       	pdsHostname = strings.TrimPrefix(pdsHostname, "https://")

     

       67
       67
       +
       	pdsHostname = strings.Split(pdsHostname, ":")[0]

     

       68
       68
       +
       	jetstreamURL := fmt.Sprintf("ws://%s:6008/subscribe?wantedCollections=social.coves.community.profile", pdsHostname)

     

       69
       69
       +
       

     

       70
       70
       +
       	testConn, _, err := websocket.DefaultDialer.Dial(jetstreamURL, nil)

     

       71
       71
       +
       	if err != nil {

     

       72
       72
       +
       		t.Skipf("Jetstream not running at %s: %v. Run 'docker-compose --profile jetstream up' to start.", jetstreamURL, err)

     

       73
       73
       +
       	}

     

       74
       74
       +
       	_ = testConn.Close()

     

       75
       75
       +
       

     

       76
       76
       +
       	ctx := context.Background()

     

       77
       77
       +
       	instanceDID := "did:web:coves.social"

     

       78
       78
       +
       

     

       79
       79
       +
       	// Setup identity resolver with local PLC

     

       80
       80
       +
       	plcURL := os.Getenv("PLC_DIRECTORY_URL")

     

       81
       81
       +
       	if plcURL == "" {

     

       82
       82
       +
       		plcURL = "http://localhost:3002" // Local PLC directory

     

       83
       83
       +
       	}

     

       84
       84
       +
       	identityConfig := identity.DefaultConfig()

     

       85
       85
       +
       	identityConfig.PLCURL = plcURL

     

       86
       86
       +
       	identityResolver := identity.NewResolver(db, identityConfig)

     

       87
       87
       +
       

     

       88
       88
       +
       	// Setup services

     

       89
       89
       +
       	communityRepo := postgres.NewCommunityRepository(db)

     

       90
       90
       +
       	provisioner := communities.NewPDSAccountProvisioner("coves.social", pdsURL)

     

       91
       91
       +
       	communityService := communities.NewCommunityService(

     

       92
       92
       +
       		communityRepo,

     

       93
       93
       +
       		pdsURL,

     

       94
       94
       +
       		instanceDID,

     

       95
       95
       +
       		"coves.social",

     

       96
       96
       +
       		provisioner,

     

       97
       97
       +
       	)

     

       98
       98
       +
       

     

       99
       99
       +
       	consumer := jetstream.NewCommunityEventConsumer(communityRepo, instanceDID, true, identityResolver)

     

       100
       100
       +
       

     

       101
       101
       +
       	t.Run("update community with real Jetstream indexing", func(t *testing.T) {

     

       102
       102
       +
       		// First, create a community

     

       103
       103
       +
       		uniqueName := fmt.Sprintf("upd%d", time.Now().UnixNano()%1000000)

     

       104
       104
       +
       		creatorDID := "did:plc:jetstream-update-test"

     

       105
       105
       +
       

     

       106
       106
       +
       		t.Logf("\n📝 Creating community on PDS...")

     

       107
       107
       +
       		community, err := communityService.CreateCommunity(ctx, communities.CreateCommunityRequest{

     

       108
       108
       +
       			Name:                   uniqueName,

     

       109
       109
       +
       			DisplayName:            "Original Display Name",

     

       110
       110
       +
       			Description:            "Original description before update",

     

       111
       111
       +
       			Visibility:             "public",

     

       112
       112
       +
       			CreatedByDID:           creatorDID,

     

       113
       113
       +
       			HostedByDID:            instanceDID,

     

       114
       114
       +
       			AllowExternalDiscovery: true,

     

       115
       115
       +
       		})

     

       116
       116
       +
       		if err != nil {

     

       117
       117
       +
       			t.Fatalf("Failed to create community: %v", err)

     

       118
       118
       +
       		}

     

       119
       119
       +
       

     

       120
       120
       +
       		t.Logf("✅ Community created on PDS:")

     

       121
       121
       +
       		t.Logf("   DID: %s", community.DID)

     

       122
       122
       +
       		t.Logf("   RecordCID: %s", community.RecordCID)

     

       123
       123
       +
       

     

       124
       124
       +
       		// Verify community is indexed (the service indexes it synchronously on create)

     

       125
       125
       +
       		t.Logf("\n🔄 Checking community is indexed...")

     

       126
       126
       +
       		indexed, err := communityService.GetCommunity(ctx, community.DID)

     

       127
       127
       +
       		if err != nil {

     

       128
       128
       +
       			t.Fatalf("Community not indexed: %v", err)

     

       129
       129
       +
       		}

     

       130
       130
       +
       		t.Logf("✅ Community indexed in AppView: %s", indexed.DisplayName)

     

       131
       131
       +
       

     

       132
       132
       +
       		// Now update the community

     

       133
       133
       +
       		t.Logf("\n📝 Updating community via service...")

     

       134
       134
       +
       

     

       135
       135
       +
       		// Start Jetstream subscription for update event BEFORE calling update

     

       136
       136
       +
       		updateEventChan := make(chan *jetstream.JetstreamEvent, 10)

     

       137
       137
       +
       		updateErrorChan := make(chan error, 1)

     

       138
       138
       +
       		updateDone := make(chan bool)

     

       139
       139
       +
       

     

       140
       140
       +
       		go func() {

     

       141
       141
       +
       			subscribeErr := subscribeToJetstreamForCommunityEvent(ctx, jetstreamURL, community.DID, "update", consumer, updateEventChan, updateDone)

     

       142
       142
       +
       			if subscribeErr != nil {

     

       143
       143
       +
       				updateErrorChan <- subscribeErr

     

       144
       144
       +
       			}

     

       145
       145
       +
       		}()

     

       146
       146
       +
       

     

       147
       147
       +
       		// Give Jetstream a moment to connect

     

       148
       148
       +
       		time.Sleep(500 * time.Millisecond)

     

       149
       149
       +
       

     

       150
       150
       +
       		// Perform the update

     

       151
       151
       +
       		newDisplayName := "Updated via TRUE E2E Test!"

     

       152
       152
       +
       		newDescription := "This description was updated and indexed via real Jetstream firehose"

     

       153
       153
       +
       		newVisibility := "unlisted"

     

       154
       154
       +
       

     

       155
       155
       +
       		updated, err := communityService.UpdateCommunity(ctx, communities.UpdateCommunityRequest{

     

       156
       156
       +
       			CommunityDID:           community.DID,

     

       157
       157
       +
       			UpdatedByDID:           creatorDID,

     

       158
       158
       +
       			DisplayName:            &newDisplayName,

     

       159
       159
       +
       			Description:            &newDescription,

     

       160
       160
       +
       			Visibility:             &newVisibility,

     

       161
       161
       +
       			AllowExternalDiscovery: nil,

     

       162
       162
       +
       		})

     

       163
       163
       +
       		if err != nil {

     

       164
       164
       +
       			t.Fatalf("Failed to update community: %v", err)

     

       165
       165
       +
       		}

     

       166
       166
       +
       

     

       167
       167
       +
       		t.Logf("✅ Community update written to PDS:")

     

       168
       168
       +
       		t.Logf("   New RecordCID: %s (was: %s)", updated.RecordCID, community.RecordCID)

     

       169
       169
       +
       

     

       170
       170
       +
       		// Wait for update event from real Jetstream

     

       171
       171
       +
       		t.Logf("\n⏳ Waiting for update event from Jetstream (max 30 seconds)...")

     

       172
       172
       +
       

     

       173
       173
       +
       		select {

     

       174
       174
       +
       		case event := <-updateEventChan:

     

       175
       175
       +
       			t.Logf("✅ Received REAL update event from Jetstream!")

     

       176
       176
       +
       			t.Logf("   Event DID:    %s", event.Did)

     

       177
       177
       +
       			t.Logf("   Collection:   %s", event.Commit.Collection)

     

       178
       178
       +
       			t.Logf("   Operation:    %s", event.Commit.Operation)

     

       179
       179
       +
       			t.Logf("   RKey:         %s", event.Commit.RKey)

     

       180
       180
       +
       

     

       181
       181
       +
       			// Verify operation type

     

       182
       182
       +
       			if event.Commit.Operation != "update" {

     

       183
       183
       +
       				t.Errorf("Expected operation 'update', got '%s'", event.Commit.Operation)

     

       184
       184
       +
       			}

     

       185
       185
       +
       

     

       186
       186
       +
       			// Verify the update was indexed in AppView

     

       187
       187
       +
       			t.Logf("\n🔍 Verifying update indexed in AppView...")

     

       188
       188
       +
       			indexedUpdated, err := communityService.GetCommunity(ctx, community.DID)

     

       189
       189
       +
       			if err != nil {

     

       190
       190
       +
       				t.Fatalf("Failed to get updated community: %v", err)

     

       191
       191
       +
       			}

     

       192
       192
       +
       

     

       193
       193
       +
       			t.Logf("✅ Update indexed in AppView:")

     

       194
       194
       +
       			t.Logf("   DisplayName: %s", indexedUpdated.DisplayName)

     

       195
       195
       +
       			t.Logf("   Description: %s", indexedUpdated.Description)

     

       196
       196
       +
       			t.Logf("   Visibility:  %s", indexedUpdated.Visibility)

     

       197
       197
       +
       

     

       198
       198
       +
       			// Verify the changes

     

       199
       199
       +
       			if indexedUpdated.DisplayName != newDisplayName {

     

       200
       200
       +
       				t.Errorf("Expected display name '%s', got '%s'", newDisplayName, indexedUpdated.DisplayName)

     

       201
       201
       +
       			}

     

       202
       202
       +
       			if indexedUpdated.Description != newDescription {

     

       203
       203
       +
       				t.Errorf("Expected description '%s', got '%s'", newDescription, indexedUpdated.Description)

     

       204
       204
       +
       			}

     

       205
       205
       +
       			if indexedUpdated.Visibility != newVisibility {

     

       206
       206
       +
       				t.Errorf("Expected visibility '%s', got '%s'", newVisibility, indexedUpdated.Visibility)

     

       207
       207
       +
       			}

     

       208
       208
       +
       

     

       209
       209
       +
       			close(updateDone)

     

       210
       210
       +
       

     

       211
       211
       +
       		case err := <-updateErrorChan:

     

       212
       212
       +
       			t.Fatalf("Jetstream error: %v", err)

     

       213
       213
       +
       

     

       214
       214
       +
       		case <-time.After(30 * time.Second):

     

       215
       215
       +
       			t.Fatalf("Timeout: No update event received from Jetstream within 30 seconds")

     

       216
       216
       +
       		}

     

       217
       217
       +
       

     

       218
       218
       +
       		t.Logf("\n✅ TRUE E2E COMMUNITY UPDATE FLOW COMPLETE:")

     

       219
       219
       +
       		t.Logf("   Service → PDS putRecord → Jetstream Firehose → Consumer → AppView ✓")

     

       220
       220
       +
       	})

     

       221
       221
       +
       

     

       222
       222
       +
       	t.Run("multiple updates with real Jetstream", func(t *testing.T) {

     

       223
       223
       +
       		// This tests that consecutive updates all flow through Jetstream correctly

     

       224
       224
       +
       		uniqueName := fmt.Sprintf("multi%d", time.Now().UnixNano()%1000000)

     

       225
       225
       +
       		creatorDID := "did:plc:multi-update-test"

     

       226
       226
       +
       

     

       227
       227
       +
       		t.Logf("\n📝 Creating community for multi-update test...")

     

       228
       228
       +
       		community, err := communityService.CreateCommunity(ctx, communities.CreateCommunityRequest{

     

       229
       229
       +
       			Name:                   uniqueName,

     

       230
       230
       +
       			DisplayName:            "Multi-Update Test",

     

       231
       231
       +
       			Description:            "Testing multiple updates",

     

       232
       232
       +
       			Visibility:             "public",

     

       233
       233
       +
       			CreatedByDID:           creatorDID,

     

       234
       234
       +
       			HostedByDID:            instanceDID,

     

       235
       235
       +
       			AllowExternalDiscovery: true,

     

       236
       236
       +
       		})

     

       237
       237
       +
       		if err != nil {

     

       238
       238
       +
       			t.Fatalf("Failed to create community: %v", err)

     

       239
       239
       +
       		}

     

       240
       240
       +
       

     

       241
       241
       +
       		// Verify create is indexed (service indexes synchronously on create)

     

       242
       242
       +
       		indexed, err := communityService.GetCommunity(ctx, community.DID)

     

       243
       243
       +
       		if err != nil {

     

       244
       244
       +
       			t.Fatalf("Community not indexed after create: %v", err)

     

       245
       245
       +
       		}

     

       246
       246
       +
       		t.Logf("✅ Create indexed: %s", indexed.DisplayName)

     

       247
       247
       +
       

     

       248
       248
       +
       		// Perform 3 consecutive updates

     

       249
       249
       +
       		for i := 1; i <= 3; i++ {

     

       250
       250
       +
       			t.Logf("\n📝 Update %d of 3...", i)

     

       251
       251
       +
       

     

       252
       252
       +
       			updateEventChan := make(chan *jetstream.JetstreamEvent, 10)

     

       253
       253
       +
       			updateErrorChan := make(chan error, 1)

     

       254
       254
       +
       			updateDone := make(chan bool)

     

       255
       255
       +
       

     

       256
       256
       +
       			go func() {

     

       257
       257
       +
       				subscribeErr := subscribeToJetstreamForCommunityEvent(ctx, jetstreamURL, community.DID, "update", consumer, updateEventChan, updateDone)

     

       258
       258
       +
       				if subscribeErr != nil {

     

       259
       259
       +
       					updateErrorChan <- subscribeErr

     

       260
       260
       +
       				}

     

       261
       261
       +
       			}()

     

       262
       262
       +
       

     

       263
       263
       +
       			time.Sleep(300 * time.Millisecond)

     

       264
       264
       +
       

     

       265
       265
       +
       			newDesc := fmt.Sprintf("Update #%d at %s", i, time.Now().Format(time.RFC3339))

     

       266
       266
       +
       			_, err := communityService.UpdateCommunity(ctx, communities.UpdateCommunityRequest{

     

       267
       267
       +
       				CommunityDID: community.DID,

     

       268
       268
       +
       				UpdatedByDID: creatorDID,

     

       269
       269
       +
       				Description:  &newDesc,

     

       270
       270
       +
       			})

     

       271
       271
       +
       			if err != nil {

     

       272
       272
       +
       				t.Fatalf("Update %d failed: %v", i, err)

     

       273
       273
       +
       			}

     

       274
       274
       +
       

     

       275
       275
       +
       			select {

     

       276
       276
       +
       			case event := <-updateEventChan:

     

       277
       277
       +
       				if event.Commit.Operation != "update" {

     

       278
       278
       +
       					t.Errorf("Expected update operation, got %s", event.Commit.Operation)

     

       279
       279
       +
       				}

     

       280
       280
       +
       				t.Logf("✅ Update %d received via Jetstream", i)

     

       281
       281
       +
       			case err := <-updateErrorChan:

     

       282
       282
       +
       				t.Fatalf("Jetstream error on update %d: %v", i, err)

     

       283
       283
       +
       			case <-time.After(30 * time.Second):

     

       284
       284
       +
       				t.Fatalf("Timeout on update %d", i)

     

       285
       285
       +
       			}

     

       286
       286
       +
       			close(updateDone)

     

       287
       287
       +
       

     

       288
       288
       +
       			// Verify in AppView

     

       289
       289
       +
       			indexed, getErr := communityService.GetCommunity(ctx, community.DID)

     

       290
       290
       +
       			if getErr != nil {

     

       291
       291
       +
       				t.Fatalf("Update %d: failed to get community: %v", i, getErr)

     

       292
       292
       +
       			}

     

       293
       293
       +
       			if indexed.Description != newDesc {

     

       294
       294
       +
       				t.Errorf("Update %d: expected description '%s', got '%s'", i, newDesc, indexed.Description)

     

       295
       295
       +
       			}

     

       296
       296
       +
       		}

     

       297
       297
       +
       

     

       298
       298
       +
       		t.Logf("\n✅ MULTIPLE UPDATES TEST COMPLETE:")

     

       299
       299
       +
       		t.Logf("   3 consecutive updates all indexed via real Jetstream ✓")

     

       300
       300
       +
       	})

     

       301
       301
       +
       }

     

       302
       302
       +
       

     

       303
       303
       +
       // subscribeToJetstreamForCommunityEvent subscribes to real Jetstream for specific community events

     

       304
       304
       +
       func subscribeToJetstreamForCommunityEvent(

     

       305
       305
       +
       	ctx context.Context,

     

       306
       306
       +
       	jetstreamURL string,

     

       307
       307
       +
       	targetDID string,

     

       308
       308
       +
       	operation string, // "create", "update", or "delete"

     

       309
       309
       +
       	consumer *jetstream.CommunityEventConsumer,

     

       310
       310
       +
       	eventChan chan<- *jetstream.JetstreamEvent,

     

       311
       311
       +
       	done <-chan bool,

     

       312
       312
       +
       ) (returnErr error) {

     

       313
       313
       +
       	// Recover from websocket panics during shutdown

     

       314
       314
       +
       	defer func() {

     

       315
       315
       +
       		if r := recover(); r != nil {

     

       316
       316
       +
       			// Panic during shutdown is expected, return nil

     

       317
       317
       +
       			returnErr = nil

     

       318
       318
       +
       		}

     

       319
       319
       +
       	}()

     

       320
       320
       +
       

     

       321
       321
       +
       	conn, _, err := websocket.DefaultDialer.Dial(jetstreamURL, nil)

     

       322
       322
       +
       	if err != nil {

     

       323
       323
       +
       		return fmt.Errorf("failed to connect to Jetstream: %w", err)

     

       324
       324
       +
       	}

     

       325
       325
       +
       	defer func() { _ = conn.Close() }()

     

       326
       326
       +
       

     

       327
       327
       +
       	for {

     

       328
       328
       +
       		select {

     

       329
       329
       +
       		case <-done:

     

       330
       330
       +
       			return nil

     

       331
       331
       +
       		case <-ctx.Done():

     

       332
       332
       +
       			return ctx.Err()

     

       333
       333
       +
       		default:

     

       334
       334
       +
       			if err := conn.SetReadDeadline(time.Now().Add(5 * time.Second)); err != nil {

     

       335
       335
       +
       				return fmt.Errorf("failed to set read deadline: %w", err)

     

       336
       336
       +
       			}

     

       337
       337
       +
       

     

       338
       338
       +
       			var event jetstream.JetstreamEvent

     

       339
       339
       +
       			err := conn.ReadJSON(&event)

     

       340
       340
       +
       			if err != nil {

     

       341
       341
       +
       				// Check done channel first to handle clean shutdown

     

       342
       342
       +
       				select {

     

       343
       343
       +
       				case <-done:

     

       344
       344
       +
       					return nil

     

       345
       345
       +
       				default:

     

       346
       346
       +
       				}

     

       347
       347
       +
       				if websocket.IsCloseError(err, websocket.CloseNormalClosure) {

     

       348
       348
       +
       					return nil

     

       349
       349
       +
       				}

     

       350
       350
       +
       				if netErr, ok := err.(net.Error); ok && netErr.Timeout() {

     

       351
       351
       +
       					continue

     

       352
       352
       +
       				}

     

       353
       353
       +
       				// Check for connection closed errors (happens during shutdown)

     

       354
       354
       +
       				if strings.Contains(err.Error(), "use of closed network connection") ||

     

       355
       355
       +
       					strings.Contains(err.Error(), "failed websocket connection") ||

     

       356
       356
       +
       					strings.Contains(err.Error(), "repeated read on failed websocket") {

     

       357
       357
       +
       					return nil

     

       358
       358
       +
       				}

     

       359
       359
       +
       				return fmt.Errorf("failed to read Jetstream message: %w", err)

     

       360
       360
       +
       			}

     

       361
       361
       +
       

     

       362
       362
       +
       			// Check if this is the event we're looking for

     

       363
       363
       +
       			if event.Did == targetDID && event.Kind == "commit" &&

     

       364
       364
       +
       				event.Commit != nil && event.Commit.Collection == "social.coves.community.profile" &&

     

       365
       365
       +
       				event.Commit.Operation == operation {

     

       366
       366
       +
       

     

       367
       367
       +
       				// Process through consumer to index in AppView

     

       368
       368
       +
       				if err := consumer.HandleEvent(ctx, &event); err != nil {

     

       369
       369
       +
       					return fmt.Errorf("failed to process event: %w", err)

     

       370
       370
       +
       				}

     

       371
       371
       +
       

     

       372
       372
       +
       				select {

     

       373
       373
       +
       				case eventChan <- &event:

     

       374
       374
       +
       					return nil

     

       375
       375
       +
       				case <-time.After(1 * time.Second):

     

       376
       376
       +
       					return fmt.Errorf("timeout sending event to channel")

     

       377
       377
       +
       				}

     

       378
       378
       +
       			}

     

       379
       379
       +
       		}

     

       380
       380
       +
       	}

     

       381
       381
       +
       }

+1 -1

internal/api/handlers/community/create_test.go

···

       23
       23
        
       	}

     

       24
       24
        
       	return &communities.Community{

     

       25
       25
        
       		DID:         "did:plc:test123",

     

       26
       26
       -
       		Handle:      "test.community.coves.social",

     

       26
       26
       +
       		Handle:      "c-test.coves.social",

     

       27
       27
        
       		RecordURI:   "at://did:plc:test123/social.coves.community.profile/self",

     

       28
       28
        
       		RecordCID:   "bafytest123",

     

       29
       29
        
       		DisplayName: req.DisplayName,

+43 -12

internal/atproto/jetstream/community_consumer.go

···

       50
       50
        
       	cache, err := lru.New[string, cachedDIDDoc](1000)

     

       51
       51
        
       	if err != nil {

     

       52
       52
        
       		// This should never happen with a valid size, but handle gracefully

     

       53
       53
       -
       		log.Printf("WARNING: Failed to create DID cache, verification will be slower: %v", err)

     

       53
       53
       +
       		log.Printf("WARNING: Failed to create DID cache (size=1000), verification will be slower: %v", err)

     

       54
       54
        
       		// Create minimal cache to avoid nil pointer

     

       55
       55
       -
       		cache, _ = lru.New[string, cachedDIDDoc](1)

     

       55
       55
       +
       		cache, fallbackErr := lru.New[string, cachedDIDDoc](1)

     

       56
       56
       +
       		if fallbackErr != nil {

     

       57
       57
       +
       			// Both attempts failed - this indicates a serious issue with the LRU library

     

       58
       58
       +
       			log.Printf("CRITICAL: Failed to create fallback DID cache (size=1): %v", fallbackErr)

     

       59
       59
       +
       			panic(fmt.Sprintf("cannot create LRU cache: primary error=%v, fallback error=%v", err, fallbackErr))

     

       60
       60
       +
       		}

     

       61
       61
       +
       		return &CommunityEventConsumer{

     

       62
       62
       +
       			repo:             repo,

     

       63
       63
       +
       			identityResolver: identityResolver,

     

       64
       64
       +
       			instanceDID:      instanceDID,

     

       65
       65
       +
       			skipVerification: skipVerification,

     

       66
       66
       +
       			httpClient: &http.Client{

     

       67
       67
       +
       				Timeout: 10 * time.Second,

     

       68
       68
       +
       				Transport: &http.Transport{

     

       69
       69
       +
       					MaxIdleConns:        100,

     

       70
       70
       +
       					MaxIdleConnsPerHost: 10,

     

       71
       71
       +
       					IdleConnTimeout:     90 * time.Second,

     

       72
       72
       +
       				},

     

       73
       73
       +
       			},

     

       74
       74
       +
       			didCache:         cache,

     

       75
       75
       +
       			wellKnownLimiter: rate.NewLimiter(10, 20),

     

       76
       76
       +
       		}

     

       56
       77
        
       	}

     

       57
       78
        
       

     

       58
       79
        
       	return &CommunityEventConsumer{

     
···

       219
       240
        
       	// Handle description facets (rich text)

     

       220
       241
        
       	if profile.DescriptionFacets != nil {

     

       221
       242
        
       		facetsJSON, marshalErr := json.Marshal(profile.DescriptionFacets)

     

       222
       222
       -
       		if marshalErr == nil {

     

       243
       243
       +
       		if marshalErr != nil {

     

       244
       244
       +
       			log.Printf("WARNING: Failed to marshal description facets for community %s: %v (facets will be omitted)", did, marshalErr)

     

       245
       245
       +
       		} else {

     

       223
       246
        
       			community.DescriptionFacets = facetsJSON

     

       224
       247
        
       		}

     

       225
       248
        
       	}

     
···

       508
       531
        
       // extractDomainFromHandle extracts the registrable domain from a community handle

     

       509
       532
        
       // Handles both formats:

     

       510
       533
        
       //   - Bluesky-style: "!gaming@coves.social" → "coves.social"

     

       511
       511
       -
       //   - DNS-style: "gaming.community.coves.social" → "coves.social"

     

       534
       534
       +
       //   - DNS-style: "c-gaming.coves.social" → "coves.social"

     

       512
       535
        
       //

     

       513
       536
        
       // Uses golang.org/x/net/publicsuffix to correctly handle multi-part TLDs:

     

       514
       514
       -
       //   - "gaming.community.coves.co.uk" → "coves.co.uk" (not "co.uk")

     

       515
       515
       -
       //   - "gaming.community.example.com.au" → "example.com.au" (not "com.au")

     

       537
       537
       +
       //   - "c-gaming.coves.co.uk" → "coves.co.uk" (not "co.uk")

     

       538
       538
       +
       //   - "c-gaming.example.com.au" → "example.com.au" (not "com.au")

     

       516
       539
        
       func extractDomainFromHandle(handle string) string {

     

       517
       540
        
       	// Remove leading ! if present

     

       518
       541
        
       	handle = strings.TrimPrefix(handle, "!")

     
···

       527
       550
        
       			if err != nil {

     

       528
       551
        
       				// If publicsuffix fails, fall back to returning the full domain part

     

       529
       552
        
       				// This handles edge cases like localhost, IP addresses, etc.

     

       553
       553
       +
       				log.Printf("DEBUG: publicsuffix failed for @-format handle domain %q, using raw domain: %v", domain, err)

     

       530
       554
        
       				return domain

     

       531
       555
        
       			}

     

       532
       556
        
       			return registrable

     
···

       534
       558
        
       		return ""

     

       535
       559
        
       	}

     

       536
       560
        
       

     

       537
       537
       -
       	// For DNS-style handles (e.g., "gaming.community.coves.social")

     

       561
       561
       +
       	// For DNS-style handles (e.g., "c-gaming.coves.social")

     

       538
       562
        
       	// Extract the registrable domain (eTLD+1) using publicsuffix

     

       539
       563
        
       	// This correctly handles multi-part TLDs like .co.uk, .com.au, etc.

     

       540
       564
        
       	registrable, err := publicsuffix.EffectiveTLDPlusOne(handle)

     

       541
       565
        
       	if err != nil {

     

       542
       566
        
       		// If publicsuffix fails (e.g., invalid TLD, localhost, IP address)

     

       543
       567
        
       		// fall back to naive extraction (last 2 parts)

     

       544
       544
       -
       		// This maintains backward compatibility for edge cases

     

       568
       568
       +
       		// WARNING: This is incorrect for multi-part TLDs (.co.uk -> would return "co.uk")

     

       569
       569
       +
       		// but maintains compatibility for localhost/dev environments

     

       545
       570
        
       		parts := strings.Split(handle, ".")

     

       546
       571
        
       		if len(parts) < 2 {

     

       572
       572
       +
       			log.Printf("DEBUG: Invalid handle format (no dots): %q", handle)

     

       547
       573
        
       			return "" // Invalid handle

     

       548
       574
        
       		}

     

       549
       549
       -
       		return strings.Join(parts[len(parts)-2:], ".")

     

       575
       575
       +
       		fallbackDomain := strings.Join(parts[len(parts)-2:], ".")

     

       576
       576
       +
       		log.Printf("DEBUG: publicsuffix failed for handle %q, using naive fallback: %q (error: %v)", handle, fallbackDomain, err)

     

       577
       577
       +
       		return fallbackDomain

     

       550
       578
        
       	}

     

       551
       579
        
       

     

       552
       580
        
       	return registrable

     
···

       788
       816
        
       }

     

       789
       817
        
       

     

       790
       818
        
       // constructHandleFromProfile constructs a deterministic handle from profile data

     

       791
       791
       -
       // Format: {name}.community.{instanceDomain}

     

       792
       792
       -
       // Example: gaming.community.coves.social

     

       819
       819
       +
       // Format: c-{name}.{instanceDomain}

     

       820
       820
       +
       // Example: c-gaming.coves.social

     

       793
       821
        
       // This is ONLY used in test mode (when identity resolver is nil)

     

       794
       822
        
       // Production MUST resolve handles from PLC (source of truth)

     

       795
       823
        
       // Returns empty string if hostedBy is not did:web format (caller will fail validation)

     

       796
       824
        
       func constructHandleFromProfile(profile *CommunityProfile) string {

     

       797
       825
        
       	if !strings.HasPrefix(profile.HostedBy, "did:web:") {

     

       798
       826
        
       		// hostedBy must be did:web format for handle construction

     

       827
       827
       +
       		// Log warning since this indicates invalid community data

     

       828
       828
       +
       		log.Printf("WARNING: constructHandleFromProfile: hostedBy %q is not did:web format, cannot construct handle for community %q",

     

       829
       829
       +
       			profile.HostedBy, profile.Name)

     

       799
       830
        
       		// Return empty to trigger validation error in repository

     

       800
       831
        
       		return ""

     

       801
       832
        
       	}

     

       802
       833
        
       	instanceDomain := strings.TrimPrefix(profile.HostedBy, "did:web:")

     

       803
       803
       -
       	return fmt.Sprintf("%s.community.%s", profile.Name, instanceDomain)

     

       834
       834
       +
       	return fmt.Sprintf("c-%s.%s", profile.Name, instanceDomain)

     

       804
       835
        
       }

     

       805
       836
        
       

     

       806
       837
        
       // extractContentVisibility extracts contentVisibility from subscription record with clamping

+6 -6

internal/core/comments/comment_service_test.go

···

       458
       458
        
       	author := createTestUser(authorDID, "author.test")

     

       459
       459
        
       	_, _ = userRepo.Create(context.Background(), author)

     

       460
       460
        
       

     

       461
       461
       -
       	community := createTestCommunity(communityDID, "test.community.coves.social")

     

       461
       461
       +
       	community := createTestCommunity(communityDID, "c-test.coves.social")

     

       462
       462
        
       	_, _ = communityRepo.Create(context.Background(), community)

     

       463
       463
        
       

     

       464
       464
        
       	comment1 := createTestComment("at://did:plc:commenter123/comment/1", commenterDID, "commenter.test", postURI, postURI, 0)

     
···

       579
       579
        
       	author := createTestUser(authorDID, "author.test")

     

       580
       580
        
       	_, _ = userRepo.Create(context.Background(), author)

     

       581
       581
        
       

     

       582
       582
       -
       	community := createTestCommunity(communityDID, "test.community.coves.social")

     

       582
       582
       +
       	community := createTestCommunity(communityDID, "c-test.coves.social")

     

       583
       583
        
       	_, _ = communityRepo.Create(context.Background(), community)

     

       584
       584
        
       

     

       585
       585
        
       	commentRepo.listByParentWithHotRankFunc = func(ctx context.Context, parentURI, sort, timeframe string, limit int, cursor *string) ([]*Comment, *string, error) {

     
···

       625
       625
        
       	author := createTestUser(authorDID, "author.test")

     

       626
       626
        
       	_, _ = userRepo.Create(context.Background(), author)

     

       627
       627
        
       

     

       628
       628
       -
       	community := createTestCommunity(communityDID, "test.community.coves.social")

     

       628
       628
       +
       	community := createTestCommunity(communityDID, "c-test.coves.social")

     

       629
       629
        
       	_, _ = communityRepo.Create(context.Background(), community)

     

       630
       630
        
       

     

       631
       631
        
       	comment1URI := "at://did:plc:commenter123/comment/1"

     
···

       694
       694
        
       	author := createTestUser(authorDID, "author.test")

     

       695
       695
        
       	_, _ = userRepo.Create(context.Background(), author)

     

       696
       696
        
       

     

       697
       697
       -
       	community := createTestCommunity(communityDID, "test.community.coves.social")

     

       697
       697
       +
       	community := createTestCommunity(communityDID, "c-test.coves.social")

     

       698
       698
        
       	_, _ = communityRepo.Create(context.Background(), community)

     

       699
       699
        
       

     

       700
       700
        
       	comment1 := createTestComment("at://did:plc:commenter123/comment/1", commenterDID, "commenter.test", postURI, postURI, 0)

     
···

       762
       762
        
       				author := createTestUser(authorDID, "author.test")

     

       763
       763
        
       				_, _ = userRepo.Create(context.Background(), author)

     

       764
       764
        
       

     

       765
       765
       -
       				community := createTestCommunity(communityDID, "test.community.coves.social")

     

       765
       765
       +
       				community := createTestCommunity(communityDID, "c-test.coves.social")

     

       766
       766
        
       				_, _ = communityRepo.Create(context.Background(), community)

     

       767
       767
        
       

     

       768
       768
        
       				comment1 := createTestComment("at://did:plc:commenter123/comment/1", commenterDID, "commenter.test", postURI, postURI, 0)

     
···

       813
       813
        
       	author := createTestUser(authorDID, "author.test")

     

       814
       814
        
       	_, _ = userRepo.Create(context.Background(), author)

     

       815
       815
        
       

     

       816
       816
       -
       	community := createTestCommunity(communityDID, "test.community.coves.social")

     

       816
       816
       +
       	community := createTestCommunity(communityDID, "c-test.coves.social")

     

       817
       817
        
       	_, _ = communityRepo.Create(context.Background(), community)

     

       818
       818
        
       

     

       819
       819
        
       	// Mock repository error

+23 -13

internal/core/communities/community.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"fmt"

     

       5
       5
       +
       	"log"

     

       5
       6
        
       	"strings"

     

       6
       7
        
       	"time"

     

       7
       8
        
       )

     
···

       141
       142
        
       

     

       142
       143
        
       // GetDisplayHandle returns the user-facing display format for a community handle

     

       143
       144
        
       // Following Bluesky's pattern where client adds @ prefix for users, but for communities we use ! prefix

     

       144
       144
       -
       // Example: "gardening.community.coves.social" -> "!gardening@coves.social"

     

       145
       145
       +
       // Example: "c-gardening.coves.social" -> "!gardening@coves.social"

     

       145
       146
        
       //

     

       146
       147
        
       // Handles various domain formats correctly:

     

       147
       147
       -
       // - "gaming.community.coves.social" -> "!gaming@coves.social"

     

       148
       148
       -
       // - "gaming.community.coves.co.uk" -> "!gaming@coves.co.uk"

     

       149
       149
       -
       // - "test.community.dev.coves.social" -> "!test@dev.coves.social"

     

       148
       148
       +
       // - "c-gaming.coves.social" -> "!gaming@coves.social"

     

       149
       149
       +
       // - "c-gaming.coves.co.uk" -> "!gaming@coves.co.uk"

     

       150
       150
       +
       // - "c-test.dev.coves.social" -> "!test@dev.coves.social"

     

       150
       151
        
       func (c *Community) GetDisplayHandle() string {

     

       151
       151
       -
       	// Find the ".community." substring in the handle

     

       152
       152
       -
       	communityIndex := strings.Index(c.Handle, ".community.")

     

       153
       153
       -
       	if communityIndex == -1 {

     

       154
       154
       -
       		// Fallback if format doesn't match expected pattern

     

       152
       152
       +
       	// Handle format: c-{name}.{instance}

     

       153
       153
       +
       	if !strings.HasPrefix(c.Handle, "c-") {

     

       154
       154
       +
       		log.Printf("DEBUG: GetDisplayHandle: handle %q missing c- prefix, returning raw handle", c.Handle)

     

       155
       155
       +
       		return c.Handle // Fallback for invalid format

     

       156
       156
       +
       	}

     

       157
       157
       +
       

     

       158
       158
       +
       	// Remove "c-" prefix and find first dot

     

       159
       159
       +
       	afterPrefix := c.Handle[2:]

     

       160
       160
       +
       	dotIndex := strings.Index(afterPrefix, ".")

     

       161
       161
       +
       	if dotIndex == -1 {

     

       162
       162
       +
       		log.Printf("DEBUG: GetDisplayHandle: handle %q has no dot after c- prefix, returning raw handle", c.Handle)

     

       155
       163
        
       		return c.Handle

     

       156
       164
        
       	}

     

       157
       165
        
       

     

       158
       158
       -
       	// Extract name (everything before ".community.")

     

       159
       159
       -
       	name := c.Handle[:communityIndex]

     

       166
       166
       +
       	// Edge case: "c-." would result in empty name

     

       167
       167
       +
       	if dotIndex == 0 {

     

       168
       168
       +
       		log.Printf("DEBUG: GetDisplayHandle: handle %q has empty name after c- prefix, returning raw handle", c.Handle)

     

       169
       169
       +
       		return c.Handle

     

       170
       170
       +
       	}

     

       160
       171
        
       

     

       161
       161
       -
       	// Extract instance domain (everything after ".community.")

     

       162
       162
       -
       	communitySegment := ".community."

     

       163
       163
       -
       	instanceDomain := c.Handle[communityIndex+len(communitySegment):]

     

       172
       172
       +
       	name := afterPrefix[:dotIndex]

     

       173
       173
       +
       	instanceDomain := afterPrefix[dotIndex+1:]

     

       164
       174
        
       

     

       165
       175
        
       	return fmt.Sprintf("!%s@%s", name, instanceDomain)

     

       166
       176
        
       }

+5 -6

internal/core/communities/pds_provisioning.go

···

       67
       67
        
       	}

     

       68
       68
        
       

     

       69
       69
        
       	// 1. Generate unique handle for the community

     

       70
       70
       -
       	// Format: {name}.community.{instance-domain}

     

       71
       71
       -
       	// Example: "gaming.community.coves.social"

     

       72
       72
       -
       	// NOTE: Using SINGULAR "community" to follow atProto lexicon conventions

     

       73
       73
       -
       	// (all record types use singular: app.bsky.feed.post, app.bsky.graph.follow, etc.)

     

       74
       74
       -
       	handle := fmt.Sprintf("%s.community.%s", strings.ToLower(communityName), p.instanceDomain)

     

       70
       70
       +
       	// Format: c-{name}.{instance-domain}

     

       71
       71
       +
       	// Example: "c-gaming.coves.social"

     

       72
       72
       +
       	// Uses c- prefix to distinguish from user handles while keeping single-level subdomain

     

       73
       73
       +
       	handle := fmt.Sprintf("c-%s.%s", strings.ToLower(communityName), p.instanceDomain)

     

       75
       74
        
       

     

       76
       75
        
       	// 2. Generate system email for PDS account management

     

       77
       76
        
       	// This email is used for account operations, not for user communication

     

       78
       78
       -
       	email := fmt.Sprintf("community-%s@community.%s", strings.ToLower(communityName), p.instanceDomain)

     

       77
       77
       +
       	email := fmt.Sprintf("c-%s@%s", strings.ToLower(communityName), p.instanceDomain)

     

       79
       78
        
       

     

       80
       79
        
       	// 3. Generate secure random password (32 characters)

     

       81
       80
        
       	// This password is never shown to users - it's for Coves to authenticate as the community

+49

internal/db/migrations/022_migrate_community_handles_to_c_prefix.sql

···

       1
       1
       +
       -- +goose Up

     

       2
       2
       +
       -- +goose StatementBegin

     

       3
       3
       +
       

     

       4
       4
       +
       -- Migration: Change community handles from .community. subdomain to c- prefix

     

       5
       5
       +
       -- This simplifies DNS/Caddy configuration (works with *.coves.social wildcard)

     

       6
       6
       +
       --

     

       7
       7
       +
       -- Examples:

     

       8
       8
       +
       --   gardening.community.coves.social -> c-gardening.coves.social

     

       9
       9
       +
       --   gaming.community.coves.social -> c-gaming.coves.social

     

       10
       10
       +
       --

     

       11
       11
       +
       -- Also updates the system email format:

     

       12
       12
       +
       --   community-gardening@community.coves.social -> c-gardening@coves.social

     

       13
       13
       +
       

     

       14
       14
       +
       -- Update community handles in the communities table

     

       15
       15
       +
       UPDATE communities

     

       16
       16
       +
       SET handle = 'c-' || SPLIT_PART(handle, '.community.', 1) || '.' || SPLIT_PART(handle, '.community.', 2)

     

       17
       17
       +
       WHERE handle LIKE '%.community.%';

     

       18
       18
       +
       

     

       19
       19
       +
       -- Update email addresses to match new format

     

       20
       20
       +
       -- Old: community-{name}@community.{instance}

     

       21
       21
       +
       -- New: c-{name}@{instance}

     

       22
       22
       +
       UPDATE communities

     

       23
       23
       +
       SET pds_email = 'c-' || SUBSTRING(pds_email FROM 11 FOR POSITION('@' IN pds_email) - 11) || '@' || SUBSTRING(pds_email FROM POSITION('@community.' IN pds_email) + 11)

     

       24
       24
       +
       WHERE pds_email LIKE 'community-%@community.%';

     

       25
       25
       +
       

     

       26
       26
       +
       -- +goose StatementEnd

     

       27
       27
       +
       

     

       28
       28
       +
       -- +goose Down

     

       29
       29
       +
       -- +goose StatementBegin

     

       30
       30
       +
       

     

       31
       31
       +
       -- Rollback: Revert handles from c- prefix back to .community. subdomain

     

       32
       32
       +
       -- Parse: c-{name}.{instance} -> {name}.community.{instance}

     

       33
       33
       +
       

     

       34
       34
       +
       UPDATE communities

     

       35
       35
       +
       SET handle = SUBSTRING(handle FROM 3 FOR POSITION('.' IN SUBSTRING(handle FROM 3)) - 1)

     

       36
       36
       +
                    || '.community.'

     

       37
       37
       +
                    || SUBSTRING(handle FROM POSITION('.' IN SUBSTRING(handle FROM 3)) + 3)

     

       38
       38
       +
       WHERE handle LIKE 'c-%' AND handle NOT LIKE '%.community.%';

     

       39
       39
       +
       

     

       40
       40
       +
       -- Revert email addresses

     

       41
       41
       +
       -- New: c-{name}@{instance}

     

       42
       42
       +
       -- Old: community-{name}@community.{instance}

     

       43
       43
       +
       UPDATE communities

     

       44
       44
       +
       SET pds_email = 'community-' || SUBSTRING(pds_email FROM 3 FOR POSITION('@' IN pds_email) - 3)

     

       45
       45
       +
                       || '@community.'

     

       46
       46
       +
                       || SUBSTRING(pds_email FROM POSITION('@' IN pds_email) + 1)

     

       47
       47
       +
       WHERE pds_email LIKE 'c-%@%' AND pds_email NOT LIKE 'community-%@community.%';

     

       48
       48
       +
       

     

       49
       49
       +
       -- +goose StatementEnd

+2 -2

tests/integration/block_handle_resolution_test.go

···

       231
       231
        
       		// To properly test invalid handle → 404, we'd need to add auth middleware context

     

       232
       232
        
       		// For now, we just verify that the resolution code doesn't crash

     

       233
       233
        
       		reqBody := map[string]string{

     

       234
       234
       -
       			"community": "nonexistent.community.coves.social",

     

       234
       234
       +
       			"community": "c-nonexistent.coves.social",

     

       235
       235
        
       		}

     

       236
       236
        
       		reqJSON, _ := json.Marshal(reqBody)

     

       237
       237
        
       

     
···

       317
       317
        
       	t.Run("Unblock with invalid handle", func(t *testing.T) {

     

       318
       318
        
       		// Note: Without auth context, returns 401 before reaching resolution

     

       319
       319
        
       		reqBody := map[string]string{

     

       320
       320
       -
       			"community": "fake.community.coves.social",

     

       320
       320
       +
       			"community": "c-fake.coves.social",

     

       321
       321
        
       		}

     

       322
       322
        
       		reqJSON, _ := json.Marshal(reqBody)

     

       323
       323

+5 -5

tests/integration/community_consumer_test.go

···

       27
       27
        
       		uniqueSuffix := fmt.Sprintf("%d", time.Now().UnixNano())

     

       28
       28
        
       		communityDID := generateTestDID(uniqueSuffix)

     

       29
       29
        
       		communityName := fmt.Sprintf("test-community-%s", uniqueSuffix)

     

       30
       30
       -
       		expectedHandle := fmt.Sprintf("%s.community.coves.local", communityName)

     

       30
       30
       +
       		expectedHandle := fmt.Sprintf("c-%s.coves.local", communityName)

     

       31
       31
        
       

     

       32
       32
        
       		// Set up mock resolver for this test DID

     

       33
       33
        
       		mockResolver := newMockIdentityResolver()

     
···

       89
       89
        
       		uniqueSuffix := fmt.Sprintf("%d", time.Now().UnixNano())

     

       90
       90
        
       		communityDID := generateTestDID(uniqueSuffix)

     

       91
       91
        
       		communityName := fmt.Sprintf("update-test-%s", uniqueSuffix)

     

       92
       92
       -
       		expectedHandle := fmt.Sprintf("%s.community.coves.local", communityName)

     

       92
       92
       +
       		expectedHandle := fmt.Sprintf("c-%s.coves.local", communityName)

     

       93
       93
        
       

     

       94
       94
        
       		// Set up mock resolver for this test DID

     

       95
       95
        
       		mockResolver := newMockIdentityResolver()

     
···

       174
       174
        
       		uniqueSuffix := fmt.Sprintf("%d", time.Now().UnixNano())

     

       175
       175
        
       		communityDID := generateTestDID(uniqueSuffix)

     

       176
       176
        
       		communityName := fmt.Sprintf("delete-test-%s", uniqueSuffix)

     

       177
       177
       -
       		expectedHandle := fmt.Sprintf("%s.community.coves.local", communityName)

     

       177
       177
       +
       		expectedHandle := fmt.Sprintf("c-%s.coves.local", communityName)

     

       178
       178
        
       

     

       179
       179
        
       		// Set up mock resolver for this test DID

     

       180
       180
        
       		mockResolver := newMockIdentityResolver()

     
···

       239
       239
        
       		uniqueSuffix := fmt.Sprintf("%d", time.Now().UnixNano())

     

       240
       240
        
       		communityDID := generateTestDID(uniqueSuffix)

     

       241
       241
        
       		communityName := fmt.Sprintf("sub-test-%s", uniqueSuffix)

     

       242
       242
       -
       		expectedHandle := fmt.Sprintf("%s.community.coves.local", communityName)

     

       242
       242
       +
       		expectedHandle := fmt.Sprintf("c-%s.coves.local", communityName)

     

       243
       243
        
       

     

       244
       244
        
       		// Set up mock resolver for this test DID

     

       245
       245
        
       		mockResolver := newMockIdentityResolver()

     
···

       418
       418
        
       		uniqueSuffix := fmt.Sprintf("%d", time.Now().UnixNano())

     

       419
       419
        
       		communityDID := generateTestDID(uniqueSuffix)

     

       420
       420
        
       		communityName := fmt.Sprintf("test-plc-%s", uniqueSuffix)

     

       421
       421
       -
       		expectedHandle := fmt.Sprintf("%s.community.coves.social", communityName)

     

       421
       421
       +
       		expectedHandle := fmt.Sprintf("c-%s.coves.social", communityName)

     

       422
       422
        
       

     

       423
       423
        
       		// Create mock resolver

     

       424
       424
        
       		mockResolver := newMockIdentityResolver()

+5 -5

tests/integration/community_e2e_test.go

···

       109
       109
        
       

     

       110
       110
        
       	// Initialize OAuth auth middleware for E2E testing

     

       111
       111
        
       	e2eAuth := NewE2EOAuthMiddleware()

     

       112
       112
       -
       	// Register the instance user for OAuth authentication

     

       113
       113
       -
       	token := e2eAuth.AddUser(instanceDID)

     

       112
       112
       +
       	// Register the instance user with their REAL PDS access token for write-forward operations

     

       113
       113
       +
       	token := e2eAuth.AddUserWithPDSToken(instanceDID, accessToken, pdsURL)

     

       114
       114
        
       

     

       115
       115
        
       	// V2.0: Extract instance domain for community provisioning

     

       116
       116
        
       	var instanceDomain string

     
···

       159
       159
        
       	// ====================================================================================

     

       160
       160
        
       	t.Run("1. Write-Forward to PDS", func(t *testing.T) {

     

       161
       161
        
       		// Use shorter names to avoid "Handle too long" errors

     

       162
       162
       -
       		// atProto handles max: 63 chars, format: name.community.coves.social

     

       162
       162
       +
       		// atProto handles max: 63 chars, format: c-name.coves.social

     

       163
       163
        
       		communityName := fmt.Sprintf("e2e-%d", time.Now().Unix())

     

       164
       164
        
       

     

       165
       165
        
       		createReq := communities.CreateCommunityRequest{

     
···

       191
       191
        
       

     

       192
       192
        
       		// V2: Verify PDS account was created for the community

     

       193
       193
        
       		t.Logf("\n🔍 V2: Verifying community PDS account exists...")

     

       194
       194
       -
       		expectedHandle := fmt.Sprintf("%s.community.%s", communityName, instanceDomain)

     

       194
       194
       +
       		expectedHandle := fmt.Sprintf("c-%s.%s", communityName, instanceDomain)

     

       195
       195
        
       		t.Logf("   Expected handle: %s", expectedHandle)

     

       196
       196
       -
       		t.Logf("   (Using subdomain: *.community.%s)", instanceDomain)

     

       196
       196
       +
       		t.Logf("   (Using subdomain: c-*.%s)", instanceDomain)

     

       197
       197
        
       

     

       198
       198
        
       		accountDID, accountHandle, err := queryPDSAccount(pdsURL, expectedHandle)

     

       199
       199
        
       		if err != nil {

+9 -9

tests/integration/community_provisioning_test.go

···

       29
       29
        
       

     

       30
       30
        
       		community := &communities.Community{

     

       31
       31
        
       			DID:                    generateTestDID(uniqueSuffix),

     

       32
       32
       -
       			Handle:                 fmt.Sprintf("test-encryption-%s.community.test.local", uniqueSuffix),

     

       32
       32
       +
       			Handle:                 fmt.Sprintf("c-test-encryption-%s.test.local", uniqueSuffix),

     

       33
       33
        
       			Name:                   "test-encryption",

     

       34
       34
        
       			DisplayName:            "Test Encryption",

     

       35
       35
        
       			Description:            "Testing password encryption",

     
···

       100
       100
        
       

     

       101
       101
        
       		community := &communities.Community{

     

       102
       102
        
       			DID:                    generateTestDID(uniqueSuffix),

     

       103
       103
       -
       			Handle:                 fmt.Sprintf("test-empty-pass-%s.community.test.local", uniqueSuffix),

     

       103
       103
       +
       			Handle:                 fmt.Sprintf("c-test-empty-pass-%s.test.local", uniqueSuffix),

     

       104
       104
        
       			Name:                   "test-empty-pass",

     

       105
       105
        
       			DisplayName:            "Test Empty Password",

     

       106
       106
        
       			Description:            "Testing empty password handling",

     
···

       332
       332
        
       

     

       333
       333
        
       			community := &communities.Community{

     

       334
       334
        
       				DID:                    generateTestDID(uniqueSuffix),

     

       335
       335
       -
       				Handle:                 fmt.Sprintf("pwd-unique-%s.community.test.local", uniqueSuffix),

     

       335
       335
       +
       				Handle:                 fmt.Sprintf("c-pwd-unique-%s.test.local", uniqueSuffix),

     

       336
       336
        
       				Name:                   fmt.Sprintf("pwd-unique-%s", uniqueSuffix),

     

       337
       337
        
       				DisplayName:            fmt.Sprintf("Password Unique Test %d", i),

     

       338
       338
        
       				Description:            "Testing password uniqueness",

     
···

       402
       402
        
       

     

       403
       403
        
       		community := &communities.Community{

     

       404
       404
        
       			DID:                    generateTestDID(uniqueSuffix),

     

       405
       405
       -
       			Handle:                 fmt.Sprintf("test-pwd-len-%s.community.test.local", uniqueSuffix),

     

       405
       405
       +
       			Handle:                 fmt.Sprintf("c-test-pwd-len-%s.test.local", uniqueSuffix),

     

       406
       406
        
       			Name:                   "test-pwd-len",

     

       407
       407
        
       			DisplayName:            "Test Password Length",

     

       408
       408
        
       			Description:            "Testing password length requirements",

     
···

       470
       470
        
       				uniqueSuffix := fmt.Sprintf("%d-%d", time.Now().UnixNano(), idx)

     

       471
       471
        
       				community := &communities.Community{

     

       472
       472
        
       					DID:                    generateTestDID(uniqueSuffix),

     

       473
       473
       -
       					Handle:                 fmt.Sprintf("%s.community.test.local", sameName),

     

       473
       473
       +
       					Handle:                 fmt.Sprintf("c-%s.test.local", sameName),

     

       474
       474
        
       					Name:                   sameName,

     

       475
       475
        
       					DisplayName:            "Concurrent Test",

     

       476
       476
        
       					Description:            "Testing concurrent creation",

     
···

       530
       530
        
       		uniqueSuffix := fmt.Sprintf("%d", time.Now().UnixNano())

     

       531
       531
        
       		community := &communities.Community{

     

       532
       532
        
       			DID:                    generateTestDID(uniqueSuffix),

     

       533
       533
       -
       			Handle:                 fmt.Sprintf("read-test-%s.community.test.local", uniqueSuffix),

     

       533
       533
       +
       			Handle:                 fmt.Sprintf("c-read-test-%s.test.local", uniqueSuffix),

     

       534
       534
        
       			Name:                   "read-test",

     

       535
       535
        
       			DisplayName:            "Read Test",

     

       536
       536
        
       			Description:            "Testing concurrent reads",

     
···

       719
       719
        
       

     

       720
       720
        
       		community := &communities.Community{

     

       721
       721
        
       			DID:                    generateTestDID(uniqueSuffix),

     

       722
       722
       -
       			Handle:                 fmt.Sprintf("token-test-%s.community.test.local", uniqueSuffix),

     

       722
       722
       +
       			Handle:                 fmt.Sprintf("c-token-test-%s.test.local", uniqueSuffix),

     

       723
       723
        
       			Name:                   "token-test",

     

       724
       724
        
       			DisplayName:            "Token Test",

     

       725
       725
        
       			Description:            "Testing token storage",

     
···

       784
       784
        
       

     

       785
       785
        
       		community := &communities.Community{

     

       786
       786
        
       			DID:                    generateTestDID(uniqueSuffix),

     

       787
       787
       -
       			Handle:                 fmt.Sprintf("empty-token-%s.community.test.local", uniqueSuffix),

     

       787
       787
       +
       			Handle:                 fmt.Sprintf("c-empty-token-%s.test.local", uniqueSuffix),

     

       788
       788
        
       			Name:                   "empty-token",

     

       789
       789
        
       			DisplayName:            "Empty Token Test",

     

       790
       790
        
       			Description:            "Testing empty token handling",

     
···

       832
       832
        
       

     

       833
       833
        
       		community := &communities.Community{

     

       834
       834
        
       			DID:                    generateTestDID(uniqueSuffix),

     

       835
       835
       -
       			Handle:                 fmt.Sprintf("encrypted-token-%s.community.test.local", uniqueSuffix),

     

       835
       835
       +
       			Handle:                 fmt.Sprintf("c-encrypted-token-%s.test.local", uniqueSuffix),

     

       836
       836
        
       			Name:                   "encrypted-token",

     

       837
       837
        
       			DisplayName:            "Encrypted Token Test",

     

       838
       838
        
       			Description:            "Testing token encryption",

+2 -2

tests/integration/community_service_integration_test.go

···

       55
       55
        
       

     

       56
       56
        
       	t.Run("creates community with real PDS provisioning", func(t *testing.T) {

     

       57
       57
        
       		// Create provisioner and service (production code path)

     

       58
       58
       -
       		// Use coves.social domain (configured in PDS_SERVICE_HANDLE_DOMAINS as .community.coves.social)

     

       58
       58
       +
       		// Use coves.social domain (configured in PDS_SERVICE_HANDLE_DOMAINS as c-{name}.coves.social)

     

       59
       59
        
       		provisioner := communities.NewPDSAccountProvisioner("coves.social", pdsURL)

     

       60
       60
        
       		service := communities.NewCommunityService(

     

       61
       61
        
       			repo,

     
···

       114
       114
        
       		t.Logf("✅ Real DID generated: %s", community.DID)

     

       115
       115
        
       

     

       116
       116
        
       		// Verify handle format

     

       117
       117
       -
       		expectedHandle := fmt.Sprintf("%s.community.coves.social", uniqueName)

     

       117
       117
       +
       		expectedHandle := fmt.Sprintf("c-%s.coves.social", uniqueName)

     

       118
       118
        
       		if community.Handle != expectedHandle {

     

       119
       119
        
       			t.Errorf("Expected handle %s, got %s", expectedHandle, community.Handle)

     

       120
       120
        
       		}

+8 -8

tests/integration/community_v2_validation_test.go

···

       29
       29
        
       		// Use unique DID and handle to avoid conflicts with other test runs

     

       30
       30
        
       		timestamp := time.Now().UnixNano()

     

       31
       31
        
       		testDID := fmt.Sprintf("did:plc:testv2rkey%d", timestamp)

     

       32
       32
       -
       		testHandle := fmt.Sprintf("testv2rkey%d.community.coves.social", timestamp)

     

       32
       32
       +
       		testHandle := fmt.Sprintf("c-testv2rkey%d.coves.social", timestamp)

     

       33
       33
        
       

     

       34
       34
        
       		event := &jetstream.JetstreamEvent{

     

       35
       35
        
       			Did:  testDID,

     
···

       90
       90
        
       				CID:        "bafyreiv1community",

     

       91
       91
        
       				Record: map[string]interface{}{

     

       92
       92
        
       					"$type":      "social.coves.community.profile",

     

       93
       93
       -
       					"handle":     "v1community.community.coves.social",

     

       93
       93
       +
       					"handle":     "c-v1community.coves.social",

     

       94
       94
        
       					"name":       "v1community",

     

       95
       95
        
       					"createdBy":  "did:plc:user456",

     

       96
       96
        
       					"hostedBy":   "did:web:coves.social",

     
···

       136
       136
        
       				CID:        "bafyreicustom",

     

       137
       137
        
       				Record: map[string]interface{}{

     

       138
       138
        
       					"$type":      "social.coves.community.profile",

     

       139
       139
       -
       					"handle":     "custom.community.coves.social",

     

       139
       139
       +
       					"handle":     "c-custom.coves.social",

     

       140
       140
        
       					"name":       "custom",

     

       141
       141
        
       					"createdBy":  "did:plc:user789",

     

       142
       142
        
       					"hostedBy":   "did:web:coves.social",

     
···

       175
       175
        
       				CID:        "bafyreiupdate1",

     

       176
       176
        
       				Record: map[string]interface{}{

     

       177
       177
        
       					"$type":      "social.coves.community.profile",

     

       178
       178
       -
       					"handle":     "updatetest.community.coves.social",

     

       178
       178
       +
       					"handle":     "c-updatetest.coves.social",

     

       179
       179
        
       					"name":       "updatetest",

     

       180
       180
        
       					"createdBy":  "did:plc:userUpdate",

     

       181
       181
        
       					"hostedBy":   "did:web:coves.social",

     
···

       206
       206
        
       				CID:        "bafyreiupdate2",

     

       207
       207
        
       				Record: map[string]interface{}{

     

       208
       208
        
       					"$type":       "social.coves.community.profile",

     

       209
       209
       -
       					"handle":      "updatetest.community.coves.social",

     

       209
       209
       +
       					"handle":      "c-updatetest.coves.social",

     

       210
       210
        
       					"name":        "updatetest",

     

       211
       211
        
       					"displayName": "Updated Name",

     

       212
       212
        
       					"createdBy":   "did:plc:userUpdate",

     
···

       266
       266
        
       				CID:        "bafyreihandle",

     

       267
       267
        
       				Record: map[string]interface{}{

     

       268
       268
        
       					"$type":      "social.coves.community.profile",

     

       269
       269
       -
       					"handle":     "gamingtest.community.coves.social", // atProto handle (DNS-resolvable)

     

       269
       269
       +
       					"handle":     "c-gamingtest.coves.social", // atProto handle (DNS-resolvable)

     

       270
       270
        
       					"name":       "gamingtest",                        // Short name for !mentions

     

       271
       271
        
       					"createdBy":  "did:plc:user123",

     

       272
       272
        
       					"hostedBy":   "did:web:coves.social",

     
···

       292
       292
        
       		}

     

       293
       293
        
       

     

       294
       294
        
       		// Verify the atProto handle is stored

     

       295
       295
       -
       		if community.Handle != "gamingtest.community.coves.social" {

     

       296
       296
       -
       			t.Errorf("Expected handle gamingtest.community.coves.social, got %s", community.Handle)

     

       295
       295
       +
       		if community.Handle != "c-gamingtest.coves.social" {

     

       296
       296
       +
       			t.Errorf("Expected handle c-gamingtest.coves.social, got %s", community.Handle)

     

       297
       297
        
       		}

     

       298
       298
        
       

     

       299
       299
        
       		// Note: The DID is the authoritative identifier for atProto resolution

+8 -7

tests/integration/post_creation_test.go

···

       67
       67
        
       	// Setup: Create test community (insert directly to DB for speed)

     

       68
       68
        
       	testCommunity := &communities.Community{

     

       69
       69
        
       		DID:            generateTestDID("testcommunity"),

     

       70
       70
       -
       		Handle:         "testcommunity.community.test.coves.social", // Canonical atProto handle (no ! prefix, .community. format)

     

       70
       70
       +
       		Handle:         "c-testcommunity.test.coves.social", // Canonical atProto handle (no ! prefix, c- format)

     

       71
       71
        
       		Name:           "testcommunity",

     

       72
       72
        
       		DisplayName:    "Test Community",

     

       73
       73
        
       		Description:    "A community for testing posts",

     
···

       134
       134
        
       

     

       135
       135
        
       	t.Run("Create text post with ! prefix handle", func(t *testing.T) {

     

       136
       136
        
       		// Test that we can also use ! prefix with scoped format: !name@instance

     

       137
       137
       -
       		// This is Coves-specific UX shorthand for name.community.instance

     

       137
       137
       +
       		// This is Coves-specific UX shorthand for c-name.instance

     

       138
       138
        
       

     

       139
       139
        
       		content := "Post using !-prefixed handle"

     

       140
       140
        
       		title := "Prefixed Handle Test"

     

       141
       141
        
       

     

       142
       142
       -
       		// Extract name from handle: "gardening.community.coves.social" -> "gardening"

     

       142
       142
       +
       		// Extract name from handle: "c-gardening.coves.social" -> "gardening"

     

       143
       143
        
       		// Scoped format: !gardening@coves.social

     

       144
       144
        
       		handleParts := strings.Split(testCommunity.Handle, ".")

     

       145
       145
       -
       		communityName := handleParts[0]

     

       146
       146
       -
       		instanceDomain := strings.Join(handleParts[2:], ".") // Skip ".community."

     

       145
       145
       +
       		communityNameWithPrefix := handleParts[0] // "c-gardening"

     

       146
       146
       +
       		communityName := strings.TrimPrefix(communityNameWithPrefix, "c-") // "gardening"

     

       147
       147
       +
       		instanceDomain := strings.Join(handleParts[1:], ".") // "coves.social"

     

       147
       148
        
       		scopedHandle := fmt.Sprintf("!%s@%s", communityName, instanceDomain)

     

       148
       149
        
       

     

       149
       150
        
       		req := posts.CreatePostRequest{

     
···

       181
       182
        
       		content := "Post with non-existent handle"

     

       182
       183
        
       

     

       183
       184
        
       		req := posts.CreatePostRequest{

     

       184
       184
       -
       			Community: "nonexistent.community.test.coves.social", // Valid canonical handle format, but doesn't exist

     

       185
       185
       +
       			Community: "c-nonexistent.test.coves.social", // Valid canonical handle format, but doesn't exist

     

       185
       186
        
       			Content:   &content,

     

       186
       187
        
       			AuthorDID: testUserDID,

     

       187
       188
        
       		}

     
···

       320
       321
        
       	testCommunityDID := generateTestDID("testcommunity2")

     

       321
       322
        
       	_, err = communityRepo.Create(ctx, &communities.Community{

     

       322
       323
        
       		DID:          testCommunityDID,

     

       323
       323
       -
       		Handle:       "testcommunity2.community.test.coves.social", // Canonical format (no ! prefix)

     

       324
       324
       +
       		Handle:       "c-testcommunity2.test.coves.social", // Canonical format (no ! prefix)

     

       324
       325
        
       		Name:         "testcommunity2",

     

       325
       326
        
       		Visibility:   "public",

     

       326
       327
        
       		CreatedByDID: testUserDID,

+7 -7

tests/integration/post_handler_test.go

···

       255
       255
        
       	})

     

       256
       256
        
       

     

       257
       257
        
       	t.Run("Accept valid scoped handle format", func(t *testing.T) {

     

       258
       258
       -
       		// Scoped format: !name@instance (gets converted to name.community.instance internally)

     

       258
       258
       +
       		// Scoped format: !name@instance (gets converted to c-name.instance internally)

     

       259
       259
        
       		validScopedHandles := []string{

     

       260
       260
        
       			"!mycommunity@bsky.social",  // Scoped format

     

       261
       261
        
       			"!gaming@test.coves.social", // Scoped format

     
···

       293
       293
        
       	})

     

       294
       294
        
       

     

       295
       295
        
       	t.Run("Accept valid canonical handle format", func(t *testing.T) {

     

       296
       296
       -
       		// Canonical format: name.community.instance (DNS-resolvable atProto handle)

     

       296
       296
       +
       		// Canonical format: c-name.instance (DNS-resolvable atProto handle)

     

       297
       297
        
       		validCanonicalHandles := []string{

     

       298
       298
       -
       			"gaming.community.test.coves.social",

     

       299
       299
       -
       			"books.community.bsky.social",

     

       298
       298
       +
       			"c-gaming.test.coves.social",

     

       299
       299
       +
       			"c-books.bsky.social",

     

       300
       300
        
       		}

     

       301
       301
        
       

     

       302
       302
        
       		for _, validHandle := range validCanonicalHandles {

     
···

       331
       331
        
       	})

     

       332
       332
        
       

     

       333
       333
        
       	t.Run("Accept valid @-prefixed handle format", func(t *testing.T) {

     

       334
       334
       -
       		// @-prefixed format: @name.community.instance (atProto standard, @ gets stripped)

     

       334
       334
       +
       		// @-prefixed format: @c-name.instance (atProto standard, @ gets stripped)

     

       335
       335
        
       		validAtHandles := []string{

     

       336
       336
       -
       			"@gaming.community.test.coves.social",

     

       337
       337
       -
       			"@books.community.bsky.social",

     

       336
       336
       +
       			"@c-gaming.test.coves.social",

     

       337
       337
       +
       			"@c-books.bsky.social",

     

       338
       338
        
       		}

     

       339
       339
        
       

     

       340
       340
        
       		for _, validHandle := range validAtHandles {

+5 -5

tests/integration/post_unfurl_test.go

···

       87
       87
        
       	// Create test community

     

       88
       88
        
       	testCommunity := &communities.Community{

     

       89
       89
        
       		DID:             generateTestDID("unfurlcommunity"),

     

       90
       90
       -
       		Handle:          "unfurlcommunity.community.test.coves.social",

     

       90
       90
       +
       		Handle:          "c-unfurlcommunity.test.coves.social",

     

       91
       91
        
       		Name:            "unfurlcommunity",

     

       92
       92
        
       		DisplayName:     "Unfurl Test Community",

     

       93
       93
        
       		Description:     "A community for testing unfurl",

     
···

       382
       382
        
       	// Create test community

     

       383
       383
        
       	testCommunity := &communities.Community{

     

       384
       384
        
       		DID:             generateTestDID("unsupportedcommunity"),

     

       385
       385
       -
       		Handle:          "unsupportedcommunity.community.test.coves.social",

     

       385
       385
       +
       		Handle:          "c-unsupportedcommunity.test.coves.social",

     

       386
       386
        
       		Name:            "unsupportedcommunity",

     

       387
       387
        
       		DisplayName:     "Unsupported URL Test",

     

       388
       388
        
       		Visibility:      "public",

     
···

       488
       488
        
       

     

       489
       489
        
       	testCommunity := &communities.Community{

     

       490
       490
        
       		DID:             generateTestDID("metadatacommunity"),

     

       491
       491
       -
       		Handle:          "metadatacommunity.community.test.coves.social",

     

       491
       491
       +
       		Handle:          "c-metadatacommunity.test.coves.social",

     

       492
       492
        
       		Name:            "metadatacommunity",

     

       493
       493
        
       		DisplayName:     "Metadata Test",

     

       494
       494
        
       		Visibility:      "public",

     
···

       598
       598
        
       

     

       599
       599
        
       	testCommunity := &communities.Community{

     

       600
       600
        
       		DID:             generateTestDID("noembedcommunity"),

     

       601
       601
       -
       		Handle:          "noembedcommunity.community.test.coves.social",

     

       601
       601
       +
       		Handle:          "c-noembedcommunity.test.coves.social",

     

       602
       602
        
       		Name:            "noembedcommunity",

     

       603
       603
        
       		DisplayName:     "No Embed Test",

     

       604
       604
        
       		Visibility:      "public",

     
···

       872
       872
        
       	testCommunityDID := generateTestDID("e2eunfurlcommunity")

     

       873
       873
        
       	community := &communities.Community{

     

       874
       874
        
       		DID:             testCommunityDID,

     

       875
       875
       -
       		Handle:          "e2eunfurlcommunity.community.test.coves.social",

     

       875
       875
       +
       		Handle:          "c-e2eunfurlcommunity.test.coves.social",

     

       876
       876
        
       		Name:            "e2eunfurlcommunity",

     

       877
       877
        
       		DisplayName:     "E2E Unfurl Test",

     

       878
       878
        
       		OwnerDID:        testCommunityDID,

+2 -2

tests/integration/token_refresh_test.go

···

       110
       110
        
       	// Create a test community first

     

       111
       111
        
       	community := &communities.Community{

     

       112
       112
        
       		DID:             "did:plc:test123",

     

       113
       113
       -
       		Handle:          "test.community.coves.social",

     

       113
       113
       +
       		Handle:          "c-test.coves.social",

     

       114
       114
        
       		Name:            "test",

     

       115
       115
        
       		OwnerDID:        "did:plc:test123",

     

       116
       116
        
       		CreatedByDID:    "did:plc:creator",

     
···

       186
       186
        
       

     

       187
       187
        
       	community := &communities.Community{

     

       188
       188
        
       		DID:             "did:plc:expiring123",

     

       189
       189
       -
       		Handle:          "expiring.community.coves.social",

     

       189
       189
       +
       		Handle:          "c-expiring.coves.social",

     

       190
       190
        
       		Name:            "expiring",

     

       191
       191
        
       		OwnerDID:        "did:plc:expiring123",

     

       192
       192
        
       		CreatedByDID:    "did:plc:creator",

+2 -1

internal/atproto/oauth/handlers_test.go

···

       49
       49
        
       	require.NoError(t, err)

     

       50
       50
        
       

     

       51
       51
        
       	// Validate metadata

     

       52
       52
       -
       	assert.Equal(t, "https://coves.social", metadata.ClientID)

     

       52
       52
       +
       	// Per atproto OAuth spec, client_id for public clients is the client metadata URL

     

       53
       53
       +
       	assert.Equal(t, "https://coves.social/oauth/client-metadata.json", metadata.ClientID)

     

       53
       54
        
       	assert.Contains(t, metadata.RedirectURIs, "https://coves.social/oauth/callback")

     

       54
       55
        
       	assert.Contains(t, metadata.GrantTypes, "authorization_code")

     

       55
       56
        
       	assert.Contains(t, metadata.GrantTypes, "refresh_token")

internal/atproto/oauth/store_test.go

···

       335
       335
        
       func TestPostgresOAuthStore_CleanupExpiredSessions(t *testing.T) {

     

       336
       336
        
       	db := setupTestDB(t)

     

       337
       337
        
       	defer func() { _ = db.Close() }()

     

       338
       338
       +
       	// Clean up before AND after to ensure test isolation

     

       339
       339
       +
       	cleanupOAuth(t, db)

     

       338
       340
        
       	defer cleanupOAuth(t, db)

     

       339
       341
        
       

     

       340
       342
        
       	storeInterface := NewPostgresOAuthStore(db, 0) // Use default TTL

+5 -5

internal/db/postgres/vote_repo_test.go

···

       271
       271
        
       	err = repo.Delete(ctx, vote.URI)

     

       272
       272
        
       	assert.NoError(t, err)

     

       273
       273
        
       

     

       274
       274
       -
       	// Verify vote is soft-deleted (still exists but has deleted_at)

     

       275
       275
       -
       	retrieved, err := repo.GetByURI(ctx, vote.URI)

     

       276
       276
       -
       	assert.NoError(t, err)

     

       277
       277
       -
       	assert.NotNil(t, retrieved.DeletedAt, "DeletedAt should be set after deletion")

     

       274
       274
       +
       	// Verify vote is soft-deleted by checking it's no longer retrievable

     

       275
       275
       +
       	// GetByURI excludes deleted votes (returns ErrVoteNotFound)

     

       276
       276
       +
       	_, err = repo.GetByURI(ctx, vote.URI)

     

       277
       277
       +
       	assert.ErrorIs(t, err, votes.ErrVoteNotFound, "GetByURI should not return deleted votes")

     

       278
       278
        
       

     

       279
       279
       -
       	// GetByVoterAndSubject should not find deleted votes

     

       279
       279
       +
       	// GetByVoterAndSubject should also not find deleted votes

     

       280
       280
        
       	_, err = repo.GetByVoterAndSubject(ctx, voterDID, vote.SubjectURI)

     

       281
       281
        
       	assert.ErrorIs(t, err, votes.ErrVoteNotFound, "GetByVoterAndSubject should not return deleted votes")

     

       282
       282
        
       }

+26 -3

tests/integration/oauth_e2e_test.go

···

       195
       195
        
       	assert.Equal(t, oauth.ErrSessionNotFound, err, "Should return ErrSessionNotFound for expired session")

     

       196
       196
        
       

     

       197
       197
        
       	// Test cleanup of expired sessions

     

       198
       198
       -
       	cleaned, err := store.(*oauth.PostgresOAuthStore).CleanupExpiredSessions(ctx)

     

       198
       198
       +
       	// Need to access the underlying PostgresOAuthStore through the wrapper

     

       199
       199
       +
       	var pgStore *oauth.PostgresOAuthStore

     

       200
       200
       +
       	if wrapper, ok := store.(*oauth.MobileAwareStoreWrapper); ok {

     

       201
       201
       +
       		pgStore, _ = wrapper.ClientAuthStore.(*oauth.PostgresOAuthStore)

     

       202
       202
       +
       	} else {

     

       203
       203
       +
       		pgStore, _ = store.(*oauth.PostgresOAuthStore)

     

       204
       204
       +
       	}

     

       205
       205
       +
       	require.NotNil(t, pgStore, "Should be able to access PostgresOAuthStore")

     

       206
       206
       +
       

     

       207
       207
       +
       	cleaned, err := pgStore.CleanupExpiredSessions(ctx)

     

       199
       208
        
       	require.NoError(t, err, "Cleanup should succeed")

     

       200
       209
        
       	assert.Greater(t, cleaned, int64(0), "Should have cleaned up at least one session")

     

       201
       210
        
       

     
···

       464
       473
        
       

     

       465
       474
        
       	// Test cleanup of expired auth requests

     

       466
       475
        
       	// Create an auth request and manually set created_at to the past

     

       476
       476
       +
       	// Use unique state to avoid conflicts with previous test runs

     

       477
       477
       +
       	oldState := fmt.Sprintf("old-state-%d", time.Now().UnixNano())

     

       467
       478
        
       	oldAuthRequest := oauthlib.AuthRequestData{

     

       468
       468
       -
       		State:         "old-state-12345",

     

       479
       479
       +
       		State:         oldState,

     

       469
       480
        
       		PKCEVerifier:  "old-verifier",

     

       470
       481
        
       		AuthServerURL: "http://localhost:3001",

     

       471
       482
        
       		Scopes:        []string{"atproto"},

     

       472
       483
        
       	}

     

       473
       484
        
       

     

       485
       485
       +
       	// Clean up any existing state first

     

       486
       486
       +
       	_ = store.DeleteAuthRequestInfo(ctx, oldState)

     

       487
       487
       +
       

     

       474
       488
        
       	err = store.SaveAuthRequestInfo(ctx, oldAuthRequest)

     

       475
       489
        
       	require.NoError(t, err)

     

       476
       490
        
       

     
···

       481
       495
        
       	require.NoError(t, err)

     

       482
       496
        
       

     

       483
       497
        
       	// Cleanup expired requests

     

       484
       484
       -
       	cleaned, err := store.(*oauth.PostgresOAuthStore).CleanupExpiredAuthRequests(ctx)

     

       498
       498
       +
       	// Need to access the underlying PostgresOAuthStore through the wrapper

     

       499
       499
       +
       	var pgStore *oauth.PostgresOAuthStore

     

       500
       500
       +
       	if wrapper, ok := store.(*oauth.MobileAwareStoreWrapper); ok {

     

       501
       501
       +
       		pgStore, _ = wrapper.ClientAuthStore.(*oauth.PostgresOAuthStore)

     

       502
       502
       +
       	} else {

     

       503
       503
       +
       		pgStore, _ = store.(*oauth.PostgresOAuthStore)

     

       504
       504
       +
       	}

     

       505
       505
       +
       	require.NotNil(t, pgStore, "Should be able to access PostgresOAuthStore")

     

       506
       506
       +
       

     

       507
       507
       +
       	cleaned, err := pgStore.CleanupExpiredAuthRequests(ctx)

     

       485
       508
        
       	require.NoError(t, err, "Cleanup should succeed")

     

       486
       509
        
       	assert.Greater(t, cleaned, int64(0), "Should have cleaned up at least one auth request")

     

       487
       510

+5 -5

tests/integration/vote_e2e_test.go

···

       84
       84
        
       	voteService := votes.NewServiceWithPDSFactory(voteRepo, nil, nil, PasswordAuthPDSClientFactory())

     

       85
       85
        
       

     

       86
       86
        
       	// Create test user on PDS

     

       87
       87
       -
       	testUserHandle := fmt.Sprintf("voter-%d.local.coves.dev", time.Now().Unix())

     

       87
       87
       +
       	testUserHandle := fmt.Sprintf("vot%d.local.coves.dev", time.Now().UnixNano()%1000000)

     

       88
       88
        
       	testUserEmail := fmt.Sprintf("voter-%d@test.local", time.Now().Unix())

     

       89
       89
        
       	testUserPassword := "test-password-123"

     

       90
       90
        
       

     
···

       307
       307
        
       	voteService := votes.NewServiceWithPDSFactory(voteRepo, nil, nil, PasswordAuthPDSClientFactory())

     

       308
       308
        
       

     

       309
       309
        
       	// Create test user

     

       310
       310
       -
       	testUserHandle := fmt.Sprintf("toggle-%d.local.coves.dev", time.Now().Unix())

     

       310
       310
       +
       	testUserHandle := fmt.Sprintf("tog%d.local.coves.dev", time.Now().UnixNano()%1000000)

     

       311
       311
        
       	testUserEmail := fmt.Sprintf("toggle-%d@test.local", time.Now().Unix())

     

       312
       312
        
       	testUserPassword := "test-password-123"

     

       313
       313
        
       

     
···

       476
       476
        
       	voteService := votes.NewServiceWithPDSFactory(voteRepo, nil, nil, PasswordAuthPDSClientFactory())

     

       477
       477
        
       

     

       478
       478
        
       	// Create test user

     

       479
       479
       -
       	testUserHandle := fmt.Sprintf("flip-%d.local.coves.dev", time.Now().Unix())

     

       479
       479
       +
       	testUserHandle := fmt.Sprintf("flp%d.local.coves.dev", time.Now().UnixNano()%1000000)

     

       480
       480
        
       	testUserEmail := fmt.Sprintf("flip-%d@test.local", time.Now().Unix())

     

       481
       481
        
       	testUserPassword := "test-password-123"

     

       482
       482
        
       

     
···

       701
       701
        
       	voteService := votes.NewServiceWithPDSFactory(voteRepo, nil, nil, PasswordAuthPDSClientFactory())

     

       702
       702
        
       

     

       703
       703
        
       	// Create test user

     

       704
       704
       -
       	testUserHandle := fmt.Sprintf("delete-%d.local.coves.dev", time.Now().Unix())

     

       704
       704
       +
       	testUserHandle := fmt.Sprintf("dlt%d.local.coves.dev", time.Now().UnixNano()%1000000)

     

       705
       705
        
       	testUserEmail := fmt.Sprintf("delete-%d@test.local", time.Now().Unix())

     

       706
       706
        
       	testUserPassword := "test-password-123"

     

       707
       707
        
       

     
···

       888
       888
        
       	voteRepo := postgres.NewVoteRepository(db)

     

       889
       889
        
       

     

       890
       890
        
       	// Create test user on PDS

     

       891
       891
       -
       	testUserHandle := fmt.Sprintf("jetstream-%d.local.coves.dev", time.Now().Unix())

     

       891
       891
       +
       	testUserHandle := fmt.Sprintf("jet%d.local.coves.dev", time.Now().UnixNano()%1000000)

     

       892
       892
        
       	testUserEmail := fmt.Sprintf("jetstream-%d@test.local", time.Now().Unix())

     

       893
       893
        
       	testUserPassword := "test-password-123"

     

       894
       894

+1 -1

cmd/server/main.go

···

       552
       552
        
       	routes.RegisterDiscoverRoutes(r, discoverService, voteService, authMiddleware)

     

       553
       553
        
       	log.Println("Discover XRPC endpoints registered (public with optional auth for viewer vote state)")

     

       554
       554
        
       

     

       555
       555
       -
       	routes.RegisterAggregatorRoutes(r, aggregatorService, userService, identityResolver)

     

       555
       555
       +
       	routes.RegisterAggregatorRoutes(r, aggregatorService, communityService, userService, identityResolver)

     

       556
       556
        
       	log.Println("Aggregator XRPC endpoints registered (query endpoints public, registration endpoint public)")

     

       557
       557
        
       

     

       558
       558
        
       	// Comment query API - supports optional authentication for viewer state

internal/api/handlers/aggregator/errors.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"Coves/internal/core/aggregators"

     

       5
       5
       +
       	"Coves/internal/core/communities"

     

       5
       6
        
       	"encoding/json"

     

       6
       7
        
       	"log"

     

       7
       8
        
       	"net/http"

     
···

       26
       27
        
       }

     

       27
       28
        
       

     

       28
       29
        
       // handleServiceError maps service errors to HTTP responses

     

       30
       30
       +
       // Handles errors from both aggregators and communities packages

     

       29
       31
        
       func handleServiceError(w http.ResponseWriter, err error) {

     

       30
       32
        
       	if err == nil {

     

       31
       33
        
       		return

     

       32
       34
        
       	}

     

       33
       35
        
       

     

       34
       36
        
       	// Map domain errors to HTTP status codes

     

       37
       37
       +
       	// Check community errors first (for ResolveCommunityIdentifier calls)

     

       35
       38
        
       	switch {

     

       39
       39
       +
       	case communities.IsNotFound(err):

     

       40
       40
       +
       		writeError(w, http.StatusNotFound, "CommunityNotFound", err.Error())

     

       41
       41
       +
       	case communities.IsValidationError(err):

     

       42
       42
       +
       		writeError(w, http.StatusBadRequest, "InvalidRequest", err.Error())

     

       36
       43
        
       	case aggregators.IsNotFound(err):

     

       37
       44
        
       		writeError(w, http.StatusNotFound, "NotFound", err.Error())

     

       38
       45
        
       	case aggregators.IsValidationError(err):

+13 -6

internal/api/handlers/aggregator/list_for_community.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"Coves/internal/core/aggregators"

     

       5
       5
       +
       	"Coves/internal/core/communities"

     

       5
       6
        
       	"encoding/json"

     

       6
       7
        
       	"log"

     

       7
       8
        
       	"net/http"

     
···

       10
       11
        
       

     

       11
       12
        
       // ListForCommunityHandler handles listing aggregators for a community

     

       12
       13
        
       type ListForCommunityHandler struct {

     

       13
       13
       -
       	service aggregators.Service

     

       14
       14
       +
       	service          aggregators.Service

     

       15
       15
       +
       	communityService communities.Service

     

       14
       16
        
       }

     

       15
       17
        
       

     

       16
       18
        
       // NewListForCommunityHandler creates a new list for community handler

     

       17
       17
       -
       func NewListForCommunityHandler(service aggregators.Service) *ListForCommunityHandler {

     

       19
       19
       +
       func NewListForCommunityHandler(service aggregators.Service, communityService communities.Service) *ListForCommunityHandler {

     

       18
       20
        
       	return &ListForCommunityHandler{

     

       19
       19
       -
       		service: service,

     

       21
       21
       +
       		service:          service,

     

       22
       22
       +
       		communityService: communityService,

     

       20
       23
        
       	}

     

       21
       24
        
       }

     

       22
       25
        
       

     
···

       36
       39
        
       		return

     

       37
       40
        
       	}

     

       38
       41
        
       

     

       39
       39
       -
       	// Resolve community identifier to DID (handles both DIDs and handles)

     

       40
       40
       -
       	// TODO: Implement identifier resolution service - for now, assume it's a DID

     

       41
       41
       -
       	req.CommunityDID = communityIdentifier

     

       42
       42
       +
       	// Resolve community identifier to DID (supports DIDs, handles, scoped identifiers)

     

       43
       43
       +
       	communityDID, err := h.communityService.ResolveCommunityIdentifier(r.Context(), communityIdentifier)

     

       44
       44
       +
       	if err != nil {

     

       45
       45
       +
       		handleServiceError(w, err)

     

       46
       46
       +
       		return

     

       47
       47
       +
       	}

     

       48
       48
       +
       	req.CommunityDID = communityDID

     

       42
       49
        
       

     

       43
       50
        
       	// Get authorizations from service

     

       44
       51
        
       	// Note: Community handle/name fields will be empty until we integrate with communities service

+496

internal/api/handlers/community/subscribe_test.go

···

       1
       1
       +
       package community

     

       2
       2
       +
       

     

       3
       3
       +
       import (

     

       4
       4
       +
       	"Coves/internal/api/middleware"

     

       5
       5
       +
       	"Coves/internal/core/communities"

     

       6
       6
       +
       	"bytes"

     

       7
       7
       +
       	"context"

     

       8
       8
       +
       	"encoding/json"

     

       9
       9
       +
       	"errors"

     

       10
       10
       +
       	"net/http"

     

       11
       11
       +
       	"net/http/httptest"

     

       12
       12
       +
       	"testing"

     

       13
       13
       +
       	"time"

     

       14
       14
       +
       )

     

       15
       15
       +
       

     

       16
       16
       +
       // subscribeTestService implements communities.Service for subscribe handler tests

     

       17
       17
       +
       type subscribeTestService struct {

     

       18
       18
       +
       	subscribeFunc   func(ctx context.Context, userDID, accessToken, communityIdentifier string, contentVisibility int) (*communities.Subscription, error)

     

       19
       19
       +
       	unsubscribeFunc func(ctx context.Context, userDID, accessToken, communityIdentifier string) error

     

       20
       20
       +
       }

     

       21
       21
       +
       

     

       22
       22
       +
       func (m *subscribeTestService) CreateCommunity(ctx context.Context, req communities.CreateCommunityRequest) (*communities.Community, error) {

     

       23
       23
       +
       	return nil, nil

     

       24
       24
       +
       }

     

       25
       25
       +
       

     

       26
       26
       +
       func (m *subscribeTestService) GetCommunity(ctx context.Context, identifier string) (*communities.Community, error) {

     

       27
       27
       +
       	return nil, nil

     

       28
       28
       +
       }

     

       29
       29
       +
       

     

       30
       30
       +
       func (m *subscribeTestService) UpdateCommunity(ctx context.Context, req communities.UpdateCommunityRequest) (*communities.Community, error) {

     

       31
       31
       +
       	return nil, nil

     

       32
       32
       +
       }

     

       33
       33
       +
       

     

       34
       34
       +
       func (m *subscribeTestService) ListCommunities(ctx context.Context, req communities.ListCommunitiesRequest) ([]*communities.Community, error) {

     

       35
       35
       +
       	return nil, nil

     

       36
       36
       +
       }

     

       37
       37
       +
       

     

       38
       38
       +
       func (m *subscribeTestService) SearchCommunities(ctx context.Context, req communities.SearchCommunitiesRequest) ([]*communities.Community, int, error) {

     

       39
       39
       +
       	return nil, 0, nil

     

       40
       40
       +
       }

     

       41
       41
       +
       

     

       42
       42
       +
       func (m *subscribeTestService) SubscribeToCommunity(ctx context.Context, userDID, accessToken, communityIdentifier string, contentVisibility int) (*communities.Subscription, error) {

     

       43
       43
       +
       	if m.subscribeFunc != nil {

     

       44
       44
       +
       		return m.subscribeFunc(ctx, userDID, accessToken, communityIdentifier, contentVisibility)

     

       45
       45
       +
       	}

     

       46
       46
       +
       	return &communities.Subscription{

     

       47
       47
       +
       		UserDID:      userDID,

     

       48
       48
       +
       		CommunityDID: "did:plc:community123",

     

       49
       49
       +
       		RecordURI:    "at://did:plc:user/social.coves.community.subscription/abc123",

     

       50
       50
       +
       		RecordCID:    "bafytest123",

     

       51
       51
       +
       		SubscribedAt: time.Now(),

     

       52
       52
       +
       	}, nil

     

       53
       53
       +
       }

     

       54
       54
       +
       

     

       55
       55
       +
       func (m *subscribeTestService) UnsubscribeFromCommunity(ctx context.Context, userDID, accessToken, communityIdentifier string) error {

     

       56
       56
       +
       	if m.unsubscribeFunc != nil {

     

       57
       57
       +
       		return m.unsubscribeFunc(ctx, userDID, accessToken, communityIdentifier)

     

       58
       58
       +
       	}

     

       59
       59
       +
       	return nil

     

       60
       60
       +
       }

     

       61
       61
       +
       

     

       62
       62
       +
       func (m *subscribeTestService) GetUserSubscriptions(ctx context.Context, userDID string, limit, offset int) ([]*communities.Subscription, error) {

     

       63
       63
       +
       	return nil, nil

     

       64
       64
       +
       }

     

       65
       65
       +
       

     

       66
       66
       +
       func (m *subscribeTestService) GetCommunitySubscribers(ctx context.Context, communityIdentifier string, limit, offset int) ([]*communities.Subscription, error) {

     

       67
       67
       +
       	return nil, nil

     

       68
       68
       +
       }

     

       69
       69
       +
       

     

       70
       70
       +
       func (m *subscribeTestService) BlockCommunity(ctx context.Context, userDID, accessToken, communityIdentifier string) (*communities.CommunityBlock, error) {

     

       71
       71
       +
       	return nil, nil

     

       72
       72
       +
       }

     

       73
       73
       +
       

     

       74
       74
       +
       func (m *subscribeTestService) UnblockCommunity(ctx context.Context, userDID, accessToken, communityIdentifier string) error {

     

       75
       75
       +
       	return nil

     

       76
       76
       +
       }

     

       77
       77
       +
       

     

       78
       78
       +
       func (m *subscribeTestService) GetBlockedCommunities(ctx context.Context, userDID string, limit, offset int) ([]*communities.CommunityBlock, error) {

     

       79
       79
       +
       	return nil, nil

     

       80
       80
       +
       }

     

       81
       81
       +
       

     

       82
       82
       +
       func (m *subscribeTestService) IsBlocked(ctx context.Context, userDID, communityIdentifier string) (bool, error) {

     

       83
       83
       +
       	return false, nil

     

       84
       84
       +
       }

     

       85
       85
       +
       

     

       86
       86
       +
       func (m *subscribeTestService) GetMembership(ctx context.Context, userDID, communityIdentifier string) (*communities.Membership, error) {

     

       87
       87
       +
       	return nil, nil

     

       88
       88
       +
       }

     

       89
       89
       +
       

     

       90
       90
       +
       func (m *subscribeTestService) ListCommunityMembers(ctx context.Context, communityIdentifier string, limit, offset int) ([]*communities.Membership, error) {

     

       91
       91
       +
       	return nil, nil

     

       92
       92
       +
       }

     

       93
       93
       +
       

     

       94
       94
       +
       func (m *subscribeTestService) ValidateHandle(handle string) error {

     

       95
       95
       +
       	return nil

     

       96
       96
       +
       }

     

       97
       97
       +
       

     

       98
       98
       +
       func (m *subscribeTestService) ResolveCommunityIdentifier(ctx context.Context, identifier string) (string, error) {

     

       99
       99
       +
       	return identifier, nil

     

       100
       100
       +
       }

     

       101
       101
       +
       

     

       102
       102
       +
       func (m *subscribeTestService) EnsureFreshToken(ctx context.Context, community *communities.Community) (*communities.Community, error) {

     

       103
       103
       +
       	return community, nil

     

       104
       104
       +
       }

     

       105
       105
       +
       

     

       106
       106
       +
       func (m *subscribeTestService) GetByDID(ctx context.Context, did string) (*communities.Community, error) {

     

       107
       107
       +
       	return nil, nil

     

       108
       108
       +
       }

     

       109
       109
       +
       

     

       110
       110
       +
       func TestSubscribeHandler_Subscribe_Success(t *testing.T) {

     

       111
       111
       +
       	tests := []struct {

     

       112
       112
       +
       		name              string

     

       113
       113
       +
       		community         string

     

       114
       114
       +
       		contentVisibility int

     

       115
       115
       +
       		expectedCommunity string

     

       116
       116
       +
       	}{

     

       117
       117
       +
       		{

     

       118
       118
       +
       			name:              "subscribe with DID",

     

       119
       119
       +
       			community:         "did:plc:community123",

     

       120
       120
       +
       			contentVisibility: 3,

     

       121
       121
       +
       			expectedCommunity: "did:plc:community123",

     

       122
       122
       +
       		},

     

       123
       123
       +
       		{

     

       124
       124
       +
       			name:              "subscribe with canonical handle",

     

       125
       125
       +
       			community:         "c-worldnews.coves.social",

     

       126
       126
       +
       			contentVisibility: 5,

     

       127
       127
       +
       			expectedCommunity: "c-worldnews.coves.social",

     

       128
       128
       +
       		},

     

       129
       129
       +
       		{

     

       130
       130
       +
       			name:              "subscribe with scoped identifier",

     

       131
       131
       +
       			community:         "!worldnews@coves.social",

     

       132
       132
       +
       			contentVisibility: 1,

     

       133
       133
       +
       			expectedCommunity: "!worldnews@coves.social",

     

       134
       134
       +
       		},

     

       135
       135
       +
       		{

     

       136
       136
       +
       			name:              "subscribe with at-identifier",

     

       137
       137
       +
       			community:         "@c-tech.coves.social",

     

       138
       138
       +
       			contentVisibility: 4,

     

       139
       139
       +
       			expectedCommunity: "@c-tech.coves.social",

     

       140
       140
       +
       		},

     

       141
       141
       +
       	}

     

       142
       142
       +
       

     

       143
       143
       +
       	for _, tc := range tests {

     

       144
       144
       +
       		t.Run(tc.name, func(t *testing.T) {

     

       145
       145
       +
       			var receivedIdentifier string

     

       146
       146
       +
       			mockService := &subscribeTestService{

     

       147
       147
       +
       				subscribeFunc: func(ctx context.Context, userDID, accessToken, communityIdentifier string, contentVisibility int) (*communities.Subscription, error) {

     

       148
       148
       +
       					receivedIdentifier = communityIdentifier

     

       149
       149
       +
       					return &communities.Subscription{

     

       150
       150
       +
       						UserDID:      userDID,

     

       151
       151
       +
       						CommunityDID: "did:plc:resolved",

     

       152
       152
       +
       						RecordURI:    "at://did:plc:user/social.coves.community.subscription/abc123",

     

       153
       153
       +
       						RecordCID:    "bafytest123",

     

       154
       154
       +
       						SubscribedAt: time.Now(),

     

       155
       155
       +
       					}, nil

     

       156
       156
       +
       				},

     

       157
       157
       +
       			}

     

       158
       158
       +
       

     

       159
       159
       +
       			handler := NewSubscribeHandler(mockService)

     

       160
       160
       +
       

     

       161
       161
       +
       			reqBody := map[string]interface{}{

     

       162
       162
       +
       				"community":         tc.community,

     

       163
       163
       +
       				"contentVisibility": tc.contentVisibility,

     

       164
       164
       +
       			}

     

       165
       165
       +
       			bodyBytes, _ := json.Marshal(reqBody)

     

       166
       166
       +
       

     

       167
       167
       +
       			req := httptest.NewRequest(http.MethodPost, "/xrpc/social.coves.community.subscribe", bytes.NewBuffer(bodyBytes))

     

       168
       168
       +
       			req.Header.Set("Content-Type", "application/json")

     

       169
       169
       +
       

     

       170
       170
       +
       			// Inject auth context

     

       171
       171
       +
       			ctx := context.WithValue(req.Context(), middleware.UserDIDKey, "did:plc:testuser")

     

       172
       172
       +
       			ctx = context.WithValue(ctx, middleware.UserAccessToken, "test-token")

     

       173
       173
       +
       			req = req.WithContext(ctx)

     

       174
       174
       +
       

     

       175
       175
       +
       			w := httptest.NewRecorder()

     

       176
       176
       +
       			handler.HandleSubscribe(w, req)

     

       177
       177
       +
       

     

       178
       178
       +
       			if w.Code != http.StatusOK {

     

       179
       179
       +
       				t.Errorf("Expected status 200, got %d. Body: %s", w.Code, w.Body.String())

     

       180
       180
       +
       			}

     

       181
       181
       +
       

     

       182
       182
       +
       			// Verify the community identifier was passed through correctly

     

       183
       183
       +
       			if receivedIdentifier != tc.expectedCommunity {

     

       184
       184
       +
       				t.Errorf("Expected community %q to be passed to service, got %q", tc.expectedCommunity, receivedIdentifier)

     

       185
       185
       +
       			}

     

       186
       186
       +
       

     

       187
       187
       +
       			// Verify response structure

     

       188
       188
       +
       			var resp struct {

     

       189
       189
       +
       				URI      string `json:"uri"`

     

       190
       190
       +
       				CID      string `json:"cid"`

     

       191
       191
       +
       				Existing bool   `json:"existing"`

     

       192
       192
       +
       			}

     

       193
       193
       +
       			if err := json.NewDecoder(w.Body).Decode(&resp); err != nil {

     

       194
       194
       +
       				t.Fatalf("Failed to decode response: %v", err)

     

       195
       195
       +
       			}

     

       196
       196
       +
       			if resp.URI == "" || resp.CID == "" {

     

       197
       197
       +
       				t.Errorf("Expected uri and cid in response, got %+v", resp)

     

       198
       198
       +
       			}

     

       199
       199
       +
       		})

     

       200
       200
       +
       	}

     

       201
       201
       +
       }

     

       202
       202
       +
       

     

       203
       203
       +
       func TestSubscribeHandler_Subscribe_RequiresAuth(t *testing.T) {

     

       204
       204
       +
       	mockService := &subscribeTestService{}

     

       205
       205
       +
       	handler := NewSubscribeHandler(mockService)

     

       206
       206
       +
       

     

       207
       207
       +
       	reqBody := map[string]interface{}{

     

       208
       208
       +
       		"community":         "did:plc:test",

     

       209
       209
       +
       		"contentVisibility": 3,

     

       210
       210
       +
       	}

     

       211
       211
       +
       	bodyBytes, _ := json.Marshal(reqBody)

     

       212
       212
       +
       

     

       213
       213
       +
       	req := httptest.NewRequest(http.MethodPost, "/xrpc/social.coves.community.subscribe", bytes.NewBuffer(bodyBytes))

     

       214
       214
       +
       	req.Header.Set("Content-Type", "application/json")

     

       215
       215
       +
       	// No auth context

     

       216
       216
       +
       

     

       217
       217
       +
       	w := httptest.NewRecorder()

     

       218
       218
       +
       	handler.HandleSubscribe(w, req)

     

       219
       219
       +
       

     

       220
       220
       +
       	if w.Code != http.StatusUnauthorized {

     

       221
       221
       +
       		t.Errorf("Expected status 401, got %d", w.Code)

     

       222
       222
       +
       	}

     

       223
       223
       +
       

     

       224
       224
       +
       	var errResp struct {

     

       225
       225
       +
       		Error string `json:"error"`

     

       226
       226
       +
       	}

     

       227
       227
       +
       	if err := json.NewDecoder(w.Body).Decode(&errResp); err != nil {

     

       228
       228
       +
       		t.Fatalf("Failed to decode error response: %v", err)

     

       229
       229
       +
       	}

     

       230
       230
       +
       	if errResp.Error != "AuthRequired" {

     

       231
       231
       +
       		t.Errorf("Expected error AuthRequired, got %s", errResp.Error)

     

       232
       232
       +
       	}

     

       233
       233
       +
       }

     

       234
       234
       +
       

     

       235
       235
       +
       func TestSubscribeHandler_Subscribe_RequiresCommunity(t *testing.T) {

     

       236
       236
       +
       	mockService := &subscribeTestService{}

     

       237
       237
       +
       	handler := NewSubscribeHandler(mockService)

     

       238
       238
       +
       

     

       239
       239
       +
       	reqBody := map[string]interface{}{

     

       240
       240
       +
       		"contentVisibility": 3,

     

       241
       241
       +
       	}

     

       242
       242
       +
       	bodyBytes, _ := json.Marshal(reqBody)

     

       243
       243
       +
       

     

       244
       244
       +
       	req := httptest.NewRequest(http.MethodPost, "/xrpc/social.coves.community.subscribe", bytes.NewBuffer(bodyBytes))

     

       245
       245
       +
       	req.Header.Set("Content-Type", "application/json")

     

       246
       246
       +
       

     

       247
       247
       +
       	ctx := context.WithValue(req.Context(), middleware.UserDIDKey, "did:plc:testuser")

     

       248
       248
       +
       	ctx = context.WithValue(ctx, middleware.UserAccessToken, "test-token")

     

       249
       249
       +
       	req = req.WithContext(ctx)

     

       250
       250
       +
       

     

       251
       251
       +
       	w := httptest.NewRecorder()

     

       252
       252
       +
       	handler.HandleSubscribe(w, req)

     

       253
       253
       +
       

     

       254
       254
       +
       	if w.Code != http.StatusBadRequest {

     

       255
       255
       +
       		t.Errorf("Expected status 400, got %d", w.Code)

     

       256
       256
       +
       	}

     

       257
       257
       +
       }

     

       258
       258
       +
       

     

       259
       259
       +
       func TestSubscribeHandler_Subscribe_ServiceErrors(t *testing.T) {

     

       260
       260
       +
       	tests := []struct {

     

       261
       261
       +
       		name           string

     

       262
       262
       +
       		serviceErr     error

     

       263
       263
       +
       		expectedStatus int

     

       264
       264
       +
       		expectedError  string

     

       265
       265
       +
       	}{

     

       266
       266
       +
       		{

     

       267
       267
       +
       			name:           "community not found",

     

       268
       268
       +
       			serviceErr:     communities.ErrCommunityNotFound,

     

       269
       269
       +
       			expectedStatus: http.StatusNotFound,

     

       270
       270
       +
       			expectedError:  "NotFound",

     

       271
       271
       +
       		},

     

       272
       272
       +
       		{

     

       273
       273
       +
       			name:           "validation error",

     

       274
       274
       +
       			serviceErr:     communities.NewValidationError("community", "invalid format"),

     

       275
       275
       +
       			expectedStatus: http.StatusBadRequest,

     

       276
       276
       +
       			expectedError:  "InvalidRequest",

     

       277
       277
       +
       		},

     

       278
       278
       +
       		{

     

       279
       279
       +
       			name:           "unauthorized",

     

       280
       280
       +
       			serviceErr:     communities.ErrUnauthorized,

     

       281
       281
       +
       			expectedStatus: http.StatusForbidden,

     

       282
       282
       +
       			expectedError:  "Forbidden",

     

       283
       283
       +
       		},

     

       284
       284
       +
       	}

     

       285
       285
       +
       

     

       286
       286
       +
       	for _, tc := range tests {

     

       287
       287
       +
       		t.Run(tc.name, func(t *testing.T) {

     

       288
       288
       +
       			mockService := &subscribeTestService{

     

       289
       289
       +
       				subscribeFunc: func(ctx context.Context, userDID, accessToken, communityIdentifier string, contentVisibility int) (*communities.Subscription, error) {

     

       290
       290
       +
       					return nil, tc.serviceErr

     

       291
       291
       +
       				},

     

       292
       292
       +
       			}

     

       293
       293
       +
       

     

       294
       294
       +
       			handler := NewSubscribeHandler(mockService)

     

       295
       295
       +
       

     

       296
       296
       +
       			reqBody := map[string]interface{}{

     

       297
       297
       +
       				"community":         "did:plc:test",

     

       298
       298
       +
       				"contentVisibility": 3,

     

       299
       299
       +
       			}

     

       300
       300
       +
       			bodyBytes, _ := json.Marshal(reqBody)

     

       301
       301
       +
       

     

       302
       302
       +
       			req := httptest.NewRequest(http.MethodPost, "/xrpc/social.coves.community.subscribe", bytes.NewBuffer(bodyBytes))

     

       303
       303
       +
       			req.Header.Set("Content-Type", "application/json")

     

       304
       304
       +
       

     

       305
       305
       +
       			ctx := context.WithValue(req.Context(), middleware.UserDIDKey, "did:plc:testuser")

     

       306
       306
       +
       			ctx = context.WithValue(ctx, middleware.UserAccessToken, "test-token")

     

       307
       307
       +
       			req = req.WithContext(ctx)

     

       308
       308
       +
       

     

       309
       309
       +
       			w := httptest.NewRecorder()

     

       310
       310
       +
       			handler.HandleSubscribe(w, req)

     

       311
       311
       +
       

     

       312
       312
       +
       			if w.Code != tc.expectedStatus {

     

       313
       313
       +
       				t.Errorf("Expected status %d, got %d. Body: %s", tc.expectedStatus, w.Code, w.Body.String())

     

       314
       314
       +
       			}

     

       315
       315
       +
       

     

       316
       316
       +
       			var errResp struct {

     

       317
       317
       +
       				Error string `json:"error"`

     

       318
       318
       +
       			}

     

       319
       319
       +
       			if err := json.NewDecoder(w.Body).Decode(&errResp); err != nil {

     

       320
       320
       +
       				t.Fatalf("Failed to decode error response: %v", err)

     

       321
       321
       +
       			}

     

       322
       322
       +
       			if errResp.Error != tc.expectedError {

     

       323
       323
       +
       				t.Errorf("Expected error %s, got %s", tc.expectedError, errResp.Error)

     

       324
       324
       +
       			}

     

       325
       325
       +
       		})

     

       326
       326
       +
       	}

     

       327
       327
       +
       }

     

       328
       328
       +
       

     

       329
       329
       +
       func TestSubscribeHandler_Unsubscribe_Success(t *testing.T) {

     

       330
       330
       +
       	tests := []struct {

     

       331
       331
       +
       		name              string

     

       332
       332
       +
       		community         string

     

       333
       333
       +
       		expectedCommunity string

     

       334
       334
       +
       	}{

     

       335
       335
       +
       		{

     

       336
       336
       +
       			name:              "unsubscribe with DID",

     

       337
       337
       +
       			community:         "did:plc:community123",

     

       338
       338
       +
       			expectedCommunity: "did:plc:community123",

     

       339
       339
       +
       		},

     

       340
       340
       +
       		{

     

       341
       341
       +
       			name:              "unsubscribe with canonical handle",

     

       342
       342
       +
       			community:         "c-worldnews.coves.social",

     

       343
       343
       +
       			expectedCommunity: "c-worldnews.coves.social",

     

       344
       344
       +
       		},

     

       345
       345
       +
       		{

     

       346
       346
       +
       			name:              "unsubscribe with scoped identifier",

     

       347
       347
       +
       			community:         "!worldnews@coves.social",

     

       348
       348
       +
       			expectedCommunity: "!worldnews@coves.social",

     

       349
       349
       +
       		},

     

       350
       350
       +
       	}

     

       351
       351
       +
       

     

       352
       352
       +
       	for _, tc := range tests {

     

       353
       353
       +
       		t.Run(tc.name, func(t *testing.T) {

     

       354
       354
       +
       			var receivedIdentifier string

     

       355
       355
       +
       			mockService := &subscribeTestService{

     

       356
       356
       +
       				unsubscribeFunc: func(ctx context.Context, userDID, accessToken, communityIdentifier string) error {

     

       357
       357
       +
       					receivedIdentifier = communityIdentifier

     

       358
       358
       +
       					return nil

     

       359
       359
       +
       				},

     

       360
       360
       +
       			}

     

       361
       361
       +
       

     

       362
       362
       +
       			handler := NewSubscribeHandler(mockService)

     

       363
       363
       +
       

     

       364
       364
       +
       			reqBody := map[string]interface{}{

     

       365
       365
       +
       				"community": tc.community,

     

       366
       366
       +
       			}

     

       367
       367
       +
       			bodyBytes, _ := json.Marshal(reqBody)

     

       368
       368
       +
       

     

       369
       369
       +
       			req := httptest.NewRequest(http.MethodPost, "/xrpc/social.coves.community.unsubscribe", bytes.NewBuffer(bodyBytes))

     

       370
       370
       +
       			req.Header.Set("Content-Type", "application/json")

     

       371
       371
       +
       

     

       372
       372
       +
       			ctx := context.WithValue(req.Context(), middleware.UserDIDKey, "did:plc:testuser")

     

       373
       373
       +
       			ctx = context.WithValue(ctx, middleware.UserAccessToken, "test-token")

     

       374
       374
       +
       			req = req.WithContext(ctx)

     

       375
       375
       +
       

     

       376
       376
       +
       			w := httptest.NewRecorder()

     

       377
       377
       +
       			handler.HandleUnsubscribe(w, req)

     

       378
       378
       +
       

     

       379
       379
       +
       			if w.Code != http.StatusOK {

     

       380
       380
       +
       				t.Errorf("Expected status 200, got %d. Body: %s", w.Code, w.Body.String())

     

       381
       381
       +
       			}

     

       382
       382
       +
       

     

       383
       383
       +
       			if receivedIdentifier != tc.expectedCommunity {

     

       384
       384
       +
       				t.Errorf("Expected community %q to be passed to service, got %q", tc.expectedCommunity, receivedIdentifier)

     

       385
       385
       +
       			}

     

       386
       386
       +
       

     

       387
       387
       +
       			var resp struct {

     

       388
       388
       +
       				Success bool `json:"success"`

     

       389
       389
       +
       			}

     

       390
       390
       +
       			if err := json.NewDecoder(w.Body).Decode(&resp); err != nil {

     

       391
       391
       +
       				t.Fatalf("Failed to decode response: %v", err)

     

       392
       392
       +
       			}

     

       393
       393
       +
       			if !resp.Success {

     

       394
       394
       +
       				t.Errorf("Expected success: true in response")

     

       395
       395
       +
       			}

     

       396
       396
       +
       		})

     

       397
       397
       +
       	}

     

       398
       398
       +
       }

     

       399
       399
       +
       

     

       400
       400
       +
       func TestSubscribeHandler_Unsubscribe_SubscriptionNotFound(t *testing.T) {

     

       401
       401
       +
       	mockService := &subscribeTestService{

     

       402
       402
       +
       		unsubscribeFunc: func(ctx context.Context, userDID, accessToken, communityIdentifier string) error {

     

       403
       403
       +
       			return communities.ErrSubscriptionNotFound

     

       404
       404
       +
       		},

     

       405
       405
       +
       	}

     

       406
       406
       +
       

     

       407
       407
       +
       	handler := NewSubscribeHandler(mockService)

     

       408
       408
       +
       

     

       409
       409
       +
       	reqBody := map[string]interface{}{

     

       410
       410
       +
       		"community": "did:plc:test",

     

       411
       411
       +
       	}

     

       412
       412
       +
       	bodyBytes, _ := json.Marshal(reqBody)

     

       413
       413
       +
       

     

       414
       414
       +
       	req := httptest.NewRequest(http.MethodPost, "/xrpc/social.coves.community.unsubscribe", bytes.NewBuffer(bodyBytes))

     

       415
       415
       +
       	req.Header.Set("Content-Type", "application/json")

     

       416
       416
       +
       

     

       417
       417
       +
       	ctx := context.WithValue(req.Context(), middleware.UserDIDKey, "did:plc:testuser")

     

       418
       418
       +
       	ctx = context.WithValue(ctx, middleware.UserAccessToken, "test-token")

     

       419
       419
       +
       	req = req.WithContext(ctx)

     

       420
       420
       +
       

     

       421
       421
       +
       	w := httptest.NewRecorder()

     

       422
       422
       +
       	handler.HandleUnsubscribe(w, req)

     

       423
       423
       +
       

     

       424
       424
       +
       	if w.Code != http.StatusNotFound {

     

       425
       425
       +
       		t.Errorf("Expected status 404, got %d. Body: %s", w.Code, w.Body.String())

     

       426
       426
       +
       	}

     

       427
       427
       +
       }

     

       428
       428
       +
       

     

       429
       429
       +
       func TestSubscribeHandler_MethodNotAllowed(t *testing.T) {

     

       430
       430
       +
       	mockService := &subscribeTestService{}

     

       431
       431
       +
       	handler := NewSubscribeHandler(mockService)

     

       432
       432
       +
       

     

       433
       433
       +
       	// Test GET on subscribe endpoint

     

       434
       434
       +
       	req := httptest.NewRequest(http.MethodGet, "/xrpc/social.coves.community.subscribe", nil)

     

       435
       435
       +
       	w := httptest.NewRecorder()

     

       436
       436
       +
       	handler.HandleSubscribe(w, req)

     

       437
       437
       +
       

     

       438
       438
       +
       	if w.Code != http.StatusMethodNotAllowed {

     

       439
       439
       +
       		t.Errorf("Expected status 405, got %d", w.Code)

     

       440
       440
       +
       	}

     

       441
       441
       +
       

     

       442
       442
       +
       	// Test GET on unsubscribe endpoint

     

       443
       443
       +
       	req = httptest.NewRequest(http.MethodGet, "/xrpc/social.coves.community.unsubscribe", nil)

     

       444
       444
       +
       	w = httptest.NewRecorder()

     

       445
       445
       +
       	handler.HandleUnsubscribe(w, req)

     

       446
       446
       +
       

     

       447
       447
       +
       	if w.Code != http.StatusMethodNotAllowed {

     

       448
       448
       +
       		t.Errorf("Expected status 405, got %d", w.Code)

     

       449
       449
       +
       	}

     

       450
       450
       +
       }

     

       451
       451
       +
       

     

       452
       452
       +
       func TestSubscribeHandler_InvalidJSON(t *testing.T) {

     

       453
       453
       +
       	mockService := &subscribeTestService{}

     

       454
       454
       +
       	handler := NewSubscribeHandler(mockService)

     

       455
       455
       +
       

     

       456
       456
       +
       	req := httptest.NewRequest(http.MethodPost, "/xrpc/social.coves.community.subscribe", bytes.NewBufferString("invalid json"))

     

       457
       457
       +
       	req.Header.Set("Content-Type", "application/json")

     

       458
       458
       +
       

     

       459
       459
       +
       	ctx := context.WithValue(req.Context(), middleware.UserDIDKey, "did:plc:testuser")

     

       460
       460
       +
       	ctx = context.WithValue(ctx, middleware.UserAccessToken, "test-token")

     

       461
       461
       +
       	req = req.WithContext(ctx)

     

       462
       462
       +
       

     

       463
       463
       +
       	w := httptest.NewRecorder()

     

       464
       464
       +
       	handler.HandleSubscribe(w, req)

     

       465
       465
       +
       

     

       466
       466
       +
       	if w.Code != http.StatusBadRequest {

     

       467
       467
       +
       		t.Errorf("Expected status 400, got %d", w.Code)

     

       468
       468
       +
       	}

     

       469
       469
       +
       }

     

       470
       470
       +
       

     

       471
       471
       +
       func TestSubscribeHandler_RequiresAccessToken(t *testing.T) {

     

       472
       472
       +
       	mockService := &subscribeTestService{}

     

       473
       473
       +
       	handler := NewSubscribeHandler(mockService)

     

       474
       474
       +
       

     

       475
       475
       +
       	reqBody := map[string]interface{}{

     

       476
       476
       +
       		"community": "did:plc:test",

     

       477
       477
       +
       	}

     

       478
       478
       +
       	bodyBytes, _ := json.Marshal(reqBody)

     

       479
       479
       +
       

     

       480
       480
       +
       	req := httptest.NewRequest(http.MethodPost, "/xrpc/social.coves.community.subscribe", bytes.NewBuffer(bodyBytes))

     

       481
       481
       +
       	req.Header.Set("Content-Type", "application/json")

     

       482
       482
       +
       

     

       483
       483
       +
       	// User DID but no access token

     

       484
       484
       +
       	ctx := context.WithValue(req.Context(), middleware.UserDIDKey, "did:plc:testuser")

     

       485
       485
       +
       	req = req.WithContext(ctx)

     

       486
       486
       +
       

     

       487
       487
       +
       	w := httptest.NewRecorder()

     

       488
       488
       +
       	handler.HandleSubscribe(w, req)

     

       489
       489
       +
       

     

       490
       490
       +
       	if w.Code != http.StatusUnauthorized {

     

       491
       491
       +
       		t.Errorf("Expected status 401, got %d", w.Code)

     

       492
       492
       +
       	}

     

       493
       493
       +
       }

     

       494
       494
       +
       

     

       495
       495
       +
       // Ensure unused import is used

     

       496
       496
       +
       var _ = errors.New

+3 -1

internal/api/routes/aggregator.go

···

       5
       5
        
       	"Coves/internal/api/middleware"

     

       6
       6
        
       	"Coves/internal/atproto/identity"

     

       7
       7
        
       	"Coves/internal/core/aggregators"

     

       8
       8
       +
       	"Coves/internal/core/communities"

     

       8
       9
        
       	"Coves/internal/core/users"

     

       9
       10
        
       	"net/http"

     

       10
       11
        
       	"time"

     
···

       17
       18
        
       func RegisterAggregatorRoutes(

     

       18
       19
        
       	r chi.Router,

     

       19
       20
        
       	aggregatorService aggregators.Service,

     

       21
       21
       +
       	communityService communities.Service,

     

       20
       22
        
       	userService users.UserService,

     

       21
       23
        
       	identityResolver identity.Resolver,

     

       22
       24
        
       ) {

     

       23
       25
        
       	// Create query handlers

     

       24
       26
        
       	getServicesHandler := aggregator.NewGetServicesHandler(aggregatorService)

     

       25
       27
        
       	getAuthorizationsHandler := aggregator.NewGetAuthorizationsHandler(aggregatorService)

     

       26
       26
       -
       	listForCommunityHandler := aggregator.NewListForCommunityHandler(aggregatorService)

     

       28
       28
       +
       	listForCommunityHandler := aggregator.NewListForCommunityHandler(aggregatorService, communityService)

     

       27
       29
        
       

     

       28
       30
        
       	// Create registration handler

     

       29
       31
        
       	registerHandler := aggregator.NewRegisterHandler(userService, identityResolver)

Compare changes