From 4cf7c081461b38c787847da126da15d12285179c Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Tue, 4 Aug 2020 12:02:13 +0100 Subject: [PATCH] Fix response format for federation /devices requests --- federationapi/routing/devices.go | 2 +- go.mod | 2 +- go.sum | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/federationapi/routing/devices.go b/federationapi/routing/devices.go index 0d1d85b40..00631b9b6 100644 --- a/federationapi/routing/devices.go +++ b/federationapi/routing/devices.go @@ -53,7 +53,7 @@ func GetUserDevices( device := gomatrixserverlib.RespUserDevice{ DeviceID: dev.DeviceID, DisplayName: dev.DisplayName, - Keys: []gomatrixserverlib.RespUserDeviceKeys{key}, + Keys: key, } response.Devices = append(response.Devices, device) } diff --git a/go.mod b/go.mod index f956a46ac..6e56a4fc0 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/matrix-org/go-http-js-libp2p v0.0.0-20200518170932-783164aeeda4 github.com/matrix-org/go-sqlite3-js v0.0.0-20200522092705-bc8506ccbcf3 github.com/matrix-org/gomatrix v0.0.0-20190528120928-7df988a63f26 - github.com/matrix-org/gomatrixserverlib v0.0.0-20200803165739-3bd1ef0f0852 + github.com/matrix-org/gomatrixserverlib v0.0.0-20200804110046-7abbc2918807 github.com/matrix-org/naffka v0.0.0-20200422140631-181f1ee7401f github.com/matrix-org/util v0.0.0-20190711121626-527ce5ddefc7 github.com/mattn/go-sqlite3 v2.0.2+incompatible diff --git a/go.sum b/go.sum index 76bd338a2..68d36174b 100644 --- a/go.sum +++ b/go.sum @@ -429,6 +429,8 @@ github.com/matrix-org/gomatrixserverlib v0.0.0-20200803165250-352235625587 h1:n2 github.com/matrix-org/gomatrixserverlib v0.0.0-20200803165250-352235625587/go.mod h1:JsAzE1Ll3+gDWS9JSUHPJiiyAksvOOnGWF2nXdg4ZzU= github.com/matrix-org/gomatrixserverlib v0.0.0-20200803165739-3bd1ef0f0852 h1:OBvHjLWaT2KS9kGarX2ES0yKBL/wMxAeQB39tRrAAls= github.com/matrix-org/gomatrixserverlib v0.0.0-20200803165739-3bd1ef0f0852/go.mod h1:JsAzE1Ll3+gDWS9JSUHPJiiyAksvOOnGWF2nXdg4ZzU= +github.com/matrix-org/gomatrixserverlib v0.0.0-20200804110046-7abbc2918807 h1:ufr+e2FBDuxcO5t/7PMfoiQoma4uyYzS/sLuJSR6tng= +github.com/matrix-org/gomatrixserverlib v0.0.0-20200804110046-7abbc2918807/go.mod h1:JsAzE1Ll3+gDWS9JSUHPJiiyAksvOOnGWF2nXdg4ZzU= github.com/matrix-org/naffka v0.0.0-20200422140631-181f1ee7401f h1:pRz4VTiRCO4zPlEMc3ESdUOcW4PXHH4Kj+YDz1XyE+Y= github.com/matrix-org/naffka v0.0.0-20200422140631-181f1ee7401f/go.mod h1:y0oDTjZDv5SM9a2rp3bl+CU+bvTRINQsdb7YlDql5Go= github.com/matrix-org/util v0.0.0-20190711121626-527ce5ddefc7 h1:ntrLa/8xVzeSs8vHFHK25k0C+NV74sYMJnNSg5NoSRo=