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

Move where emoji migration is fired to match the new emoji work

Browse Source
This commit is contained in:
Gabe Kangas 2022-12-12 08:58:00 -08:00
parent d49f001688
commit 1d248a144b
No known key found for this signature in database
GPG Key ID: 4345B2060657F330
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/core.go
View File

@ -36,7 +36,6 @@ func Start() error {
resetDirectories() resetDirectories()
data.PopulateDefaults() data.PopulateDefaults()
utils.MigrateCustomEmojiLocations()
if err := data.VerifySettings(); err != nil { if err := data.VerifySettings(); err != nil {
log.Error(err) log.Error(err)

6
main.go
View File

@ -48,7 +48,11 @@ func main() {
log.Fatalln("Cannot create data directory", err) log.Fatalln("Cannot create data directory", err)
} }
} }
// Set up emoji directory
// Migrate old (pre 0.1.0) emoji to new location if they exist.
utils.MigrateCustomEmojiLocations()
// Otherwise save the default emoji to the data directory.
if err := data.SetupEmojiDirectory(); err != nil { if err := data.SetupEmojiDirectory(); err != nil {
log.Fatalln("Cannot set up emoji directory", err) log.Fatalln("Cannot set up emoji directory", err)
} }