Merge queue attempt 1

.dialyzer_ignore.exs

@@ -33,6 +33,7 @@
   {"lib/teiserver/account/libs/smurf_key_type_lib.ex", :unknown_type},
   {"lib/teiserver/account/libs/user_lib.ex", :unknown_type},
   {"lib/teiserver/account/libs/user_lib.ex", :call},
+  {"lib/teiserver/account/libs/user_lib.ex", :no_return},
   {"lib/teiserver/account/libs/user_stat_lib.ex", :unknown_type},
   {"lib/teiserver/account/plugs/auth_plug.ex", :call},
   {"lib/teiserver/account/queries/friend_queries.ex", :unknown_type},
@@ -473,6 +474,7 @@
   {"lib/teiserver/telemetry/schemas/user_property.ex", :unknown_type},
   {"lib/teiserver_web/controllers/account/security_controller.ex", :unknown_type},
   {"lib/teiserver_web/controllers/account/session_controller.ex", :unknown_type},
+  {"lib/teiserver_web/controllers/account/session_controller.ex", :pattern_match},
   {"lib/teiserver_web/controllers/admin/accolade_controller.ex", :unknown_type},
   {"lib/teiserver_web/controllers/admin/accolade_controller.ex", :no_return},
   {"lib/teiserver_web/controllers/admin/achievement_controller.ex", :unknown_type},
@@ -505,6 +507,8 @@
   {"lib/teiserver_web/controllers/battle/match_controller.ex", :unknown_type},
   {"lib/teiserver_web/controllers/battle/ratings_controller.ex", :unknown_type},
   {"lib/teiserver_web/controllers/game/queue_controller.ex", :unknown_type},
+  {"lib/teiserver_web/controllers/game/queue_controller.ex", :no_return},
+  {"lib/teiserver_web/controllers/game/queue_controller.ex", :call},
   {"lib/teiserver_web/controllers/general/general_controller.ex", :unknown_type},
   {"lib/teiserver_web/controllers/logging/aggregate_view_log_controller.ex", :unknown_type},
   {"lib/teiserver_web/controllers/logging/aggregate_view_log_controller.ex", :no_return},
@@ -587,5 +591,11 @@
   {"lib/teiserver_web/templates/battle/match/index.html.heex", :call},
   {"lib/teiserver_web/templates/battle/match/ratings.html.heex", :no_return},
   {"lib/teiserver_web/templates/battle/match/ratings.html.heex", :call},
-  {"lib/teiserver_web/views/admin/code_view.ex", :invalid_contract}
+  {"lib/teiserver_web/views/admin/code_view.ex", :invalid_contract},
+  {"lib/teiserver_web/live/account/profile/overview.ex", :unused_fun},
+  {"lib/teiserver_web/live/account/profile/overview.ex", :pattern_match},
+  {"test/support/teiserver_test_lib.ex", :call},
+  {"test/support/teiserver_test_lib.ex", :no_return},
+  {"test/support/teiserver_test_lib.ex", :unused_fun},
+  {"test/support/teiserver_test_lib.ex", :pattern_match}
 ]

.github/workflows/tests.yml

@@ -94,4 +94,4 @@ jobs:
 
     # Step: Execute the tests.
     - name: Run tests
-      run: mix test
+      run: mix test --exclude needs_attention

lib/central/general_test_lib.ex

@@ -32,7 +32,7 @@ defmodule Central.Helpers.GeneralTestLib do
         "name" => params["name"] || "Test",
         "email" => params["email"] || "email@email#{:rand.uniform(999_999_999_999)}",
         "colour" => params["colour"] || "#00AA00",
-        "icon" => params["icon"] || "fa-regular fa-user",
+        "icon" => params["icon"] || "fa-solid fa-user",
         "permissions" => permissions,
         "password" => params["password"] || "password",
         "password_confirmation" => params["password"] || "password",

lib/teiserver/account/caches/permission_cache.ex

