convert all to snowflakes

Cyteon · Jul 24, 2024 · c3051a9 · c3051a9
1 parent b3b3c92
commit c3051a9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 14 deletions.
diff --git a/src/discord_gleam/ws/packets/message.gleam b/src/discord_gleam/ws/packets/message.gleam
@@ -1,18 +1,19 @@
+import discord_gleam/discord/snowflake.{type Snowflake}
 import gleam/dynamic
 import gleam/json
 import gleam/result
 
 pub type MessageAuthor {
-  MessageAuthor(id: String, username: String)
+  MessageAuthor(id: Snowflake, username: String)
 }
 
 pub type MessagePacketData {
   MessagePacketData(
     content: String,
-    guild_id: String,
-    channel_id: String,
-    author: MessageAuthor,
     id: String,
+    guild_id: Snowflake,
+    channel_id: Snowflake,
+    author: MessageAuthor,
   )
 }
 
@@ -32,17 +33,17 @@ pub fn string_to_data(encoded: String) -> Result(MessagePacket, String) {
         of: dynamic.decode5(
           MessagePacketData,
           dynamic.field("content", of: dynamic.string),
-          dynamic.field("guild_id", of: dynamic.string),
-          dynamic.field("channel_id", of: dynamic.string),
+          dynamic.field("id", of: snowflake.from_dynamic),
+          dynamic.field("guild_id", of: snowflake.from_dynamic),
+          dynamic.field("channel_id", of: snowflake.from_dynamic),
           dynamic.field(
             "author",
             of: dynamic.decode2(
               MessageAuthor,
-              dynamic.field("id", of: dynamic.string),
+              dynamic.field("id", of: snowflake.from_dynamic),
               dynamic.field("username", of: dynamic.string),
             ),
           ),
-          dynamic.field("id", of: dynamic.string),
         ),
       ),
     )

diff --git a/src/discord_gleam/ws/packets/message_delete.gleam b/src/discord_gleam/ws/packets/message_delete.gleam
@@ -1,9 +1,14 @@
+import discord_gleam/discord/snowflake.{type Snowflake}
 import gleam/dynamic
 import gleam/json
 import gleam/result
 
 pub type MessageDeletePacketData {
-  MessageDeletePacketData(id: String, guild_id: String, channel_id: String)
+  MessageDeletePacketData(
+    id: Snowflake,
+    guild_id: Snowflake,
+    channel_id: Snowflake,
+  )
 }
 
 pub type MessageDeletePacket {
@@ -21,9 +26,9 @@ pub fn string_to_data(encoded: String) -> Result(MessageDeletePacket, String) {
         "d",
         of: dynamic.decode3(
           MessageDeletePacketData,
-          dynamic.field("id", of: dynamic.string),
-          dynamic.field("guild_id", of: dynamic.string),
-          dynamic.field("channel_id", of: dynamic.string),
+          dynamic.field("id", of: snowflake.from_dynamic),
+          dynamic.field("guild_id", of: snowflake.from_dynamic),
+          dynamic.field("channel_id", of: snowflake.from_dynamic),
         ),
       ),
     )

diff --git a/src/discord_gleam/ws/packets/ready.gleam b/src/discord_gleam/ws/packets/ready.gleam
@@ -1,10 +1,11 @@
+import discord_gleam/discord/snowflake.{type Snowflake}
 import gleam/dynamic
 import gleam/json
 import gleam/result
 import logging
 
 pub type ReadyUser {
-  ReadyUser(username: String, id: String, discriminator: String, bot: Bool)
+  ReadyUser(username: String, id: Snowflake, discriminator: String, bot: Bool)
 }
 
 pub type ReadyData {
@@ -32,7 +33,7 @@ pub fn string_to_data(encoded: String) -> Result(ReadyPacket, String) {
             of: dynamic.decode4(
               ReadyUser,
               dynamic.field("username", of: dynamic.string),
-              dynamic.field("id", of: dynamic.string),
+              dynamic.field("id", of: snowflake.from_dynamic),
               dynamic.field("discriminator", of: dynamic.string),
               dynamic.field("bot", of: dynamic.bool),
             ),