Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F2753954
D12835.id42701.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
7 KB
Referenced Files
None
Subscribers
None
D12835.id42701.diff
View Options
diff --git a/lib/shared/dm-ops/add-members-spec.js b/lib/shared/dm-ops/add-members-spec.js
new file mode 100644
--- /dev/null
+++ b/lib/shared/dm-ops/add-members-spec.js
@@ -0,0 +1,82 @@
+// @flow
+
+import uuid from 'uuid';
+
+import type {
+ DMOperationSpec,
+ ProcessDMOperationUtilities,
+} from './dm-op-spec.js';
+import type { DMAddMembersOperation } from '../../types/dm-ops.js';
+import { messageTypes } from '../../types/message-types-enum.js';
+import { updateTypes } from '../../types/update-types-enum.js';
+import type { ClientUpdateInfo } from '../../types/update-types.js';
+
+const addMembersSpec: DMOperationSpec<DMAddMembersOperation> = Object.freeze({
+ processDMOperation: async (
+ dmOperation: DMAddMembersOperation,
+ viewerID: string,
+ utilities: ProcessDMOperationUtilities,
+ ) => {
+ const {
+ editorID,
+ time,
+ messageID,
+ addedUserIDs,
+ threadInfo,
+ rawMessageInfos,
+ truncationStatus,
+ rawEntryInfos,
+ } = dmOperation;
+ const addMembersMessage = {
+ type: messageTypes.ADD_MEMBERS,
+ id: messageID,
+ threadID: threadInfo.id,
+ creatorID: editorID,
+ time,
+ addedUserIDs: [...addedUserIDs],
+ };
+
+ const viewerIsAdded = addedUserIDs.includes(viewerID);
+ const updateInfos: Array<ClientUpdateInfo> = [];
+ if (viewerIsAdded) {
+ updateInfos.push(
+ {
+ type: updateTypes.JOIN_THREAD,
+ id: uuid.v4(),
+ time,
+ threadInfo,
+ rawMessageInfos,
+ truncationStatus,
+ rawEntryInfos,
+ },
+ {
+ type: updateTypes.UPDATE_THREAD_READ_STATUS,
+ id: uuid.v4(),
+ time,
+ threadID: threadInfo.id,
+ unread: true,
+ },
+ );
+ } else {
+ const currentThreadInfo = utilities.getThreadInfo(threadInfo.id);
+ if (currentThreadInfo?.thick) {
+ const newThreadInfo = {
+ ...currentThreadInfo,
+ members: threadInfo.members,
+ };
+ updateInfos.push({
+ type: updateTypes.UPDATE_THREAD,
+ id: uuid.v4(),
+ time,
+ threadInfo: newThreadInfo,
+ });
+ }
+ }
+ return {
+ rawMessageInfos: [addMembersMessage],
+ updateInfos,
+ };
+ },
+});
+
+export { addMembersSpec };
diff --git a/lib/shared/dm-ops/dm-op-spec.js b/lib/shared/dm-ops/dm-op-spec.js
--- a/lib/shared/dm-ops/dm-op-spec.js
+++ b/lib/shared/dm-ops/dm-op-spec.js
@@ -2,10 +2,12 @@
import type { DMOperation, DMOperationResult } from '../../types/dm-ops.js';
import type { RawMessageInfo } from '../../types/message-types.js';
+import type { RawThreadInfo } from '../../types/minimally-encoded-thread-permissions-types.js';
export type ProcessDMOperationUtilities = {
// Needed to fetch sidebar source messages
+fetchMessage: (messageID: string) => Promise<?RawMessageInfo>,
+ +getThreadInfo: (threadID: string) => ?RawThreadInfo,
};
export type DMOperationSpec<DMOp: DMOperation> = {
diff --git a/lib/shared/dm-ops/dm-op-specs.js b/lib/shared/dm-ops/dm-op-specs.js
--- a/lib/shared/dm-ops/dm-op-specs.js
+++ b/lib/shared/dm-ops/dm-op-specs.js
@@ -1,5 +1,6 @@
// @flow
+import { addMembersSpec } from './add-members-spec.js';
import { createSidebarSpec } from './create-sidebar-spec.js';
import { createThreadSpec } from './create-thread-spec.js';
import type { DMOperationSpec } from './dm-op-spec.js';
@@ -16,4 +17,5 @@
[dmOperationTypes.SEND_TEXT_MESSAGE]: sendTextMessageSpec,
[dmOperationTypes.SEND_REACTION_MESSAGE]: sendReactionMessageSpec,
[dmOperationTypes.SEND_EDIT_MESSAGE]: sendEditMessageSpec,
+ [dmOperationTypes.ADD_MEMBERS]: addMembersSpec,
});
diff --git a/lib/shared/dm-ops/process-dm-ops.js b/lib/shared/dm-ops/process-dm-ops.js
--- a/lib/shared/dm-ops/process-dm-ops.js
+++ b/lib/shared/dm-ops/process-dm-ops.js
@@ -9,15 +9,23 @@
type DMOperation,
processDMOpsActionType,
} from '../../types/dm-ops.js';
-import { useDispatch } from '../../utils/redux-utils.js';
+import { useDispatch, useSelector } from '../../utils/redux-utils.js';
function useProcessDMOperation(): (dmOp: DMOperation) => Promise<void> {
const fetchMessage = useGetLatestMessageEdit();
+ const threadInfos = useSelector(state => state.threadStore.threadInfos);
+
+ const getThreadInfo = React.useCallback(
+ (id: string) => threadInfos[id],
+ [threadInfos],
+ );
+
const utilities = React.useMemo(
() => ({
fetchMessage,
+ getThreadInfo,
}),
- [fetchMessage],
+ [fetchMessage, getThreadInfo],
);
const dispatch = useDispatch();
diff --git a/lib/types/dm-ops.js b/lib/types/dm-ops.js
--- a/lib/types/dm-ops.js
+++ b/lib/types/dm-ops.js
@@ -1,14 +1,23 @@
// @flow
-import type { TInterface, TUnion } from 'tcomb';
-import t from 'tcomb';
+import t, { type TInterface, type TUnion } from 'tcomb';
-import type { RawMessageInfo } from './message-types.js';
+import { type RawEntryInfo, rawEntryInfoValidator } from './entry-types.js';
+import type {
+ MessageTruncationStatus,
+ RawMessageInfo,
+} from './message-types.js';
+import {
+ messageTruncationStatusValidator,
+ rawMessageInfoValidator,
+} from './message-types.js';
+import type { ThickRawThreadInfo } from './minimally-encoded-thread-permissions-types.js';
import {
type NonSidebarThickThreadType,
nonSidebarThickThreadTypes,
} from './thread-types-enum.js';
import type { ClientUpdateInfo } from './update-types.js';
+import { threadInfoValidator } from '../permissions/minimally-encoded-thread-permissions-validators.js';
import { values } from '../utils/objects.js';
import { tShape, tString, tUserID } from '../utils/validation-utils.js';
@@ -18,6 +27,7 @@
SEND_TEXT_MESSAGE: 'send_text_message',
SEND_REACTION_MESSAGE: 'send_reaction_message',
SEND_EDIT_MESSAGE: 'send_edit_message',
+ ADD_MEMBERS: 'add_members',
});
export type DMOperationType = $Values<typeof dmOperationTypes>;
@@ -129,18 +139,44 @@
text: t.String,
});
+export type DMAddMembersOperation = {
+ +type: 'add_members',
+ +editorID: string,
+ +time: number,
+ +messageID: string,
+ +addedUserIDs: $ReadOnlyArray<string>,
+ +threadInfo: ThickRawThreadInfo,
+ +rawMessageInfos: $ReadOnlyArray<RawMessageInfo>,
+ +truncationStatus: MessageTruncationStatus,
+ +rawEntryInfos: $ReadOnlyArray<RawEntryInfo>,
+};
+export const dmAddMembersOperation: TInterface<DMAddMembersOperation> =
+ tShape<DMAddMembersOperation>({
+ type: tString(dmOperationTypes.ADD_MEMBERS),
+ editorID: tUserID,
+ time: t.Number,
+ messageID: t.String,
+ addedUserIDs: t.list(tUserID),
+ threadInfo: threadInfoValidator,
+ rawMessageInfos: t.list(rawMessageInfoValidator),
+ truncationStatus: messageTruncationStatusValidator,
+ rawEntryInfos: t.list(rawEntryInfoValidator),
+ });
+
export type DMOperation =
| DMCreateThreadOperation
| DMCreateSidebarOperation
| DMSendTextMessageOperation
| DMSendReactionMessageOperation
- | DMSendEditMessageOperation;
+ | DMSendEditMessageOperation
+ | DMAddMembersOperation;
export const dmOperationValidator: TUnion<DMOperation> = t.union([
dmCreateThreadOperationValidator,
dmCreateSidebarOperationValidator,
dmSendTextMessageOperationValidator,
dmSendReactionMessageOperation,
dmSendEditMessageOperation,
+ dmAddMembersOperation,
]);
export type DMOperationResult = {
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Sep 19, 6:32 PM (8 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2141589
Default Alt Text
D12835.id42701.diff (7 KB)
Attached To
Mode
D12835: [lib] DMOperationSpec for add members operation
Attached
Detach File
Event Timeline
Log In to Comment