From 06a6408269eb47f3d812bd259c759b247a024d08 Mon Sep 17 00:00:00 2001
From: Anthony Laibe <anthony@laibe.cc>
Date: Tue, 28 Sep 2021 21:21:57 +0200
Subject: [PATCH] refactor: gif backend return object (#61)

---
 status/gif.nim                  | 50 ++++-----------------------------
 status/statusgo_backend/gif.nim | 24 +++++++++-------
 status/types/gif_item.nim       | 39 +++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 54 deletions(-)
 create mode 100644 status/types/gif_item.nim

diff --git a/status/gif.nim b/status/gif.nim
index 86a9150..091cfc0 100644
--- a/status/gif.nim
+++ b/status/gif.nim
@@ -2,10 +2,10 @@ import httpclient
 import json
 import strformat
 import os
-import sequtils
-import chronicles
 import uri
+import chronicles
 
+import types/gif_item
 from statusgo_backend/gif import getRecentGifs, getFavoriteGifs, setFavoriteGifs, setRecentGifs
 
 logScope:
@@ -25,44 +25,6 @@ let TENOR_API_KEY_RESOLVED =
 const baseUrl = "https://g.tenor.com/v1/"
 let defaultParams = fmt("&media_filter=minimal&limit=50&key={TENOR_API_KEY_RESOLVED}")
 
-type
-  GifItem* = object
-    id*: string
-    title*: string
-    url*: string
-    tinyUrl*: string
-    height*: int
-
-proc tenorToGifItem(jsonMsg: JsonNode): GifItem =
-  return GifItem(
-    id: jsonMsg{"id"}.getStr,
-    title: jsonMsg{"title"}.getStr,
-    url: jsonMsg{"media"}[0]["gif"]["url"].getStr,
-    tinyUrl: jsonMsg{"media"}[0]["tinygif"]["url"].getStr,
-    height: jsonMsg{"media"}[0]["gif"]["dims"][1].getInt
-  )
-
-proc settingToGifItem(jsonMsg: JsonNode): GifItem =
-  return GifItem(
-    id: jsonMsg{"id"}.getStr,
-    title: jsonMsg{"title"}.getStr,
-    url: jsonMsg{"url"}.getStr,
-    tinyUrl: jsonMsg{"tinyUrl"}.getStr,
-    height: jsonMsg{"height"}.getInt
-  )
-
-proc toJsonNode*(self: GifItem): JsonNode =
-  result = %* {
-    "id": self.id,
-    "title": self.title,
-    "url": self.url,
-    "tinyUrl": self.tinyUrl,
-    "height": self.height
-  }
-
-proc `$`*(self: GifItem): string =
-  return fmt"GifItem(id:{self.id}, title:{self.title}, url:{self.url}, tinyUrl:{self.tinyUrl}, height:{self.height})"
-
 type
   GifClient* = ref object
     client: HttpClient
@@ -114,14 +76,14 @@ proc getTrendings*(self: GifClient): seq[GifItem] =
 proc getFavorites*(self: GifClient): seq[GifItem] =
   if not self.favoritesLoaded:
     self.favoritesLoaded = true
-    self.favorites = map(getFavoriteGifs(){"items"}.getElems(), settingToGifItem)
+    self.favorites = getFavoriteGifs()
 
   return self.favorites
 
 proc getRecents*(self: GifClient): seq[GifItem] =
   if not self.recentsLoaded:
     self.recentsLoaded = true
-    self.recents = map(getRecentGifs(){"items"}.getElems(), settingToGifItem)
+    self.recents = getRecentGifs()
 
   return self.recents
 
@@ -147,7 +109,7 @@ proc toggleFavorite*(self: GifClient, gifItem: GifItem) =
     newFavorites.add(gifItem)
 
   self.favorites = newFavorites
-  setFavoriteGifs(%*{"items": map(newFavorites, toJsonNode)})
+  setFavoriteGifs(newFavorites)
 
 proc addToRecents*(self: GifClient, gifItem: GifItem) =
   let recents = self.getRecents()
@@ -166,4 +128,4 @@ proc addToRecents*(self: GifClient, gifItem: GifItem) =
     idx += 1
 
   self.recents = newRecents
-  setRecentGifs(%*{"items": map(newRecents, toJsonNode)})
\ No newline at end of file
+  setRecentGifs(newRecents)
\ No newline at end of file
diff --git a/status/statusgo_backend/gif.nim b/status/statusgo_backend/gif.nim
index a00afc6..f10b2d5 100644
--- a/status/statusgo_backend/gif.nim
+++ b/status/statusgo_backend/gif.nim
@@ -1,16 +1,20 @@
-import json
+import json, sequtils
 
 import ./settings
-import ../types/[setting]
+import ../types/[setting, gif_item]
 
-proc getRecentGifs*(): JsonNode =
-  return settings.getSetting[JsonNode](Setting.Gifs_Recent, %*{})
+proc getRecentGifs*(): seq[GifItem] =
+  let node = settings.getSetting[JsonNode](Setting.Gifs_Recent, %*{})
+  return map(node{"items"}.getElems(), settingToGifItem)
 
-proc getFavoriteGifs*(): JsonNode =
-  return settings.getSetting[JsonNode](Setting.Gifs_Favorite, %*{})
+proc getFavoriteGifs*(): seq[GifItem] =
+  let node = settings.getSetting[JsonNode](Setting.Gifs_Favorite, %*{})
+  return map(node{"items"}.getElems(), settingToGifItem)
 
-proc setFavoriteGifs*(items: JsonNode) =
-  discard settings.saveSetting(Setting.Gifs_Favorite, items)
+proc setFavoriteGifs*(gifItems: seq[GifItem]) =
+  let node = %*{"items": map(gifItems, toJsonNode)}
+  discard settings.saveSetting(Setting.Gifs_Favorite, node)
 
-proc setRecentGifs*(items: JsonNode) =
-  discard settings.saveSetting(Setting.Gifs_Recent, items)
\ No newline at end of file
+proc setRecentGifs*(gifItems: seq[GifItem]) =
+  let node = %*{"items": map(gifItems, toJsonNode)}
+  discard settings.saveSetting(Setting.Gifs_Recent, node)
\ No newline at end of file
diff --git a/status/types/gif_item.nim b/status/types/gif_item.nim
new file mode 100644
index 0000000..4abaae5
--- /dev/null
+++ b/status/types/gif_item.nim
@@ -0,0 +1,39 @@
+import json, strformat
+
+type
+  GifItem* = object
+    id*: string
+    title*: string
+    url*: string
+    tinyUrl*: string
+    height*: int
+
+proc tenorToGifItem*(jsonMsg: JsonNode): GifItem =
+  return GifItem(
+    id: jsonMsg{"id"}.getStr,
+    title: jsonMsg{"title"}.getStr,
+    url: jsonMsg{"media"}[0]["gif"]["url"].getStr,
+    tinyUrl: jsonMsg{"media"}[0]["tinygif"]["url"].getStr,
+    height: jsonMsg{"media"}[0]["gif"]["dims"][1].getInt
+  )
+
+proc settingToGifItem*(jsonMsg: JsonNode): GifItem =
+  return GifItem(
+    id: jsonMsg{"id"}.getStr,
+    title: jsonMsg{"title"}.getStr,
+    url: jsonMsg{"url"}.getStr,
+    tinyUrl: jsonMsg{"tinyUrl"}.getStr,
+    height: jsonMsg{"height"}.getInt
+  )
+
+proc toJsonNode*(self: GifItem): JsonNode =
+  result = %* {
+    "id": self.id,
+    "title": self.title,
+    "url": self.url,
+    "tinyUrl": self.tinyUrl,
+    "height": self.height
+  }
+
+proc `$`*(self: GifItem): string =
+  return fmt"GifItem(id:{self.id}, title:{self.title}, url:{self.url}, tinyUrl:{self.tinyUrl}, height:{self.height})"