Merge branch 'master' into advanced-permissions-phase-1

1 files changed, 9 insertions, 27 deletions

diff --git a/model/emoji.go b/model/emoji.go
index 3deff4c5f..a1703abb1 100644
--- a/model/emoji.go
+++ b/model/emoji.go
@@ -61,41 +61,23 @@ func (emoji *Emoji) PreUpdate() {
 }
 
 func (emoji *Emoji) ToJson() string {
-	b, err := json.Marshal(emoji)
-	if err != nil {
-		return ""
-	} else {
-		return string(b)
-	}
+	b, _ := json.Marshal(emoji)
+	return string(b)
 }
 
 func EmojiFromJson(data io.Reader) *Emoji {
-	decoder := json.NewDecoder(data)
-	var emoji Emoji
-	err := decoder.Decode(&emoji)
-	if err == nil {
-		return &emoji
-	} else {
-		return nil
-	}
+	var emoji *Emoji
+	json.NewDecoder(data).Decode(&emoji)
+	return emoji
 }
 
 func EmojiListToJson(emojiList []*Emoji) string {
-	b, err := json.Marshal(emojiList)
-	if err != nil {
-		return ""
-	} else {
-		return string(b)
-	}
+	b, _ := json.Marshal(emojiList)
+	return string(b)
 }
 
 func EmojiListFromJson(data io.Reader) []*Emoji {
-	decoder := json.NewDecoder(data)
 	var emojiList []*Emoji
-	err := decoder.Decode(&emojiList)
-	if err == nil {
-		return emojiList
-	} else {
-		return nil
-	}
+	json.NewDecoder(data).Decode(&emojiList)
+	return emojiList
 }