commit e31a00e9b4b8546022bfeabf78097a7d23ee31af · bretton.dev/coves

+30 -12

internal/atproto/jetstream/community_consumer.go

···

       75
       75
        
       	}

     

       76
       76
        
       

     

       77
       77
        
       	// Build AT-URI for this record

     

       78
       78
       -
       	// IMPORTANT: 'did' parameter is the repository owner (instance DID)

     

       79
       79
       -
       	// The community's DID comes from profile.Did field in the record

     

       80
       80
       -
       	uri := fmt.Sprintf("at://%s/social.coves.community.profile/%s", did, commit.RKey)

     

       78
       78
       +
       	// V2 Architecture (ONLY):

     

       79
       79
       +
       	//   - 'did' parameter IS the community DID (community owns its own repo)

     

       80
       80
       +
       	//   - rkey MUST be "self" for community profiles

     

       81
       81
       +
       	//   - URI: at://community_did/social.coves.community.profile/self

     

       82
       82
       +
       

     

       83
       83
       +
       	// REJECT non-V2 communities (pre-production: no V1 compatibility)

     

       84
       84
       +
       	if commit.RKey != "self" {

     

       85
       85
       +
       		return fmt.Errorf("invalid community profile rkey: expected 'self', got '%s' (V1 communities not supported)", commit.RKey)

     

       86
       86
       +
       	}

     

       87
       87
       +
       

     

       88
       88
       +
       	uri := fmt.Sprintf("at://%s/social.coves.community.profile/self", did)

     

       89
       89
       +
       

     

       90
       90
       +
       	// V2: Community ALWAYS owns itself

     

       91
       91
       +
       	ownerDID := did

     

       81
       92
        
       

     

       82
       93
        
       	// Create community entity

     

       83
       94
        
       	community := &communities.Community{

     

       84
       84
       -
       		DID:                    profile.Did, // Community's unique DID from record, not repo owner!

     

       95
       95
       +
       		DID:                    did,         // V2: Repository DID IS the community DID

     

       85
       96
        
       		Handle:                 profile.Handle,

     

       86
       97
        
       		Name:                   profile.Name,

     

       87
       98
        
       		DisplayName:            profile.DisplayName,

     

       88
       99
        
       		Description:            profile.Description,

     

       89
       89
       -
       		OwnerDID:               profile.Owner,

     

       100
       100
       +
       		OwnerDID:               ownerDID,    // V2: same as DID (self-owned)

     

       90
       101
        
       		CreatedByDID:           profile.CreatedBy,

     

       91
       102
        
       		HostedByDID:            profile.HostedBy,

     

       92
       103
        
       		Visibility:             profile.Visibility,

     
···

       140
       151
        
       		return fmt.Errorf("community profile update event missing record data")

     

       141
       152
        
       	}

     

       142
       153
        
       

     

       143
       143
       -
       	// Parse profile to get the community DID

     

       154
       154
       +
       	// REJECT non-V2 communities (pre-production: no V1 compatibility)

     

       155
       155
       +
       	if commit.RKey != "self" {

     

       156
       156
       +
       		return fmt.Errorf("invalid community profile rkey: expected 'self', got '%s' (V1 communities not supported)", commit.RKey)

     

       157
       157
       +
       	}

     

       158
       158
       +
       

     

       159
       159
       +
       	// Parse profile

     

       144
       160
        
       	profile, err := parseCommunityProfile(commit.Record)

     

       145
       161
        
       	if err != nil {

     

       146
       162
        
       		return fmt.Errorf("failed to parse community profile: %w", err)

     

       147
       163
        
       	}

     

       148
       164
        
       

     

       149
       149
       -
       	// Get existing community using the community DID from the record, not repo owner

     

       150
       150
       -
       	existing, err := c.repo.GetByDID(ctx, profile.Did)

     

       165
       165
       +
       	// V2: Repository DID IS the community DID

     

       166
       166
       +
       	// Get existing community using the repo DID

     

       167
       167
       +
       	existing, err := c.repo.GetByDID(ctx, did)

     

       151
       168
        
       	if err != nil {

     

       152
       169
        
       		if communities.IsNotFound(err) {

     

       153
       170
        
       			// Community doesn't exist yet - treat as create

     

       154
       154
       -
       			log.Printf("Community not found for update, creating: %s", profile.Did)

     

       171
       171
       +
       			log.Printf("Community not found for update, creating: %s", did)

     

       155
       172
        
       			return c.createCommunity(ctx, did, commit)

     

       156
       173
        
       		}

     

       157
       174
        
       		return fmt.Errorf("failed to get existing community: %w", err)

     
···

       279
       296
        
       // Helper types and functions

     

       280
       297
        
       

     

       281
       298
        
       type CommunityProfile struct {

     

       282
       282
       -
       	Did                 string                   `json:"did"`         // Community's unique DID

     

       283
       283
       -
       	Handle              string                   `json:"handle"`

     

       299
       299
       +
       	// V2 ONLY: No DID field (repo DID is authoritative)

     

       300
       300
       +
       	Handle              string                   `json:"handle"`            // Scoped handle (!gaming@coves.social)

     

       301
       301
       +
       	AtprotoHandle       string                   `json:"atprotoHandle"`     // Real atProto handle (gaming.communities.coves.social)

     

       284
       302
        
       	Name                string                   `json:"name"`

     

       285
       303
        
       	DisplayName         string                   `json:"displayName"`

     

       286
       304
        
       	Description         string                   `json:"description"`

     

       287
       305
        
       	DescriptionFacets   []interface{}            `json:"descriptionFacets"`

     

       288
       306
        
       	Avatar              map[string]interface{}   `json:"avatar"`

     

       289
       307
        
       	Banner              map[string]interface{}   `json:"banner"`

     

       290
       290
       -
       	Owner               string                   `json:"owner"`

     

       308
       308
       +
       	// Owner field removed - V2 communities ALWAYS self-own (owner == repo DID)

     

       291
       309
        
       	CreatedBy           string                   `json:"createdBy"`

     

       292
       310
        
       	HostedBy            string                   `json:"hostedBy"`

     

       293
       311
        
       	Visibility          string                   `json:"visibility"`

+8 -1

internal/core/communities/community.go

···

       20
       20
        
       	BannerCID string `json:"bannerCid,omitempty" db:"banner_cid"` // CID of banner image

     

       21
       21
        
       

     

       22
       22
        
       	// Ownership

     

       23
       23
       -
       	OwnerDID     string `json:"ownerDid" db:"owner_did"`           // Instance DID in V1, community DID in V3

     

       23
       23
       +
       	OwnerDID     string `json:"ownerDid" db:"owner_did"`           // V2: same as DID (community owns itself)

     

       24
       24
        
       	CreatedByDID string `json:"createdByDid" db:"created_by_did"`  // User who created the community

     

       25
       25
        
       	HostedByDID  string `json:"hostedByDid" db:"hosted_by_did"`    // Instance hosting this community

     

       26
       26
       +
       

     

       27
       27
       +
       	// V2: PDS Account Credentials (NEVER expose in public API responses!)

     

       28
       28
       +
       	PDSEmail        string `json:"-" db:"pds_email"`          // System email for PDS account

     

       29
       29
       +
       	PDSPasswordHash string `json:"-" db:"pds_password_hash"`  // bcrypt hash for re-authentication

     

       30
       30
       +
       	PDSAccessToken  string `json:"-" db:"pds_access_token"`   // JWT for API calls (expires)

     

       31
       31
       +
       	PDSRefreshToken string `json:"-" db:"pds_refresh_token"`  // For refreshing sessions

     

       32
       32
       +
       	PDSURL          string `json:"-" db:"pds_url"`            // PDS hosting this community's repo

     

       26
       33
        
       

     

       27
       34
        
       	// Visibility & Federation

     

       28
       35
        
       	Visibility              string `json:"visibility" db:"visibility"`                               // public, unlisted, private