Navy.gif/owncast
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move emoji directory definition to config (#1317)

Browse Source 
* mv emojiDir to config

* end comment with period
This commit is contained in:
Meisam 2021-08-14 21:48:04 +02:00 committed by GitHub
parent 04bb97bffc
commit 31a8d81a42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/constants.go
View File

@ -13,6 +13,8 @@ const (
FfmpegSuggestedVersion = "v4.1.5" // Requires the v FfmpegSuggestedVersion = "v4.1.5" // Requires the v
// DataDirectory is the directory we save data to. // DataDirectory is the directory we save data to.
DataDirectory = "data" DataDirectory = "data"
// EmojiDir is relative to the webroot.
EmojiDir = "/img/emoji"
) )
var ( var (

8
controllers/emoji.go
View File

@ -15,16 +15,12 @@ import (
log "github.com/sirupsen/logrus" 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 emojiCache = make([]models.CustomEmoji, 0)
var emojiCacheTimestamp time.Time var emojiCacheTimestamp time.Time
// getCustomEmojiList returns a list of custom emoji either from the cache or from the emoji directory. // getCustomEmojiList returns a list of custom emoji either from the cache or from the emoji directory.
func getCustomEmojiList() []models.CustomEmoji { func getCustomEmojiList() []models.CustomEmoji {
fullPath := filepath.Join(config.WebRoot, emojiDir) fullPath := filepath.Join(config.WebRoot, config.EmojiDir)
emojiDirInfo, err := os.Stat(fullPath) emojiDirInfo, err := os.Stat(fullPath)
if err != nil { if err != nil {
log.Errorln(err) log.Errorln(err)
@ -42,7 +38,7 @@ func getCustomEmojiList() []models.CustomEmoji {
} }
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(config.EmojiDir, f.Name())
singleEmoji := models.CustomEmoji{Name: name, Emoji: emojiPath} singleEmoji := models.CustomEmoji{Name: name, Emoji: emojiPath}
emojiCache = append(emojiCache, singleEmoji) emojiCache = append(emojiCache, singleEmoji)
} }