From 103f3dcb9ed0a12a11e9cc5c574449439fc2cb0e Mon Sep 17 00:00:00 2001
From: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date: Tue, 23 Jun 2020 18:33:03 +0300
Subject: rich media parser ttl files consistency

---
 lib/pleroma/web/rich_media/parser/ttl.ex           |  7 +++
 .../web/rich_media/parser/ttl/aws_signed_url.ex    | 50 ++++++++++++++++++++++
 .../web/rich_media/parsers/ttl/aws_signed_url.ex   | 50 ----------------------
 lib/pleroma/web/rich_media/parsers/ttl/ttl.ex      |  7 ---
 4 files changed, 57 insertions(+), 57 deletions(-)
 create mode 100644 lib/pleroma/web/rich_media/parser/ttl.ex
 create mode 100644 lib/pleroma/web/rich_media/parser/ttl/aws_signed_url.ex
 delete mode 100644 lib/pleroma/web/rich_media/parsers/ttl/aws_signed_url.ex
 delete mode 100644 lib/pleroma/web/rich_media/parsers/ttl/ttl.ex

(limited to 'lib')

diff --git a/lib/pleroma/web/rich_media/parser/ttl.ex b/lib/pleroma/web/rich_media/parser/ttl.ex
new file mode 100644
index 000000000..8353f0fff
--- /dev/null
+++ b/lib/pleroma/web/rich_media/parser/ttl.ex
@@ -0,0 +1,7 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.RichMedia.Parser.TTL do
+  @callback ttl(Map.t(), String.t()) :: Integer.t() | nil
+end
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
new file mode 100644
index 000000000..fc4ef79c0
--- /dev/null
+++ b/lib/pleroma/web/rich_media/parser/ttl/aws_signed_url.ex
@@ -0,0 +1,50 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
+defmodule Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl do
+  @behaviour Pleroma.Web.RichMedia.Parser.TTL
+
+  @impl true
+  def ttl(data, _url) do
+    image = Map.get(data, :image)
+
+    if is_aws_signed_url(image) do
+      image
+      |> parse_query_params()
+      |> format_query_params()
+      |> get_expiration_timestamp()
+    else
+      {:error, "Not aws signed url #{inspect(image)}"}
+    end
+  end
+
+  defp is_aws_signed_url(image) when is_binary(image) and image != "" do
+    %URI{host: host, query: query} = URI.parse(image)
+
+    String.contains?(host, "amazonaws.com") and String.contains?(query, "X-Amz-Expires")
+  end
+
+  defp is_aws_signed_url(_), do: nil
+
+  defp parse_query_params(image) do
+    %URI{query: query} = URI.parse(image)
+    query
+  end
+
+  defp format_query_params(query) do
+    query
+    |> String.split(~r/&|=/)
+    |> Enum.chunk_every(2)
+    |> Map.new(fn [k, v] -> {k, v} end)
+  end
+
+  defp get_expiration_timestamp(params) when is_map(params) do
+    {:ok, date} =
+      params
+      |> Map.get("X-Amz-Date")
+      |> Timex.parse("{ISO:Basic:Z}")
+
+    {:ok, Timex.to_unix(date) + String.to_integer(Map.get(params, "X-Amz-Expires"))}
+  end
+end
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
deleted file mode 100644
index 15109d28d..000000000
--- a/lib/pleroma/web/rich_media/parsers/ttl/aws_signed_url.ex
+++ /dev/null
@@ -1,50 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Web.RichMedia.Parser.TTL.AwsSignedUrl do
-  @behaviour Pleroma.Web.RichMedia.Parser.TTL
-
-  @impl Pleroma.Web.RichMedia.Parser.TTL
-  def ttl(data, _url) do
-    image = Map.get(data, :image)
-
-    if is_aws_signed_url(image) do
-      image
-      |> parse_query_params()
-      |> format_query_params()
-      |> get_expiration_timestamp()
-    else
-      {:error, "Not aws signed url #{inspect(image)}"}
-    end
-  end
-
-  defp is_aws_signed_url(image) when is_binary(image) and image != "" do
-    %URI{host: host, query: query} = URI.parse(image)
-
-    String.contains?(host, "amazonaws.com") and String.contains?(query, "X-Amz-Expires")
-  end
-
-  defp is_aws_signed_url(_), do: nil
-
-  defp parse_query_params(image) do
-    %URI{query: query} = URI.parse(image)
-    query
-  end
-
-  defp format_query_params(query) do
-    query
-    |> String.split(~r/&|=/)
-    |> Enum.chunk_every(2)
-    |> Map.new(fn [k, v] -> {k, v} end)
-  end
-
-  defp get_expiration_timestamp(params) when is_map(params) do
-    {:ok, date} =
-      params
-      |> Map.get("X-Amz-Date")
-      |> Timex.parse("{ISO:Basic:Z}")
-
-    {:ok, Timex.to_unix(date) + String.to_integer(Map.get(params, "X-Amz-Expires"))}
-  end
-end
diff --git a/lib/pleroma/web/rich_media/parsers/ttl/ttl.ex b/lib/pleroma/web/rich_media/parsers/ttl/ttl.ex
deleted file mode 100644
index 13511888c..000000000
--- a/lib/pleroma/web/rich_media/parsers/ttl/ttl.ex
+++ /dev/null
@@ -1,7 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# 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()}
-end
-- 
cgit v1.2.3