diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-07-21 16:05:58 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-07-21 16:05:58 +0000 |
| commit | a00aab340275036858aecfef16b719abde3276c6 (patch) | |
| tree | 2ea1e1fa644657ca3dd44d7bb4aa1585dabbaeeb /lib | |
| parent | 1689a11a80be21456788d1f41c4ef231b0a0e94e (diff) | |
| parent | 33681747857eec90ff56ea0342d2ea179c4f856e (diff) | |
| download | pleroma-a00aab340275036858aecfef16b719abde3276c6.tar.gz | |
Merge branch 'fix/rich-media-ttl-fallback' into 'develop'
Fix rich media parser failing when no TTL can be found by image TTL setters
See merge request pleroma/pleroma!1460
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/rich_media/parser.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/rich_media/parser.ex b/lib/pleroma/web/rich_media/parser.ex index b69b2be61..185156375 100644 --- a/lib/pleroma/web/rich_media/parser.ex +++ b/lib/pleroma/web/rich_media/parser.ex @@ -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 |