132dd28162
The `hasMore` property of timelines in redux store was set whenever an API request returned only one page of results, *even* if the query only requested newer statuses (using `since_id`), causing `hasMore` to be incorrectly set to false whenever fetching new toots in a timeline, which happens each time an account's timeline or media gallery is visited.
125 lines
4.6 KiB
JavaScript
125 lines
4.6 KiB
JavaScript
import api, { getLinks } from 'flavours/glitch/util/api';
|
|
import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
|
|
|
|
export const TIMELINE_UPDATE = 'TIMELINE_UPDATE';
|
|
export const TIMELINE_DELETE = 'TIMELINE_DELETE';
|
|
|
|
export const TIMELINE_EXPAND_REQUEST = 'TIMELINE_EXPAND_REQUEST';
|
|
export const TIMELINE_EXPAND_SUCCESS = 'TIMELINE_EXPAND_SUCCESS';
|
|
export const TIMELINE_EXPAND_FAIL = 'TIMELINE_EXPAND_FAIL';
|
|
|
|
export const TIMELINE_SCROLL_TOP = 'TIMELINE_SCROLL_TOP';
|
|
|
|
export const TIMELINE_DISCONNECT = 'TIMELINE_DISCONNECT';
|
|
|
|
export function updateTimeline(timeline, status) {
|
|
return (dispatch, getState) => {
|
|
dispatch({
|
|
type: TIMELINE_UPDATE,
|
|
timeline,
|
|
status,
|
|
});
|
|
};
|
|
};
|
|
|
|
export function deleteFromTimelines(id) {
|
|
return (dispatch, getState) => {
|
|
const accountId = getState().getIn(['statuses', id, 'account']);
|
|
const references = getState().get('statuses').filter(status => status.get('reblog') === id).map(status => [status.get('id'), status.get('account')]);
|
|
const reblogOf = getState().getIn(['statuses', id, 'reblog'], null);
|
|
|
|
dispatch({
|
|
type: TIMELINE_DELETE,
|
|
id,
|
|
accountId,
|
|
references,
|
|
reblogOf,
|
|
});
|
|
};
|
|
};
|
|
|
|
const noOp = () => {};
|
|
|
|
export function expandTimeline(timelineId, path, params = {}, done = noOp) {
|
|
return (dispatch, getState) => {
|
|
const timeline = getState().getIn(['timelines', timelineId], ImmutableMap());
|
|
const isLoadingMore = !!params.max_id;
|
|
|
|
if (timeline.get('isLoading')) {
|
|
done();
|
|
return;
|
|
}
|
|
|
|
if (!params.max_id && !params.pinned && timeline.get('items', ImmutableList()).size > 0) {
|
|
params.since_id = timeline.getIn(['items', 0]);
|
|
}
|
|
|
|
const isLoadingRecent = !!params.since_id;
|
|
|
|
dispatch(expandTimelineRequest(timelineId, isLoadingMore));
|
|
|
|
api(getState).get(path, { params }).then(response => {
|
|
const next = getLinks(response).refs.find(link => link.rel === 'next');
|
|
dispatch(expandTimelineSuccess(timelineId, response.data, next ? next.uri : null, response.code === 206, isLoadingRecent, isLoadingMore));
|
|
done();
|
|
}).catch(error => {
|
|
dispatch(expandTimelineFail(timelineId, error, isLoadingMore));
|
|
done();
|
|
});
|
|
};
|
|
};
|
|
|
|
export const expandHomeTimeline = ({ maxId } = {}, done = noOp) => expandTimeline('home', '/api/v1/timelines/home', { max_id: maxId }, done);
|
|
export const expandPublicTimeline = ({ maxId } = {}, done = noOp) => expandTimeline('public', '/api/v1/timelines/public', { max_id: maxId }, done);
|
|
export const expandCommunityTimeline = ({ maxId } = {}, done = noOp) => expandTimeline('community', '/api/v1/timelines/public', { local: true, max_id: maxId }, done);
|
|
export const expandDirectTimeline = ({ maxId } = {}, done = noOp) => expandTimeline('direct', '/api/v1/timelines/direct', { max_id: maxId }, done);
|
|
export const expandAccountTimeline = (accountId, { maxId, withReplies } = {}) => expandTimeline(`account:${accountId}${withReplies ? ':with_replies' : ''}`, `/api/v1/accounts/${accountId}/statuses`, { exclude_replies: !withReplies, max_id: maxId });
|
|
export const expandAccountFeaturedTimeline = accountId => expandTimeline(`account:${accountId}:pinned`, `/api/v1/accounts/${accountId}/statuses`, { pinned: true });
|
|
export const expandAccountMediaTimeline = (accountId, { maxId } = {}) => expandTimeline(`account:${accountId}:media`, `/api/v1/accounts/${accountId}/statuses`, { max_id: maxId, only_media: true });
|
|
export const expandHashtagTimeline = (hashtag, { maxId } = {}, done = noOp) => expandTimeline(`hashtag:${hashtag}`, `/api/v1/timelines/tag/${hashtag}`, { max_id: maxId }, done);
|
|
export const expandListTimeline = (id, { maxId } = {}, done = noOp) => expandTimeline(`list:${id}`, `/api/v1/timelines/list/${id}`, { max_id: maxId }, done);
|
|
|
|
export function expandTimelineRequest(timeline, isLoadingMore) {
|
|
return {
|
|
type: TIMELINE_EXPAND_REQUEST,
|
|
timeline,
|
|
skipLoading: !isLoadingMore,
|
|
};
|
|
};
|
|
|
|
export function expandTimelineSuccess(timeline, statuses, next, partial, isLoadingRecent, isLoadingMore) {
|
|
return {
|
|
type: TIMELINE_EXPAND_SUCCESS,
|
|
timeline,
|
|
statuses,
|
|
next,
|
|
partial,
|
|
isLoadingRecent,
|
|
skipLoading: !isLoadingMore,
|
|
};
|
|
};
|
|
|
|
export function expandTimelineFail(timeline, error, isLoadingMore) {
|
|
return {
|
|
type: TIMELINE_EXPAND_FAIL,
|
|
timeline,
|
|
error,
|
|
skipLoading: !isLoadingMore,
|
|
};
|
|
};
|
|
|
|
export function scrollTopTimeline(timeline, top) {
|
|
return {
|
|
type: TIMELINE_SCROLL_TOP,
|
|
timeline,
|
|
top,
|
|
};
|
|
};
|
|
|
|
export function disconnectTimeline(timeline) {
|
|
return {
|
|
type: TIMELINE_DISCONNECT,
|
|
timeline,
|
|
};
|
|
};
|