Browse Source

Cache the custom emoji list (#1175)

* use emojiCache

* add emojiCacheTimestamp

* add function description

* better logging
pull/1180/head
Meisam 4 years ago committed by GitHub
parent
commit
d042fd70d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 38
      controllers/emoji.go

38
controllers/emoji.go

@ -4,9 +4,11 @@ import (
"encoding/json" "encoding/json"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"os"
"path" "path"
"path/filepath" "path/filepath"
"strings" "strings"
"time"
"github.com/owncast/owncast/config" "github.com/owncast/owncast/config"
"github.com/owncast/owncast/models" "github.com/owncast/owncast/models"
@ -17,28 +19,44 @@ import (
// to need it to be. The config is getting a bit bloated. // to need it to be. The config is getting a bit bloated.
const emojiDir = "/img/emoji" // Relative to webroot const emojiDir = "/img/emoji" // Relative to webroot
// GetCustomEmoji returns a list of custom emoji via the API. var emojiCache = make([]models.CustomEmoji, 0)
func GetCustomEmoji(w http.ResponseWriter, r *http.Request) { var emojiCacheTimestamp time.Time
emojiList := make([]models.CustomEmoji, 0)
// getCustomEmojiList returns a list of custom emoji either from the cache or from the emoji directory.
func getCustomEmojiList() []models.CustomEmoji {
fullPath := filepath.Join(config.WebRoot, emojiDir) fullPath := filepath.Join(config.WebRoot, emojiDir)
files, err := ioutil.ReadDir(fullPath) emojiDirInfo, err := os.Stat(fullPath)
if err != nil { if err != nil {
log.Errorln(err) log.Errorln(err)
// Throw HTTP 500 }
return if emojiDirInfo.ModTime() != emojiCacheTimestamp {
log.Traceln("Emoji cache invalid")
emojiCache = make([]models.CustomEmoji, 0)
} }
// Memoize this result somewhere? Right now it iterates through the if len(emojiCache) == 0 {
// filesystem every time the API is hit. Should you need to restart files, err := ioutil.ReadDir(fullPath)
// the server to add emoji? if err != nil {
log.Errorln(err)
return emojiCache
}
for _, f := range files { for _, f := range files {
name := strings.TrimSuffix(f.Name(), path.Ext(f.Name())) name := strings.TrimSuffix(f.Name(), path.Ext(f.Name()))
emojiPath := filepath.Join(emojiDir, f.Name()) emojiPath := filepath.Join(emojiDir, f.Name())
singleEmoji := models.CustomEmoji{Name: name, Emoji: emojiPath} singleEmoji := models.CustomEmoji{Name: name, Emoji: emojiPath}
emojiList = append(emojiList, singleEmoji) emojiCache = append(emojiCache, singleEmoji)
} }
emojiCacheTimestamp = emojiDirInfo.ModTime()
}
return emojiCache
}
// GetCustomEmoji returns a list of custom emoji via the API.
func GetCustomEmoji(w http.ResponseWriter, r *http.Request) {
emojiList := getCustomEmojiList()
if err := json.NewEncoder(w).Encode(emojiList); err != nil { if err := json.NewEncoder(w).Encode(emojiList); err != nil {
InternalErrorHandler(w, err) InternalErrorHandler(w, err)
} }

Loading…
Cancel
Save