From cafb7250c798b5bcfd45ca76b7a72a6b0eeff6a7 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Mon, 11 Mar 2019 00:49:21 -0700
Subject: [PATCH] Simplify duplicated code for thread watcher requests.

---
 src/Monitoring/ThreadWatcher.coffee | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/Monitoring/ThreadWatcher.coffee b/src/Monitoring/ThreadWatcher.coffee
index 4886b37bb..b5658e696 100644
--- a/src/Monitoring/ThreadWatcher.coffee
+++ b/src/Monitoring/ThreadWatcher.coffee
@@ -219,18 +219,13 @@ ThreadWatcher =
     if ThreadWatcher.requests.length is 0
       ThreadWatcher.status.textContent = '...'
       $.addClass ThreadWatcher.refreshButton, 'fa-spin'
-    if Site.hasCORS?(url) or url.split('/')[...3].join('/') is location.origin
-      req = $.ajax url,
-        onloadend: ->
-          ThreadWatcher.parseStatus.call @, thread
-        timeout: $.MINUTE
-      ,
-        whenModified: if force then false else 'ThreadWatcher'
-    else
-      req = CrossOrigin.ajax url,
-        onloadend: ->
-          ThreadWatcher.parseStatus.call @, thread
-        timeout: $.MINUTE
+    ajax = if (siteID is Site.hostname) then $.ajax else CrossOrigin.ajax
+    req = ajax url,
+      onloadend: ->
+        ThreadWatcher.parseStatus.call @, thread
+      timeout: $.MINUTE
+    ,
+      whenModified: if force then false else 'ThreadWatcher'
     ThreadWatcher.requests.push req
 
   parseStatus: ({siteID, boardID, threadID, data}) ->