diff --git a/config/constants.go b/config/constants.go index af68185a4..9d782241e 100644 --- a/config/constants.go +++ b/config/constants.go @@ -13,6 +13,8 @@ const ( FfmpegSuggestedVersion = "v4.1.5" // Requires the v // DataDirectory is the directory we save data to. DataDirectory = "data" + // EmojiDir is relative to the webroot. + EmojiDir = "/img/emoji" ) var ( diff --git a/controllers/emoji.go b/controllers/emoji.go index d0a42c203..ff4d14f1e 100644 --- a/controllers/emoji.go +++ b/controllers/emoji.go @@ -15,16 +15,12 @@ import ( log "github.com/sirupsen/logrus" ) -// Make this path configurable if somebody has a valid reason -// to need it to be. The config is getting a bit bloated. -const emojiDir = "/img/emoji" // Relative to webroot - var emojiCache = make([]models.CustomEmoji, 0) var emojiCacheTimestamp time.Time // 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, config.EmojiDir) emojiDirInfo, err := os.Stat(fullPath) if err != nil { log.Errorln(err) @@ -42,7 +38,7 @@ func getCustomEmojiList() []models.CustomEmoji { } for _, f := range files { name := strings.TrimSuffix(f.Name(), path.Ext(f.Name())) - emojiPath := filepath.Join(emojiDir, f.Name()) + emojiPath := filepath.Join(config.EmojiDir, f.Name()) singleEmoji := models.CustomEmoji{Name: name, Emoji: emojiPath} emojiCache = append(emojiCache, singleEmoji) }