File upload support and some patches being made

Author: krisppurg

dimscord/constants.nim

@@ -414,10 +414,11 @@ type
         acotNumber          = 10 ## A double
         acotAttachment      = 11
     ApplicationCommandType* = enum
-        atNothing  = 0 ## Should never appear
-        atSlash    = 1 ## CHAT_INPUT
-        atUser         ## USER
-        atMessage      ## MESSAGE
+        atNothing  = 0      ## Should never appear
+        atSlash    = 1      ## CHAT_INPUT
+        atUser              ## USER
+        atMessage           ## MESSAGE
+        atPrimaryEntryPoint ## PRIMARY_ENTRY_POINT
     ApplicationCommandPermissionType* = enum
         acptRole    = 1
         acptUser    = 2
@@ -502,6 +503,7 @@ type
         mctSeparator         = 14
         mctContainer         = 17
         mctLabel             = 18
+        mctFileUpload        = 19
     StickerType* = enum
         stUnknown
         stStandard = 1

dimscord/gateway.nim

@@ -724,7 +724,7 @@ proc startSession*(discord: DiscordClient,
             max_message_size = 5_000_000;
             gateway_version = 10;
             max_shards = none int; shard_id = 0;
-            cache_users, cache_guilds, guild_subscriptions = true;
+            cache_users, cache_guilds = true;
             cache_guild_channels, cache_dm_channels = true) {.async.} =
     ## Connects the client to Discord via gateway.
     ##
