Page MenuHomePhabricator
Differential D13238

Implement maunally marking DM thread as read/unread
ClosedPublic
Actions

Authored by marcin on Sep 4 2024, 5:28 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Apr 19, 5:28 AM
Unknown Object (File)
Fri, Apr 18, 12:41 AM
Unknown Object (File)
Wed, Apr 16, 3:59 PM
Unknown Object (File)
Wed, Apr 16, 2:40 PM
Unknown Object (File)
Wed, Apr 16, 3:14 AM
Unknown Object (File)
Wed, Apr 16, 12:03 AM
Unknown Object (File)
Tue, Apr 15, 10:50 PM
Unknown Object (File)
Tue, Apr 15, 6:58 PM
View All Files
Subscribers
ashoat

Details

Reviewers
tomek
kamil
Commits
rCOMMaf90fa403c02: Implement maunally marking DM thread as read/unread
Summary

This differential implements marking dm thread as read/unread manually (by toggle).

Test Plan

Play around marking a thread as read/unrad on one device and ensure that changes are reflected in the UI of another device (if app is active) or result in correct badge updates/rescinds (inactive app)

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

marcin created this revision.Sep 4 2024, 5:28 AM
Herald added a subscriber: ashoat. · View Herald TranscriptSep 4 2024, 5:28 AM
Harbormaster completed remote builds in B31426: Diff 43881.Sep 4 2024, 6:16 AM
marcin requested review of this revision.Sep 4 2024, 6:16 AM
marcin added a child revision: D13246: Implement DMActivityHandler.Sep 5 2024, 6:16 AM
tomek accepted this revision.Sep 6 2024, 8:21 AM
tomek added inline comments.
lib/hooks/toggle-unread-status.js
10–11 ↗(On Diff #43881)

Can be merged.

This revision is now accepted and ready to land.Sep 6 2024, 8:21 AM
marcin updated this revision to Diff 43969.Sep 9 2024, 3:07 AM

Move dm logic to hook

Harbormaster completed remote builds in B31485: Diff 43969.Sep 9 2024, 3:25 AM
marcin updated this revision to Diff 43993.Sep 9 2024, 7:25 AM

Rebase

Harbormaster completed remote builds in B31500: Diff 43993.Sep 9 2024, 7:41 AM
marcin updated this revision to Diff 43997.Sep 9 2024, 8:56 AM

Rebase before landing

This revision was landed with ongoing or failed builds.Sep 9 2024, 9:06 AM
Closed by commit rCOMMaf90fa403c02: Implement maunally marking DM thread as read/unread (authored by marcin). · Explain Why
This revision was automatically updated to reflect the committed changes.
marcin added a commit: rCOMMaf90fa403c02: Implement maunally marking DM thread as read/unread.
Harbormaster completed remote builds in B31502: Diff 43997.Sep 9 2024, 9:12 AM
ashoat added a comment.Sep 9 2024, 2:13 PM

I have the same concerns here that I highlighted in D13260. @marcin, can you address them as part of the same stack as D13260, and land the fixes together?

Revision Contents
Changeset List

PathSize
lib/
actions/
53 lines
hooks/
6 lines

Diff 43969

View Options

lib/actions/activity-actions.js

Show First 20 Lines • Show All 156 Lines • ▼ Show 20 Lines () => ({
sessionID, sessionID,
}, },
}, },
}), }),
[preRequestUserInfo, keyserverID, cookie, sessionID], [preRequestUserInfo, keyserverID, cookie, sessionID],
); );
// We only need to do a "spot check" on this value below. // We only need to do a "spot check" on this value below.
// - To avoid regenerating performRecovery whenever it changes, we want to // - To avoid regenerating below callbacks whenever it changes, we want to
// make sure it's not in that function's dep list. // make sure it's not in those callbacks' dep lists.
// - If we exclude it from that function's dep list, we'll end up binding in // - If we exclude it from those callbacks' dep lists, we'll end up binding in
// the value of preRequestUserState at the time performRecovery is updated. // the value of preRequestUserState at the time the callbacks are updated.
// Instead, by assigning to a ref, we are able to use the latest value. // Instead, by assigning to a ref, we are able to use the latest value.
const preRequestUserStateRef = React.useRef(preRequestUserState); const preRequestUserStateRef = React.useRef(preRequestUserState);
preRequestUserStateRef.current = preRequestUserState; preRequestUserStateRef.current = preRequestUserState;
const dispatch = useDispatch(); const dispatch = useDispatch();
const urlPrefix = useSelector(urlPrefixSelector(keyserverID)); const urlPrefix = useSelector(urlPrefixSelector(keyserverID));
const logOut = useLogOut(); const logOut = useLogOut();
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
const invalidateKeyserverSession = React.useCallback( const invalidateKeyserverSession = React.useCallback(
( (
source: RecoveryActionSource, source: RecoveryActionSource,
sessionChange: ClientSessionChange, sessionChange: ClientSessionChange,
userStateBeforeRecovery: PreRequestUserState,
hasBeenCancelled: () => boolean, hasBeenCancelled: () => boolean,
) => { ) => {
if (hasBeenCancelled()) { if (hasBeenCancelled()) {
return; return;
} }
setNewSession( setNewSession(
dispatch, dispatch,
sessionChange, sessionChange,
userStateBeforeRecovery, preRequestUserStateRef.current,
null, null,
source, source,
keyserverID, keyserverID,
); );
if ( if (
keyserverID === authoritativeKeyserverID() && keyserverID === authoritativeKeyserverID() &&
relyingOnAuthoritativeKeyserver relyingOnAuthoritativeKeyserver
) { ) {
Show All 30 Lines ) => {
); );
const sessionChange = const sessionChange =
recoverySessionChange ?? genericCookieInvalidation; recoverySessionChange ?? genericCookieInvalidation;
if ( if (
sessionChange.cookieInvalidated || sessionChange.cookieInvalidated ||
!sessionChange.cookie || !sessionChange.cookie ||
!sessionChange.cookie.startsWith('user=') !sessionChange.cookie.startsWith('user=')
) { ) {
invalidateKeyserverSession( invalidateKeyserverSession(source, sessionChange, hasBeenCancelled);
source,
sessionChange,
userStateBeforeRecovery,
hasBeenCancelled,
);
} }
} catch (e) { } catch (e) {
if (hasBeenCancelled()) { if (hasBeenCancelled()) {
return; return;
} }
console.log( console.log(
`Error during recovery login with keyserver ${keyserverID}`, `Error during recovery login with keyserver ${keyserverID}`,
e, e,
); );
invalidateKeyserverSession( invalidateKeyserverSession(
source, source,
genericCookieInvalidation, genericCookieInvalidation,
userStateBeforeRecovery,
hasBeenCancelled, hasBeenCancelled,
); );
throw e; throw e;
} }
}, },
[keyserverID, dispatch, cookie, urlPrefix, invalidateKeyserverSession], [keyserverID, dispatch, cookie, urlPrefix, invalidateKeyserverSession],
); );
} }
export { export {
canResolveKeyserverSessionInvalidation, canResolveKeyserverSessionInvalidation,
resolveKeyserverSessionInvalidation, resolveKeyserverSessionInvalidation,
useKeyserverRecoveryLogIn, useKeyserverRecoveryLogIn,
}; };
View Options

