From 4d8bc7ad38057a3092fd73613d124f06f1712232 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Sun, 7 Jun 2020 11:14:01 -0400 Subject: [PATCH] Fix warnings --- lib/frenzy_web/controllers/account_controller.ex | 5 ++--- lib/frenzy_web/controllers/feed_controller.ex | 1 - lib/frenzy_web/controllers/fervor/items_controller.ex | 2 +- lib/frenzy_web/controllers/fervor/oauth_controller.ex | 1 - lib/frenzy_web/controllers/fervor/paginator.ex | 9 +++------ lib/frenzy_web/controllers/group_controller.ex | 1 - lib/frenzy_web/controllers/item_controller.ex | 3 +-- lib/frenzy_web/controllers/login_controller.ex | 4 +--- lib/frenzy_web/controllers/pipeline_controller.ex | 1 - lib/frenzy_web/templates/account/show.html.eex | 2 +- lib/frenzy_web/views/layout_view.ex | 2 +- 11 files changed, 10 insertions(+), 21 deletions(-) diff --git a/lib/frenzy_web/controllers/account_controller.ex b/lib/frenzy_web/controllers/account_controller.ex index 7925040..1a6316d 100644 --- a/lib/frenzy_web/controllers/account_controller.ex +++ b/lib/frenzy_web/controllers/account_controller.ex @@ -1,7 +1,6 @@ defmodule FrenzyWeb.AccountController do use FrenzyWeb, :controller alias Frenzy.{Repo, User, FervorClient} - alias FrenzyWeb.Router.Helpers, as: Routes alias FrenzyWeb.Endpoint def show(conn, _params) do @@ -42,7 +41,7 @@ defmodule FrenzyWeb.AccountController do ^confirm -> changeset = User.change_password_changeset(user, %{password: new}) - {:ok, user} = Repo.update(changeset) + {:ok, _user} = Repo.update(changeset) conn |> put_flash(:info, "Password changed.") @@ -80,7 +79,7 @@ defmodule FrenzyWeb.AccountController do fever_password: new }) - {:ok, user} = Repo.update(changeset) + {:ok, _user} = Repo.update(changeset) conn |> put_flash(:info, "Fever password changed.") diff --git a/lib/frenzy_web/controllers/feed_controller.ex b/lib/frenzy_web/controllers/feed_controller.ex index 1ef8e86..c7bf839 100644 --- a/lib/frenzy_web/controllers/feed_controller.ex +++ b/lib/frenzy_web/controllers/feed_controller.ex @@ -1,7 +1,6 @@ defmodule FrenzyWeb.FeedController do use FrenzyWeb, :controller alias Frenzy.{Repo, Group, Feed, Item, Pipeline, Paginator} - alias FrenzyWeb.Router.Helpers, as: Routes alias FrenzyWeb.Endpoint import Ecto.Query diff --git a/lib/frenzy_web/controllers/fervor/items_controller.ex b/lib/frenzy_web/controllers/fervor/items_controller.ex index 05d0665..0383aa7 100644 --- a/lib/frenzy_web/controllers/fervor/items_controller.ex +++ b/lib/frenzy_web/controllers/fervor/items_controller.ex @@ -1,6 +1,6 @@ defmodule FrenzyWeb.Fervor.ItemsController do use FrenzyWeb, :controller - alias Frenzy.{Repo, FervorClient, Group, Feed, Filter, Item} + alias Frenzy.{Repo, Item} import Ecto.Query alias FrenzyWeb.Fervor.Paginator diff --git a/lib/frenzy_web/controllers/fervor/oauth_controller.ex b/lib/frenzy_web/controllers/fervor/oauth_controller.ex index 565cd49..51ecc19 100644 --- a/lib/frenzy_web/controllers/fervor/oauth_controller.ex +++ b/lib/frenzy_web/controllers/fervor/oauth_controller.ex @@ -1,7 +1,6 @@ defmodule FrenzyWeb.Fervor.OauthController do use FrenzyWeb, :controller alias Frenzy.{Repo, FervorClient, User, ApprovedClient} - alias FrenzyWeb.Router.Helpers, as: Routes alias FrenzyWeb.Endpoint def authorize_get(conn, params) do diff --git a/lib/frenzy_web/controllers/fervor/paginator.ex b/lib/frenzy_web/controllers/fervor/paginator.ex index 1b0d3ce..726fadd 100644 --- a/lib/frenzy_web/controllers/fervor/paginator.ex +++ b/lib/frenzy_web/controllers/fervor/paginator.ex @@ -1,18 +1,15 @@ defmodule FrenzyWeb.Fervor.Paginator do import Ecto.Query - def paginate(query, %{"max_id" => max_id} = params) do - limit = Map.get(params, "limit", 20) + def paginate(query, %{"max_id" => max_id}) do from(o in query, where: o.id < ^max_id, order_by: [desc: :id]) end - def paginate(query, %{"min_id" => min_id} = params) do - limit = Map.get(params, "limit", 20) + def paginate(query, %{"min_id" => min_id}) do from(o in query, where: o.id > ^min_id, order_by: [asc: :id]) end - def paginate(query, %{"since_id" => since_id} = params) do - limit = Map.get(params, "limit", 20) + def paginate(query, %{"since_id" => since_id}) do from(o in query, where: o.id > ^since_id, order_by: [desc: :id]) end diff --git a/lib/frenzy_web/controllers/group_controller.ex b/lib/frenzy_web/controllers/group_controller.ex index 0ab0a97..592bb49 100644 --- a/lib/frenzy_web/controllers/group_controller.ex +++ b/lib/frenzy_web/controllers/group_controller.ex @@ -1,7 +1,6 @@ defmodule FrenzyWeb.GroupController do use FrenzyWeb, :controller alias Frenzy.{Repo, Group, Feed, Item, Paginator} - alias FrenzyWeb.Router.Helpers, as: Routes alias FrenzyWeb.Endpoint import Ecto.Query diff --git a/lib/frenzy_web/controllers/item_controller.ex b/lib/frenzy_web/controllers/item_controller.ex index 2f065c5..3eb09c6 100644 --- a/lib/frenzy_web/controllers/item_controller.ex +++ b/lib/frenzy_web/controllers/item_controller.ex @@ -1,7 +1,6 @@ defmodule FrenzyWeb.ItemController do use FrenzyWeb, :controller - alias Frenzy.{Repo, Feed, Item} - alias FrenzyWeb.Router.Helpers, as: Routes + alias Frenzy.{Repo, Item} alias FrenzyWeb.Endpoint plug :user_owns_item diff --git a/lib/frenzy_web/controllers/login_controller.ex b/lib/frenzy_web/controllers/login_controller.ex index 13cbf65..65051bb 100644 --- a/lib/frenzy_web/controllers/login_controller.ex +++ b/lib/frenzy_web/controllers/login_controller.ex @@ -1,9 +1,7 @@ defmodule FrenzyWeb.LoginController do use FrenzyWeb, :controller alias Frenzy.{Repo, User} - alias FrenzyWeb.Router.Helpers, as: Routes alias FrenzyWeb.Endpoint - import Ecto.Query def login(conn, params) do render(conn, "login.html", %{ @@ -29,7 +27,7 @@ defmodule FrenzyWeb.LoginController do end end - def logout(conn, params) do + def logout(conn, _params) do conn |> put_flash(:info, "Logged out.") |> clear_session() diff --git a/lib/frenzy_web/controllers/pipeline_controller.ex b/lib/frenzy_web/controllers/pipeline_controller.ex index 6c72ff5..b459b52 100644 --- a/lib/frenzy_web/controllers/pipeline_controller.ex +++ b/lib/frenzy_web/controllers/pipeline_controller.ex @@ -1,7 +1,6 @@ defmodule FrenzyWeb.PipelineController do use FrenzyWeb, :controller alias Frenzy.{Repo, Pipeline} - alias FrenzyWeb.Router.Helpers, as: Routes alias FrenzyWeb.Endpoint import Ecto.Query diff --git a/lib/frenzy_web/templates/account/show.html.eex b/lib/frenzy_web/templates/account/show.html.eex index 9b8cd1d..c268332 100644 --- a/lib/frenzy_web/templates/account/show.html.eex +++ b/lib/frenzy_web/templates/account/show.html.eex @@ -12,7 +12,7 @@ <% end %>
  • - <%= form_for @conn, Routes.account_path(@conn, :export), [method: :post, class: "mt-2"], fn f -> %> + <%= form_for @conn, Routes.account_path(@conn, :export), [method: :post, class: "mt-2"], fn _f -> %> <%= submit "Export OPML", class: "btn btn-primary" %> <% end %>
    • diff --git a/lib/frenzy_web/views/layout_view.ex b/lib/frenzy_web/views/layout_view.ex index 71c9f6e..edb1e41 100644 --- a/lib/frenzy_web/views/layout_view.ex +++ b/lib/frenzy_web/views/layout_view.ex @@ -1,6 +1,6 @@ defmodule FrenzyWeb.LayoutView do use FrenzyWeb, :view - alias Frenzy.{Repo, Group, Feed} + alias Frenzy.{Repo, Group} import Ecto.Query def user_groups(user) do