From c2d57b8679a72eeb688d990eccfe7e6c3a46aa6b Mon Sep 17 00:00:00 2001 From: John Terzis Date: Fri, 14 Oct 2022 19:20:51 -0700 Subject: [PATCH] merge latest changes from dendrite main (#42) * merge latest changes from dendrite main * fix go formatting Co-authored-by: John Terzis Co-authored-by: Tak Wai Wong <64229756+tak-hntlabs@users.noreply.github.com> --- go.mod | 3 +-- syncapi/types/types.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4e8612f99..2f4fdadcd 100644 --- a/go.mod +++ b/go.mod @@ -41,6 +41,7 @@ require ( github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.13.0 github.com/sirupsen/logrus v1.9.0 + github.com/spruceid/siwe-go v0.2.0 github.com/stretchr/testify v1.8.0 github.com/tidwall/gjson v1.14.3 github.com/tidwall/sjson v1.2.5 @@ -102,7 +103,6 @@ require ( github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/h2non/filetype v1.1.3 // indirect - github.com/joho/godotenv v1.4.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/juju/errors v1.0.0 // indirect github.com/klauspost/compress v1.15.11 // indirect @@ -132,7 +132,6 @@ require ( github.com/relvacode/iso8601 v1.1.0 // indirect github.com/rjeczalik/notify v0.9.1 // indirect github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect - github.com/spruceid/siwe-go v0.2.0 // indirect github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.1 // indirect github.com/tklauser/go-sysconf v0.3.5 // indirect diff --git a/syncapi/types/types.go b/syncapi/types/types.go index a8ae18fde..f21993da4 100644 --- a/syncapi/types/types.go +++ b/syncapi/types/types.go @@ -407,7 +407,7 @@ func (r *Response) HasUpdates() bool { func NewResponse() *Response { res := Response{} // Pre-initialise the maps. Synapse will return {} even if there are no rooms under a specific section, - // so let's do the same thing. Bonus: this means we can't get dreaded 'assignment to entry in nil map' errors. + // so let's do the same thing. Bonus this means we can't get dreaded 'assignment to entry in nil map' errors. res.Rooms = &RoomsResponse{ Join: map[string]*JoinResponse{},