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

Merge branch 'master' of https://github.com/matrix-org/dendrite into add-nats-support

Browse source
This commit is contained in:
Till Faelligen 2021-07-24 11:27:24 +02:00
commit a833f5764a
48 changed files with 700 additions and 298 deletions
Download patch file Download diff file Expand all files Collapse all files

2
syncapi/consumers/roomserver.go
View file

@ -379,7 +379,7 @@ func (s *OutputRoomEventConsumer) updateStateEvent(event *gomatrixserverlib.Head
return event, err
}
if prevEvent == nil {
if prevEvent == nil || prevEvent.EventID() == event.EventID() {
return event, nil
}

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"