Page MenuHomePhabricator
Differential D11436

[lib] Add "Legacy" to types in `update-relationship`
ClosedPublic
Actions

Authored by atul on Mar 28 2024, 7:03 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Apr 6, 8:58 AM
Unknown Object (File)
Wed, Apr 2, 9:27 AM
Unknown Object (File)
Wed, Apr 2, 6:42 AM
Unknown Object (File)
Tue, Apr 1, 9:12 PM
Unknown Object (File)
Tue, Apr 1, 8:04 PM
Unknown Object (File)
Tue, Apr 1, 10:54 AM
Unknown Object (File)
Mar 9 2025, 4:37 PM
Unknown Object (File)
Feb 28 2025, 7:33 PM
View All 74 Files
Subscribers
ashoat

Details

Reviewers
varun
tomek
ginsu
will
Commits
rCOMM400d44d483a7: [lib] Add "Legacy" to types in `update-relationship`
Summary

Based on the following commits from hackathon branch: https://github.com/CommE2E/comm/commit/9632b8c4641cfe3d1724a94da56ffdcfc226d647#diff-f60296b8773612dd2bd84b6b259c08df2ef75250493fadc5d745aa5de47b3180, https://github.com/CommE2E/comm/commit/42f28702abce0769aa1aac0417c5006faebce254

Test Plan

Used IDE Refactor -> Rename feature.

Flow/ESLint/etc.

Diff Detail

Repository
rCOMM Comm
Branch
arcpatch-D11436 (branched from master)
Lint
No Lint Coverage
Unit
No Test Coverage

Revision Contents
Changeset List

PathSize
lib/
shared/
4 lines
messages/
50 lines
types/
24 lines
messages/
legacy-update-relationship.js
update-relationship.js
12 lines
utils/
21 lines

Diff 38681

View Options

lib/shared/message-utils.test.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/shared/messages/update-relationship-message-spec.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/types/message-types.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/types/messages/legacy-update-relationship.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/types/messages/update-relationship.js

Loading...
View Options

lib/utils/message-ops-utils.test.js

Loading...