Merge branch 'main' of https://github.com/octocondev/octocon

Author: atlas-oc

lib/nosedrum/converters.ex

@@ -11,7 +11,7 @@ defmodule Nosedrum.Converters do
 
   alias Nostrum.Error.ApiError
   alias Nostrum.Snowflake
-  alias Nostrum.Struct.Guild.{Member, Role}
+  alias Nostrum.Struct.Guild.Role
   alias Nostrum.Struct.{Channel, Guild}
 
   @typedoc """

lib/octocon/workers/simply_plural_import_worker.ex

@@ -449,5 +449,5 @@ defmodule Octocon.Workers.SimplyPluralImportWorker do
   defp parse_color("#" <> _ = color) when byte_size(color) == 7, do: color
   defp parse_color(color) when byte_size(color) == 6, do: color
   defp parse_color(color) when color == "", do: nil
-  defp parse_color(nil), do: nil
+  defp parse_color(_color), do: nil
 end

lib/octocon_discord/guild_cache.ex

@@ -67,7 +67,6 @@ defmodule OctoconDiscord.GuildCache do
 
   @impl GuildCache
   @doc "Get a guild from the cache."
-  @spec get(Guild.id()) :: {:ok, Guild.t()} | {:error, :not_found}
   def get(guild_id) do
     :mnesia.activity(:sync_transaction, fn ->
       case :mnesia.read(table(), guild_id) do
@@ -78,8 +77,6 @@ defmodule OctoconDiscord.GuildCache do
   end
 
   @impl GuildCache
-  @doc since: "0.10.0"
-  @spec all() :: Enumerable.t(Guild.t())
   def all do
     ms = [{{:_, :_, :"$1"}, [], [:"$1"]}]
 
@@ -102,7 +99,6 @@ defmodule OctoconDiscord.GuildCache do
 
   @impl GuildCache
   @doc "Create a guild from upstream data."
-  @spec create(map()) :: Guild.t()
   def create(payload) do
     guild = Guild.to_struct(payload) |> strip_guild()
     record = {record_name(), guild.id, guild}
@@ -135,7 +131,6 @@ defmodule OctoconDiscord.GuildCache do
 
   @impl GuildCache
   @doc "Remove the given guild from the cache."
-  @spec delete(Guild.id()) :: Guild.t() | nil
   def delete(guild_id) do
     :mnesia.activity(:sync_transaction, fn ->
       case :mnesia.read(table(), guild_id, :write) do
@@ -151,7 +146,6 @@ defmodule OctoconDiscord.GuildCache do
 
   @impl GuildCache
   @doc "Create the given channel for the given guild in the cache."
-  @spec channel_create(Guild.id(), map()) :: Channel.t()
   def channel_create(guild_id, channel) do
     new_channel = Channel.to_struct(channel) |> Map.take([:id, :type, :parent_id])
 
@@ -165,7 +159,6 @@ defmodule OctoconDiscord.GuildCache do
 
   @impl GuildCache
   @doc "Delete the channel from the given guild in the cache."
-  @spec channel_delete(Guild.id(), Channel.id()) :: Channel.t() | :noop
   def channel_delete(guild_id, channel_id) do
     old_channel =
       update_guild!(guild_id, fn guild ->
@@ -178,7 +171,6 @@ defmodule OctoconDiscord.GuildCache do
 
   @doc "Update the channel on the given guild in the cache."
   @impl GuildCache
-  @spec channel_update(Guild.id(), map()) :: {Channel.t() | nil, Channel.t()}
   def channel_update(guild_id, channel) do
     update_guild!(guild_id, fn guild ->
       {old, new, new_channels} =
@@ -190,23 +182,20 @@ defmodule OctoconDiscord.GuildCache do
 
   @impl GuildCache
   @doc "Update the emoji list for the given guild in the cache."
-  @spec emoji_update(Guild.id(), [map()]) :: {[Emoji.t()], [Emoji.t()]}
   def emoji_update(_guild_id, payload) do
     casted = Util.cast(payload, {:list, {:struct, Emoji}})
     {[], casted}
   end
 
   @impl GuildCache
   @doc "Update the sticker list for the given guild in the cache."
-  @spec stickers_update(Guild.id(), [map()]) :: {[Sticker.t()], [Sticker.t()]}
   def stickers_update(_guild_id, stickers) do
     casted = Util.cast(stickers, {:list, {:struct, Sticker}})
     {[], casted}
   end
 
   @impl GuildCache
   @doc "Create the given role in the given guild in the cache."
-  @spec role_create(Guild.id(), map()) :: {Guild.id(), Role.t()}
   def role_create(guild_id, payload) do
     update_guild!(guild_id, fn guild ->
       permissions = payload.permissions |> String.to_integer()
@@ -218,7 +207,6 @@ defmodule OctoconDiscord.GuildCache do
 
   @doc "Delete the given role from the given guild in the cache."
   @impl GuildCache
-  @spec role_delete(Guild.id(), Role.id()) :: {Guild.id(), Role.t()} | :noop
   def role_delete(guild_id, role_id) do
     update_guild!(guild_id, fn guild ->
       {popped, new_roles} = Map.pop(guild.roles, role_id)
@@ -229,7 +217,6 @@ defmodule OctoconDiscord.GuildCache do
 
   @impl GuildCache
   @doc "Update the given role in the given guild in the cache."
-  @spec role_update(Guild.id(), map()) :: {Guild.id(), Role.t() | nil, Role.t()}
   def role_update(guild_id, role) do
     update_guild!(guild_id, fn guild ->
       permissions = role.permissions |> String.to_integer()
@@ -242,15 +229,12 @@ defmodule OctoconDiscord.GuildCache do
 
   @impl GuildCache
   @doc "Update guild voice states with the given voice state in the cache."
-  @spec voice_state_update(Guild.id(), map()) :: {Guild.id(), [map()]}
   def voice_state_update(guild_id, _payload) do
     {guild_id, []}
   end
 
   @doc "Increment the guild member count by one."
-  @doc since: "0.7.0"
   @impl GuildCache
-  @spec member_count_up(Guild.id()) :: true
   def member_count_up(guild_id) do
     # May not be `update_guild!` for the case where guild intent is off.
     update_guild(guild_id, fn guild ->
@@ -261,9 +245,7 @@ defmodule OctoconDiscord.GuildCache do
   end
 
   @doc "Decrement the guild member count by one."
-  @doc since: "0.7.0"
   @impl GuildCache
-  @spec member_count_down(Guild.id()) :: true
   def member_count_down(guild_id) do
     # May not be `update_guild!` for the case where guild intent is off.
     update_guild(guild_id, fn guild ->
@@ -312,25 +294,31 @@ defmodule OctoconDiscord.GuildCache do
          channels: channels
        }) do
     channels =
-      channels
-      |> Enum.map(fn {id, channel} ->
-        {id, if(channel == nil, do: nil, else: Map.take(channel, [:id, :type, :parent_id]))}
-      end)
-      |> Map.new()
+      if channels == nil do
+        nil
+      else
+        channels
+        |> Enum.map(fn {id, channel} -> {id, Map.take(channel, [:id, :type, :parent_id])} end)
+        |> Map.new()
+      end
 
     threads =
-      threads
-      |> Enum.map(fn {id, thread} ->
-        {id, if(thread == nil, do: nil, else: Map.take(thread, [:id, :type, :parent_id]))}
-      end)
-      |> Map.new()
+      if threads == nil do
+        nil
+      else
+        threads
+        |> Enum.map(fn {id, thread} -> {id, Map.take(thread, [:id, :type, :parent_id])} end)
+        |> Map.new()
+      end
 
     roles =
-      roles
-      |> Enum.map(fn {id, role} ->
-        {id, if(role == nil, do: nil, else: Map.take(role, [:id, :permissions]))}
-      end)
-      |> Map.new()
+      if roles == nil do
+        nil
+      else
+        roles
+        |> Enum.map(fn {id, role} -> {id, Map.take(role, [:id, :permissions])} end)
+        |> Map.new()
+      end
 
     %{
       id: id,

lib/octocon_discord/proxy.ex

@@ -290,7 +290,11 @@ defmodule OctoconDiscord.Proxy do
                     }
 
                   true ->
-                    nil
+                    %{
+                      filename: filename,
+                      content_type: attachment.content_type,
+                      title: attachment.title
+                    }
                 end
 
               {:ok, {file_data, attachment_data}}

lib/octocon_web/controllers/system/alter_controller.ex

@@ -123,34 +123,42 @@ defmodule OctoconWeb.System.AlterController do
       |> put_status(:bad_request)
       |> json(%{error: "No valid alter attributes provided.", code: "no_alter_attributes"})
     else
-      # if Map.has_key?(attrs, :alias) do
-      #   if Alters.alias_taken?({:system, system_id}, attrs.alias) do
-      #     conn
-      #     |> put_status(:bad_request)
-      #     |> json(%{error: "That alias is already taken.", code: "alias_taken"})
-      #   else
-      #   end
-      # end
-
-      case Alters.update_alter({:system, system_id}, {:id, id}, attrs) do
-        :ok ->
-          send_resp(conn, :no_content, "")
+      if Map.has_key?(attrs, :alias) and attrs.alias != nil and
+           Alters.alias_taken?({:system, system_id}, attrs.alias) do
+        {:ok, alter} = Alters.get_alter_by_id({:system, system_id}, {:id, id})
 
-        {:error, :changeset} ->
+        if alter != nil and alter.alias != attrs.alias do
           conn
           |> put_status(:bad_request)
-          |> json(%{error: "Invalid alter attributes.", code: "invalid_alter_attributes"})
+          |> json(%{error: "That alias is already taken.", code: "alias_taken"})
+        else
+          update_alter_internal(conn, system_id, id, attrs)
+        end
+      else
+        update_alter_internal(conn, system_id, id, attrs)
+      end
+    end
+  end
 
-        {:error, :no_alter_id} ->
-          conn
-          |> put_status(:not_found)
-          |> json(%{error: "Alter not found.", code: "alter_not_found"})
+  defp update_alter_internal(conn, system_id, id, attrs) do
+    case Alters.update_alter({:system, system_id}, {:id, id}, attrs) do
+      :ok ->
+        send_resp(conn, :no_content, "")
 
-        _ ->
-          conn
-          |> put_status(:internal_server_error)
-          |> json(%{error: "An unknown error occurred.", code: "unknown_error"})
-      end
+      {:error, :changeset} ->
+        conn
+        |> put_status(:bad_request)
+        |> json(%{error: "Invalid alter attributes.", code: "invalid_alter_attributes"})
+
+      {:error, :no_alter_id} ->
+        conn
+        |> put_status(:not_found)
+        |> json(%{error: "Alter not found.", code: "alter_not_found"})
+
+      _ ->
+        conn
+        |> put_status(:internal_server_error)
+        |> json(%{error: "An unknown error occurred.", code: "unknown_error"})
     end
   end