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

Fix merge conflicts

Browse source
This commit is contained in:
Kegan Dougal 2023-04-27 12:22:08 +01:00
parent bfc1924061
commit 891948f991
4 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
clientapi/routing/profile.go
View file

@ -339,11 +339,6 @@ func buildMembershipEvents(
evs := []*types.HeaderedEvent{} evs := []*types.HeaderedEvent{}
for _, roomID := range roomIDs { for _, roomID := range roomIDs {
roomVersion, err := rsAPI.QueryRoomVersionForRoom(ctx, roomID)
if err != nil {
return nil, err
}
builder := gomatrixserverlib.EventBuilder{ builder := gomatrixserverlib.EventBuilder{
Sender: userID, Sender: userID,
RoomID: roomID, RoomID: roomID,
@ -358,7 +353,7 @@ func buildMembershipEvents(
content.DisplayName = newProfile.DisplayName content.DisplayName = newProfile.DisplayName
content.AvatarURL = newProfile.AvatarURL content.AvatarURL = newProfile.AvatarURL
if err = builder.SetContent(content); err != nil { if err := builder.SetContent(content); err != nil {
return nil, err return nil, err
} }

2
federationapi/routing/threepid.go
View file

@ -70,7 +70,7 @@ func CreateInvitesFrom3PIDInvites(
evs := []*types.HeaderedEvent{} evs := []*types.HeaderedEvent{}
for _, inv := range body.Invites { for _, inv := range body.Invites {
roomVersion, err := rsAPI.QueryRoomVersionForRoom(req.Context(), inv.RoomID) _, err := rsAPI.QueryRoomVersionForRoom(req.Context(), inv.RoomID)
if err != nil { if err != nil {
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusBadRequest,

4
roomserver/internal/query/query.go
View file

@ -521,10 +521,6 @@ func (r *Queryer) QueryMissingEvents(
response.Events = make([]*types.HeaderedEvent, 0, len(loadedEvents)-len(eventsToFilter)) response.Events = make([]*types.HeaderedEvent, 0, len(loadedEvents)-len(eventsToFilter))
for _, event := range loadedEvents { for _, event := range loadedEvents {
if !eventsToFilter[event.EventID()] { if !eventsToFilter[event.EventID()] {
_, verr := r.roomVersion(event.RoomID())
if verr != nil {
return verr
}
if _, ok := redactEventIDs[event.EventID()]; ok { if _, ok := redactEventIDs[event.EventID()]; ok {
event.Redact() event.Redact()
} }

2
roomserver/storage/shared/storage.go
View file

@ -1207,7 +1207,7 @@ func (d *Database) GetStateEvent(ctx context.Context, roomID, evType, stateKey s
if e.EventTypeNID == eventTypeNID && e.EventStateKeyNID == stateKeyNID { if e.EventTypeNID == eventTypeNID && e.EventStateKeyNID == stateKeyNID {
cachedEvent, ok := d.Cache.GetRoomServerEvent(e.EventNID) cachedEvent, ok := d.Cache.GetRoomServerEvent(e.EventNID)
if ok { if ok {
return cachedEvent.Headered(roomInfo.RoomVersion), nil return &types.HeaderedEvent{Event: cachedEvent}, nil
} }
data, err := d.EventJSONTable.BulkSelectEventJSON(ctx, nil, []types.EventNID{e.EventNID}) data, err := d.EventJSONTable.BulkSelectEventJSON(ctx, nil, []types.EventNID{e.EventNID})
if err != nil { if err != nil {