Page MenuHomePhabricator
Differential D11013

[lib][native][web] Replace ashoatKeyserverID in Socket code with keyserverID
ClosedPublic
Actions

Authored by ashoat on Feb 9 2024, 8:24 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Apr 6, 8:58 AM
Unknown Object (File)
Sat, Apr 5, 1:32 AM
Unknown Object (File)
Thu, Mar 13, 10:55 AM
Unknown Object (File)
Tue, Mar 11, 3:17 PM
Unknown Object (File)
Tue, Mar 11, 10:20 AM
Unknown Object (File)
Mar 5 2025, 9:46 AM
Unknown Object (File)
Mar 2 2025, 11:27 PM
Unknown Object (File)
Feb 26 2025, 9:12 PM
View All 76 Files
Subscribers
None

Details

Reviewers
inka
tomek
Commits
rCOMMd0b1a2c64d46: [lib][native][web] Replace ashoatKeyserverID in Socket code with keyserverID
Summary

This should be a no-op, since KeyserverConnectionHandler currently only renders a Socket when keyserverID === ashoatKeyserverID.

Depends on D11012

Test Plan
  1. Flow
  2. Careful inspection of the code

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Revision Contents
Changeset List

PathSize
lib/
socket/
43 lines
native/
26 lines
web/
23 lines

Diff 36937

View Options

lib/socket/socket.react.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

native/socket.react.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

web/socket.react.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