From 8fe9f2125f3cacfb49f92f3caff0e7bfbc3adeb1 Mon Sep 17 00:00:00 2001
From: Jonathan Staab <shtaab@gmail.com>
Date: Sat, 3 Dec 2022 12:56:27 -0800
Subject: [PATCH] Make dufflepud configurable

---
 .env.local                 |  1 +
 .env.production            |  1 +
 .gitignore                 |  1 -
 src/partials/Note.svelte   | 27 ++++++++++++++++++++++++---
 src/partials/Toggle.svelte | 34 +++++++++++++++-------------------
 src/routes/Settings.svelte | 11 +++++++++++
 src/state/app.js           |  1 +
 src/util/html.js           | 15 ---------------
 src/util/misc.js           |  1 +
 9 files changed, 54 insertions(+), 38 deletions(-)
 create mode 100644 .env.local
 create mode 100644 .env.production

diff --git a/.env.local b/.env.local
new file mode 100644
index 00000000..1703798e
--- /dev/null
+++ b/.env.local
@@ -0,0 +1 @@
+VITE_DUFFLEPUD_URL=http://localhost:8000
diff --git a/.env.production b/.env.production
new file mode 100644
index 00000000..4503780f
--- /dev/null
+++ b/.env.production
@@ -0,0 +1 @@
+VITE_DUFFLEPUD_URL=https://dufflepud.onrender.com
diff --git a/.gitignore b/.gitignore
index b6f33f9e..13a88267 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@ lerna-debug.log*
 node_modules
 dist
 dist-ssr
