aboutsummaryrefslogtreecommitdiff
path: root/clientapi
diff options
context:
space:
mode:
authorKegsay <kegan@matrix.org>2020-06-04 11:50:57 +0100
committerGitHub <noreply@github.com>2020-06-04 11:50:57 +0100
commit097cdf879cb83324e238ee489354e87d77ee4dc9 (patch)
treef415d916f20431cbb86de797fd3a475d0394a51b /clientapi
parente7d1ac84c32a10f8deb7bcfc94531386312179c7 (diff)
s/Base64String/Base64Bytes/g (#1093)
* s/Base64String/Base64Bytes/g Requires https://github.com/matrix-org/gomatrixserverlib/pull/203 to land first * update gmsl
Diffstat (limited to 'clientapi')
-rw-r--r--clientapi/auth/storage/accounts/sqlite3/constraint_wasm.go2
-rw-r--r--clientapi/threepid/invites.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/clientapi/auth/storage/accounts/sqlite3/constraint_wasm.go b/clientapi/auth/storage/accounts/sqlite3/constraint_wasm.go
index b5077c07..0dd5b1fe 100644
--- a/clientapi/auth/storage/accounts/sqlite3/constraint_wasm.go
+++ b/clientapi/auth/storage/accounts/sqlite3/constraint_wasm.go
@@ -18,4 +18,4 @@ package sqlite3
func isConstraintError(err error) bool {
return false
-} \ No newline at end of file
+}
diff --git a/clientapi/threepid/invites.go b/clientapi/threepid/invites.go
index 8fed9956..8f173bf8 100644
--- a/clientapi/threepid/invites.go
+++ b/clientapi/threepid/invites.go
@@ -279,7 +279,7 @@ func queryIDServerPubKey(ctx context.Context, idServerName string, keyID string)
}
var pubKeyRes struct {
- PublicKey gomatrixserverlib.Base64String `json:"public_key"`
+ PublicKey gomatrixserverlib.Base64Bytes `json:"public_key"`
}
if resp.StatusCode != http.StatusOK {