From b1e095d18abb9d1f0d6e8eb9b58f3e63c3fa257d Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Sat, 22 Aug 2015 06:40:21 -0700
Subject: [PATCH] Refactor settings conversion from loadletter.

---
 src/General/Settings.coffee         | 19 ++++++++++++-------
 src/Monitoring/ThreadWatcher.coffee |  7 -------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/General/Settings.coffee b/src/General/Settings.coffee
index 2dc4966c1..62da59a4d 100755
--- a/src/General/Settings.coffee
+++ b/src/General/Settings.coffee
@@ -183,9 +183,8 @@ Settings =
         c.error err.stack
     reader.readAsText file
 
-  loadSettings: (data, cb) ->
-    version = data.version.split '.'
-    if version[0] is '2'
+  convertFrom:
+    loadletter: (data) ->
       convertSettings = (data, map) ->
         for prevKey, newKey of map
           data.Conf[newKey] = data.Conf[prevKey] if newKey
@@ -261,10 +260,16 @@ Settings =
       for key, val of Config.hotkeys when key of data.Conf
         data.Conf[key] = data.Conf[key].replace(/ctrl|alt|meta/g, (s) -> "#{s[0].toUpperCase()}#{s[1..]}").replace /(^|.+\+)[A-Z]$/g, (s) ->
           "Shift+#{s[0...-1]}#{s[-1..].toLowerCase()}"
-      data.Conf['WatchedThreads'] = data.WatchedThreads
-    if data.Conf['WatchedThreads']
-      data.Conf['watchedThreads'] = boards: ThreadWatcher.convert data.Conf['WatchedThreads']
-      delete data.Conf['WatchedThreads']
+      if data.WatchedThreads
+        data.Conf['watchedThreads'] = boards: {}
+        for boardID, threads of data.WatchedThreads
+          for threadID, threadData of threads
+            (data.Conf['watchedThreads'].boards[boardID] or= {})[threadID] = excerpt: threadData.textContent
+      data
+
+  loadSettings: (data, cb) ->
+    if data.version.split('.')[0] is '2' # https://github.com/loadletter/4chan-x
+      data = Settings.convertFrom.loadletter data
     $.clear (err) ->
       return cb err if err
       $.set data.Conf, cb
diff --git a/src/Monitoring/ThreadWatcher.coffee b/src/Monitoring/ThreadWatcher.coffee
index 00dabd13c..64a629868 100755
--- a/src/Monitoring/ThreadWatcher.coffee
+++ b/src/Monitoring/ThreadWatcher.coffee
@@ -401,13 +401,6 @@ ThreadWatcher =
     ThreadWatcher.db.delete {boardID, threadID}
     ThreadWatcher.refresh()
 
-  convert: (oldFormat) ->
-    newFormat = {}
-    for boardID, threads of oldFormat
-      for threadID, data of threads
-        (newFormat[boardID] or= {})[threadID] = excerpt: data.textContent
-    newFormat
-
   menu:
     refreshers: []
     init: ->