about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-12-01 18:36:41 +0100
committerEugen Rochko <eugen@zeonfederated.com>2018-12-01 18:36:41 +0100
commit5648b30d6c61aa22520ca13988206493e0d0f708 (patch)
tree23f9e645c6261cf26d56b47e8d31c20a12c7ae77 /app
parent6a285f0a15cfd3815c3ec2c725303745e5240c15 (diff)
Fix last_status parameter for notifications and conversations (#9407)
Diffstat (limited to 'app')
-rw-r--r--app/javascript/mastodon/actions/conversations.js2
-rw-r--r--app/javascript/mastodon/actions/notifications.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/mastodon/actions/conversations.js b/app/javascript/mastodon/actions/conversations.js
index aefd2fef7..3c2ea9680 100644
--- a/app/javascript/mastodon/actions/conversations.js
+++ b/app/javascript/mastodon/actions/conversations.js
@@ -38,7 +38,7 @@ export const expandConversations = ({ maxId } = {}) => (dispatch, getState) => {
   const params = { max_id: 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 })
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index 92c70e155..d24f39ad2 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -106,7 +106,7 @@ export function expandNotifications({ maxId } = {}, done = noOp) {
     };
 
     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));