From f09b740814f3c2fe753755aa8f92ba78dd01bb77 Mon Sep 17 00:00:00 2001 From: Filip Hoffmann Date: Sat, 19 Jul 2025 17:14:54 +0200 Subject: [PATCH] move client.gleam to grom.gleam --- src/{grom/client.gleam => grom.gleam} | 0 src/grom/application.gleam | 14 +++--- .../application/current_application.gleam | 6 +-- .../role_connection_metadata.gleam | 6 +-- src/grom/channel.gleam | 24 +++++----- src/grom/channel/forum.gleam | 4 +- src/grom/channel/media.gleam | 4 +- src/grom/channel/permission_overwrite.gleam | 8 ++-- src/grom/channel/thread.gleam | 20 ++++----- src/grom/entitlement.gleam | 10 ++--- src/grom/guild.gleam | 44 +++++++++---------- src/grom/guild/audit_log.gleam | 4 +- src/grom/guild/auto_moderation.gleam | 10 ++--- src/grom/guild/role.gleam | 10 ++--- src/grom/guild_member.gleam | 16 +++---- src/grom/internal/rest.gleam | 8 ++-- src/grom/invite.gleam | 6 +-- src/grom/message.gleam | 6 +-- src/grom/user/current_user.gleam | 10 ++--- test/grom_test.gleam | 6 +-- 20 files changed, 108 insertions(+), 108 deletions(-) rename src/{grom/client.gleam => grom.gleam} (100%) diff --git a/src/grom/client.gleam b/src/grom.gleam similarity index 100% rename from src/grom/client.gleam rename to src/grom.gleam diff --git a/src/grom/application.gleam b/src/grom/application.gleam index 1e500ea..600b66c 100644 --- a/src/grom/application.gleam +++ b/src/grom/application.gleam @@ -9,8 +9,8 @@ import gleam/option.{type Option, None} import gleam/result import gleam/set.{type Set} import gleam/string +import grom import grom/application/team.{type Team} -import grom/client.{type Client} import grom/emoji.{type Emoji} import grom/entitlement.{type Entitlement} import grom/error.{type Error} @@ -372,7 +372,7 @@ pub fn event_webhook_status_encode( // PUBLIC API FUNCTIONS -------------------------------------------------------- pub fn get_emojis( - client: Client, + client: grom.Client, for application_id: String, ) -> Result(List(Emoji), Error) { use response <- result.try( @@ -390,7 +390,7 @@ pub fn get_emojis( } pub fn get_emoji( - client: Client, + client: grom.Client, for application_id: String, id emoji_id: String, ) -> Result(Emoji, Error) { @@ -409,7 +409,7 @@ pub fn get_emoji( } pub fn create_emoji( - client: Client, + client: grom.Client, for application_id: String, named name: String, bytes image: image.Data, @@ -436,7 +436,7 @@ pub fn create_emoji( } pub fn rename_emoji( - client: Client, + client: grom.Client, for application_id: String, id emoji_id: String, to name: String, @@ -459,7 +459,7 @@ pub fn rename_emoji( } pub fn delete_emoji( - client: Client, + client: grom.Client, from application_id: String, id emoji_id: String, ) -> Result(Nil, Error) { @@ -476,7 +476,7 @@ pub fn delete_emoji( } pub fn get_entitlements( - client: Client, + client: grom.Client, for application_id: String, with query: Set(GetEntitlementsQuery), ) -> Result(List(Entitlement), Error) { diff --git a/src/grom/application/current_application.gleam b/src/grom/application/current_application.gleam index e2774ec..1fa54b2 100644 --- a/src/grom/application/current_application.gleam +++ b/src/grom/application/current_application.gleam @@ -5,8 +5,8 @@ import gleam/json.{type Json} import gleam/list import gleam/option.{type Option, None, Some} import gleam/result +import grom import grom/application.{type Application} -import grom/client.{type Client} import grom/error import grom/image import grom/internal/flags @@ -146,7 +146,7 @@ fn modify_encode(modify: Modify) -> Json { // PUBLIC API FUNCTIONS -------------------------------------------------------- -pub fn get(client: Client) -> Result(Application, error.Error) { +pub fn get(client: grom.Client) -> Result(Application, error.Error) { use response <- result.try( client |> rest.new_request(http.Get, "/applications/@me") @@ -159,7 +159,7 @@ pub fn get(client: Client) -> Result(Application, error.Error) { } pub fn modify( - client: Client, + client: grom.Client, with modify: Modify, ) -> Result(Application, error.Error) { let json = modify |> modify_encode diff --git a/src/grom/application/role_connection_metadata.gleam b/src/grom/application/role_connection_metadata.gleam index 75565fd..16e95cd 100644 --- a/src/grom/application/role_connection_metadata.gleam +++ b/src/grom/application/role_connection_metadata.gleam @@ -7,7 +7,7 @@ import gleam/json.{type Json} import gleam/list import gleam/option.{type Option, None, Some} import gleam/result -import grom/client.{type Client} +import grom import grom/error import grom/internal/rest @@ -132,7 +132,7 @@ fn type_encode(type_: Type) -> Json { // PUBLIC API FUNCTIONS -------------------------------------------------------- pub fn get( - client: Client, + client: grom.Client, application_id: String, ) -> Result(List(RoleConnectionMetadata), error.Error) { use response <- result.try( @@ -150,7 +150,7 @@ pub fn get( } pub fn modify( - client: Client, + client: grom.Client, application_id: String, new metadata: List(RoleConnectionMetadata), ) -> Result(List(RoleConnectionMetadata), error.Error) { diff --git a/src/grom/channel.gleam b/src/grom/channel.gleam index 3ca23d8..7f621af 100644 --- a/src/grom/channel.gleam +++ b/src/grom/channel.gleam @@ -8,11 +8,11 @@ import gleam/option.{type Option, None, Some} import gleam/result import gleam/time/duration.{type Duration} import gleam/time/timestamp.{type Timestamp} +import grom import grom/channel/forum import grom/channel/media import grom/channel/permission_overwrite.{type PermissionOverwrite} import grom/channel/thread.{type Thread} -import grom/client.{type Client} import grom/error.{type Error} import grom/internal/flags import grom/internal/rest @@ -1943,7 +1943,7 @@ pub fn create_media_to_json(create_media: CreateMedia) -> Json { // PUBLIC API FUNCTIONS -------------------------------------------------------- -pub fn get(client: Client, id channel_id: String) -> Result(Channel, Error) { +pub fn get(client: grom.Client, id channel_id: String) -> Result(Channel, Error) { use response <- result.try( client |> rest.new_request(http.Get, "/channels/" <> channel_id) @@ -1956,7 +1956,7 @@ pub fn get(client: Client, id channel_id: String) -> Result(Channel, Error) { } pub fn modify( - client: Client, + client: grom.Client, id channel_id: String, with modify: Modify, because reason: Option(String), @@ -2392,7 +2392,7 @@ pub fn modify_thread_applied_tags_ids( } pub fn delete( - client: Client, + client: grom.Client, id channel_id: String, because reason: Option(String), ) -> Result(Channel, Error) { @@ -2409,7 +2409,7 @@ pub fn delete( } pub fn announcement_follow( - client: Client, + client: grom.Client, from channel_id: String, to webhook_channel_id: String, because reason: Option(String), @@ -2431,7 +2431,7 @@ pub fn announcement_follow( } pub fn trigger_typing_indicator( - client: Client, + client: grom.Client, in channel_id: String, ) -> Result(Nil, Error) { use _response <- result.try( @@ -2445,7 +2445,7 @@ pub fn trigger_typing_indicator( // TODO: add pagination stuff!! pub fn get_pinned_messages( - client: Client, + client: grom.Client, in channel_id: String, ) -> Result(List(Message), Error) { use response <- result.try( @@ -2463,7 +2463,7 @@ pub fn get_pinned_messages( } pub fn get_public_archived_threads( - client: Client, + client: grom.Client, in channel_id: String, earlier_than before: Option(Timestamp), maximum limit: Option(Int), @@ -2498,7 +2498,7 @@ pub fn get_public_archived_threads( } pub fn get_private_archived_threads( - client: Client, + client: grom.Client, in channel_id: String, earlier_than before: Option(Timestamp), maximum limit: Option(Int), @@ -2533,7 +2533,7 @@ pub fn get_private_archived_threads( } pub fn get_joined_private_archived_threads( - client: Client, + client: grom.Client, in channel_id: String, earlier_than before: Option(Timestamp), maximum limit: Option(Int), @@ -2568,7 +2568,7 @@ pub fn get_joined_private_archived_threads( } pub fn get_all_from_guild( - client: Client, + client: grom.Client, id guild_id: String, ) -> Result(List(Channel), Error) { use response <- result.try( @@ -2584,7 +2584,7 @@ pub fn get_all_from_guild( /// `because` has no effect if creating a DM channel. pub fn create( - client: Client, + client: grom.Client, using create: Create, because reason: Option(String), ) -> Result(Channel, Error) { diff --git a/src/grom/channel/forum.gleam b/src/grom/channel/forum.gleam index e1db9ff..38ae456 100644 --- a/src/grom/channel/forum.gleam +++ b/src/grom/channel/forum.gleam @@ -7,8 +7,8 @@ import gleam/list import gleam/option.{type Option, None, Some} import gleam/result import gleam/time/duration.{type Duration} +import grom import grom/channel/thread.{type Thread} -import grom/client.{type Client} import grom/error.{type Error} import grom/file.{type File} import grom/internal/flags @@ -279,7 +279,7 @@ pub fn start_thread_message_to_json(message: StartThreadMessage) -> Json { // PUBLIC API FUNCTIONS -------------------------------------------------------- pub fn start_thread( - client: Client, + client: grom.Client, in channel_id: String, with start_thread: StartThread, because reason: Option(String), diff --git a/src/grom/channel/media.gleam b/src/grom/channel/media.gleam index e3fb9b8..e7f6324 100644 --- a/src/grom/channel/media.gleam +++ b/src/grom/channel/media.gleam @@ -1,9 +1,9 @@ import gleam/int import gleam/option.{type Option} import gleam/time/duration.{type Duration} +import grom import grom/channel/forum import grom/channel/thread.{type Thread} -import grom/client.{type Client} import grom/error.{type Error} import grom/file.{type File} import grom/message/allowed_mentions.{type AllowedMentions} @@ -40,7 +40,7 @@ pub fn bits_flags() -> List(#(Int, Flag)) { // PUBLIC API FUNCTIONS -------------------------------------------------------- pub fn start_thread( - client: Client, + client: grom.Client, in channel_id: String, with start_thread: StartThread, because reason: Option(String), diff --git a/src/grom/channel/permission_overwrite.gleam b/src/grom/channel/permission_overwrite.gleam index 1f80048..b8be383 100644 --- a/src/grom/channel/permission_overwrite.gleam +++ b/src/grom/channel/permission_overwrite.gleam @@ -4,7 +4,7 @@ import gleam/http/request import gleam/json.{type Json} import gleam/option.{type Option} import gleam/result -import grom/client.{type Client} +import grom import grom/error.{type Error} import grom/internal/rest import grom/permission.{type Permission} @@ -76,8 +76,8 @@ pub fn type_to_json(type_: Type) -> Json { // PUBLIC API FUNCTIONS -------------------------------------------------------- -pub fn edit( - client: Client, +pub fn modify( + client: grom.Client, for channel_id: String, id overwrite_id: String, new overwrite: Create, @@ -100,7 +100,7 @@ pub fn edit( } pub fn delete( - client: Client, + client: grom.Client, for channel_id: String, id overwrite_id: String, because reason: Option(String), diff --git a/src/grom/channel/thread.gleam b/src/grom/channel/thread.gleam index 0729192..72805fb 100644 --- a/src/grom/channel/thread.gleam +++ b/src/grom/channel/thread.gleam @@ -9,7 +9,7 @@ import gleam/option.{type Option, None, Some} import gleam/result import gleam/time/duration.{type Duration} import gleam/time/timestamp.{type Timestamp} -import grom/client.{type Client} +import grom import grom/error.{type Error} import grom/guild_member.{type GuildMember} import grom/internal/flags @@ -371,7 +371,7 @@ pub fn start_without_message_encode( // PUBLIC API FUNCTIONS -------------------------------------------------------- pub fn modify( - client: Client, + client: grom.Client, id channel_id: String, with modify: Modify, because reason: Option(String), @@ -449,7 +449,7 @@ pub fn modify_applied_tags_ids( } pub fn start_from_message( - client: Client, + client: grom.Client, in channel_id: String, from message_id: String, with start_from_message: StartFromMessage, @@ -496,7 +496,7 @@ pub fn start_from_message_with_rate_limit_per_user( } pub fn start_without_message( - client: Client, + client: grom.Client, in channel_id: String, with start_without_message: StartWithoutMessage, reason reason: Option(String), @@ -557,7 +557,7 @@ pub fn start_without_message_with_rate_limit_per_user( StartWithoutMessage(..start_without_message, rate_limit_per_user: Some(limit)) } -pub fn join(client: Client, id thread_id: String) -> Result(Nil, Error) { +pub fn join(client: grom.Client, id thread_id: String) -> Result(Nil, Error) { use _response <- result.try( client |> rest.new_request( @@ -571,7 +571,7 @@ pub fn join(client: Client, id thread_id: String) -> Result(Nil, Error) { } pub fn add_member( - client: Client, + client: grom.Client, to thread_id: String, id user_id: String, ) -> Result(Nil, Error) { @@ -587,7 +587,7 @@ pub fn add_member( Ok(Nil) } -pub fn leave(client: Client, id thread_id: String) -> Result(Nil, Error) { +pub fn leave(client: grom.Client, id thread_id: String) -> Result(Nil, Error) { use _response <- result.try( client |> rest.new_request( @@ -601,7 +601,7 @@ pub fn leave(client: Client, id thread_id: String) -> Result(Nil, Error) { } pub fn remove_member( - client: Client, + client: grom.Client, from thread_id: String, id user_id: String, ) -> Result(Nil, Error) { @@ -618,7 +618,7 @@ pub fn remove_member( } pub fn get_member( - client: Client, + client: grom.Client, from thread_id: String, id user_id: String, with_guild_member with_guild_member: Bool, @@ -639,7 +639,7 @@ pub fn get_member( } pub fn get_members( - client: Client, + client: grom.Client, from thread_id: String, with_guild_member with_guild_member: Bool, older_than_id after: Option(String), diff --git a/src/grom/entitlement.gleam b/src/grom/entitlement.gleam index 660a346..cd6665d 100644 --- a/src/grom/entitlement.gleam +++ b/src/grom/entitlement.gleam @@ -10,7 +10,7 @@ import gleam/json.{type Json} import gleam/option.{type Option, None} import gleam/result import gleam/time/timestamp.{type Timestamp} -import grom/client.{type Client} +import grom import grom/error.{type Error} import grom/internal/rest import grom/internal/time_rfc3339 @@ -125,7 +125,7 @@ pub fn owner_type_to_json(owner_type: OwnerType) -> Json { // PUBLIC API FUNCTIONS -------------------------------------------------------- pub fn get( - client: Client, + client: grom.Client, for application_id: String, id entitlement_id: String, ) -> Result(Entitlement, Error) { @@ -144,7 +144,7 @@ pub fn get( } pub fn consume( - client: Client, + client: grom.Client, for application_id: String, id entitlement_id: String, ) -> Result(Nil, Error) { @@ -165,7 +165,7 @@ pub fn consume( } pub fn create_test( - client: Client, + client: grom.Client, for application_id: String, sku sku_id: String, to owner_id: String, @@ -194,7 +194,7 @@ pub fn create_test( } pub fn delete_test( - client: Client, + client: grom.Client, for application_id: String, id entitlement_id: String, ) -> Result(Nil, Error) { diff --git a/src/grom/guild.gleam b/src/grom/guild.gleam index ccc18fb..3527636 100644 --- a/src/grom/guild.gleam +++ b/src/grom/guild.gleam @@ -9,8 +9,8 @@ import gleam/option.{type Option, None, Some} import gleam/result import gleam/time/duration.{type Duration} import gleam/time/timestamp.{type Timestamp} +import grom import grom/channel/thread.{type Thread} -import grom/client.{type Client} import grom/emoji.{type Emoji} import grom/error.{type Error} import grom/guild/auto_moderation @@ -970,7 +970,7 @@ pub fn role_to_move_to_json(role_to_move: RoleToMove) -> Json { /// `get_counts`: Whether to get the `approximate_member_count` and `approximate_presence_count` pub fn get( - client: Client, + client: grom.Client, id guild_id: String, get_counts with_counts: Bool, ) -> Result(Guild, Error) { @@ -989,7 +989,7 @@ pub fn get( } pub fn get_preview( - client: Client, + client: grom.Client, for guild_id: String, ) -> Result(Preview, Error) { use response <- result.try( @@ -1004,7 +1004,7 @@ pub fn get_preview( } pub fn modify( - client: Client, + client: grom.Client, id guild_id: String, with modify: Modify, because reason: Option(String), @@ -1170,7 +1170,7 @@ pub fn modify_safety_alerts_channel_id( Modify(..modify, safety_alerts_channel_id:) } -pub fn leave(client: Client, id guild_id: String) -> Result(Nil, Error) { +pub fn leave(client: grom.Client, id guild_id: String) -> Result(Nil, Error) { use _response <- result.try( client |> rest.new_request(http.Delete, "/users/@me/guilds/" <> guild_id) @@ -1181,7 +1181,7 @@ pub fn leave(client: Client, id guild_id: String) -> Result(Nil, Error) { } pub fn get_auto_moderation_rules( - client: Client, + client: grom.Client, for guild_id: String, ) -> Result(List(auto_moderation.Rule), Error) { use response <- result.try( @@ -1199,7 +1199,7 @@ pub fn get_auto_moderation_rules( } pub fn get_emojis( - client: Client, + client: grom.Client, for guild_id: String, ) -> Result(List(Emoji), Error) { use response <- result.try( @@ -1214,7 +1214,7 @@ pub fn get_emojis( } pub fn get_emoji( - client: Client, + client: grom.Client, in guild_id: String, id emoji_id: String, ) -> Result(Emoji, Error) { @@ -1233,7 +1233,7 @@ pub fn get_emoji( } pub fn create_emoji( - client: Client, + client: grom.Client, in guild_id: String, named name: String, bytes image: image.Data, @@ -1261,7 +1261,7 @@ pub fn create_emoji( } pub fn modify_emoji( - client: Client, + client: grom.Client, in guild_id: String, id emoji_id: String, rename name: Option(String), @@ -1296,7 +1296,7 @@ pub fn modify_emoji( } pub fn delete_emoji( - client: Client, + client: grom.Client, from guild_id: String, id emoji_id: String, because reason: Option(String), @@ -1314,7 +1314,7 @@ pub fn delete_emoji( Ok(Nil) } -pub fn delete(client: Client, id guild_id: String) -> Result(Nil, Error) { +pub fn delete(client: grom.Client, id guild_id: String) -> Result(Nil, Error) { use _response <- result.try( client |> rest.new_request(http.Delete, "/guilds/" <> guild_id) @@ -1325,7 +1325,7 @@ pub fn delete(client: Client, id guild_id: String) -> Result(Nil, Error) { } pub fn get_active_threads( - client: Client, + client: grom.Client, in guild_id: String, ) -> Result(ReceivedThreads, Error) { use response <- result.try( @@ -1342,7 +1342,7 @@ pub fn get_active_threads( /// If `maximum` is not provided, a default of `1` will be used. /// See: https://discord.com/developers/docs/resources/guild#list-guild-members pub fn get_members( - client: Client, + client: grom.Client, for guild_id: String, maximum limit: Option(Int), later_than_id after: Option(String), @@ -1373,7 +1373,7 @@ pub fn get_members( } pub fn search_for_members( - client: Client, + client: grom.Client, in guild_id: String, named query_param: String, maximum limit: Option(Int), @@ -1402,7 +1402,7 @@ pub fn search_for_members( /// See: https://discord.com/developers/docs/resources/guild#get-guild-bans pub fn get_bans( - client: Client, + client: grom.Client, for guild_id: String, maximum limit: Option(Int), earlier_than_id before: Option(String), @@ -1435,7 +1435,7 @@ pub fn get_bans( } pub fn get_ban( - client: Client, + client: grom.Client, from guild_id: String, for user_id: String, ) -> Result(Ban, Error) { @@ -1451,7 +1451,7 @@ pub fn get_ban( } pub fn create_ban( - client: Client, + client: grom.Client, in guild_id: String, for user_id: String, delete_messages_since delete_message_duration: Option(Duration), @@ -1482,7 +1482,7 @@ pub fn create_ban( } pub fn remove_ban( - client: Client, + client: grom.Client, in guild_id: String, from user_id: String, because reason: Option(String), @@ -1501,7 +1501,7 @@ pub fn remove_ban( } pub fn bulk_ban( - client: Client, + client: grom.Client, in guild_id: String, users user_ids: List(String), delete_messages_since delete_message_duration: Option(Duration), @@ -1538,7 +1538,7 @@ pub fn bulk_ban( } pub fn get_roles( - client: Client, + client: grom.Client, for guild_id: String, ) -> Result(List(Role), Error) { use response <- result.try( @@ -1554,7 +1554,7 @@ pub fn get_roles( /// Returns a list of all of the guild's roles. pub fn move_roles( - client: Client, + client: grom.Client, in guild_id: String, roles roles: List(RoleToMove), because reason: Option(String), diff --git a/src/grom/guild/audit_log.gleam b/src/grom/guild/audit_log.gleam index 8302ad4..c10ef2d 100644 --- a/src/grom/guild/audit_log.gleam +++ b/src/grom/guild/audit_log.gleam @@ -5,8 +5,8 @@ import gleam/int import gleam/json import gleam/result import gleam/set.{type Set} +import grom import grom/channel.{type Channel} -import grom/client.{type Client} import grom/error.{type Error} import grom/guild/audit_log/entry.{type Entry} import grom/guild/auto_moderation @@ -115,7 +115,7 @@ pub fn partial_user_decoder() -> decode.Decoder(PartialUser) { // PUBLIC API FUNCTIONS -------------------------------------------------------- pub fn get( - client: Client, + client: grom.Client, for guild_id: String, with query: Set(GetQuery), ) -> Result(AuditLog, Error) { diff --git a/src/grom/guild/auto_moderation.gleam b/src/grom/guild/auto_moderation.gleam index 3e704cf..8fffa49 100644 --- a/src/grom/guild/auto_moderation.gleam +++ b/src/grom/guild/auto_moderation.gleam @@ -6,7 +6,7 @@ import gleam/list import gleam/option.{type Option, None, Some} import gleam/result import gleam/time/duration.{type Duration} -import grom/client.{type Client} +import grom import grom/error.{type Error} import grom/internal/rest import grom/internal/time_duration @@ -392,7 +392,7 @@ pub fn modify_rule_to_json(modify_rule: ModifyRule) -> Json { // PUBLIC API FUNCTIONS -------------------------------------------------------- pub fn get_rule( - client: Client, + client: grom.Client, from guild_id: String, id rule_id: String, ) -> Result(Rule, Error) { @@ -411,7 +411,7 @@ pub fn get_rule( } pub fn create_rule( - client: Client, + client: grom.Client, in guild_id: String, with create_rule: CreateRule, because reason: Option(String), @@ -465,7 +465,7 @@ pub fn create_rule_with_exempt_channels( } pub fn modify_rule( - client: Client, + client: grom.Client, in guild_id: String, id rule_id: String, with modify_rule: ModifyRule, @@ -530,7 +530,7 @@ pub fn exempt_channels_from_rule( } pub fn delete_rule( - client: Client, + client: grom.Client, from guild_id: String, id rule_id: String, because reason: Option(String), diff --git a/src/grom/guild/role.gleam b/src/grom/guild/role.gleam index 87fb9fb..7c6c332 100644 --- a/src/grom/guild/role.gleam +++ b/src/grom/guild/role.gleam @@ -6,7 +6,7 @@ import gleam/json.{type Json} import gleam/list import gleam/option.{type Option, None, Some} import gleam/result -import grom/client.{type Client} +import grom import grom/error.{type Error} import grom/image import grom/internal/flags @@ -258,7 +258,7 @@ pub fn modify_to_json(modify: Modify) -> Json { // PUBLIC API FUNCTIONS -------------------------------------------------------- pub fn get( - client: Client, + client: grom.Client, for guild_id: String, id role_id: String, ) -> Result(Role, Error) { @@ -277,7 +277,7 @@ pub fn get( } pub fn create( - client: Client, + client: grom.Client, in guild_id: String, using create: Create, because reason: Option(String), @@ -318,7 +318,7 @@ pub fn new_create() -> Create { } pub fn modify( - client: Client, + client: grom.Client, in guild_id: String, id role_id: String, using modify: Modify, @@ -368,7 +368,7 @@ pub fn new_modify() -> Modify { } pub fn delete( - client: Client, + client: grom.Client, from guild_id: String, id role_id: String, because reason: Option(String), diff --git a/src/grom/guild_member.gleam b/src/grom/guild_member.gleam index 4d18837..91a2784 100644 --- a/src/grom/guild_member.gleam +++ b/src/grom/guild_member.gleam @@ -7,7 +7,7 @@ import gleam/list import gleam/option.{type Option, None, Some} import gleam/result import gleam/time/timestamp.{type Timestamp} -import grom/client.{type Client} +import grom import grom/error.{type Error} import grom/internal/flags import grom/internal/rest @@ -207,7 +207,7 @@ pub fn modify_to_json(modify: Modify) -> Json { // PUBLIC API FUNCTIONS -------------------------------------------------------- pub fn get( - client: Client, + client: grom.Client, for guild_id: String, id user_id: String, ) -> Result(GuildMember, Error) { @@ -226,7 +226,7 @@ pub fn get( } pub fn modify( - client: Client, + client: grom.Client, in guild_id: String, id user_id: String, with modify: Modify, @@ -254,7 +254,7 @@ pub fn modify( } pub fn set_current_nick( - client: Client, + client: grom.Client, in guild_id: String, to nick: Modification(String), because reason: Option(String), @@ -279,7 +279,7 @@ pub fn set_current_nick( } pub fn add_role( - client: Client, + client: grom.Client, in guild_id: String, to user_id: String, id role_id: String, @@ -299,7 +299,7 @@ pub fn add_role( } pub fn remove_role( - client: Client, + client: grom.Client, in guild_id: String, from user_id: String, id role_id: String, @@ -319,7 +319,7 @@ pub fn remove_role( } pub fn remove( - client: Client, + client: grom.Client, from guild_id: String, id user_id: String, because reason: Option(String), @@ -338,7 +338,7 @@ pub fn remove( } pub fn kick( - client: Client, + client: grom.Client, from guild_id: String, id user_id: String, because reason: Option(String), diff --git a/src/grom/internal/rest.gleam b/src/grom/internal/rest.gleam index 1cd8ee3..8a78303 100644 --- a/src/grom/internal/rest.gleam +++ b/src/grom/internal/rest.gleam @@ -8,7 +8,7 @@ import gleam/json.{type Json} import gleam/list import gleam/option.{type Option, None, Some} import gleam/result -import grom/client.{type Client} +import grom import grom/error.{type Error} import grom/file.{type File} import multipart_form @@ -58,7 +58,7 @@ pub fn execute_multipart( @internal pub fn new_request( - client: Client, + client: grom.Client, method: http.Method, path: String, ) -> Request(String) { @@ -70,14 +70,14 @@ pub fn new_request( |> request.prepend_header("authorization", "Bot " <> client.token) |> request.prepend_header( "user-agent", - "DiscordBot (https://github.com/folospior/grom, " <> client.version() <> ")", + "DiscordBot (https://github.com/folospior/grom, " <> grom.version() <> ")", ) |> request.prepend_header("content-type", "application/json") } @internal pub fn new_multipart_request( - client: Client, + client: grom.Client, method: http.Method, path: String, payload_json: Json, diff --git a/src/grom/invite.gleam b/src/grom/invite.gleam index 36f927a..942144f 100644 --- a/src/grom/invite.gleam +++ b/src/grom/invite.gleam @@ -6,9 +6,9 @@ import gleam/option.{type Option, None} import gleam/result import gleam/time/duration.{type Duration} import gleam/time/timestamp.{type Timestamp} +import grom import grom/application.{type Application} import grom/channel.{type Channel} -import grom/client.{type Client} import grom/error.{type Error} import grom/guild.{type Guild} import grom/internal/rest @@ -286,7 +286,7 @@ pub fn create_encode(create: Create) -> Json { // PUBLIC API FUNCTIONS -------------------------------------------------------- pub fn get_many( - client: Client, + client: grom.Client, for channel_id: String, ) -> Result(List(WithMetadata), Error) { use response <- result.try( @@ -301,7 +301,7 @@ pub fn get_many( } pub fn create( - client: Client, + client: grom.Client, for channel_id: String, with create: Create, reason reason: Option(String), diff --git a/src/grom/message.gleam b/src/grom/message.gleam index a48e53a..e6c1074 100644 --- a/src/grom/message.gleam +++ b/src/grom/message.gleam @@ -5,9 +5,9 @@ import gleam/int import gleam/option.{type Option, None} import gleam/result import gleam/time/timestamp.{type Timestamp} +import grom import grom/application.{type Application} import grom/channel/thread.{type Thread} -import grom/client.{type Client} import grom/error.{type Error} import grom/guild/role.{type Role} import grom/guild_member.{type GuildMember} @@ -753,7 +753,7 @@ pub fn resolved_decoder() -> decode.Decoder(Resolved) { // PUBLIC API FUNCTIONS -------------------------------------------------------- pub fn pin( - client: Client, + client: grom.Client, in channel_id: String, id message_id: String, reason reason: Option(String), @@ -772,7 +772,7 @@ pub fn pin( } pub fn unpin( - client: Client, + client: grom.Client, from channel_id: String, id message_id: String, reason reason: Option(String), diff --git a/src/grom/user/current_user.gleam b/src/grom/user/current_user.gleam index 3232aa5..567f639 100644 --- a/src/grom/user/current_user.gleam +++ b/src/grom/user/current_user.gleam @@ -7,7 +7,7 @@ import gleam/list import gleam/option.{type Option, None, Some} import gleam/result import gleam/string -import grom/client.{type Client} +import grom import grom/error.{type Error} import grom/guild_member.{type GuildMember} import grom/image @@ -58,7 +58,7 @@ pub fn modify_encode(modify: Modify) -> Json { // PUBLIC API FUNCTIONS -------------------------------------------------------- -pub fn get(client: Client) -> Result(User, Error) { +pub fn get(client: grom.Client) -> Result(User, Error) { use response <- result.try( client |> rest.new_request(http.Get, "/users/@me") @@ -70,7 +70,7 @@ pub fn get(client: Client) -> Result(User, Error) { |> result.map_error(error.CouldNotDecode) } -pub fn modify(client: Client, with data: Modify) -> Result(User, Error) { +pub fn modify(client: grom.Client, with data: Modify) -> Result(User, Error) { let json = data |> modify_encode use response <- result.try( client @@ -101,7 +101,7 @@ pub fn modify_banner(modify: Modify, banner: image.Data) -> Modify { } pub fn get_guilds( - client: Client, + client: grom.Client, with query: List(GetGuildsQuery), ) -> Result(User, Error) { let query = @@ -132,7 +132,7 @@ pub fn get_guilds( } pub fn get_as_member( - client: Client, + client: grom.Client, guild_id: String, ) -> Result(GuildMember, Error) { use response <- result.try( diff --git a/test/grom_test.gleam b/test/grom_test.gleam index 69b7920..d81198b 100644 --- a/test/grom_test.gleam +++ b/test/grom_test.gleam @@ -3,7 +3,7 @@ import gleam/http/request import gleam/json import gleeunit import gleeunit/should -import grom/client +import grom import grom/file.{File} import grom/internal/rest import grom/user/current_user @@ -22,7 +22,7 @@ pub fn encode_modify_current_test() { pub fn multipart_request_test() { let expected = - rest.new_request(client.Client("token"), http.Post, "/") + rest.new_request(grom.Client("token"), http.Post, "/") |> request.set_body(<< "--gleam_multipart_form\r\n":utf8, "Content-Disposition: form-data; name=\"payload_json\"\r\n":utf8, @@ -42,7 +42,7 @@ pub fn multipart_request_test() { let result = rest.new_multipart_request( - client.Client("token"), + grom.Client("token"), http.Post, "/", json.object([]), -- 2.51.2