diff options
Diffstat (limited to 'model/team_member.go')
| -rw-r--r-- | model/team_member.go | 56 |
1 files changed, 14 insertions, 42 deletions
diff --git a/model/team_member.go b/model/team_member.go index 6c70b75eb..2fcd1e151 100644 --- a/model/team_member.go +++ b/model/team_member.go @@ -24,43 +24,25 @@ type TeamUnread struct { } func (o *TeamMember) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func (o *TeamUnread) ToJson() string { - b, err := json.Marshal(o) - if err != nil { - return "" - } else { - return string(b) - } + b, _ := json.Marshal(o) + return string(b) } func TeamMemberFromJson(data io.Reader) *TeamMember { - decoder := json.NewDecoder(data) - var o TeamMember - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *TeamMember + json.NewDecoder(data).Decode(&o) + return o } func TeamUnreadFromJson(data io.Reader) *TeamUnread { - decoder := json.NewDecoder(data) - var o TeamUnread - err := decoder.Decode(&o) - if err == nil { - return &o - } else { - return nil - } + var o *TeamUnread + json.NewDecoder(data).Decode(&o) + return o } func TeamMembersToJson(o []*TeamMember) string { @@ -72,14 +54,9 @@ func TeamMembersToJson(o []*TeamMember) string { } func TeamMembersFromJson(data io.Reader) []*TeamMember { - decoder := json.NewDecoder(data) var o []*TeamMember - err := decoder.Decode(&o) - if err == nil { - return o - } else { - return nil - } + json.NewDecoder(data).Decode(&o) + return o } func TeamsUnreadToJson(o []*TeamUnread) string { @@ -91,14 +68,9 @@ func TeamsUnreadToJson(o []*TeamUnread) string { } func TeamsUnreadFromJson(data io.Reader) []*TeamUnread { - decoder := json.NewDecoder(data) var o []*TeamUnread - err := decoder.Decode(&o) - if err == nil { - return o - } else { - return nil - } + json.NewDecoder(data).Decode(&o) + return o } func (o *TeamMember) IsValid() *AppError { |