Start cleaning up linter errors. (#358)

* Start cleaning up linter errors. For #357

* Fix unmarshalling NullTime values

* More linter fixes

* Remove commented code

* Move defer up

* Consolidate error check lines

* Move error check to make sure row iteration was successful

* Cleaner error check + do not recreate pipe if it exists

* Consolidate hashing to generate client id
This commit is contained in:
Gabe Kangas
2020-11-14 18:39:53 -08:00
committed by GitHub
parent c76b7229a5
commit 4d2066a76d
34 changed files with 248 additions and 143 deletions

View File

@@ -35,9 +35,11 @@ func GetCustomEmoji(w http.ResponseWriter, r *http.Request) {
for _, f := range files {
name := strings.TrimSuffix(f.Name(), path.Ext(f.Name()))
emojiPath := filepath.Join(emojiDir, f.Name())
singleEmoji := models.CustomEmoji{name, emojiPath}
singleEmoji := models.CustomEmoji{Name: name, Emoji: emojiPath}
emojiList = append(emojiList, singleEmoji)
}
json.NewEncoder(w).Encode(emojiList)
if err := json.NewEncoder(w).Encode(emojiList); err != nil {
internalErrorHandler(w, err)
}
}