From 9a67285c76d6cfbdbcc84eddf2940dc209263e33 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Fri, 13 Dec 2019 03:12:13 -0800
Subject: [PATCH] Revert "Don't prune data for threads on kissu.moe while
 they're in the archive."

This reverts commit aca7ed0a550ecab4bcc38d13c09b2e5da115155c.
---
 src/classes/DataBoard.coffee | 17 ++++-------------
 src/platform/$.coffee        |  4 ++--
 src/site/SW.tinyboard.coffee |  5 -----
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/classes/DataBoard.coffee b/src/classes/DataBoard.coffee
index 9acb504bb..2e76d1413 100644
--- a/src/classes/DataBoard.coffee
+++ b/src/classes/DataBoard.coffee
@@ -138,20 +138,11 @@ class DataBoard
     $.cache threadsList, ->
       return unless @status is 200
       archiveList = g.SITE.urls.archiveListJSON?({siteID, boardID})
-      archiveListHTML = g.SITE.urls.archive?({siteID, boardID})
+      return that.ajaxCleanParse(boardID, @response) unless archiveList
       response1 = @response
-      if archiveList
-        $.cache archiveList, ->
-          return unless @status is 200
-          that.ajaxCleanParse(boardID, response1, @response)
-      else if g.SITE.archiveListParse and archiveListHTML
-        $.cache archiveListHTML, ->
-          return unless @status is 200 or @status is 404
-          response2 = if @status is 404 then [] else g.SITE.archiveListParse(@response)
-          that.ajaxCleanParse(boardID, response1, response2)
-        , {responseType: 'document'}
-      else
-        that.ajaxCleanParse(boardID, @response)
+      $.cache archiveList, ->
+        return unless @status is 200
+        that.ajaxCleanParse(boardID, response1, @response)
 
   ajaxCleanParse: (boardID, response1, response2) ->
     siteID = g.SITE.ID
diff --git a/src/platform/$.coffee b/src/platform/$.coffee
index f7c7513dd..e0df4ecb3 100644
--- a/src/platform/$.coffee
+++ b/src/platform/$.coffee
@@ -208,7 +208,7 @@ $.whenModified = (url, bucket, cb, options={}) ->
 do ->
   reqs = $.dict()
   $.cache = (url, cb, options={}) ->
-    {ajax, responseType} = options
+    {ajax} = options
     if (req = reqs[url])
       if req.callbacks
         req.callbacks.push cb
@@ -221,7 +221,7 @@ do ->
       for cb in @callbacks
         do (cb) => $.queueTask => cb.call @, {isCached: false}
       delete @callbacks
-    req = (ajax or $.ajax) url, {onloadend, responseType}
+    req = (ajax or $.ajax) url, {onloadend}
     req.callbacks = [cb]
     reqs[url] = req
   $.cleanCache = (testf) ->
diff --git a/src/site/SW.tinyboard.coffee b/src/site/SW.tinyboard.coffee
index 8422295dc..506295992 100644
--- a/src/site/SW.tinyboard.coffee
+++ b/src/site/SW.tinyboard.coffee
@@ -46,7 +46,6 @@ SW.tinyboard =
     post:    ({postID})                   -> "##{postID}"
     index:   ({siteID, boardID})          -> "#{Conf['siteProperties'][siteID]?.root or "http://#{siteID}/"}#{boardID}/"
     catalog: ({siteID, boardID})          -> "#{Conf['siteProperties'][siteID]?.root or "http://#{siteID}/"}#{boardID}/catalog.html"
-    archive: ({siteID, boardID})          -> "#{Conf['siteProperties'][siteID]?.root or "http://#{siteID}/"}#{boardID}/archive/"
     threadJSON: ({siteID, boardID, threadID}, isArchived) ->
       root = Conf['siteProperties'][siteID]?.root
       if root then "#{root}#{boardID}/#{if isArchived then 'archive/' else ''}res/#{threadID}.json" else ''
@@ -111,7 +110,6 @@ SW.tinyboard =
     nav:
       prev: '.pages > form > [value=Previous]'
       next: '.pages > form > [value=Next]'
-    archiveThreadID: '#archive-list td:first-of-type'
 
   classes:
     highlight: 'highlighted'
@@ -211,6 +209,3 @@ SW.tinyboard =
 
   catalogPin: (threadRoot) ->
     threadRoot.dataset.sticky = 'true'
-
-  archiveListParse: (response) ->
-    $$(SW.tinyboard.selectors.archiveThreadID, response).map((x) -> +x.textContent)