Skip to content

Commit 7f6c195

Browse files
unenglishableunenglishable
authored
Merge pull request #116 from epochtalk/version-update
Version update
2 parents 699b2af + eceefcb commit 7f6c195

File tree

18 files changed

+62
-130
lines changed

18 files changed

+62
-130
lines changed

‎.tool-versions‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
elixir 1.14.4-otp-25
2-
erlang 25.3.1
1+
elixir 1.17.3-otp-27
2+
erlang 27.1.2

‎lib/epochtalk_server_web/controllers/board.ex‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,6 @@ defmodule EpochtalkServerWeb.Controllers.Board do
100100
400,
101101
"Error, cannot convert slug: board does not exist"
102102
)
103-
104-
_ ->
105-
ErrorHelpers.render_json_error(conn, 400, "Error, cannot convert board slug to id")
106103
end
107104
end
108105
end

‎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/moderation_log.ex‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ defmodule EpochtalkServerWeb.Controllers.ModerationLog do
44
@moduledoc """
55
Controller For `ModerationLog` related API requests
66
"""
7-
alias EpochtalkServer.Auth.Guardian
87
alias EpochtalkServer.Models.ModerationLog
98
alias EpochtalkServerWeb.ErrorHelpers
109
alias EpochtalkServerWeb.Helpers.Validate
@@ -14,21 +13,14 @@ defmodule EpochtalkServerWeb.Controllers.ModerationLog do
1413
Used to page `ModerationLog` models for moderation log view`
1514
"""
1615
def page(conn, attrs) do
17-
with {:auth, true} <- {:auth, Guardian.Plug.authenticated?(conn)},
18-
:ok <- ACL.allow!(conn, "moderationLogs.page"),
16+
with :ok <- ACL.allow!(conn, "moderationLogs.page"),
1917
page <- Validate.cast(attrs, "page", :integer, min: 1),
2018
limit <- Validate.cast(attrs, "limit", :integer, min: 1),
2119
{:ok, moderation_logs, data} <- ModerationLog.page(attrs, page, per_page: limit) do
2220
render(conn, :page, %{moderation_logs: moderation_logs, pagination_data: data})
2321
else
24-
{:auth, false} ->
25-
ErrorHelpers.render_json_error(conn, 400, "Not logged in, cannot page moderation log")
26-
27-
{:error, data} ->
28-
ErrorHelpers.render_json_error(conn, 400, data)
29-
3022
_ ->
31-
ErrorHelpers.render_json_error(conn, 500, "There was an issue getting the moderation log")
23+
ErrorHelpers.render_json_error(conn, 500, "There was an issue paging the moderation log")
3224
end
3325
end
3426
end

‎lib/epochtalk_server_web/controllers/notification.ex‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,6 @@ defmodule EpochtalkServerWeb.Controllers.Notification do
2525
400,
2626
"Not logged in, cannot fetch notification counts"
2727
)
28-
29-
{:access, false} ->
30-
ErrorHelpers.render_json_error(
31-
conn,
32-
400,
33-
"Not logged in, cannot fetch notification counts"
34-
)
3528
end
3629
end
3730

‎lib/epochtalk_server_web/controllers/poll.ex‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -193,9 +193,6 @@ defmodule EpochtalkServerWeb.Controllers.Poll do
193193
"Account must be active to modify lock on poll"
194194
)
195195

196-
{:error, data} ->
197-
ErrorHelpers.render_json_error(conn, 400, data)
198-
199196
_ ->
200197
ErrorHelpers.render_json_error(conn, 400, "Error, cannot lock poll")
201198
end
@@ -316,9 +313,6 @@ defmodule EpochtalkServerWeb.Controllers.Poll do
316313
poll <- Poll.by_thread(thread_id) do
317314
render(conn, :poll, %{poll: poll, has_voted: false})
318315
else
319-
{:valid_answers_list, false} ->
320-
ErrorHelpers.render_json_error(conn, 400, "Error, 'answer_ids' must be a list")
321-
322316
{:can_read, {:ok, false}} ->
323317
ErrorHelpers.render_json_error(
324318
conn,
@@ -355,12 +349,6 @@ defmodule EpochtalkServerWeb.Controllers.Poll do
355349
{:board_banned, {:ok, true}} ->
356350
ErrorHelpers.render_json_error(conn, 403, "Unauthorized, you are banned from this board")
357351

358-
{:error, :board_does_not_exist} ->
359-
ErrorHelpers.render_json_error(conn, 400, "Error, board does not exist")
360-
361-
{:error, data} ->
362-
ErrorHelpers.render_json_error(conn, 400, data)
363-
364352
_ ->
365353
ErrorHelpers.render_json_error(conn, 400, "Error, cannot cast vote")
366354
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: 7 additions & 26 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

@@ -174,10 +172,11 @@ defmodule EpochtalkServerWeb.Controllers.Thread do
174172
user <- Guardian.Plug.current_resource(conn),
175173
user_priority <- ACL.get_user_priority(conn),
176174
:ok <- ACL.allow!(conn, "threads.byBoard"),
177-
{:can_read, {:ok, true}} <-
178-
{:can_read, Board.get_read_access_by_id(board_id, user_priority)},
179-
{:ok, write_access} <- Board.get_write_access_by_id(board_id, user_priority),
175+
{:ok, can_read} <- Board.get_read_access_by_id(board_id, user_priority),
176+
{:can_read, true} <- {:can_read, can_read},
180177
{:ok, board_banned} <- BoardBan.banned_from_board?(user, board_id: board_id),
178+
{:board_banned, false} <- {:board_banned, board_banned},
179+
{:ok, write_access} <- Board.get_write_access_by_id(board_id, user_priority),
181180
{:ok, watching_board} <- WatchBoard.user_is_watching(user, board_id),
182181
board_mapping <- BoardMapping.all(),
183182
board_moderators <- BoardModerator.all(),
@@ -208,20 +207,14 @@ defmodule EpochtalkServerWeb.Controllers.Thread do
208207
{:error, :board_does_not_exist} ->
209208
ErrorHelpers.render_json_error(conn, 400, "Error, board does not exist")
210209

211-
{:can_read, {:ok, false}} ->
210+
{:can_read, false} ->
212211
ErrorHelpers.render_json_error(conn, 403, "Unauthorized, you do not have permission")
213212

214-
{:can_read, {:error, :board_does_not_exist}} ->
215-
ErrorHelpers.render_json_error(conn, 400, "Read error, board does not exist")
216-
217-
{:board_banned, {:ok, true}} ->
213+
{:board_banned, true} ->
218214
ErrorHelpers.render_json_error(conn, 403, "Unauthorized, you are banned from this board")
219215

220216
{:has_threads, false} ->
221217
ErrorHelpers.render_json_error(conn, 404, "Error, requested threads not found in board")
222-
223-
_ ->
224-
ErrorHelpers.render_json_error(conn, 400, "Error, cannot get threads by board")
225218
end
226219
end
227220

@@ -340,9 +333,6 @@ defmodule EpochtalkServerWeb.Controllers.Thread do
340333
"Account must be active to unwatch thread"
341334
)
342335

343-
{:error, data} ->
344-
ErrorHelpers.render_json_error(conn, 400, data)
345-
346336
_ ->
347337
ErrorHelpers.render_json_error(conn, 400, "Error, cannot unwatch thread")
348338
end
@@ -401,9 +391,6 @@ defmodule EpochtalkServerWeb.Controllers.Thread do
401391
"Account must be active to modify lock on thread"
402392
)
403393

404-
{:error, data} ->
405-
ErrorHelpers.render_json_error(conn, 400, data)
406-
407394
_ ->
408395
ErrorHelpers.render_json_error(conn, 400, "Error, cannot lock thread")
409396
end
@@ -462,9 +449,6 @@ defmodule EpochtalkServerWeb.Controllers.Thread do
462449
"Account must be active to modify sticky on thread"
463450
)
464451

465-
{:error, data} ->
466-
ErrorHelpers.render_json_error(conn, 400, data)
467-
468452
_ ->
469453
ErrorHelpers.render_json_error(conn, 400, "Error, cannot sticky thread")
470454
end
@@ -638,9 +622,6 @@ defmodule EpochtalkServerWeb.Controllers.Thread do
638622
400,
639623
"Error, cannot convert slug, thread does not exist"
640624
)
641-
642-
_ ->
643-
ErrorHelpers.render_json_error(conn, 400, "Error, cannot convert thread slug to id")
644625
end
645626
end
646627

@@ -663,7 +644,7 @@ defmodule EpochtalkServerWeb.Controllers.Thread do
663644
|> send_resp(200, [])
664645
|> halt()
665646
else
666-
{:error, :board_does_not_exist} ->
647+
{:can_read, {:error, :board_does_not_exist}} ->
667648
ErrorHelpers.render_json_error(
668649
conn,
669650
400,

0 commit comments

Comments
 (0)