Test and warning fixes

.gitignore

@@ -65,6 +65,7 @@ runtime/
 /source_deploy.tar.gz
 central.tar.gz
 /bin
+.vscode/launch.json
 
 # I'm storing server output here, don't want to push it to git
 example_output

lib/teiserver/account/servers/client_server.ex

@@ -114,7 +114,7 @@ defmodule Teiserver.Account.ClientServer do
   end
 
   def handle_cast({:merge_update_client, partial_client}, state) do
-    Logger.warn(":merge_update_client is still being used, instead use :update_values")
+    Logger.warning(":merge_update_client is still being used, instead use :update_values")
     new_client = Map.merge(state.client, partial_client)
 
     PubSub.broadcast(

lib/teiserver/battle/servers/match_monitor_server.ex

@@ -155,10 +155,10 @@ defmodule Teiserver.Battle.MatchMonitorServer do
             Telemetry.log_simple_match_event(userid, match_id, event_type_name, game_time)
             Logger.info("match-event: Stored <#{username}> <#{event_type_name}> <#{game_time}> userid #{userid} match_id #{match_id}")
           else
-            Logger.warn("match-event: Cannot get match_id of userid of #{username}")
+            Logger.warning("match-event: Cannot get match_id of userid of #{username}")
           end
         else
-          Logger.warn("match-event: Cannot get userid of #{username} or is not a bot")
+          Logger.warning("match-event: Cannot get userid of #{username} or is not a bot")
         end
 
       _ ->
@@ -242,7 +242,7 @@ defmodule Teiserver.Battle.MatchMonitorServer do
         end
 
       _ ->
-        Logger.warn("match-chat nomatch from: #{from_id}: match-chat #{data}")
+        Logger.warning("match-chat nomatch from: #{from_id}: match-chat #{data}")
     end
 
     {:noreply, state}
@@ -288,7 +288,7 @@ defmodule Teiserver.Battle.MatchMonitorServer do
         end
 
       _ ->
-        Logger.warn("match-chat-name nomatch from: #{from_id}: match-chat [[#{data}]]")
+        Logger.warning("match-chat-name nomatch from: #{from_id}: match-chat [[#{data}]]")
     end
 
     {:noreply, state}
@@ -311,23 +311,23 @@ defmodule Teiserver.Battle.MatchMonitorServer do
                 handle_json_msg(data, from_id)
 
               _ ->
-                Logger.warn("AHM DM no catch, no json-decode - '#{contents_string}'")
+                Logger.warning("AHM DM no catch, no json-decode - '#{contents_string}'")
             end
 
           _ ->
-            Logger.warn("AHM DM no catch, no decompress - '#{compressed_contents}'")
+            Logger.warning("AHM DM no catch, no decompress - '#{compressed_contents}'")
         end
 
       _ ->
-        Logger.warn("AHM DM no catch, no base64 - '#{message}'")
+        Logger.warning("AHM DM no catch, no base64 - '#{message}'")
     end
 
     {:noreply, state}
   end
 
   # Catchall handle_info
   def handle_info(msg, state) do
-    Logger.warn(
+    Logger.warning(
       "Match monitor Server handle_info error. No handler for msg of #{Kernel.inspect(msg)}"
     )
 
@@ -337,7 +337,7 @@ defmodule Teiserver.Battle.MatchMonitorServer do
   defp handle_json_msg(%{"username" => username, "GPU" => _} = contents, from_id) do
     case CacheUser.get_user_by_name(username) do
       nil ->
-        Logger.warn("No username on handle_json_msg: #{username} - #{Kernel.inspect(contents)}")
+        Logger.warning("No username on handle_json_msg: #{username} - #{Kernel.inspect(contents)}")
 
         :ok
 
@@ -367,7 +367,7 @@ defmodule Teiserver.Battle.MatchMonitorServer do
   end
 
   defp handle_json_msg(contents, _from_id) do
-    Logger.warn("No catch on handle_json_msg: #{Kernel.inspect(contents)}")
+    Logger.warning("No catch on handle_json_msg: #{Kernel.inspect(contents)}")
     :ok
   end
 

lib/teiserver/benchmark/stats_client.ex

@@ -43,7 +43,7 @@ Avg ping: #{round(average_ping * 100) / 100}ms, Pings: #{Enum.count(state.pings)
         port: port
       })
 
