Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
elixir 1.17.3-otp-27
erlang 27.1.2
elixir 1.18.2-otp-27
erlang 27.2.4
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM elixir:1.14.0
FROM elixir:1.18.2
# work in /app instead of /
RUN mkdir -p /app
WORKDIR /app
Expand Down
2 changes: 1 addition & 1 deletion config/config.exs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Config
config :epochtalk_server, ecto_repos: [EpochtalkServer.Repo]

# Set Guardian.DB to GuardianRedis
config :guardian, Guardian.DB, repo: GuardianRedis.Repo
config :guardian, Guardian.DB, repo: EpochtalkServer.Repo, adapter: GuardianRedis.Adapter

# Swoosh API client is needed for adapters other than SMTP.
config :swoosh, :api_client, false
Expand Down
3 changes: 3 additions & 0 deletions lib/epochtalk_server_web/errors/custom_errors.ex
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
defmodule EpochtalkServerWeb.CustomErrors do
@moduledoc """
Custom error handling for Auto Moderator
"""
# Auto Moderator Error Handling
# credo:disable-for-next-line
defmodule AutoModeratorReject do
Expand Down
30 changes: 15 additions & 15 deletions mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ defmodule EpochtalkServer.MixProject do
[
app: :epochtalk_server,
version: "0.1.0",
elixir: "~> 1.12",
elixir: "~> 1.18",
elixirc_paths: elixirc_paths(Mix.env()),
compilers: Mix.compilers(),
start_permanent: Mix.env() == :prod,
Expand Down Expand Up @@ -33,43 +33,43 @@ defmodule EpochtalkServer.MixProject do
# Type `mix help deps` for examples and options.
defp deps do
[
{:argon2_elixir, "~> 3.1.0"},
{:argon2_elixir, "~> 4.1.2"},
{:configparser_ex, "~> 4.0"},
{:corsica, "~> 1.3.0"},
{:corsica, "~> 2.1.3"},
{:credo, "~> 1.7.9", only: [:dev, :test], runtime: false},
{:dialyxir, "~> 1.2", only: [:dev], runtime: false},
{:dotenv_parser, "~> 2.0"},
{:earmark, "~> 1.4"},
{:ecto_sql, "~> 3.6"},
{:ecto_sql, "~> 3.12"},
{:ex_aws, "~> 2.5"},
{:ex_aws_s3, "~> 2.5"},
{:ex_doc, "~> 0.29.4"},
{:ex_machina, "~> 2.7.0", only: :test},
{:ex_doc, "~> 0.37.2"},
{:ex_machina, "~> 2.8.0", only: :test},
{:ex_utils, "~> 0.1.7"},
{:finch, "~> 0.13"},
{:gen_smtp, "~> 1.2"},
{:guardian, "~> 2.2"},
{:guardian_phoenix, "~> 2.0"},
{:guardian_db, "~> 2.1"},
{:guardian_redis, "~> 0.1"},
{:guardian_db, "~> 3.0"},
{:guardian_redis, "~> 0.2"},
{:hackney, "~> 1.9"},
{:hammer, "~> 6.2"},
{:hammer_backend_redis, "~> 6.1"},
{:html_sanitize_ex, "~> 1.4"},
{:iteraptor, git: "https://github.com/epochtalk/elixir-iteraptor.git", tag: "1.13.1"},
{:jason, "~> 1.4.0"},
{:mimic, "~> 1.7.4", only: :test},
{:mimic, "~> 1.11.0", only: :test},
{:phoenix, "~> 1.7.2"},
{:phoenix_ecto, "~> 4.4"},
{:phoenix_html, "~> 3.0"},
{:phoenix_html, "~> 4.2"},
{:plug_cowboy, "~> 2.5"},
{:poison, "~> 3.0"},
{:postgrex, "~> 0.17.1"},
{:redix, "~> 1.2.2"},
{:remote_ip, "~> 1.1.0"},
{:poison, "~> 6.0"},
{:postgrex, "~> 0.20.0"},
{:redix, "~> 1.5.2"},
{:remote_ip, "~> 1.2.0"},
{:sweet_xml, "~> 0.7"},
{:swoosh, "~> 1.8"},
{:telemetry_metrics, "~> 0.6"},
{:telemetry_metrics, "~> 1.0"},
{:telemetry_poller, "~> 1.0"}
]
end
Expand Down
77 changes: 39 additions & 38 deletions mix.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion test/epochtalk_server/models/mention_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ defmodule Test.EpochtalkServer.Models.Mention do
assert_raise FunctionClauseError,
~r/no function clause matching/,
fn ->
Mention.username_to_user_id(%{}, attrs)
Mention.username_to_user_id(%{id: nil, roles: nil}, attrs)
end
end

Expand Down
6 changes: 5 additions & 1 deletion test/support/factories/board_mapping.ex
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@ defmodule Test.Support.Factories.BoardMapping do
end

# generate attributes for board under parent board
def board_mapping_attributes_factory(%{board: board, view_order: view_order, parent: parent}) do
def board_mapping_attributes_factory(%{
board: board,
view_order: view_order,
parent: parent
}) do
%{
id: board.id,
name: board.name,
Expand Down
Loading