diff options
| author | Ekaterina Vaartis <vaartis@cock.li> | 2019-08-16 13:30:14 +0300 |
|---|---|---|
| committer | Ekaterina Vaartis <vaartis@cock.li> | 2019-09-19 00:16:33 +0300 |
| commit | 261d92f9c2605c720e7fce8b05025e5ac452e5c9 (patch) | |
| tree | f48ef6420f479717238f112b24d2f932b97eb332 /lib | |
| parent | 9dc9689144a54f3e5513dd26de61ec43421d6d50 (diff) | |
| download | pleroma-261d92f9c2605c720e7fce8b05025e5ac452e5c9.tar.gz | |
Update the pack fallback-src sha generation condition
The old one would not regenerate sha when fallback src changed
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/emoji_api/emoji_api_controller.ex | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/pleroma/web/emoji_api/emoji_api_controller.ex b/lib/pleroma/web/emoji_api/emoji_api_controller.ex index 4096ccbed..4873129c4 100644 --- a/lib/pleroma/web/emoji_api/emoji_api_controller.ex +++ b/lib/pleroma/web/emoji_api/emoji_api_controller.ex @@ -229,8 +229,13 @@ keeping it in cache for #{div(cache_ms, 1000)}s") full_pack = Jason.decode!(File.read!(pack_file_p)) + # The new fallback-src is in the new data and it's not the same as it was in the old data + should_update_fb_sha = + not is_nil(new_data["fallback-src"]) and + new_data["fallback-src"] != full_pack["pack"]["fallback-src"] + new_data = - if not is_nil(new_data["fallback-src"]) and is_nil(new_data["fallback-src-sha256"]) do + if should_update_fb_sha do pack_arch = Tesla.get!(new_data["fallback-src"]).body {:ok, flist} = :zip.unzip(pack_arch, [:memory]) |