@@ -0,0 +1,91 @@
+defmodule Teiserver.Account.PermissionCache do
+  @moduledoc """
+  Define caches and set them up for permission related things
+  """
+
+  use Supervisor
+  import Teiserver.Account.AuthLib, only: [add_permission_set: 3]
+  alias Teiserver.Helpers.CacheHelper
+
+  def start_link(opts) do
+    with {:ok, sup} <- Supervisor.start_link(__MODULE__, :ok, opts),
+         :ok <- warm_permission_cache() do
+      warm_restriction_cache()
+      {:ok, sup}
+    end
+  end
+
+  @impl true
+  def init(:ok) do
+    children = [
+      CacheHelper.concache_perm_sup(:auth_group_store),
+      CacheHelper.concache_perm_sup(:restriction_lookup_store)
+    ]
+
+    Supervisor.init(children, strategy: :one_for_all)
+  end
+
+  defp warm_permission_cache() do
+    add_permission_set("admin", "debug", ~w(debug))
+    add_permission_set("admin", "dev", ~w(developer structure))
+    add_permission_set("admin", "admin", ~w(limited full))
+    add_permission_set("admin", "report", ~w(show update delete report))
+    add_permission_set("admin", "user", ~w(show create update delete report))
+    add_permission_set("admin", "group", ~w(show create update delete report config))
+    add_permission_set("teiserver", "admin", ~w(account battle clan queue))
+
+    add_permission_set(
+      "teiserver",
+      "staff",
+      ~w(overwatch reviewer moderator admin communication clan telemetry server)
+    )
+
+    add_permission_set("teiserver", "dev", ~w(infolog))
+    add_permission_set("teiserver", "reports", ~w(client server match ratings infolog))
+    add_permission_set("teiserver", "api", ~w(battle))
+
+    add_permission_set(
+      "teiserver",
+      "player",
+      ~w(account tester contributor dev streamer donor verified bot moderator)
+    )
+
+    :ok = Teiserver.Logging.Startup.startup()
+
+    :ok
+  end
+
+  defp warm_restriction_cache() do
+    # Chat stuff
+    Teiserver.Account.UserLib.add_report_restriction_types("Chat", [
+      "Bridging",
+      "Game chat",
+      "Room chat",
+      "All chat"
+    ])
+
+    # Lobby interaction
+    Teiserver.Account.UserLib.add_report_restriction_types("Game", [
+      "Low priority",
+      "All lobbies",
+      "Login",
+      "Permanently banned"
+    ])
+
+    Teiserver.Account.UserLib.add_report_restriction_types("Other", [
+      "Accolades",
+      "Boss",
+      "Reporting",
+      "Renaming",
+      "Matchmaking"
+    ])
+
+    Teiserver.Account.UserLib.add_report_restriction_types("Warnings", [
+      "Warning reminder"
+    ])
+
+    Teiserver.Account.UserLib.add_report_restriction_types("Internal", [
+      "Note"
+    ])
+  end
+end

lib/teiserver/account/libs/auth_lib.ex

@@ -3,7 +3,7 @@ defmodule Teiserver.Account.AuthLib do
   require Logger
 
   @spec icon :: String.t()
-  def icon(), do: "fa-regular fa-address-card"
+  def icon(), do: "fa-solid fa-address-card"
 
   @spec get_all_permission_sets() :: Map.t()
   def get_all_permission_sets do

lib/teiserver/account/libs/smurf_key_type_lib.ex

@@ -4,7 +4,7 @@ defmodule Teiserver.Account.SmurfKeyTypeLib do
 
   # Functions
   @spec icon :: String.t()
-  def icon, do: "fa-regular fa-???"
+  def icon, do: "fa-regular fa-question"
 
   @spec colours :: atom
   def colours, do: :default

lib/teiserver/account/reports/mapping_report.ex

@@ -3,7 +3,7 @@ defmodule Teiserver.Game.MappingReport do
   alias Teiserver.{Battle}
 
   @spec icon() :: String.t()
