From 42fd1533649021c2033dcc1f123a06a99d4fffe4 Mon Sep 17 00:00:00 2001
From: Nolan Lawson <nolan@nolanlawson.com>
Date: Thu, 18 Jan 2018 21:52:58 -0800
Subject: [PATCH] more refinements to fetching and offline

---
 routes/_components/VirtualList.html |  9 +++++++--
 routes/_utils/mastodon/oauth.js     |  7 ++++---
 routes/_utils/mastodon/timelines.js |  3 ++-
 routes/_utils/mastodon/user.js      |  3 ++-
 routes/_utils/mastodon/utils.js     | 15 +++++++++++++++
 5 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 routes/_utils/mastodon/utils.js

diff --git a/routes/_components/VirtualList.html b/routes/_components/VirtualList.html
index 4451930..6e4538d 100644
--- a/routes/_components/VirtualList.html
+++ b/routes/_components/VirtualList.html
@@ -17,9 +17,11 @@
 <script>
   import VirtualListItem from './VirtualListItem'
   import { virtualListStore } from '../_utils/virtualListStore'
+  import throttle from 'lodash/throttle'
   import { mark, stop } from '../_utils/marks'
 
-  const DISTANCE_FROM_BOTTOM_TO_FIRE = 200
+  const DISTANCE_FROM_BOTTOM_TO_FIRE = 400
+  const SCROLL_TO_BOTTOM_DELAY = 1000
 
   export default {
     oncreate () {
@@ -29,6 +31,9 @@
           items: items
         })
         stop('set items')
+        this.fireScrollToBottom = throttle(() => {
+          this.fire('scrollToBottom')
+        }, SCROLL_TO_BOTTOM_DELAY)
       })
 
       let observedOnce = false
@@ -40,7 +45,7 @@
         }
         if (distanceFromBottom >= 0 &&
             distanceFromBottom <= DISTANCE_FROM_BOTTOM_TO_FIRE) {
-          this.fire('scrollToBottom')
+          this.fireScrollToBottom()
         }
       })
     },
diff --git a/routes/_utils/mastodon/oauth.js b/routes/_utils/mastodon/oauth.js
index 8911dd8..7f11508 100644
--- a/routes/_utils/mastodon/oauth.js
+++ b/routes/_utils/mastodon/oauth.js
@@ -2,9 +2,10 @@ const WEBSITE = 'https://pinafore.social'
 const SCOPES = 'read write follow'
 const CLIENT_NAME = 'Pinafore'
 import { post, get, paramsString } from '../ajax'
+import { basename } from './utils'
 
 export function registerApplication(instanceName, redirectUri) {
-  const url = `https://${instanceName}/api/v1/apps`
+  const url = `${basename(instanceName)}/api/v1/apps`
   return post(url, {
       client_name: CLIENT_NAME,
       redirect_uris: redirectUri,
@@ -20,11 +21,11 @@ export function generateAuthLink(instanceName, clientId, redirectUri) {
     'response_type': 'code',
     'scope': SCOPES
   })
-  return `https://${instanceName}/oauth/authorize?${params}`
+  return `${basename(instanceName)}/oauth/authorize?${params}`
 }
 
 export function getAccessTokenFromAuthCode(instanceName, clientId, clientSecret, code, redirectUri) {
-  let url = `https://${instanceName}/oauth/token`
+  let url = `${basename(instanceName)}/oauth/token`
   return post(url, {
     client_id: clientId,
     client_secret: clientSecret,
diff --git a/routes/_utils/mastodon/timelines.js b/routes/_utils/mastodon/timelines.js
index 2ad3093..1148c43 100644
--- a/routes/_utils/mastodon/timelines.js
+++ b/routes/_utils/mastodon/timelines.js
@@ -1,7 +1,8 @@
 import { get, paramsString } from '../ajax'
+import { basename } from './utils'
 
 export function getHomeTimeline(instanceName, accessToken, maxId, since) {
-  let url = `https://${instanceName}/api/v1/timelines/home`
+  let url = `${basename(instanceName)}/api/v1/timelines/home`
 
   let params = {}
   if (since) {
diff --git a/routes/_utils/mastodon/user.js b/routes/_utils/mastodon/user.js
index 8818d68..09c1b00 100644
--- a/routes/_utils/mastodon/user.js
+++ b/routes/_utils/mastodon/user.js
@@ -1,7 +1,8 @@
 import { get } from '../ajax'
+import { basename } from './utils'
 
 export function getThisUserAccount(instanceName, accessToken) {
-  let url = `https://${instanceName}/api/v1/accounts/verify_credentials`
+  let url = `${basename(instanceName)}/api/v1/accounts/verify_credentials`
   return get(url, {
     'Authorization': `Bearer ${accessToken}`
   })
diff --git a/routes/_utils/mastodon/utils.js b/routes/_utils/mastodon/utils.js
new file mode 100644
index 0000000..4c75797
--- /dev/null
+++ b/routes/_utils/mastodon/utils.js
@@ -0,0 +1,15 @@
+const isLocalhost = process.browser && process.env.NODE_ENV !== 'production' &&
+  (document.location.hostname === 'localhost' ||
+  document.location.hostname === '127.0.0.1')
+
+function targetIsLocalhost(instanceName) {
+  return process.browser && process.env.NODE_ENV !== 'production' &&
+    (instanceName === 'localhost:3000' || instanceName === '127.0.0.1:3000')
+}
+
+export function basename(instanceName) {
+  if (isLocalhost && targetIsLocalhost(instanceName)) {
+    return `http://${instanceName}`
+  }
+  return `https://${instanceName}`
+}
\ No newline at end of file