aboutsummaryrefslogtreecommitdiff
path: root/vendor/maunium.net/go/mautrix
diff options
context:
space:
mode:
authorTulir Asokan <tulir@maunium.net>2018-11-14 01:11:40 +0200
committerTulir Asokan <tulir@maunium.net>2018-11-14 01:11:40 +0200
commit912bf309d1f102f8f10c96c718784f01901dad4d (patch)
treed39b4dc6723884d49e6576411f494d56f492df30 /vendor/maunium.net/go/mautrix
parenta0815a6f3de6ed4063fcdcf6c7af3f946bbf52f8 (diff)
Fix tests
Diffstat (limited to 'vendor/maunium.net/go/mautrix')
-rw-r--r--vendor/maunium.net/go/mautrix/events.go23
1 files changed, 3 insertions, 20 deletions
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"`