refactor

routes/_actions/timeline.js

@@ -1,6 +1,6 @@
 import { store } from '../_store/store'
-import { database } from '../_utils/database/database'
-import { getTimeline } from '../_utils/mastodon/timelines'
+import { database } from '../_database/database'
+import { getTimeline } from '../_api/timelines'
 import { toast } from '../_utils/toast'
 import { mark, stop } from '../_utils/marks'
 import { mergeArrays } from '../_utils/arrays'

routes/_api/StatusStream.js

@@ -1,4 +1,4 @@
-import { paramsString } from '../ajax'
+import { paramsString } from '../_utils/ajax'
 import noop from 'lodash/noop'
 import WebSocketClient from '@gamestdio/websocket'
 

routes/_api/instance.js

@@ -1,4 +1,4 @@
-import { get } from '../ajax'
+import { get } from '../_utils/ajax'
 import { basename } from './utils'
 
 export function getInstanceInfo(instanceName) {

routes/_api/oauth.js

@@ -1,7 +1,7 @@
 const WEBSITE = 'https://pinafore.social'
 const SCOPES = 'read write follow'
 const CLIENT_NAME = 'Pinafore'
-import { post, get, paramsString } from '../ajax'
+import { post, get, paramsString } from '../_utils/ajax'
 import { basename } from './utils'
 
 export function registerApplication(instanceName, redirectUri) {

routes/_api/search.js

@@ -1,4 +1,4 @@
-import { get, paramsString } from '../ajax'
+import { get, paramsString } from '../_utils/ajax'
 
 export function search(instanceName, accessToken, query) {
   let url = `https://${instanceName}/api/v1/search?` + paramsString({

routes/_api/timelines.js

@@ -1,4 +1,4 @@
-import { get, paramsString } from '../ajax'
+import { get, paramsString } from '../_utils/ajax'
 import { basename } from './utils'
 
 function getTimelineUrlPath(timeline) {

routes/_api/user.js

@@ -1,4 +1,4 @@
-import { get, paramsString } from '../ajax'
+import { get, paramsString } from '../_utils/ajax'
 import { basename } from './utils'
 
 export function getVerifyCredentials(instanceName, accessToken) {

routes/_components/search/Search.html

@@ -59,7 +59,7 @@
   import { store } from '../../_store/store'
   import LoadingPage from '../LoadingPage.html'
   import { toast } from '../../_utils/toast'
-  import { search } from '../../_utils/mastodon/search'
+  import { search } from '../../_api/search'
   import SearchResults from './SearchResults.html'
 
   export default {

routes/_components/timeline/Timeline.html

@@ -52,7 +52,7 @@
   import LoadingFooter from './LoadingFooter.html'
   import VirtualList from '../virtualList/VirtualList.html'
   import { timelines } from '../../_static/timelines'
-  import { database } from '../../_utils/database/database'
+  import { database } from '../../_database/database'
   import { initializeTimeline, fetchTimelineItemsOnScrollToBottom, setupTimeline } from '../../_actions/timeline'
   import LoadingPage from '../LoadingPage.html'
 

routes/accounts/_actions/[accountId].js

@@ -1,5 +1,5 @@
-import { getAccount, getRelationship } from '../../_utils/mastodon/user'
-import { database } from '../../_utils/database/database'
+import { getAccount, getRelationship } from '../../_api/user'
+import { database } from '../../_database/database'
 import { store } from '../../_store/store'
 
 async function updateAccount(accountId, instanceName, accessToken) {

routes/settings/instances/_actions/[instanceName].js

@@ -1,8 +1,8 @@
-import { getVerifyCredentials } from '../../../_utils/mastodon/user'
+import { getVerifyCredentials } from '../../../_api/user'
 import { store } from '../../../_store/store'
 import { switchToTheme } from '../../../_utils/themeEngine'
 import { toast } from '../../../_utils/toast'
-import { database } from '../../../_utils/database/database'
+import { database } from '../../../_database/database'
 import { goto } from 'sapper/runtime.js'
 import pAny from 'p-any'
 

routes/settings/instances/_actions/add.js

@@ -1,8 +1,8 @@
-import { getAccessTokenFromAuthCode, registerApplication, generateAuthLink } from '../../../_utils/mastodon/oauth'
-import { getInstanceInfo } from '../../../_utils/mastodon/instance'
+import { getAccessTokenFromAuthCode, registerApplication, generateAuthLink } from '../../../_api/oauth'
+import { getInstanceInfo } from '../../../_api/instance'
 import { goto } from 'sapper/runtime.js'
 import { switchToTheme } from '../../../_utils/themeEngine'
-import { database } from '../../../_utils/database/database'
+import { database } from '../../../_database/database'
 import { store } from '../../../_store/store'
 import { updateVerifyCredentialsForInstance } from './[instanceName]'
 

server.js

@@ -6,7 +6,7 @@ const static = require('serve-static');
 
 const { PORT = 4002 } = process.env;
 
-// this allows us to do e.g. `fetch('/api/blog')` on the server
+// this allows us to do e.g. `fetch('/_api/blog')` on the server
 const fetch = require('node-fetch');
 global.fetch = (url, opts) => {
 	if (url[0] === '/') url = `http://localhost:${PORT}${url}`;