Preloaders: Use strings as keys.

diff --git a/lib/pleroma/web/preload/instance.ex b/lib/pleroma/web/preload/instance.ex
index 3b95fe403cf37fc122320e695b4379a1b4f7e192..b34d7cf37218ab328bd9a70afc5d89a96c55e3dd 100644 (file)
--- a/lib/pleroma/web/preload/instance.ex
+++ b/lib/pleroma/web/preload/instance.ex
@@ -8,9 +8,9 @@ defmodule Pleroma.Web.Preload.Providers.Instance do
   alias Pleroma.Web.Preload.Providers.Provider
 
   @behaviour Provider
-  @instance_url :"/api/v1/instance"
-  @panel_url :"/instance/panel.html"
-  @nodeinfo_url :"/nodeinfo/2.0.json"
+  @instance_url "/api/v1/instance"
+  @panel_url "/instance/panel.html"
+  @nodeinfo_url "/nodeinfo/2.0.json"
 
   @impl Provider
   def generate_terms(_params) do

diff --git a/lib/pleroma/web/preload/status_net.ex b/lib/pleroma/web/preload/status_net.ex
index 810ad512bf8d8bebedac34b4bfc89be906cbe195..9b62f87a2da108f4a4d718d877fc6e5bbb2f326b 100644 (file)
--- a/lib/pleroma/web/preload/status_net.ex
+++ b/lib/pleroma/web/preload/status_net.ex
@@ -7,7 +7,7 @@ defmodule Pleroma.Web.Preload.Providers.StatusNet do
   alias Pleroma.Web.TwitterAPI.UtilController
 
   @behaviour Provider
-  @config_url :"/api/statusnet/config.json"
+  @config_url "/api/statusnet/config.json"
 
   @impl Provider
   def generate_terms(_params) do

diff --git a/lib/pleroma/web/preload/timelines.ex b/lib/pleroma/web/preload/timelines.ex
index e531b8960e1bbf7e2663dd5363f8f88e2d7e4f06..57de0405104bcf7599260e9278b44aff7e36abff 100644 (file)
--- a/lib/pleroma/web/preload/timelines.ex
+++ b/lib/pleroma/web/preload/timelines.ex
@@ -8,7 +8,7 @@ defmodule Pleroma.Web.Preload.Providers.Timelines do
   alias Pleroma.Web.Preload.Providers.Provider
 
   @behaviour Provider
-  @public_url :"/api/v1/timelines/public"
+  @public_url "/api/v1/timelines/public"
 
   @impl Provider
   def generate_terms(params) do

diff --git a/lib/pleroma/web/preload/user.ex b/lib/pleroma/web/preload/user.ex
index 7fef0a4acef505e3e6aea254e9a6f90a0505e9b7..b3d2e9b8dd25efa6f2d90e3fef4a6a7ec8c8a085 100644 (file)
--- a/lib/pleroma/web/preload/user.ex
+++ b/lib/pleroma/web/preload/user.ex
@@ -8,7 +8,7 @@ defmodule Pleroma.Web.Preload.Providers.User do
   alias Pleroma.Web.Preload.Providers.Provider
 
   @behaviour Provider
-  @account_url_base :"/api/v1/accounts"
+  @account_url_base "/api/v1/accounts"
 
   @impl Provider
   def generate_terms(%{user: user}) do
@@ -19,7 +19,7 @@ defmodule Pleroma.Web.Preload.Providers.User do
 
   def build_accounts_tag(acc, %User{} = user) do
     account_data = AccountView.render("show.json", %{user: user, for: user})
-    Map.put(acc, :"#{@account_url_base}/#{user.id}", account_data)
+    Map.put(acc, "#{@account_url_base}/#{user.id}", account_data)
   end
 
   def build_accounts_tag(acc, _), do: acc

diff --git a/test/web/preload/instance_test.exs b/test/web/preload/instance_test.exs
index 51b9dc549c51949baeccf6e5f6488961c1069f48..5bb6c598117052307677186401e0da252a0c8d25 100644 (file)
--- a/test/web/preload/instance_test.exs
+++ b/test/web/preload/instance_test.exs
@@ -8,7 +8,7 @@ defmodule Pleroma.Web.Preload.Providers.InstanceTest do
 
   setup do: {:ok, Instance.generate_terms(nil)}
 
-  test "it renders the info", %{"/api/v1/instance": info} do
+  test "it renders the info", %{"/api/v1/instance" => info} do
     assert %{
              description: description,
              email: "admin@example.com",
@@ -18,14 +18,14 @@ defmodule Pleroma.Web.Preload.Providers.InstanceTest do
     assert String.equivalent?(description, "Pleroma: An efficient and flexible fediverse server")
   end
 
-  test "it renders the panel", %{"/instance/panel.html": panel} do
+  test "it renders the panel", %{"/instance/panel.html" => panel} do
     assert String.contains?(
              panel,
              "<p>Welcome to <a href=\"https://pleroma.social\" target=\"_blank\">Pleroma!</a></p>"
            )
   end
 
-  test "it renders the node_info", %{"/nodeinfo/2.0.json": nodeinfo} do
+  test "it renders the node_info", %{"/nodeinfo/2.0.json" => nodeinfo} do
     %{
       metadata: metadata,
       version: "2.0"

diff --git a/test/web/preload/status_net_test.exs b/test/web/preload/status_net_test.exs
index 2cdc82930cdf21ea1de150f6111a0cb69f6e382f..df7acdb115936334888874cf88fa1ecd508d005e 100644 (file)
--- a/test/web/preload/status_net_test.exs
+++ b/test/web/preload/status_net_test.exs
@@ -8,7 +8,7 @@ defmodule Pleroma.Web.Preload.Providers.StatusNetTest do
 
   setup do: {:ok, StatusNet.generate_terms(nil)}
 
-  test "it renders the info", %{"/api/statusnet/config.json": info} do
+  test "it renders the info", %{"/api/statusnet/config.json" => info} do
     assert {:ok, res} = Jason.decode(info)
     assert res["site"]
   end

diff --git a/test/web/preload/timeline_test.exs b/test/web/preload/timeline_test.exs
index da6a3aded001e05b6592c4808bfddb9b1de9c23b..fea95a6a465b44e4931dce899dde8a2a560e68d8 100644 (file)
--- a/test/web/preload/timeline_test.exs
+++ b/test/web/preload/timeline_test.exs
@@ -9,7 +9,7 @@ defmodule Pleroma.Web.Preload.Providers.TimelineTest do
   alias Pleroma.Web.CommonAPI
   alias Pleroma.Web.Preload.Providers.Timelines
 
-  @public_url :"/api/v1/timelines/public"
+  @public_url "/api/v1/timelines/public"
 
   describe "unauthenticated timeliness when restricted" do
     setup do

diff --git a/test/web/preload/user_test.exs b/test/web/preload/user_test.exs
index 68d69d97760a51bfaed5cd5815b2071c0d890d6f..83f065e27aaaa2382bddd9b1ec1036686f9fd6aa 100644 (file)
--- a/test/web/preload/user_test.exs
+++ b/test/web/preload/user_test.exs
@@ -26,7 +26,7 @@ defmodule Pleroma.Web.Preload.Providers.UserTest do
     end
 
     test "account is rendered", %{terms: terms, user: user} do
-      account = terms[:"/api/v1/accounts/#{user.id}"]
+      account = terms["/api/v1/accounts/#{user.id}"]
       assert %{acct: user, username: user} = account
     end
   end