forked from shibao/cannery
		
	fix credo
This commit is contained in:
		| @@ -196,7 +196,7 @@ defmodule Cannery.Accounts do | ||||
|          {:ok, _} <- Repo.transaction(user_email_multi(user, email, context)) do | ||||
|       :ok | ||||
|     else | ||||
|       _ -> :error | ||||
|       _error_tuple -> :error | ||||
|     end | ||||
|   end | ||||
|  | ||||
| @@ -265,7 +265,7 @@ defmodule Cannery.Accounts do | ||||
|     |> Repo.transaction() | ||||
|     |> case do | ||||
|       {:ok, %{user: user}} -> {:ok, user} | ||||
|       {:error, :user, changeset, _} -> {:error, changeset} | ||||
|       {:error, :user, changeset, _changes_so_far} -> {:error, changeset} | ||||
|     end | ||||
|   end | ||||
|  | ||||
| @@ -372,7 +372,7 @@ defmodule Cannery.Accounts do | ||||
|          {:ok, %{user: user}} <- Repo.transaction(confirm_user_multi(user)) do | ||||
|       {:ok, user} | ||||
|     else | ||||
|       _ -> :error | ||||
|       _error_tuple -> :error | ||||
|     end | ||||
|   end | ||||
|  | ||||
| @@ -420,7 +420,7 @@ defmodule Cannery.Accounts do | ||||
|          %User{} = user <- Repo.one(query) do | ||||
|       user | ||||
|     else | ||||
|       _ -> nil | ||||
|       _error_tuple -> nil | ||||
|     end | ||||
|   end | ||||
|  | ||||
| @@ -444,7 +444,7 @@ defmodule Cannery.Accounts do | ||||
|     |> Repo.transaction() | ||||
|     |> case do | ||||
|       {:ok, %{user: user}} -> {:ok, user} | ||||
|       {:error, :user, changeset, _} -> {:error, changeset} | ||||
|       {:error, :user, changeset, _changes_so_far} -> {:error, changeset} | ||||
|     end | ||||
|   end | ||||
| end | ||||
|   | ||||
| @@ -171,7 +171,7 @@ defmodule Cannery.Accounts.User do | ||||
|     Bcrypt.verify_pass(password, hashed_password) | ||||
|   end | ||||
|  | ||||
|   def valid_password?(_, _) do | ||||
|   def valid_password?(_invalid_user, _invalid_password) do | ||||
|     Bcrypt.no_user_verify() | ||||
|     false | ||||
|   end | ||||
|   | ||||
| @@ -308,7 +308,7 @@ defmodule Cannery.Ammo do | ||||
|   def get_used_count(%AmmoGroup{} = ammo_group) do | ||||
|     ammo_group | ||||
|     |> Repo.preload(:shot_groups) | ||||
|     |> Map.get(:shot_groups) | ||||
|     |> Map.fetch!(:shot_groups) | ||||
|     |> Enum.map(fn %{count: count} -> count end) | ||||
|     |> Enum.sum() | ||||
|   end | ||||
|   | ||||
| @@ -215,7 +215,7 @@ defmodule Cannery.Containers do | ||||
|   def get_container_rounds!(%Container{} = container) do | ||||
|     container | ||||
|     |> Repo.preload(:ammo_groups) | ||||
|     |> Map.get(:ammo_groups) | ||||
|     |> Map.fetch!(:ammo_groups) | ||||
|     |> Enum.map(fn %{count: count} -> count end) | ||||
|     |> Enum.sum() | ||||
|   end | ||||
|   | ||||
| @@ -9,7 +9,7 @@ defmodule Cannery.Release do | ||||
|  | ||||
|   def rollback(repo, version) do | ||||
|     load_app() | ||||
|     {:ok, _, _} = Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :down, to: version)) | ||||
|     {:ok, _fun, _opts} = Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :down, to: version)) | ||||
|   end | ||||
|  | ||||
|   defp load_app do | ||||
| @@ -20,7 +20,7 @@ defmodule Cannery.Release do | ||||
|     load_app() | ||||
|  | ||||
|     for repo <- Application.fetch_env!(@app, :ecto_repos) do | ||||
|       {:ok, _, _} = Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :up, all: true)) | ||||
|       {:ok, _fun, _opts} = Ecto.Migrator.with_repo(repo, &Ecto.Migrator.run(&1, :up, all: true)) | ||||
|     end | ||||
|   end | ||||
| end | ||||
|   | ||||
| @@ -6,11 +6,11 @@ defmodule Cannery.Repo.Migrator do | ||||
|   use GenServer | ||||
|   require Logger | ||||
|  | ||||
|   def start_link(_) do | ||||
|   def start_link(_opts) do | ||||
|     GenServer.start_link(__MODULE__, [], []) | ||||
|   end | ||||
|  | ||||
|   def init(_) do | ||||
|   def init(_opts) do | ||||
|     migrate!() | ||||
|     {:ok, nil} | ||||
|   end | ||||
|   | ||||
| @@ -71,6 +71,7 @@ defmodule CanneryWeb do | ||||
|     quote do | ||||
|       use Phoenix.Router | ||||
|  | ||||
|       # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse | ||||
|       import Plug.Conn | ||||
|       import Phoenix.Controller | ||||
|       import Phoenix.LiveView.Router | ||||
| @@ -79,7 +80,9 @@ defmodule CanneryWeb do | ||||
|  | ||||
|   def channel do | ||||
|     quote do | ||||
|       # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse | ||||
|       use Phoenix.Channel | ||||
|       # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse | ||||
|       import CanneryWeb.Gettext | ||||
|     end | ||||
|   end | ||||
| @@ -87,14 +90,18 @@ defmodule CanneryWeb do | ||||
|   defp view_helpers do | ||||
|     quote do | ||||
|       # Use all HTML functionality (forms, tags, etc) | ||||
|       # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse | ||||
|       use Phoenix.HTML | ||||
|  | ||||
|       # Import LiveView and .heex helpers (live_render, live_patch, <.form>, etc) | ||||
|       # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse | ||||
|       import Phoenix.LiveView.Helpers | ||||
|  | ||||
|       # Import basic rendering functionality (render, render_layout, etc) | ||||
|       # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse | ||||
|       import Phoenix.View | ||||
|  | ||||
|       # credo:disable-for-next-line Credo.Check.Consistency.MultiAliasImportRequireUse | ||||
|       import CanneryWeb.{ErrorHelpers, Gettext, LiveHelpers, ViewHelpers} | ||||
|       alias CanneryWeb.Router.Helpers, as: Routes | ||||
|     end | ||||
|   | ||||
| @@ -44,7 +44,7 @@ defmodule CanneryWeb.AmmoGroupLive.Show do | ||||
|   @impl true | ||||
|   def handle_event( | ||||
|         "delete", | ||||
|         _, | ||||
|         _params, | ||||
|         %{assigns: %{ammo_group: ammo_group, current_user: current_user}} = socket | ||||
|       ) do | ||||
|     ammo_group |> Ammo.delete_ammo_group!(current_user) | ||||
| @@ -58,7 +58,7 @@ defmodule CanneryWeb.AmmoGroupLive.Show do | ||||
|   @impl true | ||||
|   def handle_event( | ||||
|         "toggle_staged", | ||||
|         _, | ||||
|         _params, | ||||
|         %{assigns: %{ammo_group: ammo_group, current_user: current_user}} = socket | ||||
|       ) do | ||||
|     {:ok, ammo_group} = | ||||
|   | ||||
| @@ -14,7 +14,7 @@ defmodule CanneryWeb.AmmoTypeLive.Show do | ||||
|   end | ||||
|  | ||||
|   @impl true | ||||
|   def handle_params(%{"id" => id}, _, %{assigns: %{current_user: current_user}} = socket) do | ||||
|   def handle_params(%{"id" => id}, _params, %{assigns: %{current_user: current_user}} = socket) do | ||||
|     ammo_type = Ammo.get_ammo_type!(id, current_user) | ||||
|  | ||||
|     socket = | ||||
| @@ -32,7 +32,7 @@ defmodule CanneryWeb.AmmoTypeLive.Show do | ||||
|   @impl true | ||||
|   def handle_event( | ||||
|         "delete", | ||||
|         _, | ||||
|         _params, | ||||
|         %{assigns: %{ammo_type: ammo_type, current_user: current_user}} = socket | ||||
|       ) do | ||||
|     %{name: ammo_type_name} = ammo_type |> Ammo.delete_ammo_type!(current_user) | ||||
|   | ||||
| @@ -18,7 +18,7 @@ defmodule CanneryWeb.ContainerLive.Show do | ||||
|   @impl true | ||||
|   def handle_params( | ||||
|         %{"id" => id}, | ||||
|         _, | ||||
|         _session, | ||||
|         %{assigns: %{current_user: current_user}} = socket | ||||
|       ) do | ||||
|     {:noreply, socket |> render_container(id, current_user)} | ||||
| @@ -53,7 +53,7 @@ defmodule CanneryWeb.ContainerLive.Show do | ||||
|   @impl true | ||||
|   def handle_event( | ||||
|         "delete_container", | ||||
|         _, | ||||
|         _params, | ||||
|         %{assigns: %{container: container, current_user: current_user}} = socket | ||||
|       ) do | ||||
|     socket = | ||||
|   | ||||
| @@ -29,7 +29,7 @@ defmodule CanneryWeb.HomeLive do | ||||
|       %{^query => vsn} -> | ||||
|         {:noreply, redirect(socket, external: "https://hexdocs.pm/#{query}/#{vsn}")} | ||||
|  | ||||
|       _ -> | ||||
|       _no_query -> | ||||
|         {:noreply, | ||||
|          socket | ||||
|          |> put_flash(:error, "No dependencies found matching \"#{query}\"") | ||||
|   | ||||
| @@ -119,7 +119,7 @@ defmodule CanneryWeb.InviteLive.Index do | ||||
|   end | ||||
|  | ||||
|   @impl true | ||||
|   def handle_event("copy_to_clipboard", _, socket) do | ||||
|   def handle_event("copy_to_clipboard", _params, socket) do | ||||
|     prompt = dgettext("prompts", "Copied to clipboard") | ||||
|     {:noreply, socket |> put_flash(:info, prompt)} | ||||
|   end | ||||
|   | ||||
| @@ -2,7 +2,6 @@ defmodule CanneryWeb.EmailView do | ||||
|   @moduledoc """ | ||||
|   A view for email-related helper functions | ||||
|   """ | ||||
|   alias CanneryWeb.{Endpoint, HomeLive} | ||||
|  | ||||
|   use CanneryWeb, :view | ||||
|   alias CanneryWeb.{Endpoint, HomeLive} | ||||
| end | ||||
|   | ||||
| @@ -8,7 +8,7 @@ defmodule CanneryWeb.ErrorView do | ||||
|       case error_path do | ||||
|         "404.html" -> dgettext("errors", "Not found") | ||||
|         "401.html" -> dgettext("errors", "Unauthorized") | ||||
|         _ -> dgettext("errors", "Internal Server Error") | ||||
|         _other_template -> dgettext("errors", "Internal Server Error") | ||||
|       end | ||||
|  | ||||
|     render("error.html", %{error_string: error_string}) | ||||
|   | ||||
		Reference in New Issue
	
	Block a user