1 files changed, 12 insertions, 34 deletions

diff --git a/model/user_autocomplete.go b/model/user_autocomplete.go
index 43c030b8e..b5edb45be 100644
--- a/model/user_autocomplete.go
+++ b/model/user_autocomplete.go
@@ -23,12 +23,8 @@ type UserAutocomplete struct {
 }
 
 func (o *UserAutocomplete) ToJson() string {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return ""
-	} else {
-		return string(b)
-	}
+	b, _ := json.Marshal(o)
+	return string(b)
 }
 
 func UserAutocompleteFromJson(data io.Reader) *UserAutocomplete {
@@ -43,41 +39,23 @@ func UserAutocompleteFromJson(data io.Reader) *UserAutocomplete {
 }
 
 func (o *UserAutocompleteInChannel) ToJson() string {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return ""
-	} else {
-		return string(b)
-	}
+	b, _ := json.Marshal(o)
+	return string(b)
 }
 
 func UserAutocompleteInChannelFromJson(data io.Reader) *UserAutocompleteInChannel {
-	decoder := json.NewDecoder(data)
-	var o UserAutocompleteInChannel
-	err := decoder.Decode(&o)
-	if err == nil {
-		return &o
-	} else {
-		return nil
-	}
+	var o *UserAutocompleteInChannel
+	json.NewDecoder(data).Decode(&o)
+	return o
 }
 
 func (o *UserAutocompleteInTeam) ToJson() string {
-	b, err := json.Marshal(o)
-	if err != nil {
-		return ""
-	} else {
-		return string(b)
-	}
+	b, _ := json.Marshal(o)
+	return string(b)
 }
 
 func UserAutocompleteInTeamFromJson(data io.Reader) *UserAutocompleteInTeam {
-	decoder := json.NewDecoder(data)
-	var o UserAutocompleteInTeam
-	err := decoder.Decode(&o)
-	if err == nil {
-		return &o
-	} else {
-		return nil
-	}
+	var o *UserAutocompleteInTeam
+	json.NewDecoder(data).Decode(&o)
+	return o
 }