Take control over your live stream video by running it yourself. Streaming + chat out of the box.
HTML activitypubbroadcastingchatdecentralizedfederationfediversegolanghacktoberfesthlslivelivestreamowncastrtmpself-hostedstreaming-videovideo
fix(emoji): invalidate cache when deleting emoji in subdirectories (#5184)
Gabe Kangas7bf60afddd99
diff --git a/webserver/handlers/admin/emoji.go b/webserver/handlers/admin/emoji.goindex 43f82ff737..d51f33e4e5 100644--- a/webserver/handlers/admin/emoji.go+++ b/webserver/handlers/admin/emoji.go@@ -9,6 +9,7 @@ import ("strings""github.com/owncast/owncast/config"+ "github.com/owncast/owncast/services/datastore""github.com/owncast/owncast/utils""github.com/owncast/owncast/webserver/handlers/generated"webutils "github.com/owncast/owncast/webserver/utils"@@ -103,7 +104,6 @@ func DeleteCustomEmoji(w http.ResponseWriter, r *http.Request) {return}defer root.Close()-if err := root.Remove(name); err != nil {if os.IsNotExist(err) {webutils.WriteSimpleResponse(w, false, fmt.Sprintf("Emoji %q doesn't exist", emoji.Name))@@ -113,5 +113,9 @@ func DeleteCustomEmoji(w http.ResponseWriter, r *http.Request) {return}+ // Force cache invalidation since deleting a file in a subdirectory doesn't+ // update the parent directory's ModTime on all systems.+ _, _ = datastore.UpdateEmojiList(true)+webutils.WriteSimpleResponse(w, true, fmt.Sprintf("Emoji %q has been deleted", emoji.Name))}diff --git a/webserver/handlers/admin/emoji_test.go b/webserver/handlers/admin/emoji_test.goindex b7ce195045..f5d853abeb 100644--- a/webserver/handlers/admin/emoji_test.go+++ b/webserver/handlers/admin/emoji_test.go@@ -10,6 +10,7 @@ import ("testing""github.com/owncast/owncast/config"+ "github.com/owncast/owncast/services/datastore")// deleteEmojiRequest posts a delete request for the given name and returns@@ -85,12 +86,37 @@ func TestDeleteCustomEmojiRemovesEmojiInSubdirectory(t *testing.T) {t.Fatal(err)}+ // Force a fresh cache refresh so package-global cache state and filesystem+ // timestamp granularity cannot affect this test's setup.+ if _, err := datastore.UpdateEmojiList(true); err != nil {+ t.Fatal(err)+ }+ initialList := datastore.GetEmojiList()+ waveFound := false+ for _, emoji := range initialList {+ if emoji.Name != nil && *emoji.Name == "wave" {+ waveFound = true+ break+ }+ }+ if !waveFound {+ t.Fatal("wave emoji not in initial list; cache priming failed")+ }+if !deleteEmojiRequest(t, "/pack/wave.png") {t.Fatal("expected the nested emoji to be deleted")}if _, err := os.Stat(filepath.Join(nested, "wave.png")); !os.IsNotExist(err) {- t.Error("nested emoji was not removed")+ t.Error("nested emoji was not removed from disk")+ }++ // Verify the cache was invalidated: GetEmojiList should no longer include the deleted emoji+ emojiList := datastore.GetEmojiList()+ for _, emoji := range emojiList {+ if emoji.Name != nil && *emoji.Name == "wave" {+ t.Error("cache was not invalidated: deleted emoji still in list")+ }}}