summaryrefslogtreecommitdiffstats
path: root/model/status.go
diff options
context:
space:
mode:
authorChris <ccbrown112@gmail.com>2018-01-30 17:23:00 -0600
committerCorey Hulen <corey@hulen.com>2018-01-30 15:23:00 -0800
commit0c8968fb8df4ce302c928118cd81e75f5bef2861 (patch)
treeb17a2ae5afc98f7ce3daaea10a165d9d647c47c5 /model/status.go
parentac2e42a480c5bba2e5128017218b0fa1bed8e836 (diff)
downloadchat-0c8968fb8df4ce302c928118cd81e75f5bef2861.tar.gz
chat-0c8968fb8df4ce302c928118cd81e75f5bef2861.tar.bz2
chat-0c8968fb8df4ce302c928118cd81e75f5bef2861.zip
unnamed return (#8170)
Diffstat (limited to 'model/status.go')
-rw-r--r--model/status.go36
1 files changed, 9 insertions, 27 deletions
diff --git a/model/status.go b/model/status.go
index 6da6161eb..cd9e32ed3 100644
--- a/model/status.go
+++ b/model/status.go
@@ -27,43 +27,25 @@ type Status struct {
}
func (o *Status) ToJson() string {
- b, err := json.Marshal(o)
- if err != nil {
- return ""
- } else {
- return string(b)
- }
+ b, _ := json.Marshal(o)
+ return string(b)
}
func StatusFromJson(data io.Reader) *Status {
- decoder := json.NewDecoder(data)
- var o Status
- err := decoder.Decode(&o)
- if err == nil {
- return &o
- } else {
- return nil
- }
+ var o *Status
+ json.NewDecoder(data).Decode(&o)
+ return o
}
func StatusListToJson(u []*Status) string {
- b, err := json.Marshal(u)
- if err != nil {
- return ""
- } else {
- return string(b)
- }
+ b, _ := json.Marshal(u)
+ return string(b)
}
func StatusListFromJson(data io.Reader) []*Status {
- decoder := json.NewDecoder(data)
var statuses []*Status
- err := decoder.Decode(&statuses)
- if err == nil {
- return statuses
- } else {
- return nil
- }
+ json.NewDecoder(data).Decode(&statuses)
+ return statuses
}
func StatusMapToInterfaceMap(statusMap map[string]*Status) map[string]interface{} {