aboutsummaryrefslogtreecommitdiff
path: root/matrix/rooms
diff options
context:
space:
mode:
authorTulir Asokan <tulir@maunium.net>2018-03-23 01:07:44 +0200
committerTulir Asokan <tulir@maunium.net>2018-03-23 01:20:26 +0200
commita3f48093ebd8fcc3dc2ffefc727378ae8dca7269 (patch)
treea27d46999800d480c5bdc17b7285e6f203dc41f9 /matrix/rooms
parent16635dcde7b3402e7eff44864b4dba5a2ddd8a37 (diff)
gofmt and govet
Diffstat (limited to 'matrix/rooms')
-rw-r--r--matrix/rooms/member.go6
-rw-r--r--matrix/rooms/room.go2
2 files changed, 4 insertions, 4 deletions
diff --git a/matrix/rooms/member.go b/matrix/rooms/member.go
index 4af20a6..20c994b 100644
--- a/matrix/rooms/member.go
+++ b/matrix/rooms/member.go
@@ -35,11 +35,11 @@ type Member struct {
// The MXID of the member.
UserID string `json:"-"`
// The membership status. Defaults to leave.
- Membership Membership `json:"membership"`
+ Membership Membership `json:"membership"`
// The display name of the user. Defaults to the user ID.
- DisplayName string `json:"displayname"`
+ DisplayName string `json:"displayname"`
// The avatar URL of the user. Defaults to an empty string.
- AvatarURL string `json:"avatar_url"`
+ AvatarURL string `json:"avatar_url"`
}
// eventToRoomMember converts a m.room.member state event into a Member object.
diff --git a/matrix/rooms/room.go b/matrix/rooms/room.go
index 4166fd7..56614de 100644
--- a/matrix/rooms/room.go
+++ b/matrix/rooms/room.go
@@ -42,7 +42,7 @@ type Room struct {
topicCache string
// fetchHistoryLock is used to make sure multiple goroutines don't fetch history for this room at the same time.
- fetchHistoryLock *sync.Mutex `json:"-"`
+ fetchHistoryLock *sync.Mutex
}
func (room *Room) LockHistory() {