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

Merge branch 'main' into sender-split

Browse source
This commit is contained in:
Devon Hudson 2023-06-05 20:20:21 -06:00
parent d7e41177f3 d11da6ec7c
commit 57f8222166
No known key found for this signature in database
GPG key ID: CD06B18E77F6A628
4 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
roomserver/internal/perform/perform_peek.go
View file

@ -157,7 +157,7 @@ func (r *Peeker) performPeekRoomByID(
content := map[string]string{} content := map[string]string{}
if err = json.Unmarshal(ev.Content(), &content); err != nil { if err = json.Unmarshal(ev.Content(), &content); err != nil {
util.GetLogger(ctx).WithError(err).Error("json.Unmarshal for history visibility failed") util.GetLogger(ctx).WithError(err).Error("json.Unmarshal for history visibility failed")
return return "", err
} }
if visibility, ok := content["history_visibility"]; ok { if visibility, ok := content["history_visibility"]; ok {
worldReadable = visibility == "world_readable" worldReadable = visibility == "world_readable"
@ -185,7 +185,7 @@ func (r *Peeker) performPeekRoomByID(
}, },
}) })
if err != nil { if err != nil {
return return "", err
} }
// By this point, if req.RoomIDOrAlias contained an alias, then // By this point, if req.RoomIDOrAlias contained an alias, then

7
syncapi/routing/messages.go
View file

@ -316,11 +316,12 @@ func (r *messagesReq) retrieveEvents(ctx context.Context, rsAPI api.SyncRoomserv
clientEvents []synctypes.ClientEvent, start, clientEvents []synctypes.ClientEvent, start,
end types.TopologyToken, err error, end types.TopologyToken, err error,
) { ) {
emptyToken := types.TopologyToken{}
// Retrieve the events from the local database. // Retrieve the events from the local database.
streamEvents, err := r.snapshot.GetEventsInTopologicalRange(r.ctx, r.from, r.to, r.roomID, r.filter, r.backwardOrdering) streamEvents, err := r.snapshot.GetEventsInTopologicalRange(r.ctx, r.from, r.to, r.roomID, r.filter, r.backwardOrdering)
if err != nil { if err != nil {
err = fmt.Errorf("GetEventsInRange: %w", err) err = fmt.Errorf("GetEventsInRange: %w", err)
return return []synctypes.ClientEvent{}, emptyToken, emptyToken, err
} }
var events []*rstypes.HeaderedEvent var events []*rstypes.HeaderedEvent
@ -335,11 +336,11 @@ func (r *messagesReq) retrieveEvents(ctx context.Context, rsAPI api.SyncRoomserv
// on the ordering), or we've reached a backward extremity. // on the ordering), or we've reached a backward extremity.
if len(streamEvents) == 0 { if len(streamEvents) == 0 {
if events, err = r.handleEmptyEventsSlice(); err != nil { if events, err = r.handleEmptyEventsSlice(); err != nil {
return return []synctypes.ClientEvent{}, emptyToken, emptyToken, err
} }
} else { } else {
if events, err = r.handleNonEmptyEventsSlice(streamEvents); err != nil { if events, err = r.handleNonEmptyEventsSlice(streamEvents); err != nil {
return return []synctypes.ClientEvent{}, emptyToken, emptyToken, err
} }
} }

4
syncapi/streams/stream_pdu.go
View file

@ -501,7 +501,7 @@ func (p *PDUStreamProvider) getJoinResponseForCompleteSync(
stateEvents, err := snapshot.CurrentState(ctx, roomID, stateFilter, excludingEventIDs) stateEvents, err := snapshot.CurrentState(ctx, roomID, stateFilter, excludingEventIDs)
if err != nil { if err != nil {
return return jr, err
} }
jr.Summary, err = snapshot.GetRoomSummary(ctx, roomID, device.UserID) jr.Summary, err = snapshot.GetRoomSummary(ctx, roomID, device.UserID)
@ -554,7 +554,7 @@ func (p *PDUStreamProvider) getJoinResponseForCompleteSync(
} }
backwardTopologyPos, backwardStreamPos, err = snapshot.PositionInTopology(ctx, event.EventID()) backwardTopologyPos, backwardStreamPos, err = snapshot.PositionInTopology(ctx, event.EventID())
if err != nil { if err != nil {
return return jr, err
} }
prevBatch = &types.TopologyToken{ prevBatch = &types.TopologyToken{
Depth: backwardTopologyPos, Depth: backwardTopologyPos,

4
userapi/storage/shared/storage.go
View file

@ -644,7 +644,7 @@ func (d *Database) CreateDevice(
for i := 1; i <= 5; i++ { for i := 1; i <= 5; i++ {
newDeviceID, returnErr = generateDeviceID() newDeviceID, returnErr = generateDeviceID()
if returnErr != nil { if returnErr != nil {
return return nil, returnErr
} }
returnErr = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error { returnErr = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error {
@ -653,7 +653,7 @@ func (d *Database) CreateDevice(
return err return err
}) })
if returnErr == nil { if returnErr == nil {
return return dev, nil
} }
} }
} }