projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into feature/hide-follows-remote
[akkoma]
/
lib
/
pleroma
/
web
/
rich_media
/
parser.ex
diff --git
a/lib/pleroma/web/rich_media/parser.ex
b/lib/pleroma/web/rich_media/parser.ex
index b69b2be610a6383ed5f5c97a92f3db4c0fe3ea02..f5f9e358c23bce1996dad12a0f3e480a516cfe8d 100644
(file)
--- 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
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
Cachex.expire_at(:rich_media_cache, url, ttl * 1000)
{:ok, data}
else
@@
-82,6
+82,7
@@
defmodule Pleroma.Web.RichMedia.Parser do
html
|> maybe_parse()
html
|> maybe_parse()
+ |> Map.put(:url, url)
|> clean_parsed_data()
|> check_parsed_data()
rescue
|> clean_parsed_data()
|> check_parsed_data()
rescue