From 02b206078d2ffa9c34940a768afcde34ace6e2a3 Mon Sep 17 00:00:00 2001
From: Zed <zedeus@pm.me>
Date: Sat, 26 Oct 2019 15:34:30 +0200
Subject: [PATCH] Don't export options from types

---
 src/api/media.nim       | 3 ++-
 src/api/utils.nim       | 2 +-
 src/parser.nim          | 2 +-
 src/parserutils.nim     | 2 +-
 src/routes/status.nim   | 4 ++--
 src/routes/timeline.nim | 3 +--
 src/types.nim           | 2 --
 src/views/rss.nimf      | 2 +-
 src/views/timeline.nim  | 2 +-
 src/views/tweet.nim     | 2 +-
 10 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/api/media.nim b/src/api/media.nim
index 1b95fda..3a417d1 100644
--- a/src/api/media.nim
+++ b/src/api/media.nim
@@ -1,4 +1,5 @@
-import httpclient, asyncdispatch, times, sequtils, strutils, json, uri, macros
+import httpclient, asyncdispatch, times, sequtils, strutils, json, uri
+import macros, options
 
 import ".."/[types, parser, formatters, cache]
 import utils, consts
diff --git a/src/api/utils.nim b/src/api/utils.nim
index ce7e854..f4484f3 100644
--- a/src/api/utils.nim
+++ b/src/api/utils.nim
@@ -1,4 +1,4 @@
-import httpclient, asyncdispatch, htmlparser
+import httpclient, asyncdispatch, htmlparser, options
 import strutils, json, xmltree, uri
 
 import ../types
diff --git a/src/parser.nim b/src/parser.nim
index a71a35e..a4cda8b 100644
--- a/src/parser.nim
+++ b/src/parser.nim
@@ -1,4 +1,4 @@
-import xmltree, sequtils, strutils, json
+import xmltree, sequtils, strutils, json, options
 
 import types, parserutils, formatters
 
diff --git a/src/parserutils.nim b/src/parserutils.nim
index 2d3ad16..fa31bea 100644
--- a/src/parserutils.nim
+++ b/src/parserutils.nim
@@ -1,4 +1,4 @@
-import xmltree, strtabs, strformat, strutils, times, uri
+import xmltree, strtabs, strformat, strutils, times, uri, options
 import regex
 
 import types, formatters
diff --git a/src/routes/status.nim b/src/routes/status.nim
index 3e9ab2e..45fcf54 100644
--- a/src/routes/status.nim
+++ b/src/routes/status.nim
@@ -1,4 +1,4 @@
-import asyncdispatch, strutils, sequtils, uri
+import asyncdispatch, strutils, sequtils, uri, options
 
 import jester
 
@@ -6,7 +6,7 @@ import router_utils
 import ".."/[api, types, formatters, agents]
 import ../views/[general, status]
 
-export uri, sequtils
+export uri, sequtils, options
 export router_utils
 export api, formatters, agents
 export status
diff --git a/src/routes/timeline.nim b/src/routes/timeline.nim
index 4fa6f27..084817f 100644
--- a/src/routes/timeline.nim
+++ b/src/routes/timeline.nim
@@ -1,5 +1,4 @@
-import asyncdispatch, strutils, sequtils, uri
-
+import asyncdispatch, strutils, sequtils, uri, options
 import jester
 
 import router_utils
diff --git a/src/types.nim b/src/types.nim
index eeb10a1..291aae7 100644
--- a/src/types.nim
+++ b/src/types.nim
@@ -3,8 +3,6 @@ import norm/sqlite
 
 import prefs_impl
 
-export options
-
 type
   VideoType* = enum
     vmap, m3u8, mp4
diff --git a/src/views/rss.nimf b/src/views/rss.nimf
index 0368f03..c7feabc 100644
--- a/src/views/rss.nimf
+++ b/src/views/rss.nimf
@@ -1,5 +1,5 @@
 #? stdtmpl(subsChar = '$', metaChad = '#')
-#import strutils, xmltree, strformat
+#import strutils, xmltree, strformat, options
 #import ../types, ../utils, ../formatters
 #
 #proc getTitle(tweet: Tweet; prefs: Prefs; hostname: string): string =
diff --git a/src/views/timeline.nim b/src/views/timeline.nim
index 0fc0b3f..54b3156 100644
--- a/src/views/timeline.nim
+++ b/src/views/timeline.nim
@@ -1,4 +1,4 @@
-import strutils, strformat, sequtils, algorithm, times, uri
+import strutils, strformat, sequtils, algorithm, times, uri, options
 import karax/[karaxdsl, vdom, vstyles]
 
 import ".."/[types, query, formatters]
diff --git a/src/views/tweet.nim b/src/views/tweet.nim
index ae1cbc1..220e67a 100644
--- a/src/views/tweet.nim
+++ b/src/views/tweet.nim
@@ -1,4 +1,4 @@
-import strutils, sequtils, strformat
+import strutils, sequtils, strformat, options
 import karax/[karaxdsl, vdom, vstyles]
 
 import renderutils