Commiting

app/javascript/gabsocial/actions/bookmarks.js

@@ -10,89 +10,79 @@ export const BOOKMARKED_STATUSES_EXPAND_REQUEST = 'BOOKMARKED_STATUSES_EXPAND_RE
 export const BOOKMARKED_STATUSES_EXPAND_SUCCESS = 'BOOKMARKED_STATUSES_EXPAND_SUCCESS'
 export const BOOKMARKED_STATUSES_EXPAND_FAIL = 'BOOKMARKED_STATUSES_EXPAND_FAIL'
 
-export function fetchBookmarkedStatuses() {
-  return (dispatch, getState) => {
-    if (!me) return
+/**
+ * 
+ */
+export const fetchBookmarkedStatuses = () => (dispatch, getState) => {
+  if (!me) return
 
-    if (getState().getIn(['status_lists', 'bookmarks', 'isLoading'])) {
-      return
-    }
-
-    dispatch(fetchBookmarkedStatusesRequest())
-
-    api(getState).get('/api/v1/bookmarks').then(response => {
-      const next = getLinks(response).refs.find(link => link.rel === 'next')
-      dispatch(importFetchedStatuses(response.data))
-      dispatch(fetchBookmarkedStatusesSuccess(response.data, next ? next.uri : null))
-    }).catch(error => {
-      dispatch(fetchBookmarkedStatusesFail(error))
-    })
+  if (getState().getIn(['status_lists', 'bookmarks', 'isLoading'])) {
+    return
   }
+
+  dispatch(fetchBookmarkedStatusesRequest())
+
+  api(getState).get('/api/v1/bookmarks').then(response => {
+    const next = getLinks(response).refs.find(link => link.rel === 'next')
+    dispatch(importFetchedStatuses(response.data))
+    dispatch(fetchBookmarkedStatusesSuccess(response.data, next ? next.uri : null))
+  }).catch(error => {
+    dispatch(fetchBookmarkedStatusesFail(error))
+  })
 }
 
-export function fetchBookmarkedStatusesRequest() {
-  return {
-    type: BOOKMARKED_STATUSES_FETCH_REQUEST,
-    skipLoading: true,
+const fetchBookmarkedStatusesRequest = () => ({
+  type: BOOKMARKED_STATUSES_FETCH_REQUEST,
+  skipLoading: true,
+})
+
+const fetchBookmarkedStatusesSuccess = (statuses, next) => ({
+  type: BOOKMARKED_STATUSES_FETCH_SUCCESS,
+  statuses,
+  next,
+  skipLoading: true,
+})
+
+const fetchBookmarkedStatusesFail = (error) => ({
+  type: BOOKMARKED_STATUSES_FETCH_FAIL,
+  error,
+  skipLoading: true,
+})
+
+/**
+ * 
+ */
+export const expandBookmarkedStatuses = () => (dispatch, getState) => {
+  if (!me) return
+
+  const url = getState().getIn(['status_lists', 'bookmarks', 'next'], null)
+
+  if (url === null || getState().getIn(['status_lists', 'bookmarks', 'isLoading'])) {
+    return
   }
+
+  dispatch(expandBookmarkedStatusesRequest())
+
+  api(getState).get(url).then(response => {
+    const next = getLinks(response).refs.find(link => link.rel === 'next')
+    dispatch(importFetchedStatuses(response.data))
+    dispatch(expandBookmarkedStatusesSuccess(response.data, next ? next.uri : null))
+  }).catch(error => {
+    dispatch(expandBookmarkedStatusesFail(error))
+  })
 }
 
-export function fetchBookmarkedStatusesSuccess(statuses, next) {
-  return {
-    type: BOOKMARKED_STATUSES_FETCH_SUCCESS,
-    statuses,
-    next,
-    skipLoading: true,
-  }
-}
+const expandBookmarkedStatusesRequest = () => ({
+  type: BOOKMARKED_STATUSES_EXPAND_REQUEST,
+})
 
-export function fetchBookmarkedStatusesFail(error) {
-  return {
-    type: BOOKMARKED_STATUSES_FETCH_FAIL,
-    error,
-    skipLoading: true,
-  }
-}
+const expandBookmarkedStatusesSuccess = (statuses, next) => ({
+  type: BOOKMARKED_STATUSES_EXPAND_SUCCESS,
+  statuses,
+  next,
+})
 
-export function expandBookmarkedStatuses() {
-  return (dispatch, getState) => {
-    if (!me) return
-
-    const url = getState().getIn(['status_lists', 'bookmarks', 'next'], null)
-
-    if (url === null || getState().getIn(['status_lists', 'bookmarks', 'isLoading'])) {
-      return
-    }
-
-    dispatch(expandBookmarkedStatusesRequest())
-
-    api(getState).get(url).then(response => {
-      const next = getLinks(response).refs.find(link => link.rel === 'next')
-      dispatch(importFetchedStatuses(response.data))
-      dispatch(expandBookmarkedStatusesSuccess(response.data, next ? next.uri : null))
-    }).catch(error => {
-      dispatch(expandBookmarkedStatusesFail(error))
-    })
-  }
-}
-
-export function expandBookmarkedStatusesRequest() {
-  return {
-    type: BOOKMARKED_STATUSES_EXPAND_REQUEST,
-  }
-}
-
-export function expandBookmarkedStatusesSuccess(statuses, next) {
-  return {
-    type: BOOKMARKED_STATUSES_EXPAND_SUCCESS,
-    statuses,
-    next,
-  }
-}
-
-export function expandBookmarkedStatusesFail(error) {
-  return {
-    type: BOOKMARKED_STATUSES_EXPAND_FAIL,
-    error,
-  }
-}
+const expandBookmarkedStatusesFail = (error) => ({
+  type: BOOKMARKED_STATUSES_EXPAND_FAIL,
+  error,
+})