crypto: remove group session already shared error

tulir · tulir · commit 87d599c491fe · 2025-08-09T17:42:34.000+03:00
diff --git a/crypto/encryptmegolm.go b/crypto/encryptmegolm.go
@@ -25,7 +25,6 @@ import (
 )
 
 var (
-	AlreadyShared  = errors.New("group session already shared")
 	NoGroupSession = errors.New("no group session created")
 )
 
@@ -209,7 +208,8 @@ func (mach *OlmMachine) ShareGroupSession(ctx context.Context, roomID id.RoomID,
 	if err != nil {
 		return fmt.Errorf("failed to get previous outbound group session: %w", err)
 	} else if session != nil && session.Shared && !session.Expired() {
-		return AlreadyShared
+		mach.machOrContextLog(ctx).Debug().Stringer("room_id", roomID).Msg("Not re-sharing group session, already shared")
+		return nil
 	}
 	log := mach.machOrContextLog(ctx).With().
 		Str("room_id", roomID.String()).

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ import (`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`var (`
`28`		`- AlreadyShared = errors.New("group session already shared")`
`29`	`28`	`NoGroupSession = errors.New("no group session created")`
`30`	`29`	`)`
`31`	`30`
`@@ -209,7 +208,8 @@ func (mach *OlmMachine) ShareGroupSession(ctx context.Context, roomID id.RoomID,`
`209`	`208`	`if err != nil {`
`210`	`209`	`return fmt.Errorf("failed to get previous outbound group session: %w", err)`
`211`	`210`	`} else if session != nil && session.Shared && !session.Expired() {`
`212`		`- return AlreadyShared`
	`211`	`+ mach.machOrContextLog(ctx).Debug().Stringer("room_id", roomID).Msg("Not re-sharing group session, already shared")`
	`212`	`+ return nil`
`213`	`213`	`}`
`214`	`214`	`log := mach.machOrContextLog(ctx).With().`
`215`	`215`	`Str("room_id", roomID.String()).`