Skip to content

Commit 1907f03

Browse files
committed
chore: Run mix format
1 parent 69a1931 commit 1907f03

10 files changed

Lines changed: 45 additions & 29 deletions

File tree

‎config/runtime.exs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ if config_env() == :prod do
128128

129129
config :octocon, Octocon.MessageRepo,
130130
url: msg_database_url,
131-
pool_size: String.to_integer(System.get_env("MSG_POOL_SIZE") || "10")#, socket_options: maybe_ipv6
131+
# , socket_options: maybe_ipv6
132+
pool_size: String.to_integer(System.get_env("MSG_POOL_SIZE") || "10")
132133

133134
# The secret key base is used to sign/encrypt cookies and other secrets.
134135
# A default value is used in config/dev.exs and config/test.exs but you

‎lib/octocon/accounts.ex‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -938,10 +938,18 @@ defmodule Octocon.Accounts do
938938
"""
939939
def add_field(system_identity, data) do
940940
user = get_user!(system_identity)
941-
fields = (user.fields || []) ++ [struct(%Field{
942-
id: Ecto.UUID.generate(),
943-
locked: false
944-
}, data)]
941+
942+
fields =
943+
(user.fields || []) ++
944+
[
945+
struct(
946+
%Field{
947+
id: Ecto.UUID.generate(),
948+
locked: false
949+
},
950+
data
951+
)
952+
]
945953

946954
user
947955
|> User.update_changeset(%{fields: fields})
@@ -971,7 +979,7 @@ defmodule Octocon.Accounts do
971979
def relocate_field(system_identity, id, index) do
972980
user = get_user!(system_identity)
973981

974-
old_fields = (user.fields || [])
982+
old_fields = user.fields || []
975983
field = Enum.find(old_fields, fn field -> field.id == id end)
976984

977985
fields =

‎lib/octocon/alters.ex‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ defmodule Octocon.Alters do
206206

207207
if can_view_entity?(friendship_level, security_level) and alter != {:error, :no_alter} do
208208
{:ok, alter} = alter
209-
fields = get_guarded_fields(user_fields, (alter.fields || []), friendship_level)
209+
fields = get_guarded_fields(user_fields, alter.fields || [], friendship_level)
210210
{:ok, %{alter | fields: fields}}
211211
else
212212
:error
@@ -226,7 +226,7 @@ defmodule Octocon.Alters do
226226
get_alters_by_id(system_identity)
227227
|> Enum.filter(&can_view_entity?(friendship_level, &1.security_level))
228228
|> Enum.map(fn alter ->
229-
fields = get_guarded_fields(user_fields, (alter.fields || []), friendship_level)
229+
fields = get_guarded_fields(user_fields, alter.fields || [], friendship_level)
230230
%{alter | fields: fields}
231231
end)
232232
end

‎lib/octocon/application.ex‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ defmodule Octocon.Application do
6969
# Distribution
7070
{Cluster.Supervisor, [topologies, [name: Octocon.ClusterSupervisor]]},
7171
Octocon.RPC.NodeTracker,
72-
7372
Supervisor.child_spec(
7473
{Cachex,
7574
name: Octocon.Cache.UserRegistry,

‎lib/octocon/journals.ex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ defmodule Octocon.Journals do
8484
|> where(^where)
8585
|> select([j], struct(j, ^fields))
8686
|> Repo.all_regional({:user, system_identity})
87-
|> Enum.sort_by(&(&1.inserted_at), {:desc, NaiveDateTime})
87+
|> Enum.sort_by(& &1.inserted_at, {:desc, NaiveDateTime})
8888

8989
entry_ids = Enum.map(entries, & &1.id)
9090

‎lib/octocon/workers/plural_kit_import_worker.ex‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ defmodule Octocon.Workers.PluralKitImportWorker do
2020
@pk_endpoint URI.parse("https://api.pluralkit.me/v2/")
2121

2222
def perform(%{
23-
"system_id" => system_id,
24-
"pk_token" => pk_token
25-
}) do
23+
"system_id" => system_id,
24+
"pk_token" => pk_token
25+
}) do
2626
Logger.warning("Performing PluralKit import for user #{system_id}")
2727

2828
{:ok, %{body: self_body}} = send_pk_request(:get, "/systems/@me", pk_token)

‎lib/octocon_discord/utils.ex‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,11 @@ defmodule OctoconDiscord.Utils do
290290
inline: true,
291291
value:
292292
case alter.discord_proxies do
293-
nil -> "None"
294-
[] -> "None"
293+
nil ->
294+
"None"
295+
296+
[] ->
297+
"None"
295298

296299
proxies ->
297300
proxies

‎lib/octocon_web/controllers/auth_controller.ex‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ defmodule OctoconWeb.AuthController do
102102
metadata = get_session(conn, :metadata) |> Jason.decode!()
103103

104104
url_params = "?token=#{token}&id=#{user.user_id}"
105+
105106
redirect_url =
106107
case metadata do
107108
%{"platform" => "wasm", "is_beta" => "true"} -> "https://beta.octocon.app/app"

‎lib/octocon_web/controllers/settings_controller.ex‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,10 @@ defmodule OctoconWeb.SettingsController do
403403
def import_sp(conn, %{"token" => token}) do
404404
system_id = conn.private[:guardian_default_resource]
405405

406-
SimplyPluralImportWorker.perform(%{"system_id" => system_id, "sp_token" => String.trim(token)})
406+
SimplyPluralImportWorker.perform(%{
407+
"system_id" => system_id,
408+
"sp_token" => String.trim(token)
409+
})
407410

408411
send_resp(conn, :no_content, "")
409412
end

‎lib/octocon_web/controllers/system_json.ex‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,20 @@ defmodule OctoconWeb.SystemJSON do
2727
show_system_tag: false
2828
})
2929

30-
fields = if map.fields != nil do
31-
map.fields
32-
|> Enum.map(fn field ->
33-
if field.locked == nil do
34-
Map.put(field, :locked, false)
35-
else
36-
field
37-
end
38-
end)
39-
|> Enum.map(&Map.drop(&1, [:__struct__, :__meta__]))
40-
else
41-
[]
42-
end
30+
fields =
31+
if map.fields != nil do
32+
map.fields
33+
|> Enum.map(fn field ->
34+
if field.locked == nil do
35+
Map.put(field, :locked, false)
36+
else
37+
field
38+
end
39+
end)
40+
|> Enum.map(&Map.drop(&1, [:__struct__, :__meta__]))
41+
else
42+
[]
43+
end
4344

4445
%{map | fields: fields}
4546
end

0 commit comments

Comments
 (0)