commit df964fa89565237f1e5ce1f44d09a329e8effbbb · bretton.dev/coves

+17 -3
internal/core/communities/service.go
···

       554
       554
        
       	// 3. This avoids a race condition where two concurrent requests both pass the check

     

       555
       555
        
       	recordURI, recordCID, err := s.createRecordOnPDSAs(ctx, userDID, "social.coves.community.block", "", blockRecord, userAccessToken)

     

       556
       556
        
       	if err != nil {

     

       557
       557
       -
       		// Check if this is a duplicate error from PDS

     

       557
       557
       +
       		// Check if this is a duplicate/conflict error from PDS

     

       558
       558
       +
       		// PDS should return 409 Conflict for duplicate records, but we also check common error messages

     

       559
       559
       +
       		// for compatibility with different PDS implementations

     

       558
       560
        
       		errMsg := err.Error()

     

       559
       559
       -
       		if strings.Contains(errMsg, "duplicate") || strings.Contains(errMsg, "already exists") {

     

       561
       561
       +
       		isDuplicate := strings.Contains(errMsg, "status 409") || // HTTP 409 Conflict

     

       562
       562
       +
       			strings.Contains(errMsg, "duplicate") ||

     

       563
       563
       +
       			strings.Contains(errMsg, "already exists") ||

     

       564
       564
       +
       			strings.Contains(errMsg, "AlreadyExists")

     

       565
       565
       +
       

     

       566
       566
       +
       		if isDuplicate {

     

       560
       567
        
       			// Fetch and return existing block from our indexed view

     

       561
       568
        
       			existingBlock, getErr := s.repo.GetBlock(ctx, userDID, communityDID)

     

       562
       569
        
       			if getErr == nil {

     
···

       652
       659
        
       		return "", ErrInvalidInput

     

       653
       660
        
       	}

     

       654
       661
        
       

     

       655
       655
       -
       	// If it's already a DID, return it

     

       662
       662
       +
       	// If it's already a DID, verify the community exists

     

       656
       663
        
       	if strings.HasPrefix(identifier, "did:") {

     

       664
       664
       +
       		_, err := s.repo.GetByDID(ctx, identifier)

     

       665
       665
       +
       		if err != nil {

     

       666
       666
       +
       			if IsNotFound(err) {

     

       667
       667
       +
       				return "", fmt.Errorf("community not found: %w", err)

     

       668
       668
       +
       			}

     

       669
       669
       +
       			return "", fmt.Errorf("failed to verify community DID: %w", err)

     

       670
       670
       +
       		}

     

       657
       671
        
       		return identifier, nil

     

       658
       672
        
       	}

     

       659
       673