Commiting

app/javascript/gabsocial/actions/blocks.js

@@ -11,79 +11,69 @@ export const BLOCKS_EXPAND_REQUEST = 'BLOCKS_EXPAND_REQUEST'
 export const BLOCKS_EXPAND_SUCCESS = 'BLOCKS_EXPAND_SUCCESS'
 export const BLOCKS_EXPAND_FAIL    = 'BLOCKS_EXPAND_FAIL'
 
-export function fetchBlocks() {
-  return (dispatch, getState) => {
-    if (!me) return
+/**
+ * 
+ */
+export const fetchBlocks = () => (dispatch, getState) => {
+  if (!me) return
 
-    dispatch(fetchBlocksRequest())
+  dispatch(fetchBlocksRequest())
 
-    api(getState).get('/api/v1/blocks').then(response => {
-      const next = getLinks(response).refs.find(link => link.rel === 'next')
-      dispatch(importFetchedAccounts(response.data))
-      dispatch(fetchBlocksSuccess(response.data, next ? next.uri : null))
-      dispatch(fetchRelationships(response.data.map(item => item.id)))
-    }).catch(error => dispatch(fetchBlocksFail(error)))
-  }
+  api(getState).get('/api/v1/blocks').then(response => {
+    const next = getLinks(response).refs.find(link => link.rel === 'next')
+    dispatch(importFetchedAccounts(response.data))
+    dispatch(fetchBlocksSuccess(response.data, next ? next.uri : null))
+    dispatch(fetchRelationships(response.data.map(item => item.id)))
+  }).catch(error => dispatch(fetchBlocksFail(error)))
 }
 
-export function fetchBlocksRequest() {
-  return {
-    type: BLOCKS_FETCH_REQUEST,
-  }
+export const fetchBlocksRequest = () => ({
+  type: BLOCKS_FETCH_REQUEST,
+})
+
+export const fetchBlocksSuccess = (accounts, next) => ({
+  type: BLOCKS_FETCH_SUCCESS,
+  accounts,
+  next,
+})
+
+export const fetchBlocksFail = (error) => ({
+  type: BLOCKS_FETCH_FAIL,
+  error,
+})
+
+/**
+ * 
+ */
+export const expandBlocks = () => (dispatch, getState) => {
+  if (!me) return
+  
+  const url = getState().getIn(['user_lists', 'blocks', me, 'next'])
+  const isLoading = getState().getIn(['user_lists', 'blocks', me, 'isLoading'])
+
+  if (url === null || isLoading) return
+
+  dispatch(expandBlocksRequest())
+
+  api(getState).get(url).then(response => {
+    const next = getLinks(response).refs.find(link => link.rel === 'next')
+    dispatch(importFetchedAccounts(response.data))
+    dispatch(expandBlocksSuccess(response.data, next ? next.uri : null))
+    dispatch(fetchRelationships(response.data.map(item => item.id)))
+  }).catch(error => dispatch(expandBlocksFail(error)))
 }
 
-export function fetchBlocksSuccess(accounts, next) {
-  return {
-    type: BLOCKS_FETCH_SUCCESS,
-    accounts,
-    next,
-  }
-}
+export const expandBlocksRequest = () => ({
+  type: BLOCKS_EXPAND_REQUEST,
+})
 
-export function fetchBlocksFail(error) {
-  return {
-    type: BLOCKS_FETCH_FAIL,
-    error,
-  }
-}
+export const expandBlocksSuccess = (accounts, next) => ({
+  type: BLOCKS_EXPAND_SUCCESS,
+  accounts,
+  next,
+})
 
-export function expandBlocks() {
-  return (dispatch, getState) => {
-    if (!me) return
-    
-    const url = getState().getIn(['user_lists', 'blocks', me, 'next'])
-    const isLoading = getState().getIn(['user_lists', 'blocks', me, 'isLoading'])
-
-    if (url === null || isLoading) return
-
-    dispatch(expandBlocksRequest())
-
-    api(getState).get(url).then(response => {
-      const next = getLinks(response).refs.find(link => link.rel === 'next')
-      dispatch(importFetchedAccounts(response.data))
-      dispatch(expandBlocksSuccess(response.data, next ? next.uri : null))
-      dispatch(fetchRelationships(response.data.map(item => item.id)))
-    }).catch(error => dispatch(expandBlocksFail(error)))
-  }
-}
-
-export function expandBlocksRequest() {
-  return {
-    type: BLOCKS_EXPAND_REQUEST,
-  }
-}
-
-export function expandBlocksSuccess(accounts, next) {
-  return {
-    type: BLOCKS_EXPAND_SUCCESS,
-    accounts,
-    next,
-  }
-}
-
-export function expandBlocksFail(error) {
-  return {
-    type: BLOCKS_EXPAND_FAIL,
-    error,
-  }
-}
+export const expandBlocksFail = (error) => ({
+  type: BLOCKS_EXPAND_FAIL,
+  error,
+})