Permission changes and changes to the rest api procs. (Draft commit)

Author: krisppurg

dimscord/constants.nim

@@ -140,11 +140,17 @@ type
         ufDiscordCertifiedModerator,
         ufBotHttpInteractions
         ufActiveDeveloper      = 22
-    GuildMemberFlags* = enum
-        gmfDidRejoin
-        gmfCompletedOnboarding
-        gmfBypassesVerification
-        gmfStartedOnboarding
+    MemberFlags* = enum
+        mfDidRejoin,
+        mfCompletedOnboarding,
+        mfBypassesVerification,
+        mfStartedOnboarding,
+        mfIsGuest,
+        mfStartedHomeActions,
+        mfCompletedHomeActions,
+        mfAutomodQuarantinedUsername = 7,
+        mfDmSettingsUpsellAcknowledged = 9,
+        mfAutomodQuarantinedGuildTag
     SystemChannelFlags* = enum
         scfSuppressJoinNotifications,
         scfSuppressPremiumSubscriptions,
@@ -376,6 +382,9 @@ type
         aleOnboardingUpdate                   = 167
         aleHomeSettingsCreate                 = 190
         aleHomeSettingsUpdate                 = 191
+    OverwriteType* = enum
+        otRole   = 0
+        otMember = 1
     TeamMembershipState* = enum
         tmsInvited =  1 # not to be confused with "The Mysterious Song" lol
         tmsAccepted = 2
@@ -513,7 +522,8 @@ type
         rrwSaturday  = 5
         rrwSunday    = 6
     RecurrenceRuleMonth* = enum
-        rrmJanuary    = 1,
+        rrmNone       = 0
+        rrmJanuary    = 1
         rrmFebruary   = 2
         rrmMarch      = 3
         rrmApril      = 4
@@ -565,6 +575,7 @@ type
         etPremiumPurchase,
         etApplicationSubscription
     SkuType* = enum
+        stNone = 0 # this is so useless
         stDurable           = 2
         stConsumable        = 3
         stSubscription      = 5
@@ -650,7 +661,7 @@ const
         permAddReactions,
         permViewChannel,
         permSendMessages,
-        permSendTTSMessage,
+        permSendTtsMessage,
         permManageMessages,
         permEmbedLinks,
         permAttachFiles,
@@ -673,7 +684,7 @@ const
         permUseExternalStickers,
         permUseExternalEmojis,
         permReadMessageHistory,
-        permSendTTSMessage,
+        permSendTtsMessage,
         permAddReactions,
         permManageWebhooks,
         permUseSlashCommands,
@@ -685,7 +696,7 @@ const
         permVoiceMuteMembers,
         permVoiceDeafenMembers,
         permVoiceMoveMembers,
-        permUseVAD,
+        permUseVad,
         permUseSoundboard,
         permUseExternalSounds,
         permStartEmbeddedActivities,
@@ -700,7 +711,7 @@ const
         permReadMessageHistory,
         permAddReactions,
         permManageChannels,
-        permSendTTSMessage,
+        permSendTtsMessage,
         permViewChannel,
         permVoiceConnect,
         permVoiceMuteMembers,
@@ -742,13 +753,6 @@ proc log*(msg: string) =
     when defined(dimscordDebug):
         echo "[Lib]: " & msg
 
-proc `$`*(p:PermissionFlags): string=
-    if p==permMentionEveryone:
-        return "Mention @everyone, @here and All Roles"
-    system.`$`(p)[4..^1].findandcaptureall(
-        re"(^[a-z]|[A-Z]+)[a-z]*"
-    ).join" "
-
 # CDN Endpoints
 
 proc cdnGuilds(gid=""): string =
@@ -905,6 +909,9 @@ proc endpointGuildVanity*(gid: string): string =
 proc endpointGuildOnboarding*(gid: string): string =
     endpointGuilds(gid) & "/onboarding"
 