-  def icon(), do: "fa-regular fa-map"
+  def icon(), do: "fa-solid fa-map"
 
   @spec permissions() :: String.t()
   def permissions(), do: "Admin"

lib/teiserver/account/reports/week_on_week_report.ex

@@ -3,7 +3,7 @@ defmodule Teiserver.Account.WeekOnWeekReport do
   alias Teiserver.Helper.{TimexHelper, NumberHelper}
 
   @spec icon() :: String.t()
-  def icon(), do: "fa-regular fa-calendar"
+  def icon(), do: "fa-solid fa-calendar"
 
   @spec permissions() :: String.t()
   def permissions(), do: "Admin"

lib/teiserver/application.ex

@@ -7,6 +7,9 @@ defmodule Teiserver.Application do
   alias Phoenix.PubSub
   require Logger
 
+  import Teiserver.Helpers.CacheHelper,
+    only: [concache_sup: 1, concache_sup: 2, concache_perm_sup: 1]
+
   @impl true
   def start(_type, _args) do
     # List all child processes to be supervised
@@ -46,18 +49,13 @@ defmodule Teiserver.Application do
         concache_sup(:account_avoiding_this_cache),
         concache_sup(:account_blocking_this_cache),
         concache_perm_sup(:recently_used_cache),
-        concache_perm_sup(:auth_group_store),
-        concache_perm_sup(:restriction_lookup_store),
-        concache_perm_sup(:config_user_type_store),
-        concache_perm_sup(:config_site_type_store),
-        concache_perm_sup(:config_site_cache),
-        concache_perm_sup(:application_metadata_cache),
+        Teiserver.Account.PermissionCache,
+        Teiserver.Config.UserConfigTypes.Cache,
+        Teiserver.Config.SiteConfigTypes.Cache,
+        Teiserver.MetadataCache,
         concache_sup(:application_temp_cache),
         concache_sup(:config_user_cache),
-
-        # Tachyon schemas
-        concache_perm_sup(:tachyon_schemas),
-        concache_perm_sup(:tachyon_dispatches),
+        Teiserver.Tachyon.Cache,
 
         # Teiserver stuff
         # Global/singleton registries
@@ -79,8 +77,7 @@ defmodule Teiserver.Application do
 
         # Stores - Tables where changes are not propagated across the cluster
         # Possible stores
-        concache_perm_sup(:teiserver_queues),
-        concache_perm_sup(:lobby_policies_cache),
+        Teiserver.Data.LobbyPolicyCache,
 
         # Telemetry
         concache_perm_sup(:telemetry_property_types_cache),
@@ -98,7 +95,7 @@ defmodule Teiserver.Application do
 
         # Caches
         # Caches - Meta
-        concache_perm_sup(:lists),
+        Teiserver.Data.MatchmakingCache,
 
         # Caches - User
         # concache_sup(:users_lookup_name_with_id, [global_ttl: 300_000]),
@@ -135,7 +132,7 @@ defmodule Teiserver.Application do
         concache_perm_sup(:discord_command_cache),
 
         # Lobbies
-        concache_perm_sup(:lobby_command_cache),
+        Teiserver.Lobby.Cache,
         {DynamicSupervisor, strategy: :one_for_one, name: Teiserver.LobbySupervisor},
         {DynamicSupervisor, strategy: :one_for_one, name: Teiserver.ClientSupervisor},
         {DynamicSupervisor, strategy: :one_for_one, name: Teiserver.PartySupervisor},
@@ -162,10 +159,6 @@ defmodule Teiserver.Application do
         # Telemetry
         {Teiserver.Telemetry.TelemetryServer, name: Teiserver.Telemetry.TelemetryServer},
 
