treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix last_status parameter for notifications and conversations (#9407)

remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
ThibG 2018-12-01 18:36:41 +01:00 committed by Eugen Rochko
parent 6a285f0a15
commit 5648b30d6c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/actions/conversations.js
View File

@ -38,7 +38,7 @@ export const expandConversations = ({ maxId } = {}) => (dispatch, getState) => {
const params = { max_id: maxId }; const params = { max_id: maxId };
if (!maxId) { if (!maxId) {
params.since_id = getState().getIn(['conversations', 0, 'last_status']); params.since_id = getState().getIn(['conversations', 'items', 0, 'last_status']);
} }
api(getState).get('/api/v1/conversations', { params }) api(getState).get('/api/v1/conversations', { params })

2
app/javascript/mastodon/actions/notifications.js
View File

@ -106,7 +106,7 @@ export function expandNotifications({ maxId } = {}, done = noOp) {
}; };
if (!maxId && notifications.get('items').size > 0) { if (!maxId && notifications.get('items').size > 0) {
params.since_id = notifications.getIn(['items', 0]); params.since_id = notifications.getIn(['items', 0, 'id']);
} }
dispatch(expandNotificationsRequest(isLoadingMore)); dispatch(expandNotificationsRequest(isLoadingMore));