@@ -751,14 +751,6 @@ proc startSession*(discord: DiscordClient,
 
     discord.largeThreshold = large_threshold
 
-    if guild_subscriptions:
-        log("Warning: guild_subscriptions is deprecated.")
-        discord.intents = discord.intents + {
-            giGuildMessageTyping,
-            giDirectMessageTyping,
-            giGuildPresences
-        }
-        discord.guildSubscriptions = true
 
     discord.max_shards = max_shards.get(-1)
     discord.gatewayVersion = gateway_version

dimscord/helpers.nim

@@ -150,19 +150,30 @@ proc `$`*(u: User): string =
 proc `@`*(u: User, nick = false): string =
     ## Mentions a user.
     let n = if nick: "!" else: ""
-    result = &"<@{n}{u.id}>"
+    &"<@{n}{u.id}>"
 
 proc `@`*(r: Role): string =
     ## Mentions a role.
-    result = &"<@&{r.id}>"
+    &"<@&{r.id}>"
 
 proc `@`*(g: GuildChannel): string =
     ## Mentions a guild channel.
-    result = &"<#{g.id}>"
+    &"<#{g.id}>"
 
 proc `@`*(a: ApplicationCommand): string =
     ## Mentions a slash command.
-    result = &"</{a.name}:{a.id}>"
+    &"</{a.name}:{a.id}>"
+
+proc `@`*(e: Emoji): string =
+    ## Mentions emoji
+    &"<{$e}>"
+
+proc `>`*(e: string): Emoji =
+    ## Converts string to Emoji
+    ## "something:123" -> `Emoji(id: "123", name: "something")`
+    var elems = e.split(":")
+    Emoji(name: some elems[0],
+          id: if elems.len > 1: some elems[1] else: none string)
 
 proc `$`*(g: GuildChannel): string =
     ## Stringifies a guild channel.

dimscord/helpers/message.nim

@@ -75,7 +75,7 @@ template delete*(msgs: seq[Message]; reason = ""): Future[void] =
     getClient.api.bulkDeleteMessages(msgs[0].channel_id, msgs)
 
 template getMessages*(ch: SomeChannel;
-        around, before, after = "";
+        around = "", before = "", after = "";
         limit: range[1..100] = 50): Future[seq[Message]] =
     ## Gets channel messages.
     getClient.api.getChannelMessages(

dimscord/helpers/user.nim

@@ -54,9 +54,11 @@ template getCommand*(app: Application;
         app.id, guild_id, command_id
     )
 
-template registerCommand*(app: Application; name: string;
-        description, guild_id = "";
-        name_localizations,description_localizations=none Table[string,string];
+template registerCommand*(
+        app: Application | User | Shard | DiscordClient;
+        name: string; description = "", guild_id = "";
+        name_localizations =none Table[string,string];
+        description_localizations=none Table[string,string];
         kind = atSlash; nsfw = false;
         default_member_permissions = none set[PermissionFlags];
         options: seq[ApplicationCommandOption] = @[];
@@ -72,6 +74,16 @@ template registerCommand*(app: Application; name: string;
     ## **NOTE:** Creating a command with the same name
     ## as an existing command for your application will
     ## overwrite the old command.
+    var id = block:
+        when app is Application or app is User:
+            app.id
+        when app is Shard:
+            assert app.user != nil
+            app.user.id
+        when app is DiscordClient:
+            assert app.shards[0].user != nil
+            app.shards[0].user.id
+    
     getClient.api.registerApplicationCommand(
         app.id, name,
         description, guild_id,

dimscord/objects.nim

@@ -415,6 +415,14 @@ proc postHook(p: var Presence) =
     if p.client_status.mobile == "":
         p.client_status.mobile = "offline"
 
+proc postHook(m: var Message) =
+    if m.member.isSome:
+        if m.member.get.user == nil and m.author != nil:
+            m.member.get.user = m.author
+            m.member.get.presence.user = m.author
+        if m.member.get.presence.guild_id == "":
+            m.member.get.presence.guild_id = m.guild_id.get
+
 proc parseHook*(s: string, i: var int, v: var OverwriteType) =
     var data: JsonNode
     parseHook(s, i, data)
@@ -437,7 +445,9 @@ proc newHook(m: var Member) =
     )
 
 proc postHook(m: var Member) =
-    m.presence.user = m.user
+    if m.user != nil: m.presence.user = m.user
+    if m.presence.guild_id == "" and m.guild_id != "":
+        m.presence.guild_id = m.guild_id
 
 proc parseHook(s: string, i: var int, v: var Table[string, Overwrite]) =
     var overwrites: seq[Overwrite]
@@ -854,39 +864,31 @@ proc parseHook(s: string, n: var int, a: var ApplicationCommandInteractionData)
                 kind: ($data["type"]).fromJson(ApplicationCommandType)
             )
 
-            a.resolved=ApplicationCommandResolution(kind: a.kind)
-            if "resolved" in data:
-                for key, values in data["resolved"].getFields.pairs:
-                    case key:
-                    of "users":
-                        for k, v in values.pairs:
-                            a.resolved.users[k] = v.newUser
-                    of "attachments":
-                        for k, v in values.pairs:
-                            a.resolved.attachments[k] = v.newAttachment
-                    else: discard
-
-                    if a.kind == atUser:
-                        case key:
-                        of "members":
-                            for k, v in values.pairs:
-                                a.resolved.members[k] = v.newMember
-                        of "roles":
-                            for k, v in values.pairs:
-                                a.resolved.roles[k] = v.newRole
-                        else: discard
-
-                    if a.kind == atMessage:
-                        case key:
-                        of "channels":
-                            for k, v in values.pairs:
-                                a.resolved.channels[k] = ($v).fromJson(
-                                    ResolvedChannel
-                                )
-                        of "messages":
-                            for k, v in values.pairs:
-                                a.resolved.messages[k] = v.newMessage
-                        else: discard
+        a.resolved=ResolvedData()
+        if "resolved" in data:
+            for key, values in data["resolved"].getFields.pairs:
+                case key:
+                of "users":
+                    for k, v in values.pairs:
+                        a.resolved.users[k] = v.newUser
+                of "attachments":
+                    for k, v in values.pairs:
+                        a.resolved.attachments[k] = v.newAttachment
+                of "members":
+                    for k, v in values.pairs:
+                        a.resolved.members[k] = v.newMember
+                of "roles":
+                    for k, v in values.pairs:
+                        a.resolved.roles[k] = v.newRole
+                of "channels":
+                    for k, v in values.pairs:
+                        a.resolved.channels[k] = ($v).fromJson(
+                            ResolvedChannel
+                        )
+                of "messages":
+                    for k, v in values.pairs:
+                        a.resolved.messages[k] = v.newMessage
+                else: discard
 
     for k, val in data.pairs:
         case val.kind:
@@ -948,7 +950,8 @@ proc `%%*`*(a: ApplicationCommand): JsonNode =
     # This ternary is needed so that the enums can stay similar to
     # the discord api
 
-    # <TODO> PLEASE CLEAN UP THE CODE
+    # <TODO> PLEASE CLEAN UP THE CODE -> im postponing this cause ibr code cleanup is for later
+    # if anyone cares enough to read this :<
 
     let commandKind = if a.kind == atNothing: atSlash else: a.kind
     result = %*{
@@ -1074,29 +1077,28 @@ proc `%%*`*(comp: MessageComponent): JsonNode =
     # I thought I'd just keep it as it is and make a `%` that would redirect the proc.
     result = %*{"type": comp.kind.ord}
 
-    result.loadOpts(comp, spoiler, placeholder, disabled, id, label, description)
+    result.loadOpts(comp, spoiler, placeholder,
+        disabled, id, label, description,
+        custom_id, min_values, max_values, required)
+
     case comp.kind:
-    of mctNone: discard
+    of mctNone, mctFileUpload: discard
     of mctActionRow, mctContainer:
         result["components"] = %comp.components.mapIt(%%*it)
         result.loadOpts(comp, accent_color)
     of mctButton:
         result &= %*{"style": comp.style.ord}
 
-        result.loadOpts(comp, custom_id, url, sku_id)
+        result.loadOpts(comp, url, sku_id)
         if comp.emoji.isSome:
             result["emoji"]     = comp.emoji.get.toPartial
     of mctSelectMenu, mctUserSelect, mctRoleSelect, mctMentionableSelect, mctChannelSelect:
-        result &= %*{"custom_id":   comp.custom_id.get,
-                    "options":     comp.options,
+        result &= %*{"options":     comp.options,
                     "placeholder": comp.placeholder,
-                    "min_values":  comp.minValues,
-                    "max_values":  comp.maxValues,
                     "channel_types": comp.channel_types.mapIt(it.ord),
                     "default_values": comp.default_values.mapIt(%it)}
     of mctTextInput:
-        result &= %*{"custom_id":   comp.custom_id.get,
-                     "placeholder": comp.placeholder,
+        result &= %*{"placeholder": comp.placeholder,
                      "style":       ord comp.input_style.get}
 
         result.loadOpts(comp, value, required, min_length, max_length)

dimscord/objects/typedefs.nim

@@ -746,21 +746,21 @@ type
         version*: int
         entitlements*: seq[Entitlement]
         authorizing_integration_owners*: Table[string, JsonNode]
-        context*: Option[ApplicationIntegrationType]
+        context*: Option[InteractionContextType]
         attachment_size_limit*: int
     ApplicationCommandInteractionData* = ref object
         ## - `options` A Table consisting of the option name and the respective option object.
+        resolved*: ResolvedData
         case interaction_type*: InteractionDataType
         of idtApplicationCommand:
             id*, name*: string
             guild_id*: Option[string]
-            resolved*: ApplicationCommandResolution
             case kind*: ApplicationCommandType
             of atSlash:
                 options*: Table[string, ApplicationCommandInteractionDataOption]
             of atUser, atMessage:
                 target_id*: string
-            of atNothing: discard
+            of atNothing, atPrimaryEntryPoint: discard
         of idtMessageComponent, idtModalSubmit:
             case component_type*: MessageComponentType:
             of mctSelectMenu, mctUserSelect, mctRoleSelect, mctMentionableSelect, mctChannelSelect:
@@ -783,17 +783,6 @@ type
         roles*: Table[string, Role]
         channels*: Table[string, ResolvedChannel]
         messages*: Table[string, Message]
-    ApplicationCommandResolution* = object
-        users*: Table[string, User]
-        attachments*: Table[string, Attachment]
-        case kind*: ApplicationCommandType
-        of atUser:
-            members*: Table[string, Member]
-            roles*: Table[string, Role]
-        of atMessage:
-            channels*: Table[string, ResolvedChannel]
-            messages*: Table[string, Message]
-        else: discard
     ApplicationCommandInteractionDataOption* = object
         name*: string
         case kind*: ApplicationCommandOptionType
@@ -935,6 +924,8 @@ type
         label*: Option[string]
         description*: Option[string]
         components*: seq[MessageComponent]
+        min_values*, max_values*: Option[int]
+        required*: Option[bool]
         case kind*: MessageComponentType
         of mctNone: discard
         of mctActionRow, mctContainer:
@@ -947,11 +938,9 @@ type
             default_values*: seq[tuple[id, kind: string]]
             options*: seq[SelectMenuOption]
             channel_types*: seq[ChannelType]
-            min_values*, max_values*: Option[int]
         of mctTextInput:
             input_style*: Option[TextInputStyle]
             value*: Option[string]
-            required*: Option[bool]
             min_length*, max_length*: Option[int]
         of mctThumbnail:
             media*: UnfurledMediaItem
@@ -971,6 +960,8 @@ type
             content*: string
         of mctLabel:
             component*: MessageComponent
+        of mctFileUpload:
+            discard
     GuildPreview* = object
         id*, name*: string
         system_channel_flags*: set[SystemChannelFlags]
@@ -1227,7 +1218,6 @@ proc dm*(c: CacheTable, obj: ref object | object | string): DMChannel =
             compiles(obj.channel_id),
             "channel_id field does not exist in " & $typeof(obj)
         )
-    
         when obj.channel_id is Option[string]: 
             assert obj.channel_id.isSome, $typeof(obj) & ".channel_id is none!"
             c.dmchannels[obj.channel_id.get]
@@ -1258,6 +1248,26 @@ proc `$`*(a: Attachment): string =
 proc `$`*(a: ref object): string =
     $a[]
 
+template guild*(o: (object | ref object | tuple)): Guild =
+    ## Get guild from object via cache.
+    when declared(s) and s is Shard:
+        s.cache.guild(o)
+    else:
+        {.error: "Cannot find Shard, the arg value must be referred to as 's' which represents Shard".}
+
+template gchannel*(o: (object | ref object | tuple)): GuildChannel =
+    ## Get guild channel from object via cache
+    when declared(s) and s is Shard:
+        s.cache.gchannel(o)
+    else:
+        {.error: "Cannot find Shard, the arg value must be referred to as 's' which represents Shard".}
+
+template dm*(o: (object | ref object | tuple)): DmChannel =
+    when declared(s) and s is Shard:
+        s.cache.dm(o)
+    else:
+        {.error: "Cannot find Shard, the arg value must be referred to as 's' which represents Shard".}
+
 proc getCurrentDiscordHttpError*(): DiscordHttpError =
     ## Use this proc instead of getCurrentException() for advanced details.
     let err = getCurrentException()