-        # Text callbacks
-        concache_perm_sup(:text_callback_trigger_lookup),
-        concache_perm_sup(:text_callback_store),
-
         # Ranch servers
         %{
           id: Teiserver.SSLSpringTcpServer,
@@ -206,34 +199,6 @@ defmodule Teiserver.Application do
     end
   end
 
-  defp concache_sup(name, opts \\ []) do
-    Supervisor.child_spec(
-      {
-        ConCache,
-        [
-          name: name,
-          ttl_check_interval: 10_000,
-          global_ttl: opts[:global_ttl] || 60_000,
-          touch_on_read: true
-        ]
-      },
-      id: {ConCache, name}
-    )
-  end
-
-  defp concache_perm_sup(name) do
-    Supervisor.child_spec(
-      {
-        ConCache,
-        [
-          name: name,
-          ttl_check_interval: false
-        ]
-      },
-      id: {ConCache, name}
-    )
-  end
-
   def startup_sub_functions({:error, _}), do: :error
 
   def startup_sub_functions(_) do

lib/teiserver/chat/libs/word_lib.ex

@@ -82,6 +82,7 @@ defmodule Teiserver.Chat.WordLib do
       String.contains?(name, "[lm]") -> true
       String.contains?(name, "[ts]") -> true
       String.contains?(name, "[tei]") -> true
+      String.contains?(name, "Host[") -> true
       true -> false
     end
   end

lib/teiserver/clans/schemas/clan.ex

@@ -1,6 +1,17 @@
 defmodule Teiserver.Clans.Clan do
   use TeiserverWeb, :schema
 
+  # TODO: this type is incomplete
+  @type t :: %__MODULE__{
+          name: String.t(),
+          tag: String.t(),
+          colour: String.t(),
+          icon: String.t(),
+          description: String.t(),
+          rating: String.t(),
+          homepage: String.t()
+        }
+
   schema "teiserver_clans" do
     field :name, :string
     field :tag, :string

lib/teiserver/clans/schemas/clan_membership.ex

@@ -1,6 +1,13 @@
 defmodule Teiserver.Clans.ClanMembership do
   use TeiserverWeb, :schema
 
+  # TODO: this type is incomplete
+  @type t :: %__MODULE__{
+          role: String.t(),
+          user: any(),
+          clan: any()
+        }
+
   @primary_key false
   schema "teiserver_clan_memberships" do
     field :role, :string

lib/teiserver/communication/libs/cache.ex

@@ -0,0 +1,25 @@
+defmodule Teiserver.Communication.Cache do
+  @moduledoc """
+  Cache and setup for communication stuff
+  """
+
+  use Supervisor
+  alias Teiserver.Helpers.CacheHelper
+
+  def start_link(opts) do
+    with {:ok, sup} <- Supervisor.start_link(__MODULE__, :ok, opts),
+         :ok <- Teiserver.Communication.build_text_callback_cache() do
+      {:ok, sup}
+    end
+  end
+
+  @impl true
+  def init(:ok) do
+    children = [
+      CacheHelper.concache_perm_sup(:text_callback_trigger_lookup),
+      CacheHelper.concache_perm_sup(:text_callback_store)
+    ]
+
+    Supervisor.init(children, strategy: :one_for_all)
+  end
+end

lib/teiserver/config/site_config_types/cache.ex

@@ -0,0 +1,26 @@
+defmodule Teiserver.Config.SiteConfigTypes.Cache do
+  @moduledoc """
+  Cache and setup for site configuration
+  """
+
+  use Supervisor
+  alias Teiserver.Helpers.CacheHelper
+
+  def start_link(opts) do
+    with {:ok, sup} <- Supervisor.start_link(__MODULE__, :ok, opts),
+         :ok <- Teiserver.Config.SiteConfigTypes.SystemConfigs.create(),
+         :ok <- Teiserver.TeiserverConfigs.teiserver_configs() do
+      {:ok, sup}
+    end
+  end
+
+  @impl true
+  def init(:ok) do
+    children = [
+      CacheHelper.concache_perm_sup(:config_site_type_store),
+      CacheHelper.concache_perm_sup(:config_site_cache)
+    ]
+
+    Supervisor.init(children, strategy: :one_for_all)
+  end
+end