test(fix): resolve issues with credo, dialyzer and formatting after update of elixir version

Author: akinsey

lib/epochtalk_server_web/controllers/board.ex

@@ -100,9 +100,6 @@ defmodule EpochtalkServerWeb.Controllers.Board do
           400,
           "Error, cannot convert slug: board does not exist"
         )
-
-      _ ->
-        ErrorHelpers.render_json_error(conn, 400, "Error, cannot convert board slug to id")
     end
   end
 end

lib/epochtalk_server_web/controllers/moderation_log.ex

@@ -4,7 +4,6 @@ defmodule EpochtalkServerWeb.Controllers.ModerationLog do
   @moduledoc """
   Controller For `ModerationLog` related API requests
   """
-  alias EpochtalkServer.Auth.Guardian
   alias EpochtalkServer.Models.ModerationLog
   alias EpochtalkServerWeb.ErrorHelpers
   alias EpochtalkServerWeb.Helpers.Validate
@@ -14,21 +13,14 @@ defmodule EpochtalkServerWeb.Controllers.ModerationLog do
   Used to page `ModerationLog` models for moderation log view`
   """
   def page(conn, attrs) do
-    with {:auth, true} <- {:auth, Guardian.Plug.authenticated?(conn)},
-         :ok <- ACL.allow!(conn, "moderationLogs.page"),
+    with :ok <- ACL.allow!(conn, "moderationLogs.page"),
          page <- Validate.cast(attrs, "page", :integer, min: 1),
          limit <- Validate.cast(attrs, "limit", :integer, min: 1),
          {:ok, moderation_logs, data} <- ModerationLog.page(attrs, page, per_page: limit) do
       render(conn, :page, %{moderation_logs: moderation_logs, pagination_data: data})
     else
-      {:auth, false} ->
-        ErrorHelpers.render_json_error(conn, 400, "Not logged in, cannot page moderation log")
-
-      {:error, data} ->
-        ErrorHelpers.render_json_error(conn, 400, data)
-
       _ ->
-        ErrorHelpers.render_json_error(conn, 500, "There was an issue getting the moderation log")
+        ErrorHelpers.render_json_error(conn, 500, "There was an issue paging the moderation log")
     end
   end
 end

lib/epochtalk_server_web/controllers/notification.ex

@@ -25,13 +25,6 @@ defmodule EpochtalkServerWeb.Controllers.Notification do
           400,
           "Not logged in, cannot fetch notification counts"
         )
-
-      {:access, false} ->
-        ErrorHelpers.render_json_error(
-          conn,
-          400,
-          "Not logged in, cannot fetch notification counts"
-        )
     end
   end
 

lib/epochtalk_server_web/controllers/poll.ex

@@ -193,9 +193,6 @@ defmodule EpochtalkServerWeb.Controllers.Poll do
           "Account must be active to modify lock on poll"
         )
 
-      {:error, data} ->
-        ErrorHelpers.render_json_error(conn, 400, data)
-
       _ ->
         ErrorHelpers.render_json_error(conn, 400, "Error, cannot lock poll")
     end
@@ -316,9 +313,6 @@ defmodule EpochtalkServerWeb.Controllers.Poll do
          poll <- Poll.by_thread(thread_id) do
       render(conn, :poll, %{poll: poll, has_voted: false})
     else
-      {:valid_answers_list, false} ->
-        ErrorHelpers.render_json_error(conn, 400, "Error, 'answer_ids' must be a list")
-
       {:can_read, {:ok, false}} ->
         ErrorHelpers.render_json_error(
           conn,
@@ -355,12 +349,6 @@ defmodule EpochtalkServerWeb.Controllers.Poll do
       {:board_banned, {:ok, true}} ->
         ErrorHelpers.render_json_error(conn, 403, "Unauthorized, you are banned from this board")
 
-      {:error, :board_does_not_exist} ->
-        ErrorHelpers.render_json_error(conn, 400, "Error, board does not exist")
-
-      {:error, data} ->
-        ErrorHelpers.render_json_error(conn, 400, data)
-
       _ ->
         ErrorHelpers.render_json_error(conn, 400, "Error, cannot cast vote")
     end

lib/epochtalk_server_web/controllers/thread.ex

@@ -172,10 +172,11 @@ defmodule EpochtalkServerWeb.Controllers.Thread do
          user <- Guardian.Plug.current_resource(conn),
          user_priority <- ACL.get_user_priority(conn),
          :ok <- ACL.allow!(conn, "threads.byBoard"),
-         {:can_read, {:ok, true}} <-
-           {:can_read, Board.get_read_access_by_id(board_id, user_priority)},
-         {:ok, write_access} <- Board.get_write_access_by_id(board_id, user_priority),
+         {:ok, can_read} <- Board.get_read_access_by_id(board_id, user_priority),
+         {:can_read, true} <- {:can_read, can_read},
          {:ok, board_banned} <- BoardBan.banned_from_board?(user, board_id: board_id),
+         {:board_banned, false} <- {:board_banned, board_banned},
+         {:ok, write_access} <- Board.get_write_access_by_id(board_id, user_priority),
          {:ok, watching_board} <- WatchBoard.user_is_watching(user, board_id),
          board_mapping <- BoardMapping.all(),
          board_moderators <- BoardModerator.all(),
@@ -206,20 +207,14 @@ defmodule EpochtalkServerWeb.Controllers.Thread do
       {:error, :board_does_not_exist} ->
         ErrorHelpers.render_json_error(conn, 400, "Error, board does not exist")
 
-      {:can_read, {:ok, false}} ->
+      {:can_read, false} ->
         ErrorHelpers.render_json_error(conn, 403, "Unauthorized, you do not have permission")
 
-      {:can_read, {:error, :board_does_not_exist}} ->
-        ErrorHelpers.render_json_error(conn, 400, "Read error, board does not exist")
-
-      {:board_banned, {:ok, true}} ->
+      {:board_banned, true} ->
         ErrorHelpers.render_json_error(conn, 403, "Unauthorized, you are banned from this board")
 
       {:has_threads, false} ->
         ErrorHelpers.render_json_error(conn, 404, "Error, requested threads not found in board")
-
-      _ ->
-        ErrorHelpers.render_json_error(conn, 400, "Error, cannot get threads by board")
     end
   end
 
@@ -338,9 +333,6 @@ defmodule EpochtalkServerWeb.Controllers.Thread do
           "Account must be active to unwatch thread"
         )
 
-      {:error, data} ->
-        ErrorHelpers.render_json_error(conn, 400, data)
-
       _ ->
         ErrorHelpers.render_json_error(conn, 400, "Error, cannot unwatch thread")
     end
@@ -399,9 +391,6 @@ defmodule EpochtalkServerWeb.Controllers.Thread do
           "Account must be active to modify lock on thread"
         )
 
-      {:error, data} ->
-        ErrorHelpers.render_json_error(conn, 400, data)
-
       _ ->
         ErrorHelpers.render_json_error(conn, 400, "Error, cannot lock thread")
     end
@@ -460,9 +449,6 @@ defmodule EpochtalkServerWeb.Controllers.Thread do
           "Account must be active to modify sticky on thread"
         )
 
-      {:error, data} ->
-        ErrorHelpers.render_json_error(conn, 400, data)
-
       _ ->
         ErrorHelpers.render_json_error(conn, 400, "Error, cannot sticky thread")
     end
@@ -636,9 +622,6 @@ defmodule EpochtalkServerWeb.Controllers.Thread do
           400,
           "Error, cannot convert slug, thread does not exist"
         )
-
-      _ ->
-        ErrorHelpers.render_json_error(conn, 400, "Error, cannot convert thread slug to id")
     end
   end
 
@@ -661,7 +644,7 @@ defmodule EpochtalkServerWeb.Controllers.Thread do
       |> send_resp(200, [])
       |> halt()
     else
-      {:error, :board_does_not_exist} ->
+      {:can_read, {:error, :board_does_not_exist}} ->
         ErrorHelpers.render_json_error(
           conn,
           400,

lib/epochtalk_server_web/controllers/user.ex

@@ -94,10 +94,6 @@ defmodule EpochtalkServerWeb.Controllers.User do
          {:ok, _email} <- Mailer.send_confirm_account(user) do
       render(conn, :register_with_verify, user: user)
     else
-      # error in user.create
-      {:error, data} ->
-        ErrorHelpers.render_json_error(conn, 400, data)
-
       # error email failed to send
       {:error, :not_delivered} ->
         ErrorHelpers.render_json_error(
@@ -106,6 +102,10 @@ defmodule EpochtalkServerWeb.Controllers.User do
           "Sending of account confirmation email failed, mailer is not properly configured."
         )
 
+      # error in user.create
+      {:error, data} ->
+        ErrorHelpers.render_json_error(conn, 400, data)
+
       # Catch all for any other errors
       _ ->
         ErrorHelpers.render_json_error(conn, 500, "There was an issue registering")
@@ -139,12 +139,6 @@ defmodule EpochtalkServerWeb.Controllers.User do
           500,
           "There was an error banning malicious user, upon confirming account"
         )
-
-      {:error, data} ->
-        ErrorHelpers.render_json_error(conn, 400, data)
-
-      _ ->
-        ErrorHelpers.render_json_error(conn, 500, "There was an issue registering")
     end
   end
 
@@ -182,14 +176,8 @@ defmodule EpochtalkServerWeb.Controllers.User do
       {:error, :user_not_found} ->
         ErrorHelpers.render_json_error(conn, 400, "Account not found")
 
-      {:error, data} ->
-        ErrorHelpers.render_json_error(conn, 400, data)
-
       {:view_deleted, false} ->
         ErrorHelpers.render_json_error(conn, 400, "Account not found")
-
-      _ ->
-        ErrorHelpers.render_json_error(conn, 500, "There was an issue finding user")
     end
   end
 
@@ -217,7 +205,6 @@ defmodule EpochtalkServerWeb.Controllers.User do
     else
       {:auth, false} -> ErrorHelpers.render_json_error(conn, 400, "Not logged in")
       {:error, error} -> ErrorHelpers.render_json_error(conn, 500, error)
-      _ -> ErrorHelpers.render_json_error(conn, 500, "There was an issue signing out")
     end
   end
 
@@ -262,9 +249,6 @@ defmodule EpochtalkServerWeb.Controllers.User do
 
       {:error, :unban_error} ->
         ErrorHelpers.render_json_error(conn, 500, "There was an issue unbanning user, upon login")
-
-      _ ->
-        ErrorHelpers.render_json_error(conn, 500, "There was an issue while attempting to login")
     end
   end
 

lib/epochtalk_server_web/router.ex

@@ -65,6 +65,7 @@ defmodule EpochtalkServerWeb.Router do
     get "/admin/modlog", ModerationLog, :page
     get "/boards/movelist", Board, :movelist
     post "/images/s3/upload", ImageReference, :s3_request_upload
+    delete "/logout", User, :logout
   end
 
   scope "/api", EpochtalkServerWeb.Controllers do
@@ -86,7 +87,6 @@ defmodule EpochtalkServerWeb.Router do
     post "/register", User, :register
     post "/login", User, :login
     post "/confirm", User, :confirm
-    delete "/logout", User, :logout
   end
 
   scope "/", EpochtalkServerWeb.Controllers do

mix.exs

@@ -36,7 +36,7 @@ defmodule EpochtalkServer.MixProject do
       {:argon2_elixir, "~> 3.1.0"},
       {:configparser_ex, "~> 4.0"},
       {:corsica, "~> 1.3.0"},
-      {:credo, "~> 1.6", only: [:dev, :test], runtime: false},
+      {:credo, "~> 1.7.9", only: [:dev, :test], runtime: false},
       {:dialyxir, "~> 1.2", only: [:dev], runtime: false},
       {:dotenv_parser, "~> 2.0"},
       {:earmark, "~> 1.4"},

mix.lock

@@ -10,9 +10,9 @@
   "cowboy": {:hex, :cowboy, "2.12.0", "f276d521a1ff88b2b9b4c54d0e753da6c66dd7be6c9fca3d9418b561828a3731", [:make, :rebar3], [{:cowlib, "2.13.0", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "8a7abe6d183372ceb21caa2709bec928ab2b72e18a3911aa1771639bef82651e"},
   "cowboy_telemetry": {:hex, :cowboy_telemetry, "0.4.0", "f239f68b588efa7707abce16a84d0d2acf3a0f50571f8bb7f56a15865aae820c", [:rebar3], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7d98bac1ee4565d31b62d59f8823dfd8356a169e7fcbb83831b8a5397404c9de"},
   "cowlib": {:hex, :cowlib, "2.13.0", "db8f7505d8332d98ef50a3ef34b34c1afddec7506e4ee4dd4a3a266285d282ca", [:make, :rebar3], [], "hexpm", "e1e1284dc3fc030a64b1ad0d8382ae7e99da46c3246b815318a4b848873800a4"},
-  "credo": {:hex, :credo, "1.7.6", "b8f14011a5443f2839b04def0b252300842ce7388f3af177157c86da18dfbeea", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "146f347fb9f8cbc5f7e39e3f22f70acbef51d441baa6d10169dd604bfbc55296"},
+  "credo": {:hex, :credo, "1.7.10", "6e64fe59be8da5e30a1b96273b247b5cf1cc9e336b5fd66302a64b25749ad44d", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "71fbc9a6b8be21d993deca85bf151df023a3097b01e09a2809d460348561d8cd"},
   "db_connection": {:hex, :db_connection, "2.6.0", "77d835c472b5b67fc4f29556dee74bf511bbafecdcaf98c27d27fa5918152086", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c2f992d15725e721ec7fbc1189d4ecdb8afef76648c746a8e1cad35e3b8a35f3"},
-  "decimal": {:hex, :decimal, "2.1.1", "5611dca5d4b2c3dd497dec8f68751f1f1a54755e8ed2a966c2633cf885973ad6", [:mix], [], "hexpm", "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"},
+  "decimal": {:hex, :decimal, "2.2.0", "df3d06bb9517e302b1bd265c1e7f16cda51547ad9d99892049340841f3e15836", [:mix], [], "hexpm", "af8daf87384b51b7e611fb1a1f2c4d4876b65ef968fa8bd3adf44cff401c7f21"},
   "dialyxir": {:hex, :dialyxir, "1.4.3", "edd0124f358f0b9e95bfe53a9fcf806d615d8f838e2202a9f430d59566b6b53b", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "bf2cfb75cd5c5006bec30141b131663299c661a864ec7fbbc72dfa557487a986"},
   "dotenv_parser": {:hex, :dotenv_parser, "2.0.1", "7b2f02dd04f7f68458fe9942caf7de52a5dbada580fd87c722a8bed9f7fca0f2", [:mix], [], "hexpm", "f00780ad69e9089bd9b782e88d3e8110141dff0c54577b6c3735cef6925e4272"},
   "earmark": {:hex, :earmark, "1.4.46", "8c7287bd3137e99d26ae4643e5b7ef2129a260e3dcf41f251750cb4563c8fb81", [:mix], [], "hexpm", "798d86db3d79964e759ddc0c077d5eb254968ed426399fbf5a62de2b5ff8910a"},
@@ -26,7 +26,7 @@
   "ex_doc": {:hex, :ex_doc, "0.29.4", "6257ecbb20c7396b1fe5accd55b7b0d23f44b6aa18017b415cb4c2b91d997729", [:mix], [{:earmark_parser, "~> 1.4.31", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.14", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1", [hex: :makeup_erlang, repo: "hexpm", optional: false]}], "hexpm", "2c6699a737ae46cb61e4ed012af931b57b699643b24dabe2400a8168414bc4f5"},
   "ex_machina": {:hex, :ex_machina, "2.7.0", "b792cc3127fd0680fecdb6299235b4727a4944a09ff0fa904cc639272cd92dc7", [:mix], [{:ecto, "~> 2.2 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:ecto_sql, "~> 3.0", [hex: :ecto_sql, repo: "hexpm", optional: true]}], "hexpm", "419aa7a39bde11894c87a615c4ecaa52d8f107bbdd81d810465186f783245bf8"},
   "ex_utils": {:hex, :ex_utils, "0.1.7", "2c133e0bcdc49a858cf8dacf893308ebc05bc5fba501dc3d2935e65365ec0bf3", [:mix], [], "hexpm", "66d4fe75285948f2d1e69c2a5ddd651c398c813574f8d36a9eef11dc20356ef6"},
-  "file_system": {:hex, :file_system, "1.0.0", "b689cc7dcee665f774de94b5a832e578bd7963c8e637ef940cd44327db7de2cd", [:mix], [], "hexpm", "6752092d66aec5a10e662aefeed8ddb9531d79db0bc145bb8c40325ca1d8536d"},
+  "file_system": {:hex, :file_system, "1.0.1", "79e8ceaddb0416f8b8cd02a0127bdbababe7bf4a23d2a395b983c1f8b3f73edd", [:mix], [], "hexpm", "4414d1f38863ddf9120720cd976fce5bdde8e91d8283353f0e31850fa89feb9e"},
   "finch": {:hex, :finch, "0.18.0", "944ac7d34d0bd2ac8998f79f7a811b21d87d911e77a786bc5810adb75632ada4", [:mix], [{:castore, "~> 0.1 or ~> 1.0", [hex: :castore, repo: "hexpm", optional: false]}, {:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.3", [hex: :mint, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.4 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:nimble_pool, "~> 0.2.6 or ~> 1.0", [hex: :nimble_pool, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "69f5045b042e531e53edc2574f15e25e735b522c37e2ddb766e15b979e03aa65"},
   "gen_smtp": {:hex, :gen_smtp, "1.2.0", "9cfc75c72a8821588b9b9fe947ae5ab2aed95a052b81237e0928633a13276fd3", [:rebar3], [{:ranch, ">= 1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "5ee0375680bca8f20c4d85f58c2894441443a743355430ff33a783fe03296779"},
   "guardian": {:hex, :guardian, "2.3.2", "78003504b987f2b189d76ccf9496ceaa6a454bb2763627702233f31eb7212881", [:mix], [{:jose, "~> 1.8", [hex: :jose, repo: "hexpm", optional: false]}, {:plug, "~> 1.3.3 or ~> 1.4", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "b189ff38cd46a22a8a824866a6867ca8722942347f13c33f7d23126af8821b52"},
@@ -40,7 +40,7 @@
   "html_sanitize_ex": {:hex, :html_sanitize_ex, "1.4.3", "67b3d9fa8691b727317e0cc96b9b3093be00ee45419ffb221cdeee88e75d1360", [:mix], [{:mochiweb, "~> 2.15 or ~> 3.1", [hex: :mochiweb, repo: "hexpm", optional: false]}], "hexpm", "87748d3c4afe949c7c6eb7150c958c2bcba43fc5b2a02686af30e636b74bccb7"},
   "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~> 0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},
   "iteraptor": {:git, "https://github.com/epochtalk/elixir-iteraptor.git", "d8d1c386c38e06bdfcf60c9ce1abf8e49161cab4", [tag: "1.13.1"]},
-  "jason": {:hex, :jason, "1.4.1", "af1504e35f629ddcdd6addb3513c3853991f694921b1b9368b0bd32beb9f1b63", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "fbb01ecdfd565b56261302f7e1fcc27c4fb8f32d56eab74db621fc154604a7a1"},
+  "jason": {:hex, :jason, "1.4.4", "b9226785a9aa77b6857ca22832cffa5d5011a667207eb2a0ad56adb5db443b8a", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "c5eb0cab91f094599f94d55bc63409236a8ec69a21a67814529e8d5f6cc90b3b"},
   "jose": {:hex, :jose, "1.11.10", "a903f5227417bd2a08c8a00a0cbcc458118be84480955e8d251297a425723f83", [:mix, :rebar3], [], "hexpm", "0d6cd36ff8ba174db29148fc112b5842186b68a90ce9fc2b3ec3afe76593e614"},
   "makeup": {:hex, :makeup, "1.1.2", "9ba8837913bdf757787e71c1581c21f9d2455f4dd04cfca785c70bbfff1a76a3", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cce1566b81fbcbd21eca8ffe808f33b221f9eee2cbc7a1706fc3da9ff18e6cac"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.16.2", "627e84b8e8bf22e60a2579dad15067c755531fea049ae26ef1020cad58fe9578", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.2.3 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "41193978704763f6bbe6cc2758b84909e62984c7752b3784bd3c218bb341706b"},