From 6a7a65e16b9ec0f3d8c5695790f3f511c1b491b9 Mon Sep 17 00:00:00 2001
From: Zed <zedeus@pm.me>
Date: Thu, 15 Aug 2019 22:44:59 +0200
Subject: [PATCH] Update norm

---
 nitter.nimble |  2 +-
 src/types.nim | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/nitter.nimble b/nitter.nimble
index 3b984f6..30e43cf 100644
--- a/nitter.nimble
+++ b/nitter.nimble
@@ -11,7 +11,7 @@ bin           = @["nitter"]
 # Dependencies
 
 requires "nim >= 0.19.9"
-requires "norm <= 1.0.11"
+requires "norm >= 1.0.13"
 requires "jester >= 0.4.3"
 requires "regex >= 0.11.2"
 requires "q >= 0.0.7"
diff --git a/src/types.nim b/src/types.nim
index 38ef3b5..2ad4f7b 100644
--- a/src/types.nim
+++ b/src/types.nim
@@ -22,17 +22,17 @@ db("cache.db", "", "", ""):
       tweets*: string
       likes*: string
       media*: string
-      verified* {.dbType: "STRING", parseIt: parseBool(it.s), formatIt: $it.}: bool
-      protected* {.dbType: "STRING", parseIt: parseBool(it.s), formatIt: $it.}: bool
+      verified*: bool
+      protected*: bool
       joinDate* {.
         dbType: "INTEGER"
         parseIt: it.i.fromUnix()
-        formatIt: it.toUnix()
+        formatIt: dbValue(it.toUnix())
         .}: Time
       updated* {.
           dbType: "INTEGER"
           parseIt: it.i.fromUnix()
-          formatIt: getTime().toUnix()
+          formatIt: dbValue(getTime().toUnix())
         .}: Time
 
     Video* = object
@@ -42,19 +42,19 @@ db("cache.db", "", "", ""):
       url*: string
       thumb*: string
       views*: string
+      available*: bool
       playbackType* {.
           dbType: "STRING"
           parseIt: parseEnum[VideoType](it.s)
-          formatIt: $it
+          formatIt: dbValue($it)
         .}: VideoType
-      available* {.dbType: "STRING", parseIt: parseBool(it.s) formatIt: $it.}: bool
 
     Prefs* = object
-      videoPlayback*  {.dbType: "STRING", parseIt: parseBool(it.s), formatIt: $it.}: bool
-      autoplayGifs*   {.dbType: "STRING", parseIt: parseBool(it.s), formatIt: $it.}: bool
-      hideTweetStats* {.dbType: "STRING", parseIt: parseBool(it.s), formatIt: $it.}: bool
-      hideBanner*     {.dbType: "STRING", parseIt: parseBool(it.s), formatIt: $it.}: bool
-      stickyProfile*  {.dbType: "STRING", parseIt: parseBool(it.s), formatIt: $it.}: bool
+      videoPlayback*: bool
+      autoplayGifs*: bool
+      hideTweetStats*: bool
+      hideBanner*: bool
+      stickyProfile*: bool
       replaceYouTube*: string
       replaceTwitter*: string