summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2024-05-26 18:29:46 +0000
committerfeld <feld@feld.me>2024-05-26 18:29:46 +0000
commitc3c804b71ffb5c4d2f1a0595b4444efb44ca8180 (patch)
tree4ddb69e73e4b58cb6bc860cbd3c023eb752d5f92 /lib
parent895eea5c752212cb36fb6c908456cdd2f72ad2b7 (diff)
parent807782b7f96ee0e053ad59b464766d750f8a8800 (diff)
downloadpleroma-c3c804b71ffb5c4d2f1a0595b4444efb44ca8180.tar.gz
pleroma-c3c804b71ffb5c4d2f1a0595b4444efb44ca8180.zip
Merge branch 'fix/rich-media-ttl' into 'develop'
Fix rich media parsing some Amazon URLs See merge request pleroma/pleroma!4121
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/rich_media/parser/ttl/aws_signed_url.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/rich_media/parser/ttl/aws_signed_url.ex b/lib/pleroma/web/rich_media/parser/ttl/aws_signed_url.ex
index 948c727e1..1172a120a 100644
--- a/lib/pleroma/web/rich_media/parser/ttl/aws_signed_url.ex
+++ b/lib/pleroma/web/rich_media/parser/ttl/aws_signed_url.ex
@@ -23,7 +23,7 @@ defmodule Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl do
%URI{host: host, query: query} = URI.parse(image)
is_binary(host) and String.contains?(host, "amazonaws.com") and
- String.contains?(query, "X-Amz-Expires")
+ is_binary(query) and String.contains?(query, "X-Amz-Expires")
end
defp aws_signed_url?(_), do: nil