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

Fixed issue with group join requests not showing up in list 

• Fixed:
- issue with group join requests not showing up in list
This commit is contained in:
mgabdev 2020-12-30 12:40:02 -05:00
parent 2e0a781a5b
commit efacfeee19
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -831,81 +831,81 @@ export const checkGroupPasswordFail = (error) => ({
/** /**
* *
*/ */
export const fetchJoinRequests = (id) => (dispatch, getState) => { export const fetchJoinRequests = (groupId) => (dispatch, getState) => {
if (!me) return if (!me) return
dispatch(fetchJoinRequestsRequest(id)) dispatch(fetchJoinRequestsRequest(groupId))
api(getState).get(`/api/v1/groups/${id}/join_requests`).then((response) => { api(getState).get(`/api/v1/groups/${groupId}/join_requests`).then((response) => {
const next = getLinks(response).refs.find(link => link.rel === 'next') const next = getLinks(response).refs.find(link => link.rel === 'next')
dispatch(importFetchedAccounts(response.data)) dispatch(importFetchedAccounts(response.data))
dispatch(fetchJoinRequestsSuccess(id, response.data, next ? next.uri : null)) dispatch(fetchJoinRequestsSuccess(groupId, response.data, next ? next.uri : null))
dispatch(fetchRelationships(response.data.map(item => item.id))) dispatch(fetchRelationships(response.data.map(item => item.id)))
}).catch((error) => { }).catch((error) => {
dispatch(fetchJoinRequestsFail(id, error)) dispatch(fetchJoinRequestsFail(groupId, error))
}) })
} }
const fetchJoinRequestsRequest = (id) => ({ const fetchJoinRequestsRequest = (groupId) => ({
type: GROUP_JOIN_REQUESTS_FETCH_REQUEST, type: GROUP_JOIN_REQUESTS_FETCH_REQUEST,
id, groupId,
}) })
const fetchJoinRequestsSuccess = (id, accounts, next) => ({ const fetchJoinRequestsSuccess = (groupId, accounts, next) => ({
type: GROUP_JOIN_REQUESTS_FETCH_SUCCESS, type: GROUP_JOIN_REQUESTS_FETCH_SUCCESS,
id, groupId,
accounts, accounts,
next, next,
}) })
const fetchJoinRequestsFail = (id, error) => ({ const fetchJoinRequestsFail = (groupId, error) => ({
type: GROUP_JOIN_REQUESTS_FETCH_FAIL, type: GROUP_JOIN_REQUESTS_FETCH_FAIL,
showToast: true, showToast: true,
id, groupId,
error, error,
}) })
/** /**
* *
*/ */
export const expandJoinRequests = (id) => (dispatch, getState) => { export const expandJoinRequests = (groupId) => (dispatch, getState) => {
if (!me) return if (!me) return
const url = getState().getIn(['user_lists', 'group_join_requests', id, 'next']) const url = getState().getIn(['user_lists', 'group_join_requests', groupId, 'next'])
const isLoading = getState().getIn(['user_lists', 'group_join_requests', id, 'isLoading']) const isLoading = getState().getIn(['user_lists', 'group_join_requests', groupId, 'isLoading'])
if (url === null || isLoading) return if (url === null || isLoading) return
dispatch(expandJoinRequestsRequest(id)) dispatch(expandJoinRequestsRequest(groupId))
api(getState).get(url).then((response) => { api(getState).get(url).then((response) => {
const next = getLinks(response).refs.find(link => link.rel === 'next') const next = getLinks(response).refs.find(link => link.rel === 'next')
dispatch(importFetchedAccounts(response.data)) dispatch(importFetchedAccounts(response.data))
dispatch(expandJoinRequestsSuccess(id, response.data, next ? next.uri : null)) dispatch(expandJoinRequestsSuccess(groupId, response.data, next ? next.uri : null))
dispatch(fetchRelationships(response.data.map(item => item.id))) dispatch(fetchRelationships(response.data.map(item => item.id)))
}).catch((error) => { }).catch((error) => {
dispatch(expandJoinRequestsFail(id, error)) dispatch(expandJoinRequestsFail(groupId, error))
}) })
} }
const expandJoinRequestsRequest = (id) => ({ const expandJoinRequestsRequest = (groupId) => ({
type: GROUP_JOIN_REQUESTS_EXPAND_REQUEST, type: GROUP_JOIN_REQUESTS_EXPAND_REQUEST,
id, groupId,
}) })
const expandJoinRequestsSuccess = (id, accounts, next) => ({ const expandJoinRequestsSuccess = (id, accounts, next) => ({
type: GROUP_JOIN_REQUESTS_EXPAND_SUCCESS, type: GROUP_JOIN_REQUESTS_EXPAND_SUCCESS,
id, groupId,
accounts, accounts,
next, next,
}) })
const expandJoinRequestsFail = (id, error) => ({ const expandJoinRequestsFail = (groupId, error) => ({
type: GROUP_JOIN_REQUESTS_EXPAND_FAIL, type: GROUP_JOIN_REQUESTS_EXPAND_FAIL,
showToast: true, showToast: true,
id, groupId,
error, error,
}) })