mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-03 04:03:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Review comments @S7evinK

Browse source
This commit is contained in:
Neil Alexander 2022-04-04 13:32:08 +01:00
parent bef66cefc7
commit 208d3171e7
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roomserver/api/api_trace.go
View file

@ -73,7 +73,7 @@ func (t *RoomserverInternalAPITrace) PerformRoomUpgrade(
res *PerformRoomUpgradeResponse, res *PerformRoomUpgradeResponse,
) { ) {
t.Impl.PerformRoomUpgrade(ctx, req, res) t.Impl.PerformRoomUpgrade(ctx, req, res)
util.GetLogger(ctx).Infof("PerformUnpeek req=%+v res=%+v", js(req), js(res)) util.GetLogger(ctx).Infof("PerformRoomUpgrade req=%+v res=%+v", js(req), js(res))
} }
func (t *RoomserverInternalAPITrace) PerformJoin( func (t *RoomserverInternalAPITrace) PerformJoin(

6
roomserver/internal/perform/perform_upgrade.go
View file

@ -300,7 +300,7 @@ func (r *Upgrader) userIsAuthorized(ctx context.Context, userID, roomID string,
if err != nil { if err != nil {
return false return false
} }
// Check for power level required to send tombstone event (marks the curren room as obsolete), // Check for power level required to send tombstone event (marks the current room as obsolete),
// if not found, use the StateDefault power level // if not found, use the StateDefault power level
plToUpgrade, ok := pl.Events["m.room.tombstone"] plToUpgrade, ok := pl.Events["m.room.tombstone"]
if !ok { if !ok {
@ -384,9 +384,7 @@ func (r *Upgrader) generateInitialEvents(ctx context.Context, userID, roomID, ne
Content: newCreateContent, Content: newCreateContent,
} }
membershipContent := gomatrixserverlib.MemberContent{ membershipContent := gomatrixserverlib.MemberContent{}
Membership: gomatrixserverlib.Join,
}
if err := json.Unmarshal(oldMembershipEvent.Content(), &membershipContent); err != nil { if err := json.Unmarshal(oldMembershipEvent.Content(), &membershipContent); err != nil {
util.GetLogger(ctx).WithError(err).Error() util.GetLogger(ctx).WithError(err).Error()
return nil, &api.PerformError{ return nil, &api.PerformError{