fix: Friend & username bugs

Author: atlas-oc

lib/octocon/accounts.ex

@@ -362,6 +362,40 @@ defmodule Octocon.Accounts do
     link_discord_to_user(user, discord_id)
   end
 
+  def update_username(system_identity, username) do
+    user = get_user!(system_identity)
+
+    cond do
+      user.username == username ->
+        {:error, :already_linked}
+
+      user_exists?({:username, username}) ->
+        {:error, :user_exists}
+
+      true ->
+        user
+        |> User.update_changeset(%{username: username})
+        |> Repo.update_regional({:user, {:system, user.id}})
+        |> case do
+          {:ok, value} ->
+            spawn(fn ->
+              update_user_registry(user.id, %{username: username})
+            end)
+
+            spawn(fn ->
+              OctoconWeb.Endpoint.broadcast!("system:#{user.id}", "username_updated", %{
+                username: username
+              })
+            end)
+
+            {:ok, value}
+
+          {:error, changeset} ->
+            {:error, changeset}
+        end
+    end
+  end
+
   @doc """
   Links an email to an existing user. Accepts either a `User` struct directly or a system identity.
 

lib/octocon/friendships.ex

@@ -592,69 +592,78 @@ defmodule Octocon.Friendships do
         from_id = Accounts.id_from_system_identity(from_identity, :system)
         to_id = Accounts.id_from_system_identity(to_identity, :system)
 
-        req =
-          %Request{
-            from_id: from_id,
-            to_id: to_id,
-            date_sent: DateTime.utc_now(:second)
-          }
-          |> change_friend_request()
-          |> Repo.insert_global()
-
-        case req do
-          {:ok, _} ->
-            OctoconDiscord.Utils.send_dm(
-              {:system, to_id},
-              ":mailbox_with_mail: New friend request!",
-              "The system **#{from_id}** has sent you a friend request."
-            )
-
-            spawn(fn ->
-              %{request: request, from: from} =
-                get_incoming_friend_request(from_identity, to_identity)
-
-              OctoconWeb.Endpoint.broadcast!(
-                "system:#{to_id}",
-                "friend_request_received",
-                %{
-                  request: request,
-                  system: from
-                }
-                |> OctoconWeb.FriendRequestJSON.data()
-              )
-            end)
-
-            spawn(fn ->
-              %{request: request, to: to} =
-                get_outgoing_friend_request(from_identity, to_identity)
-
-              OctoconWeb.Endpoint.broadcast!(
-                "system:#{from_id}",
-                "friend_request_sent",
-                %{
-                  request: request,
-                  system: to
-                }
-                |> OctoconWeb.FriendRequestJSON.data()
-              )
-            end)
-
-            spawn(fn ->
-              OctoconDiscord.Autocomplete.FriendRequest.invalidate(
-                {:system, to_id},
-                :incoming
-              )
-
-              OctoconDiscord.Autocomplete.FriendRequest.invalidate(
-                {:system, from_id},
-                :outgoing
-              )
-            end)
-
-            {:ok, :sent}
+        cond do
+          to_id == nil or not Accounts.user_exists?({:system, to_id}) ->
+            {:error, :no_user}
+
+          to_id == from_id ->
+            {:error, :no_user}
+
+          true ->
+            req =
+              %Request{
+                from_id: from_id,
+                to_id: to_id,
+                date_sent: DateTime.utc_now(:second)
+              }
+              |> change_friend_request()
+              |> Repo.insert_global()
+
+            case req do
+              {:ok, _} ->
+                OctoconDiscord.Utils.send_dm(
+                  {:system, to_id},
+                  ":mailbox_with_mail: New friend request!",
+                  "The system **#{from_id}** has sent you a friend request."
+                )
 
-          {:error, error} ->
-            {:error, error}
+                spawn(fn ->
+                  %{request: request, from: from} =
+                    get_incoming_friend_request(from_identity, to_identity)
+
+                  OctoconWeb.Endpoint.broadcast!(
+                    "system:#{to_id}",
+                    "friend_request_received",
+                    %{
+                      request: request,
+                      system: from
+                    }
+                    |> OctoconWeb.FriendRequestJSON.data()
+                  )
+                end)
+
+                spawn(fn ->
+                  %{request: request, to: to} =
+                    get_outgoing_friend_request(from_identity, to_identity)
+
+                  OctoconWeb.Endpoint.broadcast!(
+                    "system:#{from_id}",
+                    "friend_request_sent",
+                    %{
+                      request: request,
+                      system: to
+                    }
+                    |> OctoconWeb.FriendRequestJSON.data()
+                  )
+                end)
+
+                spawn(fn ->
+                  OctoconDiscord.Autocomplete.FriendRequest.invalidate(
+                    {:system, to_id},
+                    :incoming
+                  )
+
+                  OctoconDiscord.Autocomplete.FriendRequest.invalidate(
+                    {:system, from_id},
+                    :outgoing
+                  )
+                end)
+
+                {:ok, :sent}
+
+              {:error, error} ->
+                {:error, error}
+            end
         end
     end
   end

lib/octocon_discord/commands/friend/request.ex

@@ -153,7 +153,7 @@ defmodule OctoconDiscord.Commands.Friend.Request do
       {:error, :already_sent_request} ->
         error_component("You have already sent a friend request to #{decorator}.")
 
-      {:error, %{errors: [to_id: {"does not exist", _}]}} ->
+      {:error, :no_user} ->
         error_component("That system #{decorator} does not exist.")
 
       {:error, _} ->

lib/octocon_discord/commands/settings.ex

@@ -56,33 +56,21 @@ defmodule OctoconDiscord.Commands.Settings do
 
   def username(%{system_identity: system_identity}, options) do
     username = get_command_option(options, "username")
-    user = Accounts.get_user!(system_identity)
 
-    if username == user.username do
-      error_component("Your username is already set to `#{username}`.")
-    else
-      case Accounts.update_user(user, %{username: username}) do
-        {:ok, _} ->
-          success_component("Your username has been changed to `#{username}`.")
-
-        {:error,
-         %Ecto.Changeset{
-           errors: [
-             username: {"has already been taken", _}
-           ]
-         }} ->
-          error_component("The username `#{username}` is already taken.")
-
-        {:error,
-         %Ecto.Changeset{
-           errors: [
-             username: {"has invalid format", _}
-           ]
-         }} ->
-          error_component(
-            "The username `#{username}` is invalid. It must satisfy the following criteria:\n\n- Between 5-16 characters\n- Only contains letters, numbers, dashes, and underscores\n- Does not start or end with a symbol\n- Does not consist of seven lowercase letters in a row (like a system ID)"
-          )
-      end
+    case Accounts.update_username(system_identity, username) do
+      {:error, :already_linked} ->
+        error_component("Your username is already set to `#{username}`.")
+
+      {:error, :user_exists} ->
+        error_component("The username `#{username}` is already taken.")
+
+      {:error, _} ->
+        error_component(
+          "The username `#{username}` is invalid. It must satisfy the following criteria:\n\n- Between 5-16 characters\n- Only contains letters, numbers, dashes, and underscores\n- Does not start or end with a symbol\n- Does not consist of seven lowercase letters in a row (like a system ID)"
+        )
+
+      {:ok, _} ->
+        success_component("Your username has been changed to `#{username}`.")
     end
   end
 

lib/octocon_discord/guild_cache.ex

@@ -17,7 +17,6 @@ defmodule OctoconDiscord.GuildCache do
     Struct.Channel,
     Struct.Emoji,
     Struct.Guild,
-    Struct.Guild.Role,
     Struct.Sticker,
     Util
   }

lib/octocon_web/controllers/friend_request_controller.ex

@@ -186,6 +186,14 @@ defmodule OctoconWeb.FriendRequestController do
               code: "already_sent_request"
             })
 
+          {:error, :no_user} ->
+            conn
+            |> put_status(:bad_request)
+            |> json(%{
+              error: "That system does not exist.",
+              code: "no_user"
+            })
+
           _ ->
             conn
             |> put_status(:internal_server_error)

lib/octocon_web/controllers/settings_controller.ex

@@ -168,49 +168,37 @@ defmodule OctoconWeb.SettingsController do
 
   def update_username(conn, %{"username" => username}) do
     system_id = conn.private[:guardian_default_resource]
-    user = Accounts.get_user({:system, system_id})
 
-    if username == user.username do
-      conn
-      |> put_status(:bad_request)
-      |> json(%{
-        error: "Your username is already set to \"#{username}\".",
-        code: "username_already_set"
-      })
-    else
-      case Accounts.update_user(user, %{username: username}) do
-        {:ok, _} ->
-          conn
-          |> put_status(:ok)
-          |> json(%{message: "Your username has been changed to \"#{username}\"."})
-
-        {:error,
-         %Ecto.Changeset{
-           errors: [
-             username: {"has already been taken", _}
-           ]
-         }} ->
-          conn
-          |> put_status(:bad_request)
-          |> json(%{
-            error: "The username \"#{username}\" is already taken.",
-            code: "username_taken"
-          })
-
-        {:error,
-         %Ecto.Changeset{
-           #  errors: [
-           #    username: {"has invalid format", _}
-           #  ]
-         }} ->
-          conn
-          |> put_status(:bad_request)
-          |> json(%{
-            error:
-              "The username \"#{username}\" is invalid. It must satisfy the following criteria:\n\n- Between 5-16 characters\n- Only contains letters, numbers, dashes, and underscores\n- Does not start or end with a symbol\n- Does not consist of seven lowercase letters in a row (like a system ID)",
-            code: "username_invalid"
-          })
-      end
+    case Accounts.update_username({:system, system_id}, username) do
+      {:error, :already_linked} ->
+        conn
+        |> put_status(:bad_request)
+        |> json(%{
+          error: "Your username is already set to \"#{username}\".",
+          code: "username_already_set"
+        })
+
+      {:error, :user_exists} ->
+        conn
+        |> put_status(:bad_request)
+        |> json(%{
+          error: "The username \"#{username}\" is already taken.",
+          code: "username_taken"
+        })
+
+      {:error, _} ->
+        conn
+        |> put_status(:bad_request)
+        |> json(%{
+          error:
+            "The username \"#{username}\" is invalid. It must satisfy the following criteria:\n\n- Between 5-16 characters\n- Only contains letters, numbers, dashes, and underscores\n- Does not start or end with a symbol\n- Does not consist of seven lowercase letters in a row (like a system ID)",
+          code: "username_invalid"
+        })
+
+      {:ok, _} ->
+        conn
+        |> put_status(:ok)
+        |> json(%{message: "Your username has been changed to \"#{username}\"."})
     end
   end
 

lib/octocon_web/utils/systems.ex

@@ -10,8 +10,6 @@ defmodule OctoconWeb.Utils.Systems do
     Friendships
   }
 
-  @spec parse_system(Plug.Conn.t(), String.t()) ::
-          {:noreply, Plug.Conn.t()} | {:self, User.t()} | {:other, User.t()}
   def parse_system(conn, id)
 
   def parse_system(conn, "me") do