-    Logger.warn("Starting stats")
+    Logger.warning("Starting stats")
     :timer.send_interval(@registration_interval, self(), :register)
     send(self(), :register)
 

lib/teiserver/bridge/command_lib.ex

@@ -2,7 +2,6 @@ defmodule Teiserver.Bridge.CommandLib do
   @moduledoc """
 
   """
-  alias Teiserver.Data.Types, as: T
   require Logger
 
   @spec handle_command(Nostrum.Struct.Interaction.t(), map()) :: map()

lib/teiserver/bridge/message_commands.ex

@@ -17,7 +17,7 @@ defmodule Teiserver.Bridge.MessageCommands do
         content: "$" <> content,
         attachments: []
       }) do
-    Logger.warn("1")
+    Logger.warning("1")
 
     [cmd | remaining] = String.split(content, " ")
     remaining = Enum.join(remaining, " ")
@@ -45,7 +45,7 @@ defmodule Teiserver.Bridge.MessageCommands do
   end
 
   def handle(_msg) do
-    # Logger.warn("2")
+    # Logger.warning("2")
     # IO.inspect msg
 
     :ok

lib/teiserver/coordinator/consul_server.ex

@@ -657,7 +657,7 @@ defmodule Teiserver.Coordinator.ConsulServer do
     # if existing.ready == false and new_client.ready == true and existing.unready_at != nil do
     #   time_elapsed = System.system_time(:millisecond) - existing.unready_at
     #   if time_elapsed < 1000 do
-    #     Logger.warn("Ready up in #{time_elapsed}ms by #{existing.userid}/#{existing.name} using #{existing.lobby_client}")
+    #     Logger.warning("Ready up in #{time_elapsed}ms by #{existing.userid}/#{existing.name} using #{existing.lobby_client}")
     #   end
     # end
 
@@ -686,7 +686,7 @@ defmodule Teiserver.Coordinator.ConsulServer do
 
         if player_count > 4 do
           if user.hw_hash == nil do
-            Logger.warn("hw hash block for #{Account.get_username(userid)}")
+            Logger.warning("hw hash block for #{Account.get_username(userid)}")
             %{new_client | player: false}
           else
             new_client

lib/teiserver/helpers/oban_logger.ex

@@ -3,7 +3,7 @@ defmodule Teiserver.Helper.ObanLogger do
   require Logger
 
   def handle_event([:oban, :job, :start], _measure, _meta, _) do
-    # Logger.warn("[Oban] :started #{meta.worker} at #{measure.system_time}")
+    # Logger.warning("[Oban] :started #{meta.worker} at #{measure.system_time}")
   end
 
   def handle_event([:oban, :job, :exception], _measure, meta, _) do

lib/teiserver/lobby/libs/lobby_lib.ex

@@ -199,14 +199,14 @@ defmodule Teiserver.Lobby.LobbyLib do
 
   @spec update_lobby(T.lobby(), nil | atom, any) :: T.lobby()
   def update_lobby(%{id: lobby_id} = lobby, nil, :silent) do
-    Logger.warn("update_lobby is still being called for :silent")
+    Logger.warning("update_lobby is still being called for :silent")
     cast_lobby(lobby_id, {:update_lobby, lobby})
 
     lobby
   end
 
   def update_lobby(%{id: lobby_id} = lobby, nil, reason) do
