Make id and name optional (bug when deleted emoji is removed from a m…

…essage reaction) and fix unused import and add used pragmas

dimscord/dispatch.nim

@@ -61,7 +61,7 @@ proc guildEmojisUpdate(s: Shard, data: JsonNode) {.async.} =
     for emoji in data["emojis"]:
         let emji = newEmoji(emoji)
         emojis.add(emji)
-        guild.emojis[emji.id] = emji
+        guild.emojis[get emji.id] = emji
 
     await s.client.events.guild_emojis_update(s, guild, emojis)
 

dimscord/gateway.nim

@@ -1,14 +1,12 @@
 import httpclient, ws, asyncnet, asyncdispatch
-import strformat, options, sequtils, strutils, restapi, dispatch
+import strformat, options, strutils, restapi, dispatch
 import tables, random, times, constants, objects, json, math
 import nativesockets
 
 when defined(discordCompress):
     import zip/zlib
 
 randomize()
-{.hint[XDeclaredButNotUsed]: off.}
-{.warning[UnusedImport]: off.}
 
 const
     opDispatch = 0
@@ -27,7 +25,7 @@ var
     backoff = false
     reconnectable = true
 
-proc reset(s: Shard) =
+proc reset(s: Shard) {.used.} =
     s.authenticating = false
     s.resuming = false
 
@@ -81,7 +79,7 @@ proc extractCloseData(data: string): tuple[code: int, reason: string] = # Code f
             0
     result.reason = if data.len > 2: data[2..^1] else: ""
 
-proc handleDisconnect(s: Shard, msg: string): bool =
+proc handleDisconnect(s: Shard, msg: string): bool {.used.} =
     let closeData = extractCloseData(msg)
 
     s.logShard("Socket suspended", (
@@ -97,7 +95,7 @@ proc handleDisconnect(s: Shard, msg: string): bool =
         result = false
         log("Fatal error: " & closeData.reason)
 
-proc sockClosed(s: Shard): bool =
+proc sockClosed(s: Shard): bool {.used.} =
     return s.connection == nil or s.connection.tcpSocket.isClosed or s.stop
 
 proc updateStatus*(s: Shard, game = none GameStatus;
@@ -121,7 +119,7 @@ proc updateStatus*(s: Shard, game = none GameStatus;
 
     asyncCheck s.sendSock(opStatusUpdate, payload)
 
-proc identify(s: Shard) {.async.} =
+proc identify(s: Shard) {.async, used.} =
     if s.authenticating or s.sockClosed: return
 
     if backoff:
@@ -157,7 +155,7 @@ proc identify(s: Shard) {.async.} =
     await s.sendSock(opIdentify, payload, ignore = true)
     if s.client.max_shards > 1: await sleepAsync 5000
 
-proc resume(s: Shard) {.async.} =
+proc resume*(s: Shard) {.async.} =
     if s.authenticating or s.sockClosed: return
 
     s.authenticating = true
@@ -214,7 +212,7 @@ proc voiceStateUpdate*(s: Shard,
         "channel_id": channel_id
     })
 
-proc handleDispatch(s: Shard, event: string, data: JsonNode) {.async.} =
+proc handleDispatch(s: Shard, event: string, data: JsonNode) {.async, used.} =
     s.logShard("Received event: " & event) # please do not enable dimscordDebug while you are on a large guild.
 
     case event:
@@ -469,7 +467,7 @@ proc endSession*(cl: DiscordClient) {.async.} =
         shard.cache.clear()
 
 proc setupShard(cl: DiscordClient, i: int;
-        cache_prefs: CacheTablePrefs): Shard =
+        cache_prefs: CacheTablePrefs): Shard {.used.} =
     result = newShard(i, cl)
     cl.shards.add(i, result)
 

dimscord/objects.nim

@@ -125,7 +125,7 @@ type
         emoji*: Emoji
         reacted*: bool
     Emoji* = object
-        id*, name*: string
+        id*, name*: Option[string]
         require_colons*, managed*, animated*: Option[bool]
         user*: User
         roles*: seq[string]
@@ -178,12 +178,10 @@ type
         instance*: bool
     Presence* = object
         user*: User
-        roles*: seq[string]
         game*: Option[GameActivity]
         guild_id*, status*: string
         activities*: seq[GameActivity]
         client_status*: tuple[web, desktop, mobile: string]
-        premium_since*, nick*: Option[string]
     Guild* = ref object
         id*, name*, owner_id*: string
         region*, preferred_locale*: string
@@ -429,7 +427,10 @@ proc clear*(c: CacheTable) =
     c.dmChannels.clear()
 
 proc `$`*(e: Emoji): string =
-    result = if e.id != "": e.name & ":" & e.id else: e.name
+    result = if e.id.isSome:
+            e.name.get("?") & ":" & e.id.get
+        else:
+            e.name.get("?")
 
 macro keyCheckOptInt(obj: typed, obj2: typed,
                         lits: varargs[untyped]): untyped =
@@ -777,17 +778,14 @@ proc newVoiceState*(data: JsonNode): VoiceState =
     data.keyCheckOptStr(result, guild_id, channel_id)
 
 proc newEmoji*(data: JsonNode): Emoji =
-    result = Emoji(name: data["name"].str)
+    result = Emoji(user: newUser(data["user"]))
 
     for r in data{"roles"}.getElems:
         result.roles.add(r.str)
 
-    data.keyCheckStr(result, id)
+    data.keyCheckOptStr(result, id, name)
     data.keyCheckOptBool(result, require_colons, managed, animated)
 
-    if "user" in data:
-        result.user = newUser(data["user"])
-
 proc newGameActivity*(data: JsonNode): GameActivity =
     result = GameActivity(
         name: data["name"].str,
@@ -840,10 +838,6 @@ proc newPresence*(data: JsonNode): Presence =
             mobile: "offline"
         )
     )
-    data.keyCheckOptStr(result, nick, premium_since)
-
-    for role in data{"roles"}.getElems:
-        result.roles.add(role.str)
 
     for activity in data["activities"].elems:
         result.activities.add(newGameActivity(activity))