Alexander/gomuks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix golint issues

Browse Source
This commit is contained in:
Tulir Asokan 2018-04-19 11:35:52 +03:00
parent f62b27f332
commit c3386ba118
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
matrix/pushrules/action.go
View File

@ -128,8 +128,7 @@ func (action *PushAction) MarshalJSON() (raw []byte, err error) {
"value": action.Value, "value": action.Value,
} }
return json.Marshal(&data) return json.Marshal(&data)
} else {
data := string(action.Action)
return json.Marshal(&data)
} }
data := string(action.Action)
return json.Marshal(&data)
} }

5
ui/messages/parser/parser.go
View File

@ -62,10 +62,9 @@ func ParseMessage(matrix ifc.MatrixContainer, room *rooms.Room, evt *gomatrix.Ev
if hasFormat && format == "org.matrix.custom.html" { if hasFormat && format == "org.matrix.custom.html" {
text := ParseHTMLMessage(room, evt, displayname) text := ParseHTMLMessage(room, evt, displayname)
return messages.NewExpandedTextMessage(evt.ID, evt.Sender, displayname, msgtype, text, ts) 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": case "m.image":
url, _ := evt.Content["url"].(string) url, _ := evt.Content["url"].(string)
data, hs, id, err := matrix.Download(url) data, hs, id, err := matrix.Download(url)