hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fix/rich-media-ttl-fallback' into 'develop'

Browse source 
Fix rich media parser failing when no TTL can be found by image TTL setters

See merge request pleroma/pleroma!1460
This commit is contained in:
kaniini 2019-07-21 16:05:58 +00:00
commit a00aab3402
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/rich_media/parser.ex
View file

@ -55,8 +55,8 @@ defmodule Pleroma.Web.RichMedia.Parser do
ttl_setters: [MyModule]
"""
def set_ttl_based_on_image({:ok, data}, url) do
with {:ok, nil} <- Cachex.ttl(:rich_media_cache, url) do
ttl = get_ttl_from_image(data, url)
with {:ok, nil} <- Cachex.ttl(:rich_media_cache, url),
ttl when is_number(ttl) <- get_ttl_from_image(data, url) do
Cachex.expire_at(:rich_media_cache, url, ttl * 1000)
{:ok, data}
else