random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated user lists

Browse Source 
• Updated:
- user lists
- follow_requests, followers, following, mutes, blocks
This commit is contained in:
mgabdev
2020-06-09 16:47:12 -04:00
parent 26829507fc
commit ddcf85c672
10 changed files with 190 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/javascript/gabsocial/actions/accounts.js
View File

@@ -441,10 +441,9 @@ export function expandFollowers(id) {
if (!me) return;
const url = getState().getIn(['user_lists', 'followers', id, 'next']);
const isLoading = getState().getIn(['user_lists', 'followers', id, 'isLoading']);
if (url === null) {
return;
}
if (url === null || isLoading) return
dispatch(expandFollowersRequest(id));
@@ -454,7 +453,8 @@ export function expandFollowers(id) {
dispatch(importFetchedAccounts(response.data));
dispatch(expandFollowersSuccess(id, response.data, next ? next.uri : null));
dispatch(fetchRelationships(response.data.map(item => item.id)));
}).catch(error => {
}).catch((error) => {
console.log("error:", error)
dispatch(expandFollowersFail(id, error));
});
};
@@ -531,10 +531,9 @@ export function expandFollowing(id) {
if (!me) return;
const url = getState().getIn(['user_lists', 'following', id, 'next']);
const isLoading = getState().getIn(['user_lists', 'following', id, 'isLoading']);
if (url === null) {
return;
}
if (url === null || isLoading) return
dispatch(expandFollowingRequest(id));
@@ -583,6 +582,9 @@ export function fetchRelationships(accountIds) {
if (newAccountIds.length === 0) {
return;
} else if (newAccountIds.length == 1) {
const firstId = newAccountIds[0]
if (me === firstId) return;
}
dispatch(fetchRelationshipsRequest(newAccountIds));
@@ -658,11 +660,10 @@ export function expandFollowRequests() {
return (dispatch, getState) => {
if (!me) return;
const url = getState().getIn(['user_lists', 'follow_requests', 'next']);
const url = getState().getIn(['user_lists', 'follow_requests', me, 'next']);
const isLoading = getState().getIn(['user_lists', 'follow_requests', me, 'isLoading']);
if (url === null) {
return;
}
if (url === null || isLoading) return
dispatch(expandFollowRequestsRequest());

87
app/javascript/gabsocial/actions/blocks.js
View File

@@ -1,90 +1,89 @@
import api, { getLinks } from '../api';
import { fetchRelationships } from './accounts';
import { importFetchedAccounts } from './importer';
import { me } from '../initial_state';
import api, { getLinks } from '../api'
import { fetchRelationships } from './accounts'
import { importFetchedAccounts } from './importer'
import { me } from '../initial_state'
export const BLOCKS_FETCH_REQUEST = 'BLOCKS_FETCH_REQUEST';
export const BLOCKS_FETCH_SUCCESS = 'BLOCKS_FETCH_SUCCESS';
export const BLOCKS_FETCH_FAIL = 'BLOCKS_FETCH_FAIL';
export const BLOCKS_FETCH_REQUEST = 'BLOCKS_FETCH_REQUEST'
export const BLOCKS_FETCH_SUCCESS = 'BLOCKS_FETCH_SUCCESS'
export const BLOCKS_FETCH_FAIL = 'BLOCKS_FETCH_FAIL'
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 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;
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)));
};
};
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 function fetchBlocksSuccess(accounts, next) {
return {
type: BLOCKS_FETCH_SUCCESS,
accounts,
next,
};
};
}
}
export function fetchBlocksFail(error) {
return {
type: BLOCKS_FETCH_FAIL,
error,
};
};
}
}
export function expandBlocks() {
return (dispatch, getState) => {
if (!me) return;
if (!me) return
const url = getState().getIn(['user_lists', 'blocks', 'next']);
const url = getState().getIn(['user_lists', 'blocks', me, 'next'])
const isLoading = getState().getIn(['user_lists', 'blocks', me, 'isLoading'])
if (url === null) {
return;
}
if (url === null || isLoading) return
dispatch(expandBlocksRequest());
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)));
};
};
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,
};
};
}
}

12
app/javascript/gabsocial/actions/groups.js
View File

@@ -284,11 +284,10 @@ export function expandMembers(id) {
return (dispatch, getState) => {
if (!me) return;
const url = getState().getIn(['user_lists', 'groups', id, 'next']);
const url = getState().getIn(['user_lists', 'groups', id, 'next'])
const isLoading = getState().getIn(['user_lists', 'groups', id, 'isLoading'])
if (url === null) {
return;
}
if (url === null || isLoading) return
dispatch(expandMembersRequest(id));
@@ -375,10 +374,9 @@ export function expandRemovedAccounts(id) {
if (!me) return;
const url = getState().getIn(['user_lists', 'groups_removed_accounts', id, 'next']);
const isLoading = getState().getIn(['user_lists', 'groups_removed_accounts', id, 'isLoading'])
if (url === null) {
return;
}
if (url === null || isLoading) return
dispatch(expandRemovedAccountsRequest(id));

7
app/javascript/gabsocial/actions/mutes.js
View File

@@ -54,11 +54,10 @@ export function expandMutes() {
return (dispatch, getState) => {
if (!me) return;
const url = getState().getIn(['user_lists', 'mutes', 'next']);
const url = getState().getIn(['user_lists', 'mutes', me, 'next']);
const isLoading = getState().getIn(['user_lists', 'mutes', me, 'isLoading']);
if (url === null) {
return;
}
if (url === null || isLoading) return
dispatch(expandMutesRequest());