-*.local
 
 # Editor directories and files
 .vscode/*
diff --git a/src/partials/Note.svelte b/src/partials/Note.svelte
index b8d53c3f..b7c4cd54 100644
--- a/src/partials/Note.svelte
+++ b/src/partials/Note.svelte
@@ -1,11 +1,11 @@
 <script>
   import cx from 'classnames'
-  import {find, uniqBy, prop, whereEq} from 'ramda'
+  import {find, last, uniqBy, prop, whereEq} from 'ramda'
   import {onMount} from 'svelte'
   import {fly, slide} from 'svelte/transition'
   import {navigate} from 'svelte-routing'
   import {LinkPreview} from 'svelte-link-preview'
-  import {ellipsize} from 'hurdak/src/core'
+  import {ellipsize, first} from 'hurdak/src/core'
   import {hasParent, toHtml, findLink} from 'src/util/html'
   import Anchor from 'src/partials/Anchor.svelte'
   import {dispatch} from "src/state/dispatch"
@@ -13,7 +13,6 @@
   import {accounts, settings, modal} from "src/state/app"
   import {user} from "src/state/user"
   import {formatTimestamp} from 'src/util/misc'
-  import {getLinkPreview} from 'src/util/html'
   import UserBadge from "src/partials/UserBadge.svelte"
 
   export let note
@@ -42,6 +41,28 @@
     }
   })
 
+  const getLinkPreview = async url => {
+    const res = await fetch(`${$settings.dufflepudUrl}/link/preview`, {
+      method: 'POST',
+      body: JSON.stringify({url}),
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    })
+
+    const json = await res.json()
+
+    if (!json.title) {
+      return null
+    }
+
+    return {
+      ...json,
+      hostname: first(last(url.split('//')).split('/')),
+      sitename: null,
+    }
+  }
+
   const onClick = e => {
     if (!['I'].includes(e.target.tagName) && !hasParent('a', e.target)) {
       modal.set({note})
diff --git a/src/partials/Toggle.svelte b/src/partials/Toggle.svelte
index e1d7a762..941f57a5 100644
--- a/src/partials/Toggle.svelte
+++ b/src/partials/Toggle.svelte
@@ -1,8 +1,6 @@
 <script>
-  import cx from "classnames"
   import Switch from "svelte-switch"
 
-  export let wrapperClass = ""
   export let value
 
   const onChange = e => {
@@ -10,20 +8,18 @@
   }
 </script>
 
-<div class={wrapperClass}>
-  <Switch
-    checked={value}
-    on:change={onChange}
-    onColor="#ccc"
-    offColor="#ccc"
-    onHandleColor="#EB5E28"
-    handleDiameter={26}
-    unCheckedIcon={false}
-    boxShadow="0px 1px 5px rgba(0, 0, 0, 0.6)"
-    activeBoxShadow="0px 0px 1px 10px rgba(0, 0, 0, 0.2)"
-    height={20}
-    width={48}>
-    <span slot="checkedIcon" />
-    <span slot="unCheckedIcon" />
-  </Switch>
-</div>
+<Switch
+  checked={value}
+  on:change={onChange}
+  onColor="#ccc"
+  offColor="#ccc"
+  onHandleColor="#EB5E28"
+  handleDiameter={26}
+  unCheckedIcon={false}
+  boxShadow="0px 1px 5px rgba(0, 0, 0, 0.6)"
+  activeBoxShadow="0px 0px 1px 10px rgba(0, 0, 0, 0.2)"
+  height={20}
+  width={48}>
+  <span slot="checkedIcon" />
+  <span slot="unCheckedIcon" />
+</Switch>
diff --git a/src/routes/Settings.svelte b/src/routes/Settings.svelte
index 34df4005..ea94c438 100644
--- a/src/routes/Settings.svelte
+++ b/src/routes/Settings.svelte
@@ -3,6 +3,7 @@
   import {fly} from 'svelte/transition'
   import {navigate} from "svelte-routing"
   import Toggle from "src/partials/Toggle.svelte"
+  import Input from "src/partials/Input.svelte"
   import Button from "src/partials/Button.svelte"
   import {user} from "src/state/user"
   import {settings} from "src/state/app"
@@ -44,6 +45,16 @@
           in any note.
         </p>
       </div>
+      <div class="flex flex-col gap-1">
+        <strong>Dufflepud URL</strong>
+        <Input bind:value={values.dufflepudUrl}>
+          <i slot="before" class="fa-solid fa-server" />
+        </Input>
+        <p class="text-sm text-light">
+          Enter a custom url for Coracle's helper application. Dufflepud is used for
+          hosting images and loading link previews.
+        </p>
+      </div>
       <Button type="submit" class="text-center">Done</Button>
     </div>
   </div>
diff --git a/src/state/app.js b/src/state/app.js
index 41064557..663bbc14 100644
--- a/src/state/app.js
+++ b/src/state/app.js
@@ -11,6 +11,7 @@ export const modal = writable(null)
 
 export const settings = writable({
   showLinkPreviews: true,
+  dufflepudUrl: import.meta.env.VITE_DUFFLEPUD_URL,
   ...getLocalJson("coracle/settings"),
 })
 
diff --git a/src/util/html.js b/src/util/html.js
index 8f062d84..7f2ac2ee 100644
--- a/src/util/html.js
+++ b/src/util/html.js
@@ -1,4 +1,3 @@
-import {last} from 'ramda'
 import {first} from 'hurdak/lib/hurdak'
 
 export const copyToClipboard = text => {
@@ -81,17 +80,3 @@ export const toHtml = content => {
       return `<a href="${url}" target="_blank noopener" class="underline">${domain}</a>`
     })
 }
-
-export const getLinkPreview = async url => {
-  const res = await fetch('http://localhost:8000/link/preview', {
-    method: 'POST',
-    body: JSON.stringify({url}),
-    headers: {
-      'Content-Type': 'application/json',
-    },
-  })
-
-  const json = await res.json()
-
-  return {...json, hostname: first(last(url.split('//')).split('/')), sitename: null}
-}
diff --git a/src/util/misc.js b/src/util/misc.js
index aa54ae6c..ebe39e32 100644
--- a/src/util/misc.js
+++ b/src/util/misc.js
@@ -49,3 +49,4 @@ export const formatTimestamp = ts => {
 }
 
 export const sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
+