diff options
| author | Tulir Asokan <tulir@maunium.net> | 2018-04-19 11:35:52 +0300 |
|---|---|---|
| committer | Tulir Asokan <tulir@maunium.net> | 2018-04-19 11:35:52 +0300 |
| commit | c3386ba118b1a0f2ae1a31a9787ea5cb8b68396f (patch) | |
| tree | d5209da741b7774db0cc173640981846d9f1436f | |
| parent | f62b27f332a90000bbbec88634be03418241a9a0 (diff) | |
Fix golint issues
| -rw-r--r-- | matrix/pushrules/action.go | 5 | ||||
| -rw-r--r-- | ui/messages/parser/parser.go | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/matrix/pushrules/action.go b/matrix/pushrules/action.go index acb97b9..64dfddd 100644 --- a/matrix/pushrules/action.go +++ b/matrix/pushrules/action.go @@ -128,8 +128,7 @@ func (action *PushAction) MarshalJSON() (raw []byte, err error) { "value": action.Value, } return json.Marshal(&data) - } else { - data := string(action.Action) - return json.Marshal(&data) } + data := string(action.Action) + return json.Marshal(&data) } diff --git a/ui/messages/parser/parser.go b/ui/messages/parser/parser.go index 9c833f5..b114d98 100644 --- a/ui/messages/parser/parser.go +++ b/ui/messages/parser/parser.go @@ -62,10 +62,9 @@ func ParseMessage(matrix ifc.MatrixContainer, room *rooms.Room, evt *gomatrix.Ev if hasFormat && format == "org.matrix.custom.html" { text := ParseHTMLMessage(room, evt, displayname) return messages.NewExpandedTextMessage(evt.ID, evt.Sender, displayname, msgtype, text, ts) - } else { - text, _ := evt.Content["body"].(string) - return messages.NewTextMessage(evt.ID, evt.Sender, displayname, msgtype, text, ts) } + text, _ := evt.Content["body"].(string) + return messages.NewTextMessage(evt.ID, evt.Sender, displayname, msgtype, text, ts) case "m.image": url, _ := evt.Content["url"].(string) data, hs, id, err := matrix.Download(url) |