+proc endpointGuildSounds*(gid: string; sid = ""): string =
+    endpointGuilds(gid) & "/soundboard-sounds" & (if sid != "":"/"&sid else:"")
+
 proc endpointGuildChannels*(gid: string; cid = ""): string =
     endpointGuilds(gid) & "/channels" & (if cid != "":"/"&cid else:"")
 

dimscord/dispatch.nim

@@ -227,7 +227,7 @@ proc messageReactionAdd(s: Shard, data: JsonNode) {.async.} =
             emoji: emoji,
             kind: some ReactionType data["type"].getInt,
             reacted: data["user_id"].str == s.user.id,
-            burst: data["burst"].getBool,
+            burst: data{"burst"}.getBool,
         )
         exists = false
 
@@ -283,7 +283,7 @@ proc messageReactionRemove(s: Shard, data: JsonNode) {.async.} =
         reaction = Reaction(
             emoji: emoji,
             kind: some data["type"].getInt.ReactionType,
-            burst: data["burst"].getBool
+            burst: data{"burst"}.getBool
         )
         exists = false
 

dimscord/helpers.nim

@@ -177,6 +177,14 @@ proc timestamp*(id: string): Time =
     let snowflake = parseBiggestUint(id)
     result = fromUnix int64(((snowflake shr 22) + 1420070400000'u64) div 1000)
 
+proc toBits*(p: set[PermissionFlags]): int =
+    ## Converts the set of permissions to an integer
+    cast[int](p)
+
+proc denied*(p: set[PermissionFlags]): set[PermissionFlags] =
+    ## Returns the denied permissions
+    permAll - p
+
 proc perms*(p: PermObj): int =
     ## Gets the total permissions.
     result = 0
@@ -598,7 +606,7 @@ template waitFor*(discord: DiscordClient; event: static[DispatchEvent],
     ##
     ## - The object returned would be a tuple that have the same parameter names in `Events`.
     ##   e.g. if you were to `waitFor` `MessageReactionAdd`, it would be
-    ##   `tuple[s: Shard, msg: Message, u: User, emj: Emoji, exists: bool]`
+    ##   `tuple[msg: Message, u: User, emj: Emoji, exists: bool]`
     ##   You can always find which type the parameter fields are by checking the `Events` object.
     ## 
     ## See also:

dimscord/helpers/user.nim

@@ -183,6 +183,7 @@ template followup*(i: Interaction;
 template editResponse*(i: Interaction;
         content = none string;
         embeds = newSeq[Embed]();
+        flags: set[MessageFlags] = {};
         allowed_mentions = none AllowedMentions;
         attachments = newSeq[Attachment]();
         files = newSeq[DiscordFile]();
@@ -195,9 +196,8 @@ template editResponse*(i: Interaction;
     ## - `message_id` can be `@original`
     getClient.api.editInteractionResponse(
         i.application_id, i.token, message_id,
-        content, embeds, allowed_mentions,
-        attachments, files,
-        components
+        content, embeds, flags, allowed_mentions,
+        attachments, files, components
     )
 
 template getResponse*(i: Interaction, message_id = "@original"): Future[Message] =

dimscord/objects.nim

@@ -218,10 +218,10 @@ proc parseHook*(s: string, i: var int, v: var set[UserFlags]) =
     parseHook(s, i, number)
     v = cast[set[UserFlags]](number)
 
-proc parseHook*(s: string, i: var int, v: var set[GuildMemberFlags]) =
+proc parseHook*(s: string, i: var int, v: var set[MemberFlags]) =
     var number: BiggestInt
     parseHook(s, i, number)
-    v = cast[set[GuildMemberFlags]](number)
+    v = cast[set[MemberFlags]](number)
 
 proc parseHook*(s: string, i: var int, v: var set[RoleFlags]) =
     var number: BiggestInt
@@ -281,6 +281,16 @@ proc newRole*(data: JsonNode): Role =
             "available_for_purchase" in tag)
         result.tags.get.guild_connections = some "guild_connections" in tag
 
+proc parseHook*(s: string, i: var int, v: var OverwriteType) =
+    var data: JsonNode
+    parseHook(s, i, data)
+    case data.kind:
+    of JString: # audit log options
+        v = OverwriteType parseInt(data.str)
+    of JInt:
+        v = OverwriteType data.getInt
+    else: discard
+
 proc newHook(m: var Member) =
     m = Member()
     m.presence = Presence(
@@ -481,7 +491,6 @@ proc `[]=`(obj: ref object, fld: string, val: JsonNode) =
     for name, field in obj[].fieldPairs:
         if name == fld:
             field = ($val).fromJson(typeof(field))
-
 
 proc newAuditLogChangeValue(data: JsonNode, key: string): AuditLogChangeValue =
     case data.kind:
@@ -574,10 +583,6 @@ proc newAuditLog*(data: JsonNode): AuditLog =
 proc newVoiceState*(data: JsonNode): VoiceState =
     result = ($data).fromJson(VoiceState)
 
-proc renameHook(v: var Guild, fieldName: var string) {.used.} =
-    if fieldName == "region":
-        fieldName = "rtc_region"
-
 proc parseHook(s: string, i: var int, v: var set[SystemChannelFlags]) =
     var number: BiggestInt
     parseHook(s, i, number)
@@ -799,8 +804,8 @@ proc parseHook(s: string, n: var int, a: var ApplicationCommandInteractionData)
 
     if "component_type" in data:
         a = ApplicationCommandInteractionData(
-            interactionType: idtMessageComponent,
-            component_type: ($data["component_type"].getInt).fromJson(
+            interaction_type: idtMessageComponent,
+            component_type: ($data["component_type"]).fromJson(
                 MessageComponentType),
             custom_id: data["custom_id"].str
         )
@@ -825,20 +830,20 @@ proc parseHook(s: string, n: var int, a: var ApplicationCommandInteractionData)
                     case key:
                     of "users":
                         for k, v in values.pairs:
-                            a.resolved.users[k] = ($v).fromJson User
+                            a.resolved.users[k] = v.newUser
                     of "attachments":
                         for k, v in values.pairs:
-                            a.resolved.attachments[k] = ($v).fromJson Attachment
+                            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).fromJson Member
+                                a.resolved.members[k] = v.newMember
                         of "roles":
                             for k, v in values.pairs:
-                                a.resolved.roles[k] = ($v).fromJson Role
+                                a.resolved.roles[k] = v.newRole
                         else: discard
 
                     if a.kind == atMessage:
@@ -850,7 +855,7 @@ proc parseHook(s: string, n: var int, a: var ApplicationCommandInteractionData)
                                 )
                         of "messages":
                             for k, v in values.pairs:
-                                a.resolved.messages[k] = ($v).fromJson Message
+                                a.resolved.messages[k] = v.newMessage
                         else: discard
 
     for k, val in data.pairs:
@@ -1002,7 +1007,6 @@ proc `+`(a, b: JsonNode): JsonNode =
     for k, v in b.pairs:
         result[k] = v
 
-
 proc `&=`(a: var JsonNode, b: JsonNode) =
     a = a+b
 

dimscord/objects/macros.nim

@@ -53,7 +53,15 @@ macro loadOpt*(obj: typed, lits: varargs[untyped]): untyped =
         let fieldName = lit.strVal
         result.add quote do:
             if `lit`.isSome:
-                `obj`[`fieldName`] = %*get(`lit`)
+                var value = %*get(`lit`)
+                when `lit` is Option[int]:
+                    if `lit`.get == -1: value = newJNull()
+                when `lit` is Option[string]:
+                    if `lit`.get == "": value = newJNull()
+                when `lit` is Option[enum]:
+                    value = %*(ord get(`lit`))
+
+                `obj`[`fieldName`] = value
 
 macro loadOpts*(res, parent: typed, lits: varargs[untyped]): untyped =
     result = newStmtList()