projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/2047-rich-media-parser' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
rich_media
/
parsers
/
ttl
/
aws_signed_url.ex
diff --git
a/lib/pleroma/web/rich_media/parsers/ttl/aws_signed_url.ex
b/lib/pleroma/web/rich_media/parsers/ttl/aws_signed_url.ex
index 014c0935f44c3968fa3b3cfd1b84c229973b5ab0..c5aaea2d47849d8c8a6710b4730367a0717c2513 100644
(file)
--- a/
lib/pleroma/web/rich_media/parsers/ttl/aws_signed_url.ex
+++ b/
lib/pleroma/web/rich_media/parsers/ttl/aws_signed_url.ex
@@
-10,21
+10,15
@@
defmodule Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl do
|> parse_query_params()
|> format_query_params()
|> get_expiration_timestamp()
|> parse_query_params()
|> format_query_params()
|> get_expiration_timestamp()
+ else
+ {:error, "Not aws signed url #{inspect(image)}"}
end
end
end
end
- defp is_aws_signed_url(""), do: nil
- defp is_aws_signed_url(nil), do: nil
-
- defp is_aws_signed_url(image) when is_binary(image) do
+ defp is_aws_signed_url(image) when is_binary(image) and image != "" do
%URI{host: host, query: query} = URI.parse(image)
%URI{host: host, query: query} = URI.parse(image)
- if String.contains?(host, "amazonaws.com") and
- String.contains?(query, "X-Amz-Expires") do
- image
- else
- nil
- end
+ String.contains?(host, "amazonaws.com") and String.contains?(query, "X-Amz-Expires")
end
defp is_aws_signed_url(_), do: nil
end
defp is_aws_signed_url(_), do: nil
@@
-47,6
+41,6
@@
defmodule Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl do
|> Map.get("X-Amz-Date")
|> Timex.parse("{ISO:Basic:Z}")
|> Map.get("X-Amz-Date")
|> Timex.parse("{ISO:Basic:Z}")
- Timex.to_unix(date) + String.to_integer(Map.get(params, "X-Amz-Expires"))
+ {:ok, Timex.to_unix(date) + String.to_integer(Map.get(params, "X-Amz-Expires"))}
end
end
end
end