chore(admin): drop emoji-logo cache leftovers

Emoji logos were removed long ago; the only remaining trace was a
purge of stale data/webapp-emoji cache files on theme save. Remove
the purge, the WEBAPP_EMOJI_CACHE_DIR constant and the emoji part of
the prune test.
This commit is contained in:
3252a8
2026-06-10 12:31:52 +03:00
parent 1b2290ea66
commit ab21253d4f
2 changed files with 0 additions and 20 deletions
@@ -25,7 +25,6 @@ WEBAPP_UPLOADED_LOGO_DIR = Path(__file__).resolve().parents[5] / "data" / "webap
WEBAPP_UPLOADED_LOGO_PATH = "/webapp-uploaded-logo" WEBAPP_UPLOADED_LOGO_PATH = "/webapp-uploaded-logo"
WEBAPP_FAVICON_DIR = Path(__file__).resolve().parents[5] / "data" / "webapp-logo" / "favicons" WEBAPP_FAVICON_DIR = Path(__file__).resolve().parents[5] / "data" / "webapp-logo" / "favicons"
WEBAPP_FAVICON_PATH = "/webapp-favicon" WEBAPP_FAVICON_PATH = "/webapp-favicon"
WEBAPP_EMOJI_CACHE_DIR = Path(__file__).resolve().parents[5] / "data" / "webapp-emoji"
WEBAPP_FAVICON_SIZES = (16, 32, 48, 180, 192, 512) WEBAPP_FAVICON_SIZES = (16, 32, 48, 180, 192, 512)
WEBAPP_LOGO_UPLOAD_CONTENT_TYPES = { WEBAPP_LOGO_UPLOAD_CONTENT_TYPES = {
".gif": "image/gif", ".gif": "image/gif",
@@ -171,15 +170,6 @@ def prune_unused_appearance_assets(settings: Settings) -> None:
except OSError: except OSError:
logger.warning("Failed to remove unused webapp favicon set %s", path, exc_info=True) logger.warning("Failed to remove unused webapp favicon set %s", path, exc_info=True)
# Emoji logos were removed; purge any leftover animated-emoji cache files.
for path in WEBAPP_EMOJI_CACHE_DIR.glob("*.512.*"):
if path.is_file():
try:
path.unlink()
except OSError:
logger.warning("Failed to remove unused webapp emoji asset %s", path, exc_info=True)
async def _persist_appearance_upload( async def _persist_appearance_upload(
request: web.Request, request: web.Request,
updates: Dict[str, Any], updates: Dict[str, Any],
-10
View File
@@ -647,10 +647,8 @@ class WebAppAssetTests(unittest.IsolatedAsyncioTestCase):
root = Path(tmpdir) root = Path(tmpdir)
uploads = root / "uploads" uploads = root / "uploads"
favicons = root / "favicons" favicons = root / "favicons"
emoji = root / "emoji"
uploads.mkdir() uploads.mkdir()
favicons.mkdir() favicons.mkdir()
emoji.mkdir()
(uploads / "logo-1111111111111111.png").write_bytes(b"keep") (uploads / "logo-1111111111111111.png").write_bytes(b"keep")
(uploads / "logo-2222222222222222.png").write_bytes(b"remove") (uploads / "logo-2222222222222222.png").write_bytes(b"remove")
(favicons / "aaaaaaaaaaaaaaaa").mkdir() (favicons / "aaaaaaaaaaaaaaaa").mkdir()
@@ -659,10 +657,6 @@ class WebAppAssetTests(unittest.IsolatedAsyncioTestCase):
(favicons / "aaaaaaaaaaaaaaaa" / "icon-180.png").write_bytes(b"keep") (favicons / "aaaaaaaaaaaaaaaa" / "icon-180.png").write_bytes(b"keep")
(favicons / "bbbbbbbbbbbbbbbb" / "icon-180.png").write_bytes(b"keep") (favicons / "bbbbbbbbbbbbbbbb" / "icon-180.png").write_bytes(b"keep")
(favicons / "cccccccccccccccc" / "icon-180.png").write_bytes(b"remove") (favicons / "cccccccccccccccc" / "icon-180.png").write_bytes(b"remove")
# Emoji logos were removed; any leftover emoji cache files are purged.
(emoji / "1f929.512.gif").write_bytes(b"remove")
(emoji / "1f929.512.webp").write_bytes(b"remove")
(emoji / "1f525.512.gif").write_bytes(b"remove")
settings = SimpleNamespace( settings = SimpleNamespace(
WEBAPP_LOGO_URL="/webapp-uploaded-logo/logo-1111111111111111.png", WEBAPP_LOGO_URL="/webapp-uploaded-logo/logo-1111111111111111.png",
WEBAPP_FAVICON_URL="/webapp-favicon/aaaaaaaaaaaaaaaa/icon-180.png", WEBAPP_FAVICON_URL="/webapp-favicon/aaaaaaaaaaaaaaaa/icon-180.png",
@@ -672,7 +666,6 @@ class WebAppAssetTests(unittest.IsolatedAsyncioTestCase):
with ( with (
patch.object(admin_themes, "WEBAPP_UPLOADED_LOGO_DIR", uploads), patch.object(admin_themes, "WEBAPP_UPLOADED_LOGO_DIR", uploads),
patch.object(admin_themes, "WEBAPP_FAVICON_DIR", favicons), patch.object(admin_themes, "WEBAPP_FAVICON_DIR", favicons),
patch.object(admin_themes, "WEBAPP_EMOJI_CACHE_DIR", emoji),
): ):
admin_themes.prune_unused_appearance_assets(settings) admin_themes.prune_unused_appearance_assets(settings)
@@ -681,9 +674,6 @@ class WebAppAssetTests(unittest.IsolatedAsyncioTestCase):
self.assertTrue((favicons / "aaaaaaaaaaaaaaaa").exists()) self.assertTrue((favicons / "aaaaaaaaaaaaaaaa").exists())
self.assertTrue((favicons / "bbbbbbbbbbbbbbbb").exists()) self.assertTrue((favicons / "bbbbbbbbbbbbbbbb").exists())
self.assertFalse((favicons / "cccccccccccccccc").exists()) self.assertFalse((favicons / "cccccccccccccccc").exists())
self.assertFalse((emoji / "1f929.512.gif").exists())
self.assertFalse((emoji / "1f929.512.webp").exists())
self.assertFalse((emoji / "1f525.512.gif").exists())
async def test_persist_appearance_upload_writes_overrides_and_clears_caches(self): async def test_persist_appearance_upload_writes_overrides_and_clears_caches(self):
settings = SimpleNamespace() settings = SimpleNamespace()