Jsony better error handling (WIP), bump up nim version, some refinements to code

Author: krisppurg

dimscord.nimble

@@ -7,7 +7,7 @@ license       = "MIT"
 
 # Dependencies
 
-requires "nim >= 1.2.0", "zippy >= 0.2.1", "ws >= 0.5.0", "regex >= 0.15.0", "libsodium <= 0.6.0", "flatty >= 0.1.2", "jsony >= 1.1.3"
+requires "nim >= 2.0.6", "zippy >= 0.2.1", "ws >= 0.5.0", "regex >= 0.15.0", "libsodium <= 0.6.0", "flatty >= 0.1.2", "jsony >= 1.1.3"
 requires "opussum >= 0.6.0", "etf#e0b77f7"
 
 task genDoc, "Generates the documentation for dimscord":

dimscord/constants.nim

@@ -4,7 +4,7 @@
 when defined(dimscordDebug):
     import strformat
 #{.hint[XDeclaredButNotUsed]: off.} Unsure when am I gonna use this
-import strutils, regex
+# import strutils, regex
 
 type
     PermissionFlags* = enum
@@ -179,13 +179,10 @@ type
         cfRequireTag = 4
         cfHideMediaDownloadOptions = 15
     SkuFlags* = enum
+        sfNone,
         sfAvailable         = 2
         sfGuildSubscription = 7
         sfUserSubscription  = 8
-    SubscriptionStatus* = enum
-        ssActive = 0
-        ssEnding,
-        ssInactive
 const
     libName* =  "Dimscord"
     libVer* =   "1.6.0"
@@ -248,14 +245,17 @@ type
         mtGuildIncidentReportFalseAlarm =           39
         mtPurchaseNotification =                    44
         mtPollResult =                              46
+        mtUnknown
     MessageActivityType* = enum
+        matNone =        0
         matJoin =        1
         matSpectate =    2
         matListen =      3
         matJoinRequest = 5 # nice skip
     MessageReferenceType* = enum
         mrtDefault = 0
         mrtForward = 1
+        mrtUnknown = 2
     ChannelType* = enum
         ctGuildText =          0
         ctDirect =             1
@@ -315,10 +315,16 @@ type
         whIncoming =    1
         whFollower =    2
         whApplication = 3
+    EventWebhookStatus* = enum
+        ewsNone               = 0
+        ewsDisabled           = 1
+        ewsEnabled            = 2
+        ewsDisabledByDiscord  = 3
     IntegrationExpireBehavior* = enum
         iebRemoveRole = 0
         iebKick =       1
     AuditLogEntryType* = enum
+        aleUnknown =                            0
         aleGuildUpdate =                        1
         aleChannelCreate =                      10
         aleChannelUpdate =                      11
@@ -456,10 +462,12 @@ type
         itGroupDm = 1
         itFriend  = 2
     InviteTargetType* = enum
+        ittUnknown
         ittStream              = 1
         ittEmbeddedApplication = 2
     PrivacyLevel* = enum
         plGuildOnly = 2
+        plUnknown
     UserPremiumType* = enum
         uptNone         = 0
         uptNitroClassic = 1
@@ -493,18 +501,23 @@ type
         mctSeparator         = 14
         mctContainer         = 17
     StickerType* = enum
+        stUnknown
         stStandard = 1
         stGuild    = 2
     PollLayoutType* = enum
+        plNone
         plDefault = 1
     GuildScheduledEventPrivacyLevel* = enum
         splGuildOnly = 2
+        splUnknown
     GuildScheduledEventStatus* = enum
+        esUnknown
         esScheduled = 1
         esActive    = 2
         esCompleted = 3
         esCanceled  = 4
     EntityType* = enum
+        etNone
         etStageInstance = 1
         etVoice         = 2
         etExternal      = 3
@@ -539,33 +552,41 @@ type
         atPremium = 0
         atBasic   = 1
     ModerationActionType* = enum
+        matUnknown
         matBlockMessage     = 1
         matSendAlertMessage = 2
         matTimeout          = 3
     ModerationTriggerType* = enum
+        mttUnknown
         mttKeyword       = 1
         mttHarmfulLink   = 2
         mttSpam          = 3
         mttKeywordPreset = 4
         mttMentionSpam   = 5
     KeywordPresetType* = enum
+        kptUnknown
         kptProfanity =     1
         kptSexualContent = 2
         kptSlurs         = 3
     ForumSortOrder* = enum
         fsoLatestActivity = 0
         fsoCreationDate   = 1
+        fsoUnknown
     ForumLayout* = enum
         flNotSet      = 0
         flListView    = 1
         flGalleryView = 2
+        flUnknown
     GuildOnboardingMode* = enum
         omDefault  = 0,
-        omAdvanced = 1
+        omAdvanced = 1,
+        omUnknown
     GuildOnboardingPromptType* = enum
         ptMultipleChoice = 0,
-        ptDropdown       = 1
+        ptDropdown       = 1,
+        ptUnknown
     EntitlementType* = enum
+        etUnknown = 0
         etPurchase = 1
         etPremiumSubscription,
         etDeveloperGift,
@@ -575,11 +596,20 @@ type
         etPremiumPurchase,
         etApplicationSubscription
     SkuType* = enum
-        stNone = 0 # this is so useless
         stDurable           = 2
         stConsumable        = 3
         stSubscription      = 5
         stSubscriptionGroup = 6
+        stNone
+    SubscriptionStatus* = enum
+        ssActive = 0
+        ssEnding,
+        ssInactive,
+        ssUnknown
+    EntryPointCommandHandlerType* = enum
+        ephUnknown
+        ephAppHandler            = 1
+        ephDiscordLaunchActivity = 2
     DispatchEvent* = enum
         Unknown
         VoiceStateUpdate              = "VOICE_STATE_UPDATE"

dimscord/dispatch.nim

@@ -1,12 +1,11 @@
 import objects, constants
 import options, json, asyncdispatch
-import sequtils, tables, jsony, macros
+import sequtils, tables, macros
 import helpers {.all.}
 import std/[sugar, strutils]
 
-when (NimMajor, NimMinor, NimPatch) >= (1, 6, 0):
-    {.warning[HoleEnumConv]: off.}
-    {.warning[CaseTransition]: off.}
+{.warning[HoleEnumConv]: off.}
+{.warning[CaseTransition]: off.}
 
 when defined(dimscordVoice):
     from voice import pause, disconnect
@@ -50,12 +49,6 @@ macro checkAndCall(s: Shard, event: static[DispatchEvent], args: varargs[untyped
 macro enumElementsAsSet(enm: typed): untyped =
     result = newNimNode(nnkCurly).add(enm.getType[1][1..^1])
 
-func fullSet*[T](U: typedesc[T]): set[T] {.inline.} =
-    when T is Ordinal:
-        {T.low..T.high}
-    else: # Hole filled enum
-        enumElementsAsSet(T)
-
 proc addMsg(c: GuildChannel, m: Message, data: string;
         prefs: CacheTablePrefs) {.async.} =
     if data.len < prefs.max_message_size:

dimscord/helpers.nim

@@ -141,6 +141,8 @@ proc iconUrl*(g: Guild, fmt = "png"; size = 128): string =
 proc `$`*(u: User): string =
     ## Stringifies a user.
     ## This would return something like `krisppurg#3211` or `krisp0`
+    if u.username == "": return u.id
+
     result = u.username
     if u.discriminator != "0":
         result &= "#" & u.discriminator