Skip to content

Commit

Permalink
fix(*): add Endpoints constants and format
Browse files Browse the repository at this point in the history
  • Loading branch information
SpaceEEC committed Jun 17, 2018
1 parent d9c6a50 commit 6be3115
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
9 changes: 5 additions & 4 deletions lib/rest.ex
Original file line number Diff line number Diff line change
Expand Up @@ -1732,7 +1732,8 @@ defmodule Crux.Rest do
For more informations see [Discord Docs](https://discordapp.com/developers/docs/resources/user#get-user).
"""
@spec get_user(user :: Util.user_id_resolvable() | String.t()) :: {:ok, User.t()} | {:error, term()}
@spec get_user(user :: Util.user_id_resolvable() | String.t()) ::
{:ok, User.t()} | {:error, term()}
def get_user(user) do
Rest.Base.queue(:get, Endpoints.users(user))
|> create(User)
Expand Down Expand Up @@ -1781,7 +1782,7 @@ defmodule Crux.Rest do
@spec get_current_user_guilds(data :: get_current_user_guild_data()) ::
{:ok, [Guild.t()]} | {:error, term()}
def get_current_user_guilds(data) do
Rest.Base.queue(:get, Endpoints.me("guilds"), Map.new(data))
Rest.Base.queue(:get, Endpoints.me_guilds(), Map.new(data))
|> create(Guild)
end

Expand All @@ -1794,7 +1795,7 @@ defmodule Crux.Rest do
def leave_guild(guild) do
guild_id = Util.resolve_guild_id(guild)

Rest.Base.queue(:delete, Endpoints.me("guilds", guild_id))
Rest.Base.queue(:delete, Endpoints.me_guilds(guild_id))
end

@doc """
Expand All @@ -1817,7 +1818,7 @@ defmodule Crux.Rest do
def create_dm(user) do
user_id = Util.resolve_user_id(user)

Rest.Base.queue(:post, Endpoints.user_channels(), %{recipient_id: user_id})
Rest.Base.queue(:post, Endpoints.me("channels"), %{recipient_id: user_id})
|> create(Channel)
end

Expand Down
10 changes: 9 additions & 1 deletion lib/rest/endpoints.ex
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,14 @@ defmodule Crux.Rest.Endpoints do
@spec guild_own_nick(guild_id :: Crux.Rest.snowflake()) :: String.t()
def guild_own_nick(guild_id), do: "#{guild_members(guild_id, "@me")}/nick"

@doc """
Used for functions related to users.
"""
@spec users(suffix :: String.t()) :: String.t()
def users(suffix \\ nil)
def users(nil), do: "/users/"
def users(suffix), do: "#{users()}/#{suffix}"

@doc """
Used for functions related to the current user.
"""
Expand All @@ -178,5 +186,5 @@ defmodule Crux.Rest.Endpoints do
@spec me_guilds(suffix :: String.t()) :: String.t()
def me_guilds(suffix \\ nil)
def me_guilds(nil), do: "#{me()}/guilds"
def me_guilds(suffix), do: "#{me_guilds()}/suffix"
def me_guilds(suffix), do: "#{me_guilds()}/#{suffix}"
end

0 comments on commit 6be3115

Please sign in to comment.