dont hardcode s3 path

3 files changed, 13 insertions, 5 deletions

diff --git a/public/assets/js/index.js b/public/assets/js/index.js
index 06f2158..51c2226 100644
--- a/public/assets/js/index.js
+++ b/public/assets/js/index.js
@@ -12,6 +12,7 @@ var app = (function(){
     set_background_color_from_time()
     
     auth.init(app.ready)
+    sdk.init()
   }
   
   app.ready = function(){
diff --git a/public/assets/js/lib/sdk/_sdk.js b/public/assets/js/lib/sdk/_sdk.js
index 06726d8..a418695 100644
--- a/public/assets/js/lib/sdk/_sdk.js
+++ b/public/assets/js/lib/sdk/_sdk.js
@@ -5,8 +5,15 @@ var sdk = (function(){
 
   var endpoint = window.location.origin
 
-  sdk.init = function(opt){
-    switch (sdk.env = opt.env || "development") {
+  sdk.init = function(){
+    try {
+      const preload = document.querySelector('#preload').getAttribute('payload')
+      sdk.opt = JSON.parse(preload)
+    } catch (e) {
+      console.error("preload error", e)
+      sdk.opt = { s3: {} }
+    }
+    switch (sdk.env = sdk.opt.env || "development") {
       case 'test':
         break
       default:
@@ -22,7 +29,7 @@ var sdk = (function(){
   }
 
   sdk.image = function(file, size){
-    return "https://i.asdf.us/bucky/data/" + file.thread + "/" + file.id
+    return "https://" + sdk.opt.s3.bucket + sdk.opt.s3.path + "/data/" + file.thread + "/" + file.id
   }
 
 //   $.ajaxSetup({
diff --git a/public/assets/js/util/format.js b/public/assets/js/util/format.js
index 837bf5d..a2da53a 100644
--- a/public/assets/js/util/format.js
+++ b/public/assets/js/util/format.js
@@ -238,7 +238,7 @@ function is_image(url){
 }
 function make_link(file){
   if (file.storage) {
-    return "//s3.amazonaws.com/" + file.storage + "/bucky/data/" + file.thread + "/" + encodeURIComponent(file.filename)
+    return "//s3.amazonaws.com/" + file.storage + sdk.opt.s3.path + "/data/" + file.thread + "/" + encodeURIComponent(file.filename)
   }
   if (file.filename.indexOf("http") !== 0) {
     return "/data/" + file.thread + "/" + encodeURIComponent(file.filename)
@@ -250,7 +250,7 @@ function profile_image(username){
 }
 function make_thumb(file){
   if (file.storage) {
-    return "//s3.amazonaws.com/" + file.storage + "/bucky/data/" + file.thread + "/" + encodeURIComponent(file.filename)
+    return "//s3.amazonaws.com/" + file.storage + sdk.opt.s3.path + "/data/" + file.thread + "/" + encodeURIComponent(file.filename)
   }
   if (file.filename.indexOf("http") !== 0) {
     return "/data/" + file.thread + "/" + file.filename