Page MenuHomePhabricator
Differential D14335

[keyserver][lib] Split generateNotifUserInfoPromise into two
ClosedPublic
Actions

Authored by ashoat on Feb 11 2025, 12:12 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 7, 1:36 AM
Unknown Object (File)
Sun, Apr 6, 8:58 AM
Unknown Object (File)
Fri, Apr 4, 12:01 AM
Unknown Object (File)
Tue, Apr 1, 4:27 AM
Unknown Object (File)
Sat, Mar 29, 12:10 PM
Unknown Object (File)
Wed, Mar 19, 3:18 AM
Unknown Object (File)
Mon, Mar 17, 8:46 PM
Unknown Object (File)
Sun, Mar 16, 12:26 PM
View All 39 Files
Subscribers
None

Details

Reviewers
tomek
angelika
Commits
rCOMMbadaf89528b0: [keyserver][lib] Split generateNotifUserInfoPromise into two
Summary

This has two benefits:

  1. Avoids calling await getMessageNotifyType twice for every message.
  2. Exposes messageNotifyType to the callsite, which is necessary for a later diff.

Depends on D14334

Test Plan

Tested in combination with later diffs, to confirm that it's possible for some message types to not set a thread to unread

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Revision Contents
Changeset List

PathSize
keyserver/
src/
creators/
59 lines
lib/
push/
36 lines
143 lines

Diff 46983

View Options

