gofmt and govet

matrix/pushrules/action.go

@@ -46,9 +46,9 @@ type PushActionArrayShould struct {
 	// Whether or not the array contained a Notify, DontNotify or Coalesce action type.
 	NotifySpecified bool
 	// Whether or not the event in question should trigger a notification.
-	Notify          bool
+	Notify bool
 	// Whether or not the event in question should be highlighted.
-	Highlight       bool
+	Highlight bool
 
 	// Whether or not the event in question should trigger a sound alert.
 	PlaySound bool

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.

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() {