hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-08-02 14:12:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace event content types with ones in gomatrixserverlib (#785)

Browse source 
The types that are not in gomatrixserverlib are not replaced.

This also updates the gomatrixserverlib dependency.
This commit is contained in:
Alex Chen 2019-08-16 01:45:11 +08:00 • committed by GitHub
parent d21a2fb152
commit d63d2a50cd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 33 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

10
clientapi/threepid/invites.go
View file

@ -56,10 +56,10 @@ type idServerLookupResponse struct {
// idServerLookupResponse represents the response described at https://matrix.org/docs/spec/client_server/r0.2.0.html#invitation-storage
type idServerStoreInviteResponse struct {
PublicKey string `json:"public_key"`
Token string `json:"token"`
DisplayName string `json:"display_name"`
PublicKeys []common.PublicKey `json:"public_keys"`
PublicKey string `json:"public_key"`
Token string `json:"token"`
DisplayName string `json:"display_name"`
PublicKeys []gomatrixserverlib.PublicKey `json:"public_keys"`
}
var (
@ -342,7 +342,7 @@ func emit3PIDInviteEvent(
}
validityURL := fmt.Sprintf("https://%s/_matrix/identity/api/v1/pubkey/isvalid", body.IDServer)
content := common.ThirdPartyInviteContent{
content := gomatrixserverlib.ThirdPartyInviteContent{
DisplayName: res.DisplayName,
KeyValidityURL: validityURL,
PublicKey: res.PublicKey,