Page MenuHomePhabricator
Files F2870845

D13576.diff
No OneTemporary
Actions

D13576.diff
View Options

diff --git a/lib/reducers/thread-reducer.js b/lib/reducers/thread-reducer.js
--- a/lib/reducers/thread-reducer.js
+++ b/lib/reducers/thread-reducer.js
@@ -335,8 +335,38 @@
const changedThreadInfos: { [string]: RawThreadInfo } = {};
for (const [threadID, mostRecentTime] of threadIDToMostRecentTime) {
const threadInfo = state.threadInfos[threadID];
+ if (!threadInfo) {
+ continue;
+ }
+
+ if (threadInfo.thick) {
+ if (threadInfo.timestamps.currentUser.unread > mostRecentTime) {
+ continue;
+ }
+ changedThreadInfos[threadID] = {
+ ...threadInfo,
+ timestamps: {
+ ...threadInfo.timestamps,
+ currentUser: {
+ ...threadInfo.timestamps.currentUser,
+ unread: mostRecentTime,
+ },
+ },
+ };
+ if (!threadInfo.currentUser.unread) {
+ changedThreadInfos[threadID] = {
+ ...changedThreadInfos[threadID],
+ currentUser: {
+ ...threadInfo.currentUser,
+ unread: true,
+ },
+ };
+ }
+ continue;
+ }
+
if (
- !threadInfo ||
+ !action.payload.updatesCurrentAsOf ||
threadInfo.currentUser.unread ||
action.payload.updatesCurrentAsOf > mostRecentTime
) {
diff --git a/lib/types/message-types.js b/lib/types/message-types.js
--- a/lib/types/message-types.js
+++ b/lib/types/message-types.js
@@ -669,7 +669,7 @@
export type SaveMessagesPayload = {
+rawMessageInfos: $ReadOnlyArray<RawMessageInfo>,
- +updatesCurrentAsOf: number,
+ +updatesCurrentAsOf: ?number,
};
export type NewMessagesPayload = {
diff --git a/native/push/push-handler.react.js b/native/push/push-handler.react.js
--- a/native/push/push-handler.react.js
+++ b/native/push/push-handler.react.js
@@ -668,9 +668,6 @@
for (const keyserverID in keyserverIDToMessageInfos) {
const updatesCurrentAsOf = this.props.allUpdatesCurrentAsOf[keyserverID];
const messageInfos = keyserverIDToMessageInfos[keyserverID];
- if (!updatesCurrentAsOf) {
- continue;
- }
this.props.dispatch({
type: saveMessagesActionType,

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 3, 7:46 PM (22 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2223189
Default Alt Text
D13576.diff (2 KB)

Event Timeline