unnamed return (#8170)

1 files changed, 5 insertions, 14 deletions

diff --git a/model/channel_search.go b/model/channel_search.go
index d915c164e..593cf6690 100644
--- a/model/channel_search.go
+++ b/model/channel_search.go
@@ -14,22 +14,13 @@ type ChannelSearch struct {
 
 // ToJson convert a Channel to a json string
 func (c *ChannelSearch) ToJson() string {
-	b, err := json.Marshal(c)
-	if err != nil {
-		return ""
-	} else {
-		return string(b)
-	}
+	b, _ := json.Marshal(c)
+	return string(b)
 }
 
 // ChannelSearchFromJson will decode the input and return a Channel
 func ChannelSearchFromJson(data io.Reader) *ChannelSearch {
-	decoder := json.NewDecoder(data)
-	var cs ChannelSearch
-	err := decoder.Decode(&cs)
-	if err == nil {
-		return &cs
-	} else {
-		return nil
-	}
+	var cs *ChannelSearch
+	json.NewDecoder(data).Decode(&cs)
+	return cs
 }