Page MenuHomePhabricator
Files F2788849

D13184.id43754.diff
No OneTemporary
Actions

D13184.id43754.diff
View Options

diff --git a/native/chat/settings/thread-settings-leave-thread.react.js b/native/chat/settings/thread-settings-leave-thread.react.js
--- a/native/chat/settings/thread-settings-leave-thread.react.js
+++ b/native/chat/settings/thread-settings-leave-thread.react.js
@@ -3,6 +3,7 @@
import invariant from 'invariant';
import * as React from 'react';
import { ActivityIndicator, Text, View } from 'react-native';
+import uuid from 'uuid';
import type { LeaveThreadInput } from 'lib/actions/thread-actions.js';
import {
@@ -11,9 +12,19 @@
} from 'lib/actions/thread-actions.js';
import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors.js';
import { otherUsersButNoOtherAdmins } from 'lib/selectors/thread-selectors.js';
+import {
+ type OutboundDMOperationSpecification,
+ dmOperationSpecificationTypes,
+} from 'lib/shared/dm-ops/dm-op-utils.js';
+import { useProcessAndSendDMOperation } from 'lib/shared/dm-ops/process-dm-ops.js';
import { identifyInvalidatedThreads } from 'lib/shared/thread-utils.js';
+import type { DMLeaveThreadOperation } from 'lib/types/dm-ops';
import type { LoadingStatus } from 'lib/types/loading-types.js';
import type { ThreadInfo } from 'lib/types/minimally-encoded-thread-permissions-types.js';
+import {
+ thickThreadTypes,
+ threadTypeIsThick,
+} from 'lib/types/thread-types-enum.js';
import type { LeaveThreadPayload } from 'lib/types/thread-types.js';
import {
type DispatchActionPromise,
@@ -64,6 +75,7 @@
+dispatchActionPromise: DispatchActionPromise,
// async functions that hit server APIs
+leaveThread: (input: LeaveThreadInput) => Promise<LeaveThreadPayload>,
+ +leaveDMThread: () => Promise<void>,
// withNavContext
+navContext: ?NavContextType,
};
@@ -114,13 +126,24 @@
onConfirmLeaveThread = () => {
const threadID = this.props.threadInfo.id;
- void this.props.dispatchActionPromise(
- leaveThreadActionTypes,
- this.leaveThread(),
- {
- customKeyName: `${leaveThreadActionTypes.started}:${threadID}`,
- },
- );
+
+ if (threadTypeIsThick(this.props.threadInfo.type)) {
+ const { navContext } = this.props;
+ invariant(navContext, 'navContext should exist in leaveThread');
+ navContext.dispatch({
+ type: clearThreadsActionType,
+ payload: { threadIDs: [threadID] },
+ });
+ void this.props.leaveDMThread();
+ } else {
+ void this.props.dispatchActionPromise(
+ leaveThreadActionTypes,
+ this.leaveThread(),
+ {
+ customKeyName: `${leaveThreadActionTypes.started}:${threadID}`,
+ },
+ );
+ }
};
async leaveThread(): Promise<LeaveThreadPayload> {
@@ -174,6 +197,41 @@
const dispatchActionPromise = useDispatchActionPromise();
const callLeaveThread = useLeaveThread();
const navContext = React.useContext(NavContext);
+ const processAndSendDMOperation = useProcessAndSendDMOperation();
+ const viewerID = useSelector(
+ state => state.currentUserInfo && state.currentUserInfo.id,
+ );
+
+ const leaveDMThread = React.useCallback(async () => {
+ invariant(viewerID, 'viewerID should be set');
+ const op: DMLeaveThreadOperation = {
+ type: 'leave_thread',
+ editorID: viewerID,
+ time: Date.now(),
+ messageID: uuid.v4(),
+ threadID: props.threadInfo.id,
+ };
+ const opSpecification: OutboundDMOperationSpecification = {
+ type: dmOperationSpecificationTypes.OUTBOUND,
+ op,
+ recipients: {
+ type: 'all_thread_members',
+ threadID:
+ props.threadInfo.type === thickThreadTypes.THICK_SIDEBAR &&
+ props.threadInfo.parentThreadID
+ ? props.threadInfo.parentThreadID
+ : props.threadInfo.id,
+ },
+ };
+ await processAndSendDMOperation(opSpecification);
+ }, [
+ processAndSendDMOperation,
+ props.threadInfo.id,
+ props.threadInfo.parentThreadID,
+ props.threadInfo.type,
+ viewerID,
+ ]);
+
return (
<ThreadSettingsLeaveThread
{...props}
@@ -184,6 +242,7 @@
dispatchActionPromise={dispatchActionPromise}
leaveThread={callLeaveThread}
navContext={navContext}
+ leaveDMThread={leaveDMThread}
/>
);
});

File Metadata

Mime Type
text/plain
Expires
Sun, Sep 22, 7:48 AM (20 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2167430
Default Alt Text
D13184.id43754.diff (4 KB)

Event Timeline