hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-08-01 13:52:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into neilalexander/nats

Browse source
This commit is contained in:
Neil Alexander 2021-07-21 13:37:04 +01:00
commit 554d15fc8e
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
71 changed files with 1426 additions and 848 deletions
Download patch file Download diff file Expand all files Collapse all files

2
syncapi/routing/messages.go
View file

@ -393,7 +393,7 @@ func (r *messagesReq) getStartEnd(events []*gomatrixserverlib.HeaderedEvent) (st
start = *r.from
if events[len(events)-1].Type() == gomatrixserverlib.MRoomCreate {
// NOTSPEC: We've hit the beginning of the room so there's really nowhere
// else to go. This seems to fix Riot iOS from looping on /messages endlessly.
// else to go. This seems to fix Element iOS from looping on /messages endlessly.
end = types.TopologyToken{}
} else {
end, err = r.db.EventPositionInTopology(

3
syncapi/storage/sqlite3/syncserver.go
View file

@ -18,9 +18,6 @@ package sqlite3
import (
"database/sql"
// Import the sqlite3 package
_ "github.com/mattn/go-sqlite3"
"github.com/matrix-org/dendrite/internal/sqlutil"
"github.com/matrix-org/dendrite/setup/config"
"github.com/matrix-org/dendrite/syncapi/storage/shared"