Page MenuHomePhabricator
Differential D10689

[lib][web][native] Rename useServerCall to useLegacyAshoatKeyserverCall
ClosedPublic
Actions

Authored by ashoat on Jan 18 2024, 12:44 AM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Apr 10, 10:01 AM
Unknown Object (File)
Thu, Apr 10, 3:47 AM
Unknown Object (File)
Wed, Apr 9, 9:38 PM
Unknown Object (File)
Wed, Apr 9, 11:57 AM
Unknown Object (File)
Wed, Apr 9, 6:26 AM
Unknown Object (File)
Feb 27 2025, 8:21 PM
Unknown Object (File)
Feb 27 2025, 7:12 PM
Unknown Object (File)
Feb 27 2025, 7:12 PM
View All 72 Files
Subscribers
None

Details

Reviewers
tomek
inka
atul
Commits
rCOMMede3e092d3a2: [lib][web][native] Rename useServerCall to useLegacyAshoatKeyserverCall
Summary

Unlike callSingleKeyserverEndpoint in the prior diff, useServerCall should have no legitimate callsites after we finish the multi-keyserver work.

As such, I'm renaming it to useLegacyAshoatKeyserverCall to make its function more clear, and to make it clear that it needs to be refactored.

Depends on D10688

Test Plan

I tested this stack using the following procedure:

  1. I tested primarily on native
    1. I compiled a dev build and deployed it to an iOS simulator
    2. I created a brand new account on my local keyserver using the iOS app
    3. I ran Redux dev tools: cd native && yarn redux-devtools
    4. I added a 30s sleep at the start of resolveKeyserverSessionInvalidation
    5. I made KeyserverConnectionsHandler return null so that the socket wouldn’t automatically recover the session prior to my testing
    6. I killed the app
    7. I deleted all of the test user’s cookie
    8. I then opened the app again and navigated to a chat and sent two messages
    9. By following the Redux monitor, I was able to see that the keyserver session invalidation recovery was successful, and both messages were eventually sent after the 30s sleep concluded
  2. On web, we don’t support keyserver session invalidation. However, I tested to make sure that the web app still loaded after my changes

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Revision Contents
Changeset List

Diff 35759

View Options

lib/components/edit-user-avatar-provider.react.js

Show All 16 Linesimport {
type BlobServiceUploadAction, type BlobServiceUploadAction,
type BlobServiceUploadResult, type BlobServiceUploadResult,
type MultimediaUploadCallbacks, type MultimediaUploadCallbacks,
type MultimediaUploadExtras, type MultimediaUploadExtras,
updateMultimediaMessageMediaActionType, updateMultimediaMessageMediaActionType,
uploadMultimedia, uploadMultimedia,
useBlobServiceUpload, useBlobServiceUpload,
} from 'lib/actions/upload-actions.js'; } from 'lib/actions/upload-actions.js';
import commStaffCommunity from 'lib/facts/comm-staff-community.js';
import { import {
type SendMultimediaMessagePayload, type SendMultimediaMessagePayload,
useInputStateContainerSendMultimediaMessage, useInputStateContainerSendMultimediaMessage,
useInputStateContainerSendTextMessage, useInputStateContainerSendTextMessage,
} from 'lib/hooks/input-state-container-hooks.js'; } from 'lib/hooks/input-state-container-hooks.js';
import { useNewThickThread } from 'lib/hooks/thread-hooks.js'; import { useNewThickThread } from 'lib/hooks/thread-hooks.js';
import type { import type {
CallSingleKeyserverEndpointOptions, CallSingleKeyserverEndpointOptions,
Show All 14 Linesimport {
createMediaMessageInfo, createMediaMessageInfo,
useMessageCreationSideEffectsFunc, useMessageCreationSideEffectsFunc,
getNextLocalID, getNextLocalID,
} from 'lib/shared/message-utils.js'; } from 'lib/shared/message-utils.js';
import type { CreationSideEffectsFunc } from 'lib/shared/messages/message-spec.js'; import type { CreationSideEffectsFunc } from 'lib/shared/messages/message-spec.js';
import { createRealThreadFromPendingThread } from 'lib/shared/thread-actions-utils.js'; import { createRealThreadFromPendingThread } from 'lib/shared/thread-actions-utils.js';
import { import {
patchThreadInfoToIncludeMentionedMembersOfParent, patchThreadInfoToIncludeMentionedMembersOfParent,
threadInfoInsideCommunity,
threadIsPending, threadIsPending,
threadIsPendingSidebar, threadIsPendingSidebar,
} from 'lib/shared/thread-utils.js'; } from 'lib/shared/thread-utils.js';
import type { CalendarQuery } from 'lib/types/entry-types.js'; import type { CalendarQuery } from 'lib/types/entry-types.js';
import type { import type {
Media, Media,
MediaMission, MediaMission,
MediaMissionResult, MediaMissionResult,
▲ Show 20 Lines • Show All 562 Lines • ▼ Show 20 Lines try {
throw new SendMessageError( throw new SendMessageError(
`Exception when sending text message: ${exceptionMessage}`, `Exception when sending text message: ${exceptionMessage}`,
messageInfo.localID ?? '', messageInfo.localID ?? '',
messageInfo.threadID, messageInfo.threadID,
); );
} }
} }
// eslint-disable-next-line no-unused-vars
shouldEncryptMedia(threadInfo: ThreadInfo): boolean { shouldEncryptMedia(threadInfo: ThreadInfo): boolean {
return ( return true;
threadTypeIsThick(threadInfo.type) ||
threadInfoInsideCommunity(threadInfo, commStaffCommunity.id)
);
} }
bartekAuthorUnsubmitted
Done
Inline Actions