-    Logger.warn("update_lobby (no data) is still being called, reason: #{reason}")
+    Logger.warning("update_lobby (no data) is still being called, reason: #{reason}")
     cast_lobby(lobby_id, {:update_lobby, lobby})
 
     PubSub.broadcast(
@@ -224,7 +224,7 @@ defmodule Teiserver.Lobby.LobbyLib do
   end
 
   def update_lobby(%{id: lobby_id} = lobby, data, reason) do
-    Logger.warn("update_lobby (with data) is still being called, reason: #{reason}")
+    Logger.warning("update_lobby (with data) is still being called, reason: #{reason}")
     cast_lobby(lobby_id, {:update_lobby, lobby})
 
     if Enum.member?([:update_battle_info], reason) do

lib/teiserver/protocols/spring/spring_in.ex

@@ -1408,11 +1408,11 @@ defmodule Teiserver.Protocols.SpringIn do
 
     cond do
       Enum.count(status_timestamps) > 10 ->
-        Logger.warn("status_flood_protection:10 - #{state.username}/#{state.userid}")
+        Logger.warning("status_flood_protection:10 - #{state.username}/#{state.userid}")
         {true, %{state | status_timestamps: status_timestamps}}
 
       Enum.count(recent_timestamps) > 3 ->
-        Logger.warn("status_flood_protection:3 - #{state.username}/#{state.userid}")
+        Logger.warning("status_flood_protection:3 - #{state.username}/#{state.userid}")
         {true, %{state | status_timestamps: status_timestamps}}
 
       true ->

lib/teiserver/protocols/spring/spring_out.ex

@@ -855,7 +855,7 @@ defmodule Teiserver.Protocols.SpringOut do
     # I've made the mistake of forgetting it and wondering
     # why stuff wasn't working so it's staying here
     if not String.ends_with?(msg, "\n") do
-      Logger.warn("Attempting to send message without newline at the end - #{msg}")
+      Logger.warning("Attempting to send message without newline at the end - #{msg}")
     end
 
     msg =

lib/teiserver/protocols/spring/spring_system_in.ex

@@ -1,9 +1,7 @@
 defmodule Teiserver.Protocols.Spring.SystemIn do
   @moduledoc false
 
-  alias Teiserver.Account.LoginThrottleServer
   alias Teiserver.Protocols.SpringIn
-  import Teiserver.Protocols.SpringOut, only: [reply: 5]
   require Logger
 
   @spec do_handle(String.t(), String.t(), String.t() | nil, Map.t()) :: Map.t()

lib/teiserver/protocols/spring/spring_telemetry_in.ex

@@ -156,9 +156,9 @@ defmodule Teiserver.Protocols.Spring.TelemetryIn do
   defp do_live_client_event(data, state) do
     if String.length(data) < 1024 do
       case Regex.run(~r/(\S+) (\S+)/u, data) do
-        [_, event_name, value64] ->
+        [_, _event_name, value64] ->
           case Spring.decode_value(value64) do
-            {:ok, value} ->
+            {:ok, _value} ->
               if state.userid do
                 # TODO: Do stuff with live client events
                 # Telemetry.log_live_client_event(state.userid, event_name, value)

lib/teiserver/protocols/tachyon_lib.ex

@@ -56,11 +56,11 @@ defmodule Teiserver.Protocols.TachyonLib do
       :error ->
         # Previously got an error with data 'OK cmd=TACHYON' which suggests
         # it was still in Spring mode
-        Logger.warn("Base64 error, given '#{data}'")
+        Logger.warning("Base64 error, given '#{data}'")
         {:error, :base64_decode}
 
       {:error, :gzip_decompress} ->
-        Logger.warn("Gzip error, given '#{data}'")
+        Logger.warning("Gzip error, given '#{data}'")
         {:error, :gzip_decompress}
 
       {:error, %Jason.DecodeError{}} ->

lib/teiserver/protocols/tachyon_v1/communication_out.ex

@@ -7,7 +7,7 @@ defmodule Teiserver.Protocols.Tachyon.V1.CommunicationOut do
   ###########
   # Direct messages
   def do_reply(:direct_message, {sender_id, msg}) do
-    Logger.warn(
+    Logger.warning(
       "Using :direct_message instead of :received_direct_message in V1.CommunicationOut"
     )
 

lib/teiserver/protocols/tachyon_v1/tachyon_out.ex

@@ -43,7 +43,7 @@ defmodule Teiserver.Protocols.Tachyon.V1.TachyonOut do
           LobbyOut.do_reply(reply_cmd, data)
 
         :battle ->
-          Logger.warn("Tachyon :battle namespace message #{reply_cmd}")
+          Logger.warning("Tachyon :battle namespace message #{reply_cmd}")
           LobbyOut.do_reply(reply_cmd, data)
 
         :matchmaking ->

lib/teiserver/telemetry/libs/simple_server_event_lib.ex

@@ -33,7 +33,7 @@ defmodule Teiserver.Telemetry.SimpleServerEventLib do
             "telemetry_simple_server_events",
             %{
               channel: "telemetry_simple_server_events",
-              userid: userid,
+              user_id: userid,
               event_type_name: event_type_name
             }
           )

lib/teiserver/telemetry/schemas/simple_server_event.ex

@@ -15,7 +15,7 @@ defmodule Teiserver.Telemetry.SimpleServerEvent do
   def changeset(struct, params \\ %{}) do
     struct
     |> cast(params, ~w(user_id event_type_id timestamp)a)
-    |> validate_required(~w(event_type_id timestamp)a)
+    |> validate_required(~w(event_type_id)a)
   end
 
   @spec authorize(atom, Plug.Conn.t(), Map.t()) :: boolean

lib/teiserver_web/live/battles/lobbies/chat.ex

@@ -245,7 +245,7 @@ defmodule TeiserverWeb.Battle.LobbyLive.Chat do
   end
 
   def handle_info(msg, socket) do
-    Logger.warn("No handler in #{__MODULE__} for message #{Kernel.inspect(msg)}")
+    Logger.warning("No handler in #{__MODULE__} for message #{Kernel.inspect(msg)}")
     {:noreply, socket}
   end
 

lib/teiserver_web/live/microblog/admin/post/show.ex

@@ -2,7 +2,6 @@ defmodule TeiserverWeb.Microblog.Admin.PostLive.Show do
   @moduledoc false
   use TeiserverWeb, :live_view
   alias Teiserver.Microblog
-  import TeiserverWeb.MicroblogComponents
 
   @impl true
   def mount(_params, _session, socket) do

lib/teiserver_web/live/microblog/admin/tag/index.ex

@@ -2,7 +2,6 @@ defmodule TeiserverWeb.Microblog.Admin.TagLive.Index do
   @moduledoc false
   use TeiserverWeb, :live_view
   alias Teiserver.Microblog
-  import TeiserverWeb.MicroblogComponents
 
   @impl true
   def mount(_params, _session, socket) do

lib/teiserver_web/live/microblog/admin/tag/show.ex

@@ -2,7 +2,6 @@ defmodule TeiserverWeb.Microblog.Admin.TagLive.Show do
   @moduledoc false
   use TeiserverWeb, :live_view
   alias Teiserver.Microblog
-  import TeiserverWeb.MicroblogComponents
 
   @impl true
   def mount(_params, _session, socket) do

lib/teiserver_web/live/queues/index.ex

@@ -206,7 +206,7 @@ defmodule TeiserverWeb.Matchmaking.QueueLive.Index do
         } = data,
         socket
       ) do
-    Logger.warn("index.ex Match ready")
+    Logger.warning("index.ex Match ready")
 
     {:noreply,
      socket

test/teiserver/account/account_test.exs

@@ -78,13 +78,6 @@ defmodule Teiserver.AccountTest do
           developer: "Normal"
         ]
       )
-
-      # Order by
-      Account.list_users(order_by: [{:data, "field", :asc}])
-      Account.list_users(order_by: [{:data, "field", :desc}])
-
-      # Fallback
-      Account.list_users(order_by: [{:data, "field", :desc}])
     end
 
     test "get_user!/1 returns the user with given id" do