From: Thibaut Girka <thib@sitedethib.com>
Date: Sat, 1 Feb 2020 16:53:28 +0000 (+0100)
Subject: When submitting markers, use last displayed notification, not last received one
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=4cd2d13bd226c005317adf9848f4c0316401b2ff;p=mastodon.git

When submitting markers, use last displayed notification, not last received one
---

diff --git a/app/javascript/flavours/glitch/actions/markers.js b/app/javascript/flavours/glitch/actions/markers.js
index defcb7127..7ffab404d 100644
--- a/app/javascript/flavours/glitch/actions/markers.js
+++ b/app/javascript/flavours/glitch/actions/markers.js
@@ -9,7 +9,7 @@ export const submitMarkers = () => (dispatch, getState) => {
   const params      = {};
 
   const lastHomeId         = getState().getIn(['timelines', 'home', 'items', 0]);
-  const lastNotificationId = getState().getIn(['notifications', 'items', 0, 'id']);
+  const lastNotificationId = getState().getIn(['notifications', 'lastReadId']);
 
   if (lastHomeId) {
     params.home = {
@@ -17,7 +17,7 @@ export const submitMarkers = () => (dispatch, getState) => {
     };
   }
 
-  if (lastNotificationId) {
+  if (lastNotificationId && lastNotificationId !== '0') {
     params.notifications = {
       last_read_id: lastNotificationId,
     };