|
|
@@ -27,9 +27,10 @@ withDb:
|
|
|
discard
|
|
|
Prefs.theme.safeAddColumn
|
|
|
|
|
|
-proc getDefaultPrefs(hostname: string): Prefs =
|
|
|
+proc getDefaultPrefs(cfg: Config): Prefs =
|
|
|
result = genDefaultPrefs()
|
|
|
- result.replaceTwitter = hostname
|
|
|
+ result.replaceTwitter = cfg.hostname
|
|
|
+ result.theme = cfg.defaultTheme
|
|
|
|
|
|
proc cache*(prefs: var Prefs) =
|
|
|
withDb:
|
|
|
@@ -40,18 +41,18 @@ proc cache*(prefs: var Prefs) =
|
|
|
except AssertionError, KeyError:
|
|
|
prefs.insert()
|
|
|
|
|
|
-proc getPrefs*(id, hostname: string): Prefs =
|
|
|
+proc getPrefs*(id: string; cfg: Config): Prefs =
|
|
|
if id.len == 0:
|
|
|
- return getDefaultPrefs(hostname)
|
|
|
+ return getDefaultPrefs(cfg)
|
|
|
|
|
|
withDb:
|
|
|
try:
|
|
|
result.getOne("id = ?", id)
|
|
|
except KeyError:
|
|
|
- result = getDefaultPrefs(hostname)
|
|
|
+ result = getDefaultPrefs(cfg)
|
|
|
|
|
|
-proc resetPrefs*(prefs: var Prefs; hostname: string) =
|
|
|
- var defPrefs = getDefaultPrefs(hostname)
|
|
|
+proc resetPrefs*(prefs: var Prefs; cfg: Config) =
|
|
|
+ var defPrefs = getDefaultPrefs(cfg)
|
|
|
defPrefs.id = prefs.id
|
|
|
cache(defPrefs)
|
|
|
prefs = defPrefs
|