tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Infinite scroll for followers/following lists

Browse Source
This commit is contained in:
Eugen Rochko
2016-11-13 20:42:54 +01:00
parent 49b7896953
commit dbfe1e4be6
9 changed files with 219 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/components/reducers/accounts.jsx
View File

@ -2,7 +2,9 @@ import {
ACCOUNT_SET_SELF,
ACCOUNT_FETCH_SUCCESS,
FOLLOWERS_FETCH_SUCCESS,
FOLLOWERS_EXPAND_SUCCESS,
FOLLOWING_FETCH_SUCCESS,
FOLLOWING_EXPAND_SUCCESS,
ACCOUNT_TIMELINE_FETCH_SUCCESS,
ACCOUNT_TIMELINE_EXPAND_SUCCESS
} from '../actions/accounts';
@ -65,7 +67,9 @@ export default function accounts(state = initialState, action) {
return normalizeAccount(state, action.account);
case SUGGESTIONS_FETCH_SUCCESS:
case FOLLOWERS_FETCH_SUCCESS:
case FOLLOWERS_EXPAND_SUCCESS:
case FOLLOWING_FETCH_SUCCESS:
case FOLLOWING_EXPAND_SUCCESS:
case REBLOGS_FETCH_SUCCESS:
case FAVOURITES_FETCH_SUCCESS:
case COMPOSE_SUGGESTIONS_READY:

25
app/assets/javascripts/components/reducers/user_lists.jsx
View File

@ -1,6 +1,8 @@
import {
FOLLOWERS_FETCH_SUCCESS,
FOLLOWING_FETCH_SUCCESS
FOLLOWERS_EXPAND_SUCCESS,
FOLLOWING_FETCH_SUCCESS,
FOLLOWING_EXPAND_SUCCESS
} from '../actions/accounts';
import { SUGGESTIONS_FETCH_SUCCESS } from '../actions/suggestions';
import {
@ -17,12 +19,29 @@ const initialState = Immutable.Map({
favourited_by: Immutable.Map()
});
const normalizeList = (state, type, id, accounts, prev) => {
return state.setIn([type, id], Immutable.Map({
prev,
items: Immutable.List(accounts.map(item => item.id))
}));
};
const appendToList = (state, type, id, accounts, prev) => {
return state.updateIn([type, id], map => {
return map.set('prev', prev).update('items', list => list.push(...accounts.map(item => item.id)));
});
};
export default function userLists(state = initialState, action) {
switch(action.type) {
case FOLLOWERS_FETCH_SUCCESS:
return state.setIn(['followers', action.id], Immutable.List(action.accounts.map(item => item.id)));
return normalizeList(state, 'followers', action.id, action.accounts, action.prev);
case FOLLOWERS_EXPAND_SUCCESS:
return appendToList(state, 'followers', action.id, action.accounts, action.prev);
case FOLLOWING_FETCH_SUCCESS:
return state.setIn(['following', action.id], Immutable.List(action.accounts.map(item => item.id)));
return normalizeList(state, 'following', action.id, action.accounts, action.prev);
case FOLLOWING_EXPAND_SUCCESS:
return appendToList(state, 'following', action.id, action.accounts, action.prev);
case SUGGESTIONS_FETCH_SUCCESS:
return state.set('suggestions', Immutable.List(action.accounts.map(item => item.id)));
case REBLOGS_FETCH_SUCCESS: