From 912bf309d1f102f8f10c96c718784f01901dad4d Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 14 Nov 2018 01:11:40 +0200 Subject: Fix tests --- vendor/maunium.net/go/mautrix/events.go | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) (limited to 'vendor/maunium.net/go/mautrix') diff --git a/vendor/maunium.net/go/mautrix/events.go b/vendor/maunium.net/go/mautrix/events.go index c974bf9..7151c27 100644 --- a/vendor/maunium.net/go/mautrix/events.go +++ b/vendor/maunium.net/go/mautrix/events.go @@ -200,9 +200,9 @@ type Content struct { PowerLevels Member Aliases []string `json:"aliases,omitempty"` - CanonicalAlias - RoomName - RoomTopic + Alias string `json:"alias,omitempty"` + Name string `json:"name,omitempty"` + Topic string `json:"name,omitempty"` RoomTags Tags `json:"tags,omitempty"` TypingUserIDs []string `json:"user_ids,omitempty"` @@ -244,11 +244,6 @@ func (content *Content) UnmarshalMember() (m Member, err error) { return } -func (content *Content) UnmarshalCanonicalAlias() (ca CanonicalAlias, err error) { - err = json.Unmarshal(content.VeryRaw, &ca) - return -} - func (content *Content) GetInfo() *FileInfo { if content.Info == nil { content.Info = &FileInfo{} @@ -260,14 +255,6 @@ type Tags map[string]struct { Order json.Number `json:"order"` } -type RoomName struct { - Name string `json:"name,omitempty"` -} - -type RoomTopic struct { - Topic string `json:"topic,omitempty"` -} - // Membership is an enum specifying the membership state of a room member. type Membership string @@ -297,10 +284,6 @@ type ThirdPartyInvite struct { } } -type CanonicalAlias struct { - Alias string `json:"alias,omitempty"` -} - type PowerLevels struct { usersLock sync.RWMutex `json:"-"` Users map[string]int `json:"users,omitempty"` -- cgit v1.2.3