aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2020-06-23 18:33:03 +0300
committerAlexander Strizhakov <alex.strizhakov@gmail.com>2020-10-13 16:38:15 +0300
commit103f3dcb9ed0a12a11e9cc5c574449439fc2cb0e (patch)
treeeceee9eba622d481c7c60b4694b1d31c79d9e54c
parent7dffaef4799b0e867e91e19b76567c0e1a19bb43 (diff)
downloadpleroma-103f3dcb9ed0a12a11e9cc5c574449439fc2cb0e.tar.gz
rich media parser ttl files consistency
-rw-r--r--lib/pleroma/web/rich_media/parser/ttl.ex (renamed from lib/pleroma/web/rich_media/parsers/ttl/ttl.ex)2
-rw-r--r--lib/pleroma/web/rich_media/parser/ttl/aws_signed_url.ex (renamed from lib/pleroma/web/rich_media/parsers/ttl/aws_signed_url.ex)2
-rw-r--r--test/pleroma/web/rich_media/parser/ttl/aws_signed_url_test.exs (renamed from test/pleroma/web/rich_media/parsers/ttl/aws_signed_url_test.exs)2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/web/rich_media/parsers/ttl/ttl.ex b/lib/pleroma/web/rich_media/parser/ttl.ex
index 13511888c..8353f0fff 100644
--- a/lib/pleroma/web/rich_media/parsers/ttl/ttl.ex
+++ b/lib/pleroma/web/rich_media/parser/ttl.ex
@@ -3,5 +3,5 @@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.RichMedia.Parser.TTL do
- @callback ttl(Map.t(), String.t()) :: {:ok, Integer.t()} | {:error, String.t()}
+ @callback ttl(Map.t(), String.t()) :: Integer.t() | nil
end
diff --git a/lib/pleroma/web/rich_media/parsers/ttl/aws_signed_url.ex b/lib/pleroma/web/rich_media/parser/ttl/aws_signed_url.ex
index 15109d28d..fc4ef79c0 100644
--- a/lib/pleroma/web/rich_media/parsers/ttl/aws_signed_url.ex
+++ b/lib/pleroma/web/rich_media/parser/ttl/aws_signed_url.ex
@@ -5,7 +5,7 @@
defmodule Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl do
@behaviour Pleroma.Web.RichMedia.Parser.TTL
- @impl Pleroma.Web.RichMedia.Parser.TTL
+ @impl true
def ttl(data, _url) do
image = Map.get(data, :image)
diff --git a/test/pleroma/web/rich_media/parsers/ttl/aws_signed_url_test.exs b/test/pleroma/web/rich_media/parser/ttl/aws_signed_url_test.exs
index 4a3122638..2f17bebd7 100644
--- a/test/pleroma/web/rich_media/parsers/ttl/aws_signed_url_test.exs
+++ b/test/pleroma/web/rich_media/parser/ttl/aws_signed_url_test.exs
@@ -2,7 +2,7 @@
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
-defmodule Pleroma.Web.RichMedia.Parsers.TTL.AwsSignedUrlTest do
+defmodule Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrlTest do
use ExUnit.Case, async: true
test "s3 signed url is parsed correct for expiration time" do