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

The types that are not in gomatrixserverlib are not replaced.

This also updates the gomatrixserverlib dependency.

4 files changed, 10 insertions, 10 deletions

diff --git a/clientapi/routing/createroom.go b/clientapi/routing/createroom.go
index 4a76e1b0..620246d2 100644
--- a/clientapi/routing/createroom.go
+++ b/clientapi/routing/createroom.go
@@ -106,7 +106,7 @@ func (r createRoomRequest) Validate() *util.JSONResponse {
 		}
 	}
 
-	var CreationContent common.CreateContent
+	var CreationContent gomatrixserverlib.CreateContent
 	err = json.Unmarshal(creationContentBytes, &CreationContent)
 	if err != nil {
 		return &util.JSONResponse{
@@ -196,7 +196,7 @@ func createRoom(
 		return httputil.LogThenError(req, err)
 	}
 
-	membershipContent := common.MemberContent{
+	membershipContent := gomatrixserverlib.MemberContent{
 		Membership:  gomatrixserverlib.Join,
 		DisplayName: profile.DisplayName,
 		AvatarURL:   profile.AvatarURL,
@@ -246,7 +246,7 @@ func createRoom(
 		{"m.room.member", userID, membershipContent},
 		{"m.room.power_levels", "", common.InitialPowerLevelsContent(userID)},
 		// TODO: m.room.canonical_alias
-		{"m.room.join_rules", "", common.JoinRulesContent{JoinRule: joinRules}},
+		{"m.room.join_rules", "", gomatrixserverlib.JoinRuleContent{JoinRule: joinRules}},
 		{"m.room.history_visibility", "", common.HistoryVisibilityContent{HistoryVisibility: historyVisibility}},
 	}
 	if r.GuestCanJoin {
diff --git a/clientapi/routing/membership.go b/clientapi/routing/membership.go
index 5e183fa0..c71ac2de 100644
--- a/clientapi/routing/membership.go
+++ b/clientapi/routing/membership.go
@@ -144,7 +144,7 @@ func buildMembershipEvent(
 		membership = gomatrixserverlib.Leave
 	}
 
-	content := common.MemberContent{
+	content := gomatrixserverlib.MemberContent{
 		Membership:  membership,
 		DisplayName: profile.DisplayName,
 		AvatarURL:   profile.AvatarURL,
diff --git a/clientapi/routing/profile.go b/clientapi/routing/profile.go
index e8ea6cf1..a87c6f74 100644
--- a/clientapi/routing/profile.go
+++ b/clientapi/routing/profile.go
@@ -332,7 +332,7 @@ func buildMembershipEvents(
 			StateKey: &userID,
 		}
 
-		content := common.MemberContent{
+		content := gomatrixserverlib.MemberContent{
 			Membership: gomatrixserverlib.Join,
 		}
 
diff --git a/clientapi/threepid/invites.go b/clientapi/threepid/invites.go
index 251afb0d..bfe5060a 100644
--- a/clientapi/threepid/invites.go
+++ b/clientapi/threepid/invites.go
@@ -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,