This function is removed in D13892

bartek: This function is removed in D13892
sendMultimediaMessage = async ( sendMultimediaMessage = async (
selections: $ReadOnlyArray<NativeMediaSelection>, selections: $ReadOnlyArray<NativeMediaSelection>,
threadInfo: ThreadInfo, threadInfo: ThreadInfo,
) => { ) => {
this.sendCallbacks.forEach(callback => callback()); this.sendCallbacks.forEach(callback => callback());
const localMessageID = getNextLocalID(); const localMessageID = getNextLocalID();
void this.startThreadCreation(threadInfo); void this.startThreadCreation(threadInfo);
▲ Show 20 Lines • Show All 1,173 Lines • Show Last 20 Lines
View Options

lib/hooks/relationship-prompt.js

Show All 16 Linesimport {
type BlobServiceUploadAction, type BlobServiceUploadAction,
type BlobServiceUploadResult, type BlobServiceUploadResult,
type MultimediaUploadCallbacks, type MultimediaUploadCallbacks,
type MultimediaUploadExtras, type MultimediaUploadExtras,
updateMultimediaMessageMediaActionType, updateMultimediaMessageMediaActionType,
uploadMultimedia, uploadMultimedia,
useBlobServiceUpload, useBlobServiceUpload,
} from 'lib/actions/upload-actions.js'; } from 'lib/actions/upload-actions.js';
import commStaffCommunity from 'lib/facts/comm-staff-community.js';
import { import {
type SendMultimediaMessagePayload, type SendMultimediaMessagePayload,
useInputStateContainerSendMultimediaMessage, useInputStateContainerSendMultimediaMessage,
useInputStateContainerSendTextMessage, useInputStateContainerSendTextMessage,
} from 'lib/hooks/input-state-container-hooks.js'; } from 'lib/hooks/input-state-container-hooks.js';
import { useNewThickThread } from 'lib/hooks/thread-hooks.js'; import { useNewThickThread } from 'lib/hooks/thread-hooks.js';
import type { import type {
CallSingleKeyserverEndpointOptions, CallSingleKeyserverEndpointOptions,
Show All 14 Linesimport {
createMediaMessageInfo, createMediaMessageInfo,
useMessageCreationSideEffectsFunc, useMessageCreationSideEffectsFunc,
getNextLocalID, getNextLocalID,
} from 'lib/shared/message-utils.js'; } from 'lib/shared/message-utils.js';
import type { CreationSideEffectsFunc } from 'lib/shared/messages/message-spec.js'; import type { CreationSideEffectsFunc } from 'lib/shared/messages/message-spec.js';
import { createRealThreadFromPendingThread } from 'lib/shared/thread-actions-utils.js'; import { createRealThreadFromPendingThread } from 'lib/shared/thread-actions-utils.js';
import { import {
patchThreadInfoToIncludeMentionedMembersOfParent, patchThreadInfoToIncludeMentionedMembersOfParent,
threadInfoInsideCommunity,
threadIsPending, threadIsPending,
threadIsPendingSidebar, threadIsPendingSidebar,
} from 'lib/shared/thread-utils.js'; } from 'lib/shared/thread-utils.js';
import type { CalendarQuery } from 'lib/types/entry-types.js'; import type { CalendarQuery } from 'lib/types/entry-types.js';
import type { import type {
Media, Media,
MediaMission, MediaMission,
MediaMissionResult, MediaMissionResult,
▲ Show 20 Lines • Show All 562 Lines • ▼ Show 20 Lines try {
throw new SendMessageError( throw new SendMessageError(
`Exception when sending text message: ${exceptionMessage}`, `Exception when sending text message: ${exceptionMessage}`,
messageInfo.localID ?? '', messageInfo.localID ?? '',
messageInfo.threadID, messageInfo.threadID,
); );
} }
} }
// eslint-disable-next-line no-unused-vars
shouldEncryptMedia(threadInfo: ThreadInfo): boolean { shouldEncryptMedia(threadInfo: ThreadInfo): boolean {
return ( return true;
threadTypeIsThick(threadInfo.type) ||
threadInfoInsideCommunity(threadInfo, commStaffCommunity.id)
);
} }
bartekAuthorUnsubmitted
Done
Inline Actions

This function is removed in D13892

bartek: This function is removed in D13892
sendMultimediaMessage = async ( sendMultimediaMessage = async (
selections: $ReadOnlyArray<NativeMediaSelection>, selections: $ReadOnlyArray<NativeMediaSelection>,
threadInfo: ThreadInfo, threadInfo: ThreadInfo,
) => { ) => {
this.sendCallbacks.forEach(callback => callback()); this.sendCallbacks.forEach(callback => callback());
const localMessageID = getNextLocalID(); const localMessageID = getNextLocalID();
void this.startThreadCreation(threadInfo); void this.startThreadCreation(threadInfo);
▲ Show 20 Lines • Show All 1,173 Lines • Show Last 20 Lines
View Options

lib/shared/crypto-utils.js

Show All 16 Linesimport {
type BlobServiceUploadAction, type BlobServiceUploadAction,
type BlobServiceUploadResult, type BlobServiceUploadResult,
type MultimediaUploadCallbacks, type MultimediaUploadCallbacks,
type MultimediaUploadExtras, type MultimediaUploadExtras,
updateMultimediaMessageMediaActionType, updateMultimediaMessageMediaActionType,
uploadMultimedia, uploadMultimedia,
useBlobServiceUpload, useBlobServiceUpload,
} from 'lib/actions/upload-actions.js'; } from 'lib/actions/upload-actions.js';
import commStaffCommunity from 'lib/facts/comm-staff-community.js';
import { import {
type SendMultimediaMessagePayload, type SendMultimediaMessagePayload,
useInputStateContainerSendMultimediaMessage, useInputStateContainerSendMultimediaMessage,
useInputStateContainerSendTextMessage, useInputStateContainerSendTextMessage,
} from 'lib/hooks/input-state-container-hooks.js'; } from 'lib/hooks/input-state-container-hooks.js';
import { useNewThickThread } from 'lib/hooks/thread-hooks.js'; import { useNewThickThread } from 'lib/hooks/thread-hooks.js';
import type { import type {
CallSingleKeyserverEndpointOptions, CallSingleKeyserverEndpointOptions,
Show All 14 Linesimport {
createMediaMessageInfo, createMediaMessageInfo,
useMessageCreationSideEffectsFunc, useMessageCreationSideEffectsFunc,
getNextLocalID, getNextLocalID,
} from 'lib/shared/message-utils.js'; } from 'lib/shared/message-utils.js';
import type { CreationSideEffectsFunc } from 'lib/shared/messages/message-spec.js'; import type { CreationSideEffectsFunc } from 'lib/shared/messages/message-spec.js';
import { createRealThreadFromPendingThread } from 'lib/shared/thread-actions-utils.js'; import { createRealThreadFromPendingThread } from 'lib/shared/thread-actions-utils.js';
import { import {
patchThreadInfoToIncludeMentionedMembersOfParent, patchThreadInfoToIncludeMentionedMembersOfParent,
threadInfoInsideCommunity,
threadIsPending, threadIsPending,
threadIsPendingSidebar, threadIsPendingSidebar,
} from 'lib/shared/thread-utils.js'; } from 'lib/shared/thread-utils.js';
import type { CalendarQuery } from 'lib/types/entry-types.js'; import type { CalendarQuery } from 'lib/types/entry-types.js';
import type { import type {
Media, Media,
MediaMission, MediaMission,
MediaMissionResult, MediaMissionResult,
▲ Show 20 Lines • Show All 562 Lines • ▼ Show 20 Lines try {
throw new SendMessageError( throw new SendMessageError(
`Exception when sending text message: ${exceptionMessage}`, `Exception when sending text message: ${exceptionMessage}`,
messageInfo.localID ?? '', messageInfo.localID ?? '',
messageInfo.threadID, messageInfo.threadID,
); );
} }
} }
// eslint-disable-next-line no-unused-vars
shouldEncryptMedia(threadInfo: ThreadInfo): boolean { shouldEncryptMedia(threadInfo: ThreadInfo): boolean {
return ( return true;
threadTypeIsThick(threadInfo.type) ||
threadInfoInsideCommunity(threadInfo, commStaffCommunity.id)
);
} }
bartekAuthorUnsubmitted
Done
Inline Actions

This function is removed in D13892

bartek: This function is removed in D13892
sendMultimediaMessage = async ( sendMultimediaMessage = async (
selections: $ReadOnlyArray<NativeMediaSelection>, selections: $ReadOnlyArray<NativeMediaSelection>,
threadInfo: ThreadInfo, threadInfo: ThreadInfo,
) => { ) => {
this.sendCallbacks.forEach(callback => callback()); this.sendCallbacks.forEach(callback => callback());
const localMessageID = getNextLocalID(); const localMessageID = getNextLocalID();
void this.startThreadCreation(threadInfo); void this.startThreadCreation(threadInfo);
▲ Show 20 Lines • Show All 1,173 Lines • Show Last 20 Lines
View Options

lib/shared/search-utils.js

Show All 16 Linesimport {
type BlobServiceUploadAction, type BlobServiceUploadAction,
type BlobServiceUploadResult, type BlobServiceUploadResult,
type MultimediaUploadCallbacks, type MultimediaUploadCallbacks,
type MultimediaUploadExtras, type MultimediaUploadExtras,
updateMultimediaMessageMediaActionType, updateMultimediaMessageMediaActionType,
uploadMultimedia, uploadMultimedia,
useBlobServiceUpload, useBlobServiceUpload,
} from 'lib/actions/upload-actions.js'; } from 'lib/actions/upload-actions.js';
import commStaffCommunity from 'lib/facts/comm-staff-community.js';
import { import {
type SendMultimediaMessagePayload, type SendMultimediaMessagePayload,
useInputStateContainerSendMultimediaMessage, useInputStateContainerSendMultimediaMessage,
useInputStateContainerSendTextMessage, useInputStateContainerSendTextMessage,
} from 'lib/hooks/input-state-container-hooks.js'; } from 'lib/hooks/input-state-container-hooks.js';
import { useNewThickThread } from 'lib/hooks/thread-hooks.js'; import { useNewThickThread } from 'lib/hooks/thread-hooks.js';
import type { import type {
CallSingleKeyserverEndpointOptions, CallSingleKeyserverEndpointOptions,
Show All 14 Linesimport {
createMediaMessageInfo, createMediaMessageInfo,
useMessageCreationSideEffectsFunc, useMessageCreationSideEffectsFunc,
getNextLocalID, getNextLocalID,
} from 'lib/shared/message-utils.js'; } from 'lib/shared/message-utils.js';
import type { CreationSideEffectsFunc } from 'lib/shared/messages/message-spec.js'; import type { CreationSideEffectsFunc } from 'lib/shared/messages/message-spec.js';
import { createRealThreadFromPendingThread } from 'lib/shared/thread-actions-utils.js'; import { createRealThreadFromPendingThread } from 'lib/shared/thread-actions-utils.js';
import { import {
patchThreadInfoToIncludeMentionedMembersOfParent, patchThreadInfoToIncludeMentionedMembersOfParent,
threadInfoInsideCommunity,
threadIsPending, threadIsPending,
threadIsPendingSidebar, threadIsPendingSidebar,
} from 'lib/shared/thread-utils.js'; } from 'lib/shared/thread-utils.js';
import type { CalendarQuery } from 'lib/types/entry-types.js'; import type { CalendarQuery } from 'lib/types/entry-types.js';
import type { import type {
Media, Media,
MediaMission, MediaMission,
MediaMissionResult, MediaMissionResult,
▲ Show 20 Lines • Show All 562 Lines • ▼ Show 20 Lines try {
throw new SendMessageError( throw new SendMessageError(
`Exception when sending text message: ${exceptionMessage}`, `Exception when sending text message: ${exceptionMessage}`,
messageInfo.localID ?? '', messageInfo.localID ?? '',
messageInfo.threadID, messageInfo.threadID,
); );
} }
} }
// eslint-disable-next-line no-unused-vars
shouldEncryptMedia(threadInfo: ThreadInfo): boolean { shouldEncryptMedia(threadInfo: ThreadInfo): boolean {
return ( return true;
threadTypeIsThick(threadInfo.type) ||
threadInfoInsideCommunity(threadInfo, commStaffCommunity.id)
);
} }
bartekAuthorUnsubmitted
Done
Inline Actions

This function is removed in D13892

bartek: This function is removed in D13892
sendMultimediaMessage = async ( sendMultimediaMessage = async (
selections: $ReadOnlyArray<NativeMediaSelection>, selections: $ReadOnlyArray<NativeMediaSelection>,
threadInfo: ThreadInfo, threadInfo: ThreadInfo,
) => { ) => {
this.sendCallbacks.forEach(callback => callback()); this.sendCallbacks.forEach(callback => callback());
const localMessageID = getNextLocalID(); const localMessageID = getNextLocalID();
void this.startThreadCreation(threadInfo); void this.startThreadCreation(threadInfo);
▲ Show 20 Lines • Show All 1,173 Lines • Show Last 20 Lines
View Options

lib/shared/thread-utils.js

Show All 16 Linesimport {
type BlobServiceUploadAction, type BlobServiceUploadAction,
type BlobServiceUploadResult, type BlobServiceUploadResult,
type MultimediaUploadCallbacks, type MultimediaUploadCallbacks,
type MultimediaUploadExtras, type MultimediaUploadExtras,
updateMultimediaMessageMediaActionType, updateMultimediaMessageMediaActionType,
uploadMultimedia, uploadMultimedia,
useBlobServiceUpload, useBlobServiceUpload,
} from 'lib/actions/upload-actions.js'; } from 'lib/actions/upload-actions.js';
import commStaffCommunity from 'lib/facts/comm-staff-community.js';
import { import {
type SendMultimediaMessagePayload, type SendMultimediaMessagePayload,
useInputStateContainerSendMultimediaMessage, useInputStateContainerSendMultimediaMessage,
useInputStateContainerSendTextMessage, useInputStateContainerSendTextMessage,
} from 'lib/hooks/input-state-container-hooks.js'; } from 'lib/hooks/input-state-container-hooks.js';
import { useNewThickThread } from 'lib/hooks/thread-hooks.js'; import { useNewThickThread } from 'lib/hooks/thread-hooks.js';
import type { import type {
CallSingleKeyserverEndpointOptions, CallSingleKeyserverEndpointOptions,
Show All 14 Linesimport {
createMediaMessageInfo, createMediaMessageInfo,
useMessageCreationSideEffectsFunc, useMessageCreationSideEffectsFunc,
getNextLocalID, getNextLocalID,
} from 'lib/shared/message-utils.js'; } from 'lib/shared/message-utils.js';
import type { CreationSideEffectsFunc } from 'lib/shared/messages/message-spec.js'; import type { CreationSideEffectsFunc } from 'lib/shared/messages/message-spec.js';
import { createRealThreadFromPendingThread } from 'lib/shared/thread-actions-utils.js'; import { createRealThreadFromPendingThread } from 'lib/shared/thread-actions-utils.js';
import { import {
patchThreadInfoToIncludeMentionedMembersOfParent, patchThreadInfoToIncludeMentionedMembersOfParent,
threadInfoInsideCommunity,
threadIsPending, threadIsPending,
threadIsPendingSidebar, threadIsPendingSidebar,
} from 'lib/shared/thread-utils.js'; } from 'lib/shared/thread-utils.js';
import type { CalendarQuery } from 'lib/types/entry-types.js'; import type { CalendarQuery } from 'lib/types/entry-types.js';
import type { import type {
Media, Media,
MediaMission, MediaMission,
MediaMissionResult, MediaMissionResult,
▲ Show 20 Lines • Show All 562 Lines • ▼ Show 20 Lines try {
throw new SendMessageError( throw new SendMessageError(
`Exception when sending text message: ${exceptionMessage}`, `Exception when sending text message: ${exceptionMessage}`,
messageInfo.localID ?? '', messageInfo.localID ?? '',
messageInfo.threadID, messageInfo.threadID,
); );
} }
} }
// eslint-disable-next-line no-unused-vars
shouldEncryptMedia(threadInfo: ThreadInfo): boolean { shouldEncryptMedia(threadInfo: ThreadInfo): boolean {
return ( return true;
threadTypeIsThick(threadInfo.type) ||
threadInfoInsideCommunity(threadInfo, commStaffCommunity.id)
);
} }
bartekAuthorUnsubmitted
Done
Inline Actions

This function is removed in D13892

bartek: This function is removed in D13892
sendMultimediaMessage = async ( sendMultimediaMessage = async (
selections: $ReadOnlyArray<NativeMediaSelection>, selections: $ReadOnlyArray<NativeMediaSelection>,
threadInfo: ThreadInfo, threadInfo: ThreadInfo,
) => { ) => {
this.sendCallbacks.forEach(callback => callback()); this.sendCallbacks.forEach(callback => callback());
const localMessageID = getNextLocalID(); const localMessageID = getNextLocalID();
void this.startThreadCreation(threadInfo); void this.startThreadCreation(threadInfo);
▲ Show 20 Lines • Show All 1,173 Lines • Show Last 20 Lines
View Options

lib/utils/action-utils.js

Loading...
View Options

native/account/register-panel.react.js

Loading...
View Options

native/account/registration/connect-ethereum.react.js

Loading...
View Options

native/account/registration/registration-server-call.js

Loading...
View Options

native/account/registration/username-selection.react.js

Loading...
View Options

native/account/siwe-hooks.js

Loading...
View Options

native/account/siwe-panel.react.js

Loading...
View Options

native/account/terms-and-privacy-modal.react.js

Loading...
View Options

native/avatars/avatar-hooks.js

Loading...
View Options

native/chat/settings/thread-settings-edit-relationship.react.js

Loading...
View Options

native/input/input-state-container.react.js

Loading...
View Options

native/navigation/deep-links-context-provider.react.js

Loading...
View Options

native/profile/edit-password.react.js

Loading...
View Options

native/profile/relationship-list-item.react.js

Loading...
View Options

native/profile/relationship-list.react.js

Loading...
View Options

native/profile/user-relationship-tooltip-modal.react.js

Loading...
View Options

web/account/siwe-login-form.react.js

Loading...
View Options

web/avatars/avatar-hooks.react.js

Loading...
View Options

web/input/input-state-container.react.js

Loading...
View Options

web/invite-links/invite-link-handler.react.js

Loading...
View Options

web/modals/terms-and-privacy-modal.react.js

Loading...
View Options

web/modals/threads/settings/thread-settings-relationship-button.react.js

Loading...
View Options

web/settings/password-change-modal.js

Loading...
View Options

web/settings/relationship/add-users-list.react.js

Loading...