changes from latest commits with some patches made

Author: krisppurg

dimscord/gateway.nim

@@ -716,6 +716,9 @@ proc startSession(s: Shard, url, query: string) {.async.} =
         if not getCurrentExceptionMsg()[0].isAlphaNumeric: return
         raise
 
+# todo: Make gateway intent compulsory, and add option of not containing
+# message content.
+# It will try to forcefully put message content intent if not specified.
 proc startSession*(discord: DiscordClient,
             autoreconnect = true;
             gateway_intents: set[GatewayIntent] = {

dimscord/helpers/channel.nim

@@ -1,13 +1,17 @@
 import asyncdispatch, options, json
 import ../objects, ../constants
 
+template startTyping*(c: SomeChannel) =
+    ## Starts typing in a specific Discord channel.
+    getClient.api.startTyping(c.id)
+
 template pin*(m: Message, reason = ""): Future[void] =
     ## Add pinned message.
-    getClient.api.addChannelMessagePin(m.channel_id, m.id, reason)
+    getClient.api.pinMessage(m.channel_id, m.id, reason)
 
 template unpin*(m: Message, reason = ""): Future[void] =
     ## Remove pinned message.
-    getClient.api.deleteChannelMessagePin(m.channel_id, m.id, reason)
+    getClient.api.unpinMessage(m.channel_id, m.id, reason)
 
 template getPins*(ch: SomeChannel): Future[seq[Message]] =
     ## Get channel pins.

dimscord/helpers/guild.nim

@@ -8,9 +8,10 @@ template beginPrune*(g: Guild;
     ## Begins a guild prune.
     getClient.api.beginGuildPrune(g.id, days, include_roles, compute_prune_count)
 
-template getPruneCount*(g: Guild; days: int): Future[int] =
+template getPruneCount*(g: Guild;
+        days: int, include_roles: seq[string] = @[]): Future[int] =
     ## Gets the prune count.
-    getClient.api.getGuildPruneCount(g.id, days)
+    getClient.api.getGuildPruneCount(g.id, days, include_roles)
 
 template editMFA*(g: Guild; lvl: MFALevel; reason = ""): Future[MFALevel] =
     ## Modify Guild MFA Level, requiring guild ownership.
@@ -24,11 +25,12 @@ template edit*(g: Guild;
         name, description, region, afk_channel_id, icon = none string;
         discovery_splash, owner_id, splash, banner = none string;
         system_channel_id, rules_channel_id = none string;
+        safety_alerts_channel_id = none string;
         preferred_locale, public_updates_channel_id = none string;
         verification_level, default_message_notifications = none int;
         system_channel_flags = none int;
         explicit_content_filter, afk_timeout = none int;
-        features: seq[string] = @[];
+        features = none seq[string];
         premium_progress_bar_enabled = none bool;
         reason = ""
 ): Future[Guild] =
@@ -42,6 +44,7 @@ template edit*(g: Guild;
     getClient.api.editGuild(
         g.id, name, description, region, afk_channel_id, icon,
         discovery_splash, owner_id, splash, banner,
+        safety_alerts_channel_id,
         system_channel_id, rules_channel_id,
         preferred_locale, public_updates_channel_id,
         verification_level, default_message_notifications,
@@ -57,25 +60,36 @@ template getAuditLogs*(g: Guild;
     ## Get guild audit logs. The maximum limit is 100.
     getClient.api.getGuildAuditLogs(g.id, user_id, before, action_type, limit)
 
+template createRole*(g: Guild,
+        name: string = "new role";
+        unicode_emoji, icon = none string;
+        hoist, mentionable: bool = false;
+        permissions: set[PermissionFlags] = {};
+        role_colors = none RoleColors;
+        color = 0; reason = ""): Future[Role] =
+    ## Creates role.
+    getClient.api.createGuildRole(g.id,
+        name, unicode_emoji, icon,
+        hoist, mentionable, permissions,
+        role_colors, color, reason) 
+
 template deleteRole*(g: Guild; r: Role): Future[void] =
     ## Deletes a guild role.
     getClient.api.deleteGuildRole(g.id, r.id)
 
 template editRole*(g: Guild; r: Role;
         name = none string;
+        permissions = none set[PermissionFlags];
         icon, unicode_emoji = none string;
-        permissions = none PermObj; color = none int;
+        colors = none RoleColors;
+        color = none int;
         hoist, mentionable = none bool;
         reason = ""
 ): Future[Role] =
     ## Modifies a guild role.
-    getClient.api.editGuildRole(
-        g.id, r.id,
-        name, icon, unicode_emoji,
-        permissions, color,
-        hoist, mentionable,
-        reason
-    )
+    getClient.api.editGuildRole(g.id, r.id,
+        name, permissions, icon, unicode_emoji,
+        colors, color, hoist, mentionable)
 
 template getInvites*(g: Guild): Future[seq[InviteMetadata]] =
     ## Gets guild invites.
@@ -112,10 +126,10 @@ template getBans*(g: Guild): Future[seq[GuildBan]] =
     ## Gets all the guild bans.
     getClient.api.getGuildBans(g.id)
 
-template ban*(g: Guild; m: Member; delete_msg_days: range[0..7] = 0;
+template ban*(g: Guild; m: Member; delete_message_seconds: range[0..604800] = 0;
         reason = ""): Future[void] =
     ## Creates a guild ban.
-    getClient.api.createGuildBan(g.id, m.user.id, delete_msg_days, reason)
+    getClient.api.createGuildBan(g.id, m.user.id, delete_message_seconds, reason)
 
 template bulkBan*(g: Guild;
         user_ids: seq[string];

dimscord/helpers/message.nim

@@ -28,19 +28,22 @@ template reply*(m: Message, content = "";
         attachments: seq[Attachment] = @[];
         components: seq[MessageComponent] = @[];
         files: seq[DiscordFile] = @[];
+        flags: set[MessageFlags] = {};
         stickers: seq[string] = @[];
         allowed_mentions = none AllowedMentions;
         nonce: Option[string] or Option[int] = none(int);
         mention, failifnotexists, tts = false): Future[Message] =
     ## Replies to a Message.
     ## - set `mention` to `true` in order to mention the replied message in Discord.
+    var refr = block:
+        (if mention: some m.reference else: none MessageReference)
     getClient.api.sendMessage(
         m.channel_id,
-        content, tts, nonce,
-        files, embeds, attachments,
-        allowed_mentions, 
-        (if mention: some m.reference else: none MessageReference),
-        components, stickers
+        content=content, tts=tts, nonce=nonce,
+        flags=flags, files=files, embeds=embeds,
+        allowed_mentions=allowed_mentions, 
+        message_reference = refr, components=components,
+        attachments=attachments, stickers=stickers
     )
 
 template editMessage*(c: SomeChannel, m: Message;
@@ -66,13 +69,14 @@ template edit*(m: Message;
         components: seq[MessageComponent] = @[];
         files: seq[DiscordFile] = @[];
         tts = false;
-        flags = none int): Future[Message]  =
+        flags = none set[MessageFlags]): Future[Message]  =
     ## Edits a Message.
     getClient.api.editMessage(
         m.channel_id, m.id,
-        content, tts, flags,
-        files, embeds, attachments,
-        components
+        content=content, tts=tts,
+        flags=flags,
+        files=files, embeds=embeds, attachments=attachments,
+        components=components
     )
 
 template delete*(m: Message; reason = ""): Future[void] =

dimscord/restapi/channel.nim

@@ -3,7 +3,7 @@ import ../objects, ../constants, ../helpers
 import sequtils, requester
 
 proc startTyping*(api: RestApi, channel_id: string) {.async.} =
-    ## Alias of triggerTypingIndicator
+    ## Starts typing in a specific Discord channel.
     discard await api.request("POST", endpointTriggerTyping(channel_id))
 
 proc pinMessage*(api: RestApi,
@@ -241,10 +241,9 @@ proc editGuildChannelPositions*(api: RestApi, guild_id, channel_id: string;
     payload.add %*{
         "id": channel_id,
         "position": %position,
-        "parent_id": %parent_id,
         "lock_permissions": lock_permissions
     }
-    payload.loadNullableOptStr(parent_id)
+    payload.loadOpt(parent_id)
     discard await api.request(
         "PATCH",
         endpointGuildChannels(guild_id),

dimscord/restapi/guild.nim

@@ -389,7 +389,6 @@ proc editGuildIntegration*(api: RestApi, guild_id, integ_id: string;
     let payload = newJObject()
 
     payload.loadOpt(expire_behavior, expire_grace_period, enable_emoticons)
-    payload.loadNullableOptInt(expire_behavior, expire_grace_period)
 
     discard await api.request(
         "PATCH",
@@ -424,7 +423,6 @@ proc editGuildWidget*(api: RestApi, guild_id: string,
     let payload = newJObject()
 
     payload.loadOpt(enabled, channel_id)
-    payload.loadNullableOptStr(channel_id)
 
     result = (await api.request(
         "PATCH",
@@ -579,7 +577,7 @@ proc editGuildTemplate*(api: RestApi;
         name, description = none string): Future[GuildTemplate] {.async.} =
     ## Modify a guild template.
     let payload = newJObject()
-    payload.loadNullableOptStr(description)
+    payload.loadOpt(description)
     if name.isSome: payload["name"] = %name
     result = (await api.request(
         "PATCH", endpointGuildTemplates(gid=guild_id,tid=code)
@@ -606,8 +604,7 @@ proc editUserVoiceState*(api: RestApi,
         assert request_to_speak_timestamp.isNone
 
     let payload = %*{"channel_id":channel_id}
-    payload.loadNullableOptStr(channel_id, request_to_speak_timestamp)
-    payload.loadOpt(suppress)
+    payload.loadOpt(channel_id, request_to_speak_timestamp, suppress)
 
     discard await api.request(
         "PATCH", endpointGuildVoiceStatesUser(guild_id, user_id),
@@ -637,8 +634,7 @@ proc editGuildWelcomeScreen*(api: RestApi, guild_id: string;
             welcome_channels: seq[WelcomeChannel]
     ]] {.async.} =
     let payload = newJObject()
-    payload.loadOpt(enabled)
-    payload.loadNullableOptStr(description)
+    payload.loadOpt(enabled, description)
 
     if welcome_channels.isSome and welcome_channels.get.len == 0:
         payload["welcome_channels"] = newJNull()
@@ -766,7 +762,7 @@ proc editGuildSticker*(api: RestApi, guild_id, sticker_id: string;
         assert tags.get.len in 2..200
     if description.isSome:
         assert description.get.len in 2..100
-    payload.loadNullableOptStr(name, description, tags)
+    payload.loadOpt(name, description, tags)
     result = (await api.request(
         "PATCH",
         endpointGuildStickers(guild_id, sticker_id),

dimscord/restapi/user.nim

@@ -1,7 +1,7 @@
 import asyncdispatch, json, options, jsony, httpclient
 import ../objects, ../constants
 import tables, sequtils, strutils
-import requester, base64
+import requester
 
 proc getInvite*(api: RestApi, code: string;
         with_counts, with_expiration = false;
@@ -44,7 +44,7 @@ proc editCurrentMember*(api: RestApi, guild_id: string;
     ## Modify current member.
     ## `nick` - some "" to reset nick.
     let payload = newJObject()
-    payload.loadNullableOptStr(nick)
+    payload.loadOpt(nick)
     discard await api.request(
         "PATCH",
         endpointGuildMembers(guild_id, "@me"),
@@ -131,7 +131,6 @@ proc editCurrentUser*(api: RestApi,
     let payload = newJObject()
 
     payload.loadOpt(username, avatar)
-    payload.loadNullableOptStr(avatar)
 
     result = (await api.request("PATCH", endpointUsers(), $payload)).newUser