diff options
| author | devonh <devon.dmytro@gmail.com> | 2023-06-14 14:23:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-14 14:23:46 +0000 |
| commit | e4665979bfbe006368d55189f074e456fe19b198 (patch) | |
| tree | e909d694a022478d0dbe3cc58ee8a2dc289bc969 /syncapi/routing/messages.go | |
| parent | 7a2e325d1014d76188b47a011730a42443f3c174 (diff) | |
Merge SenderID & Per Room User Key work (#3109)
Diffstat (limited to 'syncapi/routing/messages.go')
| -rw-r--r-- | syncapi/routing/messages.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/syncapi/routing/messages.go b/syncapi/routing/messages.go index 6784a27b..937e20ad 100644 --- a/syncapi/routing/messages.go +++ b/syncapi/routing/messages.go @@ -273,7 +273,7 @@ func OnIncomingMessagesRequest( JSON: spec.InternalServerError{}, } } - res.State = append(res.State, synctypes.ToClientEvents(gomatrixserverlib.ToPDUs(membershipEvents), synctypes.FormatAll, func(roomID string, senderID spec.SenderID) (*spec.UserID, error) { + res.State = append(res.State, synctypes.ToClientEvents(gomatrixserverlib.ToPDUs(membershipEvents), synctypes.FormatAll, func(roomID spec.RoomID, senderID spec.SenderID) (*spec.UserID, error) { return rsAPI.QueryUserIDForSender(req.Context(), roomID, senderID) })...) } @@ -389,7 +389,7 @@ func (r *messagesReq) retrieveEvents(ctx context.Context, rsAPI api.SyncRoomserv "events_before": len(events), "events_after": len(filteredEvents), }).Debug("applied history visibility (messages)") - return synctypes.ToClientEvents(gomatrixserverlib.ToPDUs(filteredEvents), synctypes.FormatAll, func(roomID string, senderID spec.SenderID) (*spec.UserID, error) { + return synctypes.ToClientEvents(gomatrixserverlib.ToPDUs(filteredEvents), synctypes.FormatAll, func(roomID spec.RoomID, senderID spec.SenderID) (*spec.UserID, error) { return rsAPI.QueryUserIDForSender(ctx, roomID, senderID) }), start, end, err } |