Skip to content

Commit da80260

Browse files
committed
fix(warnings): resolve warnings caused by updating elixir
1 parent 519420c commit da80260

File tree

8 files changed

+12
-17
lines changed

8 files changed

+12
-17
lines changed

lib/epochtalk_server_web/controllers/image_reference.ex

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ defmodule EpochtalkServerWeb.Controllers.ImageReference do
6363
# checksum <- Validate.cast(attrs, "checksum", :string, required: true),
6464
file_type <- Validate.cast(attrs, "file_type", :string, required: true) do
6565
%{length: length, type: file_type}
66-
else
67-
_ -> %{error: "Invalid attrs"}
6866
end
6967
end
7068
end

lib/epochtalk_server_web/controllers/mention.ex

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ defmodule EpochtalkServerWeb.Controllers.Mention do
2727
pagination_data: data,
2828
extended: extended
2929
}),
30-
else:
31-
({:auth, nil} ->
32-
ErrorHelpers.render_json_error(conn, 400, "Not logged in, cannot page mentions"))
30+
else: ({:auth, nil} ->
31+
ErrorHelpers.render_json_error(conn, 400, "Not logged in, cannot page mentions"))
3332
end
3433
end

lib/epochtalk_server_web/controllers/post.ex

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -417,9 +417,6 @@ defmodule EpochtalkServerWeb.Controllers.Post do
417417
Validate.cast(attrs, "body", :string, required: true, max: post_max_length, min: 1),
418418
parsed_body <- Parse.markdown(body) do
419419
render(conn, :preview, %{parsed_body: parsed_body})
420-
else
421-
_ ->
422-
ErrorHelpers.render_json_error(conn, 400, "Error, cannot generate preview")
423420
end
424421
end
425422

lib/epochtalk_server_web/controllers/preference.ex

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,11 @@ defmodule EpochtalkServerWeb.Controllers.Preference do
1414
def preferences(conn, _attrs) do
1515
with {:auth, %{} = user} <- {:auth, Guardian.Plug.current_resource(conn)},
1616
do: render(conn, :preferences, preferences: Preference.by_user_id(user.id)),
17-
else:
18-
({:auth, nil} ->
19-
ErrorHelpers.render_json_error(conn, 400, "Not logged in, cannot fetch preferences"))
17+
else: ({:auth, nil} ->
18+
ErrorHelpers.render_json_error(
19+
conn,
20+
400,
21+
"Not logged in, cannot fetch preferences"
22+
))
2023
end
2124
end

lib/epochtalk_server_web/controllers/thread.ex

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ defmodule EpochtalkServerWeb.Controllers.Thread do
3535
user_priority <- ACL.get_user_priority(conn),
3636
threads <- Thread.recent(user, user_priority) do
3737
render(conn, :recent, %{threads: threads})
38-
else
39-
_ -> ErrorHelpers.render_json_error(conn, 400, "Error, cannot fetch recent threads")
4038
end
4139
end
4240

lib/epochtalk_server_web/json/thread_json.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ defmodule EpochtalkServerWeb.Controllers.ThreadJSON do
240240
# handle deleted user
241241
thread =
242242
if thread.user_deleted,
243-
do: thread |> Map.put(:user_id, '') |> Map.put(:username, ''),
243+
do: thread |> Map.put(:user_id, "") |> Map.put(:username, ""),
244244
else: thread
245245

246246
# format user output

test/epochtalk_server_web/controllers/post_test.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ defmodule Test.EpochtalkServerWeb.Controllers.Post do
4242
fn ->
4343
post(conn, Routes.post_path(conn, :preview), %{
4444
"body" =>
45-
for(_ <- 1..10_001, into: "", do: <<Enum.random('0123456789abcdef')>>)
45+
for(_ <- 1..10_001, into: "", do: <<Enum.random(~c"0123456789abcdef")>>)
4646
})
4747
end
4848
end

test/epochtalk_server_web/controllers/user_test.exs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,16 @@ defmodule Test.EpochtalkServerWeb.Controllers.User do
5656
end
5757
end
5858

59-
@tag :banned
6059
describe "unban/1" do
60+
@tag :banned
6161
test "unbans banned user", %{users: %{user: user}} do
6262
{:ok, unbanned_user_changeset} = Ban.unban(user)
6363
assert unbanned_user_changeset.ban_info == nil
6464
end
6565
end
6666

67-
@tag :malicious
6867
describe "handle_malicious_user/2" do
68+
@tag :malicious
6969
test "populates ban_info and malicious_score if user is malicious", %{
7070
users: %{user: user},
7171
malicious_user_changeset: malicious_user_changeset

0 commit comments

Comments
 (0)