From b1fde40677d0cfeb5a5c28bdd0aeca775b6aa0e1 Mon Sep 17 00:00:00 2001
From: bptato <nincsnevem662@gmail.com>
Date: Sun, 2 Jul 2023 13:13:14 +0200
Subject: return Result[T, JSError] from fromJS

---
 src/config/config.nim | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/config')

diff --git a/src/config/config.nim b/src/config/config.nim
index 7fc0b2b1..1bfacd28 100644
--- a/src/config/config.nim
+++ b/src/config/config.nim
@@ -45,7 +45,7 @@ type
   SiteConfig* = object
     url*: Opt[Regex]
     host*: Opt[Regex]
-    rewrite_url*: (proc(s: URL): Opt[URL])
+    rewrite_url*: (proc(s: URL): Result[URL, JSError])
     cookie*: Opt[bool]
     third_party_cookie*: seq[Regex]
     share_cookie_jar*: Opt[string]
@@ -57,7 +57,7 @@ type
 
   OmniRule* = object
     match*: Regex
-    substitute_url*: (proc(s: string): Opt[string])
+    substitute_url*: (proc(s: string): Result[string, JSError])
 
   StartConfig = object
     visual_home*: string
@@ -176,8 +176,7 @@ proc getSiteConfig*(config: Config, jsctx: JSContext): seq[SiteConfig] =
     if sc.rewrite_url.isSome:
       let fun = jsctx.eval(sc.rewrite_url.get, "<siteconf>",
         JS_EVAL_TYPE_GLOBAL)
-      let f = getJSFunction[URL, URL](jsctx, fun)
-      conf.rewrite_url = f.get
+      conf.rewrite_url = getJSFunction[URL, URL](jsctx, fun)
     result.add(conf)
 
 proc getOmniRules*(config: Config, jsctx: JSContext): seq[OmniRule] =
@@ -187,8 +186,7 @@ proc getOmniRules*(config: Config, jsctx: JSContext): seq[OmniRule] =
       match: re.get
     )
     let fun = jsctx.eval(rule.substitute_url, "<siteconf>", JS_EVAL_TYPE_GLOBAL)
-    let f = getJSFunction[string, string](jsctx, fun)
-    conf.substitute_url = f.get
+    conf.substitute_url = getJSFunction[string, string](jsctx, fun)
     result.add(conf)
 
 func getRealKey(key: string): string =
-- 
cgit 1.4.1-2-gfad0