Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject-replies-to-deleted

2024-05-27 15:19:53 +04:00 · 2024-05-27 15:19:53 +04:00 · 4d6316b488
commit 4d6316b488
parent d4769b076a 5e43060128
12 changed files with 176 additions and 5 deletions
--- 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