aboutsummaryrefslogtreecommitdiff
path: root/src/services
diff options
context:
space:
mode:
Diffstat (limited to 'src/services')
-rw-r--r--src/services/api/api.service.js8
-rw-r--r--src/services/backend_interactor_service/backend_interactor_service.js5
-rw-r--r--src/services/style_setter/style_setter.js1
-rw-r--r--src/services/timeline_fetcher/timeline_fetcher.service.js13
4 files changed, 4 insertions, 23 deletions
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index f172f769..4dfc0a02 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -62,12 +62,6 @@ const fetchAllFollowing = ({username, credentials}) => {
.then((data) => data.json())
}
-const fetchMentions = ({username, sinceId = 0, credentials}) => {
- let url = `${MENTIONS_URL}?since_id=${sinceId}&screen_name=${username}`
- return fetch(url, { headers: authHeaders(credentials) })
- .then((data) => data.json())
-}
-
const fetchConversation = ({id, credentials}) => {
let url = `${CONVERSATION_URL}/${id}.json?count=100`
return fetch(url, { headers: authHeaders(credentials) })
@@ -100,6 +94,7 @@ const fetchTimeline = ({timeline, credentials, since = false, until = false}) =>
const timelineUrls = {
public: PUBLIC_TIMELINE_URL,
friends: FRIENDS_TIMELINE_URL,
+ mentions: MENTIONS_URL,
'publicAndExternal': PUBLIC_AND_EXTERNAL_TIMELINE_URL
}
@@ -192,7 +187,6 @@ const apiService = {
fetchTimeline,
fetchConversation,
fetchStatus,
- fetchMentions,
fetchFriends,
followUser,
unfollowUser,
diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js
index d379e602..bc68d02c 100644
--- a/src/services/backend_interactor_service/backend_interactor_service.js
+++ b/src/services/backend_interactor_service/backend_interactor_service.js
@@ -10,10 +10,6 @@ const backendInteractorService = (credentials) => {
return apiService.fetchConversation({id, credentials})
}
- const fetchMentions = ({sinceId, username}) => {
- return apiService.fetchMentions({sinceId, username, credentials})
- }
-
const fetchFriends = () => {
return apiService.fetchFriends({credentials})
}
@@ -43,7 +39,6 @@ const backendInteractorService = (credentials) => {
const backendInteractorServiceInstance = {
fetchStatus,
fetchConversation,
- fetchMentions,
fetchFriends,
followUser,
unfollowUser,
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index 7129852d..59d5a7de 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -45,6 +45,7 @@ const setStyle = (href, commit) => {
styleSheet.insertRule(`a { color: ${colors['base08']}`, 'index-max')
styleSheet.insertRule(`body { color: ${colors['base05']}`, 'index-max')
styleSheet.insertRule(`.base05-border { border-color: ${colors['base05']}`, 'index-max')
+ styleSheet.insertRule(`.base03-border { border-color: ${colors['base03']}`, '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 e684a170..24aef069 100644
--- a/src/services/timeline_fetcher/timeline_fetcher.service.js
+++ b/src/services/timeline_fetcher/timeline_fetcher.service.js
@@ -5,7 +5,7 @@ import apiService from '../api/api.service.js'
const update = ({store, statuses, timeline, showImmediately}) => {
const ccTimeline = camelCase(timeline)
- setError({store, timeline, value: false})
+ store.dispatch('setError', { value: false })
store.dispatch('addNewStatuses', {
timeline: ccTimeline,
@@ -14,15 +14,6 @@ const update = ({store, statuses, timeline, showImmediately}) => {
})
}
-const setError = ({store, timeline, value}) => {
- const ccTimeline = camelCase(timeline)
-
- store.dispatch('setError', {
- timeline: ccTimeline,
- value
- })
-}
-
const fetchAndUpdate = ({store, credentials, timeline = 'friends', older = false, showImmediately = false}) => {
const args = { timeline, credentials }
const rootState = store.rootState || store.state
@@ -36,7 +27,7 @@ const fetchAndUpdate = ({store, credentials, timeline = 'friends', older = false
return apiService.fetchTimeline(args)
.then((statuses) => update({store, statuses, timeline, showImmediately}),
- () => setError({store, timeline, value: true}))
+ () => store.dispatch('setError', { value: true }))
}
const startFetching = ({ timeline = 'friends', credentials, store }) => {