From 28ed2718ba17511d48158bd722a9014f13842fdc Mon Sep 17 00:00:00 2001
From: Kyle Drake <kyle@kyledrake.net>
Date: Tue, 28 Mar 2023 16:07:31 -0500
Subject: [PATCH 1/2] fix for screenshot worker test

---
 workers/screenshot_worker.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/workers/screenshot_worker.rb b/workers/screenshot_worker.rb
index 84f2d682..31cdc52e 100644
--- a/workers/screenshot_worker.rb
+++ b/workers/screenshot_worker.rb
@@ -47,7 +47,7 @@ class ScreenshotWorker
       base_image_tmpfile_path = "/tmp/#{SecureRandom.uuid}.png"
 
       http_resp = HTTP.basic_auth(user: api_user, pass: api_password).get(uri)
-      BlackBox.new(site, path).check_uri(http_resp.headers['X-URL'])
+      BlackBox.new(site, path).check_uri(http_resp.headers['X-URL']) if defined?(BlackBox)
       File.write base_image_tmpfile_path, http_resp.to_s
 
       user_screenshots_path = File.join SCREENSHOTS_PATH, Site.sharding_dir(username), username
@@ -72,7 +72,7 @@ class ScreenshotWorker
     rescue => e
       raise e
     ensure
-      FileUtils.rm base_image_tmpfile_path
+      FileUtils.rm base_image_tmpfile_path if File.exist?(base_image_tmpfile_path)
     end
   end
 

From 5a77fcb519467aeb379fddc4a7ddcd7af4a752d6 Mon Sep 17 00:00:00 2001
From: Kyle Drake <kyle@kyledrake.net>
Date: Fri, 28 Apr 2023 10:19:57 -0500
Subject: [PATCH 2/2] switch to ajax call to disable mystery caching that's
 popped up for some reason

---
 views/site_files/text_editor.erb | 67 +++++++++++++++++---------------
 1 file changed, 36 insertions(+), 31 deletions(-)

diff --git a/views/site_files/text_editor.erb b/views/site_files/text_editor.erb
index 9a5f7a79..f60a22af 100644
--- a/views/site_files/text_editor.erb
+++ b/views/site_files/text_editor.erb
@@ -163,42 +163,47 @@
 
   var editor = {}
 
+
   $(document).ready(function() {
-    $.get("/site_files/download/<%= Addressable::URI.parse(@filename).normalized_path.to_s %>", function(resp) {
-      editor = ace.edit("editor")
-      setTheme()
-      <% if @ace_mode %>
-        editor.getSession().setMode("ace/mode/<%= @ace_mode %>")
-      <% end %>
-      editor.getSession().setTabSize(2)
-      editor.getSession().setUseWrapMode(true)
-      editor.setFontSize(14)
-      editor.setShowPrintMargin(false)
-      editor.setOptions({
-        maxLines: Infinity,
-        autoScrollEditorIntoView: true
-      })
+    $.ajax({
+      url: "/site_files/download/<%= Addressable::URI.parse(@filename).normalized_path.to_s %>",
+      cache: false,
+      success: function(resp) {
+        editor = ace.edit("editor")
+        setTheme()
+        <% if @ace_mode %>
+          editor.getSession().setMode("ace/mode/<%= @ace_mode %>")
+        <% end %>
+        editor.getSession().setTabSize(2)
+        editor.getSession().setUseWrapMode(true)
+        editor.setFontSize(14)
+        editor.setShowPrintMargin(false)
+        editor.setOptions({
+          maxLines: Infinity,
+          autoScrollEditorIntoView: true
+        })
 
-      // Disable autocomplete
-      editor.setBehavioursEnabled(false)
+        // Disable autocomplete
+        editor.setBehavioursEnabled(false)
 
-      editor.setValue(resp, -1)
-      editor.getSession().setUndoManager(new ace.UndoManager())
+        editor.setValue(resp, -1)
+        editor.getSession().setUndoManager(new ace.UndoManager())
 
-      editor.on('change', function(obj) {
-        $('a#saveButton,a#saveAndExitButton').css('opacity', 1)
-        unsavedChanges = true
-      })
+        editor.on('change', function(obj) {
+          $('a#saveButton,a#saveAndExitButton').css('opacity', 1)
+          unsavedChanges = true
+        })
 
-      editor.commands.addCommand({
-          name: 'saveCommand',
-          bindKey: {win: 'Ctrl-S',  mac: 'Command-S'},
-          exec: function(editor) {
-            saveTextFile(false)
-          }
-      })
-    })
-  })
+        editor.commands.addCommand({
+            name: 'saveCommand',
+            bindKey: {win: 'Ctrl-S',  mac: 'Command-S'},
+            exec: function(editor) {
+              saveTextFile(false)
+            }
+        })
+      }
+    });
+  });
 
   window.onbeforeunload = function() {
     if(unsavedChanges == true)