summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJordan Bracco <href@random.sh>2022-12-20 22:11:14 +0100
committerJordan Bracco <href@random.sh>2022-12-20 22:11:14 +0100
commitdf1a429c54a39e2489b89f355e6e3f10c4c01571 (patch)
tree0b2a720561df6e412ba5a639e7bf0f00d373909d
parentMove from deprecated Mix.Config to Config (diff)
Various fixes, refs T77.
-rw-r--r--config/config.exs4
-rw-r--r--lib/plugins/account.ex7
-rw-r--r--lib/plugins/alcoolog.ex4
-rw-r--r--lib/web/controllers/alcoolog_controller.ex2
-rw-r--r--mix.exs2
5 files changed, 9 insertions, 10 deletions
diff --git a/config/config.exs b/config/config.exs
index ff936c0..e2d7db9 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -2,7 +2,7 @@ import Config
config :logger, level: :debug
config :logger, :console,
- format: "$date $time [$level$levelpad] $metadata$message\n",
+ format: "$date $time [$level] $metadata$message\n",
metadata: :all
config :phoenix, :json_library, Jason
@@ -33,7 +33,7 @@ config :nola, NolaWeb.Endpoint,
render_errors: [view: NolaWeb.ErrorView, accepts: ~w(html json)],
server: true,
live_view: [signing_salt: "CHANGE_ME_FFS"],
- pubsub: [name: Nola.PubSub,
+ pubsub: [name: NolaWeb.PubSub,
adapter: Phoenix.PubSub.PG2]
config :mime, :types, %{"text/event-stream" => ["sse"]}
diff --git a/lib/plugins/account.ex b/lib/plugins/account.ex
index 242b290..0377e1c 100644
--- a/lib/plugins/account.ex
+++ b/lib/plugins/account.ex
@@ -84,7 +84,7 @@ defmodule Nola.Plugins.Account do
def handle_info({:irc, :text, m = %Nola.Message{text: "disable-sms"}}, state) do
if Nola.Account.get_meta(m.account, "sms-number") do
Nola.Account.delete_meta(m.account, "sms-number")
- m.replfyun.("SMS disabled.")
+ m.replyfun.("SMS disabled.")
else
m.replyfun.("SMS already disabled.")
end
@@ -92,9 +92,8 @@ defmodule Nola.Plugins.Account do
end
def handle_info({:irc, :text, m = %Nola.Message{text: "web"}}, state) do
- auth_url = Untappd.auth_url()
login_url = Nola.AuthToken.new_url(m.account.id, nil)
- m.replyfun.("-> " <> login_url)
+ m.replyfun.("↪:" <> login_url)
{:noreply, state}
end
@@ -102,7 +101,7 @@ defmodule Nola.Plugins.Account do
code = String.downcase(EntropyString.small_id())
Nola.Account.put_meta(m.account, "sms-validation-code", code)
Nola.Account.put_meta(m.account, "sms-validation-target", m.network)
- number = Nola.Plugin.Sms.my_number()
+ number = Nola.Plugins.Sms.my_number()
text = "To enable or change your number for SMS messaging, please send:"
<> " \"enable #{code}\" to #{number}"
m.replyfun.(text)
diff --git a/lib/plugins/alcoolog.ex b/lib/plugins/alcoolog.ex
index 28723d0..69bd60c 100644
--- a/lib/plugins/alcoolog.ex
+++ b/lib/plugins/alcoolog.ex
@@ -1047,12 +1047,12 @@ defmodule Nola.Plugins.Alcoolog do
relative <> detail
end
- defp put_user_meta(state, account_id, meta) do
+ def put_user_meta(state, account_id, meta) do
:dets.insert(state.meta, {{:meta, account_id}, meta})
:ok
end
- defp get_user_meta(%{meta: meta}, account_id) do
+ def get_user_meta(%{meta: meta}, account_id) do
case :dets.lookup(meta, {:meta, account_id}) do
[{{:meta, _}, meta}] ->
Map.merge(@default_user_meta, meta)
diff --git a/lib/web/controllers/alcoolog_controller.ex b/lib/web/controllers/alcoolog_controller.ex
index 8263df1..8d7fc11 100644
--- a/lib/web/controllers/alcoolog_controller.ex
+++ b/lib/web/controllers/alcoolog_controller.ex
@@ -163,7 +163,7 @@ defmodule NolaWeb.AlcoologController do
profile_account = Nola.Account.find_always_by_nick(network, nick, nick)
friend? = Enum.member?(Nola.Membership.friends(account), profile_account.id)
if friend? do
- history = for {_, date, value} <- Nola.Plugs.AlcoologAnnouncer.log(profile_account) do
+ history = for {_, date, value} <- Nola.Plugins.AlcoologAnnouncer.log(profile_account) do
%{date: DateTime.to_iso8601(date), value: value}
end
conn
diff --git a/mix.exs b/mix.exs
index 54af7a8..765b008 100644
--- a/mix.exs
+++ b/mix.exs
@@ -15,7 +15,7 @@ defmodule Nola.Mixfile do
def application do
[
- mod: {LSG.Application, []},
+ mod: {Nola.Application, []},
extra_applications: [:logger, :runtime_tools]
]
end