keyserver/src/creators/message-creator.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { import {
updateRelationships as serverUpdateRelationships, updateRelationships as serverUpdateRelationships,
updateRelationshipsActionTypes, updateRelationshipsActionTypes,
} from '../actions/relationship-actions.js'; } from '../actions/relationship-actions.js';
import { getSingleOtherUser } from '../shared/thread-utils.js'; import { getSingleOtherUser } from '../shared/thread-utils.js';
import type { ThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js'; import type { ThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js';
import { import {
type RelationshipAction,
relationshipActions, relationshipActions,
type TraditionalRelationshipAction,
} from '../types/relationship-types.js'; } from '../types/relationship-types.js';
import type { UserInfo } from '../types/user-types.js'; import type { UserInfo } from '../types/user-types.js';
import { useLegacyAshoatKeyserverCall } from '../utils/action-utils.js'; import { useLegacyAshoatKeyserverCall } from '../utils/action-utils.js';
import { useDispatchActionPromise } from '../utils/redux-promise-utils.js'; import { useDispatchActionPromise } from '../utils/redux-promise-utils.js';
import { useSelector } from '../utils/redux-utils.js'; import { useSelector } from '../utils/redux-utils.js';
type RelationshipCallbacks = { type RelationshipCallbacks = {
+blockUser: () => void, +blockUser: () => void,
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
function useRelationshipCallbacks( function useRelationshipCallbacks(
otherUserID?: string, otherUserID?: string,
onErrorCallback?: () => void, onErrorCallback?: () => void,
): RelationshipCallbacks { ): RelationshipCallbacks {
const callUpdateRelationships = useLegacyAshoatKeyserverCall( const callUpdateRelationships = useLegacyAshoatKeyserverCall(
serverUpdateRelationships, serverUpdateRelationships,
); );
const updateRelationship = React.useCallback( const updateRelationship = React.useCallback(
async (action: RelationshipAction) => { async (action: TraditionalRelationshipAction) => {
try { try {
invariant(otherUserID, 'Other user info id should be present'); invariant(otherUserID, 'Other user info id should be present');
return await callUpdateRelationships({ return await callUpdateRelationships({
action, action,
userIDs: [otherUserID], userIDs: [otherUserID],
}); });
} catch (e) { } catch (e) {
onErrorCallback?.(); onErrorCallback?.();
throw e; throw e;
} }
}, },
[callUpdateRelationships, onErrorCallback, otherUserID], [callUpdateRelationships, onErrorCallback, otherUserID],
); );
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
const onButtonPress = React.useCallback( const onButtonPress = React.useCallback(
(action: RelationshipAction) => { (action: TraditionalRelationshipAction) => {
void dispatchActionPromise( void dispatchActionPromise(
updateRelationshipsActionTypes, updateRelationshipsActionTypes,
updateRelationship(action), updateRelationship(action),
); );
}, },
[dispatchActionPromise, updateRelationship], [dispatchActionPromise, updateRelationship],
); );
Show All 29 Lines
View Options

lib/push/send-utils.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { import {
updateRelationships as serverUpdateRelationships, updateRelationships as serverUpdateRelationships,
updateRelationshipsActionTypes, updateRelationshipsActionTypes,
} from '../actions/relationship-actions.js'; } from '../actions/relationship-actions.js';
import { getSingleOtherUser } from '../shared/thread-utils.js'; import { getSingleOtherUser } from '../shared/thread-utils.js';
import type { ThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js'; import type { ThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js';
import { import {
type RelationshipAction,
relationshipActions, relationshipActions,
type TraditionalRelationshipAction,
} from '../types/relationship-types.js'; } from '../types/relationship-types.js';
import type { UserInfo } from '../types/user-types.js'; import type { UserInfo } from '../types/user-types.js';
import { useLegacyAshoatKeyserverCall } from '../utils/action-utils.js'; import { useLegacyAshoatKeyserverCall } from '../utils/action-utils.js';
import { useDispatchActionPromise } from '../utils/redux-promise-utils.js'; import { useDispatchActionPromise } from '../utils/redux-promise-utils.js';
import { useSelector } from '../utils/redux-utils.js'; import { useSelector } from '../utils/redux-utils.js';
type RelationshipCallbacks = { type RelationshipCallbacks = {
+blockUser: () => void, +blockUser: () => void,
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
function useRelationshipCallbacks( function useRelationshipCallbacks(
otherUserID?: string, otherUserID?: string,
onErrorCallback?: () => void, onErrorCallback?: () => void,
): RelationshipCallbacks { ): RelationshipCallbacks {
const callUpdateRelationships = useLegacyAshoatKeyserverCall( const callUpdateRelationships = useLegacyAshoatKeyserverCall(
serverUpdateRelationships, serverUpdateRelationships,
); );
const updateRelationship = React.useCallback( const updateRelationship = React.useCallback(
async (action: RelationshipAction) => { async (action: TraditionalRelationshipAction) => {
try { try {
invariant(otherUserID, 'Other user info id should be present'); invariant(otherUserID, 'Other user info id should be present');
return await callUpdateRelationships({ return await callUpdateRelationships({
action, action,
userIDs: [otherUserID], userIDs: [otherUserID],
}); });
} catch (e) { } catch (e) {
onErrorCallback?.(); onErrorCallback?.();
throw e; throw e;
} }
}, },
[callUpdateRelationships, onErrorCallback, otherUserID], [callUpdateRelationships, onErrorCallback, otherUserID],
); );
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
const onButtonPress = React.useCallback( const onButtonPress = React.useCallback(
(action: RelationshipAction) => { (action: TraditionalRelationshipAction) => {
void dispatchActionPromise( void dispatchActionPromise(
updateRelationshipsActionTypes, updateRelationshipsActionTypes,
updateRelationship(action), updateRelationship(action),
); );
}, },
[dispatchActionPromise, updateRelationship], [dispatchActionPromise, updateRelationship],
); );
Show All 29 Lines
View Options

lib/push/utils.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { import {
updateRelationships as serverUpdateRelationships, updateRelationships as serverUpdateRelationships,
updateRelationshipsActionTypes, updateRelationshipsActionTypes,
} from '../actions/relationship-actions.js'; } from '../actions/relationship-actions.js';
import { getSingleOtherUser } from '../shared/thread-utils.js'; import { getSingleOtherUser } from '../shared/thread-utils.js';
import type { ThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js'; import type { ThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js';
import { import {
type RelationshipAction,
relationshipActions, relationshipActions,
type TraditionalRelationshipAction,
} from '../types/relationship-types.js'; } from '../types/relationship-types.js';
import type { UserInfo } from '../types/user-types.js'; import type { UserInfo } from '../types/user-types.js';
import { useLegacyAshoatKeyserverCall } from '../utils/action-utils.js'; import { useLegacyAshoatKeyserverCall } from '../utils/action-utils.js';
import { useDispatchActionPromise } from '../utils/redux-promise-utils.js'; import { useDispatchActionPromise } from '../utils/redux-promise-utils.js';
import { useSelector } from '../utils/redux-utils.js'; import { useSelector } from '../utils/redux-utils.js';
type RelationshipCallbacks = { type RelationshipCallbacks = {
+blockUser: () => void, +blockUser: () => void,
▲ Show 20 Lines • Show All 42 Lines • ▼ Show 20 Lines
function useRelationshipCallbacks( function useRelationshipCallbacks(
otherUserID?: string, otherUserID?: string,
onErrorCallback?: () => void, onErrorCallback?: () => void,
): RelationshipCallbacks { ): RelationshipCallbacks {
const callUpdateRelationships = useLegacyAshoatKeyserverCall( const callUpdateRelationships = useLegacyAshoatKeyserverCall(
serverUpdateRelationships, serverUpdateRelationships,
); );
const updateRelationship = React.useCallback( const updateRelationship = React.useCallback(
async (action: RelationshipAction) => { async (action: TraditionalRelationshipAction) => {
try { try {
invariant(otherUserID, 'Other user info id should be present'); invariant(otherUserID, 'Other user info id should be present');
return await callUpdateRelationships({ return await callUpdateRelationships({
action, action,
userIDs: [otherUserID], userIDs: [otherUserID],
}); });
} catch (e) { } catch (e) {
onErrorCallback?.(); onErrorCallback?.();
throw e; throw e;
} }
}, },
[callUpdateRelationships, onErrorCallback, otherUserID], [callUpdateRelationships, onErrorCallback, otherUserID],
); );
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
const onButtonPress = React.useCallback( const onButtonPress = React.useCallback(
(action: RelationshipAction) => { (action: TraditionalRelationshipAction) => {
void dispatchActionPromise( void dispatchActionPromise(
updateRelationshipsActionTypes, updateRelationshipsActionTypes,
updateRelationship(action), updateRelationship(action),
); );
}, },
[dispatchActionPromise, updateRelationship], [dispatchActionPromise, updateRelationship],
); );
Show All 29 Lines