mirror of
https://github.com/matrix-org/dendrite.git
synced 2026-01-16 10:33:11 -06:00
Remove duplication
This commit is contained in:
parent
48ea4b5bfc
commit
0873d83d82
|
|
@ -296,11 +296,6 @@ func (r *Joiner) performJoinRoomByID(
|
||||||
case nil:
|
case nil:
|
||||||
// create user room key if needed
|
// create user room key if needed
|
||||||
if buildRes.RoomVersion == gomatrixserverlib.RoomVersionPseudoIDs {
|
if buildRes.RoomVersion == gomatrixserverlib.RoomVersionPseudoIDs {
|
||||||
var roomID *spec.RoomID
|
|
||||||
roomID, err = spec.NewRoomID(req.RoomIDOrAlias)
|
|
||||||
if err != nil {
|
|
||||||
return "", "", rsAPI.ErrInvalidID{Err: fmt.Errorf("room ID %q is invalid: %w", req.RoomIDOrAlias, err)}
|
|
||||||
}
|
|
||||||
_, err = r.RSAPI.GetUserRoomPrivateKey(ctx, *userID, *roomID)
|
_, err = r.RSAPI.GetUserRoomPrivateKey(ctx, *userID, *roomID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
util.GetLogger(ctx).WithError(err).Error("GetUserRoomPrivateKey failed")
|
util.GetLogger(ctx).WithError(err).Error("GetUserRoomPrivateKey failed")
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue