Merge branch 'develop' into feature/hash-routed

4 files changed, 23 insertions, 5 deletions

diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 87a7e2e5..de89f503 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -1,6 +1,7 @@
 /* eslint-env browser */
 const LOGIN_URL = '/api/account/verify_credentials.json'
 const FRIENDS_TIMELINE_URL = '/api/statuses/friends_timeline.json'
+const ALL_FOLLOWING_URL = '/api/qvitter/allfollowing'
 const PUBLIC_TIMELINE_URL = '/api/statuses/public_timeline.json'
 const PUBLIC_AND_EXTERNAL_TIMELINE_URL = '/api/statuses/public_and_external_timeline.json'
 const FAVORITE_URL = '/api/favorites/create'
@@ -54,6 +55,12 @@ const fetchFriends = ({credentials}) => {
     .then((data) => data.json())
 }
 
+const fetchAllFollowing = ({username, credentials}) => {
+  const url = `${ALL_FOLLOWING_URL}/${username}.json`
+  return fetch(url, { headers: authHeaders(credentials) })
+    .then((data) => data.json().users)
+}
+
 const fetchMentions = ({username, sinceId = 0, credentials}) => {
   let url = `${MENTIONS_URL}?since_id=${sinceId}&screen_name=${username}`
   return fetch(url, { headers: authHeaders(credentials) })
@@ -169,7 +176,8 @@ const apiService = {
   retweet,
   postStatus,
   deleteStatus,
-  uploadMedia
+  uploadMedia,
+  fetchAllFollowing
 }
 
 export default apiService
diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js
index 746776bf..d335bfb7 100644
--- a/src/services/backend_interactor_service/backend_interactor_service.js
+++ b/src/services/backend_interactor_service/backend_interactor_service.js
@@ -1,4 +1,5 @@
 import apiService from '../api/api.service.js'
+import timelineFetcherService from '../timeline_fetcher/timeline_fetcher.service.js'
 
 const backendInteractorService = (credentials) => {
   const fetchStatus = ({id}) => {
@@ -17,6 +18,10 @@ const backendInteractorService = (credentials) => {
     return apiService.fetchFriends({credentials})
   }
 
+  const fetchAllFollowing = ({username}) => {
+    return apiService.fetchAllFollowing({username, credentials})
+  }
+
   const followUser = (id) => {
     return apiService.followUser({credentials, id})
   }
@@ -25,6 +30,10 @@ const backendInteractorService = (credentials) => {
     return apiService.unfollowUser({credentials, id})
   }
 
+  const startFetching = ({timeline, store}) => {
+    return timelineFetcherService.startFetching({timeline, store, credentials})
+  }
+
   const backendInteractorServiceInstance = {
     fetchStatus,
     fetchConversation,
@@ -32,7 +41,9 @@ const backendInteractorService = (credentials) => {
     fetchFriends,
     followUser,
     unfollowUser,
-    verifyCredentials: apiService.verifyCredentials
+    fetchAllFollowing,
+    verifyCredentials: apiService.verifyCredentials,
+    startFetching
   }
 
   return backendInteractorServiceInstance
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index 79b68b38..0a5be77d 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -34,7 +34,7 @@ const setStyle = (href) => {
 
     styleSheet.insertRule(`a { color: ${base08Color}`, 'index-max')
     styleSheet.insertRule(`body { color: ${base05Color}`, 'index-max')
-    styleSheet.insertRule(`.base05-border { color: ${base05Color}`, 'index-max')
+    styleSheet.insertRule(`.base05-border { border-color: ${base05Color}`, 'index-max')
     body.style.display = 'initial'
   }
   cssEl.addEventListener('load', setDynamic)
diff --git a/src/services/timeline_fetcher/timeline_fetcher.service.js b/src/services/timeline_fetcher/timeline_fetcher.service.js
index 0d4ffcad..37bbcd82 100644
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -30,8 +30,7 @@ const fetchAndUpdate = ({store, credentials, timeline = 'friends', older = false
 const startFetching = ({ timeline = 'friends', credentials, store }) => {
   fetchAndUpdate({timeline, credentials, store, showImmediately: true})
   const boundFetchAndUpdate = () => fetchAndUpdate({ timeline, credentials, store })
-
-  setInterval(boundFetchAndUpdate, 10000)
+  return setInterval(boundFetchAndUpdate, 10000)
 }
 const timelineFetcher = {
   fetchAndUpdate,