diff options
author | Chris <ccbrown112@gmail.com> | 2018-01-30 17:23:00 -0600 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2018-01-30 15:23:00 -0800 |
commit | 0c8968fb8df4ce302c928118cd81e75f5bef2861 (patch) | |
tree | b17a2ae5afc98f7ce3daaea10a165d9d647c47c5 /model/team.go | |
parent | ac2e42a480c5bba2e5128017218b0fa1bed8e836 (diff) | |
download | chat-0c8968fb8df4ce302c928118cd81e75f5bef2861.tar.gz chat-0c8968fb8df4ce302c928118cd81e75f5bef2861.tar.bz2 chat-0c8968fb8df4ce302c928118cd81e75f5bef2861.zip |
unnamed return (#8170)
Diffstat (limited to 'model/team.go')
-rw-r--r-- | model/team.go | 72 |
1 files changed, 18 insertions, 54 deletions
diff --git a/model/team.go b/model/team.go index 4fe03f2fc..5b6eb1fa0 100644 --- a/model/team.go +++ b/model/team.go @@ -54,14 +54,9 @@ type Invites struct { } func InvitesFromJson(data io.Reader) *Invites { - decoder := json.NewDecoder(data) - var o Invites - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *Invites + json.NewDecoder(data).Decode(&o) + return o } func (o *Invites) ToEmailList() []string { @@ -73,72 +68,41 @@ func (o *Invites) ToEmailList() []string { } func (o *Invites) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func (o *Team) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func TeamFromJson(data io.Reader) *Team { - decoder := json.NewDecoder(data) - var o Team - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *Team + json.NewDecoder(data).Decode(&o) + return o } func TeamMapToJson(u map[string]*Team) string { - b, err := json.Marshal(u) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(u) + return string(b) } func TeamMapFromJson(data io.Reader) map[string]*Team { - decoder := json.NewDecoder(data) var teams map[string]*Team - err := decoder.Decode(&teams) - if err == nil { - return teams - } else { - return nil - } + json.NewDecoder(data).Decode(&teams) + return teams } func TeamListToJson(t []*Team) string { - b, err := json.Marshal(t) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(t) + return string(b) } func TeamListFromJson(data io.Reader) []*Team { - decoder := json.NewDecoder(data) var teams []*Team - err := decoder.Decode(&teams) - if err == nil { - return teams - } else { - return nil - } + json.NewDecoder(data).Decode(&teams) + return teams } func (o *Team) Etag() string { |