From 47ef3c186676b030b18908605e64311b1d2e1817 Mon Sep 17 00:00:00 2001
From: Filip Hoffmann <folosp@protonmail.com>
Date: Tue, 1 Jul 2025 11:51:50 +0200
Subject: [PATCH] fix errors

---
 src/grom/channel/thread.gleam       | 6 +++---
 src/grom/interaction.gleam          | 3 +--
 src/grom/interaction/resolved.gleam | 4 ++--
 src/grom/message.gleam              | 6 +++---
 src/grom/user/current_user.gleam    | 9 ++++++---
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/grom/channel/thread.gleam b/src/grom/channel/thread.gleam
index d1ad5bd..9007018 100644
--- a/src/grom/channel/thread.gleam
+++ b/src/grom/channel/thread.gleam
@@ -11,7 +11,7 @@ import gleam/time/duration.{type Duration}
 import gleam/time/timestamp.{type Timestamp}
 import grom/client.{type Client}
 import grom/error.{type Error}
-import grom/guild/member.{type Member as GuildMember}
+import grom/guild
 import grom/internal/flags
 import grom/internal/rest
 import grom/internal/time_duration
@@ -89,7 +89,7 @@ pub type Member {
     thread_id: Option(String),
     user_id: Option(String),
     join_timestamp: Timestamp,
-    guild_member: Option(GuildMember),
+    guild_member: Option(guild.Member),
   )
 }
 
@@ -220,7 +220,7 @@ pub fn member_decoder() -> decode.Decoder(Member) {
   use guild_member <- decode.optional_field(
     "member",
     None,
-    decode.optional(member.decoder()),
+    decode.optional(guild.member_decoder()),
   )
   decode.success(Member(thread_id:, user_id:, join_timestamp:, guild_member:))
 }
diff --git a/src/grom/interaction.gleam b/src/grom/interaction.gleam
index e18fd81..60625cb 100644
--- a/src/grom/interaction.gleam
+++ b/src/grom/interaction.gleam
@@ -4,7 +4,6 @@ import grom/application
 import grom/channel.{type Channel}
 import grom/entitlement.{type Entitlement}
 import grom/guild.{type Guild}
-import grom/guild/member.{type Member}
 import grom/interaction/application_command
 import grom/interaction/context_type.{type ContextType}
 import grom/interaction/resolved.{type Resolved}
@@ -23,7 +22,7 @@ pub type Interaction {
     guild_id: Option(String),
     channel: Option(Channel),
     channel_id: Option(String),
-    member: Option(Member),
+    member: Option(guild.Member),
     user: Option(User),
     token: String,
     version: Int,
diff --git a/src/grom/interaction/resolved.gleam b/src/grom/interaction/resolved.gleam
index 16ec30c..ad81955 100644
--- a/src/grom/interaction/resolved.gleam
+++ b/src/grom/interaction/resolved.gleam
@@ -1,6 +1,6 @@
 import gleam/option.{type Option}
 import grom/channel/thread
-import grom/guild/member.{type Member}
+import grom/guild
 import grom/guild/role.{type Role}
 import grom/message.{type Message}
 import grom/message/attachment.{type Attachment}
@@ -10,7 +10,7 @@ import grom/user.{type User}
 pub type Resolved {
   Resolved(
     users: Option(List(#(String, User))),
-    members: Option(List(#(String, Member))),
+    members: Option(List(#(String, guild.Member))),
     roles: Option(List(#(String, Role))),
     channels: Option(List(#(String, Channel))),
     messages: Option(List(#(String, Message))),
diff --git a/src/grom/message.gleam b/src/grom/message.gleam
index c2c4472..9871273 100644
--- a/src/grom/message.gleam
+++ b/src/grom/message.gleam
@@ -9,7 +9,7 @@ import grom/application.{type Application}
 import grom/channel/thread.{type Thread}
 import grom/client.{type Client}
 import grom/error.{type Error}
-import grom/guild/member.{type Member}
+import grom/guild
 import grom/guild/role.{type Role}
 import grom/internal/flags
 import grom/internal/rest
@@ -158,7 +158,7 @@ pub type Snapshot {
 pub type Resolved {
   Resolved(
     users: Option(Dict(String, User)),
-    members: Option(Dict(String, Member)),
+    members: Option(Dict(String, guild.Member)),
     roles: Option(Dict(String, Role)),
     channels: Option(Dict(String, ResolvedChannel)),
     messages: Option(Dict(String, Message)),
@@ -717,7 +717,7 @@ pub fn resolved_decoder() -> decode.Decoder(Resolved) {
   use members <- decode.optional_field(
     "members",
     None,
-    decode.optional(decode.dict(decode.string, member.decoder())),
+    decode.optional(decode.dict(decode.string, guild.member_decoder())),
   )
   use roles <- decode.optional_field(
     "roles",
diff --git a/src/grom/user/current_user.gleam b/src/grom/user/current_user.gleam
index 9874ee7..2f5d73f 100644
--- a/src/grom/user/current_user.gleam
+++ b/src/grom/user/current_user.gleam
@@ -9,7 +9,7 @@ import gleam/result
 import gleam/string
 import grom/client.{type Client}
 import grom/error.{type Error}
-import grom/guild/member.{type Member}
+import grom/guild
 import grom/image
 import grom/internal/rest
 import grom/user.{type User}
@@ -131,7 +131,10 @@ pub fn get_guilds(
   |> result.map_error(error.CouldNotDecode)
 }
 
-pub fn get_as_member(client: Client, guild_id: String) -> Result(Member, Error) {
+pub fn get_as_member(
+  client: Client,
+  guild_id: String,
+) -> Result(guild.Member, Error) {
   use response <- result.try(
     client
     |> rest.new_request(http.Get, "/users/@me/guilds/" <> guild_id <> "/member")
@@ -139,6 +142,6 @@ pub fn get_as_member(client: Client, guild_id: String) -> Result(Member, Error)
   )
 
   response.body
-  |> json.parse(using: member.decoder())
+  |> json.parse(using: guild.member_decoder())
   |> result.map_error(error.CouldNotDecode)
 }
-- 
2.51.2