lib/hooks/toggle-unread-status.js

Show First 20 Lines • Show All 156 Lines • ▼ Show 20 Lines () => ({
sessionID, sessionID,
}, },
}, },
}), }),
[preRequestUserInfo, keyserverID, cookie, sessionID], [preRequestUserInfo, keyserverID, cookie, sessionID],
); );
// We only need to do a "spot check" on this value below. // We only need to do a "spot check" on this value below.
// - To avoid regenerating performRecovery whenever it changes, we want to // - To avoid regenerating below callbacks whenever it changes, we want to
// make sure it's not in that function's dep list. // make sure it's not in those callbacks' dep lists.
// - If we exclude it from that function's dep list, we'll end up binding in // - If we exclude it from those callbacks' dep lists, we'll end up binding in
// the value of preRequestUserState at the time performRecovery is updated. // the value of preRequestUserState at the time the callbacks are updated.
// Instead, by assigning to a ref, we are able to use the latest value. // Instead, by assigning to a ref, we are able to use the latest value.
const preRequestUserStateRef = React.useRef(preRequestUserState); const preRequestUserStateRef = React.useRef(preRequestUserState);
preRequestUserStateRef.current = preRequestUserState; preRequestUserStateRef.current = preRequestUserState;
const dispatch = useDispatch(); const dispatch = useDispatch();
const urlPrefix = useSelector(urlPrefixSelector(keyserverID)); const urlPrefix = useSelector(urlPrefixSelector(keyserverID));
const logOut = useLogOut(); const logOut = useLogOut();
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
const invalidateKeyserverSession = React.useCallback( const invalidateKeyserverSession = React.useCallback(
( (
source: RecoveryActionSource, source: RecoveryActionSource,
sessionChange: ClientSessionChange, sessionChange: ClientSessionChange,
userStateBeforeRecovery: PreRequestUserState,
hasBeenCancelled: () => boolean, hasBeenCancelled: () => boolean,
) => { ) => {
if (hasBeenCancelled()) { if (hasBeenCancelled()) {
return; return;
} }
setNewSession( setNewSession(
dispatch, dispatch,
sessionChange, sessionChange,
userStateBeforeRecovery, preRequestUserStateRef.current,
null, null,
source, source,
keyserverID, keyserverID,
); );
if ( if (
keyserverID === authoritativeKeyserverID() && keyserverID === authoritativeKeyserverID() &&
relyingOnAuthoritativeKeyserver relyingOnAuthoritativeKeyserver
) { ) {
Show All 30 Lines ) => {
); );
const sessionChange = const sessionChange =
recoverySessionChange ?? genericCookieInvalidation; recoverySessionChange ?? genericCookieInvalidation;
if ( if (
sessionChange.cookieInvalidated || sessionChange.cookieInvalidated ||
!sessionChange.cookie || !sessionChange.cookie ||
!sessionChange.cookie.startsWith('user=') !sessionChange.cookie.startsWith('user=')
) { ) {
invalidateKeyserverSession( invalidateKeyserverSession(source, sessionChange, hasBeenCancelled);
source,
sessionChange,
userStateBeforeRecovery,
hasBeenCancelled,
);
} }
} catch (e) { } catch (e) {
if (hasBeenCancelled()) { if (hasBeenCancelled()) {
return; return;
} }
console.log( console.log(
`Error during recovery login with keyserver ${keyserverID}`, `Error during recovery login with keyserver ${keyserverID}`,
e, e,
); );
invalidateKeyserverSession( invalidateKeyserverSession(
source, source,
genericCookieInvalidation, genericCookieInvalidation,
userStateBeforeRecovery,
hasBeenCancelled, hasBeenCancelled,
); );
throw e; throw e;
} }
}, },
[keyserverID, dispatch, cookie, urlPrefix, invalidateKeyserverSession], [keyserverID, dispatch, cookie, urlPrefix, invalidateKeyserverSession],
); );
} }
export { export {
canResolveKeyserverSessionInvalidation, canResolveKeyserverSessionInvalidation,
resolveKeyserverSessionInvalidation, resolveKeyserverSessionInvalidation,
useKeyserverRecoveryLogIn, useKeyserverRecoveryLogIn,
}; };